brynq-sdk-bob 2.4.0__tar.gz → 2.4.2__tar.gz

{brynq_sdk_bob-2.4.0 → brynq_sdk_bob-2.4.2}/PKG-INFO

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

{brynq_sdk_bob-2.4.0 → brynq_sdk_bob-2.4.2}/brynq_sdk_bob/__init__.py

@@ -16,6 +16,7 @@ from .people import People
 from .salaries import Salaries
 from .timeoff import TimeOff
 from .work import Work
+from .custom_tables import CustomTables
 
 class Bob(BrynQ):
     def __init__(self, system_type: Optional[Literal['source', 'target']] = None, test_environment: bool = True, debug: bool = False, target_system: str = None):
@@ -38,6 +39,7 @@ class Bob(BrynQ):
         self.documents = CustomDocuments(self)
         self.companies = Company(self)
         self.named_lists = NamedLists(self)
+        self.custom_tables = CustomTables(self)
         self.data_interface_id = os.getenv("DATA_INTERFACE_ID")
         self.debug = debug
 

brynq_sdk_bob-2.4.2/brynq_sdk_bob/custom_tables.py

@@ -0,0 +1,75 @@
+import pandas as pd
+from brynq_sdk_functions import Functions
+from .schemas.custom_tables import CustomTableSchema, CustomTableMetadataSchema
+
+
+class CustomTables:
+    def __init__(self, bob):
+        self.bob = bob
+        self.schema = CustomTableSchema
+
+    def get(self, employee_id: str, custom_table_id: str) -> tuple[pd.DataFrame, pd.DataFrame]:
+        """
+        Get custom table data for an employee
+
+        Args:
+            employee_id: The employee ID
+            custom_table_id: The custom table ID
+
+        Returns:
+            A tuple of (valid_data, invalid_data) as pandas DataFrames
+        """
+        resp = self.bob.session.get(url=f"{self.bob.base_url}people/custom-tables/{employee_id}/{custom_table_id}")
+        resp.raise_for_status()
+        data = resp.json()
+
+        # Normalize the nested JSON response
+        df = pd.json_normalize(
+            data,
+            record_path=['values']
+        )
+
+        df['employee_id'] = employee_id
+        valid_data, invalid_data = Functions.validate_data(df=df, schema=self.schema, debug=True)
+
+        return valid_data, invalid_data
+
+    def get_metadata(self) -> tuple[pd.DataFrame, pd.DataFrame]:
+        """
+        Get metadata for all custom tables
+
+        Returns:
+            A tuple of (valid_data, invalid_data) as pandas DataFrames containing table and column metadata
+        """
+        url = f"{self.bob.base_url}people/custom-tables/metadata"
+        resp = self.bob.session.get(url=url)
+        resp.raise_for_status()
+        data = resp.json()
+
+        # Flatten the nested structure - create one row per column with table info repeated
+        rows = []
+        for table in data.get('tables', []):
+            table_info = {
+                'table_id': table.get('id'),
+                'table_name': table.get('name'),
+                'table_category': table.get('category'),
+                'table_description': table.get('description')
+            }
+
+            for column in table.get('columns', []):
+                row = {
+                    **table_info,
+                    'column_id': column.get('id'),
+                    'column_name': column.get('name'),
+                    'column_description': column.get('description'),
+                    'column_mandatory': column.get('mandatory'),
+                    'column_type': column.get('type')
+                }
+                rows.append(row)
+
+        df = pd.DataFrame(rows)
+
+        # Validate against the metadata schema
+        valid_data, invalid_data = Functions.validate_data(df=df, schema=CustomTableMetadataSchema, debug=True)
+
+        return valid_data, invalid_data

brynq_sdk_bob-2.4.0/brynq_sdk_bob/people.py → brynq_sdk_bob-2.4.2/brynq_sdk_bob/payroll_history.py

@@ -1,21 +1,10 @@
 import pandas as pd
 from brynq_sdk_functions import Functions
-from .bank import Bank
-from .employment import Employment
-from .salaries import Salaries
 from .schemas.people import PeopleSchema
-from .work import Work
-from .custom_tables import CustomTables
 
-
-class People:
+class History:
     def __init__(self, bob):
         self.bob = bob
