letschatty 0.4.337__py3-none-any.whl → 0.4.338__py3-none-any.whl

letschatty/services/chatty_assets/asset_service.py

@@ -1,22 +1,11 @@
 from __future__ import annotations
-from typing import TypeVar, Generic, Type, Callable, Protocol, Optional, ClassVar, TYPE_CHECKING, List
-
-from bson import ObjectId
-from letschatty.models.utils.types import StrObjectId
+from typing import TypeVar, Generic, Type, Callable, Protocol, Optional
 from .base_container_with_collection import ChattyAssetCollectionInterface, ChattyAssetContainerWithCollection, CacheConfig
 from ...models.base_models import ChattyAssetModel
 from ...models.base_models.chatty_asset_model import ChattyAssetPreview
 from ...models.data_base.mongo_connection import MongoConnection
 import logging
 import os
-
-if TYPE_CHECKING:
-    from ...models.analytics.events.base import EventType
-    from ...models.company.empresa import EmpresaModel
-    from ...models.execution.execution import ExecutionContext
-    from ...models.company.assets.company_assets import CompanyAssetType
-    from ...models.utils.types.deletion_type import DeletionType
-
 logger = logging.getLogger("AssetService")
 
 # Protocol for assets that specify their preview type
@@ -55,75 +44,17 @@ class AssetCollection(Generic[T, P], ChattyAssetCollectionInterface[T, P]):
             raise ValueError(f"Data must be a dictionary, got {type(data)}: {data}")
         return self._create_instance_method(data)
 
-
 class AssetService(Generic[T, P], ChattyAssetContainerWithCollection[T, P]):
-    """
-    Generic service for handling CRUD operations for any Chatty asset.
-
-    Supports optional automatic event handling for API implementations.
-    Set these class attributes to enable events:
-    - asset_type_enum: CompanyAssetType (e.g., CompanyAssetType.PRODUCTS)
-    - event_type_created: EventType (e.g., EventType.PRODUCT_CREATED)
-    - event_type_updated: EventType (e.g., EventType.PRODUCT_UPDATED)
-    - event_type_deleted: EventType (e.g., EventType.PRODUCT_DELETED)
-    """
-
-    # Optional: Set these in subclasses to enable automatic event handling
-    asset_type_enum: ClassVar[Optional['CompanyAssetType']] = None
-    event_type_created: ClassVar[Optional['EventType']] = None
-    event_type_updated: ClassVar[Optional['EventType']] = None
-    event_type_deleted: ClassVar[Optional['EventType']] = None
-
-    collection: AssetCollection[T, P]  # Type annotation for better type checking
+    """Generic service for handling CRUD operations for any Chatty asset"""
 
     def __init__(self,
-                 collection: AssetCollection[T, P],
+                 collection_name: str,
+                 asset_type: Type[T],
+                 connection: MongoConnection,
+                 create_instance_method: Callable[[dict], T],
+                 preview_type: Optional[Type[P]] = None,
                  cache_config: CacheConfig = CacheConfig.default()):
-        """
-        Initialize AssetService with a pre-configured collection.
-
-        The item_type and preview_type are automatically extracted from the collection,
-        eliminating redundancy and simplifying the API.
-
-        Args:
-            collection: Pre-configured AssetCollection subclass
-            cache_config: Cache configuration
-        """
-        logger.debug(f"AssetService {self.__class__.__name__} initializing with collection")
-        super().__init__(
-            item_type=collection.type,
-            preview_type=collection.preview_type,
-            collection=collection,
-            cache_config=cache_config,
-        )
-        logger.debug(f"AssetService {self.__class__.__name__} initialized")
-
-    @classmethod
-    def from_config(cls,
-                    collection_name: str,
-                    asset_type: Type[T],
-                    connection: MongoConnection,
-                    create_instance_method: Callable[[dict], T],
-                    preview_type: Optional[Type[P]] = None,
-                    cache_config: CacheConfig = CacheConfig.default()) -> 'AssetService[T, P]':
-        """
-        Create an AssetService using the legacy configuration pattern.
-
-        This class method is provided for backward compatibility.
-        New code should use pre-configured AssetCollection subclasses.
-
-        Args:
-            collection_name: MongoDB collection name
-            asset_type: The asset model type
-            connection: MongoDB connection
-            create_instance_method: Factory method to create asset instances
-            preview_type: Optional preview type
-            cache_config: Cache configuration
-
-        Returns:
-            AssetService instance
-        """
-        logger.debug(f"AssetService creating from config for {collection_name}")
+        logger.debug(f"AssetService {self.__class__.__name__} initializing for {collection_name}")
         asset_collection = AssetCollection(
             collection=collection_name,
             asset_type=asset_type,
@@ -131,102 +62,13 @@ class AssetService(Generic[T, P], ChattyAssetContainerWithCollection[T, P]):
             create_instance_method=create_instance_method,
             preview_type=preview_type
         )
