model-compose 0.3.8__tar.gz → 0.3.9__tar.gz

{model_compose-0.3.8 → model_compose-0.3.9}/PKG-INFO

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

{model_compose-0.3.8 → model_compose-0.3.9}/pyproject.toml

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

{model_compose-0.3.8 → model_compose-0.3.9}/src/mindor/core/component/services/http_server.py

@@ -105,16 +105,18 @@ class HttpServerComponent(ComponentService):
         self.client: Optional[HttpClient] = None
 
     async def _setup(self) -> None:
-        if self.config.commands.install:
-            for command in self.config.commands.install:
-                await run_command_streaming(command, self.config.working_dir, self.config.env)
+        if self.config.manage.scripts.install:
+            for command in self.config.manage.scripts.install:
+                await run_command_streaming(command, self.config.manage.working_dir, self.config.manage.env)
 
-        if self.config.commands.build:
-            for command in self.config.commands.build:
-                await run_command_streaming(command, self.config.working_dir, self.config.env)
+        if self.config.manage.scripts.build:
+            for command in self.config.manage.scripts.build:
+                await run_command_streaming(command, self.config.manage.working_dir, self.config.manage.env)
 
     async def _teardown(self):
-        pass
+        if self.config.manage.scripts.clean:
+            for command in self.config.manage.scripts.clean:
+                await run_command_streaming(command, self.config.manage.working_dir, self.config.manage.env)
 
     async def _start(self) -> None:
         base_url = f"http://localhost:{self.config.port}" + (self.config.base_path or "")
@@ -127,8 +129,8 @@ class HttpServerComponent(ComponentService):
         self.client = None
 
     async def _serve(self) -> None:
-        if self.config.commands.start:
-            await run_command_streaming(self.config.commands.start, self.config.working_dir, self.config.env, block=False)
+        if self.config.manage.scripts.start:
+            await run_command_streaming(self.config.manage.scripts.start, self.config.manage.working_dir, self.config.manage.env, block=False)
 
     async def _shutdown(self) -> None:
         pass

{model_compose-0.3.8 → model_compose-0.3.9}/src/mindor/core/component/services/mcp_server.py

@@ -36,16 +36,18 @@ class McpServerComponent(ComponentService):
         self.client: Optional[McpClient] = None 
 
     async def _setup(self) -> None:
-        if self.config.commands.install:
-            for command in self.config.commands.install:
-                await run_command_streaming(command, self.config.working_dir, self.config.env)
+        if self.config.manage.scripts.install:
+            for command in self.config.manage.scripts.install:
+                await run_command_streaming(command, self.config.manage.working_dir, self.config.manage.env)
 
-        if self.config.commands.build:
-            for command in self.config.commands.build:
-                await run_command_streaming(command, self.config.working_dir, self.config.env)
+        if self.config.manage.scripts.build:
+            for command in self.config.manage.scripts.build:
+                await run_command_streaming(command, self.config.manage.working_dir, self.config.manage.env)
 
     async def _teardown(self):
-        pass
+        if self.config.manage.scripts.clean:
+            for command in self.config.manage.scripts.clean:
+                await run_command_streaming(command, self.config.manage.working_dir, self.config.manage.env)
 
     async def _start(self) -> None:
         base_url = f"http://localhost:{self.config.port}" + (self.config.base_path or "")
@@ -58,8 +60,8 @@ class McpServerComponent(ComponentService):
         self.client = None
 
     async def _serve(self) -> None:
-        if self.config.commands.start:
-            await run_command_streaming(self.config.commands.start, self.config.working_dir, self.config.env, block=False)
+        if self.config.manage.scripts.start:
+            await run_command_streaming(self.config.manage.scripts.start, self.config.manage.working_dir, self.config.manage.env, block=False)
 
     async def _shutdown(self) -> None:
         pass

{model_compose-0.3.8 → model_compose-0.3.9}/src/mindor/core/component/services/shell.py

@@ -1,7 +1,7 @@
 from typing import Type, Union, Literal, Optional, Dict, List, Tuple, Set, Annotated, Any
 from mindor.dsl.schema.component import ShellComponentConfig
 from mindor.dsl.schema.action import ActionConfig, ShellActionConfig
-from mindor.core.utils.shell import run_command
+from mindor.core.utils.shell import run_command_streaming, run_command
 from ..base import ComponentService, ComponentType, ComponentGlobalConfigs, register_component
 from ..context import ComponentActionContext
 import os
