model-compose 0.3.17__tar.gz → 0.3.18__tar.gz

{model_compose-0.3.17/src/model_compose.egg-info → model_compose-0.3.18}/PKG-INFO

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

{model_compose-0.3.17 → model_compose-0.3.18}/pyproject.toml

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

{model_compose-0.3.17 → model_compose-0.3.18}/src/mindor/core/component/base.py

@@ -7,7 +7,7 @@ from mindor.dsl.schema.gateway import GatewayConfig
 from mindor.dsl.schema.workflow import WorkflowConfig
 from mindor.core.services import AsyncService
 from mindor.core.utils.workqueue import WorkQueue
-from mindor.core.utils.package import extract_module_name, is_module_installed, install_package
+from mindor.core.utils.package import install_package, parse_requirement, is_requirement_satisfied
 from mindor.core.logger import logging
 from .context import ComponentActionContext
 
@@ -89,7 +89,7 @@ class ComponentService(AsyncService):
     async def _teardown(self) -> None:
         pass
 
-    async def _get_setup_requirements(self) -> Optional[List[str]]:
+    def _get_setup_requirements(self) -> Optional[List[str]]:
         return None
 
     async def _start(self) -> None:
@@ -119,8 +119,8 @@ class ComponentService(AsyncService):
 
     async def _install_packages(self, packages: List[str]) -> None:
         for package_spec in packages:
-            module_name = extract_module_name(package_spec)
-            if not is_module_installed(module_name):
+            requirement = parse_requirement(package_spec)
+            if not requirement or not is_requirement_satisfied(requirement):
                 logging.info(f"Installing missing module: {package_spec}")
                 await install_package(package_spec)
 

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

@@ -2,7 +2,7 @@ from __future__ import annotations
 from typing import TYPE_CHECKING
 
 from typing import Type, Union, Literal, Optional, Dict, List, Tuple, Set, Annotated, Any
-from mindor.dsl.schema.component import ModelComponentConfig
+from mindor.dsl.schema.component import ModelComponentConfig, ModelSourceConfig
 from mindor.dsl.schema.action import ModelActionConfig, TextGenerationModelActionConfig
 from mindor.core.utils.streamer import AsyncStreamer
 from mindor.core.logger import logging
@@ -126,7 +126,7 @@ class TextGenerationTaskService(ModelTaskService):
 
     async def _run(self, action: ModelActionConfig, context: ComponentActionContext, loop: asyncio.AbstractEventLoop) -> Any:
         return await TextGenerationTaskAction(action, self.model, self.tokenizer, self.device).run(context, loop)
-
+    
     def _get_model_class(self) -> Type[PreTrainedModel]:
         from transformers import AutoModelForCausalLM
         return AutoModelForCausalLM

model_compose-0.3.18/src/mindor/core/utils/package.py

@@ -0,0 +1,63 @@
+from typing import Optional
+from packaging.requirements import Requirement, SpecifierSet
+from packaging.utils import canonicalize_name
+from importlib.metadata import version, PackageNotFoundError
+import sys, subprocess, re
+import asyncio
+
+async def install_package(package_spec: str) -> None:
+    """Install a package using pip.
+    
+    Args:
+        package_spec: Package specification to install (e.g., "torch>=2.0.0")
+    """
+    process = await asyncio.create_subprocess_exec(
+        sys.executable, "-m", "pip", "install", package_spec,
+        stdout=asyncio.subprocess.PIPE,
+        stderr=asyncio.subprocess.PIPE
+    )
+
+    stdout, stderr = await process.communicate()
+    
+    if process.returncode != 0:
+        raise subprocess.CalledProcessError(
+            process.returncode, 
+            [sys.executable, "-m", "pip", "install", package_spec],
+            output=stdout,
+            stderr=stderr
+        )
+
+def parse_requirement(package_spec: str) -> Optional[Requirement]:
+    """Attempt to parse the package specification as a PEP 508 requirement.
+
+    Args:
+        package_spec: A package specification string (e.g., "torch>=2.0.0")
+
+    Returns:
+        A Requirement object if the specification can be parsed, None otherwise
+    """    
+    try:
+        return Requirement(package_spec)
+    except Exception:
+        return None
+
+def is_requirement_satisfied(requirement: Requirement) -> bool:
+    """Check whether the installed version of a package satisfies the given requirement.
+
+    Args:
+        requirement: Requirement object specifying the package name and version constraints.
+
+    Returns:
+        True if the package is installed and its version meets the requirement, False otherwise.
+    """
+    distribution_name = canonicalize_name(requirement.name)
+    try:
+        installed_version = version(distribution_name)  # e.g. "4.41.2"
+    except PackageNotFoundError:
+        return False
+
+    specifier: SpecifierSet = requirement.specifier
+    if not specifier:
+        return True
+
+    return specifier.contains(installed_version, prereleases=True)

