fdc-shared-kernel 0.0.72__tar.gz → 0.0.73__tar.gz

{fdc_shared_kernel-0.0.72 → fdc_shared_kernel-0.0.73}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fdc_shared_kernel
-Version: 0.0.72
+Version: 0.0.73
 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.72 → fdc_shared_kernel-0.0.73}/fdc_shared_kernel.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fdc_shared_kernel
-Version: 0.0.72
+Version: 0.0.73
 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.72 → fdc_shared_kernel-0.0.73}/pyproject.toml

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

{fdc_shared_kernel-0.0.72 → fdc_shared_kernel-0.0.73}/shared_kernel/event_executor/event_executor.py

@@ -85,10 +85,14 @@ class EventExecutor:
             logger.info(
                 f"Processing event {event_msg.event_name}. trace-id: {event_msg.event_meta.trace_id}. span-id: {event_msg.event_meta.trace_id}."
             )
-            task: dict = self.status_tracker.get_task(
-                task=event_msg.event_name, task_id=event_msg.event_meta.job_id
-            )
 
+            task_details = self.status_tracker.get_task(task_details = event_msg)
+            if task_details is not None and task_details["is_duplicate"]:
+                logger.info(
+                    f"Duplicate task {event_msg.event_name} is already in progress. trace-id: {event_msg.event_meta.trace_id}. span-id: {event_msg.event_meta.trace_id}."
+                )
+                return
+            task = task_details.get("task_details") if task_details is not None else None
             if task is None:
                 logger.info(
                     f"Creating new task for event {event_msg.event_name}. trace-id: {event_msg.event_meta.trace_id}. span-id: {event_msg.event_meta.trace_id}."
@@ -99,6 +103,8 @@ class EventExecutor:
                     task=event_msg.event_name,
                     status=TaskStatus.PROCESSING.value,
                     task_id=event_msg.event_meta.job_id,
+                    org_id=event_msg.event_meta.org_id,
+                    entity_id=event_msg.event_meta.entity_id,
                 )
                 
                 # setting tracking payload without the time taken and end time

{fdc_shared_kernel-0.0.72 → fdc_shared_kernel-0.0.73}/shared_kernel/logger/__init__.py

@@ -33,7 +33,8 @@ class JSONFormatter(logging.Formatter):
         if hasattr(record, 'meta_data'):
             log_record.update(record.meta_data)
         if record.exc_info:
-            log_record["exception"] = self.formatException(record.exc_info)
+            log_record["stack_trace"] = self.formatException(record.exc_info)
+            log_record["exception"] = str(record.exc_info[1])
         return json.dumps(log_record)
 class Logger:
     """

{fdc_shared_kernel-0.0.72 → fdc_shared_kernel-0.0.73}/shared_kernel/messaging/aws_databus.py

@@ -70,6 +70,8 @@ class AWSDataBus(DataBus):
                 task=validated_event_dict["event_name"],
                 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(

{fdc_shared_kernel-0.0.72 → fdc_shared_kernel-0.0.73}/shared_kernel/messaging/utils/event_messages.py

@@ -19,6 +19,9 @@ class EventMeta:
         self.trace_id: str = meta_data.get("trace_id")
         self.job_id: str = meta_data.get("job_id")
         self.trigger = meta_data.get("trigger")
+        self.org_id = meta_data.get("org_id")
+        # entity_id is an optional field as some events may not be associated with an entity
+        self.entity_id = meta_data.get("entity_id", None)
         # generate a new span_id for each event if not present already
         self.span_id: str = meta_data.get("span_id", str(uuid.uuid4()))
 

{fdc_shared_kernel-0.0.72 → fdc_shared_kernel-0.0.73}/shared_kernel/registries/service_event_registry.py

@@ -20,9 +20,9 @@ class ServiceEventRegistry:
         + "/event/subscribe-sync-event/MARK_TASK_AS_FAILURE/"
     )
 
-    GET_TASK = (
+    PROCESS_TASK = (
         config.get("MASTER_SERVICE_BASE_ENDPOINT")
-        + "/event/subscribe-sync-event/GET_TASK/"
+        + "/event/subscribe-sync-event/PROCESS_TASK/"
     )
 
     GET_IN_PROGRESS_TASK = (

{fdc_shared_kernel-0.0.72 → fdc_shared_kernel-0.0.73}/shared_kernel/status_tracker/status_tracker.py

@@ -1,6 +1,7 @@
 from shared_kernel.exceptions.custom_exceptions import StatusTrackerException
 from shared_kernel.interfaces.databus import DataBus
 from shared_kernel.messaging import DataBusFactory
+from shared_kernel.messaging.utils.event_messages import EventMessage
 from shared_kernel.registries.service_event_registry import ServiceEventRegistry
 
 service_event_registry = ServiceEventRegistry()
@@ -32,7 +33,7 @@ class StatusTracker:
         )
 
 
-    def create_task(self, span_id, trace_id, task, status, task_id):
+    def create_task(self, span_id, trace_id, task, status, task_id, org_id, entity_id=None):
         """Publishes a synchronous event to create a task"""
         try:
             payload = {
@@ -41,7 +42,10 @@ class StatusTracker:
                 "task": task,
                 "status": status,
                 "task_id": task_id,
+                "org_id": org_id,
             }
+            if entity_id:
+                payload["entity_id"] = entity_id
             response = self.databus.request_event(
                 getattr(service_event_registry, "CREATE_TASK"), payload
             )
@@ -89,15 +93,19 @@ class StatusTracker:
             raise StatusTrackerException(e)
         
     
-    def get_task(self, task, task_id):
+    def get_task(self, task_details: EventMessage):
         """Publishes a synchronous event to retrieve a task"""
         try:
             payload = {
-                "task": task,
-                "task_id": task_id,
+                "task": task_details.event_name,
+                "task_id": task_details.event_meta.job_id,
+                "entity_id": task_details.event_meta.entity_id if task_details.event_meta.entity_id else None,
+                "trace_id": task_details.event_meta.trace_id,
+                "span_id": task_details.event_meta.span_id,
+                "org_id": task_details.event_meta.org_id,
             }
             response: dict = self.databus.request_event(
-                getattr(service_event_registry, "GET_TASK"), payload
+                getattr(service_event_registry, "PROCESS_TASK"), payload
             )
             return response.get("data")
 
@@ -155,4 +163,3 @@ class StatusTracker:
 
         except Exception as e:
             raise StatusTrackerException(e)
-