brynq-sdk-alight 1.0.0.dev0__tar.gz → 1.0.0.dev2__tar.gz

{brynq_sdk_alight-1.0.0.dev0 → brynq_sdk_alight-1.0.0.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: brynq_sdk_alight
-Version: 1.0.0.dev0
+Version: 1.0.0.dev2
 Summary: Alight SDK for the BrynQ.com platform
 Author: BrynQ
 Author-email: support@brynq.com

{brynq_sdk_alight-1.0.0.dev0 → brynq_sdk_alight-1.0.0.dev2}/brynq_sdk_alight/__init__.py

@@ -413,7 +413,6 @@ class Alight(BrynQ):
             # BOD REMOVAL: Always include creation_date_time and bodid for model validation (required fields)
             # We'll remove them from XML output later if exclude_bod_fields is True
             app_area_data["creation_date_time"] = {"value": XmlDateTime.from_datetime(timestamp)}
-            # BOD REMOVAL: Only include bodid if not excluding BOD fields
             if not exclude_bod_fields:
                 app_area_data["bodid"] = {"value": app_bodid_value}
             if application_language_code:
@@ -537,17 +536,21 @@ class Alight(BrynQ):
             pydantic_serializer = PydanticXmlSerializer()
             raw_xml = pydantic_serializer.render(envelope, ns_map=namespace_map)
 
-            # BOD REMOVAL: Remove BOD fields from XML if exclude_bod_fields was set (for new hires)
+            # BOD REMOVAL: Remove BOD fields from XML if exclude_bod_fields was set (for new hires and updates)
             # Check if we should exclude by looking at the envelope's application_area
             # When exclude_bod_fields is True, bodid is not set, so it will be None
-            if envelope.application_area and envelope.application_area.bodid is None:
-                # Remove CreationDateTime and BODID elements from XML for new hires
-                # Handle both single-line and multi-line XML formatting
-                raw_xml = re.sub(r'<oa:CreationDateTime>.*?</oa:CreationDateTime>\s*', '', raw_xml, flags=re.DOTALL)
-                raw_xml = re.sub(r'<oa:BODID>.*?</oa:BODID>\s*', '', raw_xml, flags=re.DOTALL)
-                # Also handle self-closing tags if they exist
-                raw_xml = re.sub(r'<oa:CreationDateTime\s*/>\s*', '', raw_xml)
-                raw_xml = re.sub(r'<oa:BODID\s*/>\s*', '', raw_xml)
+            # We always remove creation_date_time and bodid from XML when exclude_bod_fields is True
+            if envelope.application_area:
+                bodid = getattr(envelope.application_area, 'bodid', None)
+                # If bodid is None, it means exclude_bod_fields was True, so remove both fields
+                if bodid is None:
+                    # Remove CreationDateTime and BODID elements from XML
+                    # Handle both single-line and multi-line XML formatting
+                    raw_xml = re.sub(r'<oa:CreationDateTime>.*?</oa:CreationDateTime>\s*', '', raw_xml, flags=re.DOTALL)
+                    raw_xml = re.sub(r'<oa:BODID>.*?</oa:BODID>\s*', '', raw_xml, flags=re.DOTALL)
+                    # Also handle self-closing tags if they exist
+                    raw_xml = re.sub(r'<oa:CreationDateTime\s*/>\s*', '', raw_xml)
+                    raw_xml = re.sub(r'<oa:BODID\s*/>\s*', '', raw_xml)
 
             if pretty_print:
                 # Pretty print the XML
@@ -807,11 +810,11 @@ class Alight(BrynQ):
         auth_token = self.session.headers.get('Authorization', 'Bearer <TOKEN>')
         subscription_key = self.session.headers.get('Ocp-Apim-Subscription-Key', '<SUBSCRIPTION_KEY>')
 
-        print(f'curl {self.base_url}/bods/submit -X POST -H "Content-Type: application/json" -H "gcc: {self.gcc}" -H "env: {env}" -H "Authorization: {auth_token}" -H "Ocp-Apim-Subscription-Key: {subscription_key}" -d \'{{"bod": "{data}"}}\'')
+        # print(f'curl {self.base_url}/bods/submit -X POST -H "Content-Type: application/json" -H "gcc: {self.gcc}" -H "env: {env}" -H "Authorization: {auth_token}" -H "Ocp-Apim-Subscription-Key: {subscription_key}" -d \'{{"bod": "{data}"}}\'')
 
         resp = self.session.post(url=f"{self.base_url}/bods/submit", json={"bod": data})
         resp.raise_for_status()
-        return resp.json().get("UUID")
+        return resp.json().get("bodId")
 
     def get_bods_status(self, bods_id: str):
         """
@@ -863,7 +866,16 @@ class Alight(BrynQ):
 
         try:
             # Convert Employee to IndicativeDataType model
-            employee_model = employee if isinstance(employee, EmployeeCreate) else EmployeeCreate(**employee)
+            if isinstance(employee, EmployeeCreate):
+                employee_model = employee
+                # Set action_code if not already set
+                if not hasattr(employee_model, 'action_code') or employee_model.action_code is None:
+                    employee_model.action_code = action_code
+            else:
+                # Pass action_code to model for CHANGE vs ADD detection
+                employee_dict = dict(employee)
+                employee_dict['action_code'] = action_code
+                employee_model = EmployeeCreate(**employee_dict)
             indicative_data = employee_model.to_model()
 
             # Process optional extensions
@@ -956,8 +968,8 @@ class Alight(BrynQ):
             envelope_kwargs.setdefault("bod_id", str(uuid.uuid4()).upper())
             envelope_kwargs.setdefault("logical_id", logical_id or "TST-GB003-1001")
 
-            # BOD REMOVAL: Exclude BOD fields for new hires (action_code="ADD")
-            if action_code == "ADD":
+            # BOD REMOVAL: Exclude BOD fields for new hires (action_code="ADD") and updates (action_code="CHANGE")
+            if action_code == "ADD" or action_code == "CHANGE":
                 envelope_kwargs["exclude_bod_fields"] = True
 
             envelope = self.create_complete_alight_envelope(

{brynq_sdk_alight-1.0.0.dev0 → brynq_sdk_alight-1.0.0.dev2}/brynq_sdk_alight/address.py

@@ -24,7 +24,7 @@ class Address:
         data: Dict[str, Any],
         *,
         person_id: str,
-        employee_id: str,
+        employee_id: Optional[str] = None,
         logical_id: Optional[str] = None,
         envelope_options: Optional[Dict[str, Any]] = None,
         employee_data: Optional[Dict[str, Any]] = None,
@@ -32,7 +32,7 @@ class Address:
     ) -> str:
         """
         Update address (actionCode=CHANGE). Returns XML string.
-        Requires both person_id and employee_id per integration constraints.
+        Requires person_id. employee_id is optional for updates.
 
         Example:
             >>> alight.address.update(
@@ -43,13 +43,13 @@ class Address:
             ...         "address_valid_from": "2024-01-01",
             ...     },
             ...     person_id="35561",
-            ...     employee_id="35561ZZGB",
             ... )
         """
         payload: dict[str, Any] = {
             "person_id": person_id,
-            "employee_id": employee_id,
         }
+        if employee_id is not None:
+            payload["employee_id"] = employee_id
 
         # build from flat fields
         address_model = AddressModel(**data)

{brynq_sdk_alight-1.0.0.dev0 → brynq_sdk_alight-1.0.0.dev2}/brynq_sdk_alight/job.py

@@ -57,28 +57,28 @@ class Job:
         data: Mapping[str, Any],
         *,
         person_id: str,
-        employee_id: str,
+        employee_id: Optional[str] = None,
         logical_id: Optional[str] = None,
         envelope_options: Optional[dict[str, Any]] = None,
         pretty_print: bool = True,
     ) -> str:
         """
         Update job/deployment data (actionCode=CHANGE). Returns XML string.
