model-compose 0.3.11__tar.gz → 0.3.12__tar.gz

{model_compose-0.3.11/src/model_compose.egg-info → model_compose-0.3.12}/PKG-INFO

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

{model_compose-0.3.11 → model_compose-0.3.12}/pyproject.toml

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

{model_compose-0.3.11 → model_compose-0.3.12}/src/mindor/core/component/services/http_client.py

@@ -2,14 +2,15 @@ from typing import Type, Union, Literal, Optional, Dict, List, Tuple, Set, Annot
 from abc import ABC, abstractmethod
 from mindor.dsl.schema.component import HttpClientComponentConfig
 from mindor.dsl.schema.action import ActionConfig, HttpClientActionConfig, HttpClientCompletionType, HttpClientCompletionConfig
+from mindor.dsl.schema.transport.http import HttpStreamFormat
 from mindor.core.listener import HttpCallbackListener
-from mindor.core.utils.http_client import HttpClient
+from mindor.core.utils.http_client import HttpClient, HttpEventStreamResource
 from mindor.core.utils.http_status import is_status_code_matched
 from mindor.core.utils.time import parse_duration
 from ..base import ComponentService, ComponentType, ComponentGlobalConfigs, register_component
 from ..context import ComponentActionContext
 from datetime import datetime, timezone
-import asyncio
+import asyncio, json
 
 class HttpClientCompletion(ABC):
     def __init__(self, config: HttpClientCompletionConfig):
@@ -94,10 +95,28 @@ class HttpClientAction:
         headers     = await context.render_variable(self.config.headers)
 
         response, result = await client.request(url_or_path, method, params, body, headers), None
+
+        if isinstance(response, HttpEventStreamResource) and context.contains_variable_reference("response[]", self.config.output):
+            async def _stream_generator(stream: HttpEventStreamResource):
+                async for chunk in stream:
+                    context.register_source("response[]", self._convert_stream_chunk(chunk))
+                    yield await context.render_variable(self.config.output, ignore_files=True)
+
+            return _stream_generator(response)
+
         context.register_source("response", response)
 
         if self.completion:
             result = await self.completion.run(context, client)
+
+            if isinstance(result, HttpEventStreamResource) and context.contains_variable_reference("result[]", self.config.output):
+                async def _stream_generator(stream: HttpEventStreamResource):
+                    async for chunk in stream:
+                        context.register_source("result[]", self._convert_stream_chunk(chunk))
+                        yield await context.render_variable(self.config.output, ignore_files=True)
+
+                return _stream_generator(result)
+
             context.register_source("result", result)
 
         return (await context.render_variable(self.config.output, ignore_files=True)) if self.config.output else (result or response)
@@ -108,6 +127,18 @@ class HttpClientAction:
 
         return await context.render_variable(self.config.endpoint)
 
+    def _convert_stream_chunk(self, chunk: bytes) -> Any:
+        if self.config.stream_format == HttpStreamFormat.JSON:
+            try:
+                return json.loads(chunk)
+            except:
+                return None
+
+        if self.config.stream_format == HttpStreamFormat.TEXT:
+            return chunk.decode("utf-8", errors="replace")
+
+        return chunk
+
 @register_component(ComponentType.HTTP_CLIENT)
 class HttpClientComponent(ComponentService):
     def __init__(self, id: str, config: HttpClientComponentConfig, global_configs: ComponentGlobalConfigs, daemon: bool):

{model_compose-0.3.11 → model_compose-0.3.12}/src/mindor/core/component/services/http_server.py

@@ -2,15 +2,16 @@ from typing import Type, Union, Literal, Optional, Dict, List, Tuple, Set, Annot
 from abc import ABC, abstractmethod
 from mindor.dsl.schema.component import HttpServerComponentConfig
 from mindor.dsl.schema.action import ActionConfig, HttpServerActionConfig, HttpServerCompletionType, HttpServerCompletionConfig
+from mindor.dsl.schema.transport.http import HttpStreamFormat
 from mindor.core.listener import HttpCallbackListener
