willisapi-client 1.9.9__tar.gz → 2.0__tar.gz

{willisapi_client-1.9.9 → willisapi_client-2.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: willisapi_client
-Version: 1.9.9
+Version: 2.0
 Summary: A Python client for willisapi
 Home-page: https://github.com/bklynhlth/willsiapi_client
 Author: bklynhlth
@@ -9,6 +9,39 @@ License: Apache
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: aiohttp==3.9.0
+Requires-Dist: aiosignal==1.3.1
+Requires-Dist: async-timeout==4.0.2
+Requires-Dist: asyncio==3.4.3
+Requires-Dist: attrs==23.1.0
+Requires-Dist: certifi==2023.7.22
+Requires-Dist: charset-normalizer==3.2.0
+Requires-Dist: frozenlist==1.4.0
+Requires-Dist: idna==3.4
+Requires-Dist: multidict==6.0.4
+Requires-Dist: nest-asyncio==1.5.7
+Requires-Dist: numpy==1.25.2
+Requires-Dist: pandas==2.0.3
+Requires-Dist: pytest==7.4.0
+Requires-Dist: pytest-cov==4.1.0
+Requires-Dist: python-dateutil==2.8.2
+Requires-Dist: pytz==2023.3
+Requires-Dist: requests==2.31.0
+Requires-Dist: six==1.16.0
+Requires-Dist: tqdm==4.66.1
+Requires-Dist: tzdata==2023.3
+Requires-Dist: urllib3==2.0.7
+Requires-Dist: yarl==1.9.2
+Dynamic: author
+Dynamic: author-email
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 <!-- Output copied to clipboard! -->
 

{willisapi_client-1.9.9 → willisapi_client-2.0}/willisapi_client/__version__.py

@@ -1,7 +1,7 @@
 """Version details for willisapi_client"""
 
 __client__ = "willisapi_client"
-__latestVersion__ = "1.9.9"
+__latestVersion__ = "2.0"
 __url__ = "https://github.com/bklynhlth/willsiapi_client"
 __short_description__ = "A Python client for willisapi"
 __content_type__ = "text/markdown"

{willisapi_client-1.9.9 → willisapi_client-2.0}/willisapi_client/services/metadata/utils.py

@@ -473,15 +473,48 @@ class UploadUtils:
         except Exception as e:
             raise RuntimeError(f"Failed to calculate checksum: {e}")
 
+    def optional_value(self, column: str):
+        """Return a column's value only when the row actually supplies one.
+
+        Optional columns may be missing from the CSV entirely, or present but
+        empty on a given row -- pandas surfaces both as an absent attribute or
+        NaN. Passing that straight through would post the string "nan" to the
+        API and overwrite good data, so it is dropped instead. Callers omit
+        the key altogether, which the API treats as "leave this field alone".
+        """
+        value = getattr(self.row, column, None)
+        if value is None or pd.isna(value):
+            return None
+        text = str(value).strip()
+        return text or None
+
+    def demographic_fields(self) -> Dict[str, Any]:
+        """Optional demographics to send, omitting any the row leaves blank."""
+        supplied = {}
+        for column in ("sex", "race"):
+            value = self.optional_value(column)
+            if value is not None:
+                supplied[column] = value
+
+        age = self.optional_value("age")
+        if age is not None:
+            try:
+                # Via float first: pandas widens an int column to float as soon
+                # as any row is blank, so a whole-number age arrives as "42.0".
+                supplied["age"] = int(float(age))
+            except (TypeError, ValueError):
+                # MetadataValidation already reports a non-numeric age; dropping
+                # it here keeps a bad cell from failing the upload as well.
+                pass
+
+        return supplied
+
     def generate_payload(self) -> Dict[str, Any]:
         payload = {
             "study_id": self.row.study_id,
             "site_id": self.row.site_id,
             "rater_id": self.row.rater_id,
             "participant_id": self.row.participant_id,
-            "age": self.row.age,
-            "sex": self.row.sex,
-            "race": self.row.race,
             "language": self.row.language,
             "visit_name": self.row.visit_name,
             "visit_order": int(self.row.visit_order),
@@ -494,6 +527,7 @@ class UploadUtils:
             "is_last_recording": self.row.is_last_recording,
             # "time_collected": parser.parse(self.row.time_collected).isoformat(),
         }
+        payload.update(self.demographic_fields())
         return payload
 
     def generate_processed_payload(
@@ -519,6 +553,7 @@ class UploadUtils:
         site_country = getattr(self.row, "site_country", None)
         if site_country:
             payload["site_country"] = site_country
+        payload.update(self.demographic_fields())
         return payload
 
     def post(

{willisapi_client-1.9.9 → willisapi_client-2.0}/willisapi_client.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
-Name: willisapi-client
-Version: 1.9.9
+Metadata-Version: 2.4
+Name: willisapi_client
+Version: 2.0
 Summary: A Python client for willisapi
 Home-page: https://github.com/bklynhlth/willsiapi_client
 Author: bklynhlth
@@ -9,6 +9,39 @@ License: Apache
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: aiohttp==3.9.0
+Requires-Dist: aiosignal==1.3.1
+Requires-Dist: async-timeout==4.0.2
+Requires-Dist: asyncio==3.4.3
+Requires-Dist: attrs==23.1.0
+Requires-Dist: certifi==2023.7.22
+Requires-Dist: charset-normalizer==3.2.0
+Requires-Dist: frozenlist==1.4.0
+Requires-Dist: idna==3.4
+Requires-Dist: multidict==6.0.4
+Requires-Dist: nest-asyncio==1.5.7
+Requires-Dist: numpy==1.25.2
+Requires-Dist: pandas==2.0.3
+Requires-Dist: pytest==7.4.0
+Requires-Dist: pytest-cov==4.1.0
+Requires-Dist: python-dateutil==2.8.2
+Requires-Dist: pytz==2023.3
+Requires-Dist: requests==2.31.0
+Requires-Dist: six==1.16.0
+Requires-Dist: tqdm==4.66.1
+Requires-Dist: tzdata==2023.3
+Requires-Dist: urllib3==2.0.7
+Requires-Dist: yarl==1.9.2
+Dynamic: author
+Dynamic: author-email
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 <!-- Output copied to clipboard! -->