model-compose 0.4.50__tar.gz → 0.4.51__tar.gz

{model_compose-0.4.50 → model_compose-0.4.51}/PKG-INFO

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

{model_compose-0.4.50 → model_compose-0.4.51}/pyproject.toml

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

{model_compose-0.4.50 → model_compose-0.4.51}/src/mindor/core/component/services/graph_store/drivers/arangodb.py

@@ -257,7 +257,7 @@ class ArangoDBGraphStoreService(GraphStoreService):
     def _create_client(self) -> Tuple[ArangoClient, StandardDatabase]:
         from arango import ArangoClient
 
-        url = f"{self.config.protocol}://{self.config.host}:{self.config.port}"
+        url = self.config.url if self.config.url else f"{self.config.protocol}://{self.config.host}:{self.config.port}"
         client = ArangoClient(
             hosts=url,
             request_timeout=parse_duration(self.config.timeout).total_seconds()

{model_compose-0.4.50 → model_compose-0.4.51}/src/mindor/core/component/services/graph_store/drivers/neo4j.py

@@ -301,9 +301,10 @@ class Neo4jGraphStoreService(GraphStoreService):
         from neo4j import AsyncGraphDatabase
 
         auth = (self.config.username, self.config.password) if self.config.username else None
+        url = self.config.url if self.config.url else f"{self.config.protocol}://{self.config.host}:{self.config.port}"
 
         return AsyncGraphDatabase.driver(
-            self.config.uri,
+            url,
             auth=auth,
             connection_timeout=parse_duration(self.config.timeout).total_seconds()
         )

{model_compose-0.4.50 → model_compose-0.4.51}/src/mindor/dsl/schema/component/impl/graph_store/impl/arangodb.py

@@ -1,11 +1,12 @@
 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 BaseModel, Field, model_validator
 from mindor.dsl.schema.action import ArangoDBGraphStoreActionConfig
 from .common import CommonGraphStoreComponentConfig, GraphStoreDriver
 
 class ArangoDBGraphStoreComponentConfig(CommonGraphStoreComponentConfig):
     driver: Literal[GraphStoreDriver.ARANGODB]
+    url: Optional[str] = Field(default=None, description="ArangoDB connection URL (e.g., http://localhost:8529).")
     host: str = Field(default="localhost", description="ArangoDB server hostname or IP address.")
     port: int = Field(default=8529, ge=1, le=65535, description="ArangoDB server port number.")
     protocol: Literal["http", "https"] = Field(default="http", description="Connection protocol.")
@@ -14,3 +15,9 @@ class ArangoDBGraphStoreComponentConfig(CommonGraphStoreComponentConfig):
     database: str = Field(default="_system", description="Target database name.")
     timeout: str = Field(default="30s", description="Client operation timeout.")
     actions: List[ArangoDBGraphStoreActionConfig] = Field(default_factory=list)
+
+    @model_validator(mode="before")
+    def validate_url_or_host(cls, values: Dict[str, Any]):
+        if values.get("url") and values.get("host"):
+            raise ValueError("Either 'url' or 'host' should be set, but not both")
+        return values

{model_compose-0.4.50 → model_compose-0.4.51}/src/mindor/dsl/schema/component/impl/graph_store/impl/neo4j.py

@@ -1,14 +1,23 @@
 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 BaseModel, Field, model_validator
 from mindor.dsl.schema.action import Neo4jGraphStoreActionConfig
 from .common import CommonGraphStoreComponentConfig, GraphStoreDriver
 
 class Neo4jGraphStoreComponentConfig(CommonGraphStoreComponentConfig):
     driver: Literal[GraphStoreDriver.NEO4J]
-    uri: str = Field(default="bolt://localhost:7687", description="Neo4j connection URI (bolt:// or neo4j://).")
+    url: Optional[str] = Field(default=None, description="Neo4j connection URL (bolt:// or neo4j://).")
+    host: str = Field(default="localhost", description="Neo4j server hostname or IP address.")
+    port: int = Field(default=7687, ge=1, le=65535, description="Neo4j server port number.")
+    protocol: Literal["bolt", "neo4j", "bolt+s", "neo4j+s", "bolt+ssc", "neo4j+ssc"] = Field(default="bolt", description="Neo4j connection protocol.")
     username: Optional[str] = Field(default=None, description="Username for authentication.")
     password: Optional[str] = Field(default=None, description="Password for authentication.")
     database: Optional[str] = Field(default=None, description="Target database name. Uses default database if not specified.")
     timeout: str = Field(default="30s", description="Client operation timeout.")
     actions: List[Neo4jGraphStoreActionConfig] = Field(default_factory=list)
+
+    @model_validator(mode="before")
+    def validate_url_or_host(cls, values: Dict[str, Any]):
+        if values.get("url") and values.get("host"):
+            raise ValueError("Either 'url' or 'host' should be set, but not both")
+        return values

{model_compose-0.4.50 → model_compose-0.4.51}/src/model_compose.egg-info/PKG-INFO

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