-        Requires both person_id and employee_id.
+        Requires person_id. employee_id is optional for updates.
 
         Example:
             >>> alight.job.update(
             ...     data={"job": {"job_code": "FIN-DIR", "effective_date": "2024-04-01"}},
             ...     person_id="35561",
-            ...     employee_id="35561ZZGB",
             ... )
         """
         job_model = JobModel(**dict(data))
         payload = {
             "person_id": person_id,
-            "employee_id": employee_id,
             "job": job_model.model_dump(exclude_none=True, by_alias=True),
         }
+        if employee_id is not None:
+            payload["employee_id"] = employee_id
 
         return self._client.generate_employee_xml(
             employee=payload,

{brynq_sdk_alight-1.0.0.dev0 → brynq_sdk_alight-1.0.0.dev2}/brynq_sdk_alight/leave.py

@@ -61,20 +61,19 @@ class Leave:
         data: Dict[str, Any],
         *,
         person_id: str,
-        employee_id: str,
+        employee_id: Optional[str] = None,
         logical_id: Optional[str] = None,
         envelope_options: Optional[dict[str, Any]] = None,
         pretty_print: bool = True,
     ) -> str:
         """
         Update leave entry (actionCode=CHANGE). Returns XML string.
-        Requires both person_id and employee_id.
+        Requires person_id. employee_id is optional for updates.
 
         Example:
             >>> alight.leave.update(
             ...     data={"leave": {"leave_type": "SICK", "status": "Cancelled"}},
             ...     person_id="35561",
-            ...     employee_id="35561ZZGB",
             ... )
         """
         if 'leave' in data and data['leave'] is not None:
@@ -84,9 +83,10 @@ class Leave:
             leave_model = LeaveModel(**data)
         payload = {
             "person_id": person_id,
-            "employee_id": employee_id,
             "leave": leave_model.model_dump(exclude_none=True, by_alias=True),
         }
+        if employee_id is not None:
+            payload["employee_id"] = employee_id
 
         return self._client.generate_employee_xml(
             employee=payload,

{brynq_sdk_alight-1.0.0.dev0 → brynq_sdk_alight-1.0.0.dev2}/brynq_sdk_alight/pay_elements.py

@@ -74,7 +74,7 @@ class PayElements:
         *,
         elements: List[Dict[str, Any]],
         person_id: str,
-        employee_id: str,
+        employee_id: Optional[str] = None,
         logical_id: Optional[str] = None,
         envelope_options: Optional[Dict[str, Any]] = None,
         pretty_print: bool = True,
@@ -87,8 +87,12 @@ class PayElements:
         """
         pay_elements_data = self._build_pay_elements(elements)
 
