model-compose 0.3.1__tar.gz → 0.3.2__tar.gz

{model_compose-0.3.1/src/model_compose.egg-info → model_compose-0.3.2}/PKG-INFO

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

{model_compose-0.3.1 → model_compose-0.3.2}/pyproject.toml

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

{model_compose-0.3.1 → model_compose-0.3.2}/src/mindor/core/controller/runtime/docker/context/Dockerfile

@@ -37,6 +37,7 @@ COPY requirements.txt .
 RUN pip install --no-cache-dir -r requirements.txt
 
 COPY src .
+COPY webui ./webui
 COPY model-compose.yml .
 
 CMD [ "python", "-m", "mindor.cli.compose", "up" ]

{model_compose-0.3.1 → model_compose-0.3.2}/src/mindor/core/controller/runtime/docker/docker.py

@@ -1,11 +1,11 @@
 from typing import Type, Union, Literal, Optional, Dict, List, Tuple, Set, Annotated, Any
-from mindor.dsl.schema.controller import ControllerConfig
+from mindor.dsl.schema.controller import ControllerConfig, ControllerWebUIDriver
 from mindor.dsl.schema.runtime import DockerRuntimeConfig, DockerBuildConfig, DockerPortConfig, DockerVolumeConfig, DockerHealthCheck
 from mindor.core.runtime.docker import DockerRuntimeManager
 from mindor.core.logger import logging
 from ..specs import ControllerRuntimeSpecs
 from pathlib import Path
-import mindor, shutil, yaml
+import mindor, shutil, yaml, os
 
 class DockerRuntimeLauncher:
     def __init__(self, config: ControllerConfig, verbose: bool):
@@ -76,7 +76,7 @@ class DockerRuntimeLauncher:
         # Copy context files
         context_files_root = Path(__file__).resolve().parent / "context"
         shutil.copytree(
-            src=str(context_files_root), 
+            src=context_files_root, 
             dst=context_dir
         )
 
@@ -84,15 +84,11 @@ class DockerRuntimeLauncher:
         source_files_root = Path(mindor.__file__).resolve().parent
         target_dir = context_dir / "src" / source_files_root.name
         shutil.copytree(
-            src=str(source_files_root), 
+            src=source_files_root, 
             dst=target_dir, 
             ignore=shutil.ignore_patterns("__pycache__", "*.pyc")
         )
 
-        # Generate model-compose.yml
-        with open(context_dir / "model-compose.yml", "w") as f:
-            yaml.dump(specs.generate_native_runtime_specs(), f, sort_keys=False)
-
         # Copy or generate requirements.txt
         file_path = Path.cwd() / "requirements.txt"
         target_path = Path(context_dir) / file_path.name
@@ -100,3 +96,26 @@ class DockerRuntimeLauncher:
             shutil.copy(file_path, target_path)
         else:
             target_path.touch()
+
+        # Copy or generate webui directory
+        Path(context_dir / "webui").mkdir(parents=True, exist_ok=True)
+
+        if getattr(self.config.webui, "server_dir", None):
+            server_dir = Path.cwd() / self.config.webui.server_dir
+            target_dir = context_dir / "webui" / "server"
+            shutil.copytree(
+                src=server_dir,
+                dst=target_dir
+            )
+
+        if getattr(self.config.webui, "static_dir", None):
+            static_dir = Path.cwd() / self.config.webui.static_dir
+            target_dir = context_dir / "webui" / "static"
+            shutil.copytree(
+                src=static_dir,
+                dst=target_dir
+            )
+
+        # Generate model-compose.yml
+        with open(context_dir / "model-compose.yml", "w") as f:
+            yaml.dump(specs.generate_native_runtime_specs(), f, sort_keys=False)

{model_compose-0.3.1 → model_compose-0.3.2}/src/mindor/core/controller/runtime/specs.py

@@ -28,6 +28,12 @@ class ControllerRuntimeSpecs:
         specs["controller"] = self.controller.model_dump()
         specs["controller"]["runtime"] = "native"
 
