brynq-sdk-bob 2.6.2.dev13__py3-none-any.whl → 2.8.2__py3-none-any.whl

brynq_sdk_bob/__init__.py

@@ -1,11 +1,9 @@
 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 .reports import Reports
 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 +15,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,15 +39,13 @@ class Bob(BrynQ):
         self.companies = Company(self)
         self.named_lists = NamedLists(self)
         self.custom_tables = CustomTables(self)
+        self.payroll_history = History(self)
+        self.reports = Reports(self)
         self.data_interface_id = os.getenv("DATA_INTERFACE_ID")
         self.debug = debug
 
     def _get_request_headers(self, system_type):
         credentials = self.interfaces.credentials.get(system='bob', system_type=system_type)
-        if type(credentials) is list:
-            credentials = credentials[0]
-
-        print(credentials)
         auth_token = base64.b64encode(f"{credentials.get('data').get('User ID')}:{credentials.get('data').get('API Token')}".encode()).decode('utf-8')
         headers = {
             "accept": "application/json",

brynq_sdk_bob/bank.py

@@ -2,35 +2,23 @@ import pandas as pd
 from brynq_sdk_functions import Functions
 from .schemas.bank import BankSchema
 
-import time
-from tqdm import tqdm
-from tenacity import retry, stop_after_delay, wait_exponential
 
 class Bank:
     def __init__(self, bob):
         self.bob = bob
         self.schema = BankSchema
 
-    @retry(stop=stop_after_delay(120), wait=wait_exponential(multiplier=1, min=1, max=10))
-    def _get_bank_accounts(self, person_id: str):
-        """Fetch bank accounts for a person with retry logic (max 2 minutes)."""
-        resp = self.bob.session.get(url=f"{self.bob.base_url}people/{person_id}/bank-accounts", timeout=self.bob.timeout)
-        resp.raise_for_status()
-        return resp
-
     def get(self, person_ids: pd.Series, field_selection: list[str] = []) -> (pd.DataFrame, pd.DataFrame):
         data = []
-        for person_id in tqdm(person_ids, desc="Fetching bank accounts"):
-            resp = self._get_bank_accounts(person_id)
+        for person_id in person_ids:
+            resp = self.bob.session.get(url=f"{self.bob.base_url}people/{person_id}/bank-accounts", timeout=self.bob.timeout)
+            resp.raise_for_status()
             temp_data = resp.json()['values']
             # when an employee has one or more bank accounts, the response is a list of dictionaries.
             for account in temp_data:
                 account['employee_id'] = person_id
             data += temp_data
 
-            # rate limit is 50 per minute
-            time.sleep(1.3)
-
         df = pd.DataFrame(data)
 
         valid_banks, invalid_banks = Functions.validate_data(df=df, schema=BankSchema, debug=True)

brynq_sdk_bob/employment.py

@@ -1,9 +1,7 @@
 import pandas as pd
 import requests
-
-from brynq_sdk_functions import Functions
-
 from .schemas.employment import EmploymentSchema
+from brynq_sdk_functions import Functions
 
 
 class Employment:

brynq_sdk_bob/payments.py

@@ -1,12 +1,7 @@
-import time
-from typing import List, Optional
-
 import pandas as pd
-from tqdm import tqdm
-
+from typing import Optional, List
 from brynq_sdk_functions import Functions
-
-from .schemas.payments import ActualPaymentsSchema, VariablePaymentSchema
+from .schemas.payments import VariablePaymentSchema, ActualPaymentsSchema
 
 
 class Payments:
@@ -14,43 +9,9 @@ class Payments:
         self.bob = bob
         self.schema = VariablePaymentSchema
 
-    def _apply_named_list_mappings(self, df: pd.DataFrame) -> pd.DataFrame:
-        """Apply named list ID-to-value mappings to dataframe columns."""
-        if df.empty:
-            return df
-
-        # Fetch named lists from Bob API
-        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()
-
-        # Transform named_lists to create id-to-value mappings for each field
-        named_lists = {
-            key.split('.')[-1]: {item['id']: item['value'] for item in value['values']}
-            for key, value in named_lists.items()
-        }
-
-        # rename payrollVariableType to variableType in named lists
-        named_lists['variableType'] = named_lists['payrollVariableType']
-
-        for field in df.columns:
-            # Fields in the response and in the named-list have different building blocks
-            # but they both end with the same last block
-            field_df = field.split('.')[-1].split('work_')[-1]
-            if field_df in named_lists.keys() and field_df not in ['site']:
-                mapping = named_lists[field_df]
-                df[field] = df[field].apply(
-                    lambda v: [mapping.get(x, x) for x in v] if isinstance(v, list) else mapping.get(v, v)
-                )
-
-        return df
-
     def get(self, person_ids: List[str]) -> (pd.DataFrame, pd.DataFrame):
         df = pd.DataFrame()
-        for person_id in tqdm(person_ids, desc="Fetching variable payments"):
+        for person_id in person_ids:
             resp = self.bob.session.get(url=f"{self.bob.base_url}people/{person_id}/variable", timeout=self.bob.timeout)
             resp.raise_for_status()
             data = resp.json()
@@ -59,15 +20,7 @@ class Payments:
                 record_path='values'
             )])
             df['employee_id'] = person_id
-
-            # Rate limit is 50 per minute
-            time.sleep(1.3)
-
         df = df.reset_index(drop=True)
