brynq-sdk-nmbrs 1.3.2__tar.gz → 2.0.0__tar.gz

{brynq_sdk_nmbrs-1.3.2 → brynq_sdk_nmbrs-2.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: brynq_sdk_nmbrs
-Version: 1.3.2
+Version: 2.0.0
 Summary: Nmbrs wrapper from BrynQ
 Home-page: UNKNOWN
 Author: BrynQ

{brynq_sdk_nmbrs-1.3.2 → brynq_sdk_nmbrs-2.0.0}/brynq_sdk_nmbrs/__init__.py

@@ -1,5 +1,5 @@
 import warnings
-from typing import Union, List
+from typing import Union, List, Literal, Optional
 import re
 import pandas as pd
 import requests
@@ -23,10 +23,11 @@ from .hours import VariableHours, FixedHours
 from .salaries import Salaries
 from .schedules import Schedule
 from .wagecomponents import EmployeeFixedWageComponents, EmployeeVariableWageComponents
+import os
 
 
 class Nmbrs(BrynQ):
-    def __init__(self, label: Union[str, List], debug: bool = False, mock_mode: bool = True):
+    def __init__(self, system_type: Optional[Literal['source', 'target']] = None, debug: bool = False, mock_mode: bool = True):
         """
         Initialize the Nmbrs class.
 
@@ -38,10 +39,11 @@ class Nmbrs(BrynQ):
         self.mock_mode = mock_mode
         self.debug = debug
         self.timeout = 3600
+        self.system_type = system_type
         if mock_mode is False:
             super().__init__()
-            self.label = label
-            headers = self._get_request_headers(label=label)
+            self.data_interface_id = os.getenv("DATA_INTERFACE_ID")
+            headers = self._get_request_headers()
             self.base_url = "https://api.nmbrsapp.com/api/"
             self.session = requests.Session()
             self.session.headers.update(headers)
@@ -64,7 +66,7 @@ class Nmbrs(BrynQ):
         self.companies = Companies(self)
         self.contract = Contract(self)
         self.department = EmployeeDepartment(self)
-        self.company_ids = self.companies.get()['company_id']
+        self.company_ids = self.companies.get()['companyId']
         self.soap_company_ids = self.companies.get_soap_ids()
         self.employees = Employees(self)
         self.employment = Employment(self)
@@ -80,14 +82,13 @@ class Nmbrs(BrynQ):
         self.salary_scales = SalaryScales(self)
         self.salary_steps = SalarySteps(self)
 
-    def _get_request_headers(self, label):
-        initial_credentials = self.get_system_credential(system='nmbrs', label=label)
-        credentials = self.refresh_system_credential(system='nmbrs', system_id=initial_credentials['id'])
+    def _get_request_headers(self):
+        credentials = self.interfaces.credentials.get(system='nmbrs', system_type=self.system_type)
         headers = {
             "accept": "application/json",
-            "Authorization": f"Bearer {credentials['access_token']}",
+            "Authorization": f"Bearer {credentials.get('data').get('access_token')}",
             # partner identifier
-            "X-Subscription-Key": initial_credentials.get("config").get("subscription_key")
+            "X-Subscription-Key": credentials.get("custom_data").get("subscription_key")
         }
 
         return headers
@@ -99,7 +100,7 @@ class Nmbrs(BrynQ):
         Returns:
             AuthHeaderWithDomainType: The authentication header for SOAP requests
         """
-        initial_credentials = self.get_system_credential(system='nmbrs', label=self.label)
+        initial_credentials = self.get_system_credential(system='nmbrs', label='bob')
         config = initial_credentials.get("config", {})
         
         # Get the AuthHeaderWithDomain type from the WSDL
@@ -120,7 +121,7 @@ class Nmbrs(BrynQ):
         while has_next_page:
             prepped = request.prepare()
             prepped.headers.update(self.session.headers)
-            resp = self.session.send(prepped, timeout=self.nmbrs.timeout)
+            resp = self.session.send(prepped, timeout=self.timeout)
             resp.raise_for_status()
             response_data = resp.json()
             result_data += response_data['data']

{brynq_sdk_nmbrs-1.3.2 → brynq_sdk_nmbrs-2.0.0}/brynq_sdk_nmbrs/companies.py

@@ -25,6 +25,7 @@ class Companies:
                                    url=f"{self.nmbrs.base_url}companies")
         data = self.nmbrs.get_paginated_result(request)
         df = pd.DataFrame(data)
+        # TODO: add validation for rename
 
         return df
 

{brynq_sdk_nmbrs-1.3.2 → brynq_sdk_nmbrs-2.0.0}/brynq_sdk_nmbrs/costcenter.py