-        self.salaries = Salaries(bob)
-        self.employment = Employment(bob)
-        self.bank = Bank(bob)
-        self.work = Work(bob)
-        self.custom_tables = CustomTables(bob)
         self.schema = PeopleSchema
         self.field_name_in_body, self.field_name_in_response, self.endpoint_to_response = self._init_fields()
 

brynq_sdk_bob-2.4.2/brynq_sdk_bob/people.py

@@ -0,0 +1,340 @@
+import pandas as pd
+import re
+from brynq_sdk_functions import Functions
+from .bank import Bank
+from .employment import Employment
+from .salaries import Salaries
+from .schemas.people import PeopleSchema
+from .work import Work
+from .custom_tables import CustomTables
+
+
+class People:
+    def __init__(self, bob):
+        self.bob = bob
+        self.salaries = Salaries(bob)
+        self.employment = Employment(bob)
+        self.bank = Bank(bob)
+        self.work = Work(bob)
+        self.custom_tables = CustomTables(bob)
+        self.schema = PeopleSchema
+        self.field_name_in_body, self.field_name_in_response, self.endpoint_to_response = self._init_fields()
+
+        # Define payroll information types and their configurations
+        self.payroll_types = {
+            'entitlement': {
+                'pattern': 'payroll.entitlement.',
+                'named_list_key': 'entitlementType'
+            },
+            'variable': {
+                'pattern': 'payroll.variable.',
+                'named_list_key': 'payrollVariableType'
+            }
+        }
+        self.payroll_mappings = {}
+
+    def _add_payroll_fields_to_request(self, body_fields: list, response_fields: list, payroll_type: str) -> tuple[list, list]:
+        """
+        Add payroll fields to request fields for a specific payroll type.
+
+        Args:
+            body_fields: Current body fields
+            response_fields: Current response fields
+            payroll_type: Type of payroll information (e.g., 'entitlement', 'variable')
+
+        Returns:
+            - body_fields: Updated body fields including payroll fields
+            - response_fields: Updated response fields including payroll fields
+        """
+        if payroll_type not in self.payroll_types:
+            return body_fields, response_fields
+
+        pattern = self.payroll_types[payroll_type]['pattern']
+        payroll_fields_to_add = [field for field in self.field_name_in_body if pattern in field.lower()]
+        payroll_response_fields = [self.endpoint_to_response.get(field) for field in payroll_fields_to_add if field in self.endpoint_to_response]
+
+        for field in payroll_fields_to_add:
+            if field not in body_fields:
+                body_fields.append(field)
+
+        for field in payroll_response_fields:
+            if field and field not in response_fields:
+                response_fields.append(field)
+
+        return body_fields, response_fields
+
+    def _get_payroll_mapping(self, payroll_type: str) -> dict:
+        """
+        Get mapping of payroll IDs to their names from the named-lists endpoint for a specific payroll type.
+
+        Args:
+            payroll_type: Type of payroll information (e.g., 'entitlement', 'variable')
+
+        Returns:
+            Dictionary mapping IDs to names
+        """
+        if payroll_type not in self.payroll_types:
+            return {}
+
+        # Check if we already have the mapping cached
+        if payroll_type in self.payroll_mappings:
+            return self.payroll_mappings[payroll_type]
+
+        resp = self.bob.session.get(
+            url=f"{self.bob.base_url}company/named-lists",
+            timeout=self.bob.timeout,
+            headers=self.bob.headers
+        )
+        named_lists = resp.json()
+
+        # Extract the mapping for this payroll type
+        mapping = {}
+        named_list_key = self.payroll_types[payroll_type]['named_list_key']
+        if named_list_key in named_lists:
+            for value in named_lists[named_list_key]['values']:
+                mapping[value['id']] = value['name']
+
+        # Cache the mapping
+        self.payroll_mappings[payroll_type] = mapping
+        return mapping
+
+    def _flatten_nested_payroll_data(self, df: pd.DataFrame, pattern: str) -> pd.DataFrame:
+        """
+        Flatten nested JSON structures in payroll columns.
+
+        Args:
+            df: DataFrame with potentially nested payroll data
+            pattern: Pattern to identify payroll columns (e.g., 'payroll.variable.')
+
+        Returns:
+            DataFrame with flattened payroll columns
+        """
+        # Identify payroll columns
+        payroll_columns = [col for col in df.columns if pattern in col.lower()]
+
+        if not payroll_columns:
+            return df
+
+        # Create a copy to avoid modifying the original
+        df_result = df.copy()
+
+        # Process each payroll column
+        for col in payroll_columns:
+            # Check if the column contains nested data
+            if df_result[col].notna().any():
+                # Get the first non-null value to check structure
+                sample_value = df_result[col].dropna().iloc[0] if not df_result[col].dropna().empty else None
+
+                if isinstance(sample_value, dict):
+                    # Flatten nested structure
+                    nested_df = pd.json_normalize(df_result[col].tolist())
+
+                    # Rename columns to include the original column name as prefix
+                    nested_df.columns = [f"{col}.{subcol}" for subcol in nested_df.columns]
+
+                    # Drop the original column and add flattened columns
+                    df_result = df_result.drop(columns=[col])
+                    df_result = pd.concat([df_result, nested_df], axis=1)
+
+        return df_result
+
+    def _extract_payroll_columns(self, df: pd.DataFrame, payroll_type: str) -> pd.DataFrame:
+        """
+        Extract payroll columns from DataFrame and rename them based on mapping.
+
+        Args:
+            df: DataFrame containing all data including payroll columns
+            payroll_type: Type of payroll information (e.g., 'entitlement', 'variable')
+
+        Returns:
+            DataFrame with only payroll columns (renamed if mapping available)
+        """
+        if payroll_type not in self.payroll_types:
+            return pd.DataFrame(index=df.index)
+
+        # Get the pattern for this payroll type
+        pattern = self.payroll_types[payroll_type]['pattern']
+
+        # Identify all payroll columns for this type
+        payroll_columns = [col for col in df.columns if pattern in col.lower()]
+
+        if not payroll_columns:
+            # No payroll columns found, return empty DataFrame
+            return pd.DataFrame(index=df.index)
+
+        # Extract payroll columns
+        df_payroll = df[payroll_columns].copy()
+
+        # Get mapping for this payroll type
+        payroll_mapping = self._get_payroll_mapping(payroll_type)
+
+        # Rename payroll columns if mapping is available
+        rename_dict = {}
+        if payroll_mapping:
+            for col in df_payroll.columns:
+                # Extract the ID from the column name (any digits after the pattern)
+                # Use case-insensitive match but extract from original column name
+                pattern_regex = pattern.replace('.', r'\.')  # Escape dots for regex
+                match = re.search(rf'({pattern_regex})(\d+)', col, re.IGNORECASE)
+                if match:
+                    payroll_id = match.group(2)
+                    if payroll_id in payroll_mapping:
+                        # Replace only the first occurrence of the ID with the name
+                        # This preserves any suffixes like .value, .currency, etc.
+                        new_col_name = col[:match.start(2)] + payroll_mapping[payroll_id] + col[match.end(2):]
+                        rename_dict[col] = new_col_name
+
+            # Apply the renaming
+            if rename_dict:
+                df_payroll = df_payroll.rename(columns=rename_dict)
+
+        return df_payroll
+
+    def get(self, additional_fields: list[str] = None, field_selection: list[str] = None, add_payroll_information: list[str] = None) -> tuple[pd.DataFrame, pd.DataFrame]:
+        """
+        Get people from Bob
+
+        Args:
+            additional_fields (list[str]): Additional fields to get (not defined in the schema)
+            field_selection (list[str]): Fields to get (defined in the schema), if not provided, all fields are returned
+            add_payroll_information (list[str]): List of payroll information types to include (valid options: 'entitlement', 'variable')
+
+        Returns:
+            valid_people (pd.DataFrame): Validated people data (with payroll information appended if requested)
+            invalid_people (pd.DataFrame): Invalid records
+        """
+        #resp = self.bob.session.get(url=f"{self.bob.base_url}profiles", timeout=self.bob.timeout)
+        if additional_fields is None:
+            additional_fields = []
+        body_fields = list(set(self.field_name_in_body + additional_fields))
+        response_fields = list(set(self.field_name_in_response + additional_fields))
+
+        if field_selection:
+            body_fields = [field for field in body_fields if field in field_selection]
+            response_fields = [self.endpoint_to_response.get(field) for field in field_selection if field in self.endpoint_to_response]
+
+        # Add payroll fields to request if needed (before making the API call)
+        if add_payroll_information:
+            # Validate and filter payroll types
+            valid_payroll_types = [pt for pt in add_payroll_information if pt in self.payroll_types]
+
+            for payroll_type in valid_payroll_types:
+                body_fields, response_fields = self._add_payroll_fields_to_request(body_fields, response_fields, payroll_type)
+
+        # Bob sucks with default fields so you need to do a search call to retrieve additional fields.
+        resp_additional_fields = self.bob.session.post(url=f"{self.bob.base_url}people/search",
+                                                       json={
+                                                           "fields": body_fields,
+                                                           "filters": []
+                                                       },
+                                                       timeout=self.bob.timeout)
+        df = pd.json_normalize(resp_additional_fields.json()['employees'])
+
+        # Validate payroll types if requested
+        valid_payroll_types = []
+        if add_payroll_information:
+            valid_payroll_types = [pt for pt in add_payroll_information if pt in self.payroll_types]
+
+            # Flatten nested data for each payroll type
+            for payroll_type in valid_payroll_types:
+                pattern = self.payroll_types[payroll_type]['pattern']
+                df = self._flatten_nested_payroll_data(df, pattern)
+
+        # Now filter columns - include original response_fields plus any flattened payroll columns
+        columns_to_keep = []
+        for col in df.columns:
+            # Keep if it's in response_fields
+            if col in response_fields:
+                columns_to_keep.append(col)
+            # Or if it's a payroll column (original or flattened)
+            elif valid_payroll_types:
+                for payroll_type in valid_payroll_types:
+                    pattern = self.payroll_types[payroll_type]['pattern']
+                    if pattern in col.lower():
+                        columns_to_keep.append(col)
+                        break
+
+        df = df[columns_to_keep]
+
+        # Map DataFrame columns (response fields) back to alias (endpoint) fields for validation
+        response_to_endpoint = {v: k for k, v in self.endpoint_to_response.items() if v}
+        df = df.rename(columns={col: response_to_endpoint[col] for col in df.columns if col in response_to_endpoint})
+
+        # Extract payroll information if requested
+        payroll_dataframes = {}
+        if valid_payroll_types:
+            for payroll_type in valid_payroll_types:
+                # Extract payroll columns into separate DataFrame
+                df_payroll = self._extract_payroll_columns(df, payroll_type)
+                if not df_payroll.empty:
+                    payroll_dataframes[payroll_type] = df_payroll
+
+                    # Remove payroll columns from main DataFrame for validation
+                    pattern = self.payroll_types[payroll_type]['pattern']
+                    payroll_columns = [col for col in df.columns if pattern in col.lower()]
+                    if payroll_columns:
+                        df = df.drop(columns=payroll_columns)
+
+        # Validate the data (without payroll information)
+        valid_people, invalid_people = Functions.validate_data(df=df, schema=PeopleSchema, debug=True)
+
+        # Append all payroll information to valid_people if they exist
+        if payroll_dataframes and not valid_people.empty:
+            for payroll_type, df_payroll in payroll_dataframes.items():
+                # Only include payroll data for valid rows
+                df_payroll_valid = df_payroll.loc[valid_people.index]
+                # Append payroll columns to valid_people
+                valid_people = pd.concat([valid_people, df_payroll_valid], axis=1)
+
+
+        # 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 valid_people.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():
+                valid_people[field] = valid_people[field].map(named_lists[field_df])
+
+        return valid_people, invalid_people
+
+
+    def _init_fields(self) -> tuple[list[str], list[str], dict[str, str]]:
+        resp_fields = self.bob.session.get(
+            url=f"{self.bob.base_url}company/people/fields",
+            timeout=self.bob.timeout,
+            headers=self.bob.headers
+        )
+        fields = resp_fields.json()
+        field_name_in_body = [field.get('id') for field in fields]
+        # For all field names in field_name_in_body containing 'root.', add an alternative without 'root.' in addition to those fields
+        field_name_in_body = field_name_in_body
+        field_name_in_response = [field['jsonPath'] for field in fields]
+        endpoint_to_response = {field['id']: field['jsonPath'] for field in fields}
+
+        return field_name_in_body, field_name_in_response, endpoint_to_response
+
+
+
+    def _get_employee_id_to_person_id_mapping(self) -> tuple[pd.DataFrame, pd.DataFrame]:
+        employee_id_in_company = "work.employeeIdInCompany"
+        person_id = "root.id"
+
+        body_fields = [employee_id_in_company, person_id]
+        response_fields = [self.endpoint_to_response.get(field) for field in body_fields if field in self.endpoint_to_response]
+
+        resp_additional_fields = self.bob.session.post(url=f"{self.bob.base_url}people/search",
+                                                       json={
+                                                           "fields": body_fields,
+                                                           "filters": []
+                                                       },
+                                                       timeout=self.bob.timeout)
+        df = pd.json_normalize(resp_additional_fields.json()['employees'])
+        df = df[[col for col in response_fields if col in df.columns]]
+        # Get the valid column names from PeopleSchema
+        valid_people, invalid_people = Functions.validate_data(df=df, schema=PeopleSchema, debug=True)
+        return valid_people, invalid_people