+        employee_payload = {"person_id": person_id}
+        if employee_id is not None:
+            employee_payload["employee_id"] = employee_id
+
         return self._client.generate_employee_xml(
-            employee={"person_id": person_id, "employee_id": employee_id},
+            employee=employee_payload,
             action_code="CHANGE",
             logical_id=logical_id,
             pay_elements_data=pay_elements_data,

{brynq_sdk_alight-1.0.0.dev0 → brynq_sdk_alight-1.0.0.dev2}/brynq_sdk_alight/schemas/employee.py

@@ -4,16 +4,17 @@ Automatically converts to complex nested HR-XML structure using schema introspec
 """
 
 import datetime
-from typing import Optional, Dict, Any, List, Union
-from pydantic import Field, model_validator, BaseModel
+from typing import Any, Dict, List, Optional, Union
+
+from pydantic import BaseModel, Field, model_validator
 
-from .utils import add_to_nested_path, post_process_nested_data, construct_model
-from .salary import Salary  # Import related models
 from .address import Address
+from .generated_xsd_schemas.hrxml_indicative_data import IndicativeDataType
 from .job import Job
 from .leave import Leave
+from .salary import Salary  # Import related models
 from .termination import Termination
-from .generated_xsd_schemas.hrxml_indicative_data import IndicativeDataType
+from .utils import add_to_nested_path, construct_model, post_process_nested_data
 
 
 class EmployeeCreate(BaseModel):
@@ -478,6 +479,9 @@ class EmployeeCreate(BaseModel):
     leave: Optional[Leave] = Field(default=None, description="Employee's leave information")
     termination: Optional[Termination] = Field(default=None, description="Employee's termination information")
 
+    # Internal field to track action code (excluded from model dump)
+    action_code: Optional[str] = Field(default=None, exclude=True, description="Internal: action code (ADD/CHANGE)")
+
     # Schedule Information and Work Level fields removed - these belong in Job model
     # Access these through the job relation
 
@@ -584,8 +588,10 @@ class EmployeeCreate(BaseModel):
             raise ImportError("IndicativeDataType not available - cannot perform schema-driven conversion")
 
         # Dump current model using aliases to get dot-path keys
+        # exclude_unset=True prevents default values (like work_level_code="FullTime") from being included
+        # unless they were explicitly set, which is important for CHANGE updates
         flat_alias: Dict[str, Any] = self.model_dump(
-            exclude={"salary", "address", "job"}, exclude_none=True, by_alias=True
+            exclude={"salary", "address", "job", "action_code"}, exclude_none=True, exclude_unset=True, by_alias=True
         )
         # print("[EMP] flat_alias keys:", list(flat_alias.keys())[:40])
 
@@ -605,9 +611,13 @@ class EmployeeCreate(BaseModel):
                 del flat_alias[basis_path]
 
         # Minimal business logic
-        if not flat_alias.get('indicative_person_dossier.indicative_employee.employee_id') and self.person_id:
-            # Mirror employee_id default to person_id if missing
-            flat_alias['indicative_person_dossier.indicative_employee.employee_id'] = self.person_id
+        # Only auto-add employee_id for ADD operations, not for CHANGE
+        employee_id_key = 'indicative_person_dossier.indicative_employee.employee_id'
+        if employee_id_key not in flat_alias and self.person_id:
+            # Only auto-add employee_id for ADD operations
+            # For CHANGE operations, employee_id should be explicitly provided if needed
+            if self.action_code != "CHANGE":
+                flat_alias[employee_id_key] = self.person_id
 
         # Merge related models (they already dump with by_alias in their to_nested_dict)
         if self.salary is not None:

{brynq_sdk_alight-1.0.0.dev0 → brynq_sdk_alight-1.0.0.dev2}/brynq_sdk_alight/termination.py

@@ -64,7 +64,7 @@ class Termination:
         data: Dict[str, Any],
         *,
         person_id: str,
-        employee_id: str,
+        employee_id: Optional[str] = None,
         extension_data: Optional[Dict[str, Any]] = None,
         employee_data: Optional[Dict[str, Any]] = None,
         logical_id: Optional[str] = None,
@@ -73,22 +73,22 @@ class Termination:
     ) -> str:
         """
         Update termination entry (actionCode=CHANGE). Returns XML string.
-        Requires both person_id and employee_id.
+        Requires person_id. employee_id is optional for updates.
 
         Example:
             >>> alight.termination.update(
             ...     data={"termination_reason": "DISMISSAL", "termination_date": "2024-07-15"},
             ...     person_id="35561",
-            ...     employee_id="35561ZZGB",
             ...     employee_data={"last_day_worked": "2024-07-10"},
             ... )
         """
         termination_model = TerminationModel(**data)
         payload: Dict[str, Any] = {
             "person_id": person_id,
-            "employee_id": employee_id,
             "termination": termination_model.model_dump(exclude_none=True, by_alias=True),
         }
+        if employee_id is not None:
+            payload["employee_id"] = employee_id
 
         if employee_data:
             payload.update(employee_data)

{brynq_sdk_alight-1.0.0.dev0 → brynq_sdk_alight-1.0.0.dev2}/brynq_sdk_alight/time_elements.py

@@ -84,7 +84,7 @@ class TimeElements:
         *,
         absences: Union[Dict[str, Any], List[Dict[str, Any]]],
         person_id: str,
-        employee_id: str,
+        employee_id: Optional[str] = None,
         logical_id: Optional[str] = None,
         envelope_options: Optional[Dict[str, Any]] = None,
         pretty_print: bool = True,
@@ -101,15 +101,15 @@ class TimeElements:
             ...         {"absence_reason": "VAC", "valid_from": "2024-01-01", "valid_to": "2024-01-02", "units": "16"}
             ...     ],
             ...     person_id="35561",
-            ...     employee_id="35561ZZGB",
             ... )
         """
         extension_data = self._build_extension_with_time_elements(absences)
 
         payload = {
             "person_id": person_id,
-            "employee_id": employee_id,
         }
+        if employee_id is not None:
+            payload["employee_id"] = employee_id
 
         return self._client.generate_employee_xml(
             employee=payload,

{brynq_sdk_alight-1.0.0.dev0 → brynq_sdk_alight-1.0.0.dev2}/brynq_sdk_alight.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: brynq_sdk_alight
-Version: 1.0.0.dev0
+Version: 1.0.0.dev2
 Summary: Alight SDK for the BrynQ.com platform
 Author: BrynQ
 Author-email: support@brynq.com

{brynq_sdk_alight-1.0.0.dev0 → brynq_sdk_alight-1.0.0.dev2}/setup.py

@@ -2,7 +2,7 @@ from setuptools import find_namespace_packages, setup
 
 setup(
     name='brynq_sdk_alight',
-    version='1.0.0.dev0',
+    version='1.0.0.dev2',
     description='Alight SDK for the BrynQ.com platform',
     long_description='Alight SDK for the BrynQ.com platform',
     author='BrynQ',