{model_compose-0.3.17 → model_compose-0.3.18}/src/mindor/dsl/schema/component/impl/model/impl/common.py

@@ -23,14 +23,15 @@ class AttentionMode(str, Enum):
 
 class ModelSourceConfig(BaseModel):
     model_id: str = Field(..., description="Model identifier.")
-    provider: Optional[str] = Field(default=None, description="Model provider.")
+    provider: Literal[ "huggingface" ] = Field(default="huggingface", description="Model provider.")
     revision: Optional[str] = Field(default=None, description="Model version or branch to load.")
     filename: Optional[str] = Field(default=None, description="Specific file inside the model repo.")
 
 class CommonModelComponentConfig(CommonComponentConfig):
     type: Literal[ComponentType.MODEL]
     task: ModelTaskType = Field(..., description="Type of task the model performs.")
-    model: Union[str, ModelSourceConfig] = Field(..., description="Model source.")
+    driver: Literal[ "huggingface" ] = Field(default="huggingface", description="")
+    model: Union[str, ModelSourceConfig] = Field(..., description="Model source configuration.")
     cache_dir: Optional[str] = Field(default=None, description="Directory to cache the model files.")
     local_files_only: bool = Field(default=False, description="Force loading from local files only.")
     device_mode: DeviceMode = Field(default=DeviceMode.AUTO, description="Device allocation mode.")

{model_compose-0.3.17 → model_compose-0.3.18}/src/mindor/dsl/schema/component/impl/model/impl/text_generation.py

@@ -1,4 +1,5 @@
 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
 from mindor.dsl.schema.action import TextGenerationModelActionConfig

{model_compose-0.3.17 → model_compose-0.3.18/src/model_compose.egg-info}/PKG-INFO

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

model_compose-0.3.17/src/mindor/core/utils/package.py

@@ -1,57 +0,0 @@
-import sys, subprocess, re
-import asyncio
-
-_VERSION_SPEC_PATTERN = re.compile(r'^([a-zA-Z0-9_\-\.]+)([><=!]+.*)?$')
-
-async def install_package(package_spec: str) -> None:
-    """Install a package using pip.
-    
-    Args:
-        package_spec: Package specification to install (e.g., "torch>=2.0.0")
-    """
-    process = await asyncio.create_subprocess_exec(
-        sys.executable, "-m", "pip", "install", package_spec,
-        stdout=asyncio.subprocess.PIPE,
-        stderr=asyncio.subprocess.PIPE
-    )
-
-    stdout, stderr = await process.communicate()
-    
-    if process.returncode != 0:
-        raise subprocess.CalledProcessError(
-            process.returncode, 
-            [sys.executable, "-m", "pip", "install", package_spec],
-            output=stdout,
-            stderr=stderr
-        )
-
-def extract_module_name(package_spec: str) -> str:
-    """Extract module name from package specification.
-
-    Args:
-        package_spec: Package specification like "torch>=2.0.0" or "transformers"
-        
-    Returns:
-        Module name for importing (e.g., "torch" from "torch>=2.0.0")
-    """
-    match = re.match(_VERSION_SPEC_PATTERN, package_spec)
-    
-    if match:
-        return match.group(1)
-    
-    return None
-
-def is_module_installed(module_name: str) -> bool:
-    """Check if a module is installed and importable.
-    
-    Args:
-        module_name: Name of the module to check
-        
-    Returns:
-        True if module can be imported, False otherwise
-    """
-    try:
-        __import__(module_name)
-        return True
-    except ImportError:
-        return False