fdc-shared-kernel 0.0.69__tar.gz → 0.0.71__tar.gz

{fdc_shared_kernel-0.0.69 → fdc_shared_kernel-0.0.71}/PKG-INFO

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

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

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

{fdc_shared_kernel-0.0.69 → fdc_shared_kernel-0.0.71}/shared_kernel/event_executor/event_executor.py

@@ -1,3 +1,4 @@
+import json
 import threading
 from concurrent.futures import ThreadPoolExecutor, Future
 from typing import Any, Callable, Dict, Optional
@@ -98,12 +99,11 @@ class EventExecutor:
                 
                 # setting tracking payload without the time taken and end time
                 # but with all the other data
-                self.status_tracker.set_tracking_payload(
-                    span_id=event_msg.event_meta.span_id,
-                    trace_id=event_msg.event_meta.trace_id,
-                    task=event_msg.event_name,
-                    tracking_payload=event_msg.to_json(),
+                self.status_tracker.set_event_meta_and_message_receipt_handle(
+                    event_meta=event_msg.event_meta.to_dict(),
                     task_id=event_msg.event_meta.job_id,
+                    task=event_msg.event_name,
+                    message_receipt_handle=event_msg.receipt_handle,
                 )
 
                 callback(event_msg.raw_message, None)
@@ -113,12 +113,11 @@ class EventExecutor:
                     f"Task {event_msg.event_name} is already in queue. trace-id: {event_msg.event_meta.trace_id}. span-id: {event_msg.event_meta.trace_id}."
                 )
 
-                self.status_tracker.set_tracking_payload(
-                    span_id=event_msg.event_meta.span_id,
-                    trace_id=event_msg.event_meta.trace_id,
-                    task=event_msg.event_name,
-                    tracking_payload=event_msg.to_json(),
+                self.status_tracker.set_event_meta_and_message_receipt_handle(
+                    event_meta=event_msg.event_meta.to_dict(),
                     task_id=event_msg.event_meta.job_id,
+                    task=event_msg.event_name,
+                    message_receipt_handle=event_msg.receipt_handle,
                 )
                 
                 self.status_tracker.update_task(
@@ -128,13 +127,15 @@ class EventExecutor:
                     status=TaskStatus.PROCESSING.value,
                     task_id=event_msg.event_meta.job_id,
                 )
-                callback(event_msg.raw_message, task.get("tracking_payload"))
+                tracking_id = json.loads(task["tracking_id"]) if task["tracking_id"] else None
+                callback(event_msg.raw_message, tracking_id)
 
             elif task["status"] == TaskStatus.PROCESSING.value:
                 logger.info(
                     f"Task {event_msg.event_name} is already processing. trace-id: {event_msg.event_meta.trace_id}. span-id: {event_msg.event_meta.trace_id}."
                 )
-                callback(event_msg.raw_message, task.get("tracking_payload"))
+                tracking_id = json.loads(task["tracking_id"]) if task["tracking_id"] else None
+                callback(event_msg.raw_message, tracking_id)
 
             return True
 
@@ -172,13 +173,12 @@ class EventExecutor:
             logger.info(
                     f"Setting tracking payload for event {event_msg.event_name}. trace-id: {event_msg.event_meta.trace_id}. span-id: {event_msg.event_meta.trace_id}."
                 )
-            # updating tracking payload with the time taken and end time
-            self.status_tracker.set_tracking_payload(
-                    span_id=event_msg.event_meta.span_id,
-                    trace_id=event_msg.event_meta.trace_id,
-                    task=event_msg.event_name,
-                    tracking_payload=event_msg.to_json(),
+            # updating event_meta with the time taken and end time
+            self.status_tracker.set_event_meta_and_message_receipt_handle(
+                    event_meta=event_msg.event_meta.to_dict(),
                     task_id=event_msg.event_meta.job_id,
+                    task=event_msg.event_name,
+                    message_receipt_handle=event_msg.receipt_handle,
                 )
             
     def _update_event_stats(self, event_name: str, success: bool) -> None:

{fdc_shared_kernel-0.0.69 → fdc_shared_kernel-0.0.71}/shared_kernel/messaging/aws_databus.py

@@ -71,12 +71,14 @@ class AWSDataBus(DataBus):
                 status=TaskStatus.QUEUED.value,
                 task_id=validated_event_dict["event_meta"]["job_id"],
             )
-            self.status_tracker.set_tracking_payload(
-                span_id=validated_event_dict["event_meta"]["span_id"],
-                trace_id=validated_event_dict["event_meta"]["trace_id"],
-                task=validated_event_dict["event_name"],
-                tracking_payload=json.dumps(validated_event_dict),
+            
+            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"],
+            )
+            logger.info(
+                f"Updated event: {validated_event_dict['event_name']} with meta: {validated_event_dict['event_meta']}"
             )
 
     def subscribe_sync_event(self, event_name: str, callback: Callable[[Any], None]):

{fdc_shared_kernel-0.0.69 → fdc_shared_kernel-0.0.71}/shared_kernel/messaging/utils/aws_utility.py

@@ -256,3 +256,25 @@ class AWSMessagingUtility:
         except Exception as e:
             logger.error(f"Failed to publish event: {e}")
             return False, None
+         
+    def get_queue_url_arn(self, event_name: str) -> dict:
+        queue_name = f"{self.service_name}-{event_name}"
+        queue_arn = f"arn:aws:sqs:{self.region}:{self.account_id}:{queue_name}"
+        queue_url = f"https://sqs.{self.region}.amazonaws.com/{self.account_id}/{queue_name}"
+        return {
+            "queue_arn": queue_arn, 
+            "queue_url": queue_url
+        }
+    
+    def update_visibility_timeout(self, queue_url, receipt_handle, timeout_in_seconds):
+        try:
+            response = self.sqs.change_message_visibility(
+                QueueUrl=queue_url,
+                ReceiptHandle=receipt_handle,
+                VisibilityTimeout=timeout_in_seconds
+            )
+            logger.info(f"Message visibility changed: {response}")
+        
+        except ClientError as e:
+            logger.error(f"Error changing message visibility: {e}")
+            raise e

{fdc_shared_kernel-0.0.69 → fdc_shared_kernel-0.0.71}/shared_kernel/registries/service_event_registry.py

@@ -20,12 +20,22 @@ class ServiceEventRegistry:
         + "/event/subscribe-sync-event/MARK_TASK_AS_FAILURE/"
     )
 