-        return cls(
+        super().__init__(
+            item_type=asset_type,
+            preview_type=preview_type,
             collection=asset_collection,
-            cache_config=cache_config
+            cache_config=cache_config,
         )
-
-    def _should_handle_events(self) -> bool:
-        """Check if this service should handle events automatically"""
-        return (self.asset_type_enum is not None and
-                self.event_type_created is not None and
-                self.event_type_updated is not None and
-                self.event_type_deleted is not None)
-
-    def _queue_event(self, item: T, event_type: 'EventType', execution_context: 'ExecutionContext', company_info: 'EmpresaModel'):
-        """Queue an event for this asset if event handling is enabled"""
-        if not self._should_handle_events() or not self.asset_type_enum:
-            return
-
-        try:
-            from ...services.factories.analytics.events_factory import EventFactory
-            from ...services.events import events_manager
-
-            # Type guard - company_id should exist on ChattyAssetModel
-            if not hasattr(item, 'company_id'):
-                logger.warning(f"Asset {type(item).__name__} missing company_id, skipping event")
-                return
-
-            events = EventFactory.asset_events(
-                company_id=item.company_id,  # type: ignore[attr-defined]
-                executor_id=execution_context.executor.id,
-                asset=item,
-                asset_type=self.asset_type_enum,
-                event_type=event_type,
-                time=execution_context.time,
-                trace_id=execution_context.trace_id,
-                executor_type=execution_context.executor.type,
-                company_info=company_info
-            )
-            events_manager.queue_events(events)
-        except ImportError:
-            # Events not available (microservice context) - skip
-            pass
-
-    # All methods are now async-only for better performance
-    async def insert(self, item: T, execution_context: 'ExecutionContext', company_info: Optional['EmpresaModel'] = None) -> T:
-        """Insert with automatic event handling if configured"""
-        result = await super().insert(item, execution_context)
-        if company_info and self._should_handle_events() and self.event_type_created:
-            self._queue_event(result, self.event_type_created, execution_context, company_info)
-        return result
-
-    async def update(self, id: str, new_item: T, execution_context: 'ExecutionContext', company_info: Optional['EmpresaModel'] = None) -> T:
-        """Update with automatic event handling if configured"""
-        result = await super().update(id, new_item, execution_context)
-        if company_info and self._should_handle_events() and self.event_type_updated:
-            self._queue_event(result, self.event_type_updated, execution_context, company_info)
-        return result
-
-    async def delete(self, id: str, execution_context: 'ExecutionContext', company_info: Optional['EmpresaModel'] = None, deletion_type: Optional['DeletionType'] = None) -> T:
-        """Delete with automatic event handling if configured"""
-        from ...models.utils.types.deletion_type import DeletionType as DT
-        result = await super().delete(id, execution_context, deletion_type or DT.LOGICAL)
-        if company_info and self._should_handle_events() and self.event_type_deleted:
-            self._queue_event(result, self.event_type_deleted, execution_context, company_info)
-        return result
-
-    async def restore(self, id: str, execution_context: 'ExecutionContext', company_info: Optional['EmpresaModel'] = None) -> T:
-        """Restore with automatic event handling if configured"""
-        result = await super().restore(id, execution_context)
-        if company_info and self._should_handle_events() and self.event_type_updated:
-            self._queue_event(result, self.event_type_updated, execution_context, company_info)
-        return result
-
-    # Generic convenience methods
-    async def create_asset(self, data: dict, execution_context: 'ExecutionContext', company_info: 'EmpresaModel') -> T:
-        """
-        Generic create method - creates instance from dict and inserts with events.
-        Can be called as create_asset or aliased to create_product/create_tag/etc.
-        """
-        data["company_id"] = execution_context.company_id
-        item = self.collection.create_instance(data)
-        return await self.insert(item, execution_context, company_info)
-
-    async def update_asset(self, id: str, data: dict, execution_context: 'ExecutionContext', company_info: 'EmpresaModel') -> T:
-        """
-        Generic update method - creates instance from dict and updates with events.
-        Can be called as update_asset or aliased to update_product/update_tag/etc.
-        """
-        new_item = self.collection.create_instance(data)
-        return await self.update(id, new_item, execution_context, company_info)
-
-    async def delete_asset(self, id: str, execution_context: 'ExecutionContext', company_info: 'EmpresaModel') -> T:
-        """
-        Generic delete method - deletes with events.
-        Can be called as delete_asset or aliased to delete_product/delete_tag/etc.
-        """
-        return await self.delete(id, execution_context, company_info)
+        logger.debug(f"AssetService {self.__class__.__name__} initialized for {collection_name}")
 
     def get_preview_type(self) -> Type[P]:
         """Get the preview type from the asset class if it has one"""
@@ -239,22 +81,3 @@ class AssetService(Generic[T, P], ChattyAssetContainerWithCollection[T, P]):
         preview_type = self.get_preview_type()
         return super().get_preview_by_id(id, company_id, preview_type)
 
-    # Additional async read methods (passthrough to base class)
-    async def get_by_id(self, id: str) -> T:
-        """Get by ID"""
-        return await super().get_by_id(id)
-
-    async def get_all(self, company_id: str) -> List[T]:
-        """Get all for company"""
-        return await super().get_all(company_id)
-
-    async def get_by_query(self, query: dict, company_id: Optional[str]) -> List[T]:
-        """Get by query"""
-        return await super().get_by_query(query, company_id)
-
-    async def get_item_dumped(self, id: str) -> dict:
-        """Get item by ID and return as JSON serialized dict for frontend"""
-        from ...models.utils.types.serializer_type import SerializerType
-        item = await self.get_by_id(id)
-        return item.model_dump_json(serializer=SerializerType.FRONTEND)
-

letschatty/services/chatty_assets/base_container.py

@@ -123,9 +123,8 @@ class ChattyAssetBaseContainer(Generic[T, P], ABC):
         else:
             return list(self.items.values())
 
-    async def get_all_dict_id_item(self, company_id:Optional[StrObjectId]) -> Dict[StrObjectId, T]:
-        items = await self.get_all(company_id)
-        return {item.id: item for item in items}
+    def get_all_dict_id_item(self, company_id:Optional[StrObjectId]) -> Dict[StrObjectId, T]:
+        return {item.id: item for item in self.get_all(company_id)}
 
     def get_all_previews(self, company_id:Optional[StrObjectId]) -> List[P]:
         logger.debug(f"Getting all previews for {self.__class__.__name__}")

letschatty/services/chatty_assets/base_container_with_collection.py

@@ -64,8 +64,7 @@ class ChattyAssetContainerWithCollection(ChattyAssetBaseContainer[T, P], ABC):
         self.update_previews_thread()
         self.load_from_db_thread(company_id=None)
 
-    # All methods are now async-only for better performance
-    async def insert(self, item: T, execution_context: ExecutionContext) -> T:
+    def insert(self, item: T, execution_context: ExecutionContext) -> T:
         """
         Add an item to the container and insert it into the database collection.
 
@@ -78,12 +77,12 @@ class ChattyAssetContainerWithCollection(ChattyAssetBaseContainer[T, P], ABC):
         """
         logger.debug(f"{self.__class__.__name__} inserting item {item}")
         inserted_item = super().insert(item)
-        await self.collection.insert(inserted_item)
+        self.collection.insert(inserted_item)
         execution_context.set_event_time(inserted_item.created_at)
         self.update_previews_thread()
         return inserted_item
 
-    async def update(self, id: str, new_item: T, execution_context: ExecutionContext) -> T:
+    def update(self, id: str, new_item: T, execution_context: ExecutionContext) -> T:
         """
         Update an item in the container and in the database collection.
 
@@ -106,18 +105,18 @@ class ChattyAssetContainerWithCollection(ChattyAssetBaseContainer[T, P], ABC):
             if id != updated_item.id:
                 logger.error(f"Item id {id} does not match updated item id {updated_item.id}")
                 raise ValueError(f"Item id {id} does not match updated item id {updated_item.id}")
-            await self.collection.update(updated_item)
+            self.collection.update(updated_item)
             execution_context.set_event_time(updated_item.updated_at)
             self.update_preview(updated_item)
             self.update_previews_thread()
             return updated_item
 
         except NotFoundError as e:
-            outdated_item = await self.collection.get_by_id(id)
+            outdated_item = self.collection.get_by_id(id)
             if outdated_item:
                 updated_item = outdated_item.update(new_item)
                 self.items[id] = updated_item
-                await self.collection.update(updated_item)
+                self.collection.update(updated_item)
                 execution_context.set_event_time(updated_item.updated_at)
                 self.update_previews_thread()
                 return updated_item
@@ -126,7 +125,7 @@ class ChattyAssetContainerWithCollection(ChattyAssetBaseContainer[T, P], ABC):
                 f"Item with id {id} not found in {self.__class__.__name__} nor in collection DB"
             )
 
-    async def delete(self, id: str, execution_context: ExecutionContext,deletion_type : DeletionType = DeletionType.LOGICAL) -> T:
+    def delete(self, id: str, execution_context: ExecutionContext,deletion_type : DeletionType = DeletionType.LOGICAL) -> T:
         """
         Delete an item from the container and the collection.
 
@@ -143,16 +142,16 @@ class ChattyAssetContainerWithCollection(ChattyAssetBaseContainer[T, P], ABC):
             deleted_item = super().delete(id)
             self.delete_preview(id)
             execution_context.set_event_time(datetime.now(ZoneInfo("UTC")))
-            await self.collection.delete(id, deletion_type)
+            self.collection.delete(id, deletion_type)
             return deleted_item
         except NotFoundError as e:
-            await self.collection.delete(id, deletion_type)
+            self.collection.delete(id, deletion_type)
             self.delete_preview(id)
             self.update_previews_thread()
             execution_context.set_event_time(datetime.now(ZoneInfo("UTC")))
-            return await self.collection.get_by_id(id)
+            return self.collection.get_by_id(id)
 
-    async def get_by_id(self, id: str) -> T:
+    def get_by_id(self, id: str) -> T:
         """
         Get an item from the container.
 
@@ -175,7 +174,7 @@ class ChattyAssetContainerWithCollection(ChattyAssetBaseContainer[T, P], ABC):
             #     #if they are supposed to be in memory, we raise an error since it shouldn't be in the collection DB
             #     raise NotFoundError(f"Item with id {id} not found in {self.__class__.__name__} nor in collection DB")
             logger.debug(f"{self.__class__.__name__} getting item {id} not found in container, trying to get from collection")
-            item = await self.collection.get_by_id(id)
+            item = self.collection.get_by_id(id)
             if item:
                 if item.deleted_at is not None:
                     return item
@@ -240,7 +239,7 @@ class ChattyAssetContainerWithCollection(ChattyAssetBaseContainer[T, P], ABC):
             logger.debug(f"Clearing previews cache of {self.__class__.__name__}")
             self.set_preview_items([])
 
-    async def get_all(self, company_id: Optional[StrObjectId]) -> List[T]:
+    def get_all(self, company_id: Optional[StrObjectId]) -> List[T]:
         # Get items from memory
         logger.debug(f"{self.__class__.__name__} getting all items from memory and collection")
         memory_items = super().get_all(company_id=company_id)
@@ -248,7 +247,7 @@ class ChattyAssetContainerWithCollection(ChattyAssetBaseContainer[T, P], ABC):
         memory_ids = [ObjectId(item.id) for item in memory_items]
         # Build the query for collection items
         query = {"deleted_at": None, "_id": {"$nin": memory_ids}}
-        collection_items = await self.collection.get_docs(query=query, company_id=company_id)
+        collection_items = self.collection.get_docs(query=query, company_id=company_id)
         all_items = memory_items + collection_items
         return sorted(all_items, key=lambda x: x.created_at, reverse=True)
 
@@ -262,8 +261,6 @@ class ChattyAssetContainerWithCollection(ChattyAssetBaseContainer[T, P], ABC):
     def update_previews_thread(self):
         """We start a thread to update the previews cache so it doesn't block the main thread"""
         # self.update_previews_cache()
-        if not self.cache_config.keep_previews_always_in_memory:
-            return
         thread = threading.Thread(target=self.update_previews_cache)
         thread.start()
 
@@ -278,13 +275,13 @@ class ChattyAssetContainerWithCollection(ChattyAssetBaseContainer[T, P], ABC):
         self.set_preview_items(collection_items)
         return collection_items
 
-    async def get_by_query(self, query: dict, company_id: Optional[StrObjectId]) -> List[T]:
+    def get_by_query(self, query: dict, company_id: Optional[StrObjectId]) -> List[T]:
         logger.debug(f"{self.__class__.__name__} getting items by query {query} from collection")
-        return await self.collection.get_docs(query=query, company_id=company_id)
+        return self.collection.get_docs(query=query, company_id=company_id)
 
-    async def get_deleted(self, company_id: Optional[StrObjectId]) -> List[T]:
+    def get_deleted(self, company_id: Optional[StrObjectId]) -> List[T]:
         logger.debug(f"{self.__class__.__name__} getting deleted items from collection")
-        return await self.collection.get_docs(query={"deleted_at": {"$ne": None}}, company_id=company_id)
+        return self.collection.get_docs(query={"deleted_at": {"$ne": None}}, company_id=company_id)
 
     def load_from_db_thread(self, company_id: Optional[StrObjectId]):
         """We start a thread to load the items from the database so it doesn't block the main thread"""
@@ -295,27 +292,21 @@ class ChattyAssetContainerWithCollection(ChattyAssetBaseContainer[T, P], ABC):
         thread.start()
 
     def load_from_db(self, company_id: Optional[StrObjectId]):
-        """Pass company_id=None to load all items from the database. Uses sync client for background loading."""
+        """Pass company_id=None to load all items from the database."""
         logger.debug(f"{self.__class__.__name__} loading items from collection")
-        # Background loading uses sync client (less critical, runs in thread)
-        query: Dict[str, Any] = {"deleted_at": None}
-        if company_id:
-            query["company_id"] = company_id
-        docs = list(self.collection.collection.find(filter=query))
-        # Create instances once and reuse
-        loaded_items = [self.collection.create_instance(doc) for doc in docs]
-        self.items = {item.id: item for item in loaded_items}
-
-    async def restore(self, id: str, execution_context: ExecutionContext) -> T:
+        # self.items = {item.id: item for item in self.collection.get_docs(query={}, company_id=company_id)}
+        self.items = {item.id: item for item in self.collection.get_docs(query={"deleted_at": None}, company_id=company_id)}
+
+    def restore(self, id: str, execution_context: ExecutionContext) -> T:
         logger.debug(f"{self.__class__.__name__} restoring item {id} with execution context {execution_context}")
         if id in self.items:
             raise ValueError(f"Item with id {id} already exists in {self.__class__.__name__}")
-        restored_item = await self.collection.get_by_id(id)
+        restored_item = self.collection.get_by_id(id)
         if restored_item is None:
             raise NotFoundError(f"Item with id {id} not found in collection DB")
         restored_item.deleted_at = None
         restored_item.update_now()
         execution_context.set_event_time(restored_item.updated_at)
         self.items[id] = restored_item
-        await self.collection.update(restored_item)
-        return restored_item
+        self.collection.update(restored_item)
+        return restored_item

letschatty/services/continuous_conversation_service/continuous_conversation_helper.py

@@ -269,15 +269,4 @@ class ContinuousConversationHelper:
         central_notif_content = ChattyContentCentral(body=body, status=CentralNotificationStatus.WARNING, calls_to_action=[cta.value for cta in cc.calls_to_action])
         central_notif = CentralNotificationFactory.continuous_conversation_status(cc=cc, content=central_notif_content)
         ChatService.add_central_notification(central_notification=central_notif, chat=chat)
-        return cc
-
-    @staticmethod
-    def handle_failed_template_cc(chat: Chat, cc: ContinuousConversation, error_details: str) -> ContinuousConversation:
-        """This is for the handling of a failed template CC"""
-        cc.set_status(status=ContinuousConversationStatus.FAILED)
-        body=f"Continuous conversation failed to be sent: {error_details}"
-        logger.debug(f"{body} | CC status: {cc.status} | CC id: {cc.id} | chat id: {chat.identifier}")
-        central_notif_content = ChattyContentCentral(body=body, status=CentralNotificationStatus.ERROR, calls_to_action=[cta.value for cta in cc.calls_to_action])
-        central_notif = CentralNotificationFactory.continuous_conversation_status(cc=cc, content=central_notif_content)
-        ChatService.add_central_notification(central_notification=central_notif, chat=chat)
         return cc

letschatty/services/events/events_manager.py

@@ -1,219 +1,2 @@
-"""
-Events Manager - Handles queuing and publishing events to EventBridge
+from letschatty.models.base_models.singleton import SingletonMeta
 
-This is a generic implementation that can be configured for different environments.
-"""
-from ...models.base_models.singleton import SingletonMeta
-from ...models.analytics.events.base import Event, EventType
-from typing import List, Optional, Callable
-import logging
-import boto3
-import queue
-import threading
-import time
-from datetime import datetime
-from zoneinfo import ZoneInfo
-import os
-import json
-
-logger = logging.getLogger("EventsManager")
-
-
-class EventsManager(metaclass=SingletonMeta):
-    """
-    Manages event queuing and publishing to AWS EventBridge.
-
-    Can be configured via environment variables or init parameters.
-    """
-
-    def __init__(self,
-                 event_bus_name: Optional[str] = None,
-                 source: Optional[str] = None,
-                 publish_events: Optional[bool] = None,
-                 failed_events_callback: Optional[Callable] = None):
-        """
-        Initialize EventsManager.
-
-        Args:
-            event_bus_name: AWS EventBridge event bus name (or uses env var)
-            source: Source identifier for events (or uses env var)
-            publish_events: Whether to publish events (or uses env var)
-            failed_events_callback: Optional callback for handling failed events
-        """
-        self.events_queue: queue.Queue[Event] = queue.Queue()
-        self.eventbridge_client = boto3.client('events', region_name='us-east-1')
-
-        # Configuration - prefer parameters, fall back to env vars
-        self.event_bus_name = event_bus_name or os.getenv('CHATTY_EVENT_BUS_NAME', 'chatty-events')
-        self.source = source or os.getenv('CHATTY_EVENT_SOURCE')
-        if not self.source:
-            raise ValueError("Source must be provided either as a parameter or through the CHATTY_EVENT_SOURCE environment variable.")
-        self.publish_events = publish_events if publish_events is not None else os.getenv('PUBLISH_EVENTS_TO_EVENTBRIDGE', 'true').lower() == 'true'
-
-        self.max_retries = 3
-        self.thread_lock = threading.Lock()
-        self.thread_running = False
-        self.max_thread_runtime = 300
-        self.failed_events_callback = failed_events_callback
-
-        logger.debug(f"EventsManager initialized: bus={self.event_bus_name}, source={self.source}, publish={self.publish_events}")
-
-    def queue_events(self, events: List[Event]):
-        """Queue events and spawn a thread to publish them if one isn't already running"""
-        if not self.publish_events:
-            logger.debug("Event publishing disabled, skipping")
-            return
-
-        for event in events:
-            logger.debug(f"Queueing event: {event.type.value} {event.company_id}")
-            logger.debug(f"Event: {event.model_dump_json()}")
-            self.events_queue.put(event)
-
-        logger.debug(f"Queued {len(events)} events")
-        if events:
-            logger.debug(f"1° event: {events[0].model_dump_json()}")
-
-        # Only start a new thread if one isn't already running
-        with self.thread_lock:
-            if not self.thread_running:
-                logger.debug("Starting publisher thread")
-                self.thread_running = True
-                thread = threading.Thread(
-                    target=self._process_queue,
-                    daemon=True,
-                    name="EventBridge-Publisher"
-                )
-                thread.start()
-                logger.debug("Started publisher thread")
-            else:
-                logger.debug("Publisher thread already running, using existing thread")
-
-    def _process_queue(self):
-        """Process all events in the queue and then terminate"""
-        try:
-            start_time = time.time()
-            while not self.events_queue.empty():
-                logger.debug("Processing queue")
-                events_batch = []
-                if time.time() - start_time > self.max_thread_runtime:
-                    logger.warning(f"Thread ran for more than {self.max_thread_runtime}s - terminating")
-                    break
-
-                # Collect up to 10 events (EventBridge limit)
-                for _ in range(10):
-                    try:
-                        event = self.events_queue.get(timeout=0.5)
-                        events_batch.append(event)
-                        self.events_queue.task_done()
-                    except queue.Empty:
-                        logger.debug("Queue is empty")
-                        break
-
-                # Publish this batch
-                if events_batch:
-                    self._publish_batch(events_batch)
-
-        except Exception as e:
-            logger.exception(f"Error in publisher thread: {str(e)}")
-
-        finally:
-            # Mark thread as completed
-            with self.thread_lock:
-                self.thread_running = False
-
-    def _publish_batch(self, events: List[Event]):
-        """Send a batch of events to EventBridge with retries"""
-        if not events:
-            return
-
-        entries = []
-        for event in events:
-            entry = {
-                'Source': self.source,
-                'DetailType': event.type.value,
-                'Detail': json.dumps(event.model_dump_json()),
-                'EventBusName': self.event_bus_name
-            }
-            logger.debug(f"Appending event: {event.type.value}")
-            entries.append(entry)
-
-        for retry in range(self.max_retries):
-            try:
-                logger.debug(f"Sending {len(entries)} events to EventBridge")
-                logger.debug(f"Entries: {entries}")
-                response = self.eventbridge_client.put_events(Entries=entries)
-                logger.debug(f"Response: {response}")
-
-                if response.get('FailedEntryCount', 0) == 0:
-                    logger.info(f"Successfully published {len(events)} events")
-                    return
-
-                # Handle partial failures
-                failed_entries: List[dict] = []
-                failed_events: List[Event] = []
-
-                for i, result in enumerate(response.get('Entries', [])):
-                    if 'ErrorCode' in result:
-                        failed_entries.append(entries[i])
-                        failed_events.append(events[i])
-                        logger.error(f"Failed to publish event: {events[i].type.value}")
-
-                if retry < self.max_retries - 1 and failed_entries:
-                    logger.info(f"Retrying {len(failed_entries)} events")
-                    entries = failed_entries
-                    events = failed_events
-                else:
-                    # Store failed events via callback if provided
-                    if self.failed_events_callback and failed_events:
-                        failed_events_with_errors = []
-                        for i, event in enumerate(failed_events):
-                            result = response.get('Entries', [])[i]
-                            failed_event_data = {
-                                "event": event.model_dump_json(),
-                                "error_code": result.get('ErrorCode'),
-                                "error_message": result.get('ErrorMessage'),
-                                "retry_count": self.max_retries,
-                                "timestamp": datetime.now(ZoneInfo("UTC"))
-                            }
-                            failed_events_with_errors.append(failed_event_data)
-
-                        try:
-                            self.failed_events_callback(failed_events_with_errors)
-                        except Exception as e:
-                            logger.error(f"Error calling failed_events_callback: {e}")
-
-                    logger.error(f"Gave up on {len(failed_entries)} events after {self.max_retries} attempts")
-                    return
-
-            except Exception as e:
-                if retry < self.max_retries - 1:
-                    logger.warning(f"Error publishing events (attempt {retry+1}/{self.max_retries}): {str(e)}")
-                    time.sleep(0.5 * (2 ** retry))  # Exponential backoff
-                else:
-                    logger.exception(f"Failed to publish events after {self.max_retries} attempts")
-                    return
-
-    def flush(self):
-        """Wait for all queued events to be processed"""
-        # If no thread is running but we have events, start one
-        with self.thread_lock:
-            if not self.thread_running and not self.events_queue.empty():
-                self.thread_running = True
-                thread = threading.Thread(
-                    target=self._process_queue,
-                    daemon=True,
-                    name="EventBridge-Publisher"
-                )
-                thread.start()
-
-        # Wait for queue to be empty
-        try:
-            self.events_queue.join()
-            return True
-        except Exception:
-            logger.warning("Error waiting for events queue to complete")
-            return False
-
-
-# Singleton instance
-events_manager = EventsManager()