kailash 0.3.0__py3-none-any.whl → 0.3.1__py3-none-any.whl

kailash/manifest.py

@@ -1,9 +1,9 @@
 """Workflow manifest generation for Kailash deployment."""
 
 import json
-from datetime import datetime, timezone
+from datetime import UTC, datetime
 from pathlib import Path
-from typing import Any, Dict, List, Optional, Union
+from typing import Any
 
 import yaml
 from pydantic import BaseModel, Field
@@ -17,13 +17,13 @@ class KailashManifest(BaseModel):
 
     model_config = {"arbitrary_types_allowed": True}
 
-    metadata: Dict[str, Any] = Field(..., description="Manifest metadata")
-    workflow: Optional[Workflow] = Field(None, description="Associated workflow")
-    resources: Optional[Dict[str, Any]] = Field(
+    metadata: dict[str, Any] = Field(..., description="Manifest metadata")
+    workflow: Workflow | None = Field(None, description="Associated workflow")
+    resources: dict[str, Any] | None = Field(
         default_factory=dict, description="Additional deployment resources"
     )
 
-    def to_dict(self) -> Dict[str, Any]:
+    def to_dict(self) -> dict[str, Any]:
         """Convert manifest to dictionary.
 
         Returns:
@@ -55,7 +55,7 @@ class KailashManifest(BaseModel):
         """
         return json.dumps(self.to_dict(), indent=2)
 
-    def save(self, path: Union[str, Path], format: str = "yaml") -> None:
+    def save(self, path: str | Path, format: str = "yaml") -> None:
         """Save manifest to file.
 
         Args:
@@ -95,7 +95,7 @@ class KailashManifest(BaseModel):
             "version": workflow.metadata.version,
             "author": workflow.metadata.author,
             "description": workflow.metadata.description,
-            "created_at": datetime.now(timezone.utc).isoformat(),
+            "created_at": datetime.now(UTC).isoformat(),
         }
 
         # Override defaults with provided metadata
@@ -104,7 +104,7 @@ class KailashManifest(BaseModel):
         return cls(metadata=default_metadata, workflow=workflow)
 
     @classmethod
-    def from_dict(cls, data: Dict[str, Any]) -> "KailashManifest":
+    def from_dict(cls, data: dict[str, Any]) -> "KailashManifest":
         """Create manifest from dictionary.
 
         Args:
@@ -132,7 +132,7 @@ class KailashManifest(BaseModel):
             raise ManifestError(f"Failed to create manifest from data: {e}") from e
 
     @classmethod
-    def load(cls, path: Union[str, Path]) -> "KailashManifest":
+    def load(cls, path: str | Path) -> "KailashManifest":
         """Load manifest from file.
 
         Args:
@@ -149,7 +149,7 @@ class KailashManifest(BaseModel):
             if not file_path.exists():
                 raise FileNotFoundError(f"File not found: {file_path}")
 
-            with open(file_path, "r") as f:
+            with open(file_path) as f:
                 content = f.read()
 
             # Parse based on file extension
@@ -172,21 +172,21 @@ class DeploymentConfig(BaseModel):
     namespace: str = Field("default", description="Kubernetes namespace")
     replicas: int = Field(1, description="Number of replicas")
     strategy: str = Field("RollingUpdate", description="Deployment strategy")
-    labels: Dict[str, str] = Field(
+    labels: dict[str, str] = Field(
         default_factory=dict, description="Kubernetes labels"
     )
-    annotations: Dict[str, str] = Field(
+    annotations: dict[str, str] = Field(
         default_factory=dict, description="Kubernetes annotations"
     )
     image_pull_policy: str = Field("IfNotPresent", description="Image pull policy")
-    service_account: Optional[str] = Field(None, description="Service account name")
-    node_selector: Dict[str, str] = Field(
+    service_account: str | None = Field(None, description="Service account name")
+    node_selector: dict[str, str] = Field(
         default_factory=dict, description="Node selector"
     )
-    tolerations: List[Dict[str, Any]] = Field(
+    tolerations: list[dict[str, Any]] = Field(
         default_factory=list, description="Pod tolerations"
     )
-    affinity: Optional[Dict[str, Any]] = Field(None, description="Pod affinity rules")
+    affinity: dict[str, Any] | None = Field(None, description="Pod affinity rules")
 
 
 class ServiceConfig(BaseModel):
@@ -194,11 +194,11 @@ class ServiceConfig(BaseModel):
 
     name: str = Field(..., description="Service name")
     type: str = Field("ClusterIP", description="Service type")
-    ports: List[Dict[str, Any]] = Field(
+    ports: list[dict[str, Any]] = Field(
         default_factory=list, description="Service ports"
     )
-    selector: Dict[str, str] = Field(default_factory=dict, description="Pod selector")
-    labels: Dict[str, str] = Field(default_factory=dict, description="Service labels")
+    selector: dict[str, str] = Field(default_factory=dict, description="Pod selector")
+    labels: dict[str, str] = Field(default_factory=dict, description="Service labels")
 
 
 class VolumeConfig(BaseModel):
@@ -209,7 +209,7 @@ class VolumeConfig(BaseModel):
     source: str = Field(..., description="Volume source")
     mount_path: str = Field(..., description="Mount path in container")
     read_only: bool = Field(True, description="Read-only mount")
-    sub_path: Optional[str] = Field(None, description="Sub-path within volume")
+    sub_path: str | None = Field(None, description="Sub-path within volume")
 
 
 class ConfigMapConfig(BaseModel):
@@ -217,9 +217,9 @@ class ConfigMapConfig(BaseModel):
 
     name: str = Field(..., description="ConfigMap name")
     namespace: str = Field("default", description="Namespace")
-    data: Dict[str, str] = Field(default_factory=dict, description="ConfigMap data")
-    binary_data: Dict[str, str] = Field(default_factory=dict, description="Binary data")
-    labels: Dict[str, str] = Field(default_factory=dict, description="Labels")
+    data: dict[str, str] = Field(default_factory=dict, description="ConfigMap data")
+    binary_data: dict[str, str] = Field(default_factory=dict, description="Binary data")
+    labels: dict[str, str] = Field(default_factory=dict, description="Labels")
 
 
 class SecretConfig(BaseModel):
@@ -228,9 +228,9 @@ class SecretConfig(BaseModel):
     name: str = Field(..., description="Secret name")
     namespace: str = Field("default", description="Namespace")
     type: str = Field("Opaque", description="Secret type")
-    data: Dict[str, str] = Field(default_factory=dict, description="Secret data")
-    string_data: Dict[str, str] = Field(default_factory=dict, description="String data")
-    labels: Dict[str, str] = Field(default_factory=dict, description="Labels")
+    data: dict[str, str] = Field(default_factory=dict, description="Secret data")
+    string_data: dict[str, str] = Field(default_factory=dict, description="String data")
+    labels: dict[str, str] = Field(default_factory=dict, description="Labels")
 
 
 class ManifestBuilder:
@@ -244,10 +244,10 @@ class ManifestBuilder:
         """
         self.workflow = workflow
         self.deployment_config = None
-        self.service_configs: List[ServiceConfig] = []
-        self.volume_configs: List[VolumeConfig] = []
-        self.configmap_configs: List[ConfigMapConfig] = []
-        self.secret_configs: List[SecretConfig] = []
+        self.service_configs: list[ServiceConfig] = []
+        self.volume_configs: list[VolumeConfig] = []
+        self.configmap_configs: list[ConfigMapConfig] = []
+        self.secret_configs: list[SecretConfig] = []
 
     def with_deployment(self, config: DeploymentConfig) -> "ManifestBuilder":
         """Add deployment configuration.
@@ -309,7 +309,7 @@ class ManifestBuilder:
         self.secret_configs.append(config)
         return self
 
-    def build(self) -> Dict[str, Any]:
+    def build(self) -> dict[str, Any]:
         """Build the complete manifest.
 
         Returns:
@@ -340,7 +340,7 @@ class ManifestBuilder:
 
         return manifest
 
-    def _build_deployment(self) -> Dict[str, Any]:
+    def _build_deployment(self) -> dict[str, Any]:
         """Build deployment manifest."""
         config = self.deployment_config
 
@@ -446,7 +446,7 @@ class ManifestBuilder:
 
         return deployment
 
-    def _build_service(self, config: ServiceConfig) -> Dict[str, Any]:
+    def _build_service(self, config: ServiceConfig) -> dict[str, Any]:
         """Build service manifest."""
         service = {
             "apiVersion": "v1",
@@ -469,7 +469,7 @@ class ManifestBuilder:
 
         return service
 
-    def _build_configmap(self, config: ConfigMapConfig) -> Dict[str, Any]:
+    def _build_configmap(self, config: ConfigMapConfig) -> dict[str, Any]:
         """Build ConfigMap manifest."""
         configmap = {
             "apiVersion": "v1",
@@ -487,7 +487,7 @@ class ManifestBuilder:
 
         return configmap
 
-    def _build_secret(self, config: SecretConfig) -> Dict[str, Any]:
+    def _build_secret(self, config: SecretConfig) -> dict[str, Any]:
         """Build Secret manifest."""
         secret = {
             "apiVersion": "v1",
@@ -506,7 +506,7 @@ class ManifestBuilder:
 
         return secret
 
-    def _build_workflow_crd(self) -> Dict[str, Any]:
+    def _build_workflow_crd(self) -> dict[str, Any]:
         """Build workflow custom resource."""
         from kailash.utils.export import ExportConfig, WorkflowExporter
 
@@ -529,7 +529,7 @@ class ManifestGenerator:
     @staticmethod
     def generate_simple_manifest(
         workflow: Workflow, name: str, namespace: str = "default"
-    ) -> Dict[str, Any]:
+    ) -> dict[str, Any]:
         """Generate a simple deployment manifest.
 
         Args:
@@ -586,9 +586,9 @@ class ManifestGenerator:
         name: str,
         namespace: str = "default",
         replicas: int = 1,
-        resources: Optional[Dict[str, Any]] = None,
+        resources: dict[str, Any] | None = None,
         **kwargs,
-    ) -> Dict[str, Any]:
+    ) -> dict[str, Any]:
         """Generate an advanced deployment manifest with custom configuration.
 
         Args:
@@ -713,7 +713,7 @@ class ManifestGenerator:
         return builder.build()
 
     @staticmethod
-    def save_manifest(manifest: Dict[str, Any], path: str, format: str = "yaml"):
+    def save_manifest(manifest: dict[str, Any], path: str, format: str = "yaml"):
         """Save manifest to file.
 
         Args:
@@ -737,7 +737,7 @@ class ManifestGenerator:
 # Convenience functions
 def create_deployment_manifest(
     workflow: Workflow, deployment_name: str, **config
-) -> Dict[str, Any]:
+) -> dict[str, Any]:
     """Create a deployment manifest for a workflow.
 
     Args:

kailash/mcp/__init__.py

@@ -44,7 +44,7 @@ Examples:
 """
 
 from .client import MCPClient
-from .server import MCPServer, SimpleMCPServer
+from .server_enhanced import MCPServer, SimpleMCPServer
 
 __all__ = [
     "MCPClient",

kailash/mcp/ai_registry_server.py

@@ -11,7 +11,7 @@ Run as: python -m kailash.mcp.ai_registry_server
 import asyncio
 import json
 import os
-from typing import Any, Dict, List, Optional
+from typing import Any
 
 from mcp.server import Server
 from mcp.types import Resource, TextContent, Tool
@@ -32,7 +32,7 @@ class AIRegistryServer:
         self._setup_tools()
         self._setup_resources()
 
-    def _load_registry_data(self, registry_file: str) -> Dict[str, Any]:
+    def _load_registry_data(self, registry_file: str) -> dict[str, Any]:
         """Load AI Registry data from JSON file."""
         # Handle both absolute and relative paths
         if not os.path.isabs(registry_file):
@@ -48,7 +48,7 @@ class AIRegistryServer:
                 registry_file = os.path.join(project_root, registry_file)
 
         try:
-            with open(registry_file, "r", encoding="utf-8") as f:
+            with open(registry_file, encoding="utf-8") as f:
                 return json.load(f)
         except FileNotFoundError:
             # Return mock data if file not found
@@ -425,10 +425,10 @@ class AIRegistryServer:
     def _search_use_cases(
         self,
         query: str,
-        domains: Optional[List[str]] = None,
-        methods: Optional[List[str]] = None,
+        domains: list[str] | None = None,
+        methods: list[str] | None = None,
         limit: int = 10,
-    ) -> Dict[str, Any]:
+    ) -> dict[str, Any]:
         """Search use cases with filters."""
         use_cases = self.registry_data.get("use_cases", [])
         results = []
@@ -460,8 +460,8 @@ class AIRegistryServer:
         return {"results": results[:limit], "count": len(results), "query": query}
 
     def _filter_by_domain(
-        self, domain: str, status: Optional[str] = None, limit: int = 20
-    ) -> Dict[str, Any]:
+        self, domain: str, status: str | None = None, limit: int = 20
+    ) -> dict[str, Any]:
         """Filter use cases by domain."""
         use_cases = self.registry_data.get("use_cases", [])
         filtered = []
@@ -473,7 +473,7 @@ class AIRegistryServer:
 
         return {"domain": domain, "count": len(filtered), "use_cases": filtered[:limit]}
 
-    def _get_use_case_details(self, use_case_id: int) -> Dict[str, Any]:
+    def _get_use_case_details(self, use_case_id: int) -> dict[str, Any]:
         """Get detailed information for a specific use case."""
         use_case = self._get_use_case_by_id(use_case_id)
         if use_case:
@@ -486,7 +486,7 @@ class AIRegistryServer:
 
     def _analyze_domain_trends(
         self, domain: str, include_details: bool = False
-    ) -> Dict[str, Any]:
+    ) -> dict[str, Any]:
         """Analyze trends within a specific domain."""
         use_cases = [
             uc
@@ -518,9 +518,9 @@ class AIRegistryServer:
     def _recommend_similar(
         self,
         use_case_id: int,
-        similarity_factors: Optional[List[str]] = None,
+        similarity_factors: list[str] | None = None,
         limit: int = 5,
-    ) -> Dict[str, Any]:
+    ) -> dict[str, Any]:
         """Find similar use cases."""
         reference_case = self._get_use_case_by_id(use_case_id)
         if not reference_case:
@@ -542,8 +542,8 @@ class AIRegistryServer:
         }
 
     def _estimate_complexity(
-        self, use_case_id: int, organization_context: Optional[Dict] = None
-    ) -> Dict[str, Any]:
+        self, use_case_id: int, organization_context: dict | None = None
+    ) -> dict[str, Any]:
         """Estimate implementation complexity."""
         use_case = self._get_use_case_by_id(use_case_id)
         if not use_case:
@@ -587,8 +587,8 @@ class AIRegistryServer:
         }
 
     def _suggest_implementation_path(
-        self, use_case_id: int, organization_context: Optional[Dict] = None
-    ) -> Dict[str, Any]:
+        self, use_case_id: int, organization_context: dict | None = None
+    ) -> dict[str, Any]:
         """Suggest implementation roadmap."""
         use_case = self._get_use_case_by_id(use_case_id)
         if not use_case:
@@ -626,8 +626,8 @@ class AIRegistryServer:
         }
 
     def _filter_by_method(
-        self, method: str, min_maturity: Optional[str] = None, limit: int = 15
-    ) -> Dict[str, Any]:
+        self, method: str, min_maturity: str | None = None, limit: int = 15
+    ) -> dict[str, Any]:
         """Filter use cases by AI method."""
         use_cases = self.registry_data.get("use_cases", [])
         filtered = []
@@ -644,7 +644,7 @@ class AIRegistryServer:
 
     # Helper methods
 
-    def _get_use_case_by_id(self, use_case_id: int) -> Optional[Dict[str, Any]]:
+    def _get_use_case_by_id(self, use_case_id: int) -> dict[str, Any] | None:
         """Get use case by ID."""
         for use_case in self.registry_data.get("use_cases", []):
             if use_case.get("use_case_id") == use_case_id:
@@ -652,7 +652,7 @@ class AIRegistryServer:
         return None
 
     def _calculate_similarity(
-        self, case1: Dict[str, Any], case2: Dict[str, Any]
+        self, case1: dict[str, Any], case2: dict[str, Any]
     ) -> float:
         """Calculate similarity between two use cases."""
         score = 0.0

kailash/mcp/client.py

@@ -41,7 +41,7 @@ import json
 import logging
 import os
 from contextlib import AsyncExitStack
-from typing import Any, Dict, List, Union
+from typing import Any
 
 logger = logging.getLogger(__name__)
 
@@ -72,8 +72,8 @@ class MCPClient:
         self._discovered_resources = {}  # Cache discovered resources
 
     async def discover_tools(
-        self, server_config: Union[str, Dict[str, Any]]
-    ) -> List[Dict[str, Any]]:
+        self, server_config: str | dict[str, Any]
+    ) -> list[dict[str, Any]]:
         """Discover available tools from an MCP server.
 
         Args:
@@ -169,9 +169,9 @@ class MCPClient:
 
     async def call_tool(
         self,
-        server_config: Union[str, Dict[str, Any]],
+        server_config: str | dict[str, Any],
         tool_name: str,
-        arguments: Dict[str, Any],
+        arguments: dict[str, Any],
     ) -> Any:
         """Call a tool on an MCP server.
 
@@ -260,8 +260,8 @@ class MCPClient:
             return {"error": str(e)}
 
     async def list_resources(
-        self, server_config: Union[str, Dict[str, Any]]
-    ) -> List[Dict[str, Any]]:
+        self, server_config: str | dict[str, Any]
+    ) -> list[dict[str, Any]]:
         """List available resources from an MCP server.
 
         Args:
@@ -350,9 +350,7 @@ class MCPClient:
             logger.error(f"Failed to list resources: {e}")
             return []
 
-    async def read_resource(
-        self, server_config: Union[str, Dict[str, Any]], uri: str
-    ) -> Any:
+    async def read_resource(self, server_config: str | dict[str, Any], uri: str) -> Any:
         """Read a resource from an MCP server.
 
         Args:
@@ -438,7 +436,7 @@ class MCPClient:
             logger.error(f"Failed to read resource: {e}")
             return {"error": str(e)}
 
-    def _get_server_key(self, server_config: Union[str, Dict[str, Any]]) -> str:
+    def _get_server_key(self, server_config: str | dict[str, Any]) -> str:
         """Generate a unique key for caching server data."""
         if isinstance(server_config, str):
             return server_config

kailash/mcp/client_new.py

@@ -6,7 +6,7 @@ This is NOT a node - it's a utility class used by LLM agents to interact with MC
 
 import logging
 import os
-from typing import Any, Dict, List, Optional, Union
+from typing import Any
 
 # Will use official MCP SDK when available
 try:
@@ -47,7 +47,7 @@ class MCPClient:
         self.logger = logging.getLogger(__name__)
 
     async def connect_stdio(
-        self, command: str, args: List[str], env: Optional[Dict[str, str]] = None
+        self, command: str, args: list[str], env: dict[str, str] | None = None
     ):
         """
         Connect to an MCP server via stdio transport.
@@ -88,7 +88,7 @@ class MCPClient:
             self.logger.error(f"Failed to connect to MCP server: {e}")
             raise RuntimeError(f"MCP connection failed: {e}")
 
-    async def discover_tools(self, session: "ClientSession") -> List[Dict[str, Any]]:
+    async def discover_tools(self, session: "ClientSession") -> list[dict[str, Any]]:
         """
         Discover available tools from an MCP server.
 
@@ -118,7 +118,7 @@ class MCPClient:
             return []
 
     async def call_tool(
-        self, session: "ClientSession", name: str, arguments: Dict[str, Any]
+        self, session: "ClientSession", name: str, arguments: dict[str, Any]
     ) -> Any:
         """
         Call a tool on the MCP server.
@@ -150,7 +150,7 @@ class MCPClient:
             self.logger.error(f"Failed to call tool '{name}': {e}")
             raise
 
-    async def list_resources(self, session: "ClientSession") -> List[Dict[str, Any]]:
+    async def list_resources(self, session: "ClientSession") -> list[dict[str, Any]]:
         """
         List available resources from an MCP server.
 
@@ -212,7 +212,7 @@ class MCPClient:
             self.logger.error(f"Failed to read resource '{uri}': {e}")
             raise
 
-    async def list_prompts(self, session: "ClientSession") -> List[Dict[str, Any]]:
+    async def list_prompts(self, session: "ClientSession") -> list[dict[str, Any]]:
         """
         List available prompts from an MCP server.
 
@@ -252,8 +252,8 @@ class MCPClient:
             return []
 
     async def get_prompt(
-        self, session: "ClientSession", name: str, arguments: Dict[str, Any]
-    ) -> Dict[str, Any]:
+        self, session: "ClientSession", name: str, arguments: dict[str, Any]
+    ) -> dict[str, Any]:
         """
         Get a prompt from an MCP server.
 
@@ -292,8 +292,8 @@ class MCPClient:
 
 # Convenience functions for LLM agents
 async def discover_and_prepare_tools(
-    mcp_servers: List[Union[str, Dict[str, Any]]],
-) -> List[Dict[str, Any]]:
+    mcp_servers: list[str | dict[str, Any]],
+) -> list[dict[str, Any]]:
     """
     Discover tools from multiple MCP servers and prepare them for LLM use.
 

kailash/mcp/server.py

@@ -33,7 +33,7 @@ Examples:
 
 import logging
 from abc import ABC, abstractmethod
-from typing import Callable
+from collections.abc import Callable
 
 logger = logging.getLogger(__name__)
 
@@ -84,7 +84,6 @@ class MCPServer(ABC):
             Use @self.add_tool(), @self.add_resource(uri), and
             @self.add_prompt(name) decorators to register capabilities.
         """
-        pass
 
     def add_tool(self):
         """Decorator to add a tool to the server.