fdc-shared-kernel 0.0.159__tar.gz → 0.0.161__tar.gz

{fdc_shared_kernel-0.0.159 → fdc_shared_kernel-0.0.161}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fdc_shared_kernel
-Version: 0.0.159
+Version: 0.0.161
 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
@@ -24,7 +24,8 @@ Requires-Dist: pytest==8.2.2
 Requires-Dist: pytest-asyncio==0.23.8
 Requires-Dist: python-dotenv==1.0.1
 Requires-Dist: setuptools==71.0.0
-Requires-Dist: SQLAlchemy==2.0.31
+Requires-Dist: SQLAlchemy==1.4.54
+Requires-Dist: sqlalchemy-redshift==0.8.14
 Requires-Dist: typing_extensions==4.12.2
 Requires-Dist: boto3==1.35.4
 Requires-Dist: azure-keyvault-secrets==4.8.0

{fdc_shared_kernel-0.0.159 → fdc_shared_kernel-0.0.161}/fdc_shared_kernel.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fdc_shared_kernel
-Version: 0.0.159
+Version: 0.0.161
 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
@@ -24,7 +24,8 @@ Requires-Dist: pytest==8.2.2
 Requires-Dist: pytest-asyncio==0.23.8
 Requires-Dist: python-dotenv==1.0.1
 Requires-Dist: setuptools==71.0.0
-Requires-Dist: SQLAlchemy==2.0.31
+Requires-Dist: SQLAlchemy==1.4.54
+Requires-Dist: sqlalchemy-redshift==0.8.14
 Requires-Dist: typing_extensions==4.12.2
 Requires-Dist: boto3==1.35.4
 Requires-Dist: azure-keyvault-secrets==4.8.0

{fdc_shared_kernel-0.0.159 → fdc_shared_kernel-0.0.161}/fdc_shared_kernel.egg-info/requires.txt

@@ -14,7 +14,8 @@ pytest==8.2.2
 pytest-asyncio==0.23.8
 python-dotenv==1.0.1
 setuptools==71.0.0
-SQLAlchemy==2.0.31
+SQLAlchemy==1.4.54
+sqlalchemy-redshift==0.8.14
 typing_extensions==4.12.2
 boto3==1.35.4
 azure-keyvault-secrets==4.8.0

{fdc_shared_kernel-0.0.159 → fdc_shared_kernel-0.0.161}/pyproject.toml

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

{fdc_shared_kernel-0.0.159 → fdc_shared_kernel-0.0.161}/requirements.txt

@@ -14,7 +14,8 @@ pytest==8.2.2
 pytest-asyncio==0.23.8
 python-dotenv==1.0.1
 setuptools==71.0.0
-SQLAlchemy==2.0.31
+SQLAlchemy==1.4.54
+sqlalchemy-redshift==0.8.14
 typing_extensions==4.12.2
 boto3==1.35.4
 azure-keyvault-secrets==4.8.0

{fdc_shared_kernel-0.0.159 → fdc_shared_kernel-0.0.161}/shared_kernel/agent_communication_channel/agent_channel.py

@@ -1,3 +1,5 @@
+from threading import Event
+from queue import Empty as QueueEmpty
 from shared_kernel.agent_communication_channel.event_channel import EventChannel
 
 
@@ -9,15 +11,44 @@ class AgentChannel:
         self._streaming = False
 
     # ---------- public contexts ----------
-    def wait_for_user_input(self):
-        """Context that blocks for user input and auto-ends processing on exit."""
+    def wait_for_user_input(self, stop_event: Event = None, timeout: float = None):
+        """
+        Context that blocks for user input and auto-ends processing on exit.
+
+        Args:
+            stop_event: Optional Event to check for early termination
+            timeout: Optional timeout in seconds for periodic stop_event checks (default: 1.0s)
+        """
 
         class _UserInputCtx:
-            def __init__(_self, outer: "AgentChannel"):
+            def __init__(
+                _self, outer: "AgentChannel", stop_event: Event, timeout: float
+            ):
                 _self._outer = outer
+                _self._stop_event = stop_event
+                _self._timeout = (
+                    timeout if timeout is not None else 1.0
+                )  # default 1s polling
 
             def __enter__(_self):
-                return _self._outer.channel.wait_for_user_input()
+                # if stop_event provided, poll with timeout
+                if _self._stop_event:
+                    while not _self._stop_event.is_set():
+                        try:
+                            # wait with timeout to periodically check stop_event
+                            user_input = _self._outer.channel.wait_for_user_input(
+                                timeout=_self._timeout
+                            )
+                            return user_input  # got input
+                        except QueueEmpty:
+                            # timeout - loop to check stop_event again
+                            continue
+
+                    # stop event was set
+                    return None
+                else:
+                    # no stop_event - original blocking behavior
+                    return _self._outer.channel.wait_for_user_input()
 
             def __exit__(_self, exc_type, exc, tb):
                 if _self._outer._processing_started:
@@ -25,7 +56,7 @@ class AgentChannel:
                     _self._outer._publish("AgentProcessingEnd")
                     _self._outer._processing_started = False
 
-        return _UserInputCtx(self)
+        return _UserInputCtx(self, stop_event, timeout)
 
     def start_step(self, message: str, *, is_streaming: bool = False):
         class _StepCtx:

{fdc_shared_kernel-0.0.159 → fdc_shared_kernel-0.0.161}/shared_kernel/agent_communication_channel/event_channel.py

@@ -23,11 +23,34 @@ class EventChannel:
             {"event": "UserSendsInput", "payload": {"message": user_input}}
         )
 
-    def wait_for_user_input(self) -> str:
+    def wait_for_user_input(self, timeout: Optional[float] = None) -> str:
+        """
+        Wait for user input from the queue.
+
+        Args:
+            timeout: Optional timeout in seconds. If None, blocks indefinitely.
+                    If timeout expires, raises queue.Empty.
+
+        Returns:
+            User input string
+
+        Raises:
+            queue.Empty: If timeout expires before receiving input
+        """
         while True:
-            event: dict = self.user_to_agent_queue.get()
-            if event.get("event") == "UserSendsInput":
-                return event["payload"]["message"]
+            try:
+                # use timeout parameter for queue.get()
+                event: dict = self.user_to_agent_queue.get(block=True, timeout=timeout)
+
+                if event.get("event") == "UserSendsInput":
+                    return event["payload"]["message"]
+
+                # if event is not UserSendsInput, continue waiting
+                # (respecting remaining timeout via queue behavior)
+
+            except queue.Empty:
+                # timeout expired
+                raise
 
     # --- agent -> user ---
     def publish_event(self, event_name: str, payload: dict = None):