brynq_sdk_bob-2.4.2/brynq_sdk_bob/schemas/custom_tables.py

@@ -0,0 +1,27 @@
+import pandera as pa
+from pandera.typing import Series
+import pandas as pd
+from brynq_sdk_functions import BrynQPanderaDataFrameModel
+
+class CustomTableSchema(BrynQPanderaDataFrameModel):
+    id: Series[pd.Int64Dtype] = pa.Field(coerce=True, description="Custom Table ID", alias="id")
+    employee_id: Series[str] = pa.Field(coerce=True, description="Employee ID", alias="employee_id")
+
+    class Config:
+        coerce = True
+class CustomTableMetadataSchema(BrynQPanderaDataFrameModel):
+    # Table information
+    table_id: Series[str] = pa.Field(coerce=True, description="Table ID", alias="table_id")
+    table_name: Series[str] = pa.Field(coerce=True, description="Table Name", alias="table_name")
+    table_category: Series[str] = pa.Field(coerce=True, description="Table Category", alias="table_category")
+    table_description: Series[str] = pa.Field(coerce=True, nullable=True, description="Table Description", alias="table_description")
+
+    # Column information
+    column_id: Series[str] = pa.Field(coerce=True, description="Column ID", alias="column_id")
+    column_name: Series[str] = pa.Field(coerce=True, description="Column Name", alias="column_name")
+    column_description: Series[str] = pa.Field(coerce=True, nullable=True, description="Column Description", alias="column_description")
+    column_mandatory: Series[bool] = pa.Field(coerce=True, description="Is Column Mandatory", alias="column_mandatory")
+    column_type: Series[str] = pa.Field(coerce=True, description="Column Type", alias="column_type")
+
+    class Config:
+        coerce = True

