brynq-sdk-nmbrs 2.2.0__tar.gz → 2.2.2__tar.gz

{brynq_sdk_nmbrs-2.2.0 → brynq_sdk_nmbrs-2.2.2}/PKG-INFO

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

{brynq_sdk_nmbrs-2.2.0 → brynq_sdk_nmbrs-2.2.2}/brynq_sdk_nmbrs/__init__.py

@@ -67,6 +67,16 @@ class Nmbrs(BrynQ):
                 'https://api.nmbrs.nl/soap/v3/EmployeeService.asmx?wsdl',
                 settings=self.soap_settings
             )
+            self.soap_auth_header = self._get_soap_auth_header()
+            # Following methods can only be used if the SOAP authentication header is set (optional, this is not always in scope for all integrations)
+            if self.soap_auth_header is not None:
+                self.soap_company_ids = self.companies.get_soap_ids()
+                self.salary_tables = SalaryTables(self)
+                self.salary_scales = SalaryScales(self)
+                self.salary_steps = SalarySteps(self)
+                self.wage_tax = WageTax(self)
+                self.absence = Absence(self)
+                self.children = Children(self)
 
         self.address = Address(self)
         self.bank = Bank(self)
@@ -78,7 +88,6 @@ class Nmbrs(BrynQ):
         debtors, _ = self.debtor.get()
         self.debtor_ids = debtors['debtor_id'].to_list()
         self.company_ids = self.companies.get()['companyId'].to_list()
-        self.soap_company_ids = self.companies.get_soap_ids()
         self.employees = Employees(self)
         self.employment = Employment(self)
         self.function = EmployeeFunction(self)
@@ -92,12 +101,6 @@ class Nmbrs(BrynQ):
         self.schedule = Schedule(self)
         self.fixed_wagecomponents = EmployeeFixedWageComponents(self)
         self.variable_wagecomponents = EmployeeVariableWageComponents(self)
-        self.children = Children(self)
-        self.salary_tables = SalaryTables(self)
-        self.salary_scales = SalaryScales(self)
-        self.salary_steps = SalarySteps(self)
-        self.wage_tax = WageTax(self)
-        self.absence = Absence(self)
         self.current_period = self.companies.get_current_period()
 
     def _get_request_headers(self):
@@ -118,20 +121,23 @@ class Nmbrs(BrynQ):
         Returns:
             AuthHeaderWithDomainType: The authentication header for SOAP requests
         """
-        initial_credentials = self.get_system_credential(system='nmbrs', label='bob')
-        config = initial_credentials.get("config", {})
-
-        # Get the AuthHeaderWithDomain type from the WSDL
-        AuthHeaderWithDomainType = self.soap_client_companies.get_element('ns0:AuthHeaderWithDomain')
-
-        # Create the auth header using credentials from config
-        auth_header = AuthHeaderWithDomainType(
-            Username=config.get("soap_api_username"),
-            Token=config.get("soap_api_token"),
-            Domain=config.get("soap_api_domain")
-        )
+        initial_credentials = self.interfaces.credentials.get(system='nmbrs', system_type=self.system_type)
+        config = initial_credentials.get("custom_data", {})
+
+        if 'soap_api_token' not in config.keys():
+            return None
+        else:
+            # Get the AuthHeaderWithDomain type from the WSDL
+            AuthHeaderWithDomainType = self.soap_client_companies.get_element('ns0:AuthHeaderWithDomain')
+
+            # Create the auth header using credentials from config
+            auth_header = AuthHeaderWithDomainType(
+                Username=config.get("soap_api_username"),
+                Token=config.get("soap_api_token"),
+                Domain=config.get("soap_api_domain")
+            )
 
-        return auth_header
+            return auth_header
 
     def get_paginated_result(self, request: requests.Request) -> List:
         has_next_page = True

{brynq_sdk_nmbrs-2.2.0 → brynq_sdk_nmbrs-2.2.2}/brynq_sdk_nmbrs/absence.py

@@ -40,7 +40,7 @@ class Absence:
 
     def _get(self, company_id: int, employee_id: int = None) -> pd.DataFrame:
         """
-        Get salary tables for a specific company, period and year.
+        Get all absences for a specific company, period and year.
 
         Args:
             company_id (int): The ID of the company