@@ -104,29 +104,6 @@ class EmployeeCostcenter:
         )
         return resp
 
-    def delete(self, employee_id: str, employee_cost_center_id: str):
-        """
-        Delete a costcenter for an employee.
-
-        Args:
-            employee_id: The ID of the employee
-            employee_cost_center_id: The ID of the costcenter to delete
-
-        Returns:
-            Response from the API
-        """
-        # Create and validate a EmployeeCostcenterDelete model
-        costcenter_model = EmployeeCostcenterDelete(employeeCostCenterId=employee_cost_center_id)
-
-        if self.nmbrs.mock_mode:
-            return costcenter_model
-
-        # Send request
-        resp = self.nmbrs.session.delete(
-            url=f"{self.nmbrs.base_url}employees/{employee_id}/costcenters/{employee_cost_center_id}",
-            timeout=self.nmbrs.timeout
-        )
-        return resp
 
 
 class Costcenter:
@@ -208,27 +185,3 @@ class Costcenter:
             timeout=self.nmbrs.timeout
         )
         return resp
-
-    def delete(self, company_id: str, cost_center_id: str):
-        """
-        Delete a costcenter.
-
-        Args:
-            company_id: The ID of the company
-            cost_center_id: The ID of the costcenter to delete
-
-        Returns:
-            Response from the API
-        """
-        # Create and validate a CostcenterDelete model
-        costcenter_model = CostcenterDelete(costCenterId=cost_center_id)
-
-        if self.nmbrs.mock_mode:
-            return costcenter_model
-
-        # Send request
-        resp = self.nmbrs.session.delete(
-            url=f"{self.nmbrs.base_url}companies/{company_id}/costcenters/{cost_center_id}",
-            timeout=self.nmbrs.timeout
-        )
-        return resp

{brynq_sdk_nmbrs-1.3.2 → brynq_sdk_nmbrs-2.0.0}/brynq_sdk_nmbrs/costunit.py

@@ -28,28 +28,28 @@ class Costunit:
         df = pd.DataFrame(data)
 
         return df
-        
+
     def create(self, company_id: str, data: Dict[str, Any]):
         """
         Create a new costunit using Pydantic validation.
-        
+
         Args:
             company_id: The ID of the company
             data: Dictionary containing costunit data with fields matching
                  the CostunitCreate schema (using camelCase field names)
-            
+
         Returns:
             Response from the API
         """
         # Validate with Pydantic model - this will raise an error if required fields are missing
         costunit_model = CostunitCreate(**data)
-        
+
         if self.nmbrs.mock_mode:
             return costunit_model
-        
+
         # Convert validated model to dict for API payload
         payload = costunit_model.dict(exclude_none=True)
-        
+
         # Send request
         resp = self.nmbrs.session.post(
             url=f"{self.nmbrs.base_url}companies/{company_id}/costunit",
@@ -61,24 +61,24 @@ class Costunit:
     def update(self, company_id: str, data: Dict[str, Any]):
         """
         Update a costunit using Pydantic validation.
-        
+
         Args:
             company_id: The ID of the company
             data: Dictionary containing costunit data with fields matching
                  the CostunitUpdate schema (using camelCase field names)
-            
+
         Returns:
             Response from the API
         """
         # Validate with Pydantic model - this will raise an error if required fields are missing
         costunit_model = CostunitUpdate(**data)
-        
+
         if self.nmbrs.mock_mode:
             return costunit_model
-        
+
         # Convert validated model to dict for API payload
         payload = costunit_model.dict(exclude_none=True)
-        
+
         # Send request
         resp = self.nmbrs.session.put(
             url=f"{self.nmbrs.base_url}companies/{company_id}/costunit",
@@ -86,27 +86,3 @@ class Costunit:
             timeout=self.nmbrs.timeout
         )
         return resp
-        
-    def delete(self, company_id: str, cost_unit_id: str):
-        """
-        Delete a costunit.
-        
-        Args:
-            company_id: The ID of the company
-            cost_unit_id: The ID of the costunit to delete
-            
-        Returns:
-            Response from the API
-        """
-        # Create and validate a CostunitDelete model
-        costunit_model = CostunitDelete(costUnitId=cost_unit_id)
-        
-        if self.nmbrs.mock_mode:
-            return costunit_model
-            
-        # Send request
-        resp = self.nmbrs.session.delete(
-            url=f"{self.nmbrs.base_url}companies/{company_id}/costunits/{cost_unit_id}",
-            timeout=self.nmbrs.timeout
-        )
-        return resp 

{brynq_sdk_nmbrs-1.3.2 → brynq_sdk_nmbrs-2.0.0}/brynq_sdk_nmbrs/debtors.py

@@ -1,6 +1,7 @@
 import pandas as pd
 import requests
-from .costcenter import Costcenter, Costunit
+from .costcenter import Costcenter
+from .costunit import Costunit
 from .department import Departments
 from .hours import Hours
 from .bank import Bank

{brynq_sdk_nmbrs-1.3.2 → brynq_sdk_nmbrs-2.0.0}/brynq_sdk_nmbrs/department.py

@@ -101,29 +101,6 @@ class EmployeeDepartment:
         )
         return resp
 