@@ -48,5 +48,15 @@ class ShellComponent(ComponentService):
     def __init__(self, id: str, config: ShellComponentConfig, global_configs: ComponentGlobalConfigs, daemon: bool):
         super().__init__(id, config, global_configs, daemon)
 
+    async def _setup(self) -> None:
+        if self.config.manage.scripts.install:
+            for command in self.config.manage.scripts.install:
+                await run_command_streaming(command, self.config.manage.working_dir, self.config.manage.env)
+
+    async def _teardown(self):
+        if self.config.manage.scripts.clean:
+            for command in self.config.manage.scripts.clean:
+                await run_command_streaming(command, self.config.manage.working_dir, self.config.manage.env)
+
     async def _run(self, action: ActionConfig, context: ComponentActionContext) -> Any:
         return await ShellAction(action, self.config.base_dir, self.config.env).run(context)

{model_compose-0.3.8 → model_compose-0.3.9}/src/mindor/dsl/schema/component/impl/http_server.py

@@ -4,34 +4,43 @@ from pydantic import model_validator
 from mindor.dsl.schema.action import HttpServerActionConfig
 from .common import ComponentType, CommonComponentConfig
 
-class HttpServerCommands(BaseModel):
-    install: Optional[List[List[str]]] = Field(default=None, description="One or more commands to install dependencies.")
-    build: Optional[List[List[str]]] = Field(default=None, description="One or more commands to build the server.")
-    start: Optional[List[str]] = Field(default=None, description="Command to start the server.")
+class HttpServerManageScripts(BaseModel):
+    install: Optional[List[List[str]]] = Field(default=None, description="One or more scripts to install dependencies.")
+    build: Optional[List[List[str]]] = Field(default=None, description="One or more scripts to build the server.")
+    clean: Optional[List[List[str]]] = Field(default=None, description="One or more scripts to clean the server environment.")
+    start: Optional[List[str]] = Field(default=None, description="Script to start the server.")
 
     @model_validator(mode="before")
-    def normalize_commands(cls, values):
-        for key in [ "install", "build" ]:
-            command = values.get(key)
-            if command and isinstance(command, list) and all(isinstance(token, str) for token in command):
-                values[key] = [ command ]
+    def normalize_scripts(cls, values):
+        for key in [ "install", "build", "clean" ]:
+            script = values.get(key)
+            if script and isinstance(script, list) and all(isinstance(token, str) for token in script):
+                values[key] = [ script ]
+        return values
+
+class HttpServerManageConfig(BaseModel):
+    scripts: HttpServerManageScripts = Field(..., description="Shell scripts used to install, build, clean, and start the server.")
+    working_dir: Optional[str] = Field(default=None, description="Working directory for the scripts.")
+    env: Dict[str, str] = Field(default_factory=dict, description="Environment variables to set when executing the scripts.")
+
+    @model_validator(mode="before")
+    def inflate_single_script(cls, values: Dict[str, Any]):
+        if "scripts" not in values:
+            values["scripts"] = { key: values.pop(key) for key in HttpServerManageScripts.model_fields.keys() if key in values }
         return values
 
 class HttpServerComponentConfig(CommonComponentConfig):
     type: Literal[ComponentType.HTTP_SERVER]
-    commands: HttpServerCommands = Field(..., description="Shell commands used to install, build, and start the server.")
-    working_dir: Optional[str] = Field(default=None, description="Working directory for the commands.")
-    env: Dict[str, str] = Field(default_factory=dict, description="Environment variables to set when executing the commands.")
-    port: int = Field(default=8000, ge=1, le=65535, description="Port on which the server will listen.")
+    manage: HttpServerManageConfig = Field(default_factory=HttpServerManageConfig, description="Configuration used to manage the HTTP server lifecycle.")
+    port: int = Field(default=8000, ge=1, le=65535, description="Port on which the HTTP server will listen for incoming requests.")
     base_path: Optional[str] = Field(default=None, description="Base path to prefix all HTTP routes exposed by this component.")
     headers: Dict[str, Any] = Field(default_factory=dict, description="Headers to be included in all outgoing HTTP requests.")
     actions: Dict[str, HttpServerActionConfig] = Field(default_factory=dict)
 
     @model_validator(mode="before")
-    def inflate_single_command(cls, values: Dict[str, Any]):
-        if "commands" not in values:
-            if "command" in values:
-                values["commands"] = { "start": values.pop("command") }
+    def inflate_single_script(cls, values: Dict[str, Any]):
+        if "manage" not in values:
+            values["manage"] = { key: values.pop(key) for key in HttpServerManageScripts.model_fields.keys() if key in values }
         return values
 
     @model_validator(mode="before")

