manta-node 0.5b0.dev245__py3-none-any.whl → 0.5b0.dev259__py3-none-any.whl

manta_node/__main__.py

@@ -40,9 +40,7 @@ def main():
         ]
 
         if first_arg not in cli_commands and (
-            first_arg.endswith(".toml")
-            or first_arg.endswith(".yaml")
-            or first_arg.endswith(".json")
+            first_arg.endswith((".toml", ".yaml", ".json"))
             or Path(first_arg).exists()
             or (Path.home() / ".manta" / "nodes" / f"{first_arg}.toml").exists()
         ):

manta_node/cli/commands/cluster.py

@@ -5,7 +5,6 @@ import subprocess
 import sys
 import time
 from pathlib import Path
-from typing import List
 
 from rich.console import Console
 from rich.prompt import Confirm, Prompt
@@ -119,7 +118,7 @@ def start_cluster_multi_config(count: int) -> int:
                 "--background",
             ]
 
-            result = subprocess.run(cmd, capture_output=True, text=True)
+            result = subprocess.run(cmd, capture_output=True, text=True, check=False)
 
             if result.returncode == 0:
                 started_nodes.append(node["alias"])
@@ -199,7 +198,7 @@ def start_cluster_simple(count: int, config_name: str) -> int:
                 "--background",
             ]
 
-            result = subprocess.run(cmd, capture_output=True, text=True)
+            result = subprocess.run(cmd, capture_output=True, text=True, check=False)
 
             if result.returncode == 0:
                 started_nodes.append(node_alias)
@@ -289,7 +288,7 @@ def stop_cluster() -> int:
         return 1
 
 
-def cluster_command(args: List[str]) -> int:
+def cluster_command(args: list[str]) -> int:
     """Handle node cluster command.
 
     Args:

manta_node/cli/commands/config.py

@@ -5,7 +5,6 @@ import os
 import subprocess
 import sys
 from pathlib import Path
-from typing import List
 
 from rich.console import Console
 from rich.panel import Panel
@@ -383,7 +382,7 @@ def edit_config(config_name: str) -> int:
         console.print(f"Opening {config_path} in {editor}...")
 
         try:
-            result = subprocess.run([editor, str(config_path)])
+            result = subprocess.run([editor, str(config_path)], check=False)
             if result.returncode == 0:
                 print_success(f"Configuration '{config_name}' edited successfully")
 
@@ -410,7 +409,7 @@ def edit_config(config_name: str) -> int:
         return 1
 
 
-def config_command(args: List[str]) -> int:
+def config_command(args: list[str]) -> int:
     """Handle node config command.
 
     Args:

manta_node/cli/commands/logs.py

@@ -3,7 +3,6 @@
 import argparse
 import time
 from pathlib import Path
-from typing import List
 
 from rich.console import Console
 
@@ -73,7 +72,7 @@ def tail_log_file(log_file: Path, lines: int = 50, follow: bool = False) -> None
         print_error(f"Error reading log file: {e}")
 
 
-def logs_command(args: List[str]) -> int:
+def logs_command(args: list[str]) -> int:
     """Handle node logs command.
 
     Args:
@@ -136,7 +135,7 @@ def logs_command(args: List[str]) -> int:
         else:
             # Multiple log files, ask user to specify
             print_error("Multiple log files found. Please specify an instance:")
-            for instance_id in log_files.keys():
+            for instance_id in log_files:
                 console.print(f"  - {instance_id}")
             return 1
     else:
@@ -153,7 +152,7 @@ def logs_command(args: List[str]) -> int:
             print_error(f"No log file found for instance '{instance_name}'")
             if log_files:
                 console.print("Available log files:")
-                for instance_id in log_files.keys():
+                for instance_id in log_files:
                     console.print(f"  - {instance_id}")
             return 1
 

manta_node/cli/commands/start.py

@@ -11,15 +11,12 @@ import time
 import uuid
 from datetime import datetime
 from pathlib import Path
-from typing import List
-
-from rich.console import Console
 
 from manta_common.logging_config import configure_logging
-
-from ...node_orchestrator import Node
+from rich.console import Console
 
 from ...infrastructure.config import NodeConfigManager
+from ...node_orchestrator import Node
 
 console = Console()
 
@@ -302,7 +299,7 @@ def start_node_background(
         return 1
 
 
-def start_command(args: List[str]) -> int:
+def start_command(args: list[str]) -> int:
     """Handle node start command.
 
     Args:

