cdapython 2.2.0__py3-none-any.whl → 2.2.2__py3-none-any.whl

cdapython/discover.py

@@ -502,7 +502,10 @@ def columns(
     try:
         columns_response_data_object = cda_client.api.columns.columns_endpoint_columns_get.sync( client=query_api_instance )
     except UnexpectedStatus as error:
-        log.error( f"UnexpectedStatus error from API, status code {error.status_code}: {json.loads( error.content )['message']}" )
+        try:
+            log.error( f"UnexpectedStatus error from API, status code {error.status_code}: {json.loads( error.content )['message']}" )
+        except:
+            log.error( f"{type(error)}: {error}" )
         return
     except Exception as error:
         log.error( f"{type(error)}: {error}" )
@@ -848,7 +851,7 @@ def column_values(
 
         data_source ( string; optional ):
             Restrict returned values to the given upstream data source. Current
-            valid values are 'GC', 'GDC', 'PDC', 'IDC' and 'ICDC'.
+            valid values are 'CTDC', 'GC', 'GDC', 'PDC', 'IDC' and 'ICDC'.
             Defaults to None (no filter).
 
         force( boolean; optional ):
@@ -997,7 +1000,7 @@ def column_values(
 
     # Warn the user if an override hasn't been requested.
     if not force and column in expensive_columns:
-        log.warning( f"'{column}' has a very large number of values; retrieval is blocked by default. To perform this query, use column_values( ..., 'force=True' )." )
+        log.warning( f"'{column}' has a very large number of values; retrieval is blocked by default. To perform this query, use column_values( ..., force=True )." )
         return
 
     #############################################################################################################################

cdapython/get_data.py

@@ -75,7 +75,7 @@ def get_file_data(
 
         data_source ( string or list of strings; optional ):
             Restrict results to those deriving from the given upstream
-            data source(s). Current valid values are 'GC', 'GDC', 'IDC',
+            data source(s). Current valid values are 'CTDC', 'GC', 'GDC', 'IDC',
             'PDC' and 'ICDC'. (Default: no filter.)
 
         add_columns ( string or list of strings; optional ):
@@ -206,7 +206,7 @@ def get_subject_data(
 
         data_source ( string or list of strings; optional ):
             Restrict results to those deriving from the given upstream
-            data source(s). Current valid values are 'GC', 'GDC', 'IDC',
+            data source(s). Current valid values are 'CTDC', 'GC', 'GDC', 'IDC',
             'PDC' and 'ICDC'. (Default: no filter.)
 
         add_columns ( string or list of strings; optional ):
@@ -343,7 +343,7 @@ def get_data(
 
         data_source ( string or list of strings; optional ):
             Restrict results to those deriving from the given upstream
-            data source(s). Current valid values are 'GC', 'GDC', 'IDC',
+            data source(s). Current valid values are 'CTDC', 'GC', 'GDC', 'IDC',
             'PDC' and 'ICDC'. (Default: no filter.)
 
         add_columns ( string or list of strings; optional ):

cdapython/summarize.py

@@ -551,7 +551,7 @@ def summarize_files(
 
         data_source ( string or list of strings; optional ):
             Restrict results to those deriving from the given upstream
-            data source(s). Current valid values are 'GC', 'GDC', 'IDC',
+            data source(s). Current valid values are 'CTDC', 'GC', 'GDC', 'IDC',
             'PDC' and 'ICDC'. (Default: no filter.)
 
         add_columns ( string or list of strings; optional ):
@@ -707,7 +707,7 @@ def summarize_subjects(
 
         data_source ( string or list of strings; optional ):
             Restrict results to those deriving from the given upstream
-            data source(s). Current valid values are 'GC', 'GDC', 'IDC',
+            data source(s). Current valid values are 'CTDC', 'GC', 'GDC', 'IDC',
             'PDC' and 'ICDC'. (Default: no filter.)
 
         add_columns ( string or list of strings; optional ):
@@ -863,7 +863,7 @@ def summarize(
 
         data_source ( string or list of strings; optional ):
             Restrict results to those deriving from the given upstream
-            data source(s). Current valid values are 'GC', 'GDC', 'IDC',
+            data source(s). Current valid values are 'CTDC', 'GC', 'GDC', 'IDC',
             'PDC' and 'ICDC'. (Default: no filter.)
 
         add_columns ( string or list of strings; optional ):

{cdapython-2.2.0.dist-info → cdapython-2.2.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cdapython
-Version: 2.2.0
+Version: 2.2.2
 Summary: NCI CRDC CDA front-end user interface library
 License-File: LICENSE
 Requires-Python: >=3.9,<4.0
@@ -11,6 +11,7 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
+Classifier: Programming Language :: Python :: 3.15
 Requires-Dist: cda-client (>=2.1.0)
 Requires-Dist: pandas (>=2.2.3,<3.0.0)
 Requires-Dist: pyyaml (>=6.0.0)

cdapython-2.2.2.dist-info/RECORD

@@ -0,0 +1,12 @@
+cdapython/__init__.py,sha256=s37hjhAK4bhkNKju5I9btRjDukGjCfv_M6_BUu6Jh70,560
+cdapython/config/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+cdapython/config/logger_default_config.yml,sha256=j4kaJk0w4-xiOyCl5Ml0DhWnK6dAWy33UecLsl1vI_w,434
+cdapython/discover.py,sha256=PALR2oVGyWpofMgZIcwGwzy9H2yMbiEhpVt3or9l2r4,60008
+cdapython/get_data.py,sha256=DhGonfugu0Gj_jbJR4zKFCComqbgSJX2fTw54F8xWdY,120518
+cdapython/logging_wrappers.py,sha256=SsgKrLh9y6RR-iAiMAm0Is9fGjLKQZ8BckA1MBCCLig,6885
+cdapython/summarize.py,sha256=1_4cIIN3NLwCr5s3zvmTzo5sKXKHPN-Ee_57AMIoq7E,126614
+cdapython/validation.py,sha256=YIPVUZfpGy8ahgbZaFUOKKzbrX26tHhusL2k-r6mTWc,41076
+cdapython-2.2.2.dist-info/METADATA,sha256=-5LJymkLCu0VfbuufYeLQA02ctBJcxU4gVL4OH8rDr8,823
+cdapython-2.2.2.dist-info/WHEEL,sha256=L-WvLdSBvJWHXv5zrQxDvNRnIgoBzLUpcbuiw19KCuQ,88
+cdapython-2.2.2.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+cdapython-2.2.2.dist-info/RECORD,,

{cdapython-2.2.0.dist-info → cdapython-2.2.2.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 2.4.1
+Generator: poetry-core 2.5.0
 Root-Is-Purelib: true
 Tag: py3-none-any

cdapython-2.2.0.dist-info/RECORD

@@ -1,12 +0,0 @@
-cdapython/__init__.py,sha256=s37hjhAK4bhkNKju5I9btRjDukGjCfv_M6_BUu6Jh70,560
-cdapython/config/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cdapython/config/logger_default_config.yml,sha256=j4kaJk0w4-xiOyCl5Ml0DhWnK6dAWy33UecLsl1vI_w,434
-cdapython/discover.py,sha256=zJb9b5Y57FAqRIB7TDpU6AlV55lg5Y37fyon8OqpHBk,59918
-cdapython/get_data.py,sha256=bDJfkIbKOip04YZKNZHJls9LiVhMC7o6jJujyXsEhL4,120494
-cdapython/logging_wrappers.py,sha256=SsgKrLh9y6RR-iAiMAm0Is9fGjLKQZ8BckA1MBCCLig,6885
-cdapython/summarize.py,sha256=_-LQeZCI-xV3BRW0bY03heP5kXFywsN-ug10TsY4oxY,126590
-cdapython/validation.py,sha256=YIPVUZfpGy8ahgbZaFUOKKzbrX26tHhusL2k-r6mTWc,41076
-cdapython-2.2.0.dist-info/METADATA,sha256=6U6E7oddsOGR2PFGB4USBraCoGRWsqfh-Fd4aBGNxVg,772
-cdapython-2.2.0.dist-info/WHEEL,sha256=eY7nduwzv-ldUxpzbRlxwvC693Hg6PX8bWDjEHjZ_dk,88
-cdapython-2.2.0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-cdapython-2.2.0.dist-info/RECORD,,