@@ -51,20 +51,16 @@ class Absence:
             pd.DataFrame: DataFrame containing the salary tables
         """
         try:
-
-            # Get the auth header using the centralized method
-            auth_header = self.nmbrs._get_soap_auth_header()
-
             if employee_id is None:
                 response = self.soap_client_employees.service.Absence_GetAll_AllEmployeesByCompany(
                     CompanyId=company_id,
-                    _soapheaders=[auth_header]
+                    _soapheaders=[self.nmbrs.soap_auth_header]
                 )
             else:
                 # Make SOAP request with the proper header structure
                 response = self.soap_client_employees.service.Absence_GetList(
                     EmployeeId=employee_id,
-                    _soapheaders=[auth_header]
+                    _soapheaders=[self.nmbrs.soap_auth_header]
                 )
 
             # Convert response to DataFrame
@@ -95,9 +91,6 @@ class Absence:
             if self.nmbrs.mock_mode:
                 return absence_model
 
-            # Get the auth header using the centralized method
-            auth_header = self.nmbrs._get_soap_auth_header()
-
             # Use the model's built-in SOAP conversion method
             absence_settings = absence_model.to_soap_settings(self.nmbrs.soap_client_employees)
 
@@ -106,7 +99,7 @@ class Absence:
                 EmployeeId=absence_model.employee_id,
                 Dossier=absence_model.new_dossier,
                 Absence=absence_settings,
-                _soapheaders=[auth_header]
+                _soapheaders=[self.nmbrs.soap_auth_header]
             )
 
             # Convert response to DataFrame

{brynq_sdk_nmbrs-2.2.0 → brynq_sdk_nmbrs-2.2.2}/brynq_sdk_nmbrs/companies.py

@@ -51,12 +51,9 @@ class Companies:
             pd.DataFrame: DataFrame containing all companies
         """
         try:
-            # Get the auth header using the centralized method
-            auth_header = self.nmbrs._get_soap_auth_header()
-
             # Make SOAP request with the proper header structure
             response = self.soap_client_companies.service.List_GetAll(
-                _soapheaders=[auth_header]
+                _soapheaders=[self.nmbrs.soap_auth_header]
             )
 
             # Convert response to DataFrame

{brynq_sdk_nmbrs-2.2.0 → brynq_sdk_nmbrs-2.2.2}/brynq_sdk_nmbrs/costcenter.py

@@ -2,17 +2,19 @@ import pandas as pd
 import requests
 from dateutil.utils import today
 from requests import HTTPError
-from typing import Dict, Any
+from typing import Dict, Any, TYPE_CHECKING
 
 from brynq_sdk_functions import Functions
 from .schemas.costcenter import CostcenterGet, EmployeeCostcenterGet
 from .schemas.costcenter import EmployeeCostcenterUpdate, EmployeeCostcenterDelete
 from .schemas.costcenter import CostcenterCreate, CostcenterUpdate, CostcenterDelete
+if TYPE_CHECKING:
+    from brynq_sdk_nmbrs import Nmbrs
 
 
 class EmployeeCostcenter:
     def __init__(self, nmbrs):