+        if getattr(self.controller.webui, "server_dir", None):
+            specs["controller"]["webui"]["server_dir"] = "webui/server"
+
+        if getattr(self.controller.webui, "static_dir", None):
+            specs["controller"]["webui"]["static_dir"] = "webui/static"
+
         specs["components"] = {}
         for id, component in self.components.items():
             specs["components"][id] = component.model_dump()

{model_compose-0.3.1 → model_compose-0.3.2}/src/mindor/core/controller/webui/webui.py

@@ -1,5 +1,6 @@
 from typing import Type, Union, Literal, Optional, Dict, List, Tuple, Set, Annotated, Any
-from mindor.dsl.schema.controller import ControllerWebUIConfig, ControllerConfig
+from mindor.dsl.schema.controller import ControllerConfig
+from mindor.dsl.schema.controller.webui import ControllerWebUIConfig, ControllerWebUIDriver
 from mindor.dsl.schema.component import ComponentConfig
 from mindor.dsl.schema.workflow import WorkflowConfig
 from mindor.core.controller.runner import ControllerRunner
@@ -8,6 +9,8 @@ from mindor.core.services import AsyncService
 from .gradio import GradioWebUIBuilder
 from gradio import mount_gradio_app
 from fastapi import FastAPI
+from fastapi.staticfiles import StaticFiles
+from pathlib import Path
 import uvicorn, gradio
 
 class ControllerWebUI(AsyncService):
@@ -32,13 +35,21 @@ class ControllerWebUI(AsyncService):
         self._configure_driver()
 
     def _configure_driver(self) -> None:
-        if self.config.driver == "gradio":
+        if self.config.driver == ControllerWebUIDriver.GRADIO:
             blocks: gradio.Blocks = GradioWebUIBuilder().build(
                 schema=self.schema,
                 runner=self._run_workflow
             )
             self.app = mount_gradio_app(self.app, blocks, path="")
             return
+        
+        if self.config.driver == ControllerWebUIDriver.STATIC:
+            static_files = StaticFiles(
+                directory=Path(self.config.static_dir).resolve(), 
+                html=True
+            )
+            self.app.mount("/", static_files, name="static")
+            return
 
     async def _serve(self) -> None:
         self.runner = ControllerRunner(self.controller)

{model_compose-0.3.1 → model_compose-0.3.2}/src/mindor/core/utils/mcp_client.py

@@ -23,12 +23,12 @@ class McpClient:
         Call a specific tool on the MCP server
         
         Args:
-            name: The name of the tool to call
+            name: Name of the tool to call
             arguments: Arguments to pass to the tool
             raise_on_error: Whether to raise exceptions on error responses
             
         Returns:
-            The tool execution result
+            Tool execution result
         """
         await self._ensure_initialized()
         result = await self.session.call_tool(name, arguments)
@@ -50,10 +50,10 @@ class McpClient:
         Read a specific resource from the MCP server
         
         Args:
-            uri: The URI of the resource to read
+            uri: URI of the resource to read
             
         Returns:
-            The resource content
+            Resource content
         """
         await self._ensure_initialized()
         result = await self.session.read_resource(uri)
@@ -70,11 +70,11 @@ class McpClient:
         Get a specific prompt from the MCP server
         
         Args:
-            name: The name of the prompt to get
+            name: Name of the prompt to get
             arguments: Arguments to pass to the prompt
             
         Returns:
-            The prompt content
+            Prompt content
         """
         await self._ensure_initialized()
         result = await self.session.get_prompt(name, arguments)

{model_compose-0.3.1 → model_compose-0.3.2}/src/mindor/core/workflow/job/impl/__init__.py

@@ -2,3 +2,4 @@ from .action import *
 from .delay import *
 from .if_ import *
 from .switch import *
+from .random_router import *

model_compose-0.3.2/src/mindor/core/workflow/job/impl/random_router.py

@@ -0,0 +1,37 @@
+from typing import Type, Union, Literal, Optional, Dict, List, Tuple, Set, Annotated, Callable, Any
+from mindor.dsl.schema.job import RandomRouterJobConfig, RandomRoutingMode
+from mindor.dsl.schema.component import ComponentConfig
+from mindor.core.logger import logging
+from ..base import Job, JobType, WorkflowContext, RoutingTarget, register_job
+import random
+
+@register_job(JobType.RANDOM_ROUTER)
+class RandomRouterJob(Job):
+    def __init__(self, id: str, config: RandomRouterJobConfig, components: Dict[str, ComponentConfig]):
+        super().__init__(id, config, components)
+
+    async def run(self, context: WorkflowContext) -> Union[Any, RoutingTarget]:
+        if self.config.mode == RandomRoutingMode.WEIGHTED:
+            weights, targets = [], []
+            for routing in self.config.routings:
+                weight = await context.render_variable(routing.weight)
+                if weight is not None and weight > 0.0:
+                    weights.append(weight)
+                    targets.append(routing.target)
+
+            if not weights:
+                raise ValueError(f"No valid weights found in random-router job '{self.id}'.")
+
+            target = random.choices(targets, weights=weights, k=1)[0]
+            return RoutingTarget(target)
+
+        if self.config.mode == RandomRoutingMode.UNIFORM:
+            targets = [ routing.target for routing in self.config.routings ]
+
+            if not targets:
+                raise ValueError(f"No valid routing found in random-router job '{self.id}'.")
+
+            target = random.choice(targets)
+            return RoutingTarget(target)
+
+        raise ValueError(f"Unsupported routing mode: {self.config.mode}")

model_compose-0.3.2/src/mindor/dsl/schema/component/impl/common.py

@@ -0,0 +1,13 @@
+from typing import Type, Union, Literal, Optional, Dict, List, Tuple, Set, Annotated, Any
+from enum import Enum
+from pydantic import BaseModel, Field
+from mindor.dsl.schema.action import CommonActionConfig
+from mindor.dsl.schema.runtime import RuntimeType
+from .types import ComponentType
+
+class CommonComponentConfig(BaseModel):
+    type: ComponentType = Field(..., description="Type of component.")
+    runtime: RuntimeType = Field(default=RuntimeType.NATIVE, description="Runtime environment used to execute this component.")
+    max_concurrent_count: int = Field(default=1, description="Maximum number of concurrent actions this component can handle.")
+    default: bool = Field(default=False, description="Whether to use this component when no component is explicitly specified.")
+    actions: Dict[str, CommonActionConfig] = Field(default_factory=dict, description="Actions available within this component.")

{model_compose-0.3.1 → model_compose-0.3.2}/src/mindor/dsl/schema/component/impl/http_client.py

@@ -6,9 +6,9 @@ from .common import ComponentType, CommonComponentConfig
 
 class HttpClientComponentConfig(CommonComponentConfig):
     type: Literal[ComponentType.HTTP_CLIENT]
-    base_url: Optional[str] = Field(default=None)
-    headers: Dict[str, Any] = Field(default_factory=dict)
-    actions: Dict[str, HttpClientActionConfig] = Field(default_factory=dict)
+    base_url: Optional[str] = Field(default=None, description="")
+    headers: Dict[str, Any] = Field(default_factory=dict, description="")
+    actions: Dict[str, HttpClientActionConfig] = Field(default_factory=dict, description="")
 
     @model_validator(mode="before")
     def inflate_single_action(cls, values: Dict[str, Any]):

{model_compose-0.3.1 → model_compose-0.3.2}/src/mindor/dsl/schema/component/impl/http_server.py

@@ -6,6 +6,6 @@ from .common import ComponentType, CommonComponentConfig
 
 class HttpServerComponentConfig(CommonComponentConfig):
     type: Literal[ComponentType.HTTP_SERVER]
-    port: Optional[int] = Field(default=None, ge=1, le=65535)
-    base_path: Optional[str] = Field(default=None)
-    actions: Dict[str, HttpServerActionConfig] = Field(default_factory=dict)
+    port: Optional[int] = Field(default=None, ge=1, le=65535, description="")
+    base_path: Optional[str] = Field(default=None, description="")
+    actions: Dict[str, HttpServerActionConfig] = Field(default_factory=dict, description="")

{model_compose-0.3.1 → model_compose-0.3.2}/src/mindor/dsl/schema/component/impl/mcp_client.py

@@ -7,8 +7,8 @@ from .common import ComponentType, CommonComponentConfig
 class McpClientComponentConfig(CommonComponentConfig):
     type: Literal[ComponentType.MCP_CLIENT]
     url: str = Field(..., description="URL of the MCP server to invoke tools.")
-    headers: Dict[str, Any] = Field(default_factory=dict)
-    actions: Dict[str, McpClientActionConfig] = Field(default_factory=dict)
+    headers: Dict[str, Any] = Field(default_factory=dict, description="")
+    actions: Dict[str, McpClientActionConfig] = Field(default_factory=dict, description="")
 
     @model_validator(mode="before")
     def inflate_single_action(cls, values: Dict[str, Any]):

{model_compose-0.3.1 → model_compose-0.3.2}/src/mindor/dsl/schema/component/impl/mcp_server.py

@@ -6,4 +6,4 @@ from .common import ComponentType, CommonComponentConfig
 
 class McpServerComponentConfig(CommonComponentConfig):
     type: Literal[ComponentType.MCP_SERVER]
-    actions: Dict[str, McpServerActionConfig] = Field(default_factory=dict)
+    actions: Dict[str, McpServerActionConfig] = Field(default_factory=dict, description="")

model_compose-0.3.2/src/mindor/dsl/schema/controller/impl/common.py

@@ -0,0 +1,28 @@
+from typing import Type, Union, Literal, Optional, Dict, List, Tuple, Set, Annotated, Any
+from pydantic import BaseModel, Field
+from pydantic import model_validator, field_validator
+from mindor.dsl.schema.runtime import RuntimeConfig, RuntimeType
+from .types import ControllerType
+from ..webui import ControllerWebUIConfig, ControllerWebUIDriver
+
+class CommonControllerConfig(BaseModel):
+    name: Optional[str] = Field(default=None, description="Name used to identify this controller instance.")
+    type: ControllerType = Field(..., description="Type of controller to run.")
+    runtime: RuntimeConfig = Field(..., description="Runtime environment settings.")
+    max_concurrent_count: int = Field(default=1, description="Maximum number of jobs that can be executed concurrently.")
+    threaded: bool = Field(default=False, description="Whether to run jobs in separate threads.")
+    webui: Optional[ControllerWebUIConfig] = Field(default=None, description="Configuration for the controller's Web UI interface.")
+
+    @model_validator(mode="before")
+    def inflate_runtime(cls, values: Dict[str, Any]):
+        runtime = values.get("runtime")
+        if runtime is None or isinstance(runtime, str):
+            values["runtime"] = { "type": runtime or RuntimeType.NATIVE }
+        return values
+
+    @model_validator(mode="before")
+    def fill_missing_webui_driver(cls, values: Dict[str, Any]):
+        webui = values.get("webui")
+        if isinstance(webui, dict) and "driver" not in webui:
+            webui["driver"] = ControllerWebUIDriver.GRADIO
+        return values

{model_compose-0.3.1 → model_compose-0.3.2}/src/mindor/dsl/schema/controller/impl/http_server.py

@@ -5,7 +5,7 @@ from .common import ControllerType, CommonControllerConfig
 
 class HttpServerControllerConfig(CommonControllerConfig):
     type: Literal[ControllerType.HTTP_SERVER]
-    host: Optional[str] = Field(default="0.0.0.0", description="")
-    port: Optional[int] = Field(default=8080, description="")
-    base_path: Optional[str] = Field(default=None, description="")
-    origins: Optional[str] = Field(default="*", description="")
+    host: Optional[str] = Field(default="0.0.0.0", description="Host address to bind the HTTP server to.")
+    port: Optional[int] = Field(default=8080, description="Port number on which the HTTP server will listen.")
+    base_path: Optional[str] = Field(default=None, description="Base path to prefix all API routes")
+    origins: Optional[str] = Field(default="*", description="CORS allowed origins, specified as a comma-separated string")

{model_compose-0.3.1 → model_compose-0.3.2}/src/mindor/dsl/schema/controller/impl/mcp_server.py

@@ -5,6 +5,6 @@ from .common import ControllerType, CommonControllerConfig
 
 class McpServerControllerConfig(CommonControllerConfig):
     type: Literal[ControllerType.MCP_SERVER]
-    host: Optional[str] = Field(default="0.0.0.0", description="")
-    port: Optional[int] = Field(default=8080, description="")
-    base_path: Optional[str] = Field(default=None, description="")
+    host: Optional[str] = Field(default="0.0.0.0", description="Host address to bind the MCP server to.")
+    port: Optional[int] = Field(default=8080, description="Port number on which the MCP server will listen.")
+    base_path: Optional[str] = Field(default=None, description="Base path to prefix all MCP endpoints")

model_compose-0.3.2/src/mindor/dsl/schema/controller/webui/__init__.py

@@ -0,0 +1 @@
+from .webui import *

model_compose-0.3.2/src/mindor/dsl/schema/controller/webui/impl/__init__.py

@@ -0,0 +1,4 @@
+from .common import *
+from .gradio import *
+from .static import *
+from .dynamic import *

model_compose-0.3.2/src/mindor/dsl/schema/controller/webui/impl/common.py

@@ -0,0 +1,13 @@
+from typing import Type, Union, Literal, Optional, Dict, List, Tuple, Set, Annotated, Any
+from enum import Enum
+from pydantic import BaseModel, Field
+
+class ControllerWebUIDriver(str, Enum):
+    GRADIO  = "gradio"
+    STATIC  = "static"
+    DYNAMIC = "dynamic"
+
+class CommonWebUIConfig(BaseModel):
+    driver: ControllerWebUIDriver = Field(..., description="")
+    host: Optional[str] = Field(default="0.0.0.0", description="Host address to bind the Web UI server to.")
+    port: Optional[int] = Field(default=8081, description="Port number to serve the Web UI on.")

model_compose-0.3.2/src/mindor/dsl/schema/controller/webui/impl/dynamic.py

@@ -0,0 +1,9 @@
+from typing import Type, Union, Literal, Optional, Dict, List, Tuple, Set, Annotated, Any
+from pydantic import BaseModel, Field
+from .common import CommonWebUIConfig, ControllerWebUIDriver
+
+class DynamicWebUIConfig(CommonWebUIConfig):
+    driver: Literal[ControllerWebUIDriver.DYNAMIC]
+    command: str = Field(..., description="Command to start the web UI server.")
+    server_dir: str = Field(default="webui/server", description="Directory containing source code and entry point for the web UI server.")
+    static_dir: str = Field(default="webui/static", description="Directory containing static HTML/CSS/JS files for the web UI.")

model_compose-0.3.2/src/mindor/dsl/schema/controller/webui/impl/gradio.py

@@ -0,0 +1,6 @@
+from typing import Type, Union, Literal, Optional, Dict, List, Tuple, Set, Annotated, Any
+from pydantic import BaseModel, Field
+from .common import CommonWebUIConfig, ControllerWebUIDriver
+
+class GradioWebUIConfig(CommonWebUIConfig):
+    driver: Literal[ControllerWebUIDriver.GRADIO]

model_compose-0.3.2/src/mindor/dsl/schema/controller/webui/impl/static.py

@@ -0,0 +1,7 @@
+from typing import Type, Union, Literal, Optional, Dict, List, Tuple, Set, Annotated, Any
+from pydantic import BaseModel, Field
+from .common import CommonWebUIConfig, ControllerWebUIDriver
+
+class StaticWebUIConfig(CommonWebUIConfig):
+    driver: Literal[ControllerWebUIDriver.STATIC]
+    static_dir: str = Field(default="webui", description="Directory containing static HTML/CSS/JS files for the web UI.")

model_compose-0.3.2/src/mindor/dsl/schema/controller/webui/webui.py

@@ -0,0 +1,13 @@
+from typing import Type, Union, Literal, Optional, Dict, List, Tuple, Set, Annotated, Any
+from enum import Enum
+from pydantic import BaseModel, Field
+from .impl import *
+
+ControllerWebUIConfig = Annotated[
+    Union[ 
+        GradioWebUIConfig,
+        StaticWebUIConfig,
+        DynamicWebUIConfig
+    ],
+    Field(discriminator="driver")
+]

{model_compose-0.3.1 → model_compose-0.3.2}/src/mindor/dsl/schema/gateway/impl/common.py

@@ -5,5 +5,5 @@ from .types import GatewayType
 
 class CommonGatewayConfig(BaseModel):
     type: GatewayType = Field(..., description="")
-    runtime: RuntimeType = Field(default=RuntimeType.NATIVE)
-    port: Optional[int] = Field(default=8090)
+    runtime: RuntimeType = Field(default=RuntimeType.NATIVE, description="")
+    port: Optional[int] = Field(default=8090, description="")

{model_compose-0.3.1 → model_compose-0.3.2}/src/mindor/dsl/schema/gateway/impl/http_tunnel.py

@@ -9,4 +9,4 @@ class HttpTunnelGatewayDriver(str, Enum):
 
 class HttpTunnelGatewayConfig(CommonGatewayConfig):
     type: Literal[GatewayType.HTTP_TUNNEL]
-    driver: HttpTunnelGatewayDriver = Field(default=HttpTunnelGatewayDriver.NGROK)
+    driver: HttpTunnelGatewayDriver = Field(default=HttpTunnelGatewayDriver.NGROK, description="")

{model_compose-0.3.1 → model_compose-0.3.2}/src/mindor/dsl/schema/job/impl/__init__.py

@@ -3,3 +3,4 @@ from .action import *
 from .delay import *
 from .if_ import *
 from .switch import *
+from .random_router import *

{model_compose-0.3.1 → model_compose-0.3.2}/src/mindor/dsl/schema/job/impl/delay.py

@@ -20,7 +20,7 @@ class TimeIntervalDelayJobConfig(CommonDelayJobConfig):
 class SpecificTimeDelayJobConfig(CommonDelayJobConfig):
     mode: Literal[DelayJobMode.SPECIFIC_TIME]
     time: Union[datetime, str] = Field(..., description="Specific date and time to wait until.")
-    timezone: Optional[str] = Field(default=None, description="")
+    timezone: Optional[str] = Field(default=None, description="Timezone identifier used to interpret the 'time' field.")
 
 DelayJobConfig = Annotated[
     Union[ 

model_compose-0.3.2/src/mindor/dsl/schema/job/impl/random_router.py

@@ -0,0 +1,21 @@
+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, field_validator
+from .common import JobType, CommonJobConfig
+
+class RandomRoutingMode(Enum, str):
+    UNIFORM  = "uniform"
+    WEIGHTED = "weighted"
+
+class RandomRoutingConfig(BaseModel):
+    weight: Optional[float] = Field(default=None, description="")
+    target: str = Field(..., description="Destination job ID for this route.")
+
+class RandomRouterJobConfig(CommonJobConfig):
+    type: Literal[JobType.RANDOM_ROUTER]
+    mode: RandomRoutingMode = Field(default=RandomRoutingMode.UNIFORM, description="")
+    routings: List[RandomRoutingConfig] = Field(default_factory=list, description="")
+
+    def get_routing_jobs(self) -> Set[str]:
+        return { routing.target for routing in self.routings }

model_compose-0.3.2/src/mindor/dsl/schema/job/impl/types.py

@@ -0,0 +1,8 @@
+from enum import Enum
+
+class JobType(str, Enum):
+    ACTION        = "action"
+    DELAY         = "delay"
+    IF            = "if"
+    SWITCH        = "switch"
+    RANDOM_ROUTER = "random-router"

{model_compose-0.3.1 → model_compose-0.3.2}/src/mindor/dsl/schema/job/job.py

@@ -7,7 +7,8 @@ JobConfig = Annotated[
         ActionJobConfig,
         DelayJobConfig,
         IfJobConfig,
-        SwitchJobConfig
+        SwitchJobConfig,
+        RandomRouterJobConfig
     ],
     Field(discriminator="type")
 ]

{model_compose-0.3.1 → model_compose-0.3.2}/src/mindor/dsl/schema/listener/impl/common.py

@@ -5,5 +5,5 @@ from .types import ListenerType
 
 class CommonListenerConfig(BaseModel):
     type: ListenerType = Field(..., description="")
-    runtime: RuntimeType = Field(default=RuntimeType.NATIVE)
-    max_concurrent_count: int = Field(default=0)
+    runtime: RuntimeType = Field(default=RuntimeType.NATIVE, description="")
+    max_concurrent_count: int = Field(default=0, description="")

{model_compose-0.3.1 → model_compose-0.3.2}/src/mindor/dsl/schema/listener/impl/http_callback.py

@@ -5,14 +5,14 @@ from .common import ListenerType, CommonListenerConfig
 
 class HttpCallbackConfig(BaseModel):
     path: str
-    method: Literal[ "GET", "POST", "PUT", "DELETE", "PATCH" ] = Field(default="POST")
-    bulk: bool = Field(default=False)
-    item: Optional[str] = Field(default=None)
+    method: Literal[ "GET", "POST", "PUT", "DELETE", "PATCH" ] = Field(default="POST", description="")
+    bulk: bool = Field(default=False, description="")
+    item: Optional[str] = Field(default=None, description="")
     identify_by: str = Field(..., description="")
-    status: Optional[str] = Field(default=None)
-    success_when: Optional[List[str]] = Field(default=None)
-    fail_when: Optional[List[str]] = Field(default=None)
-    result: Optional[Any] = Field(default=None)
+    status: Optional[str] = Field(default=None, description="")
+    success_when: Optional[List[str]] = Field(default=None, description="")
+    fail_when: Optional[List[str]] = Field(default=None, description="")
+    result: Optional[Any] = Field(default=None, description="")
 
     @model_validator(mode="before")
     def normalize_status_fields(cls, values: Dict[str, Any]):

{model_compose-0.3.1 → model_compose-0.3.2}/src/mindor/dsl/schema/workflow.py

@@ -3,7 +3,7 @@ from enum import Enum
 from pydantic import BaseModel, Field
 from pydantic import model_validator, field_validator
 from mindor.dsl.utils.annotation import get_model_union_keys
-from .job import JobConfig, JobType
+from .job import JobConfig, JobType, DelayJobMode
 
 class WorkflowVariableType(str, Enum):
     # Primitive data types
@@ -67,7 +67,8 @@ class WorkflowConfig(BaseModel):
     def normalize_jobs(cls, values: Dict[str, Any]):
         values = cls.inflate_single_job(values)
         if "jobs" in values:
-           cls.set_default_job_type(values["jobs"])
+           cls.fill_missing_job_type(values["jobs"])
+           cls.fill_missing_delay_job_mode(values["jobs"])
         return values
 
     @classmethod
@@ -79,7 +80,13 @@ class WorkflowConfig(BaseModel):
         return values
 
     @classmethod
-    def set_default_job_type(cls, jobs: Dict[str, Any]):
+    def fill_missing_job_type(cls, jobs: Dict[str, Any]):
         for job in jobs.values():
             if "type" not in job:
                 job["type"] = JobType.ACTION
+
+    @classmethod
+    def fill_missing_delay_job_mode(cls, jobs: Dict[str, Any]):
+        for job in [ job for job in jobs.values() if job["type"] == "delay" ]:
+            if "mode" not in job:
+                job["mode"] = DelayJobMode.TIME_INTERVAL

{model_compose-0.3.1 → model_compose-0.3.2/src/model_compose.egg-info}/PKG-INFO

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

{model_compose-0.3.1 → model_compose-0.3.2}/src/model_compose.egg-info/SOURCES.txt

@@ -94,6 +94,7 @@ src/mindor/core/workflow/job/impl/__init__.py
 src/mindor/core/workflow/job/impl/action.py
 src/mindor/core/workflow/job/impl/delay.py
 src/mindor/core/workflow/job/impl/if_.py
+src/mindor/core/workflow/job/impl/random_router.py
 src/mindor/core/workflow/job/impl/switch.py
 src/mindor/dsl/__init__.py
 src/mindor/dsl/loader.py
@@ -147,7 +148,13 @@ src/mindor/dsl/schema/controller/impl/common.py
 src/mindor/dsl/schema/controller/impl/http_server.py
 src/mindor/dsl/schema/controller/impl/mcp_server.py
 src/mindor/dsl/schema/controller/impl/types.py
-src/mindor/dsl/schema/controller/impl/webui.py
+src/mindor/dsl/schema/controller/webui/__init__.py
+src/mindor/dsl/schema/controller/webui/webui.py
+src/mindor/dsl/schema/controller/webui/impl/__init__.py
+src/mindor/dsl/schema/controller/webui/impl/common.py
+src/mindor/dsl/schema/controller/webui/impl/dynamic.py
+src/mindor/dsl/schema/controller/webui/impl/gradio.py
+src/mindor/dsl/schema/controller/webui/impl/static.py
 src/mindor/dsl/schema/gateway/__init__.py
 src/mindor/dsl/schema/gateway/gateway.py
 src/mindor/dsl/schema/gateway/impl/__init__.py
@@ -162,6 +169,7 @@ src/mindor/dsl/schema/job/impl/action.py
 src/mindor/dsl/schema/job/impl/common.py
 src/mindor/dsl/schema/job/impl/delay.py
 src/mindor/dsl/schema/job/impl/if_.py
+src/mindor/dsl/schema/job/impl/random_router.py
 src/mindor/dsl/schema/job/impl/switch.py
 src/mindor/dsl/schema/job/impl/types.py
 src/mindor/dsl/schema/listener/__init__.py

model_compose-0.3.1/src/mindor/dsl/schema/component/impl/common.py

@@ -1,13 +0,0 @@
-from typing import Type, Union, Literal, Optional, Dict, List, Tuple, Set, Annotated, Any
-from enum import Enum
-from pydantic import BaseModel, Field
-from mindor.dsl.schema.action import CommonActionConfig
-from mindor.dsl.schema.runtime import RuntimeType
-from .types import ComponentType
-
-class CommonComponentConfig(BaseModel):
-    type: ComponentType = Field(..., description="")
-    runtime: RuntimeType = Field(default=RuntimeType.NATIVE)
-    max_concurrent_count: int = Field(default=1)
-    default: bool = Field(default=False)
-    actions: Dict[str, CommonActionConfig] = Field(default_factory=dict)

model_compose-0.3.1/src/mindor/dsl/schema/controller/impl/common.py

@@ -1,21 +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, field_validator
-from mindor.dsl.schema.runtime import RuntimeConfig
-from .types import ControllerType
-from .webui import ControllerWebUIConfig
-
-class CommonControllerConfig(BaseModel):
-    name: Optional[str] = Field(default=None)
-    type: ControllerType = Field(..., description="")
-    runtime: RuntimeConfig = Field(..., description="")
-    max_concurrent_count: int = Field(default=1, description="")
-    threaded: bool = Field(default=False, description="")
-    webui: Optional[ControllerWebUIConfig] = Field(default=None, description="")
-
-    @model_validator(mode="before")
-    def inflate_runtime(cls, values: Dict[str, Any]):
-        runtime = values.get("runtime")
-        if runtime is None or isinstance(runtime, str):
-            values["runtime"] = { "type": runtime or "native" }
-        return values