tooluniverse 1.0.9__py3-none-any.whl → 1.0.10__py3-none-any.whl

tooluniverse/smcp_server.py

@@ -37,6 +37,31 @@ Examples:
 
   # Start with custom hook configuration
   tooluniverse-smcp-server --hook-config-file /path/to/hook_config.json
+
+  # Load Space configuration
+  tooluniverse-smcp-server --load "community/proteomics-toolkit"
+  tooluniverse-smcp-server --load "./my-config.yaml"
+        """,
+    )
+
+    # Space configuration options
+    space_group = parser.add_argument_group("Space Configuration")
+    space_group.add_argument(
+        "--load",
+        "-l",
+        type=str,
+        metavar="CONFIG",
+        help="""Load space configuration (preset/workspace).
+
+Supports multiple formats:
+  • HuggingFace:      username/repo, hf:username/repo@v1.0.0
+  • Local files:      ./config.yaml, /absolute/path.yaml
+  • HTTP URLs:        https://example.com/config.yaml
+
+Examples:
+  --load "community/proteomics-toolkit"
+  --load "./my-config.yaml"
+  --load "https://example.com/config.yaml"
         """,
     )
 
@@ -106,9 +131,10 @@ Examples:
 
         print()
 
-        # Create SMCP server with hook support
+        # Create SMCP server with Space support
         server = SMCP(
             name=args.name,
+            space=args.load,  # Pass Space URI directly to SMCP
             auto_expose_tools=True,
             search_enabled=True,
             max_workers=5,
@@ -157,47 +183,73 @@ def run_stdio_server():
         epilog="""
 Examples:
   # Start server with all tools using stdio transport (hooks enabled by default)
-  tooluniverse-stdio
+  tooluniverse-smcp-stdio
 
   # Start with specific categories
-  tooluniverse-stdio --categories uniprot ChEMBL opentarget
+  tooluniverse-smcp-stdio --categories uniprot ChEMBL opentarget
 
   # Enable hooks
-  tooluniverse-stdio --hooks
+  tooluniverse-smcp-stdio --hooks
 
   # Use FileSaveHook instead of SummarizationHook
-  tooluniverse-stdio --hook-type FileSaveHook
+  tooluniverse-smcp-stdio --hook-type FileSaveHook
 
   # Use custom hook configuration
-  tooluniverse-stdio --hook-config-file /path/to/hook_config.json
+  tooluniverse-smcp-stdio --hook-config-file /path/to/hook_config.json
 
   # Start with categories but exclude specific tools
-  tooluniverse-stdio --categories uniprot ChEMBL --exclude-tools "ChEMBL_get_molecule_by_chembl_id"
+  tooluniverse-smcp-stdio --categories uniprot ChEMBL --exclude-tools "ChEMBL_get_molecule_by_chembl_id"
 
   # Start with all tools but exclude entire categories
-  tooluniverse-stdio --exclude-categories mcp_auto_loader_boltz mcp_auto_loader_expert_feedback
+  tooluniverse-smcp-stdio --exclude-categories mcp_auto_loader_boltz mcp_auto_loader_expert_feedback
 
   # Load only specific tools by name
-  tooluniverse-stdio --include-tools "UniProt_get_entry_by_accession" "ChEMBL_get_molecule_by_chembl_id"
+  tooluniverse-smcp-stdio --include-tools "UniProt_get_entry_by_accession" "ChEMBL_get_molecule_by_chembl_id"
 
   # Load tools from a file
-  tooluniverse-stdio --tools-file "/path/to/tool_names.txt"
+  tooluniverse-smcp-stdio --tools-file "/path/to/tool_names.txt"
 
   # Load additional config files
-  tooluniverse-stdio --tool-config-files "custom:/path/to/custom_tools.json"
+  tooluniverse-smcp-stdio --tool-config-files "custom:/path/to/custom_tools.json"
 
   # Include/exclude specific tool types
-  tooluniverse-stdio --include-tool-types "OpenTarget" "ToolFinderEmbedding"
-  tooluniverse-stdio --exclude-tool-types "ToolFinderLLM" "Unknown"
+  tooluniverse-smcp-stdio --include-tool-types "OpenTarget" "ToolFinderEmbedding"
+  tooluniverse-smcp-stdio --exclude-tool-types "ToolFinderLLM" "Unknown"
 
   # List available categories
-  tooluniverse-stdio --list-categories
+  tooluniverse-smcp-stdio --list-categories
 
   # List all available tools
-  tooluniverse-stdio --list-tools
+  tooluniverse-smcp-stdio --list-tools
 
   # Start minimal server with just search tools
