nci-cidc-api-modules 1.1.27__tar.gz → 1.1.29__tar.gz

{nci_cidc_api_modules-1.1.27/nci_cidc_api_modules.egg-info → nci_cidc_api_modules-1.1.29}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nci_cidc_api_modules
-Version: 1.1.27
+Version: 1.1.29
 Summary: SQLAlchemy data models and configuration tools used in the NCI CIDC API
 Home-page: https://github.com/NCI-CIDC/cidc-api-gae
 License: MIT license
@@ -28,7 +28,7 @@ Requires-Dist: python-dotenv==0.10.3
 Requires-Dist: requests==2.32.3
 Requires-Dist: jinja2==3.1.6
 Requires-Dist: certifi==2024.7.4
-Requires-Dist: nci-cidc-schemas==0.27.18
+Requires-Dist: nci-cidc-schemas==0.27.19
 Dynamic: description
 Dynamic: description-content-type
 Dynamic: home-page

{nci_cidc_api_modules-1.1.27 → nci_cidc_api_modules-1.1.29}/cidc_api/config/logging.py

@@ -19,7 +19,8 @@ def get_logger(name: Optional[str]) -> logging.Logger:
         logger.setLevel(gunicorn_logger.level)
     else:
         handler = logging.StreamHandler(sys.stdout)
-        handler.setFormatter(logging.Formatter("[%(asctime)s] [%(threadName)s] [%(levelname)s]: %(message)s"))
+        formatter = logging.Formatter("[%(asctime)s] [%(threadName)s] [%(levelname)s] [%(name)s]: %(message)s")
+        handler.setFormatter(formatter)
         logger.addHandler(handler)
         logger.setLevel(logging.DEBUG if ENV == "dev" else logging.INFO)
         if not TESTING:

{nci_cidc_api_modules-1.1.27 → nci_cidc_api_modules-1.1.29}/cidc_api/models/models.py

@@ -3103,8 +3103,8 @@ class DownloadableFiles(CommonColumns):
         trial_file_counts = cls.count_by(
             cls.trial_id,
             session=session,
-            # Apply the provided filter, and also exclude files with null `data_category`s
-            filter_=lambda q: filter_(q).filter(cls.data_category != None),
+            # Apply the provided filter
+            filter_=lambda q: filter_(q),
         )
         trial_facets = build_trial_facets(trial_file_counts)
         return trial_facets

{nci_cidc_api_modules-1.1.27 → nci_cidc_api_modules-1.1.29/nci_cidc_api_modules.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nci_cidc_api_modules
-Version: 1.1.27
+Version: 1.1.29
 Summary: SQLAlchemy data models and configuration tools used in the NCI CIDC API
 Home-page: https://github.com/NCI-CIDC/cidc-api-gae
 License: MIT license
@@ -28,7 +28,7 @@ Requires-Dist: python-dotenv==0.10.3
 Requires-Dist: requests==2.32.3
 Requires-Dist: jinja2==3.1.6
 Requires-Dist: certifi==2024.7.4
-Requires-Dist: nci-cidc-schemas==0.27.18
+Requires-Dist: nci-cidc-schemas==0.27.19
 Dynamic: description
 Dynamic: description-content-type
 Dynamic: home-page

{nci_cidc_api_modules-1.1.27 → nci_cidc_api_modules-1.1.29}/nci_cidc_api_modules.egg-info/requires.txt

@@ -19,4 +19,4 @@ python-dotenv==0.10.3
 requests==2.32.3
 jinja2==3.1.6
 certifi==2024.7.4
-nci-cidc-schemas==0.27.18
+nci-cidc-schemas==0.27.19

{nci_cidc_api_modules-1.1.27 → nci_cidc_api_modules-1.1.29}/requirements.modules.txt

@@ -19,4 +19,4 @@ python-dotenv==0.10.3
 requests==2.32.3
 jinja2==3.1.6
 certifi==2024.7.4
-nci-cidc-schemas==0.27.18
+nci-cidc-schemas==0.27.19

{nci_cidc_api_modules-1.1.27 → nci_cidc_api_modules-1.1.29}/tests/test_api.py

@@ -435,6 +435,7 @@ def test_endpoint_urls(cidc_api):
         "/ingestion/intake_metadata",
         "/permissions/",
         "/permissions/<int:permission>",
+        "/samples/",
         "/trial_metadata/",
         "/trial_metadata/new_manifest",
         "/trial_metadata/summaries",