manta_node/cli/commands/status.py

@@ -1,11 +1,11 @@
 """Node status command implementation."""
 
 import argparse
+import contextlib
 import json
 import os
 from datetime import datetime
 from pathlib import Path
-from typing import List
 
 import psutil
 from rich.console import Console
@@ -59,10 +59,8 @@ def find_running_instances():
                 config_name = instance_data.get("config_name", "unknown")
                 start_time_str = instance_data.get("start_time")
                 if start_time_str and not create_time:
-                    try:
+                    with contextlib.suppress(ValueError, TypeError):
                         create_time = datetime.fromisoformat(start_time_str)
-                    except Exception:
-                        pass
 
                 instances.append(
                     {
@@ -89,7 +87,7 @@ def find_running_instances():
     return instances
 
 
-def show_status_table(instances: List[dict]) -> None:
+def show_status_table(instances: list[dict]) -> None:
     """Display instances in a formatted table."""
     if not instances:
         console.print("[yellow]No running node instances found.[/yellow]")
@@ -135,7 +133,7 @@ def show_status_table(instances: List[dict]) -> None:
     console.print(table)
 
 
-def show_status_plain(instances: List[dict]) -> None:
+def show_status_plain(instances: list[dict]) -> None:
     """Display instances in plain text format."""
     if not instances:
         console.print("No running node instances found.")
@@ -164,7 +162,7 @@ def show_status_plain(instances: List[dict]) -> None:
         console.print("")
 
 
-def status_command(args: List[str]) -> int:
+def status_command(args: list[str]) -> int:
     """Handle node status command.
 
     Args:

manta_node/cli/commands/stop.py

@@ -6,7 +6,6 @@ import os
 import signal
 import time
 from pathlib import Path
-from typing import List
 
 from rich.console import Console
 
@@ -202,7 +201,7 @@ def stop_specific_instance(
         return 1
 
 
-def stop_command(args: List[str]) -> int:
+def stop_command(args: list[str]) -> int:
     """Handle node stop command.
 
     Args:

manta_node/cli/config_manager.py

@@ -6,7 +6,7 @@ but delegate to the new NodeConfiguration system.
 """
 
 from dataclasses import dataclass
-from typing import Any, Dict, Optional
+from typing import Any
 
 from manta_node.infrastructure.config.node_config_manager import IdentityConfig
 
@@ -20,14 +20,14 @@ class ConnectionConfig:
     host: str = "localhost"
     port: int = 50051
     use_tls: bool = False
-    cert_folder: Optional[str] = None
+    cert_folder: str | None = None
 
 
 @dataclass
 class HardwareConfig:
     """Compatibility class for old HardwareConfig."""
 
-    gpu_enabled: Optional[bool] = None
+    gpu_enabled: bool | None = None
     max_concurrent_tasks: int = 2
     cpu_limit: str = "2.0"
     memory_limit: str = "4G"
@@ -53,12 +53,12 @@ class NodeConfig:
     name: str
     alias: str
     connection: ConnectionConfig
-    hardware: Optional[HardwareConfig] = None
-    datasets: Optional[Dict[str, str]] = None
+    hardware: HardwareConfig | None = None
+    datasets: dict[str, str] | None = None
     auto_register: bool = True
     random_id: bool = False
-    created_at: Optional[Any] = None
-    updated_at: Optional[Any] = None
+    created_at: Any | None = None
+    updated_at: Any | None = None
 
     def __post_init__(self):
         """Ensure datasets is a proper dict if provided."""

manta_node/cli/main.py

@@ -1,7 +1,6 @@
 """Manta Node CLI main entry point."""
 
 import sys
-from typing import List, Optional
 
 from rich.console import Console
 
@@ -11,7 +10,7 @@ from .commands.logs import logs_command
 from .commands.start import start_command
 from .commands.status import status_command
 from .commands.stop import stop_command
-from .version import get_version_string, get_full_version_info
+from .version import get_full_version_info, get_version_string
 
 console = Console()
 
@@ -67,7 +66,7 @@ For more help on a specific command:
     console.print(help_text)
 
 
-def main(args: Optional[List[str]] = None) -> int:
+def main(args: list[str] | None = None) -> int:
     """Main CLI entry point for manta-node.
 
     Args:

manta_node/cli/version.py

@@ -8,10 +8,9 @@ Version information is loaded from:
 import subprocess
 from datetime import datetime
 from pathlib import Path
-from typing import Optional
 
 
-def _load_build_version() -> Optional[dict]:
+def _load_build_version() -> dict | None:
     """Try to load version from build-time generated file.
 
     Returns:
@@ -32,7 +31,7 @@ def _load_build_version() -> Optional[dict]:
         return None
 
 
-def _get_git_commit_id() -> Optional[str]:
+def _get_git_commit_id() -> str | None:
     """Get the current git commit ID (short form) dynamically.
 
     This is used as fallback when build-time version is not available.
@@ -50,6 +49,7 @@ def _get_git_commit_id() -> Optional[str]:
             capture_output=True,
             text=True,
             timeout=2,
+            check=False,
         )
 
         if result.returncode == 0:

manta_node/domain/task_lifecycle.py

@@ -1,6 +1,8 @@
 # domain/task_lifecycle.py
 """Pure business logic for task lifecycle management."""
 
+from typing import ClassVar
+
 # Import domain entities (no infrastructure!)
 from manta_common.build.common.tasks import TaskStatus
 
@@ -8,7 +10,7 @@ from manta_common.build.common.tasks import TaskStatus
 class TaskTransitionRule:
     """Business rules for task state transitions."""
 
-    ALLOWED_TRANSITIONS = {
+    ALLOWED_TRANSITIONS: ClassVar[dict[TaskStatus, list[TaskStatus]]] = {
         TaskStatus.PENDING: [TaskStatus.RUNNING, TaskStatus.FAILED],
         TaskStatus.RUNNING: [
             TaskStatus.COMPLETED,

manta_node/infrastructure/config/__init__.py

@@ -8,24 +8,24 @@ from .node_config_manager import (
     MetadataConfig,
     MQTTConfig,
     NetworkConfig,
-    NodeConfiguration,
     NodeConfigManager,
+    NodeConfiguration,
     ResourceConfig,
     SecurityConfig,
     TaskConfig,
 )
 
 __all__ = [
-    "NodeConfigManager",
-    "NodeConfiguration",
-    "IdentityConfig",
-    "NetworkConfig",
-    "MQTTConfig",
     "ContainerConfig",
     "DatasetConfig",
-    "TaskConfig",
-    "ResourceConfig",
+    "IdentityConfig",
     "LoggingConfig",
-    "SecurityConfig",
+    "MQTTConfig",
     "MetadataConfig",
+    "NetworkConfig",
+    "NodeConfigManager",
+    "NodeConfiguration",
+    "ResourceConfig",
+    "SecurityConfig",
+    "TaskConfig",
 ]

manta_node/infrastructure/config/node_config_manager.py

@@ -4,6 +4,7 @@ This module provides a comprehensive configuration management system for manta-n
 using TOML files for persistent storage and dataclasses for type-safe configuration.
 """
 
+import logging
 import os
 import threading
 
@@ -12,16 +13,19 @@ try:
 except ImportError:
     import tomli as tomllib  # Python < 3.11 fallback
 
+from collections.abc import Callable
 from dataclasses import asdict, dataclass, field
 from datetime import datetime
 from pathlib import Path
-from typing import Any, Callable, Dict, List, Optional, Union
+from typing import Any, ClassVar
 
 import toml  # For writing TOML files
 from manta_common.errors import MantaConfigurationError
 
 __all__ = ["NodeConfigManager", "NodeConfiguration"]
 
+logger = logging.getLogger(__name__)
+
 
 # Configuration Section Dataclasses
 
@@ -31,7 +35,7 @@ class IdentityConfig:
     """Node identity configuration."""
 
     secured_token: str  # Required field - must be provided
-    alias: Optional[str] = None
+    alias: str | None = None
     random_id: bool = False
 
 
@@ -42,7 +46,7 @@ class NetworkConfig:
     manager_host: str = "localhost"
     manager_port: int = 50051
     light_service_host: str = "0.0.0.0"
-    light_service_port: Optional[int] = None  # Auto-assigned if not specified
+    light_service_port: int | None = None  # Auto-assigned if not specified
 
 
 @dataclass
@@ -53,22 +57,22 @@ class MQTTConfig:
     reconnect_attempts: int = 5
     reconnect_delay: float = 5.0
     # Runtime populated from manager registration
-    broker_host: Optional[str] = None
-    broker_port: Optional[int] = None
-    topics: List[str] = field(default_factory=list)
+    broker_host: str | None = None
+    broker_port: int | None = None
+    topics: list[str] = field(default_factory=list)
 
 
 @dataclass
 class ContainerConfig:
     """Container/Docker configuration."""
 
-    gpu_enabled: Optional[bool] = None  # Auto-detect if None
+    gpu_enabled: bool | None = None  # Auto-detect if None
     default_memory_limit: str = "4G"
     default_cpu_limit: str = "2.0"
     docker_network: str = "host"
     runtime: str = "docker"  # docker or podman
     pull_timeout: int = 300
-    log_config: Dict[str, Any] = field(
+    log_config: dict[str, Any] = field(
         default_factory=lambda: {
             "type": "json-file",
             "config": {"max-size": "10m", "max-file": "3"},
@@ -82,7 +86,7 @@ class DatasetConfig:
 
     base_path: str = "/data/datasets"
     mount_readonly: bool = True
-    mappings: Dict[str, str] = field(default_factory=dict)  # name -> path
+    mappings: dict[str, str] = field(default_factory=dict)  # name -> path
     cache_metadata: bool = True
 
 
@@ -93,7 +97,7 @@ class TaskConfig:
     max_concurrent: int = 2
     task_timeout: int = 3600  # seconds
     retry_attempts: int = 3
-    temp_folder: Optional[str] = None
+    temp_folder: str | None = None
     cleanup_on_failure: bool = True
     stream_logs: bool = True
 
@@ -178,12 +182,12 @@ class NodeConfiguration:
                 Path.home() / ".manta" / "logs" / "nodes" / f"{safe_name}.log"
             )
 
-    def to_dict(self) -> Dict[str, Any]:
+    def to_dict(self) -> dict[str, Any]:
         """Convert configuration to dictionary."""
         return asdict(self)
 
     @classmethod
-    def from_dict(cls, data: Dict[str, Any]) -> "NodeConfiguration":
+    def from_dict(cls, data: dict[str, Any]) -> "NodeConfiguration":
         """Create configuration from dictionary."""
         # For identity, we need to ensure secured_token is present
         identity_data = data.get("identity", {})
@@ -231,14 +235,14 @@ class NodeConfigManager:
     """
 
     # Runtime update categories
-    SAFE_RUNTIME_UPDATES = [
+    SAFE_RUNTIME_UPDATES: ClassVar[list[str]] = [
         "logging",  # Can change log levels
         "datasets.mappings",  # Can add/remove datasets
         "tasks.max_concurrent",  # Can adjust concurrency
         "resources",  # Can adjust resource limits
     ]
 
-    REQUIRES_RESTART = [
+    REQUIRES_RESTART: ClassVar[list[str]] = [
         "identity",  # Node ID is immutable
         "network",  # Port changes need restart
         "mqtt.broker_host",  # MQTT connection needs restart
@@ -247,16 +251,16 @@ class NodeConfigManager:
         "containers.runtime",  # Runtime change needs restart
     ]
 
-    def __init__(self, config_path: Optional[Union[str, Path]] = None):
+    def __init__(self, config_path: str | Path | None = None):
         """Initialize configuration manager.
 
         Args:
             config_path: Path to configuration file or None for default
         """
         self._lock = threading.RLock()
-        self._observers: List[Callable] = []
+        self._observers: list[Callable] = []
         self._config = NodeConfiguration(IdentityConfig(secured_token="<REQUIRED>"))
-        self._instances: List[Any] = []  # Track running instances
+        self._instances: list[Any] = []  # Track running instances
 
         # Determine config path
         if config_path:
@@ -286,7 +290,7 @@ class NodeConfigManager:
         return self.config
 
     @current_config.setter
-    def current_config(self, config_dict: Union[Dict[str, Any], NodeConfiguration]):
+    def current_config(self, config_dict: dict[str, Any] | NodeConfiguration):
         """Set current configuration from dictionary or NodeConfiguration.
 
         Args:
@@ -343,9 +347,9 @@ class NodeConfigManager:
 
         # Print helpful message to inform user
         print(f"📝 Created default configuration template at: {self._config_path}")
-        print("")
+        print()
         print("⚠️  IMPORTANT: Please set your secured_token before starting the node!")
-        print("")
+        print()
         print("Next steps:")
         print("  1. Get your JWT token from the manta manager")
         print(f"  2. Edit the config file: {self._config_path}")
@@ -353,7 +357,7 @@ class NodeConfigManager:
         print(
             "  4. Or run interactive setup: manta_node config init <path/to/config.yaml>"
         )
-        print("")
+        print()
 
     def _expand_env_vars(self, value: Any) -> Any:
         """Expand environment variables in configuration values.
@@ -407,7 +411,7 @@ class NodeConfigManager:
             return [self._expand_paths(item) for item in value]
         return value
 
-    def load(self, config_path: Optional[Union[str, Path]] = None) -> NodeConfiguration:
+    def load(self, config_path: str | Path | None = None) -> NodeConfiguration:
         """Load configuration from TOML file.
 
         Args:
@@ -448,7 +452,7 @@ class NodeConfigManager:
         except Exception as e:
             raise MantaConfigurationError(f"Failed to load configuration: {e}")
 
-    def save(self, config_path: Optional[Union[str, Path]] = None) -> bool:
+    def save(self, config_path: str | Path | None = None) -> bool:
         """Save configuration to TOML file.
 
         Args:
@@ -486,7 +490,7 @@ class NodeConfigManager:
             raise MantaConfigurationError(f"Failed to save configuration: {e}")
 
     def update(
-        self, updates: Dict[str, Any], allow_restart_required: bool = False
+        self, updates: dict[str, Any], allow_restart_required: bool = False
     ) -> bool:
         """Update configuration with validation.
 
@@ -545,7 +549,7 @@ class NodeConfigManager:
         # Set the value
         setattr(target, parts[-1], value)
 
-    def validate(self) -> List[str]:
+    def validate(self) -> list[str]:
         """Validate configuration.
 
         Returns:
@@ -569,11 +573,12 @@ class NodeConfigManager:
             issues.append(
                 f"network.manager_port ({self._config.network.manager_port}) must be between 443 and 65535"
             )
-        if self._config.network.light_service_port is not None:
-            if not (1024 <= self._config.network.light_service_port <= 65535):
-                issues.append(
-                    f"network.light_service_port ({self._config.network.light_service_port}) must be between 1024 and 65535"
-                )
+        if self._config.network.light_service_port is not None and not (
+            1024 <= self._config.network.light_service_port <= 65535
+        ):
+            issues.append(
+                f"network.light_service_port ({self._config.network.light_service_port}) must be between 1024 and 65535"
+            )
 
         # Validate dataset paths
         for name, path in self._config.datasets.mappings.items():
@@ -587,7 +592,7 @@ class NodeConfigManager:
 
         return issues
 
-    def register_observer(self, callback: Callable[[Dict[str, Any]], None]):
+    def register_observer(self, callback: Callable[[dict[str, Any]], None]):
         """Register observer for configuration changes.
 
         Args:
@@ -595,7 +600,7 @@ class NodeConfigManager:
         """
         self._observers.append(callback)
 
-    def _notify_observers(self, change: Dict[str, Any]):
+    def _notify_observers(self, change: dict[str, Any]):
         """Notify all observers of configuration change.
 
         Args:
@@ -605,9 +610,9 @@ class NodeConfigManager:
             try:
                 observer(change)
             except Exception:
-                pass  # Ignore observer errors
+                logger.debug("Observer callback raised an error", exc_info=True)
 
-    def list_available_configs(self) -> List[str]:
+    def list_available_configs(self) -> list[str]:
         """List available configuration files.
 
         Returns:
@@ -623,7 +628,7 @@ class NodeConfigManager:
 
         return sorted(configs)
 
-    def get_node_config(self, config_name: str) -> Optional[NodeConfiguration]:
+    def get_node_config(self, config_name: str) -> NodeConfiguration | None:
         """Load and return a specific node configuration by name.
 
         Args:
@@ -647,7 +652,7 @@ class NodeConfigManager:
         except Exception:
             return None
 
-    def export_template(self, path: Optional[Union[str, Path]] = None) -> str:
+    def export_template(self, path: str | Path | None = None) -> str:
         """Export a configuration template.
 
         Args:
@@ -704,7 +709,7 @@ class NodeConfigManager:
         except Exception as e:
             raise MantaConfigurationError(f"Failed to set manager configuration: {e}")
 
-    def get_manager_config(self) -> Dict[str, Any]:
+    def get_manager_config(self) -> dict[str, Any]:
         """Get manager configuration as dictionary.
 
         Returns:
@@ -788,7 +793,7 @@ class NodeConfigManager:
 
         @dataclass
         class HardwareConfig:
-            gpu_enabled: Optional[bool]
+            gpu_enabled: bool | None
             max_concurrent_tasks: int
             cpu_limit: str
             memory_limit: str
@@ -799,7 +804,7 @@ class NodeConfigManager:
             alias: str
             connection: ConnectionConfig
             hardware: HardwareConfig
-            datasets: Optional[Any]
+            datasets: Any | None
             auto_register: bool
             random_id: bool
 
@@ -849,7 +854,7 @@ class NodeConfigManager:
             random_id=False,
         )
 
-    def list_running_instances(self) -> List[Any]:
+    def list_running_instances(self) -> list[Any]:
         """List all running node instances.
 
         Returns:
@@ -880,7 +885,7 @@ class NodeConfigManager:
                 return True
         return False
 
-    def list_node_configs(self) -> List[Any]:
+    def list_node_configs(self) -> list[Any]:
         """List all available node configurations.
 
         Returns:
@@ -913,6 +918,9 @@ class NodeConfigManager:
                     configs.append(config_info)
             except Exception:
                 # Skip invalid configs
+                logger.debug(
+                    "Skipping invalid config file: %s", config_file, exc_info=True
+                )
                 continue
 
         return configs