-    def delete(self, employee_id: str, department_id: str):
-        """
-        Delete a department assignment for an employee.
-
-        Args:
-            employee_id: The ID of the employee
-            department_id: The ID of the department to delete
-
-        Returns:
-            Response from the API
-        """
-        # Create and validate a DepartmentDelete model
-        department_model = DepartmentDelete(departmentId=department_id)
-
-        if self.nmbrs.mock_mode:
-            return department_model
-
-        # Send request
-        resp = self.nmbrs.session.delete(
-            url=f"{self.nmbrs.base_url}employees/{employee_id}/departments/{department_id}",
-            timeout=self.nmbrs.timeout
-        )
-
 
 
 class Departments:
@@ -138,4 +115,4 @@ class Departments:
         data = self.nmbrs.get_paginated_result(request)
         df = pd.DataFrame(data)
 
-        return df
+        return df

{brynq_sdk_nmbrs-1.3.2 → brynq_sdk_nmbrs-2.0.0}/brynq_sdk_nmbrs/employees.py

@@ -1,5 +1,7 @@
 import pandas as pd
 import requests
+from pydantic import BaseModel
+
 from brynq_sdk_functions import Functions
 from typing import Dict, Any, Optional
 
@@ -87,7 +89,20 @@ class Employees:
             Response from the API
         """
         # Validate with Pydantic model
-        employee_model = EmployeeCreate(**data)
+        def nest_dict(flat_dict, model):
+            nested = {}
+            for name, field in model.model_fields.items():
+                key_in_input = name  # Original model field name as key in flat_dict
+                alias = field.alias or name
+                if isinstance(field.annotation, type) and issubclass(field.annotation, BaseModel):
+                    nested[alias] = nest_dict(flat_dict, field.annotation)
+                else:
+                    if key_in_input in flat_dict:
+                        nested[alias] = flat_dict[key_in_input]
+            return nested
+
+        nested_data = nest_dict(data, EmployeeCreate)
+        employee_model = EmployeeCreate(**nested_data)
 
         if self.nmbrs.mock_mode:
             return employee_model
@@ -144,26 +159,3 @@ class Employees:
             )
 
         return resp
-
-    def delete(self, employee_id: str):
-        """
-        Delete an employee.
-
-        Args:
-            employee_id: The ID of the employee to delete
-
-        Returns:
-            Response from the API
-        """
-        # Create and validate an EmployeeDelete model
-        employee_model = EmployeeDelete(employeeId=employee_id)
-
-        if self.nmbrs.mock_mode:
-            return employee_model
-
-        # Send request
-        resp = self.nmbrs.session.delete(
-            url=f"{self.nmbrs.base_url}employees/{employee_id}",
-            timeout=self.nmbrs.timeout
-        )
-        return resp

{brynq_sdk_nmbrs-1.3.2 → brynq_sdk_nmbrs-2.0.0}/brynq_sdk_nmbrs/employment.py

@@ -103,27 +103,3 @@ class Employment:
             timeout=self.nmbrs.timeout
         )
         return resp
-
-    def delete(self, employee_id: str, employment_id: str):
-        """
-        Delete an employment record for an employee.
-
-        Args:
-            employee_id: The ID of the employee
-            employment_id: The ID of the employment record to delete
-
-        Returns:
-            Response from the API
-        """
-        # Create and validate an EmploymentDelete model
-        employment_model = EmploymentDelete(employmentId=employment_id)
-
-        if self.nmbrs.mock_mode:
-            return employment_model
-
-        # Send request
-        resp = self.nmbrs.session.delete(
-            url=f"{self.nmbrs.base_url}employees/{employee_id}/employments/{employment_id}",
-            timeout=self.nmbrs.timeout
-        )
-        return resp

{brynq_sdk_nmbrs-1.3.2 → brynq_sdk_nmbrs-2.0.0}/brynq_sdk_nmbrs/function.py

@@ -96,29 +96,6 @@ class EmployeeFunction:
         )
         return resp
 
-    def delete(self, employee_id: str, function_id: str):
-        """
-        Delete a function for an employee.
-
-        Args:
-            employee_id: The ID of the employee
-            function_id: The ID of the function to delete
-
-        Returns:
-            Response from the API
-        """
-        # Create and validate a FunctionDelete model
-        function_model = FunctionDelete(functionId=function_id)
-
-        if self.nmbrs.mock_mode:
-            return function_model
-
-        # Send request
-        resp = self.nmbrs.session.delete(
-            url=f"{self.nmbrs.base_url}employees/{employee_id}/functions/{function_id}",
-            timeout=self.nmbrs.timeout
-        )
-        return resp
 
 
 class Functions:
@@ -135,4 +112,4 @@ class Functions:
         except requests.HTTPError as e:
             df = pd.DataFrame()
 
-        return df
+        return df

{brynq_sdk_nmbrs-1.3.2 → brynq_sdk_nmbrs-2.0.0}/brynq_sdk_nmbrs/salaries.py

@@ -56,24 +56,24 @@ class Salaries:
     def create(self, employee_id: str, data: Dict[str, Any]):
         """
         Create a new salary for an employee using Pydantic validation.
