fdc-shared-kernel 0.0.34__tar.gz → 0.0.35__tar.gz

{fdc_shared_kernel-0.0.34 → fdc_shared_kernel-0.0.35}/PKG-INFO

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fdc_shared_kernel
-Version: 0.0.34
+Version: 0.0.35
 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.34 → fdc_shared_kernel-0.0.35}/fdc_shared_kernel.egg-info/SOURCES.txt

@@ -34,7 +34,7 @@ shared_kernel/interfaces/http.py
 shared_kernel/interfaces/keyvault.py
 shared_kernel/logger/__init__.py
 shared_kernel/messaging/__init__.py
-shared_kernel/messaging/event_bridge_sqs_databus.py
+shared_kernel/messaging/aws_databus.py
 shared_kernel/messaging/http_databus.py
 shared_kernel/messaging/nats_databus.py
 shared_kernel/metrics/__init__.py

{fdc_shared_kernel-0.0.34 → fdc_shared_kernel-0.0.35}/pyproject.toml

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

{fdc_shared_kernel-0.0.34 → fdc_shared_kernel-0.0.35}/shared_kernel/messaging/__init__.py

@@ -1,6 +1,6 @@
 from shared_kernel.messaging.nats_databus import NATSDataBus
 from shared_kernel.messaging.http_databus import HTTPDataBus
-from shared_kernel.messaging.event_bridge_sqs_databus import EventBridgeSQSDataBus
+from shared_kernel.messaging.event_bridge_sqs_databus import AWSDataBus
 from shared_kernel.interfaces import DataBus
 
 
@@ -9,7 +9,7 @@ class DataBus:
     data_bus_classes = {
         "NATS": NATSDataBus,
         "HTTP": HTTPDataBus,
-        "EventBridgeSQS": EventBridgeSQSDataBus,
+        "AWS": AWSDataBus,
     }
 
     @staticmethod

fdc_shared_kernel-0.0.34/shared_kernel/messaging/event_bridge_sqs_databus.py → fdc_shared_kernel-0.0.35/shared_kernel/messaging/aws_databus.py

@@ -8,7 +8,8 @@ import threading
 
 logging.getLogger().setLevel(logging.INFO)
 
-class EventBridgeSQSDataBus:
+
+class AWSDataBus:
     """
     An EventBridge and SQS interface class to handle event-driven communication.
     """
@@ -16,12 +17,12 @@ class EventBridgeSQSDataBus:
 
     def __new__(cls, *args, **kwargs):
         if cls._instance is None:
-            cls._instance = super(EventBridgeSQSDataBus, cls).__new__(cls)
+            cls._instance = super(AWSDataBus, cls).__new__(cls)
         return cls._instance
 
     def __init__(self, config: Dict = None):
         """
-        Initialize the EventBridgeSQSDataBus and start listening to the SQS queue.
+        Initialize the AWSDataBus and start listening to the SQS queue.
         Args:
             config (Dict): A dictionary containing the EventBridge and SQS configuration.
         """
@@ -31,16 +32,18 @@ class EventBridgeSQSDataBus:
             self.sqs = boto3.client('sqs')
             self.event_bus_name = config.get('event_bus_name')
             self.queue_url = config.get('queue_url')
+            self.queue_arn = config.get("queue_arn")
+            self.source_name = config.get("source_name")
             self.callback_registry = {}  # Store callbacks for subscribed events
             self.initialized = True
             self.stop_event = threading.Event()
-            
+
             if self.queue_url:
                 # Start listening to the SQS queue as soon as initialized in a thread pool
                 self.executor = ThreadPoolExecutor(max_workers=4)
                 self.executor.submit(self._start_listening)
 
-    def subscribe_async_event(self, event_name: str, event_pattern: str, callback: Callable[[Any], None]):
+    def subscribe_async_event(self, event_name: str, callback: Callable[[Any], None]):
         """
         Subscribe to an event by creating an EventBridge rule and store the callback for the event.
         Args:
@@ -49,6 +52,12 @@ class EventBridgeSQSDataBus:
             callback (Callable[[Any], None]): The callback function to be invoked when the event is received.
         """
         rule_name = f'{event_name}_rule'
+        event_pattern = json.dumps(
+            {
+                "source": [self.source_name],  # Use self.source_name as the source
+                "detail-type": [event_name],
+            }
+        )
         try:
             # Create EventBridge Rule
             self.eventbridge.put_rule(
@@ -63,10 +72,12 @@ class EventBridgeSQSDataBus:
             self.eventbridge.put_targets(
                 Rule=rule_name,
                 EventBusName=self.event_bus_name,
-                Targets=[{
-                    'Id': f'{event_name}_sqs_target',
-                    'Arn': 'arn:aws:sqs:us-east-1:012765396827:test_fdc_queue',  # SQS queue ARN
-                }]
+                Targets=[
+                    {
+                        "Id": f"{event_name}_sqs_target",
+                        "Arn": self.queue_arn,  # SQS queue ARN
+                    }
+                ],
             )
             logging.info(f"SQS queue target added to rule '{rule_name}'.")
 
@@ -121,7 +132,7 @@ class EventBridgeSQSDataBus:
         except Exception as e:
             logging.error(f"Error processing message: {e}")
 
-    def publish_event(self, event_name: str, event_payload: dict):
+    def publish_event(self, event_name: str, source_name: str, event_payload: dict):
         """
         Publish an event to the EventBridge.
         Args:
@@ -132,12 +143,14 @@ class EventBridgeSQSDataBus:
         """
         try:
             response = self.eventbridge.put_events(
-                Entries=[{
-                    'Source': 'my.application',
-                    'DetailType': event_name,
-                    'Detail': json.dumps(event_payload),
-                    'EventBusName': self.event_bus_name,
-                }]
+                Entries=[
+                    {
+                        "Source": self.source_name,
+                        "DetailType": event_name,
+                        "Detail": json.dumps(event_payload),
+                        "EventBusName": self.event_bus_name,
+                    }
+                ]
             )
             logging.info(f"Published event '{event_name}': {event_payload}, response: {response}")
             return True
@@ -159,4 +172,3 @@ class EventBridgeSQSDataBus:
             logging.info(f"Message deleted from SQS queue with receipt handle '{receipt_handle}'.")
         except ClientError as e:
             logging.error(f"Failed to delete message from SQS: {e}")
-