clean up base infra

libs/events/nats_bus.py

@@ -5,10 +5,11 @@ import json
 from collections.abc import Awaitable, Callable
 from typing import Any
 
-import nats  # type: ignore
+import nats
 import structlog
-from nats.aio.client import Client as NATS  # type: ignore
-from nats.js import JetStreamContext  # type: ignore
+from nats.aio.client import Client as NATS
+from nats.js import JetStreamContext
+from nats.js.api import AckPolicy, ConsumerConfig, DeliverPolicy
 
 from .base import EventBus, EventPayload
 
@@ -157,10 +158,10 @@ class NATSEventBus(EventBus):  # pylint: disable=too-many-instance-attributes
                 subscription = await self.js.pull_subscribe(
                     subject=subject,
                     durable=consumer_name,
-                    config=nats.js.api.ConsumerConfig(
+                    config=ConsumerConfig(
                         durable_name=consumer_name,
-                        ack_policy=nats.js.api.AckPolicy.EXPLICIT,
-                        deliver_policy=nats.js.api.DeliverPolicy.NEW,
+                        ack_policy=AckPolicy.EXPLICIT,
+                        deliver_policy=DeliverPolicy.NEW,
                         max_deliver=3,
                         ack_wait=30,  # 30 seconds
                     ),
@@ -193,15 +194,12 @@ class NATSEventBus(EventBus):  # pylint: disable=too-many-instance-attributes
             await self.js.stream_info(self.stream_name)
             logger.debug("Stream already exists", stream=self.stream_name)
 
-        except nats.js.errors.NotFoundError:
+        except Exception:
             # Stream doesn't exist, create it
             try:
                 await self.js.add_stream(
                     name=self.stream_name,
                     subjects=[f"{self.stream_name}.*"],
-                    retention=nats.js.api.RetentionPolicy.WORK_QUEUE,
-                    max_age=7 * 24 * 60 * 60,  # 7 days in seconds
-                    storage=nats.js.api.StorageType.FILE,
                 )
                 logger.info("Created JetStream stream", stream=self.stream_name)
 
@@ -261,7 +259,7 @@ class NATSEventBus(EventBus):  # pylint: disable=too-many-instance-attributes
                         )
                         await message.nak()
 
-            except asyncio.TimeoutError:
+            except TimeoutError:
                 # No messages available, continue polling
                 continue
             except Exception as e:  # pylint: disable=broad-exception-caught