model-compose 0.4.72__tar.gz → 0.4.73__tar.gz

{model_compose-0.4.72 → model_compose-0.4.73}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: model-compose
-Version: 0.4.72
+Version: 0.4.73
 Summary: model-compose: Declarative AI Workflow Orchestrator
 Author-email: Hanyeol Cho <hanyeol.cho@gmail.com>
 License-Expression: MIT
@@ -12,6 +12,7 @@ Requires-Dist: click
 Requires-Dist: pyyaml
 Requires-Dist: pydantic
 Requires-Dist: python-dotenv
+Requires-Dist: packaging
 Requires-Dist: docker
 Requires-Dist: aiohttp
 Requires-Dist: aiofiles

{model_compose-0.4.72 → model_compose-0.4.73}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "model-compose"
-version = "0.4.72"
+version = "0.4.73"
 description = "model-compose: Declarative AI Workflow Orchestrator"
 authors = [
     { name = "Hanyeol Cho", email = "hanyeol.cho@gmail.com" }
@@ -13,6 +13,7 @@ dependencies = [
     "pyyaml",
     "pydantic",
     "python-dotenv",
+    "packaging",
     "docker",
     "aiohttp",
     "aiofiles",

{model_compose-0.4.72 → model_compose-0.4.73}/src/mindor/core/controller/webui/gradio/builder.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 from typing import TYPE_CHECKING
 
-from typing import Type, Union, Literal, Optional, Dict, List, Callable, Any
+from typing import Type, Union, Literal, Optional, Dict, List, Tuple, Callable, Any
 from mindor.dsl.schema.workflow import WorkflowVariableConfig, WorkflowVariableGroupConfig, WorkflowVariableType, WorkflowVariableFormat
 from mindor.core.controller.base import TaskStatus, TaskState, JobEvent, ComponentEvent
 from mindor.core.workflow.schema import WorkflowSchema
@@ -35,10 +35,11 @@ class WorkflowLogPanel:
     def build(self) -> List[gr.Component]:
         self.chatbot = gr.Chatbot(
             label="Log",
-            height="80vh",
+            min_height="80vh",
             buttons=[],
             editable=False,
             feedback_options=None,
+            elem_classes=[ "log-panel-chatbot" ],
         )
         return [ self.chatbot ]
 
@@ -59,7 +60,7 @@ class GradioWebUIBuilder:
         self,
         workflow_schemas: Dict[str, WorkflowSchema],
         runner: Callable[[], ControllerRunner]
-    ) -> gr.Blocks:
+    ) -> Tuple[gr.Blocks, str]:
         with gr.Blocks() as blocks:
             for workflow_id, workflow in workflow_schemas.items():
                 if len(workflow_schemas) > 1:
@@ -68,7 +69,7 @@ class GradioWebUIBuilder:
                 else:
                     self._build_workflow_section(workflow_id, workflow, runner)
 