-        
+
         Args:
             employee_id: The ID of the employee
             data: Dictionary containing salary data with fields matching
                  the SalaryCreate schema (using camelCase field names)
-            
+
         Returns:
             Response from the API
         """
         # Validate with Pydantic model
         salary_model = SalaryCreate(**data)
-        
+
         if self.nmbrs.mock_mode:
             return salary_model
-        
+
         # Convert validated model to dict for API payload
         payload = salary_model.dict(exclude_none=True)
-        
+
         # Send request
         resp = self.nmbrs.session.post(
             url=f"{self.nmbrs.base_url}employees/{employee_id}/salary",
@@ -85,24 +85,24 @@ class Salaries:
     def update(self, employee_id: str, data: Dict[str, Any]):
         """
         Update a salary for an employee using Pydantic validation.
-        
+
         Args:
             employee_id: The ID of the employee
             data: Dictionary containing salary data with fields matching
                  the SalaryUpdate schema (using camelCase field names)
-            
+
         Returns:
             Response from the API
         """
         # Validate with Pydantic model
         salary_model = SalaryUpdate(**data)
-        
+
         if self.nmbrs.mock_mode:
             return salary_model
-        
+
         # Convert validated model to dict for API payload
         payload = salary_model.dict(exclude_none=True)
-        
+
         # Send request
         resp = self.nmbrs.session.put(
             url=f"{self.nmbrs.base_url}employees/{employee_id}/salary",
@@ -110,27 +110,3 @@ class Salaries:
             timeout=self.nmbrs.timeout
         )
         return resp
-        
-    def delete(self, employee_id: str, salary_id: str):
-        """
-        Delete a salary for an employee.
-        
-        Args:
-            employee_id: The ID of the employee
-            salary_id: The ID of the salary to delete
-            
-        Returns:
-            Response from the API
-        """
-        # Create and validate a SalaryDelete model
-        salary_model = SalaryDelete(salaryId=salary_id)
-        
-        if self.nmbrs.mock_mode:
-            return salary_model
-            
-        # Send request
-        resp = self.nmbrs.session.delete(
-            url=f"{self.nmbrs.base_url}employees/{employee_id}/salaries/{salary_id}",
-            timeout=self.nmbrs.timeout
-        )
-        return resp

{brynq_sdk_nmbrs-1.3.2 → brynq_sdk_nmbrs-2.0.0}/brynq_sdk_nmbrs/schedules.py

@@ -49,34 +49,34 @@ class Schedule:
                data: Dict[str, Any]):
         """
         Create a new schedule for an employee using Pydantic validation
-        
+
         Args:
             employee_id: The employee ID
             data: Schedule data dictionary with the following keys:
                 - start_date_schedule: Start date of the schedule
                 - weekly_hours: Hours per week (optional)
                 - hours_monday, hours_tuesday, etc.: Hours for each day
