vital-agent-container-sdk 0.1.1__tar.gz → 0.1.2__tar.gz

{vital_agent_container_sdk-0.1.1/vital_agent_container_sdk.egg-info → vital_agent_container_sdk-0.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vital-agent-container-sdk
-Version: 0.1.1
+Version: 0.1.2
 Summary: Vital Agent Container SDK
 Home-page: https://github.com/vital-ai/vital-agent-container-python
 Author: Marc Hadfield
@@ -12,8 +12,8 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: vital-ai-vitalsigns==0.1.19
-Requires-Dist: vital-ai-aimp==0.1.6
+Requires-Dist: vital-ai-vitalsigns==0.1.20
+Requires-Dist: vital-ai-aimp==0.1.7
 Requires-Dist: httpx==0.26.0
 Requires-Dist: python-json-logger==2.0.7
 Requires-Dist: python-dotenv==1.0.1

{vital_agent_container_sdk-0.1.1 → vital_agent_container_sdk-0.1.2}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='vital-agent-container-sdk',
-    version='0.1.1',
+    version='0.1.2',
     author='Marc Hadfield',
     author_email='marc@vital.ai',
     description='Vital Agent Container SDK',
@@ -21,8 +21,8 @@ setup(
     },
     license='Apache License 2.0',
     install_requires=[
-        'vital-ai-vitalsigns==0.1.19',
-        'vital-ai-aimp==0.1.6',
+        'vital-ai-vitalsigns==0.1.20',
+        'vital-ai-aimp==0.1.7',
         'httpx==0.26.0',
         'python-json-logger==2.0.7',
         'python-dotenv==1.0.1',

{vital_agent_container_sdk-0.1.1 → vital_agent_container_sdk-0.1.2}/test/test_app.py

@@ -8,6 +8,7 @@ def main():
     print('Test Agent Container App')
 
     current_file_directory = os.path.dirname(os.path.abspath(__file__))
+
     parent_directory = os.path.dirname(current_file_directory)
 
     app_home = parent_directory

{vital_agent_container_sdk-0.1.1 → vital_agent_container_sdk-0.1.2}/vital_agent_container/agent_container_app.py

@@ -42,11 +42,13 @@ class AgentContainerApp(FastAPI):
         self.app_home = app_home
         load_dotenv()
         self.config = ConfigUtils.load_config(app_home)
+        self.message_processor = AIMPMessageProcessor()
         self.add_routes()
 
     async def process_ws_message(self, client: httpx.AsyncClient, websocket: WebSocket, data: str,
                                  started_event: asyncio.Event):
-        await AIMPMessageProcessor.process_message(self.handler, self.config, client, websocket, data, started_event)
+        print(f"process_ws_message: Processing: {data}")
+        await self.message_processor.process_message(self.handler, self.config, client, websocket, data, started_event)
 
     def add_routes(self):
         @self.get("/health")
@@ -67,8 +69,9 @@ class AgentContainerApp(FastAPI):
 
                     logger.info(f"Received message from {websocket.client.host}:{websocket.client.port}: {data}")
                     message_obj = json.loads(data)
-                    message_type = message_obj[0].get("type")
-                    message_intent = message_obj[0].get("http://vital.ai/ontology/vital-aimp#hasIntent")
+                    logger.info(f"Received message: {message_obj}")
+                    message_type = message_obj[0].get("type", None)
+                    message_intent = message_obj[0].get("http://vital.ai/ontology/vital-aimp#hasIntent", None)
                     logger.info(f"message_type: {message_type}")
                     logger.info(f"message_intent: {message_intent}")
 
@@ -96,9 +99,12 @@ class AgentContainerApp(FastAPI):
                     else:
                         logger.info(f"Processing message: {data}")
                         started_event = asyncio.Event()
-                        task = asyncio.create_task(self.process_ws_message(self.handler, client, websocket, data, started_event))
+                        task = asyncio.create_task(self.process_ws_message(client, websocket, data, started_event))
                         background_tasks.append(task)
                         await started_event.wait()
+                        logger.info(f"Completed Processing message: {data}")
+                        # break out of infinite loop
+                        break
             except WebSocketDisconnect:
                 logger.info("WebSocket connection closed by the client.")
                 # still try to close it in finally?

vital_agent_container_sdk-0.1.2/vital_agent_container/handler/aimp_message_handler_inf.py

@@ -0,0 +1,14 @@
+import asyncio
+import httpx
+from starlette.websockets import WebSocket
+from abc import ABC, abstractmethod
+
+
+class AIMPMessageHandlerInf(ABC):
+
+    @abstractmethod
+    async def process_message(self, config, client: httpx.AsyncClient, websocket: WebSocket, data: str, started_event: asyncio.Event):
+        pass
+
+
+

vital_agent_container_sdk-0.1.2/vital_agent_container/handler/impl/aimp_echo_message_handler.py

@@ -0,0 +1,23 @@
+import asyncio
+import httpx
+from starlette.websockets import WebSocket
+from vital_agent_container.handler.aimp_message_handler_inf import AIMPMessageHandlerInf
+
+
+class AIMPEchoMessageHandler(AIMPMessageHandlerInf):
+    async def process_message(self, config, client: httpx.AsyncClient, websocket: WebSocket, data: str, started_event: asyncio.Event):
+        try:
+            print(f"Received Message: {data}")
+            await websocket.send_text(data)
+            print(f"Sent Message: {data}")
+            # await websocket.close(1000, "Processing Complete")
+            # print(f"Websocket closed.")
+            started_event.set()
+            print(f"Completed Event.")
+        except asyncio.CancelledError:
+            # log canceling
+            raise
+
+
+
+

vital_agent_container_sdk-0.1.2/vital_agent_container/processor/aimp_message_processor.py

@@ -0,0 +1,18 @@
+import asyncio
+
+from vital_agent_container.handler.aimp_message_handler_inf import AIMPMessageHandlerInf
+
+
+class AIMPMessageProcessor:
+
+    def __init__(self):
+        pass
+
+    async def process_message(self, handler: AIMPMessageHandlerInf, app_config, client, websocket, data, started_event):
+        print(f"Processing: {data}")
+        try:
+            return await handler.process_message(app_config, client, websocket, data, started_event)
+        except asyncio.CancelledError:
+            # log canceling
+            raise
+

{vital_agent_container_sdk-0.1.1 → vital_agent_container_sdk-0.1.2/vital_agent_container_sdk.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vital-agent-container-sdk
-Version: 0.1.1
+Version: 0.1.2
 Summary: Vital Agent Container SDK
 Home-page: https://github.com/vital-ai/vital-agent-container-python
 Author: Marc Hadfield
@@ -12,8 +12,8 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: vital-ai-vitalsigns==0.1.19
-Requires-Dist: vital-ai-aimp==0.1.6
+Requires-Dist: vital-ai-vitalsigns==0.1.20
+Requires-Dist: vital-ai-aimp==0.1.7
 Requires-Dist: httpx==0.26.0
 Requires-Dist: python-json-logger==2.0.7
 Requires-Dist: python-dotenv==1.0.1

{vital_agent_container_sdk-0.1.1 → vital_agent_container_sdk-0.1.2}/vital_agent_container_sdk.egg-info/requires.txt

@@ -1,5 +1,5 @@
-vital-ai-vitalsigns==0.1.19
-vital-ai-aimp==0.1.6
+vital-ai-vitalsigns==0.1.20
+vital-ai-aimp==0.1.7
 httpx==0.26.0
 python-json-logger==2.0.7
 python-dotenv==1.0.1

vital_agent_container_sdk-0.1.1/vital_agent_container/handler/aimp_message_handler_inf.py

@@ -1,5 +0,0 @@
-
-
-class AIMPMessageHandlerInf:
-    pass
-

vital_agent_container_sdk-0.1.1/vital_agent_container/handler/impl/aimp_echo_message_handler.py

@@ -1,7 +0,0 @@
-from vital_agent_container.handler.aimp_message_handler_inf import AIMPMessageHandlerInf
-
-
-class AIMPEchoMessageHandler(AIMPMessageHandlerInf):
-    pass
-
-

vital_agent_container_sdk-0.1.1/vital_agent_container/processor/aimp_message_processor.py

@@ -1,9 +0,0 @@
-
-
-class AIMPMessageProcessor:
-
-    def __init__(self):
-        pass
-
-    async def process_message(self, handler, app_config, client, websocket, data, started_event):
-        pass