{brynq_sdk_bob-2.4.0 → brynq_sdk_bob-2.4.2}/brynq_sdk_bob/schemas/payments.py

@@ -26,7 +26,7 @@ class VariablePaymentSchema(BrynQPanderaDataFrameModel):
     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[pd.Int64Dtype] = pa.Field(nullable=True, coerce=True, description="Change Changed By ID", alias="change.changedById")
-    employee_id: Series[pd.Int64Dtype] = pa.Field(coerce=True, description="Employee ID", alias="employee_id") #set manually
+    employee_id: Series[String] = pa.Field(coerce=True, description="Employee ID", alias="employee_id") #set manually
     class Config:
         coerce = True
 

brynq_sdk_bob-2.4.2/brynq_sdk_bob/schemas/payroll_history.py

@@ -0,0 +1,24 @@
+from datetime import datetime
+from typing import Optional
+
+import pandas as pd
+import pandera as pa
+from pandera import Bool
+from pandera.typing import Series, String, Float, DateTime
+import pandera.extensions as extensions
+from brynq_sdk_functions import BrynQPanderaDataFrameModel
+
+
+
+@extensions.register_check_method()
+def check_list(x):
+    return isinstance(x, list)
+
+
+class PayrollHistorySchema(BrynQPanderaDataFrameModel):
+    id: Optional[Series[String]] = pa.Field(coerce=True, description="Person ID", alias="id")
+    display_name: Optional[Series[String]] = pa.Field(coerce=True, nullable=True, description="Display Name", alias="displayName")
+    company_id: Optional[Series[String]] = pa.Field(coerce=True, description="Company ID", alias="companyId")
+
+    class Config:
+        coerce = True