-        return blocks
+        return blocks, self._global_css()
 
     def _build_workflow_section(self,
         workflow_id: str,
@@ -81,8 +82,8 @@ class GradioWebUIBuilder:
             if workflow.description:
                 gr.Markdown(f"📝 {workflow.description}")
 
-            with gr.Row():
-                with gr.Column(scale=2):
+            with gr.Row(equal_height=True):
+                with gr.Column(scale=2, elem_classes=["input-output-column"]):
                     gr.Markdown("#### Input Parameters")
                     input_components = [ self._build_input_component(variable) for variable in workflow.input ]
 
@@ -647,7 +648,7 @@ class GradioWebUIBuilder:
         title = self._log_format_task_title(state)
         if title is None:
             return []
-        messages: List[Dict] = [ self._log_assistant_message(title) ]
+        messages: List[Dict] = [ self._log_assistant_message(f"{title}\n`task_id: {state.task_id}`") ]
         if state.status == TaskStatus.FAILED and state.error:
             messages.append(self._log_assistant_message(f"```\n{state.error}\n```", title="Error"))
         return messages
@@ -665,7 +666,7 @@ class GradioWebUIBuilder:
 
     def _log_messages_for_component_event(self, event: ComponentEvent) -> List[Dict]:
         title = self._log_format_component_title(event)
-        messages: List[Dict] = [ self._log_assistant_message(title) ]
+        messages: List[Dict] = [ self._log_assistant_message(f"{title}\n`run_id: {event.run_id}`") ]
         if event.input is not None:
             messages.append(self._log_payload_message(event.input, title="Input"))
         if event.output is not None:
@@ -691,37 +692,44 @@ class GradioWebUIBuilder:
         return self._log_assistant_message(f"{_SPINNER_FRAMES[frame % len(_SPINNER_FRAMES)]} Running...")
 
     def _log_format_task_title(self, state: TaskState) -> Optional[str]:
+        workflow_id = self._escape_markdown(state.workflow_id)
         if state.status == TaskStatus.PROCESSING:
-            return "▶ Task started"
+            return f"▶ Workflow '**{workflow_id}**' started"
         if state.status == TaskStatus.INTERRUPTED:
-            return "⏸ Task interrupted"
+            return f"⏸ Workflow '**{workflow_id}**' interrupted"
         if state.status == TaskStatus.COMPLETED:
-            return "✓ Task completed"
+            return f"✓ Workflow '**{workflow_id}**' completed"
         if state.status == TaskStatus.FAILED:
-            return "✗ Task failed"
+            return f"✗ Workflow '**{workflow_id}**' failed"
         return None
 
     def _log_format_job_title(self, event: JobEvent) -> str:
+        job_id = self._escape_markdown(event.job_id)
         if event.event == "started":
-            return f"▶ Job '{event.job_id}' started"
+            return f"▶ Job '**{job_id}**' started"
         if event.event == "completed":
-            return f"✓ Job '{event.job_id}' completed · {event.elapsed:.2f}s"
+            return f"✓ Job '**{job_id}**' completed · {event.elapsed:.2f}s"
         if event.event == "failed":
-            return f"✗ Job '{event.job_id}' failed · {event.elapsed:.2f}s"
+            return f"✗ Job '**{job_id}**' failed · {event.elapsed:.2f}s"
         if event.event == "routed":
-            return f"→ {event.job_id} → {event.next_job_id} · {event.elapsed:.2f}s"
-        return f"• Job '{event.job_id}' {event.event}"
+            next_job_id = self._escape_markdown(event.next_job_id)
+            return f"→ '**{job_id}**' → '**{next_job_id}**' · {event.elapsed:.2f}s"
+        return f"• Job '**{job_id}**' {event.event}"
 
     def _log_format_component_title(self, event: ComponentEvent) -> str:
+        component_id = self._escape_markdown(event.component_id)
         if event.event == "started":
-            return f"▶ Component '{event.component_id}' started"
+            return f"▶ Component '**{component_id}**' started"
         if event.event == "completed":
-            return f"✓ Component '{event.component_id}' completed"
+            return f"✓ Component '**{component_id}**' completed"
         if event.event == "failed":
-            return f"✗ Component '{event.component_id}' failed"
+            return f"✗ Component '**{component_id}**' failed"
         if event.event == "internal":
-            return f"└ Component '{event.component_id}' reported" + (f" · [{event.kind}]" if event.kind else "")
-        return f"• Component '{event.component_id}' {event.event}"
+            return f"└ Component '**{component_id}**' reported" + (f" · [{event.kind}]" if event.kind else "")
+        return f"• Component '**{component_id}**' {event.event}"
+
+    def _escape_markdown(self, value: str) -> str:
+        return re.sub(r"([\\`*_{}\[\]()#+!~])", r"\\\1", value)
 
     def _log_format_payload(self, value: Any) -> Optional[str]:
         if isinstance(value, bytes):
@@ -748,3 +756,33 @@ class GradioWebUIBuilder:
         if isinstance(obj, bytes):
             return f"<bytes len={len(obj)}>"
         return repr(obj)
+
+    def _global_css(self) -> str:
+        return """
+        .log-panel-chatbot {
+            flex-grow: 1 !important;
+            flex-shrink: 1 !important;
+            flex-basis: 0 !important;
+            height: auto !important;
+            min-height: 80vh !important;
+            max-height: 100% !important;
+            overflow: hidden !important;
+        }
+        .log-panel-chatbot * {
+            min-height: 0 !important;
+        }
+        .log-panel-chatbot > .wrap,
+        .log-panel-chatbot > .wrapper {
+            height: 100% !important;
+            max-height: 100% !important;
+            overflow: hidden !important;
+        }
+        .log-panel-chatbot .bubble-wrap {
+            flex-grow: 1 !important;
+            max-height: 100% !important;
+            overflow-y: auto !important;
+        }
+        .input-output-column > * {
+            flex-grow: 0 !important;
+        }
+        """

{model_compose-0.4.72 → model_compose-0.4.73}/src/mindor/core/controller/webui/gradio/driver.py

@@ -14,11 +14,11 @@ class GradioDriver(WebUIDriver):
         self.server: Optional[uvicorn.Server] = None
         self.app: FastAPI = FastAPI(openapi_url=None, docs_url=None, redoc_url=None)
 
-        blocks = GradioWebUIBuilder().build(
+        blocks, css = GradioWebUIBuilder().build(
             workflow_schemas=self.workflow_schemas,
             runner=lambda: self.runner
         )
-        self.app = mount_gradio_app(self.app, blocks, path="")
+        self.app = mount_gradio_app(self.app, blocks, path="", css=css)
 
     async def _start(self) -> None:
         self.server = uvicorn.Server(uvicorn.Config(

{model_compose-0.4.72 → model_compose-0.4.73}/src/mindor/core/utils/http_client.py

@@ -6,7 +6,7 @@ from .http_request import build_request_body, parse_options_header
 from .streaming import StreamResource
 from .url import encode_url
 from requests.structures import CaseInsensitiveDict
-import aiohttp, json
+import aiohttp, asyncio, json
 
 class HttpStreamResource(StreamResource):
     def __init__(
@@ -74,26 +74,28 @@ class HttpEventStreamResource(StreamResource):
                     yield b"\n".join(parts)
 
 class HttpClient:
-    shared_instance: Optional[HttpClient] = None
+    _shared_instance: Optional[HttpClient] = None
 
     def __init__(
         self,
         base_url: Optional[str] = None,
         headers: Optional[Dict[str, str]] = None,
-        timeout: Optional[float] = None
+        timeout: Optional[float] = None,
+        shared: bool = False
     ):
         self.base_url: Optional[str] = base_url
         self.headers: Optional[Dict[str, str]] = headers
         self.timeout: Optional[float] = timeout
-        self.session: aiohttp.ClientSession = self._create_session(self.base_url)
+        self.shared: bool = shared
+        self._sessions: Dict[int, aiohttp.ClientSession] = {}
 
     async def __aenter__(self):
-        if not self.session:
-            self.session = self._create_session(self.base_url)
+        await self._get_session()
         return self
 
     async def __aexit__(self, exc_type, exc_val, exc_tb):
-        await self.close()
+        if not self.shared:
+            await self.close()
 
     async def request(
         self,
@@ -110,7 +112,7 @@ class HttpClient:
         try:
             merged_headers = { **(self.headers or {}), **(headers or {}) }
             response = await self._request_with_session(
-                session=self.session,
+                session=await self._get_session(),
                 url_or_path=url_or_path,
                 method=method,
                 params={ k: v for k, v in params.items() if v is not None } if params else None,
@@ -134,16 +136,19 @@ class HttpClient:
             raise e
 
     async def close(self) -> None:
-        if self.session:
-            await self.session.close()
-            self.session = None
+        sessions, self._sessions = self._sessions, {}
+        for session in sessions.values():
+            try:
+                await session.close()
+            except Exception:
+                pass
 
     @classmethod
-    def get_shared_instance(cls) -> "HttpClient":
-        if not cls.shared_instance:
-            cls.shared_instance = HttpClient()
-        return cls.shared_instance
-    
+    def get_shared_instance(cls) -> HttpClient:
+        if not cls._shared_instance:
+            cls._shared_instance = HttpClient(shared=True)
+        return cls._shared_instance
+
     @classmethod
     async def request_once(cls, *args, **kwargs):
         instance = cls()
@@ -152,6 +157,18 @@ class HttpClient:
         finally:
             await instance.close()
 
+    async def _get_session(self) -> aiohttp.ClientSession:
+        key = id(asyncio.get_running_loop())
+        session = self._sessions.get(key)
+
+        if session and not session.closed:
+            return session
+
+        session = self._create_session(self.base_url)
+        self._sessions[key] = session
+
+        return session
+
     def _create_session(self, base_url: Optional[str]) -> aiohttp.ClientSession:
         return aiohttp.ClientSession(base_url.rstrip("/") + "/" if base_url else None)
 

{model_compose-0.4.72 → model_compose-0.4.73}/src/mindor/core/utils/ssh_client.py

@@ -73,9 +73,6 @@ class SshConnectionParams:
         }
 
 class SshClient:
-    """SSH client with remote port forwarding support"""
-    shared_instance: Optional["SshClient"] = None
-
     def __init__(self, params: SshConnectionParams):
         self.params: SshConnectionParams = params
         self.client: Optional[paramiko.SSHClient] = None
@@ -247,10 +244,3 @@ class SshClient:
     def is_connected(self) -> bool:
         """Check if SSH connection is active"""
         return self.client is not None and self.transport is not None and self.transport.is_active()
-
-    @classmethod
-    def get_shared_instance(cls, params: SshConnectionParams) -> "SshClient":
-        """Get or create shared SSH client instance"""
-        if not cls.shared_instance:
-            cls.shared_instance = SshClient(params)
-        return cls.shared_instance

{model_compose-0.4.72 → model_compose-0.4.73}/src/model_compose.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: model-compose
-Version: 0.4.72
+Version: 0.4.73
 Summary: model-compose: Declarative AI Workflow Orchestrator
 Author-email: Hanyeol Cho <hanyeol.cho@gmail.com>
 License-Expression: MIT
@@ -12,6 +12,7 @@ Requires-Dist: click
 Requires-Dist: pyyaml
 Requires-Dist: pydantic
 Requires-Dist: python-dotenv
+Requires-Dist: packaging
 Requires-Dist: docker
 Requires-Dist: aiohttp
 Requires-Dist: aiofiles

{model_compose-0.4.72 → model_compose-0.4.73}/src/model_compose.egg-info/requires.txt

@@ -2,6 +2,7 @@ click
 pyyaml
 pydantic
 python-dotenv
+packaging
 docker
 aiohttp
 aiofiles