-
-        # Apply named list mappings
-        df = self._apply_named_list_mappings(df)
-
         valid_payments, invalid_payments = Functions.validate_data(df=df, schema=self.schema, debug=True)
         return valid_payments, invalid_payments
 
@@ -154,9 +107,6 @@ class Payments:
 
         df = pd.json_normalize(all_results)
 
-        # Apply named list mappings
-        df = self._apply_named_list_mappings(df)
-
         valid_payments, invalid_payments = Functions.validate_data(
             df=df,
             schema=ActualPaymentsSchema,

brynq_sdk_bob/people.py

@@ -1,15 +1,14 @@
-from typing import List, Optional
-
 import pandas as pd
-
-from brynq_sdk_functions import BrynQPanderaDataFrameModel, Functions
-
+import re
+from typing import Optional
+from brynq_sdk_functions import Functions
+from brynq_sdk_functions import BrynQPanderaDataFrameModel
 from .bank import Bank
-from .custom_tables import CustomTables
 from .employment import Employment
 from .salaries import Salaries
 from .schemas.people import PeopleSchema
 from .work import Work
+from .custom_tables import CustomTables
 
 
 class People:
@@ -23,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()
@@ -31,78 +31,96 @@ class People:
             for col_name, col in schema.columns.items()
         ]
 
-    def get(self, schema_custom_fields: Optional[BrynQPanderaDataFrameModel] = None, employee_ids: Optional[List[str]] = None, show_inactive: bool = False) -> pd.DataFrame:
+    def get(self, schema_custom_fields: Optional[BrynQPanderaDataFrameModel] = None) -> pd.DataFrame:
+
         core_fields = self.__build_api_fields(PeopleSchema)
         custom_fields = self.__build_api_fields(schema_custom_fields) if schema_custom_fields is not None else []
         fields = core_fields + custom_fields
 
-        # Build filters based on employee_ids if provided
-        filters = []
-        if employee_ids is not None:
-            filters = [
-                {
-                    "fieldPath": "root.id",
-                    "operator": "equals",
-                    "values": employee_ids
-                }
-            ]
-
         resp = self.bob.session.post(url=f"{self.bob.base_url}people/search",
                                       json={
                                           "fields": fields,
-                                          "filters": filters,
-                                          "showInactive": show_inactive,
+                                          "filters": []
                                           #"humanReadable": "REPLACE"
                                       },
                                       timeout=self.bob.timeout)
         resp.raise_for_status()
         df = pd.json_normalize(resp.json()['employees'])
-        if df.empty and employee_ids is not None and resp.status_code == 200:
-            raise Exception(f"No employees found in HiBob for employee_ids: {employee_ids}")
 
-        df = df.loc[:, ~df.columns.str.contains('value')]
 
         # Normalize separators in incoming data: convert '/' to '.' to match schema aliases
         df.columns = df.columns.str.replace('/', '.', regex=False)
 
+
+        # Clean up custom .value columns; keeps only one field per custom key. the .value column actually contains the value., other column is nested key.
+        custom_cols = [col for col in df.columns if "custom" in str(col) and str(col).endswith('.value')]
+        for col in custom_cols:
+            new_col = col.removesuffix('.value')
+            # prefer non-empty clean column, otherwise upgrade .value data
+            if new_col not in df.columns:
+                df = df.rename(columns={col: new_col})
+            elif df[new_col].isna().all() and not df[col].isna().all():
+                df[new_col] = df[col]
+                df = df.drop(columns=[col])
+            else:
+                # Drop identical/redundant .value col
+                if df[new_col].equals(df[col]):
+                    df = df.drop(columns=[col])
+                pass
+
+
         # 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()
-        # save json to file
-        # import json
-        # with open('named_lists.json', 'w') as f:
-        #     json.dump(named_lists, f, indent=4)
 
         # Transform named_lists to create id-to-value mappings for each field
         named_lists = {key.split('.')[-1]: {item['id']: item['value'] for item in value['values']} for key, value in named_lists.items()}
 
-        deviating_named_list_cols_mapping = {
-            'payroll.employment.actualWorkingPattern.workingPatternId': 'workingPattern_entity_list',
-            'payroll.employment.type': 'payrollEmploymentType',
-            'home.familyStatus': 'familystatus',
-            'personal.nationality': 'nationalities',
-            'internal.terminationReason': 'terminationreason',
-        }
-
         for field in df.columns:
             # Fields in the response and in the named-list does have different building blocks (e.g. people.payroll.entitlement. or people.entitlement.). But they both end with the same last block
             field_df = field.split('.')[-1].split('work_')[-1]
-
-            # Check if this field has a deviating mapping
-            named_list_key = deviating_named_list_cols_mapping.get(field, field_df)
-
-            if named_list_key in named_lists.keys() and named_list_key not in ['site']:
-                mapping = named_lists[named_list_key]
+            if field_df in named_lists.keys() and field_df not in ['site']:
+                mapping = named_lists[field_df]
                 df[field] = df[field].apply(
                     lambda v: [mapping.get(x, x) for x in v] if isinstance(v, list) else mapping.get(v, v)
                 )
 
+
         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()
 
+
         valid_people, invalid_people = Functions.validate_data(df=valid_people, schema=PeopleSchema, debug=True)
 
+        # 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/reports.py

