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

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

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

{brynq_sdk_nmbrs-1.3.3 → 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.3 → 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.3 → 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.3 → 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

{brynq_sdk_nmbrs-1.3.3 → 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.3
+Version: 2.0.0
 Summary: Nmbrs wrapper from BrynQ
 Home-page: UNKNOWN
 Author: BrynQ

{brynq_sdk_nmbrs-1.3.3 → 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.3 → 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.3',
+    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',