-  tooluniverse-stdio --categories special_tools tool_finder
+  tooluniverse-smcp-stdio --categories special_tools tool_finder
+
+  # Load Space configuration
+  tooluniverse-smcp-stdio --load "hf:community/proteomics-toolkit"
+  tooluniverse-smcp-stdio --load "./my-config.yaml"
+  tooluniverse-smcp-stdio --load "https://example.com/config.yaml"
+        """,
+    )
+
+    # Space configuration options
+    space_group = parser.add_argument_group("Space Configuration")
+    space_group.add_argument(
+        "--load",
+        "-l",
+        type=str,
+        metavar="CONFIG",
+        help="""Load space configuration (preset/workspace).
+
+Supports multiple formats:
+  • HuggingFace:      username/repo, hf:username/repo@v1.0.0
+  • Local files:      ./config.yaml, /absolute/path.yaml
+  • HTTP URLs:        https://example.com/config.yaml
+
+Examples:
+  --load "community/proteomics-toolkit"
+  --load "./my-config.yaml"
+  --load "https://example.com/config.yaml"
         """,
     )
 
@@ -378,11 +430,12 @@ Examples:
             total_tools = 0
             for category in sorted(tools_by_category.keys()):
                 tools = sorted(tools_by_category[category])
-                print(f"\n📁 {category} ({len(tools, file=sys.stderr)} tools):")
+                print(f"\n📁 {category} ({len(tools)} tools):", file=sys.stderr)
                 for tool in tools[:10]:  # Show first 10 tools per category
                     print(f"  {tool}", file=sys.stderr)
                 if len(tools) > 10:
-                    print(f"  ... and {len(tools, file=sys.stderr) - 10} more tools")
+                    # Print remaining count to stderr
+                    print(f"  ... and {len(tools) - 10} more tools", file=sys.stderr)
                 total_tools += len(tools)
 
             print(f"\nTotal: {total_tools} tools available", file=sys.stderr)
@@ -508,9 +561,10 @@ Examples:
         print(f"⚡ Max workers: {args.max_workers}", file=sys.stderr)
         print(file=sys.stderr)
 
-        # Create SMCP server with hook support
+        # Create SMCP server with Space and tool configuration support
         server = SMCP(
             name=args.name,
+            space=args.load,  # Pass Space URI directly to SMCP
             tool_categories=tool_categories,
             exclude_tools=exclude_tools,
             exclude_categories=exclude_categories,
@@ -588,6 +642,31 @@ Examples:
 
   # Start server for Claude Desktop (stdio transport)
   tooluniverse-smcp --transport stdio
+
+  # Load Space configuration
+  tooluniverse-smcp --load "community/proteomics-toolkit" --port 8000
+  tooluniverse-smcp --load "./my-config.yaml" --transport stdio
+        """,
+    )
+
+    # Space configuration options
+    space_group = parser.add_argument_group("Space Configuration")
+    space_group.add_argument(
+        "--load",
+        "-l",
+        type=str,
+        metavar="CONFIG",
+        help="""Load space configuration (preset/workspace).
+
+Supports multiple formats:
+  • HuggingFace:      username/repo, hf:username/repo@v1.0.0
+  • Local files:      ./config.yaml, /absolute/path.yaml
+  • HTTP URLs:        https://example.com/config.yaml
+
+Examples:
+  --load "community/proteomics-toolkit"
+  --load "./my-config.yaml"
+  --load "https://example.com/config.yaml"
         """,
     )
 
@@ -873,9 +952,10 @@ Examples:
         print(f"⚡ Max workers: {args.max_workers}")
         print()
 