-from mindor.core.utils.http_client import HttpClient
+from mindor.core.utils.http_client import HttpClient, HttpEventStreamResource
 from mindor.core.utils.http_status import is_status_code_matched
 from mindor.core.utils.time import parse_duration
 from mindor.core.utils.shell import run_command_streaming
 from ..base import ComponentService, ComponentType, ComponentGlobalConfigs, register_component
 from ..context import ComponentActionContext
 from datetime import datetime, timezone
-import asyncio
+import asyncio, json
 
 class HttpServerCompletion(ABC):
     def __init__(self, config: HttpServerCompletionConfig):
@@ -89,14 +90,44 @@ class HttpServerAction:
         headers = await context.render_variable(self.config.headers)
 
         response, result = await client.request(path or "", method, params, body, headers), None
+
+        if isinstance(response, HttpEventStreamResource) and context.contains_variable_reference("response[]", self.config.output):
+            async def _stream_generator(stream: HttpEventStreamResource):
+                async for chunk in stream:
+                    context.register_source("response[]", self._convert_stream_chunk(chunk))
+                    yield await context.render_variable(self.config.output, ignore_files=True)
+
+            return _stream_generator(response)
+
         context.register_source("response", response)
 
         if self.completion:
             result = await self.completion.run(context, client)
+
+            if isinstance(result, HttpEventStreamResource) and context.contains_variable_reference("result[]", self.config.output):
+                async def _stream_generator(stream: HttpEventStreamResource):
+                    async for chunk in stream:
+                        context.register_source("result[]", self._convert_stream_chunk(chunk))
+                        yield await context.render_variable(self.config.output, ignore_files=True)
+
+                return _stream_generator(result)
+
             context.register_source("result", result)
 
         return (await context.render_variable(self.config.output, ignore_files=True)) if self.config.output else (result or response)
 
+    def _convert_stream_chunk(self, chunk: bytes) -> Any:
+        if self.config.stream_format == HttpStreamFormat.JSON:
+            try:
+                return json.loads(chunk)
+            except:
+                return None
+
+        if self.config.stream_format == HttpStreamFormat.TEXT:
+            return chunk.decode("utf-8", errors="replace")
+
+        return chunk
+
 @register_component(ComponentType.HTTP_SERVER)
 class HttpServerComponent(ComponentService):
     def __init__(self, id: str, config: HttpServerComponentConfig, global_configs: ComponentGlobalConfigs, daemon: bool):

{model_compose-0.3.11 → model_compose-0.3.12}/src/mindor/core/component/services/model/tasks/image_to_text.py

@@ -63,8 +63,9 @@ class ImageToTextTaskAction:
         if stream:
             async def _stream_generator():
                 async for chunk in AsyncStreamer(streamer, loop):
-                    context.register_source("result", chunk)
-                    yield (await context.render_variable(self.config.output, ignore_files=True)) if self.config.output else chunk
+                    if chunk:
+                        context.register_source("result[]", chunk)
+                        yield (await context.render_variable(self.config.output, ignore_files=True)) if self.config.output else chunk
 
             return _stream_generator()
         else:

{model_compose-0.3.11 → model_compose-0.3.12}/src/mindor/core/component/services/model/tasks/summarization.py

@@ -75,8 +75,9 @@ class SummarizationTaskAction:
         if stream:
             async def _stream_generator():
                 async for chunk in AsyncStreamer(streamer, loop):
-                    context.register_source("result", chunk)
-                    yield (await context.render_variable(self.config.output, ignore_files=True)) if self.config.output else chunk
+                    if chunk:
+                        context.register_source("result[]", chunk)
+                        yield (await context.render_variable(self.config.output, ignore_files=True)) if self.config.output else chunk
 
             return _stream_generator()
         else:

{model_compose-0.3.11 → model_compose-0.3.12}/src/mindor/core/component/services/model/tasks/text_generation.py

@@ -67,8 +67,9 @@ class TextGenerationTaskAction:
         if stream:
             async def _stream_generator():
                 async for chunk in AsyncStreamer(streamer, loop):
-                    context.register_source("result", chunk)
-                    yield (await context.render_variable(self.config.output, ignore_files=True)) if self.config.output else chunk
+                    if chunk:
+                        context.register_source("result[]", chunk)
+                        yield (await context.render_variable(self.config.output, ignore_files=True)) if self.config.output else chunk
 
             return _stream_generator()
         else:

{model_compose-0.3.11 → model_compose-0.3.12}/src/mindor/core/component/services/model/tasks/translation.py

@@ -75,8 +75,9 @@ class TranslationTaskAction:
         if stream:
             async def _stream_generator():
                 async for chunk in AsyncStreamer(streamer, loop):
-                    context.register_source("result", chunk)
-                    yield (await context.render_variable(self.config.output, ignore_files=True)) if self.config.output else chunk
+                    if chunk:
+                        context.register_source("result[]", chunk)
+                        yield (await context.render_variable(self.config.output, ignore_files=True)) if self.config.output else chunk
 
             return _stream_generator()
         else:

{model_compose-0.3.11 → model_compose-0.3.12}/src/mindor/core/controller/services/http_server.py

@@ -1,4 +1,4 @@
-from typing import Type, Union, Literal, Optional, Dict, List, Tuple, Set, Annotated, AsyncIterator, Any
+from typing import Type, Union, Literal, Optional, Dict, List, Tuple, Set, Annotated, AsyncIterator, AsyncIterable, Any
 from types import AsyncGeneratorType
 from typing_extensions import Self
 from pydantic import BaseModel
@@ -9,6 +9,7 @@ from mindor.dsl.schema.gateway import GatewayConfig
 from mindor.dsl.schema.logger import LoggerConfig
 from mindor.dsl.schema.workflow import WorkflowConfig, WorkflowVariableConfig, WorkflowVariableGroupConfig
 from mindor.core.utils.http_request import parse_request_body, parse_options_header
+from mindor.core.utils.http_response import HttpEventStreamer
 from mindor.core.utils.http_client import HttpEventStreamResource
 from mindor.core.utils.streaming import StreamResource
 from ..base import ControllerService, ControllerType, WorkflowSchema, TaskState, TaskStatus, register_controller
@@ -16,7 +17,7 @@ from fastapi import FastAPI, APIRouter, Request, Body, HTTPException
 from fastapi.middleware.cors import CORSMiddleware
 from fastapi.responses import Response, JSONResponse, StreamingResponse
 from starlette.background import BackgroundTask
-import uvicorn, json
+import uvicorn
 
 class WorkflowTaskRequestBody(BaseModel):
     workflow_id: Optional[str] = None
@@ -219,47 +220,29 @@ class HttpServerController(ControllerService):
         if state.status == TaskStatus.FAILED:
             raise HTTPException(status_code=500, detail=str(state.error))
 
-        if isinstance(state.output, AsyncIterator):
+        if isinstance(state.output, (HttpEventStreamResource, AsyncIterator)):
             return self._render_async_iterator(state.output)
 
         if isinstance(state.output, StreamResource):
             return self._render_stream_resource(state.output)
 
         return JSONResponse(content=state.output)
-    
-    def _render_async_iterator(self, iterator: AsyncIterator) -> Response:
-        async def _event_generator() -> AsyncIterator[bytes]:
-            async for chunk in iterator:
-                if not isinstance(chunk, (str, bytes)):
-                    chunk = json.dumps(chunk, ensure_ascii=False, default=str)
-                if isinstance(chunk, str):
-                    chunk = chunk.replace("\r\n", "\n")
-                    if chunk.endswith("\n"):
-                        lines = chunk.split("\n")
-                        if chunk.startswith("\n"):
-                            lines = lines[1:]
-                        chunk = [ line.encode("utf-8") for line in lines ]
-                    else:
-                        chunk = chunk.encode("utf-8")
-                for line in [ chunk ] if isinstance(chunk, bytes) else chunk:
-                    yield b"data: " + line + b"\n"
-                yield b"\n"
 
+    def _render_async_iterator(self, iterator: AsyncIterable[Any]) -> Response:
         return StreamingResponse(
-            _event_generator(),
+            HttpEventStreamer(iterator).stream(),
             media_type="text/event-stream",
-            headers={ "Cache-Control": "no-cache" }
+            headers={
+                "Cache-Control": "no-cache"
+            }
         )
 
     def _render_stream_resource(self, resource: StreamResource) -> Response:
-        async def _close_stream():
-            await resource.close() 
-
         return StreamingResponse(
             resource,
             media_type=resource.content_type, 
             headers=self._build_stream_resource_headers(resource), 
-            background=BackgroundTask(_close_stream)
+            background=BackgroundTask(resource.close)
         )
 
     def _build_stream_resource_headers(self, resource: StreamResource) -> Dict[str, str]:

{model_compose-0.3.11 → model_compose-0.3.12}/src/mindor/core/utils/http_client.py

@@ -40,7 +40,7 @@ class HttpEventStreamResource(StreamResource):
 
         self.response: aiohttp.ClientResponse = response
         self.stream: aiohttp.StreamReader = response.content
-        self._buffer: str = ""
+        self._buffer: bytearray = bytearray()
 
     async def close(self) -> None:
         self.response.close()
@@ -48,18 +48,29 @@ class HttpEventStreamResource(StreamResource):
         self.stream = None
 
     async def _iterate_stream(self) -> AsyncIterator[bytes]:
-        try:
-            async for chunk in self.stream:
-                text = chunk.decode("utf-8", errors="ignore")
-                self._buffer += text
-
-                while "\n\n" in self._buffer:
-                    message, self._buffer = self._buffer.split("\n\n", 1)
-                    lines = [ line[5:].lstrip() for line in message.splitlines() if line.startswith("data:") ]
-                    if lines and any(line.strip() for line in lines):
-                        yield "\n".join(lines).encode("utf-8")
-        except Exception as e:
-            return
+        async for chunk in self.stream:
+            self._buffer += chunk.replace(b"\r\n", b"\n")
+
+            while True:
+                pos = self._buffer.find(b"\n\n")
+                if pos < 0:
+                    break
+
+                block, self._buffer = self._buffer[:pos], self._buffer[pos + 2:]
+                parts = []
+
+                for line in block.split(b"\n"):
+                        if line.startswith(b"data:"):
+                            parts.append(line[5:].lstrip(b" "))
+                            continue
+                        if line == b"data":
+                            parts.append(b"")
+                            continue
+                        if line.startswith(b":"): # comment
+                            continue
+
+                if parts:
+                    yield b"\n".join(parts)
 
 class HttpClient:
     shared_instance: Optional["HttpClient"] = None
@@ -94,7 +105,7 @@ class HttpClient:
             if raise_on_error and response.status >= 400:
                 raise ValueError(f"Request failed with status {response.status}: {content}")
 
-            if not isinstance(content, (StreamResource, AsyncIterator)):
+            if not isinstance(content, StreamResource):
                 response.close()
 
             return content if raise_on_error else (content, response.status)
@@ -157,7 +168,7 @@ class HttpClient:
             return (await response.json(), content_type)
 
         if content_type == "text/event-stream":
-            return (HttpEventStreamResource(response).as_iterator(), content_type)
+            return (HttpEventStreamResource(response), content_type)
 
         if content_type.startswith("text/"):
             return (await response.text(), content_type)

model_compose-0.3.12/src/mindor/core/utils/http_response.py

@@ -0,0 +1,25 @@
+from typing import Type, Union, Literal, Optional, Dict, List, Tuple, Set, Annotated, AsyncIterator, AsyncIterable, Any
+import json
+
+class HttpEventStreamer:
+    def __init__(self, iterator: AsyncIterable[Any]):
+        self.iterator: AsyncIterable[Any] = iterator
+
+    async def stream(self) -> AsyncIterator[bytes]:
+        async for chunk in self.iterator:
+            if not isinstance(chunk, (str, bytes)):
+                chunk = json.dumps(chunk, ensure_ascii=False, default=str)
+            
+            if isinstance(chunk, str):
+                if chunk.endswith("\n"):
+                    lines = chunk.split("\n")
+                    if chunk.startswith("\n"):
+                        lines = lines[1:]
+                    chunk = [ line.encode("utf-8") for line in lines ]
+                else:
+                    chunk = chunk.encode("utf-8")
+
+            for line in [ chunk ] if isinstance(chunk, bytes) else chunk:
+                yield b"data: " + line + b"\n"
+            
+            yield b"\n"

{model_compose-0.3.11 → model_compose-0.3.12}/src/mindor/dsl/schema/action/impl/http_client.py

@@ -2,6 +2,7 @@ from typing import Type, Union, Literal, Optional, Dict, List, Tuple, Set, Annot
 from enum import Enum
 from pydantic import BaseModel, Field
 from pydantic import model_validator