-        self.nmbrs = nmbrs
+        self.nmbrs: Nmbrs = nmbrs
 
     def get(self,
             created_from: str = None,

{brynq_sdk_nmbrs-2.2.0 → brynq_sdk_nmbrs-2.2.2}/brynq_sdk_nmbrs/salary_tables.py

@@ -50,15 +50,12 @@ class SalaryTables:
             pd.DataFrame: DataFrame containing the salary tables
         """
         try:
-            # Get the auth header using the centralized method
-            auth_header = self.nmbrs._get_soap_auth_header()
-
             # Make SOAP request with the proper header structure
             response = self.soap_client_companies.service.SalaryTable2_Get(
                 CompanyId=company_id,
                 Period=period,
                 Year=year,
-                _soapheaders=[auth_header]
+                _soapheaders=[self.nmbrs.soap_auth_header]
             )
 
             # Convert response to DataFrame
@@ -123,15 +120,12 @@ class SalaryScales:
             pd.DataFrame: DataFrame containing the salary scales
         """
         try:
-            # Get the auth header using the centralized method
-            auth_header = self.nmbrs._get_soap_auth_header()
-
             # Make SOAP request with the proper header structure
             response = self.soap_client_companies.service.SalaryTable2_GetScales(
                 CompanyId=company_id,
                 Period=period,
                 Year=year,
-                _soapheaders=[auth_header]
+                _soapheaders=[self.nmbrs.soap_auth_header]
             )
 
             # Convert response to DataFrame
@@ -208,9 +202,6 @@ class SalarySteps:
             pd.DataFrame: DataFrame containing the salary steps
         """
         try:
-            # Get the auth header using the centralized method
-            auth_header = self.nmbrs._get_soap_auth_header()
-
             # Make SOAP request with the proper header structure
             response = self.soap_client_companies.service.SalaryTable2_GetSteps(
                 CompanyId=company_id,
@@ -223,7 +214,7 @@ class SalarySteps:
                     'ScalePercentageMax': scale.get('scale_percentage_max', 0),
                     'ScalePercentageMin': scale.get('scale_percentage_min', 0)
                 },
-                _soapheaders=[auth_header]
+                _soapheaders=[self.nmbrs.soap_auth_header]
             )
 
             # Convert response to DataFrame

{brynq_sdk_nmbrs-2.2.0 → brynq_sdk_nmbrs-2.2.2}/brynq_sdk_nmbrs/schemas/__init__.py

@@ -12,7 +12,7 @@ from .function import FunctionGet, FunctionUpdate
 from .hours import FixedHoursGet, FixedHoursCreate, FixedHoursUpdate, HoursDelete, VariableHoursGet, VariableHoursCreate, VariableHoursUpdate
 from .salary import SalaryGet, SalaryCreate
 from .manager import ManagerGet, ManagerBasicGet, EmployeeManagerGet, ManagerHistoricBasicGet, ManagerCreate, ManagerUpdate, ManagerDelete, UpdateEmployeeManager
-from .salary import SalaryGet, SalaryCreate, SalaryUpdate, SalaryDelete
+from .salary import SalaryGet, SalaryCreate
 from .wagecomponents import FixedWageComponentGet, FixedWageComponentCreate, FixedWageComponentUpdate, WageComponentDelete, VariableWageComponentGet, VariableWageComponentCreate, VariableWageComponentUpdate
 from .wage_tax import WageTaxGet, WageTaxUpdate
 

{brynq_sdk_nmbrs-2.2.0 → brynq_sdk_nmbrs-2.2.2}/brynq_sdk_nmbrs/schemas/costcenter.py

@@ -22,8 +22,8 @@ class EmployeeCostcenterGet(BrynQPanderaDataFrameModel):
     cost_units_description: Series[String] = pa.Field(coerce=True, description="Cost Unit Description", alias="costUnits.description")
     percentage: Series[Float] = pa.Field(coerce=True, description="Percentage", alias="percentage")
     default: Series[Bool] = pa.Field(coerce=True, description="Default", alias="default")
-    period_year: Series[int] = pa.Field(coerce=True, description="Year", alias="period.year")
-    period_period: Series[int] = pa.Field(coerce=True, description="Period", alias="period.period")
+    period_year: Series[pd.Int64Dtype] = pa.Field(coerce=True, description="Year", alias="period.year")
+    period_period: Series[pd.Int64Dtype] = pa.Field(coerce=True, description="Period", alias="period.period")
     created_at: Series[DateTime] = pa.Field(coerce=True, description="Created At", alias="createdAt")
 
     class _Annotation:

{brynq_sdk_nmbrs-2.2.0 → brynq_sdk_nmbrs-2.2.2}/brynq_sdk_nmbrs/social_insurance.py

@@ -20,9 +20,6 @@ class SocialInsurance:
             if self.nmbrs.mock_mode:
                 return social_insurance_model
 
-            # Get the auth header using the centralized method
-            auth_header = self.nmbrs._get_soap_auth_header()
-
             # Use the model's built-in SOAP conversion method
             social_insurance_settings = social_insurance_model.to_soap_settings(self.nmbrs.soap_client_employees)
 
@@ -30,7 +27,7 @@ class SocialInsurance:
             response = self.nmbrs.soap_client_employees.service.SVW_UpdateCurrent(
                 EmployeeId=social_insurance_model.employee_id,
                 SVWSettings=social_insurance_settings,
-                _soapheaders=[auth_header]
+                _soapheaders=[self.nmbrs.soap_auth_header]
             )
 
             # Convert response to DataFrame

{brynq_sdk_nmbrs-2.2.0 → brynq_sdk_nmbrs-2.2.2}/brynq_sdk_nmbrs/wage_tax.py

@@ -51,14 +51,11 @@ class WageTax:
             pd.DataFrame: DataFrame containing the salary tables
         """
         try:
-            # Get the auth header using the centralized method
-            auth_header = self.nmbrs._get_soap_auth_header()
-
             # Make SOAP request with the proper header structure
             response = self.soap_client_companies.service.WageTax_GetList(
                 CompanyId=company_id,
                 intYear=year,
-                _soapheaders=[auth_header]
+                _soapheaders=[self.nmbrs.soap_auth_header]
             )
 
             # Convert response to DataFrame
@@ -89,9 +86,6 @@ class WageTax:
             if self.nmbrs.mock_mode:
                 return wage_tax_model
 
-            # Get the auth header using the centralized method
-            auth_header = self.nmbrs._get_soap_auth_header()
-
             # Use the model's built-in SOAP conversion method
             wage_tax_settings = wage_tax_model.to_soap_settings(self.nmbrs.soap_client_employees)
 
@@ -99,7 +93,7 @@ class WageTax:
             response = self.nmbrs.soap_client_employees.service.WageTax_UpdateCurrent(
                 EmployeeId=wage_tax_model.employee_id,
                 LoonheffingSettings=wage_tax_settings,
-                _soapheaders=[auth_header]
+                _soapheaders=[self.nmbrs.soap_auth_header]
             )
 
             # Convert response to DataFrame

{brynq_sdk_nmbrs-2.2.0 → brynq_sdk_nmbrs-2.2.2}/brynq_sdk_nmbrs.egg-info/PKG-INFO

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

{brynq_sdk_nmbrs-2.2.0 → brynq_sdk_nmbrs-2.2.2}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_namespace_packages
 
 setup(
     name='brynq_sdk_nmbrs',
-    version='2.2.0',
+    version='2.2.2',
     description='Nmbrs wrapper from BrynQ',
     long_description='Nmbrs wrapper from BrynQ',
     author='BrynQ',