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

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

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

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

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

{fdc_shared_kernel-0.0.41 → fdc_shared_kernel-0.0.43}/shared_kernel/messaging/__init__.py

@@ -14,7 +14,7 @@ class DataBusFactory:
 
     @staticmethod
     def create_data_bus(bus_type: str, config: dict) -> DataBus:
-        data_bus_class = DataBus.data_bus_classes.get(bus_type)
+        data_bus_class = DataBusFactory.data_bus_classes.get(bus_type)
         if data_bus_class is None:
             raise ValueError(f"Unknown data bus type: {bus_type}")
         return data_bus_class(config)

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

@@ -100,12 +100,12 @@ class NATSDataBus(DataBus):
             )
             await self.nats_jet_stream_context.add_stream(dlq_config)
             logger.info(
-                f"DLQ Stream '{app_config.get('NATS_DLQ_STREAM_NAME')}' created"
+                f"DLQ Stream [{app_config.get('NATS_DLQ_STREAM_NAME')}] created"
             )
         except JetstreamBadRequestError as e:
             if e.err_code == 10058:  # Stream already exists
                 logger.info(
-                    f"DLQ Stream '{app_config.get('NATS_DLQ_STREAM_NAME')}' already exists"
+                    f"DLQ Stream [{app_config.get('NATS_DLQ_STREAM_NAME')}] already exists"
                 )
             else:
                 raise
@@ -132,11 +132,11 @@ class NATSDataBus(DataBus):
                 max_age=600,
             )
             await self.nats_jet_stream_context.add_stream(stream_config)
-            logger.info(f"Stream {app_config.get("NATS_STREAM_NAME")} created")
+            logger.info(f"Stream [{app_config.get('NATS_STREAM_NAME')}] created")
         except JetstreamBadRequestError as e:
             # case where the stream already exists (error code 10058)
             if e.err_code == 10058:
-                logger.info(f"Stream {app_config.get("NATS_STREAM_NAME")} already exists with other topics")
+                logger.info(f"Stream [{app_config.get('NATS_STREAM_NAME')}] already exists with other topics")
                 # retrieve the existing stream's information
                 stream_info = await self.nats_jet_stream_context.stream_info(
                     app_config.get("NATS_STREAM_NAME")
@@ -154,7 +154,7 @@ class NATSDataBus(DataBus):
                     )
                     # apply the updated configuration to the existing stream
                     await self.nats_jet_stream_context.update_stream(stream_config)
-                    logger.info(f"Added topic: {topic[0]} to the stream {app_config.get("NATS_STREAM_NAME")}")
+                    logger.info(f"Added topic: [{topic[0]}] to the stream [{app_config.get('NATS_STREAM_NAME')}]")
         except Exception as e:
             logger.error(f"Error creating/updating stream: {e}")
             raise e
@@ -239,7 +239,7 @@ class NATSDataBus(DataBus):
             event_name, json.dumps(event_payload).encode("utf-8")
         )
         logger.info(
-            f"Published event '{event_payload.get('event_name')}' to subject '{event_name}', ack: {ack}"
+            f"""Published event [{event_payload.get('event_name')}] to subject [{event_name}], ack: {ack}"""
         )
         return ack
 
@@ -286,7 +286,7 @@ class NATSDataBus(DataBus):
         pull_subscription_object: JetStreamContext.PullSubscription = (
             await self.nats_jet_stream_context.pull_subscribe(subject=event_name, durable=consumer_name)
         )
-        logger.info(f"Subscribed to async event on subject '{event_name}'")
+        logger.info(f"""Subscribed to async event on subject [{event_name}]""")
         while True:
             try:
                 message_object: Msg = await self._fetch_messages(
@@ -297,19 +297,18 @@ class NATSDataBus(DataBus):
                 has_job_failed = False
                 try:
                     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)}"
+                        f"Invoking callback during execution of [{event_name}] failed due to {str(e)}"
                     )
                     has_job_failed = True
 
-                if (
-                    has_job_failed
-                    and message_object.metadata.num_delivered == self.max_delivery_count
-                ):
+                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
                     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)
@@ -331,7 +330,7 @@ class NATSDataBus(DataBus):
             callback (Callable[[Any], None]): A callback function to handle received messages.
         """
         await self.nats_client.subscribe(event_name, cb=callback)
-        logger.info(f"Subscribed to sync event on subject '{event_name}'")
+        logger.info(f"Subscribed to sync event on subject [{event_name}]")
 
     def delete_message(self, receipt_handle: str):
         pass