+from mindor.dsl.schema.transport.http import HttpStreamFormat
 from .common import CommonActionConfig
 
 class HttpClientCompletionType(str, Enum):
@@ -10,6 +11,7 @@ class HttpClientCompletionType(str, Enum):
 
 class HttpClientCommonCompletionConfig(BaseModel):
     type: HttpClientCompletionType
+    stream_format: Optional[HttpStreamFormat] = Field(default=None, description="Format of stream payload.")
 
 class HttpClientPollingCompletionConfig(HttpClientCommonCompletionConfig):
     type: Literal[HttpClientCompletionType.POLLING]
@@ -57,6 +59,7 @@ class HttpClientActionConfig(CommonActionConfig):
     headers: Dict[str, str] = Field(default_factory=dict, description="")
     body: Dict[str, Any] = Field(default_factory=dict, description="")
     params: Dict[str, str] = Field(default_factory=dict, description="")
+    stream_format: Optional[HttpStreamFormat] = Field(default=None, description="Format of stream payload.")
     completion: Optional[HttpClientCompletionConfig] = Field(default=None, description="")
 
     @model_validator(mode="before")

{model_compose-0.3.11 → model_compose-0.3.12}/src/mindor/dsl/schema/action/impl/http_server.py

@@ -2,6 +2,7 @@ from typing import Type, Union, Literal, Optional, Dict, List, Tuple, Set, Annot
 from enum import Enum
 from pydantic import BaseModel, Field
 from pydantic import model_validator
+from mindor.dsl.schema.transport.http import HttpStreamFormat
 from .common import CommonActionConfig
 
 class HttpServerCompletionType(str, Enum):
@@ -10,6 +11,7 @@ class HttpServerCompletionType(str, Enum):
 
 class HttpServerCommonCompletionConfig(BaseModel):
     type: HttpServerCompletionType
+    stream_format: Optional[HttpStreamFormat] = Field(default=None, description="Format of stream payload.")
 
 class HttpServerPollingCompletionConfig(HttpServerCommonCompletionConfig):
     type: Literal[HttpServerCompletionType.POLLING]
@@ -49,4 +51,5 @@ class HttpServerActionConfig(CommonActionConfig):
     headers: Dict[str, str] = Field(default_factory=dict, description="")
     body: Dict[str, Any] = Field(default_factory=dict, description="")
     params: Dict[str, str] = Field(default_factory=dict, description="")
+    stream_format: Optional[HttpStreamFormat] = Field(default=None, description="Format of stream payload.")
     completion: Optional[HttpServerCompletionConfig] = Field(default=None, description="")

model_compose-0.3.12/src/mindor/dsl/schema/transport/http.py

@@ -0,0 +1,8 @@
+from typing import Type, Union, Literal, Optional, Dict, List, Tuple, Set, Annotated, Any
+from enum import Enum
+from pydantic import BaseModel, Field
+from pydantic import model_validator
+
+class HttpStreamFormat(str, Enum):
+    JSON = "json"
+    TEXT = "text"

{model_compose-0.3.11 → model_compose-0.3.12/src/model_compose.egg-info}/PKG-INFO

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

{model_compose-0.3.11 → model_compose-0.3.12}/src/model_compose.egg-info/SOURCES.txt

@@ -79,6 +79,7 @@ src/mindor/core/utils/__init__.py
 src/mindor/core/utils/caching.py
 src/mindor/core/utils/http_client.py
 src/mindor/core/utils/http_request.py
+src/mindor/core/utils/http_response.py
 src/mindor/core/utils/http_status.py
 src/mindor/core/utils/image.py
 src/mindor/core/utils/mcp_client.py
@@ -211,6 +212,7 @@ src/mindor/dsl/schema/runtime/impl/docker.py
 src/mindor/dsl/schema/runtime/impl/native.py
 src/mindor/dsl/schema/runtime/impl/types.py
 src/mindor/dsl/schema/transport/__init__.py
+src/mindor/dsl/schema/transport/http.py
 src/mindor/dsl/schema/transport/ssh.py
 src/mindor/dsl/utils/__init__.py
 src/mindor/dsl/utils/annotation.py