{brynq_sdk_bob-2.4.0 → brynq_sdk_bob-2.4.2}/brynq_sdk_bob/schemas/people.py

@@ -16,13 +16,13 @@ def check_list(x):
 
 
 class PeopleSchema(BrynQPanderaDataFrameModel):
-    id: Optional[Series[String]] = pa.Field(coerce=True, description="Person ID", alias="id")
+    id: Optional[Series[String]] = pa.Field(coerce=True, description="Person ID", alias="root.id")
     display_name: Optional[Series[String]] = pa.Field(coerce=True, nullable=True, description="Display Name", alias="displayName")
     company_id: Optional[Series[String]] = pa.Field(coerce=True, description="Company ID", alias="companyId")
-    email: Optional[Series[String]] = pa.Field(coerce=True, nullable=True, description="Email", alias="email")
+    email: Optional[Series[String]] = pa.Field(coerce=True, nullable=True, description="Email", alias="root.email")
     home_mobile_phone: Optional[Series[String]] = pa.Field(coerce=True, nullable=True, description="Personal Mobile Phone", alias="home.mobilePhone")
-    surname: Optional[Series[String]] = pa.Field(coerce=True, description="Surname", alias="surname")
-    first_name: Optional[Series[String]] = pa.Field(coerce=True, nullable=True, description="First Name", alias="firstName")
+    surname: Optional[Series[String]] = pa.Field(coerce=True, description="Surname", alias="root.surname")
+    first_name: Optional[Series[String]] = pa.Field(coerce=True, nullable=True, description="First Name", alias="root.firstName")
     full_name: Optional[Series[String]] = pa.Field(coerce=True, nullable=True, description="Full Name", alias="fullName")
     personal_birth_date: Optional[Series[DateTime]] = pa.Field(coerce=True, nullable=True, description="Personal Birth Date", alias="personal.birthDate")
     personal_pronouns: Optional[Series[String]] = pa.Field(coerce=True, nullable=True, description="Personal Pronouns", alias="personal.pronouns")