model_compose-0.3.9/src/mindor/dsl/schema/component/impl/mcp_server.py

@@ -0,0 +1,51 @@
+from typing import Type, Union, Literal, Optional, Dict, List, Tuple, Set, Annotated, Any
+from pydantic import BaseModel, Field
+from pydantic import model_validator
+from mindor.dsl.schema.action import McpServerActionConfig
+from .common import ComponentType, CommonComponentConfig
+
+class McpServerManageScripts(BaseModel):
+    install: Optional[List[List[str]]] = Field(default=None, description="One or more scripts to install dependencies.")
+    build: Optional[List[List[str]]] = Field(default=None, description="One or more scripts to build the server.")
+    clean: Optional[List[List[str]]] = Field(default=None, description="One or more scripts to clean the server environment.")
+    start: Optional[List[str]] = Field(default=None, description="Script to start the server.")
+
+    @model_validator(mode="before")
+    def normalize_scripts(cls, values):
+        for key in [ "install", "build", "clean" ]:
+            script = values.get(key)
+            if script and isinstance(script, list) and all(isinstance(token, str) for token in script):
+                values[key] = [ script ]
+        return values
+
+class McpServerManageConfig(BaseModel):
+    scripts: McpServerManageScripts = Field(..., description="Shell scripts used to install, build, clean, and start the server.")
+    working_dir: Optional[str] = Field(default=None, description="Working directory for the scripts.")
+    env: Dict[str, str] = Field(default_factory=dict, description="Environment variables to set when executing the scripts.")
+
+    @model_validator(mode="before")
+    def inflate_single_script(cls, values: Dict[str, Any]):
+        if "scripts" not in values:
+            values["scripts"] = { key: values.pop(key) for key in McpServerManageScripts.model_fields.keys() if key in values }
+        return values
+
+class McpServerComponentConfig(CommonComponentConfig):
+    type: Literal[ComponentType.MCP_SERVER]
+    manage: McpServerManageConfig = Field(default_factory=McpServerManageConfig, description="Configuration used to manage the MCP server lifecycle.")
+    port: int = Field(default=8000, ge=1, le=65535, description="Port on which the MCP server will listen for incoming requests.")
+    base_path: Optional[str] = Field(default=None, description="Base path to prefix all MCP routes exposed by this component.")
+    actions: Dict[str, McpServerActionConfig] = Field(default_factory=dict)
+
+    @model_validator(mode="before")
+    def inflate_single_script(cls, values: Dict[str, Any]):
+        if "manage" not in values:
+            values["manage"] = { key: values.pop(key) for key in McpServerManageScripts.model_fields.keys() if key in values }
+        return values
+
+    @model_validator(mode="before")
+    def inflate_single_action(cls, values: Dict[str, Any]):
+        if "actions" not in values:
+            action_keys = set(McpServerActionConfig.model_fields.keys())
+            if any(k in values for k in action_keys):
+                values["actions"] = { "__default__": { k: values.pop(k) for k in action_keys if k in values } }
+        return values

model_compose-0.3.9/src/mindor/dsl/schema/component/impl/shell.py

