fdc-shared-kernel 0.0.52__tar.gz → 0.0.53__tar.gz

{fdc_shared_kernel-0.0.52 → fdc_shared_kernel-0.0.53}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fdc_shared_kernel
-Version: 0.0.52
+Version: 0.0.53
 Summary: Shared library for microservice
 Author-email: Shikhil S <shikhil.s@dbizsolution.com>, Ahammed Akdham N <ahammedakdham.n@dbizsolution.com>
 Classifier: Programming Language :: Python :: 3

{fdc_shared_kernel-0.0.52 → fdc_shared_kernel-0.0.53}/fdc_shared_kernel.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fdc_shared_kernel
-Version: 0.0.52
+Version: 0.0.53
 Summary: Shared library for microservice
 Author-email: Shikhil S <shikhil.s@dbizsolution.com>, Ahammed Akdham N <ahammedakdham.n@dbizsolution.com>
 Classifier: Programming Language :: Python :: 3

{fdc_shared_kernel-0.0.52 → fdc_shared_kernel-0.0.53}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "fdc_shared_kernel"
-version = "0.0.52"
+version = "0.0.53"
 requires-python = ">=3.7"
 readme = "README_pypi.md"
 description = "Shared library for microservice"

{fdc_shared_kernel-0.0.52 → fdc_shared_kernel-0.0.53}/shared_kernel/event_executor/event_executor.py

@@ -53,15 +53,15 @@ class EventExecutor:
             bool: True if processing succeeded, False otherwise
         """
         try:
-            task: dict = self.status_tracker.get_task(entity_id=event_msg.payload.get("entity_id"), task=event_msg.event_name)
+            task: dict = self.status_tracker.get_task(task=event_msg.event_name, task_id=event_msg.job_id)
             
             if task is None:
                 self.status_tracker.create_task(
                     trace_id=event_msg.trace_id,
                     span_id=event_msg.span_id, 
-                    entity_id=event_msg.payload.get("entity_id"),
                     task=event_msg.event_name,
-                    status=TaskStatus.PROCESSING.value
+                    status=TaskStatus.PROCESSING.value,
+                    task_id=event_msg.job_id
                 )
 
                 # NOTE: From where are we going to set the tracking payload for an event
@@ -89,9 +89,9 @@ class EventExecutor:
             self.status_tracker.mark_task_as_failure(
                 span_id=event_msg.span_id,
                 trace_id=event_msg.trace_id,
-                entity_id=event_msg.payload.get("entity_id"),
                 task=event_msg.event_name,
-                failure_reason=str(e)
+                failure_reason=str(e),
+                task_id=event_msg.job_id
             )
 
             # NOTE: dead letter queue is yet to be implemented
@@ -112,19 +112,19 @@ class EventExecutor:
         """
         Wrapper around message processing to handle cleanup and status updates.
         """
-        event_msg = AWSReceiveEventMessage(message)
         success = False
         
         try:
+            event_msg = AWSReceiveEventMessage(message)
             success = self._process_message(event_msg, callback)
         finally:
             if success:
                 self.status_tracker.update_task(
                     span_id=event_msg.span_id,
                     trace_id=event_msg.trace_id,
-                    entity_id=event_msg.payload.get("entity_id"),
                     task=event_msg.event_name,
-                    status=TaskStatus.COMPLETED.value
+                    status=TaskStatus.COMPLETED.value,
+                    task_id=event_msg.job_id
                 )
             self.databus.delete_message(event_msg)
 

{fdc_shared_kernel-0.0.52 → fdc_shared_kernel-0.0.53}/shared_kernel/messaging/utils/event_messages.py

@@ -15,7 +15,7 @@ class PublishEventMessage:
         event_dict (Dict[str, Any]): Dictionary containing complete event data including:
             - event_name: Name of the event being published
             - payload: Event payload containing event-specific data
-            - meta: Dictionary containing trace_id and span_id
+            - event_meta: Dictionary containing trace_id and span_id
     """
 
     def __init__(self, event_dict: Dict[str, Any]):
@@ -25,8 +25,8 @@ class PublishEventMessage:
             event_dict: Dictionary containing event data in the format:
                 {
                     "event_name": str,
-                    "payload": dict,
-                    "meta": {
+                    "event_payload": dict,
+                    "event_meta": {
                         "trace_id": str,
                         "span_id": str
                     }
@@ -38,15 +38,15 @@ class PublishEventMessage:
     def _validate_and_set_trace_ids(self):
         """Validates and sets trace_id and span_id in the event dictionary.
         
-        If meta section doesn't exist, creates it.
+        If event_meta section doesn't exist, creates it.
         If trace_id or span_id don't exist, generates them using UUID4.
         """
-        # ensure meta dictionary exists
-        if "meta" not in self.event_dict or not self.event_dict["meta"]["trace_id"]:
+        # ensure event_meta dictionary exists
+        if "event_meta" not in self.event_dict or not self.event_dict["event_meta"]["trace_id"]:
             raise Exception("Message metdata or trace_id not found.")
 
         # always generate a new job_id
-        self.event_dict["meta"]["job_id"] = str(uuid.uuid4())
+        self.event_dict["event_meta"]["job_id"] = str(uuid.uuid4())
 
     def to_dict(self) -> dict:
         """Convert the event to a dictionary format"""
@@ -66,26 +66,26 @@ class ReceiveEventMessage:
     Attributes:
         raw_message (dict): The original raw message received
         event_name (str): Name of the received event
-        payload (dict): Event payload containing event-specific data
-        meta (dict): Metadata including trace_id and span_id
+        event_payload (dict): Event payload containing event-specific data
+        event_meta (dict): Metadata including trace_id and span_id
         trace_id (str): Unique identifier for tracing a request across services
         span_id (str): Unique identifier for this specific operation within the trace
     """
     def __init__(self, raw_message: dict):
         self.raw_message = raw_message
-
         self.event_name = raw_message.get("event_name")
 
         # event payload will contain entity_id, connector_id and other info
         # needed for specific events
-        self.payload: dict = raw_message.get("payload", {})
-        self.meta: dict = raw_message.get("meta", {})
+        self.payload: dict = raw_message.get("event_payload", {})
+        self.event_meta: dict = raw_message.get("event_meta", {})
 
-        self.trace_id = self.meta.get("trace_id")
-        self.job_id = self.meta.get("job_id")
+        self.trace_id = self.event_meta.get("trace_id")
+        self.job_id = self.event_meta.get("job_id")
 
         # create span id when we recieve a message
-        self.span_id = ["meta"]["job_id"] = str(uuid.uuid4())
+        self.event_meta["span_id"] = str(uuid.uuid4())
+        self.span_id = self.event_meta["span_id"]
 
 
 class NATSReceiveEventMessage(ReceiveEventMessage):