{brynq_sdk_bob-2.4.0 → brynq_sdk_bob-2.4.2}/brynq_sdk_bob/schemas/timeoff.py

@@ -1,5 +1,6 @@
 import pandera as pa
 from pandera.typing import Series, String, Float
+from typing import Optional
 import pandas as pd
 from brynq_sdk_functions import BrynQPanderaDataFrameModel
 
@@ -15,15 +16,15 @@ class TimeOffSchema(BrynQPanderaDataFrameModel):
     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: Series[String] = pa.Field(coerce=True, description="Day Portion", alias="dayPortion")
-    date: Series[String] = pa.Field(coerce=True, description="Date", alias="date")
-    hours_on_date: Series[Float] = pa.Field(coerce=True, description="Hours on Date", alias="hoursOnDate")
-    daily_hours: Series[Float] = pa.Field(coerce=True, description="Daily Hours", alias="dailyHours")
-    duration_unit: Series[String] = pa.Field(coerce=True, description="Duration Unit", alias="durationUnit")
-    total_duration: Series[Float] = pa.Field(coerce=True, description="Total Duration", alias="totalDuration")
-    total_cost: Series[Float] = pa.Field(coerce=True, description="Total Cost", alias="totalCost")
-    change_reason: Series[String] = pa.Field(nullable=True, coerce=True, description="Change Reason", alias="changeReason")
-    visibility: Series[String] = pa.Field(coerce=True, description="Visibility", alias="visibility")
+    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")
+    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")
 
     class Config:
         coerce = True

{brynq_sdk_bob-2.4.0 → brynq_sdk_bob-2.4.2}/brynq_sdk_bob/timeoff.py

@@ -11,7 +11,7 @@ class TimeOff:
         self.schema = TimeOffSchema
         self.balance_schema = TimeOffBalanceSchema
 
