fdc-shared-kernel 0.0.43__tar.gz → 0.0.45__tar.gz

{fdc_shared_kernel-0.0.43 → fdc_shared_kernel-0.0.45}/PKG-INFO

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

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

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

{fdc_shared_kernel-0.0.43 → fdc_shared_kernel-0.0.45}/shared_kernel/logger/__init__.py

@@ -96,16 +96,16 @@ class Logger:
 
     def info(self, message, *args, **kwargs):
         extra_data = {"extra_data": kwargs}
-        self.logger.info(message, *args, extra=extra_data)
+        self.logger.info(message, *args, extra=extra_data, stacklevel=2)
 
     def error(self, message, *args, **kwargs):
         extra_data = {"extra_data": kwargs}
-        self.logger.error(message, exc_info=True, *args, extra=extra_data)
+        self.logger.error(message, exc_info=True, *args, extra=extra_data, stacklevel=2)
 
     def debug(self, message, *args, **kwargs):
         extra_data = {"extra_data": kwargs}
-        self.logger.debug(message, *args, extra=extra_data)
+        self.logger.debug(message, *args, extra=extra_data, stacklevel=2)
 
     def warning(self, message, *args, **kwargs):
         extra_data = {"extra_data": kwargs}
-        self.logger.warning(message, *args, extra=extra_data)
+        self.logger.warning(message, *args, extra=extra_data, stacklevel=2)

{fdc_shared_kernel-0.0.43 → fdc_shared_kernel-0.0.45}/shared_kernel/messaging/nats_databus.py

@@ -23,13 +23,6 @@ class NATSDataBus(DataBus):
     A NATS interface class to handle both standard NATS and JetStream operations.
     """
 
-    _instance = None
-
-    def __new__(cls, *args, **kwargs):
-        if cls._instance is None:
-            cls._instance = super(NATSDataBus, cls).__new__(cls)
-        return cls._instance
-
     def __init__(self, config: Dict = None):
         """
         Initialize the NATSDataBus.
@@ -37,16 +30,14 @@ class NATSDataBus(DataBus):
         Args:
             config (Dict): A dictionary containing the NATS configuration.
         """
-        if not hasattr(self, "initialized"):  # Prevent reinitialization
-            super().__init__()
-            self.nats_client = NATS()
-            self.servers = config.get("servers")
-            self.user = config.get("user")
-            self.password = config.get("password")
-            self.connected = False
-            self.nats_jet_stream_context = None  # JetStream context
-            self.initialized = True
-            self.max_delivery_count = app_config.get("MAX_DELIVERY_COUNT")
+        super().__init__()
+        self.nats_client = NATS()
+        self.servers = config.get("servers")
+        self.user = config.get("user")
+        self.password = config.get("password")
+        self.connected = False
+        self.nats_jet_stream_context = None  # JetStream context
+        self.max_delivery_count = app_config.get("MAX_DELIVERY_COUNT")
 
     async def _connection_error_callback(self, e: Exception) -> None:
         """
@@ -74,6 +65,7 @@ class NATSDataBus(DataBus):
                         ack_policy=AckPolicy.EXPLICIT,
                         deliver_policy=DeliverPolicy.ALL,
                         filter_subject=subject,
+                        ack_wait=3600,
                         max_ack_pending=5,
                     )
                     await self.nats_jet_stream_context.add_consumer(
@@ -200,7 +192,7 @@ class NATSDataBus(DataBus):
         """
         Connect to the NATS server.
         """
-        if not self.connected:
+        if not self.nats_client.is_connected:
             await self.nats_client.connect(
                 servers=self.servers,
                 user=self.user,
@@ -296,19 +288,20 @@ class NATSDataBus(DataBus):
                 event_data: dict = json.loads(message_object.data.decode())
                 has_job_failed = False
                 try:
-                    callback(event_data)
+                    await callback(event_data)
+                    # acknowledge the message after processing and finishing the job
+                    await message_object.ack()
+                    logger.info(f"Acknowledged job: {event_data}")
                 except Exception as e:
                     logger.error(
                         f"Invoking callback during execution of [{event_name}] failed due to {str(e)}"
                     )
                     has_job_failed = True
 
-                if not has_job_failed:
-                    # acknowledge the message after processing and finishing the job successfully
-                    await message_object.ack()
-                    logger.info(f"Acknowledged job: {event_data}")
-                elif message_object.metadata.num_delivered == self.max_delivery_count:
-                    # move to DLQ if max retries have been reached
+                if (
+                    has_job_failed
+                    and message_object.metadata.num_delivered == self.max_delivery_count
+                ):
                     logger.warning("Moving event to the dead letter topic after max retries")
                     await self._create_dlq_stream()
                     await self._move_to_dlq(event_name, event_data)