Skip to content

Commit 810fced

Browse files
committed
enh: update to IDC v23
1 parent 2264f3c commit 810fced

10 files changed

Lines changed: 13 additions & 13 deletions

assets/clinical_index.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@ SELECT
2525
# values encountered in the column
2626
`values`
2727
FROM
28-
`bigquery-public-data.idc_v22_clinical.column_metadata`
28+
`bigquery-public-data.idc_v23_clinical.column_metadata`
2929
ORDER BY
3030
collection_id, table_name

assets/sm_index.sql

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

3838

3939
FROM
40-
`bigquery-public-data.idc_v22.dicom_all` AS dicom_all
40+
`bigquery-public-data.idc_v23.dicom_all` AS dicom_all
4141
GROUP BY
4242
SeriesInstanceUID
4343
),
@@ -51,7 +51,7 @@ SpecimenPreparationSequence_unnested AS (
5151
concept_code_sequence.CodeMeaning AS ccs_cm,
5252
concept_code_sequence.CodingSchemeDesignator AS ccs_csd,
5353
concept_code_sequence.CodeValue AS ccs_val,
54-
FROM `bigquery-public-data.idc_v22.dicom_all`,
54+
FROM `bigquery-public-data.idc_v23.dicom_all`,
5555
UNNEST(SpecimenDescriptionSequence[SAFE_OFFSET(0)].SpecimenPreparationSequence) as preparation_unnest_step1,
5656
UNNEST(preparation_unnest_step1.SpecimenPreparationStepContentItemSequence) as preparation_unnest_step2,
5757
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
@@ -16,7 +16,7 @@ WITH
1616
concept_code_sequence.CodingSchemeDesignator AS ccs_csd,
1717
concept_code_sequence.CodeValue AS ccs_val,
1818
FROM
19-
`bigquery-public-data.idc_v22.dicom_all`,
19+
`bigquery-public-data.idc_v23.dicom_all`,
2020
UNNEST(SpecimenDescriptionSequence[SAFE_OFFSET(0)].SpecimenPreparationSequence) AS preparation_unnest_step1,
2121
UNNEST(preparation_unnest_step1.SpecimenPreparationStepContentItemSequence) AS preparation_unnest_step2,
2222
UNNEST(preparation_unnest_step2.ConceptNameCodeSequence) AS concept_name_code_sequence,
@@ -144,7 +144,7 @@ SELECT
144144
# unique identifier of the instance within the IDC
145145
dicom_all.crdc_instance_uuid AS crdc_instance_uuid
146146
FROM
147-
`bigquery-public-data.idc_v22.dicom_all` AS dicom_all
147+
`bigquery-public-data.idc_v23.dicom_all` AS dicom_all
148148
LEFT JOIN
149149
slide_embedding
150150
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 = "22.1.5"
16+
version = "23.0.1"
1717
authors = [
1818
{ name = "Andrey Fedorov", email = "andrey.fedorov@gmail.com" },
1919
{ name = "Vamsi Thiriveedhi", email = "vthiriveedhi@mgh.harvard.edu" },

scripts/python/idc_index_data_manager.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,7 @@ def retrieve_latest_idc_release_version(self) -> int:
423423
SELECT
424424
MAX(idc_version) AS latest_idc_release_version
425425
FROM
426-
`bigquery-public-data.idc_current.version_metadata`
426+
`bigquery-public-data.idc_v23.version_metadata`
427427
"""
428428
query_job = self.client.query(query)
429429
result = query_job.result()

scripts/sql/analysis_results_index.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,4 @@ SELECT
4343
# citation for the analysis results collection that should be used for acknowledgment
4444
Citation
4545
FROM
46-
`bigquery-public-data.idc_v22.analysis_results_metadata`
46+
`bigquery-public-data.idc_v23.analysis_results_metadata`

scripts/sql/collections_index.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,4 @@ SELECT
4040
# detailed information about the collection
4141
Description
4242
FROM
43-
`bigquery-public-data.idc_v22.original_collections_metadata`
43+
`bigquery-public-data.idc_v23.original_collections_metadata`

scripts/sql/idc_index.sql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,9 @@ SELECT
8383
# total size of the series in megabytes
8484
ROUND(SUM(SAFE_CAST(instance_size AS float64))/1000000, 2) AS series_size_MB,
8585
FROM
86-
`bigquery-public-data.idc_v22.dicom_all` AS dicom_all
86+
`bigquery-public-data.idc_v23.dicom_all` AS dicom_all
8787
JOIN
88-
`bigquery-public-data.idc_v22.dicom_metadata_curated` AS dicom_curated
88+
`bigquery-public-data.idc_v23.dicom_metadata_curated` AS dicom_curated
8989
ON
9090
dicom_all.SOPInstanceUID = dicom_curated.SOPInstanceUID
9191
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 22;
6+
DECLARE latest_idc_version INT64 DEFAULT 23;
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 = 22
10+
EXPECTED_IDC_INDEX_VERSION = 23
1111

1212

1313
def test_version():

0 commit comments

Comments
 (0)