-    SET_TRACKING_PAYLOAD = (
+    GET_TASK = (
         config.get("MASTER_SERVICE_BASE_ENDPOINT")
-        + "/event/subscribe-sync-event/SET_TRACKING_PAYLOAD/"
+        + "/event/subscribe-sync-event/GET_TASK/"
     )
 
-    GET_TASK = (
+    GET_IN_PROGRESS_TASK = (
         config.get("MASTER_SERVICE_BASE_ENDPOINT")
-        + "/event/subscribe-sync-event/GET_TASK/"
+        + "/event/subscribe-sync-event/GET_IN_PROGRESS_TASK/"
+    )
+
+    SET_EVENT_META_AND_MESSAGE_RECEIPT_HANDLE = (
+        config.get("MASTER_SERVICE_BASE_ENDPOINT")
+        + "/event/subscribe-sync-event/SET_EVENT_META_AND_MESSAGE_RECEIPT_HANDLE/"
+    )
+
+    SET_TRACKING_ID = (
+        config.get("MASTER_SERVICE_BASE_ENDPOINT")
+        + "/event/subscribe-sync-event/SET_TRACKING_ID/"
     )

{fdc_shared_kernel-0.0.69 → fdc_shared_kernel-0.0.71}/shared_kernel/status_tracker/status_tracker.py

@@ -88,19 +88,51 @@ class StatusTracker:
         except Exception as e:
             raise StatusTrackerException(e)
         
+    
+    def get_task(self, task, task_id):
+        """Publishes a synchronous event to retrieve a task"""
+        try:
+            payload = {
+                "task": task,
+                "task_id": task_id,
+            }
+            response: dict = self.databus.request_event(
+                getattr(service_event_registry, "GET_TASK"), payload
+            )
+            return response.get("data")
+
+        except Exception as e:
+            raise StatusTrackerException(e)
 
-    def set_tracking_payload(self, span_id, trace_id, task, tracking_payload, task_id):
-        """Publishes a synchronous event to set tracking payload"""
+    
+    def get_in_progress_task(self, task):
+        """Publishes a synchronous event to retrieve a task in Processing status"""
         try:
             payload = {
-                "span_id": span_id,
-                "trace_id": trace_id,
                 "task": task,
-                "tracking_payload": tracking_payload,
+            }
+            response: dict = self.databus.request_event(
+                getattr(service_event_registry, "GET_IN_PROGRESS_TASK"), payload
+            )
+            return response.get("data")
+
+        except Exception as e:
+            raise StatusTrackerException(e)
+        
+    
+    def set_event_meta_and_message_receipt_handle(self, event_meta, task_id, task, message_receipt_handle=None):
+        """Publishes a synchronous event to set event meta"""
+        try:
+            payload = {
+                "event_meta": event_meta,
                 "task_id": task_id,
+                "task": task,
             }
+            if message_receipt_handle:
+                payload["message_receipt_handle"] = message_receipt_handle
+
             response = self.databus.request_event(
-                getattr(service_event_registry, "SET_TRACKING_PAYLOAD"), payload
+                getattr(service_event_registry, "SET_EVENT_META_AND_MESSAGE_RECEIPT_HANDLE"), payload
             )
             return response
 
@@ -108,17 +140,19 @@ class StatusTracker:
             raise StatusTrackerException(e)
         
     
-    def get_task(self, task, task_id):
-        """Publishes a synchronous event to retrieve a task"""
+    def set_tracking_id(self, task_id, task, tracking_id):
+        """Publishes a synchronous event to set tracking id"""
         try:
             payload = {
-                "task": task,
                 "task_id": task_id,
+                "task": task,
+                "tracking_id": tracking_id,
             }
-            response: dict = self.databus.request_event(
-                getattr(service_event_registry, "GET_TASK"), payload
+            response = self.databus.request_event(
+                getattr(service_event_registry, "SET_TRACKING_ID"), payload
             )
-            return response.get("data")
+            return response
 
         except Exception as e:
             raise StatusTrackerException(e)
+