-        # Create SMCP server with hook support
+        # Create SMCP server with Space and hook support
         server = SMCP(
             name=args.name,
+            space=args.load,  # Pass Space URI directly to SMCP
             tool_categories=tool_categories,
             exclude_tools=exclude_tools,
             exclude_categories=exclude_categories,

tooluniverse/space/__init__.py

@@ -0,0 +1,46 @@
+"""
+ToolUniverse Space Configuration Management
+
+This module provides tools for loading, validating, and managing ToolUniverse Space configurations.
+Space allows users to define collections of tools with specific configurations,
+LLM settings, and hooks for advanced scientific workflows.
+
+Main Components:
+- SpaceLoader: Loads Space configurations from various sources (HuggingFace, local files, URLs)
+- SpaceValidator: Validates Space configurations using JSON Schema
+- ValidationError: Exception raised when configuration validation fails
+
+Usage:
+    from tooluniverse.space import SpaceLoader, validate_space_config
+
+    # Load a Space configuration
+    loader = SpaceLoader()
+    config = loader.load("hf:user/repo")
+
+    # Validate a configuration
+    is_valid, errors = validate_space_config(config)
+"""
+
+from .loader import SpaceLoader
+from .validator import (
+    validate_space_config,
+    validate_with_schema,
+    validate_yaml_file_with_schema,
+    validate_yaml_format_by_template,
+    validate_yaml_file,
+    fill_defaults,
+    ValidationError,
+    SPACE_SCHEMA,
+)
+
+__all__ = [
+    "SpaceLoader",
+    "validate_space_config",
+    "validate_with_schema",
+    "validate_yaml_file_with_schema",
+    "validate_yaml_format_by_template",
+    "validate_yaml_file",
+    "fill_defaults",
+    "ValidationError",
+    "SPACE_SCHEMA",
+]

tooluniverse/space/loader.py

@@ -0,0 +1,133 @@
+"""
+ToolUniverse Space Configuration Loader
+
+Simplified loader supporting HuggingFace, local files, and HTTP/HTTPS.
+"""
+
+import json
+from pathlib import Path
+from typing import Any, Dict, Optional, Union
+import yaml
+import requests
+from huggingface_hub import hf_hub_download
+
+from ..utils import get_user_cache_dir
+from .validator import validate_space_config
+
+
+class SpaceLoader:
+    """Simplified loader for ToolUniverse Space configurations."""
+
+    def __init__(self, cache_dir: Optional[Union[str, Path]] = None):
+        """
+        Initialize the Space loader.
+
+        Args:
+            cache_dir: Directory for caching downloaded configurations
+        """
+        if cache_dir:
+            self.cache_dir = Path(cache_dir)
+        else:
+            self.cache_dir = Path(get_user_cache_dir()) / "spaces"
+
+        self.cache_dir.mkdir(parents=True, exist_ok=True)
+
+    def load(self, uri: str) -> Dict[str, Any]:
+        """
+        Load Space configuration from URI.
+
+        Args:
+            uri: Space URI (e.g., "hf:user/repo", "./config.yaml", "https://example.com/config.yaml")
+
+        Returns
+            Loaded configuration dictionary
+
+        Raises:
+            ValueError: If URI is unsupported or configuration is invalid
+        """
+        # Use URI directly (no alias resolution)
+        resolved_uri = uri
+
+        # Detect URI type
+        if resolved_uri.startswith("hf:"):
+            config = self._load_from_hf(resolved_uri)
+        elif resolved_uri.startswith(("http://", "https://")):
+            config = self._load_from_url(resolved_uri)
+        else:
+            config = self._load_from_file(resolved_uri)
+
+        # Validate configuration
+        is_valid, errors = validate_space_config(config)
+        if not is_valid:
+            error_msg = "Configuration validation failed:\n" + "\n".join(
+                f"  - {e}" for e in errors
+            )
+            raise ValueError(error_msg)
+
+        return config
+
+    def _load_from_hf(self, uri: str) -> Dict[str, Any]:
+        """Load configuration from HuggingFace Hub."""
+        repo_id = uri[3:]  # Remove 'hf:' prefix
+
+        try:
+            # Try to download the config file
+            config_path = hf_hub_download(
+                repo_id=repo_id,
+                filename="space.yaml",
+                cache_dir=self.cache_dir,
+                local_files_only=False,
+            )
+            return self._load_from_file(config_path)
+        except Exception as e:
+            # Fallback: try space.json
+            try:
+                config_path = hf_hub_download(
+                    repo_id=repo_id,
+                    filename="space.json",
+                    cache_dir=self.cache_dir,
+                    local_files_only=False,
+                )
+                return self._load_from_file(config_path)
+            except Exception:
+                raise ValueError(
+                    f"Failed to load Space from HuggingFace {repo_id}: {e}"
+                )
+
+    def _load_from_url(self, uri: str) -> Dict[str, Any]:
+        """Load configuration from HTTP/HTTPS URL."""
+        try:
+            response = requests.get(uri, timeout=30)
+            response.raise_for_status()
+
+            # Try YAML first, then JSON
+            try:
+                return yaml.safe_load(response.text)
+            except yaml.YAMLError:
+                return response.json()
+        except Exception as e:
+            raise ValueError(f"Failed to load Space from URL {uri}: {e}")
+
+    def _load_from_file(self, file_path: str) -> Dict[str, Any]:
+        """Load configuration from local file."""
+        path = Path(file_path)
+
+        if not path.exists():
+            raise ValueError(f"Space file not found: {file_path}")
+
+        try:
+            with open(path, "r", encoding="utf-8") as f:
+                if path.suffix.lower() in [".yaml", ".yml"]:
+                    return yaml.safe_load(f)
+                elif path.suffix.lower() == ".json":
+                    return json.load(f)
+                else:
+                    # Try YAML first, then JSON
+                    try:
+                        f.seek(0)
+                        return yaml.safe_load(f)
+                    except yaml.YAMLError:
+                        f.seek(0)
+                        return json.load(f)
+        except Exception as e:
+            raise ValueError(f"Failed to load Space from file {file_path}: {e}")