Skip to content

Commit fa75f44

Browse files
committed
ENH: update to IDC v22
1 parent 1dabc78 commit fa75f44

File tree

7 files changed

+10
-10
lines changed

7 files changed

+10
-10
lines changed

assets/clinical_index.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ SELECT
66
column_label,
77
`values`
88
FROM
9-
`bigquery-public-data.idc_v21_clinical.column_metadata`
9+
`bigquery-public-data.idc_v22_clinical.column_metadata`
1010
ORDER BY
1111
collection_id, table_name

assets/sm_index.sql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ WITH
3131

3232

3333
FROM
34-
`bigquery-public-data.idc_v21.dicom_all` AS dicom_all
34+
`bigquery-public-data.idc_v22.dicom_all` AS dicom_all
3535
GROUP BY
3636
SeriesInstanceUID
3737
),
@@ -45,7 +45,7 @@ SpecimenPreparationSequence_unnested AS (
4545
concept_code_sequence.CodeMeaning AS ccs_cm,
4646
concept_code_sequence.CodingSchemeDesignator AS ccs_csd,
4747
concept_code_sequence.CodeValue AS ccs_val,
48-
FROM `bigquery-public-data.idc_v21.dicom_all`,
48+
FROM `bigquery-public-data.idc_v22.dicom_all`,
4949
UNNEST(SpecimenDescriptionSequence[SAFE_OFFSET(0)].SpecimenPreparationSequence) as preparation_unnest_step1,
5050
UNNEST(preparation_unnest_step1.SpecimenPreparationStepContentItemSequence) as preparation_unnest_step2,
5151
UNNEST(preparation_unnest_step2.ConceptNameCodeSequence) as concept_name_code_sequence,

assets/sm_instance_index.sql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ WITH
99
concept_code_sequence.CodingSchemeDesignator AS ccs_csd,
1010
concept_code_sequence.CodeValue AS ccs_val,
1111
FROM
12-
`bigquery-public-data.idc_v21.dicom_all`,
12+
`bigquery-public-data.idc_v22.dicom_all`,
1313
UNNEST(SpecimenDescriptionSequence[SAFE_OFFSET(0)].SpecimenPreparationSequence) AS preparation_unnest_step1,
1414
UNNEST(preparation_unnest_step1.SpecimenPreparationStepContentItemSequence) AS preparation_unnest_step2,
1515
UNNEST(preparation_unnest_step2.ConceptNameCodeSequence) AS concept_name_code_sequence,
@@ -107,7 +107,7 @@ SELECT
107107
-- attributes needed to retrieve the selected instances/files
108108
dicom_all.crdc_instance_uuid
109109
FROM
110-
`bigquery-public-data.idc_v21.dicom_all` AS dicom_all
110+
`bigquery-public-data.idc_v22.dicom_all` AS dicom_all
111111
LEFT JOIN
112112
slide_embedding
113113
ON

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ build-backend = "scikit_build_core.build"
1313

1414
[project]
1515
name = "idc-index-data"
16-
version = "21.0.0"
16+
version = "22.0.0"
1717
authors = [
1818
{ name = "Andrey Fedorov", email = "[email protected]" },
1919
{ name = "Vamsi Thiriveedhi", email = "[email protected]" },

scripts/sql/idc_index.sql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ SELECT
2929
ANY_VALUE(CONCAT(series_aws_url,"*")) AS series_aws_url,
3030
ROUND(SUM(SAFE_CAST(instance_size AS float64))/1000000, 2) AS series_size_MB,
3131
FROM
32-
`bigquery-public-data.idc_v21.dicom_all` AS dicom_all
32+
`bigquery-public-data.idc_v22.dicom_all` AS dicom_all
3333
JOIN
34-
`bigquery-public-data.idc_v21.dicom_metadata_curated` AS dicom_curated
34+
`bigquery-public-data.idc_v22.dicom_metadata_curated` AS dicom_curated
3535
ON
3636
dicom_all.SOPInstanceUID = dicom_curated.SOPInstanceUID
3737
GROUP BY

scripts/sql/prior_versions_index.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
--
44
-- Step 1: Declare variables
55
DECLARE idc_versions ARRAY<INT64>;
6-
DECLARE latest_idc_version INT64 DEFAULT 21;
6+
DECLARE latest_idc_version INT64 DEFAULT 22;
77
DECLARE union_all_query STRING;
88

99
--Step 2

tests/test_package.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
import idc_index_data as m
99

10-
EXPECTED_IDC_INDEX_VERSION = 21
10+
EXPECTED_IDC_INDEX_VERSION = 22
1111

1212

1313
def test_version():

0 commit comments

Comments
 (0)