brynq-sdk-bob 2.7.0__tar.gz → 2.8.1__tar.gz

{brynq_sdk_bob-2.7.0 → brynq_sdk_bob-2.8.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: brynq_sdk_bob
-Version: 2.7.0
+Version: 2.8.1
 Summary: Bob wrapper from BrynQ
 Home-page: UNKNOWN
 Author: BrynQ

{brynq_sdk_bob-2.7.0 → brynq_sdk_bob-2.8.1}/brynq_sdk_bob/people.py

@@ -51,6 +51,17 @@ class People:
         # Normalize separators in incoming data: convert '/' to '.' to match schema aliases
         df.columns = df.columns.str.replace('/', '.', regex=False)
 
+        # format custom columns in the same way as they were in the schema/request body. (e.g. '.table.custom.123123123.value' -> 'table.custom.123123123')
+        custom_cols = [col for col in df.columns if "custom" in str(col)]
+        prefix = r'\.'
+        suffix = r'\.value'
+        df = df.rename(
+            columns={
+                col: col.removeprefix(prefix).removesuffix(suffix)
+                for col in custom_cols
+            }        )
+
+
         # A lot of fields from Bob are returned with only ID's. Those fields should be mapped to names. Therefore, we need to get the mapping from the named-lists endpoint.
         resp_named_lists = self.bob.session.get(url=f"{self.bob.base_url}company/named-lists", timeout=self.bob.timeout, headers=self.bob.headers)
         named_lists = resp_named_lists.json()
@@ -69,7 +80,10 @@ class People:
 
 
         if schema_custom_fields is not None:
+
             valid_people, invalid_people_custom = Functions.validate_data(df=df, schema=schema_custom_fields, debug=True)
+
+
         else:
             valid_people = df
             invalid_people_custom = pd.DataFrame()

{brynq_sdk_bob-2.7.0 → brynq_sdk_bob-2.8.1}/brynq_sdk_bob/reports.py

@@ -1,14 +1,16 @@
 from datetime import datetime
 from io import BytesIO
-from typing import Optional
+from typing import Optional, TYPE_CHECKING
 
 import pandas as pd
 from brynq_sdk_functions import Functions
+if TYPE_CHECKING:
+    from brynq_sdk_bob import Bob
 
 
 class Reports:
     def __init__(self, bob):
-        self.bob = bob
+        self.bob: Bob = bob
 
     def get(self) -> pd.DataFrame:
         resp = self.bob.session.get(url=f"{self.bob.base_url}company/reports", timeout=self.bob.timeout)
@@ -23,16 +25,14 @@ class Reports:
 
         return df
 
-    def download(self, report_id: Optional[str] = None, report_name: Optional[str] = None) -> dict:
+    def download(self, report_id: int | str = None) -> bytes:
         if report_id:
-            url = f"{self.bob.base_url}company/reports/{report_id}"
-        elif report_name:
-            url = f"{self.bob.base_url}company/reports/download/{report_name}"
+            url = f"{self.bob.base_url}company/reports/{report_id}/download"
         else:
             raise ValueError("Either report_id or report_name must be provided")
 
-        resp = self.bob.session.get(url=url, timeout=self.bob.timeout)
+        resp = self.bob.session.get(url=url, timeout=self.bob.timeout, params={"format": "csv"})
         resp.raise_for_status()
-        data = resp.json()
+        data = resp.content
 
         return data

{brynq_sdk_bob-2.7.0 → brynq_sdk_bob-2.8.1}/brynq_sdk_bob.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: brynq-sdk-bob
-Version: 2.7.0
+Version: 2.8.1
 Summary: Bob wrapper from BrynQ
 Home-page: UNKNOWN
 Author: BrynQ

{brynq_sdk_bob-2.7.0 → brynq_sdk_bob-2.8.1}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_namespace_packages
 
 setup(
     name='brynq_sdk_bob',
-    version='2.7.0',
+    version='2.8.1',
     description='Bob wrapper from BrynQ',
     long_description='Bob wrapper from BrynQ',
     author='BrynQ',