@@ -0,0 +1,38 @@
+from datetime import datetime
+from io import BytesIO
+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 = bob
+
+    def get(self) -> pd.DataFrame:
+        resp = self.bob.session.get(url=f"{self.bob.base_url}company/reports", timeout=self.bob.timeout)
+        resp.raise_for_status()
+        data = resp.json()
+        df = pd.json_normalize(
+            data,
+            record_path='views'
+        )
+        # df = self.bob.rename_camel_columns_to_snake_case(df)
+        # valid_documents, invalid_documents = Functions.validate_data(df=df, schema=DocumentsSchema, debug=True)
+
+        return df
+
+    def download(self, report_id: int | str = None) -> bytes:
+        if report_id:
+            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, params={"format": "csv"})
+        resp.raise_for_status()
+        data = resp.content
+
+        return data

brynq_sdk_bob/salaries.py

@@ -1,6 +1,5 @@
 import pandas as pd
 import requests
-from typing import Optional, List
 from brynq_sdk_functions import Functions
 from .schemas.salary import SalarySchema, SalaryCreateSchema
 
@@ -10,16 +9,10 @@ class Salaries:
         self.bob = bob
         self.schema = SalarySchema
 
-    def get(self, employee_ids: Optional[List[str]] = None) -> tuple[pd.DataFrame, pd.DataFrame]:
-        params = {"limit": 100}
-
-        # Add employeeIds filter if provided
-        if employee_ids is not None:
-            params["employeeIds"] = ",".join(employee_ids)
-
+    def get(self) -> tuple[pd.DataFrame, pd.DataFrame]:
         request = requests.Request(method='GET',
                                    url=f"{self.bob.base_url}bulk/people/salaries",
-                                   params=params)
+                                   params={"limit": 100})
         data = self.bob.get_paginated_result(request)
         df = pd.json_normalize(
             data,

brynq_sdk_bob/schemas/bank.py

@@ -1,5 +1,4 @@
 import pandera as pa
-from typing import Optional
 from pandera.typing import Series, String
 import pandas as pd
 from brynq_sdk_functions import BrynQPanderaDataFrameModel
@@ -7,19 +6,19 @@ from brynq_sdk_functions import BrynQPanderaDataFrameModel
 
 class BankSchema(BrynQPanderaDataFrameModel):
     id: Series[pd.Int64Dtype] = pa.Field(coerce=True, description="Bank ID", alias="id")
-    employee_id: Series[String] = pa.Field(coerce=True, description="Employee ID", alias="employee_id")
-    amount: Optional[Series[pd.Int64Dtype]] = pa.Field(coerce=True, description="Amount", alias="amount")
-    allocation: Optional[Series[String]] = pa.Field(coerce=True, nullable=True, description="Allocation", alias="allocation")
-    branch_address: Optional[Series[String]] = pa.Field(coerce=True, nullable=True, description="Branch Address", alias="branchAddress")
+    employee_id: Series[String] = pa.Field(coerce=True, description="Employee ID", alias="employeeId")
+    amount: Series[pd.Int64Dtype] = pa.Field(coerce=True, description="Amount", alias="amount")
+    allocation: Series[String] = pa.Field(coerce=True, nullable=True, description="Allocation", alias="allocation")
+    branch_address: Series[String] = pa.Field(coerce=True, nullable=True, description="Branch Address", alias="branchAddress")
     bank_name: Series[String] = pa.Field(coerce=True, nullable=True, description="Bank Name", alias="bankName")
     account_number: Series[String] = pa.Field(coerce=True, nullable=True, description="Account Number", alias="accountNumber")
-    routing_number: Optional[Series[String]] = pa.Field(coerce=True, nullable=True, description="Routing Number", alias="routingNumber")
+    routing_number: Series[String] = pa.Field(coerce=True, nullable=True, description="Routing Number", alias="routingNumber")
     bank_account_type: Series[String] = pa.Field(coerce=True, nullable=True, description="Bank Account Type", alias="bankAccountType")
-    bic_or_swift: Optional[Series[String]] = pa.Field(coerce=True, nullable=True, description="BIC or SWIFT", alias="bicOrSwift")
+    bic_or_swift: Series[String] = pa.Field(coerce=True, nullable=True, description="BIC or SWIFT", alias="bicOrSwift")
     changed_by: Series[String] = pa.Field(coerce=True, nullable=True, description="Changed By", alias="changedBy")
     iban: Series[String] = pa.Field(coerce=True, description="IBAN", alias="iban")
     account_nickname: Series[String] = pa.Field(coerce=True, nullable=True, description="Account Nickname", alias="accountNickname")
-    use_for_bonus: Optional[Series[pd.BooleanDtype]] = pa.Field(coerce=True, nullable=True, description="Use for Bonus", alias="useForBonus")
+    use_for_bonus: Series[pd.BooleanDtype] = pa.Field(coerce=True, nullable=True, description="Use for Bonus", alias="useForBonus")
 
     class Config:
         coerce = True

brynq_sdk_bob/schemas/employment.py

@@ -6,7 +6,7 @@ from brynq_sdk_functions import BrynQPanderaDataFrameModel
 
 class EmploymentSchema(BrynQPanderaDataFrameModel):
     id: Series[pd.Int64Dtype] = pa.Field(coerce=True, description="Employment ID", alias="id")
-    employee_id: Series[pd.Int64Dtype] = pa.Field(coerce=True, description="Employee ID", alias="employeeId")
+    employee_id: Series[String] = pa.Field(coerce=True, description="Employee ID", alias="employeeId")
     active_effective_date: Series[DateTime] = pa.Field(coerce=True, description="Active Effective Date", alias="activeEffectiveDate")
     contract: Series[String] = pa.Field(coerce=True, nullable=True, description="Contract", alias="contract") # has a list of possible values
     creation_date: Series[DateTime] = pa.Field(coerce=True, nullable=True, description="Creation Date", alias="creationDate")

brynq_sdk_bob/schemas/payments.py

@@ -38,8 +38,8 @@ class ActualPaymentsSchema(BrynQPanderaDataFrameModel):
     pay_type: Series[String] = pa.Field(coerce=True, description="Pay Type", alias="payType")
     amount_value: Series[Float] = pa.Field(coerce=True, description="Amount Value", alias="amount.value")
     amount_currency: Series[String] = pa.Field(coerce=True, description="Amount Currency", alias="amount.currency")
-    # change_reason: Series[String] = pa.Field(nullable=True, coerce=True, description="Change Reason", alias="change.reason")
-    # change_changed_by: Series[String] = pa.Field(nullable=True, coerce=True, description="Change Changed By", alias="change.changedBy")
+    change_reason: Series[String] = pa.Field(nullable=True, coerce=True, description="Change Reason", alias="change.reason")
+    change_changed_by: Series[String] = pa.Field(nullable=True, coerce=True, description="Change Changed By", alias="change.changedBy")
     change_changed_by_id: Series[String] = pa.Field(nullable=True, coerce=True, description="Change Changed By ID", alias="change.changedById")
 
     class Config:

brynq_sdk_bob/schemas/people.py

@@ -1,14 +1,13 @@
 from datetime import datetime
-from typing import Dict, List, Optional
+from typing import Optional, List, Dict
 
 import pandas as pd
 import pandera as pa
-import pandera.extensions as extensions
 from pandera import Bool
-from pandera.engines.pandas_engine import DateTime
-from pandera.typing import Float, Series, String
-
+from pandera.typing import Series, String, Float
+import pandera.extensions as extensions
 from brynq_sdk_functions import BrynQPanderaDataFrameModel
+from pandera.engines.pandas_engine import DateTime
 
 
 @extensions.register_check_method()
@@ -27,7 +26,7 @@ class PeopleSchema(BrynQPanderaDataFrameModel):
     first_name: Optional[Series[String]] = pa.Field(coerce=True, nullable=True, description="First Name", alias="firstName", metadata={"api_field": "root.firstName"})
     full_name: Optional[Series[String]] = pa.Field(coerce=True, nullable=True, description="Full Name", alias="fullName", metadata={"api_field": "root.fullName"})
     # the date is in DD/MM/YYYY format,
-    personal_birth_date: Optional[Series[DateTime]] = pa.Field(coerce=True, nullable=True, description="Personal Birth Date", alias="personal.birthDate") # , dtype_kwargs={"to_datetime_kwargs": {"format": "%d/%m/%Y"}}
+    personal_birth_date: Optional[Series[DateTime]] = pa.Field(coerce=True, nullable=False, description="Personal Birth Date", alias="personal.birthDate")
     personal_pronouns: Optional[Series[String]] = pa.Field(coerce=True, nullable=True, description="Personal Pronouns", alias="personal.pronouns")
     personal_honorific: Optional[Series[String]] = pa.Field(coerce=True, nullable=True, description="Personal Honorific", alias="personal.honorific")
     personal_nationality: Optional[Series[object]] = pa.Field(coerce=True, check_name=check_list, description="Personal Nationality", alias="personal.nationality")
@@ -41,10 +40,10 @@ class PeopleSchema(BrynQPanderaDataFrameModel):
     work_manager: Optional[Series[String]] = pa.Field(coerce=True, nullable=True, description="Work Manager", alias="work.manager")
     work_work_phone: Optional[Series[String]] = pa.Field(coerce=True, nullable=True, description="Work Work Phone", alias="work.workPhone")
     work_tenure_duration_period_i_s_o: Optional[Series[String]] = pa.Field(coerce=True, nullable=True, description="Work Tenure Duration Period ISO", alias="work.tenureDuration.periodISO")
-    work_tenure_duration_sort_factor: Optional[Series[pd.Int64Dtype]] = pa.Field(coerce=True, nullable=True, description="Work Tenure Duration Sort Factor", alias="work.tenureDuration.sortFactor")
+    work_tenure_duration_sort_factor: Optional[Series[pd.Int64Dtype]] = pa.Field(coerce=True, nullable=False, description="Work Tenure Duration Sort Factor", alias="work.tenureDuration.sortFactor")
     work_tenure_duration_humanize: Optional[Series[String]] = pa.Field(coerce=True, nullable=True, description="Work Tenure Duration Humanize", alias="work.tenureDuration.humanize")
     work_duration_of_employment_period_i_s_o: Optional[Series[String]] = pa.Field(coerce=True, nullable=True, description="Work Duration of Employment Period ISO", alias="work.durationOfEmployment.periodISO")
-    work_duration_of_employment_sort_factor: Optional[Series[String]] = pa.Field(coerce=True, nullable=True, description="Work Duration of Employment Sort Factor", alias="work.durationOfEmployment.sortFactor")
+    work_duration_of_employment_sort_factor: Optional[Series[String]] = pa.Field(coerce=True, nullable=False, description="Work Duration of Employment Sort Factor", alias="work.durationOfEmployment.sortFactor")
     work_duration_of_employment_humanize: Optional[Series[String]] = pa.Field(coerce=True, nullable=True, description="Work Duration of Employment Humanize", alias="work.durationOfEmployment.humanize")
     work_reports_to_id_in_company: Optional[Series[pd.Int64Dtype]] = pa.Field(coerce=True, nullable=True, description="Work Reports to ID in Company", alias="work.reportsToIdInCompany")
     work_employee_id_in_company: Optional[Series[pd.Int64Dtype]] = pa.Field(coerce=True, nullable=True, description="Work Employee ID in Company", alias="work.employeeIdInCompany")
@@ -203,7 +202,7 @@ class PeopleSchema(BrynQPanderaDataFrameModel):
     payroll_employment_actual_working_pattern_days_thursday: Optional[Series[float]] = pa.Field(coerce=True, nullable=True, description="Actual Working Pattern - Thursday", alias="payroll.employment.actualWorkingPattern.days.thursday")
     payroll_employment_actual_working_pattern_days_saturday: Optional[Series[float]] = pa.Field(coerce=True, nullable=True, description="Actual Working Pattern - Saturday", alias="payroll.employment.actualWorkingPattern.days.saturday")
     payroll_employment_actual_working_pattern_hours_per_day: Optional[Series[float]] = pa.Field(coerce=True, nullable=True, description="Actual Working Pattern - Hours Per Day", alias="payroll.employment.actualWorkingPattern.hoursPerDay")
-    payroll_employment_actual_working_pattern_working_pattern_id: Optional[Series[String]] = pa.Field(coerce=True, nullable=True, description="Actual Working Pattern - Working Pattern ID", alias="payroll.employment.actualWorkingPattern.workingPatternId")
+    payroll_employment_actual_working_pattern_working_pattern_id: Optional[Series[pd.Int64Dtype]] = pa.Field(coerce=True, nullable=True, description="Actual Working Pattern - Working Pattern ID", alias="payroll.employment.actualWorkingPattern.workingPatternId")
     payroll_employment_site_working_pattern_working_pattern_type: Optional[Series[String]] = pa.Field(coerce=True, nullable=True, description="Site Working Pattern - Working Pattern Type", alias="payroll.employment.siteWorkingPattern.workingPatternType")
     payroll_employment_site_working_pattern_days_sunday: Optional[Series[float]] = pa.Field(coerce=True, nullable=True, description="Site Working Pattern - Sunday", alias="payroll.employment.siteWorkingPattern.days.sunday")
     payroll_employment_site_working_pattern_days_tuesday: Optional[Series[float]] = pa.Field(coerce=True, nullable=True, description="Site Working Pattern - Tuesday", alias="payroll.employment.siteWorkingPattern.days.tuesday")
@@ -215,13 +214,24 @@ class PeopleSchema(BrynQPanderaDataFrameModel):
     payroll_employment_site_working_pattern_hours_per_day: Optional[Series[float]] = pa.Field(coerce=True, nullable=True, description="Site Working Pattern - Hours Per Day", alias="payroll.employment.siteWorkingPattern.hoursPerDay")
     payroll_employment_site_working_pattern_working_pattern_id: Optional[Series[pd.Int64Dtype]] = pa.Field(coerce=True, nullable=True, description="Site Working Pattern - Working Pattern ID", alias="payroll.employment.siteWorkingPattern.workingPatternId")
     payroll_employment_calendar_id: Optional[Series[String]] = pa.Field(coerce=True, nullable=True, description="Calendar ID", alias="payroll.employment.calendarId")
-
-
     payroll_employment_salary_pay_type: Optional[Series[String]] = pa.Field(coerce=True, nullable=True, description="Salary Pay Type", alias="payroll.employment.salaryPayType")
     payroll_employment_flsa_code: Optional[Series[String]] = pa.Field(coerce=True, nullable=True, description="FLSA Code", alias="payroll.employment.flsaCode")
     payroll_employment_fte: Optional[Series[Float]] = pa.Field(coerce=True, nullable=True, description="FTE %", alias="payroll.employment.fte")
     payroll_employment_weekly_hours: Optional[Series[Float]] = pa.Field(coerce=True, nullable=True, description="Weekly Hours", alias="payroll.employment.weeklyHours")
 
+    # Salary information
+    # 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) 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
     emergency_first_name: Optional[Series[String]] = pa.Field(coerce=True, nullable=True, description="Emergency First Name", alias="emergency.firstName")
     emergency_second_name: Optional[Series[String]] = pa.Field(coerce=True, nullable=True, description="Emergency Middle Name", alias="emergency.secondName")
@@ -277,7 +287,6 @@ class PeopleSchema(BrynQPanderaDataFrameModel):
     # Positions / Job profile
     employee_position_opening_id: Optional[Series[String]] = pa.Field(coerce=True, nullable=True, description="Position Opening ID", alias="employee.positionOpeningId")
     employee_job_profile_id: Optional[Series[String]] = pa.Field(coerce=True, nullable=True, description="Job Profile ID", alias="employee.jobProfileId")
-    employee_job_profile_code: Optional[Series[String]] = pa.Field(coerce=True, nullable=True, description="Job Profile Code", alias="employee.jobProfileCode")
     employee_recent_leave_start_date: Optional[Series[DateTime]] = pa.Field(coerce=True, nullable=True, description="Recent Leave Start Date", alias="employee.recentLeaveStartDate")
     employee_recent_leave_end_date: Optional[Series[DateTime]] = pa.Field(coerce=True, nullable=True, description="Recent Leave End Date", alias="employee.recentLeaveEndDate")
     employee_first_day_of_work: Optional[Series[DateTime]] = pa.Field(coerce=True, nullable=True, description="First Day Of Work", alias="employee.firstDayOfWork")

brynq_sdk_bob/schemas/salary.py

@@ -18,6 +18,7 @@ class SalarySchema(BrynQPanderaDataFrameModel):
     modification_date: Series[DateTime] = pa.Field(coerce=True, nullable=True, description="Modification Date", alias="modificationDate")
     effective_date: Series[DateTime] = pa.Field(coerce=True, description="Effective Date", alias="effectiveDate")
     end_effective_date: Series[DateTime] = pa.Field(coerce=True, nullable=True, description="End Effective Date", alias="endEffectiveDate")
+    change_reason: Series[str] = pa.Field(coerce=True, nullable=True, description="Change Reason", alias="change.reason")
     pay_period: Series[String] = pa.Field(coerce=True, nullable=True, description="Pay Period", alias="payPeriod")
     base_value: Series[Float] = pa.Field(coerce=True, nullable=True, description="Base Value", alias="base.value") #needs to become base.value?
     base_currency: Series[String] = pa.Field(coerce=True, nullable=True, description="Base Currency", alias="base.currency")

brynq_sdk_bob/schemas/timeoff.py

@@ -6,7 +6,7 @@ from brynq_sdk_functions import BrynQPanderaDataFrameModel
 
 class TimeOffSchema(BrynQPanderaDataFrameModel):
     change_type: Series[String] = pa.Field(coerce=True, description="Change Type", alias="changeType")
-    employee_id: Series[pd.Int64Dtype] = pa.Field(coerce=True, description="Employee ID", alias="employeeId")
+    employee_id: Series[String] = pa.Field(coerce=True, description="Employee ID", alias="employeeId")
     employee_display_name: Series[String] = pa.Field(coerce=True, description="Employee Display Name", alias="employeeDisplayName")
     employee_email: Series[String] = pa.Field(coerce=True, description="Employee Email", alias="employeeEmail")
     request_id: Series[pd.Int64Dtype] = pa.Field(coerce=True, description="Request ID", alias="requestId")

brynq_sdk_bob/schemas/work.py

@@ -18,6 +18,7 @@ class WorkSchema(BrynQPanderaDataFrameModel):
     active_effective_date: Series[datetime] = pa.Field(coerce=True, nullable=True, description="Active Effective Date", alias="activeEffectiveDate")
     department: Series[str] = pa.Field(coerce=True, nullable=True, description="Department", alias="department")
     effective_date: Series[datetime] = pa.Field(coerce=True, nullable=True, description="Effective Date", alias="effectiveDate")
+    change_reason: Series[str] = pa.Field(coerce=True, nullable=True, description="Change Reason", alias="change.reason")
     change_changed_by: Series[str] = pa.Field(coerce=True, nullable=True, description="Change Changed By", alias="change.changedBy")
     change_changed_by_id: Series[str] = pa.Field(coerce=True, nullable=True, description="Change Changed By ID", alias="change.changedById")
     reports_to_id: Series[str] = pa.Field(coerce=True, nullable=True, description="Reports To ID", alias="reportsTo.id")
@@ -25,6 +26,7 @@ class WorkSchema(BrynQPanderaDataFrameModel):
     reports_to_surname: Series[str] = pa.Field(coerce=True, nullable=True, description="Reports To Surname", alias="reportsTo.surname")
     reports_to_email: Series[str] = pa.Field(coerce=True, nullable=True, description="Reports To Email", alias="reportsTo.email")
     reports_to_display_name: Series[str] = pa.Field(coerce=True, nullable=True, description="Reports To Display Name", alias="reportsTo.displayName")
+    reports_to: Series[pd.Int64Dtype] = pa.Field(coerce=True, nullable=True, description="Reports To", alias="reportsTo")
     employee_id: Series[str] = pa.Field(coerce=True, description="Employee ID", alias="employeeId")
 
     class Config:

brynq_sdk_bob/work.py

@@ -1,6 +1,5 @@
 import pandas as pd
 import requests
-from typing import Optional, List
 from brynq_sdk_functions import Functions
 from .schemas.work import WorkSchema
 
@@ -10,38 +9,15 @@ class Work:
         self.bob = bob
         self.schema = WorkSchema
 
-    def _ensure_reports_to_columns(self, df: pd.DataFrame) -> pd.DataFrame:
-        reports_to_columns = [
-            'reportsTo.id',
-            'reportsTo.firstName',
-            'reportsTo.surname',
-            'reportsTo.email',
-            'reportsTo.displayName'
-        ]
-        
-        for col in reports_to_columns:
-            if col not in df.columns:
-                df[col] = pd.NA
-        
-        return df
-
-    def get(self, employee_ids: Optional[List[str]] = None) ->(pd.DataFrame, pd.DataFrame):
-        params = {"limit": 100}
-
-        # Add employeeIds filter if provided
-        if employee_ids is not None:
-            params["employeeIds"] = ",".join(employee_ids)
-
+    def get(self) ->(pd.DataFrame, pd.DataFrame):
         request = requests.Request(method='GET',
-                                   url=f"{self.bob.base_url}bulk/people/work",
-                                   params=params)
+                                   url=f"{self.bob.base_url}bulk/people/work")
         data = self.bob.get_paginated_result(request)
         df = pd.json_normalize(
             data,
             record_path='values',
             meta=['employeeId']
         )
