model-compose 0.4.40__tar.gz → 0.4.42__tar.gz

{model_compose-0.4.40 → model_compose-0.4.42}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: model-compose
-Version: 0.4.40
+Version: 0.4.42
 Summary: model-compose: Declarative AI Workflow Orchestrator
 Author-email: Hanyeol Cho <hanyeol.cho@gmail.com>
 License-Expression: MIT

{model_compose-0.4.40 → model_compose-0.4.42}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "model-compose"
-version = "0.4.40"
+version = "0.4.42"
 description = "model-compose: Declarative AI Workflow Orchestrator"
 authors = [
     { name = "Hanyeol Cho", email = "hanyeol.cho@gmail.com" }

{model_compose-0.4.40 → model_compose-0.4.42}/src/mindor/core/component/services/websocket_server.py

@@ -3,13 +3,33 @@ from mindor.dsl.schema.component import WebSocketServerComponentConfig
 from mindor.dsl.schema.action import ActionConfig, WebSocketServerActionConfig
 from mindor.dsl.schema.action.impl.websocket_server import WebSocketReceiveFormat
 from mindor.core.utils.websocket_client import WebSocketClient, WebSocketConnection
-from mindor.core.utils.streaming import BytesStreamResource
+from mindor.core.utils.streaming import BytesStreamResource, StreamResource
 from mindor.core.utils.shell import run_command_streaming
 from mindor.core.utils.time import parse_duration
 from ..base import ComponentService, ComponentType, ComponentGlobalConfigs, register_component
 from ..context import ComponentActionContext
+from collections.abc import AsyncIterator
 import asyncio, json
 
+class WebSocketBinaryStreamResource(StreamResource):
+    def __init__(self, connection: WebSocketConnection, owned: bool):
+        super().__init__("application/octet-stream", None)
+        self._connection = connection
+        self._owned = owned
+
+    async def close(self) -> None:
+        if self._owned and self._connection:
+            await self._connection.close()
+            self._connection = None
+
+    async def _iterate_stream(self) -> AsyncIterator[bytes]:
+        try:
+            async for frame in self._connection.receive_frames():
+                if isinstance(frame, bytes):
+                    yield frame
+        finally:
+            await self.close()
+
 class WebSocketConnector:
     def __init__(self, client: WebSocketClient, params: Optional[Dict[str, Any]] = None):
         self._client: WebSocketClient = client
@@ -67,7 +87,9 @@ class WebSocketServerAction:
                 await self._send(connection, message)
 
             if context.contains_variable_reference("response[]", self.config.output):
-                return self._receive_stream(connection, format, context)
+                if format == WebSocketReceiveFormat.BINARY:
+                    return WebSocketBinaryStreamResource(connection, owned)
+                return self._receive_stream(connection, format, context, connection if owned else None)
 
             response = await self._receive(connection, format, collect)
         except:
@@ -123,12 +145,16 @@ class WebSocketServerAction:
                 return frame
         return None
 
-    async def _receive_stream(self, connection: WebSocketConnection, format: WebSocketReceiveFormat, context: ComponentActionContext):
-        async for frame in connection.receive_frames():
-            frame = self._decode_frame(frame, format)
-            if frame is not None:
-                context.register_source("response[]", frame)
-                yield await context.render_variable(self.config.output, ignore_files=True)
+    async def _receive_stream(self, connection: WebSocketConnection, format: WebSocketReceiveFormat, context: ComponentActionContext, owned_connection: Optional[WebSocketConnection] = None):
+        try:
+            async for frame in connection.receive_frames():
+                frame = self._decode_frame(frame, format)
+                if frame is not None:
+                    context.register_source("response[]", frame)
+                    yield await context.render_variable(self.config.output, ignore_files=True)
+        finally:
+            if owned_connection:
+                await owned_connection.close()
 
     def _decode_frame(self, frame: Any, format: WebSocketReceiveFormat) -> Any:
         if format == WebSocketReceiveFormat.BINARY and isinstance(frame, bytes):
@@ -194,11 +220,14 @@ class WebSocketServerComponent(ComponentService):
 
     async def _is_ready(self) -> bool:
         try:
-            _, writer = await asyncio.open_connection("localhost", self.config.port)
+            reader, writer = await asyncio.open_connection("localhost", self.config.port)
+            writer.write(b"GET / HTTP/1.0\r\nHost: localhost\r\n\r\n")
+            await writer.drain()
+            response = await asyncio.wait_for(reader.read(12), timeout=2)
             writer.close()
             await writer.wait_closed()
-            return True
-        except (ConnectionRefusedError, OSError):
+            return response.startswith(b"HTTP/")
+        except Exception:
             return False
 
     async def _run(self, action: ActionConfig, context: ComponentActionContext) -> Any:

{model_compose-0.4.40 → model_compose-0.4.42}/src/model_compose.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: model-compose
-Version: 0.4.40
+Version: 0.4.42
 Summary: model-compose: Declarative AI Workflow Orchestrator
 Author-email: Hanyeol Cho <hanyeol.cho@gmail.com>
 License-Expression: MIT