brynq-sdk-bob 2.6.0__tar.gz → 2.6.4__tar.gz

{brynq_sdk_bob-2.6.0 → brynq_sdk_bob-2.6.4}/PKG-INFO

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

{brynq_sdk_bob-2.6.0 → brynq_sdk_bob-2.6.4}/brynq_sdk_bob/custom_tables.py

@@ -29,7 +29,7 @@ class CustomTables:
             record_path=['values']
         )
 
-        df['employeeId'] = employee_id
+        df['employee_id'] = employee_id
         valid_data, invalid_data = Functions.validate_data(df=df, schema=self.schema, debug=True)
 
         return valid_data, invalid_data

{brynq_sdk_bob-2.6.0 → brynq_sdk_bob-2.6.4}/brynq_sdk_bob/payments.py

@@ -9,17 +9,19 @@ class Payments:
         self.bob = bob
         self.schema = VariablePaymentSchema
 
-    def get(self, person_id: str) -> (pd.DataFrame, pd.DataFrame):
-        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()
-        df = pd.json_normalize(
-            data,
-            record_path='values'
-        )
-        df['employee_id'] = person_id
+    def get(self, person_ids: List[str]) -> (pd.DataFrame, pd.DataFrame):
+        df = pd.DataFrame()
+        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()
+            df = pd.concat([df, pd.json_normalize(
+                data,
+                record_path='values'
+            )])
+            df['employee_id'] = person_id
+        df = df.reset_index(drop=True)
         valid_payments, invalid_payments = Functions.validate_data(df=df, schema=self.schema, debug=True)
-
         return valid_payments, invalid_payments
 
     def get_actual_payments(

{brynq_sdk_bob-2.6.0 → brynq_sdk_bob-2.6.4}/brynq_sdk_bob/people.py

@@ -45,9 +45,27 @@ class People:
         resp.raise_for_status()
         df = pd.json_normalize(resp.json()['employees'])
         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)
 
+        # 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()
+
+        # 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()}
+
+        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]
+            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:

{brynq_sdk_bob-2.6.0 → brynq_sdk_bob-2.6.4}/brynq_sdk_bob/schemas/people.py

@@ -26,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=False, 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")
@@ -106,7 +106,7 @@ class PeopleSchema(BrynQPanderaDataFrameModel):
     internal_termination_date: Optional[Series[DateTime]] = pa.Field(coerce=True, nullable=True, description="Internal Termination Date", alias="internal.terminationDate")
     internal_termination_type: Optional[Series[String]] = pa.Field(coerce=True, nullable=True, description="Internal Termination Type", alias="internal.terminationType")
     employee_last_day_of_work: Optional[Series[DateTime]] = pa.Field(coerce=True, nullable=True, description="Employee Last Day of Work", alias="employee.lastDayOfWork")
-    financial_iban: Series[String] = pa.Field(coerce=True, nullable=True, alias='financial.iban')
+    financial_iban: Optional[Series[String]] = pa.Field(coerce=True, nullable=True, alias='financial.iban')
     employee_band_effective_date_ote: Optional[Series[DateTime]] = pa.Field(coerce=True, nullable=True, description="Employee Band Effective Date OTE", alias="employee.band_effectiveDate_ote")
     employee_band_site_ote: Optional[Series[object]] = pa.Field(coerce=True, nullable=True, check_name=check_list, description="Employee Band Site OTE", alias="employee.band_site_ote")
     employee_band_min_ote: Optional[Series[Float]] = pa.Field(coerce=True, nullable=True, description="Employee Band Min OTE", alias="employee.band_min_ote")
@@ -214,13 +214,16 @@ 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
+    payroll_salary_monthly_payment: Optional[Series[Float]] = pa.Field(coerce=True, nullable=True, description="Base salary (monthly_", alias="payroll.salary.monthlyPayment")
+    payroll_salary_yearly_payment: Optional[Series[Float]] = pa.Field(coerce=True, nullable=True, description="Base salary (yearly)", alias="payroll.salary.yearlyPayment")
+    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")

