fdc-shared-kernel 0.0.98__tar.gz → 0.0.99__tar.gz

{fdc_shared_kernel-0.0.98 → fdc_shared_kernel-0.0.99}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fdc_shared_kernel
-Version: 0.0.98
+Version: 0.0.99
 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.98 → fdc_shared_kernel-0.0.99}/fdc_shared_kernel.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fdc_shared_kernel
-Version: 0.0.98
+Version: 0.0.99
 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.98 → fdc_shared_kernel-0.0.99}/pyproject.toml

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

{fdc_shared_kernel-0.0.98 → fdc_shared_kernel-0.0.99}/shared_kernel/messaging/aws_databus.py

@@ -6,7 +6,7 @@ from shared_kernel.config import Config
 from shared_kernel.interfaces.databus import DataBus
 from shared_kernel.logger import Logger
 from shared_kernel.messaging.utils.aws_utility import AWSMessagingUtility, AWSQueue
-from shared_kernel.messaging.utils.event_messages import AWSEventMessage
+from shared_kernel.messaging.utils.event_messages import AWSEventMessage, EventMessage
 from shared_kernel.enums import TaskStatus
 
 app_config = Config()
@@ -34,6 +34,7 @@ class AWSDataBus(DataBus):
         """
         ## Importing here to avoid circular import error since status_tracker depends on DataBusFactory
         from shared_kernel.status_tracker.status_tracker import StatusTracker
+
         if not hasattr(self, "initialized"):  # Prevent reinitialization
             super().__init__()
             self.aws_utility = AWSMessagingUtility()
@@ -61,24 +62,18 @@ class AWSDataBus(DataBus):
         Returns:
             bool: True if the event was published successfully, False otherwise.
         """
-        is_success, validated_event_dict = self.aws_utility.publish_event(event_name, event_payload)
+        is_success, validated_event_dict = self.aws_utility.publish_event(
+            event_name, event_payload
+        )
         if is_success and event_name != "DLQ":
             # we dont want to create status tracker entries for messages sent to DLQ
+            event_msg_object = EventMessage(validated_event_dict)
             self.status_tracker.create_task(
-                span_id=validated_event_dict["event_meta"]["span_id"],
-                trace_id=validated_event_dict["event_meta"]["trace_id"],
-                task=validated_event_dict["event_name"],
+                event_msg=event_msg_object,
                 status=TaskStatus.QUEUED.value,
-                task_id=validated_event_dict["event_meta"]["job_id"],
-                org_id=validated_event_dict["event_meta"]["org_id"],
-                entity_id=validated_event_dict["event_meta"].get("entity_id", None),
-            )
-            
-            self.status_tracker.set_event_meta_and_message_receipt_handle(
-                event_meta=validated_event_dict["event_meta"],
-                task_id=validated_event_dict["event_meta"]["job_id"],
-                task=validated_event_dict["event_name"],
             )
+
+            self.status_tracker.set_event_meta_and_message_receipt_handle(event_msg=event_msg_object)
             logger.info(
                 f"Updated event: {validated_event_dict['event_name']} with meta: {validated_event_dict['event_meta']}"
             )
@@ -97,11 +92,11 @@ class AWSDataBus(DataBus):
     def subscribe_async_event(self, event_name: str, callback: Callable[[Any], None]):
         """
         Subscribe to an event by creating an SQS queue for the event-specific queue
-        and EventBridge rule. 
+        and EventBridge rule.
 
         Args:
             event_name (str): The name of the event to subscribe to.
-            callback (Callable): Included to comply with the DataBus interface but is not used 
+            callback (Callable): Included to comply with the DataBus interface but is not used
             in AWSDataBus as events are handled differently.
         """
         aws_queue = None
@@ -130,14 +125,14 @@ class AWSDataBus(DataBus):
 
         Args:
             message (AWSEventMessage): AWSEventMessage object which contains event_name and
-            receipt_handle associated with the message           
+            receipt_handle associated with the message
         """
         try:
             queue: AWSQueue = self.event_queue_mapper.get(message.event_name)
             self.aws_utility.delete_message_from_queue(queue, message.receipt_handle)
         except ClientError as e:
             logger.error(f"Failed to delete message from SQS: {e}")
-    
+
     def get_queued_count(self, event_name):
         queue: AWSQueue = self.event_queue_mapper.get(event_name)
         return self.aws_utility.get_queue_count(queue)