cdapython 2.0.8__py3-none-any.whl → 2.0.9__py3-none-any.whl

cdapython/discover.py

@@ -834,20 +834,36 @@ def column_values(
     # Let's not care about case, and remove any whitespace before it can do any damage.
     data_source = re.sub( r'\s+', r'', data_source ).upper()
 
-    # TEMPORARY: enumerate valid `data_source` values and warn the user if they supplied something else.
-    #
-    # This should be replaced ASAP with a fetch from the /release_metadata endpoint.
-
-    allowed_data_source_values = {
-        'GC',
-        'GDC',
-        'PDC',
-        'IDC',
-        'ICDC'
-    }
+    # Cache valid labels for upstream data sources. The data structure coming back from
+    # release_metadata() is a list of dicts, with each dict looking like
+    # 
+    # {
+    #     'cda_table': 'file',
+    #     'cda_column': 'access',
+    #     'data_source': 'GDC',
+    #     'data_source_version': 'March 2025',
+    #     'data_source_extraction_date': '2025-03-21',
+    #     'data_source_row_count': 3025352,
+    #     'data_source_unique_value_count': 4,
+    #     'data_source_null_count': 407714
+    # }
+
+    try:
+        cached_release_metadata = release_metadata()
+    except Exception as e:
+        log.critical( e )
+        return
+
+    valid_data_sources = set()
+
+    for column_record in cached_release_metadata:
+        record_data_source = column_record['data_source']
+        # Let's not care about case.
+        if record_data_source.upper() != 'CDA':
+            valid_data_sources.add( record_data_source.upper() )
 
-    if data_source != '' and data_source not in allowed_data_source_values:
-        log.error( f"The 'data_source' parameter must be one of [ 'GC', 'GDC', 'PDC', 'IDC', 'ICDC' ]. You supplied '{data_source}', which is not." )
+    if data_source != '' and data_source not in valid_data_sources:
+        log.error( f"The 'data_source' parameter must be one of { sorted( valid_data_sources ) }. You supplied '{data_source}', which is not." )
         return
 
     #############################################################################################################################

{cdapython-2.0.8.dist-info → cdapython-2.0.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cdapython
-Version: 2.0.8
+Version: 2.0.9
 Summary: NCI CRDC CDA front-end user interface library
 License-File: LICENSE
 Requires-Python: >=3.9,<4.0

{cdapython-2.0.8.dist-info → cdapython-2.0.9.dist-info}/RECORD

@@ -2,12 +2,12 @@ cdapython/__init__.py,sha256=5XapTJOqQ9IfFcO4UrM09teNP_xYkTR_bQTRww6e3Wk,575
 cdapython/application_utilities.py,sha256=oD8LA9N2cM8gnTx353IdEgjtcHiI1LSlKQgUtKXtANM,1615
 cdapython/config/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cdapython/config/logger_default_config.yml,sha256=j4kaJk0w4-xiOyCl5Ml0DhWnK6dAWy33UecLsl1vI_w,434
-cdapython/discover.py,sha256=89nDzR6S2LNJeYYl6COxXkv1jZI8jmTeK_LggqpsPSo,60340
+cdapython/discover.py,sha256=9E4uYZRY1RJHiKFw1F5EXBU_f6YAOjz-rg0_dEhKWqU,60954
 cdapython/get_data.py,sha256=y8sCtnxLglRYgJSmCd-kppNZB6hhYhx8CBhCFaWWbKU,59368
 cdapython/logging_wrappers.py,sha256=SsgKrLh9y6RR-iAiMAm0Is9fGjLKQZ8BckA1MBCCLig,6885
 cdapython/summarize.py,sha256=Oed_HwL2ytNRYtNhs2rYtaDIN8JkEMObRMdij-pxMz0,90546
 cdapython/validation.py,sha256=za33Ca0rS7-CsnuB9pCiTqzAU4BEkkfxIo4bPqZkUwM,34050
-cdapython-2.0.8.dist-info/METADATA,sha256=DrXpjePQilBW92i1EWdA4mCjGRoVDCFRjSjtyH4wKiA,764
-cdapython-2.0.8.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-cdapython-2.0.8.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-cdapython-2.0.8.dist-info/RECORD,,
+cdapython-2.0.9.dist-info/METADATA,sha256=Au1S4DHkb_MiNvuDGPPJuTRVjj-UQ6UkwQz8ye0I1tM,764
+cdapython-2.0.9.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+cdapython-2.0.9.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+cdapython-2.0.9.dist-info/RECORD,,