{brynq_sdk_bob-2.6.0 → brynq_sdk_bob-2.6.4}/brynq_sdk_bob/schemas/timeoff.py

@@ -12,19 +12,19 @@ class TimeOffSchema(BrynQPanderaDataFrameModel):
     request_id: Series[pd.Int64Dtype] = pa.Field(coerce=True, description="Request ID", alias="requestId")
     policy_type_display_name: Series[String] = pa.Field(coerce=True, description="Policy Type Display Name", alias="policyTypeDisplayName")
     type: Series[String] = pa.Field(coerce=True, description="Type", alias="type")
-    start_date: Series[String] = pa.Field(coerce=True, description="Start Date", alias="startDate")
-    start_portion: Series[String] = pa.Field(coerce=True, description="Start Portion", alias="startPortion")
-    end_date: Series[String] = pa.Field(coerce=True, description="End Date", alias="endDate")
-    end_portion: Series[String] = pa.Field(coerce=True, description="End Portion", alias="endPortion")
-    day_portion: Optional[Series[String]] = pa.Field(coerce=True, description="Day Portion", alias="dayPortion")
-    date: Optional[Series[String]] = pa.Field(coerce=True, description="Date", alias="date")
-    hours_on_date: Optional[Series[Float]] = pa.Field(coerce=True, description="Hours on Date", alias="hoursOnDate")
-    daily_hours: Optional[Series[Float]] = pa.Field(coerce=True, description="Daily Hours", alias="dailyHours")
-    duration_unit: Optional[Series[String]] = pa.Field(coerce=True, description="Duration Unit", alias="durationUnit")
-    total_duration: Optional[Series[Float]] = pa.Field(coerce=True, description="Total Duration", alias="totalDuration")
-    total_cost: Optional[Series[Float]] = pa.Field(coerce=True, description="Total Cost", alias="totalCost")
+    start_date: Series[String] = pa.Field(coerce=True, nullable=True, description="Start Date", alias="startDate")
+    start_portion: Series[String] = pa.Field(coerce=True, nullable=True, description="Start Portion", alias="startPortion")
+    end_date: Series[String] = pa.Field(coerce=True, nullable=True, description="End Date", alias="endDate")
+    end_portion: Series[String] = pa.Field(coerce=True, nullable=True, description="End Portion", alias="endPortion")
+    day_portion: Optional[Series[String]] = pa.Field(coerce=True, nullable=True, description="Day Portion", alias="dayPortion")
+    date: Optional[Series[String]] = pa.Field(coerce=True, nullable=True, description="Date", alias="date")
+    hours_on_date: Optional[Series[Float]] = pa.Field(coerce=True, nullable=True, description="Hours on Date", alias="hoursOnDate")
+    daily_hours: Optional[Series[Float]] = pa.Field(coerce=True, nullable=True, description="Daily Hours", alias="dailyHours")
+    duration_unit: Optional[Series[String]] = pa.Field(coerce=True, nullable=True, description="Duration Unit", alias="durationUnit")
+    total_duration: Optional[Series[Float]] = pa.Field(coerce=True, nullable=True, description="Total Duration", alias="totalDuration")
+    total_cost: Optional[Series[Float]] = pa.Field(coerce=True, nullable=True, description="Total Cost", alias="totalCost")
     change_reason: Optional[Series[String]] = pa.Field(nullable=True, coerce=True, description="Change Reason", alias="changeReason")
-    visibility: Optional[Series[String]] = pa.Field(coerce=True, description="Visibility", alias="visibility")
+    visibility: Optional[Series[String]] = pa.Field(coerce=True, nullable=True, description="Visibility", alias="visibility")
 
     class Config:
         coerce = True

{brynq_sdk_bob-2.6.0 → brynq_sdk_bob-2.6.4}/brynq_sdk_bob.egg-info/PKG-INFO

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

{brynq_sdk_bob-2.6.0 → brynq_sdk_bob-2.6.4}/setup.py

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