-        df = self._ensure_reports_to_columns(df)
         valid_work, invalid_work = Functions.validate_data(df=df, schema=self.schema, debug=True)
 
         return valid_work, invalid_work

{brynq_sdk_bob-2.6.2.dev13.dist-info → brynq_sdk_bob-2.8.2.dist-info}/METADATA

@@ -1,13 +1,12 @@
 Metadata-Version: 2.4
 Name: brynq_sdk_bob
-Version: 2.6.2.dev13
+Version: 2.8.2
 Summary: Bob wrapper from BrynQ
 Author: BrynQ
 Author-email: support@brynq.com
 License: BrynQ License
 Requires-Dist: brynq-sdk-brynq<5,>=4
 Requires-Dist: pandas<3.0.0,>=2.2.0
-Requires-Dist: tenacity==8.2.3
 Dynamic: author
 Dynamic: author-email
 Dynamic: description

brynq_sdk_bob-2.8.2.dist-info/RECORD

@@ -0,0 +1,29 @@
+brynq_sdk_bob/__init__.py,sha256=M2y-juQ-GgzglQa0HvbWmeA9fBzv5L3MShHbTfb9rsk,3014
+brynq_sdk_bob/bank.py,sha256=zTdfe_qCZt2FB7SZbQ7njIDspwTinLFdbeH_xUby2FY,966
+brynq_sdk_bob/company.py,sha256=rjOpkm0CZ1EeJ-jddBl36GrGKUQviC1ca1aUL2tl1_M,848
+brynq_sdk_bob/custom_tables.py,sha256=MvnR2mIcyK0rpwd0P7xV3BPIvCYQVEClBvo901GttPs,2642
+brynq_sdk_bob/documents.py,sha256=ww101owiBGARCxOANdDtmWrNedSBe9V-BEed6QspQPg,1756
+brynq_sdk_bob/employment.py,sha256=uNllQrIBbo8yPG_2-ln1PWeWUFU672T289PpWWvL-V8,763
+brynq_sdk_bob/named_lists.py,sha256=ksLXV2ysBFegq4gZiiaC56gjkgdnPzL7WajZTGvjYIM,1069
+brynq_sdk_bob/payments.py,sha256=HVXoMyA0Jyhyk5EcgCU2OQfdbMtElhdLfdBKgI9xC4Q,3922
+brynq_sdk_bob/payroll_history.py,sha256=wHo6da7kLDe1ViL4egyMdyJBMZnWVhwjNjmh4cTCTeY,3972
+brynq_sdk_bob/people.py,sha256=t1A1dABX6UZ0pyLTGOL-Sp5pHY630KWIyIO3JQ_Pjdk,5970
+brynq_sdk_bob/reports.py,sha256=fiYzd6037siGl6c4KQLE7F4CeFRRDVDgSIVcWVVWsvI,1209
+brynq_sdk_bob/salaries.py,sha256=BGQm-PT9QuKKJ9DP5nX6wmC8SZRAlm9M9I2EJhoZaII,1523
+brynq_sdk_bob/timeoff.py,sha256=NbBZ39qy9D7jbS_z9bpmB-BKNuUGmNrkYTbEw034tZ0,3339
+brynq_sdk_bob/work.py,sha256=0bVZkQ0I6z-z2_ql-EsOpFExx8VgsJvpcCQdOfiJYQM,712
+brynq_sdk_bob/schemas/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+brynq_sdk_bob/schemas/bank.py,sha256=lDmXP4P8091N20fL2CmhPU2wFuaK60Z-p-dvYSNCMaQ,1846
+brynq_sdk_bob/schemas/custom_tables.py,sha256=638NH2n50vHzw1LFlbKVCBKBhfSsfGqtEGuor0Z-QS4,1567
+brynq_sdk_bob/schemas/employment.py,sha256=KUGbT8hjYuQIN-3BGlIrBBswXT6fSPkLtn5blT19xkY,3219
+brynq_sdk_bob/schemas/named_lists.py,sha256=HJBRKrAI2vhrkq-5MVXqQcmpGNzFtoOnaZI2Ii_6_vs,725
+brynq_sdk_bob/schemas/payments.py,sha256=LrSr8WApYxqbMDmhYmh0EISEbWJinWovsULZV6sItG0,4290
+brynq_sdk_bob/schemas/payroll_history.py,sha256=JdAq0XaArHHEw8EsXo3GD0EhSAyBhPtYQMmdvjCiY8g,806
+brynq_sdk_bob/schemas/people.py,sha256=Zs58mO4i8M-u-DLWRS0IHbyDNiwrhxSxOX8t3mLr2fw,40150
+brynq_sdk_bob/schemas/salary.py,sha256=TSaM1g92y3oiDcUrfJW7ushgKZenI9xB6XW3kKuU0dE,4540
+brynq_sdk_bob/schemas/timeoff.py,sha256=uswH42djiiWE2H0wXKHoneDvOJQ5BlaIeNdNl-kYd-s,4117
+brynq_sdk_bob/schemas/work.py,sha256=YgtBJ0WXJOq55bFlT_kY_IbHh0SlQEtaa0W8vms-xA4,3048
+brynq_sdk_bob-2.8.2.dist-info/METADATA,sha256=ulFwB84MiNowHTx0EF7zGUwi1OxfoZt2qMlJWXexwOA,371
+brynq_sdk_bob-2.8.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+brynq_sdk_bob-2.8.2.dist-info/top_level.txt,sha256=oGiWqOuAAiVoLIzGe6F-Lo4IJBYz5ftOwBft7HtPuoY,14
+brynq_sdk_bob-2.8.2.dist-info/RECORD,,