-                
+
         Returns:
             Response from the API
         """
         # Transform data to match schema
         schedule_data = {}
-        
+
         # Required field
         if "start_date_schedule" in data:
             schedule_data["startDate"] = data["start_date_schedule"]
-        
+
         # Optional field
         if "weekly_hours" in data:
             # Handle NaN values
             if not isinstance(data["weekly_hours"], float) or not math.isnan(data["weekly_hours"]):
                 schedule_data["hoursPerWeek"] = data["weekly_hours"]
-        
+
         # Create week1 and week2 data
         week1_data = {}
         week2_data = {}
-        
+
         day_mapping = {
             "hours_monday": "hoursMonday",
             "hours_tuesday": "hoursTuesday",
@@ -86,7 +86,7 @@ class Schedule:
             "hours_saturday": "hoursSaturday",
             "hours_sunday": "hoursSunday"
         }
-        
+
         # Populate week1 data
         for day, api_day in day_mapping.items():
             if day in data and (not isinstance(data[day], float) or not math.isnan(data[day])):
@@ -94,20 +94,20 @@ class Schedule:
             else:
                 # Default to 0 hours if not specified
                 week1_data[api_day] = 0.0
-        
+
         # For now, set week2 same as week1 (can be adjusted if needed)
         week2_data = week1_data.copy()
-        
+
         schedule_data["week1"] = week1_data
         schedule_data["week2"] = week2_data
-        
+
         # Validate with Pydantic schema
         try:
             validated_data = ScheduleCreate(**schedule_data)
-            
+
             if self.nmbrs.mock_mode:
                 return validated_data
-            
+
             # Use the validated data for the API call
             resp = self.nmbrs.session.post(
                 url=f"{self.nmbrs.base_url}employees/{employee_id}/schedule",
@@ -115,31 +115,31 @@ class Schedule:
                 timeout=self.nmbrs.timeout
             )
             return resp
-            
+
         except Exception as e:
             raise ValueError(f"Schedule validation failed: {str(e)}")
 
     def update(self, employee_id: str, data: Dict[str, Any]):
         """
         Update a schedule for an employee using Pydantic validation.
-        
+
         Args:
             employee_id: The ID of the employee
             data: Dictionary containing schedule data with fields matching
                  the ScheduleUpdate schema (using camelCase field names)
-            
+
         Returns:
             Response from the API
         """
         # Validate with Pydantic model - this will raise an error if required fields are missing
         schedule_model = ScheduleUpdate(**data)
-        
+
         if self.nmbrs.mock_mode:
             return schedule_model
-        
+
         # Convert validated model to dict for API payload
         payload = schedule_model.dict(exclude_none=True)
-        
+
         # Send request
         resp = self.nmbrs.session.put(
             url=f"{self.nmbrs.base_url}employees/{employee_id}/schedule",
@@ -147,27 +147,3 @@ class Schedule:
             timeout=self.nmbrs.timeout
         )
         return resp
-        
-    def delete(self, employee_id: str, schedule_id: str):
-        """
-        Delete a schedule for an employee.
-        
-        Args:
-            employee_id: The ID of the employee
-            schedule_id: The ID of the schedule to delete
-            
-        Returns:
-            Response from the API
-        """
-        # Create and validate a ScheduleDelete model
-        schedule_model = ScheduleDelete(scheduleId=schedule_id)
-        
-        if self.nmbrs.mock_mode:
-            return schedule_model
-            
-        # Send request
-        resp = self.nmbrs.session.delete(
-            url=f"{self.nmbrs.base_url}employees/{employee_id}/schedules/{schedule_id}",
-            timeout=self.nmbrs.timeout
-        )
-        return resp

{brynq_sdk_nmbrs-1.3.2 → brynq_sdk_nmbrs-2.0.0}/brynq_sdk_nmbrs.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: brynq-sdk-nmbrs
-Version: 1.3.2
+Version: 2.0.0
 Summary: Nmbrs wrapper from BrynQ
 Home-page: UNKNOWN
 Author: BrynQ

{brynq_sdk_nmbrs-1.3.2 → brynq_sdk_nmbrs-2.0.0}/brynq_sdk_nmbrs.egg-info/requires.txt

@@ -1,4 +1,4 @@
-brynq-sdk-brynq>=2
+brynq-sdk-brynq<5,>=4
 pandas<3.0.0,>=2.2.0
 pydantic<3.0.0,>=2.5.0
 pandera<1.0.0,>=0.16.0

{brynq_sdk_nmbrs-1.3.2 → brynq_sdk_nmbrs-2.0.0}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_namespace_packages
 
 setup(
     name='brynq_sdk_nmbrs',
-    version='1.3.2',
+    version='2.0.0',
     description='Nmbrs wrapper from BrynQ',
     long_description='Nmbrs wrapper from BrynQ',
     author='BrynQ',
@@ -10,7 +10,7 @@ setup(
     packages=find_namespace_packages(include=['brynq_sdk*']),
     license='BrynQ License',
     install_requires=[
-        'brynq-sdk-brynq>=2',
+        'brynq-sdk-brynq>=4,<5',
         'pandas>=2.2.0,<3.0.0',
         'pydantic>=2.5.0,<3.0.0',
         'pandera>=0.16.0,<1.0.0',