@@ -0,0 +1,49 @@
+from typing import Type, Union, Literal, Optional, Dict, List, Tuple, Set, Annotated, Any
+from pydantic import BaseModel, Field
+from pydantic import model_validator
+from mindor.dsl.schema.action import ShellActionConfig
+from .common import ComponentType, CommonComponentConfig
+
+class ShellManageScripts(BaseModel):
+    install: Optional[List[List[str]]] = Field(default=None, description="One or more scripts to install dependencies.")
+    clean: Optional[List[List[str]]] = Field(default=None, description="One or more scripts to clean up the execution environment.")
+
+    @model_validator(mode="before")
+    def normalize_scripts(cls, values):
+        for key in [ "install", "clean" ]:
+            script = values.get(key)
+            if script and isinstance(script, list) and all(isinstance(token, str) for token in script):
+                values[key] = [ script ]
+        return values
+
+class ShellManageConfig(BaseModel):
+    scripts: ShellManageScripts = Field(..., description="Shell scripts used to install dependencies and clean up the environment.")
+    working_dir: Optional[str] = Field(default=None, description="Working directory for the scripts.")
+    env: Dict[str, str] = Field(default_factory=dict, description="Environment variables to set when executing the scripts.")
+
+    @model_validator(mode="before")
+    def inflate_single_script(cls, values: Dict[str, Any]):
+        if "scripts" not in values:
+            values["scripts"] = { key: values.pop(key) for key in ShellManageScripts.model_fields.keys() if key in values }
+        return values
+
+class ShellComponentConfig(CommonComponentConfig):
+    type: Literal[ComponentType.SHELL]
+    manage: ShellManageConfig = Field(default_factory=ShellManageConfig, description="Configuration for scripts and environment setup related to this shell component.")
+    base_dir: Optional[str] = Field(default=None, description="Base working directory for all actions in this component.")
+    env: Optional[Dict[str, str]] = Field(default_factory=dict, description="Environment variables to set for all actions in this component.")
+    actions: Optional[Dict[str, ShellActionConfig]] = Field(default_factory=dict)
+
+    @model_validator(mode="before")
+    def inflate_single_script(cls, values: Dict[str, Any]):
+        if "manage" not in values:
+            values["manage"] = { key: values.pop(key) for key in ShellManageScripts.model_fields.keys() if key in values }
+        return values
+
+    @model_validator(mode="before")
+    def inflate_single_action(cls, values: Dict[str, Any]):
+        if "actions" not in values:
+            action_keys = set(ShellActionConfig.model_fields.keys())
+            if any(k in values for k in action_keys):
+                values["actions"] = { "__default__": { k: values.pop(k) for k in action_keys if k in values } }
+        return values

{model_compose-0.3.8 → model_compose-0.3.9}/src/model_compose.egg-info/PKG-INFO

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

model_compose-0.3.8/src/mindor/dsl/schema/component/impl/mcp_server.py

@@ -1,27 +0,0 @@
-from typing import Type, Union, Literal, Optional, Dict, List, Tuple, Set, Annotated, Any
-from pydantic import BaseModel, Field
-from pydantic import model_validator
-from mindor.dsl.schema.action import McpServerActionConfig
-from .common import ComponentType, CommonComponentConfig
-
-class McpServerCommands(BaseModel):
-    install: Optional[List[List[str]]] = Field(default=None, description="One or more commands to install dependencies.")
-    build: Optional[List[List[str]]] = Field(default=None, description="One or more commands to build the server.")
-    start: Optional[List[str]] = Field(default=None, description="Command to start the server.")
-
-    @model_validator(mode="before")
-    def normalize_commands(cls, values):
-        for key in [ "install", "build" ]:
-            command = values.get(key)
-            if command and isinstance(command, list) and all(isinstance(token, str) for token in command):
-                values[key] = [ command ]
-        return values
-
-class McpServerComponentConfig(CommonComponentConfig):
-    type: Literal[ComponentType.MCP_SERVER]
-    commands: McpServerCommands = Field(..., description="")
-    working_dir: Optional[str] = Field(default=None, description="Working directory for the commands.")
-    env: Dict[str, str] = Field(default_factory=dict, description="Environment variables to set when executing the commands.")
-    port: int = Field(default=8000, ge=1, le=65535, description="")
-    base_path: Optional[str] = Field(default=None, description="")
-    actions: Dict[str, McpServerActionConfig] = Field(default_factory=dict)

model_compose-0.3.8/src/mindor/dsl/schema/component/impl/shell.py

@@ -1,19 +0,0 @@
-from typing import Type, Union, Literal, Optional, Dict, List, Tuple, Set, Annotated, Any
-from pydantic import BaseModel, Field
-from pydantic import model_validator
-from mindor.dsl.schema.action import ShellActionConfig
-from .common import ComponentType, CommonComponentConfig
-
-class ShellComponentConfig(CommonComponentConfig):
-    type: Literal[ComponentType.SHELL]
-    base_dir: Optional[str] = Field(default=None, description="Base working directory for all actions in this component.")
-    env: Optional[Dict[str, str]] = Field(default_factory=dict, description="Environment variables to set for all actions in this component.")
-    actions: Optional[Dict[str, ShellActionConfig]] = Field(default_factory=dict, description="Shell actions mapped by an identifier.")
-
-    @model_validator(mode="before")
-    def inflate_single_action(cls, values: Dict[str, Any]):
-        if "actions" not in values:
-            action_keys = set(ShellActionConfig.model_fields.keys())
-            if any(k in values for k in action_keys):
-                values["actions"] = { "__default__": { k: values.pop(k) for k in action_keys if k in values } }
-        return values