{brynq_sdk_bob-2.6.2.dev13.dist-info → brynq_sdk_bob-2.8.2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.10.2)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

brynq_sdk_bob-2.6.2.dev13.dist-info/RECORD

@@ -1,28 +0,0 @@
-brynq_sdk_bob/__init__.py,sha256=bw2Www_wgVxqZczJpz9K_94k7OdgqwWKF0aQaKG5TQE,3052
-brynq_sdk_bob/bank.py,sha256=5ncWsmeAvNoiLnVvIvPgFDRQ5DB5_VY2ipMC439GVHU,1460
-brynq_sdk_bob/company.py,sha256=rjOpkm0CZ1EeJ-jddBl36GrGKUQviC1ca1aUL2tl1_M,848
-brynq_sdk_bob/custom_tables.py,sha256=MvnR2mIcyK0rpwd0P7xV3BPIvCYQVEClBvo901GttPs,2642
-brynq_sdk_bob/documents.py,sha256=ww101owiBGARCxOANdDtmWrNedSBe9V-BEed6QspQPg,1756
-brynq_sdk_bob/employment.py,sha256=kBEKfUmKEw-A_FjC9fOuJqcsT7NxUKwXJs_V_-x9LbI,765
-brynq_sdk_bob/named_lists.py,sha256=ksLXV2ysBFegq4gZiiaC56gjkgdnPzL7WajZTGvjYIM,1069
-brynq_sdk_bob/payments.py,sha256=e1TnJcXlbotOfULukVUiaYZ1N-bDGynAtmPgpux7It0,5670
-brynq_sdk_bob/payroll_history.py,sha256=wHo6da7kLDe1ViL4egyMdyJBMZnWVhwjNjmh4cTCTeY,3972
-brynq_sdk_bob/people.py,sha256=6b7uCucl_xqtAq_4YJZU457fUY0qssMwfCCStzbNG0M,5036
-brynq_sdk_bob/salaries.py,sha256=8xq9XDTK473Az2MpuAPofz9CvZstjufSoWtF0bi1wC4,1766
-brynq_sdk_bob/timeoff.py,sha256=NbBZ39qy9D7jbS_z9bpmB-BKNuUGmNrkYTbEw034tZ0,3339
-brynq_sdk_bob/work.py,sha256=DzShGngMETPYP4TrMLm7pg6GmIft1rgBUZNyNFwxPsM,1488
-brynq_sdk_bob/schemas/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-brynq_sdk_bob/schemas/bank.py,sha256=Yfq-ouzcAyaqcZj5_lWLcaQgtLikI9zlcsHhsuPUQzY,1935
-brynq_sdk_bob/schemas/custom_tables.py,sha256=638NH2n50vHzw1LFlbKVCBKBhfSsfGqtEGuor0Z-QS4,1567
-brynq_sdk_bob/schemas/employment.py,sha256=uErbSyl8xYaYo5Hu0FZ7_tl1WCOaytcU9pjkIWJbmOo,3226
-brynq_sdk_bob/schemas/named_lists.py,sha256=HJBRKrAI2vhrkq-5MVXqQcmpGNzFtoOnaZI2Ii_6_vs,725
-brynq_sdk_bob/schemas/payments.py,sha256=LiFff0YwmgFi-6vHau1iuX2RZb42ZGX5keGL_Ai5Jlk,4294
-brynq_sdk_bob/schemas/payroll_history.py,sha256=JdAq0XaArHHEw8EsXo3GD0EhSAyBhPtYQMmdvjCiY8g,806
-brynq_sdk_bob/schemas/people.py,sha256=cy0mLKRdUhjOv52WB53AWd1XHn6mwrACGZAvK2ufsz4,38780
-brynq_sdk_bob/schemas/salary.py,sha256=7pq66_JfxmPbSWowX-25c-aKQvz3IGmoG5toRIq3H7g,4418
-brynq_sdk_bob/schemas/timeoff.py,sha256=BHImTTT4n8j7bF7T5Ue_B0WHmmj1_QTPV9TKAlHeBZM,4124
-brynq_sdk_bob/schemas/work.py,sha256=USjLR6vNhfCFb0Qul_A9cWru8wIzb370p5j1YxcDBFM,2804
-brynq_sdk_bob-2.6.2.dev13.dist-info/METADATA,sha256=fRJIgqWg-8uyqcNIhnBNrMOlwqdD3OXvf5sX-wRUyWY,408
-brynq_sdk_bob-2.6.2.dev13.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-brynq_sdk_bob-2.6.2.dev13.dist-info/top_level.txt,sha256=oGiWqOuAAiVoLIzGe6F-Lo4IJBYz5ftOwBft7HtPuoY,14
-brynq_sdk_bob-2.6.2.dev13.dist-info/RECORD,,