-    def get(self, since: datetime = None) -> tuple[pd.DataFrame, pd.DataFrame]:
+    def get(self, since: datetime = None, include_pending: bool = False) -> tuple[pd.DataFrame, pd.DataFrame]:
         """
         Get time off requests
 
@@ -37,16 +37,12 @@ class TimeOff:
 
         since = since.replace(tzinfo=timezone.utc).isoformat(timespec='milliseconds').replace('+00:00', 'Z')
         resp = self.bob.session.get(url=f"{self.bob.base_url}timeoff/requests/changes",
-                                    params={'since': since},
+                                    params={'since': since, 'includePending': 'true' if include_pending else 'false'},
                                     timeout=self.bob.timeout)
         resp.raise_for_status()
         data = resp.json()['changes']
         # data = self.bob.get_paginated_result(request)
-        df = pd.json_normalize(
-            data,
-            record_path='changes',
-            meta=['employeeId']
-        )
+        df = pd.DataFrame(data)
         valid_timeoff, invalid_timeoff = Functions.validate_data(df=df, schema=self.schema, debug=True)
 
         return valid_timeoff, invalid_timeoff

{brynq_sdk_bob-2.4.0 → brynq_sdk_bob-2.4.2}/brynq_sdk_bob.egg-info/PKG-INFO

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

{brynq_sdk_bob-2.4.0 → brynq_sdk_bob-2.4.2}/brynq_sdk_bob.egg-info/SOURCES.txt

@@ -7,6 +7,7 @@ brynq_sdk_bob/documents.py
 brynq_sdk_bob/employment.py
 brynq_sdk_bob/named_lists.py
 brynq_sdk_bob/payments.py
+brynq_sdk_bob/payroll_history.py
 brynq_sdk_bob/people.py
 brynq_sdk_bob/salaries.py
 brynq_sdk_bob/timeoff.py
@@ -23,6 +24,7 @@ brynq_sdk_bob/schemas/custom_tables.py
 brynq_sdk_bob/schemas/employment.py
 brynq_sdk_bob/schemas/named_lists.py
 brynq_sdk_bob/schemas/payments.py
+brynq_sdk_bob/schemas/payroll_history.py
 brynq_sdk_bob/schemas/people.py
 brynq_sdk_bob/schemas/salary.py
 brynq_sdk_bob/schemas/timeoff.py

{brynq_sdk_bob-2.4.0 → brynq_sdk_bob-2.4.2}/setup.py

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

brynq_sdk_bob-2.4.0/brynq_sdk_bob/custom_tables.py

@@ -1,36 +0,0 @@
-from datetime import datetime
-import pandas as pd
-from brynq_sdk_functions import Functions
-from .schemas.custom_tables import CustomTableSchema
-
-
-class CustomTables:
-    def __init__(self, bob):
-        self.bob = bob
-        self.schema = CustomTableSchema
-
-    def get(self, employee_id: str, custom_table_id: str) -> (pd.DataFrame, pd.DataFrame):
-        """
-        Get custom table data for an employee
-
-        Args:
-            employee_id: The employee ID
-            custom_table_id: The custom table ID
-
-        Returns:
-            A tuple of (valid_data, invalid_data) as pandas DataFrames
-        """
-        resp = self.bob.session.get(url=f"{self.bob.base_url}people/custom-tables/{employee_id}/{custom_table_id}")
-        resp.raise_for_status()
-        data = resp.json()
-
-        # Normalize the nested JSON response
-        df = pd.json_normalize(
-            data,
-            record_path=['values']
-        )
-
-        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.4.0/brynq_sdk_bob/schemas/custom_tables.py

@@ -1,11 +0,0 @@
-import pandera as pa
-from pandera.typing import Series
-import pandas as pd
-from brynq_sdk_functions import BrynQPanderaDataFrameModel
-
-class CustomTableSchema(BrynQPanderaDataFrameModel):
-    id: Series[pd.Int64Dtype] = pa.Field(coerce=True, description="Custom Table ID", alias="id")
-    employee_id: Series[pd.Int64Dtype] = pa.Field(coerce=True, description="Employee ID", alias="employeeId")
-
-    class Config:
-        coerce = True