brynq-sdk-bob 2.6.6__tar.gz → 2.6.8__tar.gz

{brynq_sdk_bob-2.6.6 → brynq_sdk_bob-2.6.8}/PKG-INFO

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

{brynq_sdk_bob-2.6.6 → brynq_sdk_bob-2.6.8}/brynq_sdk_bob/__init__.py

@@ -1,11 +1,8 @@
 import base64
-import re
-from typing import Union, List, Optional, Literal
-import pandas as pd
+from typing import List, Optional, Literal
 import requests
 import os
 from brynq_sdk_brynq import BrynQ
-from brynq_sdk_functions import Functions
 from .bank import Bank
 from .company import Company
 from .documents import CustomDocuments
@@ -17,6 +14,7 @@ from .salaries import Salaries
 from .timeoff import TimeOff
 from .work import Work
 from .custom_tables import CustomTables
+from .payroll_history import History
 
 class Bob(BrynQ):
     def __init__(self, system_type: Optional[Literal['source', 'target']] = None, test_environment: bool = True, debug: bool = False, target_system: str = None):
@@ -40,6 +38,7 @@ class Bob(BrynQ):
         self.companies = Company(self)
         self.named_lists = NamedLists(self)
         self.custom_tables = CustomTables(self)
+        self.payroll_history = History(self)
         self.data_interface_id = os.getenv("DATA_INTERFACE_ID")
         self.debug = debug
 

{brynq_sdk_bob-2.6.6 → brynq_sdk_bob-2.6.8}/brynq_sdk_bob/people.py

@@ -1,4 +1,5 @@
 import pandas as pd
+import re
 from typing import Optional
 from brynq_sdk_functions import Functions
 from brynq_sdk_functions import BrynQPanderaDataFrameModel
@@ -21,6 +22,7 @@ class People:
         self.schema = PeopleSchema
 
 
+
         # Build API fields using column metadata if present (api_field), otherwise use the column (alias) name
     def __build_api_fields(self, schema_model: BrynQPanderaDataFrameModel) -> list[str]:
         schema = schema_model.to_schema()
@@ -74,6 +76,30 @@ class People:
 
 
         valid_people, invalid_people = Functions.validate_data(df=valid_people, schema=PeopleSchema, debug=True)
-        valid_people = valid_people.loc[:, ~valid_people.columns.str.contains(r'\.value|_get')]
 
+        # For columns ending with .value.value, use fillna to fill the corresponding base column since that's not done automatically
+        def _normalize_key(key: str) -> str:
+            # Build mapping from custom schema alias (API path) to the real column name used after validation
+            key = key.lstrip('.')
+            key = key.replace('/', '.')
+            key = key.replace('.', '_')
+            key = re.sub(r'(?<!^)([A-Z])', r'_\1', key).lower()
+            return key
+
+        alias_to_real: dict = {}
+        if schema_custom_fields is not None:
+            alias_map = getattr(schema_custom_fields, "_alias_map", {})  # real_name -> alias
+            alias_to_real = {_normalize_key(alias): real for real, alias in alias_map.items()}
+
+        for col in valid_people.columns:
+            if col.endswith('value.value'):
+                # Compute the base alias (remove suffix), normalise, and resolve to real column name via custom schema
+                base_alias = col[:-12]
+                target_key = _normalize_key(base_alias)
+                target_col = alias_to_real.get(target_key, target_key)
+                if target_col in valid_people.columns:
+                    valid_people[target_col] = valid_people[target_col].fillna(valid_people[col])
+
+        # Remove columns that contain '.value' or '_get'
+        valid_people = valid_people.loc[:, ~valid_people.columns.str.contains(r'\.value|_get')]
         return valid_people, pd.concat([invalid_people, invalid_people_custom])

{brynq_sdk_bob-2.6.6 → brynq_sdk_bob-2.6.8}/brynq_sdk_bob/schemas/people.py

@@ -220,10 +220,16 @@ class PeopleSchema(BrynQPanderaDataFrameModel):
     payroll_employment_weekly_hours: Optional[Series[Float]] = pa.Field(coerce=True, nullable=True, description="Weekly Hours", alias="payroll.employment.weeklyHours")
 
     # Salary information
-    payroll_salary_monthly_payment: Optional[Series[Float]] = pa.Field(coerce=True, nullable=True, description="Base salary (monthly_", alias="payroll.salary.monthlyPayment")
+    # SOLUTION NOW FOR MFT: TODO: FIX UNNESTING (including .value.value)
+    payroll_salary_monthly_get: Optional[Series[str]] = pa.Field(coerce=True, nullable=True, description="Base salary (monthly), used for getting nested json", alias="payroll.salary.monthlyPayment")
+    payroll_salary_monthly_payment: Optional[Series[Float]] = pa.Field(coerce=True, nullable=True, description="Base salary (monthly)", alias="payroll.salary.monthlyPayment.value")
+    payroll_salary_monthly_payment_currency: Optional[Series[str]] = pa.Field(coerce=True, nullable=True, description="Base salary (monthly) currency", alias="payroll.salary.monthlyPayment.currency")
+
     payroll_salary_yearly_get: Optional[Series[str]] = pa.Field(coerce=True, nullable=True, description="Base salary (yearly), used for getting nested json", alias="payroll.salary.yearlyPayment")
     payroll_salary_yearly_payment: Optional[Series[Float]] = pa.Field(coerce=True, nullable=True, description="Base salary (yearly)", alias="payroll.salary.yearlyPayment.value")
-    payroll_salary_yearly_payment_currency: Optional[Series[str]] = pa.Field(coerce=True, nullable=True, description="Base salary (yearly)", alias="payroll.salary.yearlyPayment.currency")
+    payroll_salary_yearly_payment_currency: Optional[Series[str]] = pa.Field(coerce=True, nullable=True, description="Base salary (yearly) currency", alias="payroll.salary.yearlyPayment.currency")
+
+    payroll_salary_active_effective_date: Optional[Series[str]] = pa.Field(coerce=True, nullable=True, description="effective date payment", alias="payroll.salary.activeEffectiveDate")
     payroll_salary_payment: Optional[Series[Float]] = pa.Field(coerce=True, nullable=True, description="Base Salary", alias="payroll.salary.payment")
 
     # Emergency contact

{brynq_sdk_bob-2.6.6 → brynq_sdk_bob-2.6.8}/brynq_sdk_bob.egg-info/PKG-INFO

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

{brynq_sdk_bob-2.6.6 → brynq_sdk_bob-2.6.8}/setup.py

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