container-manager-mcp 0.0.12__py3-none-any.whl → 1.0.1__py3-none-any.whl

container_manager_mcp/container_manager.py

@@ -6,11 +6,12 @@ import logging
 import os
 from abc import ABC, abstractmethod
 from typing import List, Dict, Optional, Any
-import getopt
+import argparse
 import json
 import subprocess
 from datetime import datetime
 import dateutil.parser
+import platform
 
 try:
     import docker
@@ -815,15 +816,107 @@ class DockerManager(ContainerManagerBase):
 
 
 class PodmanManager(ContainerManagerBase):
-    def __init__(self, silent: bool = False, log_file: str = None):
+    def __init__(self, silent: bool = False, log_file: Optional[str] = None):
         super().__init__(silent, log_file)
+
         if PodmanClient is None:
             raise ImportError("Please install podman-py: pip install podman")
+
+        base_url = self._autodetect_podman_url()
+        if base_url is None:
+            self.logger.error(
+                "No valid Podman socket found after trying all known locations"
+            )
+            raise RuntimeError("Failed to connect to Podman: No valid socket found")
+
         try:
-            self.client = PodmanClient()
+            self.client = PodmanClient(base_url=base_url)
+            self.logger.info(f"Connected to Podman with base_url: {base_url}")
         except PodmanError as e:
-            self.logger.error(f"Failed to connect to Podman daemon: {str(e)}")
-            raise RuntimeError(f"Failed to connect to Podman: {str(e)}")
+            self.logger.error(
+                f"Failed to connect to Podman daemon with {base_url}: {str(e)}"
+            )
+            raise RuntimeError(f"Failed to connect to Podman with {base_url}: {str(e)}")
+
+    def _is_wsl(self) -> bool:
+        """Check if running inside WSL2."""
+        try:
+            with open("/proc/version", "r") as f:
+                return "WSL" in f.read()
+        except FileNotFoundError:
+            return "WSL_DISTRO_NAME" in os.environ
+
+    def _is_podman_machine_running(self) -> bool:
+        """Check if Podman machine is running (for Windows/WSL2)."""
+        try:
+            result = subprocess.run(
+                ["podman", "machine", "list", "--format", "{{.Running}}"],
+                capture_output=True,
+                text=True,
+                check=False,
+            )
+            return "true" in result.stdout.lower()
+        except (subprocess.SubprocessError, FileNotFoundError):
+            return False
+
+    def _try_connect(self, base_url: str) -> Optional[PodmanClient]:
+        """Attempt to connect to Podman with the given base_url."""
+        try:
+            client = PodmanClient(base_url=base_url)
+            # Test connection
+            client.version()
+            return client
+        except PodmanError as e:
+            self.logger.debug(f"Connection failed for {base_url}: {str(e)}")
+            return None
+
+    def _autodetect_podman_url(self) -> Optional[str]:
+        """Autodetect the appropriate Podman socket URL based on platform."""
+        # Check for environment variable override
+        base_url = os.environ.get("PODMAN_BASE_URL")
+        if base_url:
+            self.logger.info(f"Using PODMAN_BASE_URL from environment: {base_url}")
+            return base_url
+
+        system = platform.system()
+        is_wsl = self._is_wsl()
+
+        # Define socket candidates based on platform
+        socket_candidates = []
+        if system == "Windows" and not is_wsl:
+            # Windows with Podman machine
+            if self._is_podman_machine_running():
+                socket_candidates.append("npipe:////./pipe/docker_engine")
+            # Fallback to WSL2 distro sockets if running in a mixed setup
+            socket_candidates.extend(
+                [
+                    "unix:///mnt/wsl/podman-sockets/podman-machine-default/podman-user.sock",  # Rootless
+                    "unix:///mnt/wsl/podman-sockets/podman-machine-default/podman-root.sock",  # Rootful
+                ]
+            )
+        elif system == "Linux" or is_wsl:
+            # Linux or WSL2 distro: prioritize rootless, then rootful
+            uid = os.getuid()
+            socket_candidates.extend(
+                [
+                    f"unix:///run/user/{uid}/podman/podman.sock",  # Rootless
+                    "unix:///run/podman/podman.sock",  # Rootful
+                ]
+            )
+
+        # Try each socket candidate
+        for url in socket_candidates:
+            # For Unix sockets, check if the file exists (on Linux/WSL2)
+            if url.startswith("unix://") and (system == "Linux" or is_wsl):
+                socket_path = url.replace("unix://", "")
+                if not os.path.exists(socket_path):
+                    self.logger.debug(f"Socket {socket_path} does not exist")
+                    continue
+            client = self._try_connect(url)
+            if client:
+                return url
+
+        return None
 
     def list_images(self) -> List[Dict]:
         params = {}
@@ -1272,13 +1365,32 @@ class PodmanManager(ContainerManagerBase):
         raise NotImplementedError("Swarm not supported in Podman")
 
 
-# The rest of the file (create_manager, usage, container_manager) remains unchanged
-
-
 def create_manager(
-    manager_type: str, silent: bool = False, log_file: str = None
+    manager_type: Optional[str] = None, silent: bool = False, log_file: str = None
 ) -> ContainerManagerBase:
-    if manager_type.lower() == "docker" or manager_type.lower() == "swarm":
+    if manager_type is None:
+        manager_type = os.environ.get("CONTAINER_MANAGER_TYPE")
+    if manager_type is None:
+        # Autodetect
+        if PodmanClient is not None:
+            try:
+                test_client = PodmanClient()
+                test_client.close()
+                manager_type = "podman"
+            except Exception:
+                pass
+        if manager_type is None and docker is not None:
+            try:
+                test_client = docker.from_env()
+                test_client.close()
+                manager_type = "docker"
+            except Exception:
+                pass
+    if manager_type is None:
+        raise ValueError(
+            "No supported container manager detected. Set CONTAINER_MANAGER_TYPE or install Docker/Podman."
+        )
+    if manager_type.lower() in ["docker", "swarm"]:
         return DockerManager(silent=silent, log_file=log_file)
     elif manager_type.lower() == "podman":
         return PodmanManager(silent=silent, log_file=log_file)
@@ -1294,7 +1406,7 @@ Container Manager: A tool to manage containers with Docker, Podman, and Docker S
 Usage:
 -h | --help            [ See usage for script ]
 -s | --silent          [ Suppress output ]
--m | --manager <type>  [ docker, podman, swarm; default: docker ]
+-m | --manager <type>  [ docker, podman, swarm; default: auto-detect ]
 --log-file <path>      [ Log to specified file (default: container_manager.log in script dir) ]
 
 Actions:
@@ -1359,262 +1471,178 @@ container_manager.py --manager docker --pull-image nginx --tag latest --list-con
 
 
 def container_manager(argv):
-    get_version = False
-    get_info = False
-    list_images = False
-    pull_image = False
-    pull_image_str = None
-    tag = "latest"
-    platform = None
-    remove_image = False
-    remove_image_str = None
-    force = False
-    list_containers = False
-    all_containers = False
-    run_container = False
-    run_image = None
-    name = None
-    command = None
-    detach = False
-    ports_str = None
-    volumes_str = None
-    environment_str = None
-    stop_container = False
-    stop_container_id = None
-    timeout = 10
-    remove_container = False
-    remove_container_id = None
-    get_container_logs = False
-    container_logs_id = None
-    tail = "all"
-    exec_in_container = False
-    exec_container_id = None
-    exec_command = None
-    exec_detach = False
-    list_volumes = False
-    create_volume = False
-    create_volume_name = None
-    remove_volume = False
-    remove_volume_name = None
-    list_networks = False
-    create_network = False
-    create_network_name = None
-    driver = "bridge"
-    remove_network = False
-    remove_network_id = None
-    compose_up = False
-    compose_up_file = None
-    compose_build = False
-    compose_detach = True
-    compose_down = False
-    compose_down_file = None
-    compose_ps = False
-    compose_ps_file = None
-    compose_logs = False
-    compose_logs_file = None
-    compose_service = None
-    init_swarm = False
-    advertise_addr = None
-    leave_swarm = False
-    list_nodes = False
-    list_services = False
-    create_service = False
-    create_service_name = None
-    service_image = None
-    replicas = 1
-    mounts_str = None
-    remove_service = False
-    remove_service_id = None
-    manager_type = "docker"
-    silent = False
-    log_file = None
-
-    try:
-        opts, _ = getopt.getopt(
-            argv,
-            "hsm:",
-            [
-                "help",
-                "silent",
-                "manager=",
-                "log-file=",
-                "get-version",
-                "get-info",
-                "list-images",
-                "pull-image=",
-                "tag=",
-                "platform=",
-                "remove-image=",
-                "force",
-                "list-containers",
-                "all",
-                "run-container=",
-                "name=",
-                "command=",
-                "detach",
-                "ports=",
-                "volumes=",
-                "environment=",
-                "stop-container=",
-                "timeout=",
-                "remove-container=",
-                "get-container-logs=",
-                "tail=",
-                "exec-in-container=",
-                "exec-command=",
-                "exec-detach",
-                "list-volumes",
-                "create-volume=",
-                "remove-volume=",
-                "list-networks",
-                "create-network=",
-                "driver=",
-                "remove-network=",
-                "compose-up=",
-                "build",
-                "compose-down=",
-                "compose-ps=",
-                "compose-logs=",
-                "service=",
-                "init-swarm",
-                "advertise-addr=",
-                "leave-swarm",
-                "list-nodes",
-                "list-services",
-                "create-service=",
-                "image=",
-                "replicas=",
-                "mounts=",
-                "remove-service=",
-            ],
-        )
-    except getopt.GetoptError:
-        usage()
-        sys.exit(2)
+    parser = argparse.ArgumentParser(
+        description="Container Manager: A tool to manage containers with Docker, Podman, and Docker Swarm!"
+    )
+    parser.add_argument("-s", "--silent", action="store_true", help="Suppress output")
+    parser.add_argument(
+        "-m",
+        "--manager",
+        type=str,
+        default=None,
+        help="Container manager type: docker, podman, swarm (default: auto-detect)",
+    )
+    parser.add_argument("--log-file", type=str, default=None, help="Path to log file")
+    parser.add_argument("--get-version", action="store_true", help="Get version info")
+    parser.add_argument("--get-info", action="store_true", help="Get system info")
+    parser.add_argument("--list-images", action="store_true", help="List images")
+    parser.add_argument("--pull-image", type=str, default=None, help="Image to pull")
+    parser.add_argument("--tag", type=str, default="latest", help="Image tag")
+    parser.add_argument("--platform", type=str, default=None, help="Platform")
+    parser.add_argument(
+        "--remove-image", type=str, default=None, help="Image to remove"
+    )
+    parser.add_argument("--force", action="store_true", help="Force removal")
+    parser.add_argument(
+        "--list-containers", action="store_true", help="List containers"
+    )
+    parser.add_argument("--all", action="store_true", help="Show all containers")
+    parser.add_argument("--run-container", type=str, default=None, help="Image to run")
+    parser.add_argument("--name", type=str, default=None, help="Container name")
+    parser.add_argument("--command", type=str, default=None, help="Command to run")
+    parser.add_argument("--detach", action="store_true", help="Detach mode")
+    parser.add_argument("--ports", type=str, default=None, help="Port mappings")
+    parser.add_argument("--volumes", type=str, default=None, help="Volume mappings")
+    parser.add_argument(
+        "--environment", type=str, default=None, help="Environment vars"
+    )
+    parser.add_argument(
+        "--stop-container", type=str, default=None, help="Container to stop"
+    )
+    parser.add_argument("--timeout", type=int, default=10, help="Timeout in seconds")
+    parser.add_argument(
+        "--remove-container", type=str, default=None, help="Container to remove"
+    )
+    parser.add_argument(
+        "--get-container-logs", type=str, default=None, help="Container logs"
+    )
+    parser.add_argument("--tail", type=str, default="all", help="Tail lines")
+    parser.add_argument(
+        "--exec-in-container", type=str, default=None, help="Container to exec"
+    )
+    parser.add_argument("--exec-command", type=str, default=None, help="Exec command")
+    parser.add_argument("--exec-detach", action="store_true", help="Detach exec")
+    parser.add_argument("--list-volumes", action="store_true", help="List volumes")
+    parser.add_argument(
+        "--create-volume", type=str, default=None, help="Volume to create"
+    )
+    parser.add_argument(
+        "--remove-volume", type=str, default=None, help="Volume to remove"
+    )
+    parser.add_argument("--list-networks", action="store_true", help="List networks")
+    parser.add_argument(
+        "--create-network", type=str, default=None, help="Network to create"
+    )
+    parser.add_argument("--driver", type=str, default="bridge", help="Network driver")
+    parser.add_argument(
+        "--remove-network", type=str, default=None, help="Network to remove"
+    )
+    parser.add_argument("--compose-up", type=str, default=None, help="Compose file up")
+    parser.add_argument("--build", action="store_true", help="Build images")
+    parser.add_argument(
+        "--compose-detach", action="store_true", default=True, help="Detach compose"
+    )
+    parser.add_argument(
+        "--compose-down", type=str, default=None, help="Compose file down"
+    )
+    parser.add_argument("--compose-ps", type=str, default=None, help="Compose ps")
+    parser.add_argument("--compose-logs", type=str, default=None, help="Compose logs")
+    parser.add_argument("--service", type=str, default=None, help="Specific service")
+    parser.add_argument("--init-swarm", action="store_true", help="Init swarm")
+    parser.add_argument(
+        "--advertise-addr", type=str, default=None, help="Advertise address"
+    )
+    parser.add_argument("--leave-swarm", action="store_true", help="Leave swarm")
+    parser.add_argument("--list-nodes", action="store_true", help="List swarm nodes")
+    parser.add_argument(
+        "--list-services", action="store_true", help="List swarm services"
+    )
+    parser.add_argument(
+        "--create-service", type=str, default=None, help="Service to create"
+    )
+    parser.add_argument("--image", type=str, default=None, help="Service image")
+    parser.add_argument("--replicas", type=int, default=1, help="Replicas")
+    parser.add_argument("--mounts", type=str, default=None, help="Mounts")
+    parser.add_argument(
+        "--remove-service", type=str, default=None, help="Service to remove"
+    )
+    parser.add_argument("-h", "--help", action="store_true", help="Show help")
+
+    args = parser.parse_args(argv)
 
-    for opt, arg in opts:
-        if opt in ("-h", "--help"):
-            usage()
-            sys.exit()
-        elif opt in ("-s", "--silent"):
-            silent = True
-        elif opt in ("-m", "--manager"):
-            manager_type = arg
-        elif opt == "--log-file":
-            log_file = arg
-        elif opt == "--get-version":
-            get_version = True
-        elif opt == "--get-info":
-            get_info = True
-        elif opt == "--list-images":
-            list_images = True
-        elif opt == "--pull-image":
-            pull_image = True
-            pull_image_str = arg
-        elif opt == "--tag":
-            tag = arg
-        elif opt == "--platform":
-            platform = arg
-        elif opt == "--remove-image":
-            remove_image = True
-            remove_image_str = arg
-        elif opt == "--force":
-            force = True
-        elif opt == "--list-containers":
-            list_containers = True
-        elif opt == "--all":
-            all_containers = True
-        elif opt == "--run-container":
-            run_container = True
-            run_image = arg
-        elif opt == "--name":
-            name = arg
-        elif opt == "--command":
-            command = arg
-        elif opt == "--detach":
-            detach = True
-        elif opt == "--ports":
-            ports_str = arg
-        elif opt == "--volumes":
-            volumes_str = arg
-        elif opt == "--environment":
-            environment_str = arg
-        elif opt == "--stop-container":
-            stop_container = True
-            stop_container_id = arg
-        elif opt == "--timeout":
-            timeout = int(arg)
-        elif opt == "--remove-container":
-            remove_container = True
-            remove_container_id = arg
-        elif opt == "--get-container-logs":
-            get_container_logs = True
-            container_logs_id = arg
-        elif opt == "--tail":
-            tail = arg
-        elif opt == "--exec-in-container":
-            exec_in_container = True
-            exec_container_id = arg
-        elif opt == "--exec-command":
-            exec_command = arg
-        elif opt == "--exec-detach":
-            exec_detach = True
-        elif opt == "--list-volumes":
-            list_volumes = True
-        elif opt == "--create-volume":
-            create_volume = True
-            create_volume_name = arg
-        elif opt == "--remove-volume":
-            remove_volume = True
-            remove_volume_name = arg
-        elif opt == "--list-networks":
-            list_networks = True
-        elif opt == "--create-network":
-            create_network = True
-            create_network_name = arg
-        elif opt == "--driver":
-            driver = arg
-        elif opt == "--remove-network":
-            remove_network = True
-            remove_network_id = arg
-        elif opt == "--compose-up":
-            compose_up = True
-            compose_up_file = arg
-        elif opt == "--build":
-            compose_build = True
-        elif opt == "--compose-down":
-            compose_down = True
-            compose_down_file = arg
-        elif opt == "--compose-ps":
-            compose_ps = True
-            compose_ps_file = arg
-        elif opt == "--compose-logs":
-            compose_logs = True
-            compose_logs_file = arg
-        elif opt == "--service":
-            compose_service = arg
-        elif opt == "--init-swarm":
-            init_swarm = True
-        elif opt == "--advertise-addr":
-            advertise_addr = arg
-        elif opt == "--leave-swarm":
-            leave_swarm = True
-        elif opt == "--list-nodes":
-            list_nodes = True
-        elif opt == "--list-services":
-            list_services = True
-        elif opt == "--create-service":
-            create_service = True
-            create_service_name = arg
-        elif opt == "--image":
-            service_image = arg
-        elif opt == "--replicas":
-            replicas = int(arg)
-        elif opt == "--mounts":
-            mounts_str = arg
-        elif opt == "--remove-service":
-            remove_service = True
-            remove_service_id = arg
+    if args.help:
+        usage()
+        sys.exit(0)
+
+    get_version = args.get_version
+    get_info = args.get_info
+    list_images = args.list_images
+    pull_image = args.pull_image is not None
+    pull_image_str = args.pull_image
+    tag = args.tag
+    platform = args.platform
+    remove_image = args.remove_image is not None
+    remove_image_str = args.remove_image
+    force = args.force
+    list_containers = args.list_containers
+    all_containers = args.all
+    run_container = args.run_container is not None
+    run_image = args.run_container
+    name = args.name
+    command = args.command
+    detach = args.detach
+    ports_str = args.ports
+    volumes_str = args.volumes
+    environment_str = args.environment
+    stop_container = args.stop_container is not None
+    stop_container_id = args.stop_container
+    timeout = args.timeout
+    remove_container = args.remove_container is not None
+    remove_container_id = args.remove_container
+    get_container_logs = args.get_container_logs is not None
+    container_logs_id = args.get_container_logs
+    tail = args.tail
+    exec_in_container = args.exec_in_container is not None
+    exec_container_id = args.exec_in_container
+    exec_command = args.exec_command
+    exec_detach = args.exec_detach
+    list_volumes = args.list_volumes
+    create_volume = args.create_volume is not None
+    create_volume_name = args.create_volume
+    remove_volume = args.remove_volume is not None
+    remove_volume_name = args.remove_volume
+    list_networks = args.list_networks
+    create_network = args.create_network is not None
+    create_network_name = args.create_network
+    driver = args.driver
+    remove_network = args.remove_network is not None
+    remove_network_id = args.remove_network
+    compose_up = args.compose_up is not None
+    compose_up_file = args.compose_up
+    compose_build = args.build
+    compose_detach = args.compose_detach
+    compose_down = args.compose_down is not None
+    compose_down_file = args.compose_down
+    compose_ps = args.compose_ps is not None
+    compose_ps_file = args.compose_ps
+    compose_logs = args.compose_logs is not None
+    compose_logs_file = args.compose_logs
+    compose_service = args.service
+    init_swarm = args.init_swarm
+    advertise_addr = args.advertise_addr
+    leave_swarm = args.leave_swarm
+    list_nodes = args.list_nodes
+    list_services = args.list_services
+    create_service = args.create_service is not None
+    create_service_name = args.create_service
+    service_image = args.image
+    replicas = args.replicas
+    mounts_str = args.mounts
+    remove_service = args.remove_service is not None
+    remove_service_id = args.remove_service
+    manager_type = args.manager
+    silent = args.silent
+    log_file = args.log_file
 
     manager = create_manager(manager_type, silent, log_file)
 

container_manager_mcp/container_manager_mcp.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # coding: utf-8
 
-import getopt
+import argparse
 import os
 import sys
 import logging
@@ -41,6 +41,7 @@ def to_boolean(string):
 
 environment_silent = os.environ.get("SILENT", False)
 environment_log_file = os.environ.get("LOG_FILE", None)
+environment_container_manager_type = os.environ.get("CONTAINER_MANAGER_TYPE", None)
 
 if environment_silent:
     environment_silent = to_boolean(environment_silent)
@@ -59,8 +60,9 @@ if environment_silent:
     tags={"container_management"},
 )
 async def get_version(
-    manager_type: str = Field(
-        description="Container manager: docker, podman", default="docker"
+    manager_type: Optional[str] = Field(
+        description="Container manager: docker, podman (default: auto-detect)",
+        default=environment_container_manager_type,
     ),
     silent: Optional[bool] = Field(
         description="Suppress output", default=environment_silent
@@ -95,8 +97,9 @@ async def get_version(
     tags={"container_management"},
 )
 async def get_info(
-    manager_type: str = Field(
-        description="Container manager: docker, podman", default="docker"
+    manager_type: Optional[str] = Field(
+        description="Container manager: docker, podman (default: auto-detect)",
+        default=environment_container_manager_type,
     ),
     silent: Optional[bool] = Field(
         description="Suppress output", default=environment_silent
@@ -131,8 +134,9 @@ async def get_info(
     tags={"container_management"},
 )
 async def list_images(
-    manager_type: str = Field(
-        description="Container manager: docker, podman", default="docker"
+    manager_type: Optional[str] = Field(
+        description="Container manager: docker, podman (default: auto-detect)",
+        default=environment_container_manager_type,
     ),
     silent: Optional[bool] = Field(
         description="Suppress output", default=environment_silent
@@ -172,8 +176,9 @@ async def pull_image(
     platform: Optional[str] = Field(
         description="Platform (e.g., linux/amd64)", default=None
     ),
-    manager_type: str = Field(
-        description="Container manager: docker, podman", default="docker"
+    manager_type: Optional[str] = Field(
+        description="Container manager: docker, podman (default: auto-detect)",
+        default=environment_container_manager_type,
     ),
     silent: Optional[bool] = Field(
         description="Suppress output", default=environment_silent
@@ -210,8 +215,9 @@ async def pull_image(
 async def remove_image(
     image: str = Field(description="Image name or ID to remove"),
     force: bool = Field(description="Force removal", default=False),
-    manager_type: str = Field(
-        description="Container manager: docker, podman", default="docker"
+    manager_type: Optional[str] = Field(
+        description="Container manager: docker, podman (default: auto-detect)",
+        default=environment_container_manager_type,
     ),
     silent: Optional[bool] = Field(
         description="Suppress output", default=environment_silent
@@ -249,8 +255,9 @@ async def list_containers(
     all: bool = Field(
         description="Show all containers (default running only)", default=False
     ),
-    manager_type: str = Field(
-        description="Container manager: docker, podman", default="docker"
+    manager_type: Optional[str] = Field(
+        description="Container manager: docker, podman (default: auto-detect)",
+        default=environment_container_manager_type,
     ),
     silent: Optional[bool] = Field(
         description="Suppress output", default=environment_silent
@@ -301,8 +308,9 @@ async def run_container(
     environment: Optional[Dict[str, str]] = Field(
         description="Environment variables", default=None
     ),
-    manager_type: str = Field(
-        description="Container manager: docker, podman", default="docker"
+    manager_type: Optional[str] = Field(
+        description="Container manager: docker, podman (default: auto-detect)",
+        default=environment_container_manager_type,
     ),
     silent: Optional[bool] = Field(
         description="Suppress output", default=environment_silent
@@ -341,8 +349,9 @@ async def run_container(
 async def stop_container(
     container_id: str = Field(description="Container ID or name"),
     timeout: int = Field(description="Timeout in seconds", default=10),
-    manager_type: str = Field(
-        description="Container manager: docker, podman", default="docker"
+    manager_type: Optional[str] = Field(
+        description="Container manager: docker, podman (default: auto-detect)",
+        default=environment_container_manager_type,
     ),
     silent: Optional[bool] = Field(
         description="Suppress output", default=environment_silent
@@ -379,8 +388,9 @@ async def stop_container(
 async def remove_container(
     container_id: str = Field(description="Container ID or name"),
     force: bool = Field(description="Force removal", default=False),
-    manager_type: str = Field(
-        description="Container manager: docker, podman", default="docker"
+    manager_type: Optional[str] = Field(
+        description="Container manager: docker, podman (default: auto-detect)",
+        default=environment_container_manager_type,
     ),
     silent: Optional[bool] = Field(
         description="Suppress output", default=environment_silent
@@ -419,8 +429,9 @@ async def get_container_logs(
     tail: str = Field(
         description="Number of lines to show from the end (or 'all')", default="all"
     ),
-    manager_type: str = Field(
-        description="Container manager: docker, podman", default="docker"
+    manager_type: Optional[str] = Field(
+        description="Container manager: docker, podman (default: auto-detect)",
+        default=environment_container_manager_type,
     ),
     silent: Optional[bool] = Field(
         description="Suppress output", default=environment_silent
@@ -458,8 +469,9 @@ async def exec_in_container(
     container_id: str = Field(description="Container ID or name"),
     command: List[str] = Field(description="Command to execute"),
     detach: bool = Field(description="Detach execution", default=False),
-    manager_type: str = Field(
-        description="Container manager: docker, podman", default="docker"
+    manager_type: Optional[str] = Field(
+        description="Container manager: docker, podman (default: auto-detect)",
+        default=environment_container_manager_type,
     ),
     silent: Optional[bool] = Field(
         description="Suppress output", default=environment_silent
@@ -494,8 +506,9 @@ async def exec_in_container(
     tags={"container_management"},
 )
 async def list_volumes(
-    manager_type: str = Field(
-        description="Container manager: docker, podman", default="docker"
+    manager_type: Optional[str] = Field(
+        description="Container manager: docker, podman (default: auto-detect)",
+        default=environment_container_manager_type,
     ),
     silent: Optional[bool] = Field(
         description="Suppress output", default=environment_silent
@@ -531,8 +544,9 @@ async def list_volumes(
 )
 async def create_volume(
     name: str = Field(description="Volume name"),
-    manager_type: str = Field(
-        description="Container manager: docker, podman", default="docker"
+    manager_type: Optional[str] = Field(
+        description="Container manager: docker, podman (default: auto-detect)",
+        default=environment_container_manager_type,
     ),
     silent: Optional[bool] = Field(
         description="Suppress output", default=environment_silent
@@ -569,8 +583,9 @@ async def create_volume(
 async def remove_volume(
     name: str = Field(description="Volume name"),
     force: bool = Field(description="Force removal", default=False),
-    manager_type: str = Field(
-        description="Container manager: docker, podman", default="docker"
+    manager_type: Optional[str] = Field(
+        description="Container manager: docker, podman (default: auto-detect)",
+        default=environment_container_manager_type,
     ),
     silent: Optional[bool] = Field(
         description="Suppress output", default=environment_silent
@@ -605,8 +620,9 @@ async def remove_volume(
     tags={"container_management"},
 )
 async def list_networks(
-    manager_type: str = Field(
-        description="Container manager: docker, podman", default="docker"
+    manager_type: Optional[str] = Field(
+        description="Container manager: docker, podman (default: auto-detect)",
+        default=environment_container_manager_type,
     ),
     silent: Optional[bool] = Field(
         description="Suppress output", default=environment_silent
@@ -643,8 +659,9 @@ async def list_networks(
 async def create_network(
     name: str = Field(description="Network name"),
     driver: str = Field(description="Network driver (e.g., bridge)", default="bridge"),
-    manager_type: str = Field(
-        description="Container manager: docker, podman", default="docker"
+    manager_type: Optional[str] = Field(
+        description="Container manager: docker, podman (default: auto-detect)",
+        default=environment_container_manager_type,
     ),
     silent: Optional[bool] = Field(
         description="Suppress output", default=environment_silent
@@ -680,8 +697,9 @@ async def create_network(
 )
 async def remove_network(
     network_id: str = Field(description="Network ID or name"),
-    manager_type: str = Field(
-        description="Container manager: docker, podman", default="docker"
+    manager_type: Optional[str] = Field(
+        description="Container manager: docker, podman (default: auto-detect)",
+        default=environment_container_manager_type,
     ),
     silent: Optional[bool] = Field(
         description="Suppress output", default=environment_silent
@@ -722,7 +740,10 @@ async def init_swarm(
     advertise_addr: Optional[str] = Field(
         description="Advertise address", default=None
     ),
-    manager_type: str = Field(description="Must be docker for swarm", default="docker"),
+    manager_type: Optional[str] = Field(
+        description="Container manager: must be docker for swarm (default: auto-detect)",
+        default=environment_container_manager_type,
+    ),
     silent: Optional[bool] = Field(
         description="Suppress output", default=environment_silent
     ),
@@ -733,7 +754,7 @@ async def init_swarm(
         description="MCP context for progress reporting", default=None
     ),
 ) -> Dict:
-    if manager_type != "docker":
+    if manager_type and manager_type != "docker":
         raise ValueError("Swarm operations are only supported on Docker")
     logger = logging.getLogger("ContainerManager")
     logger.debug(
@@ -759,7 +780,10 @@ async def init_swarm(
 )
 async def leave_swarm(
     force: bool = Field(description="Force leave", default=False),
-    manager_type: str = Field(description="Must be docker for swarm", default="docker"),
+    manager_type: Optional[str] = Field(
+        description="Container manager: must be docker for swarm (default: auto-detect)",
+        default=environment_container_manager_type,
+    ),
     silent: Optional[bool] = Field(
         description="Suppress output", default=environment_silent
     ),
@@ -770,7 +794,7 @@ async def leave_swarm(
         description="MCP context for progress reporting", default=None
     ),
 ) -> Dict:
-    if manager_type != "docker":
+    if manager_type and manager_type != "docker":
         raise ValueError("Swarm operations are only supported on Docker")
     logger = logging.getLogger("ContainerManager")
     logger.debug(
@@ -795,7 +819,10 @@ async def leave_swarm(
     tags={"container_management", "swarm"},
 )
 async def list_nodes(
-    manager_type: str = Field(description="Must be docker for swarm", default="docker"),
+    manager_type: Optional[str] = Field(
+        description="Container manager: must be docker for swarm (default: auto-detect)",
+        default=environment_container_manager_type,
+    ),
     silent: Optional[bool] = Field(
         description="Suppress output", default=environment_silent
     ),
@@ -806,7 +833,7 @@ async def list_nodes(
         description="MCP context for progress reporting", default=None
     ),
 ) -> List[Dict]:
-    if manager_type != "docker":
+    if manager_type and manager_type != "docker":
         raise ValueError("Swarm operations are only supported on Docker")
     logger = logging.getLogger("ContainerManager")
     logger.debug(
@@ -831,7 +858,10 @@ async def list_nodes(
     tags={"container_management", "swarm"},
 )
 async def list_services(
-    manager_type: str = Field(description="Must be docker for swarm", default="docker"),
+    manager_type: Optional[str] = Field(
+        description="Container manager: must be docker for swarm (default: auto-detect)",
+        default=environment_container_manager_type,
+    ),
     silent: Optional[bool] = Field(
         description="Suppress output", default=environment_silent
     ),
@@ -842,7 +872,7 @@ async def list_services(
         description="MCP context for progress reporting", default=None
     ),
 ) -> List[Dict]:
-    if manager_type != "docker":
+    if manager_type and manager_type != "docker":
         raise ValueError("Swarm operations are only supported on Docker")
     logger = logging.getLogger("ContainerManager")
     logger.debug(
@@ -876,7 +906,10 @@ async def create_service(
     mounts: Optional[List[str]] = Field(
         description="Mounts [source:target:mode]", default=None
     ),
-    manager_type: str = Field(description="Must be docker for swarm", default="docker"),
+    manager_type: Optional[str] = Field(
+        description="Container manager: must be docker for swarm (default: auto-detect)",
+        default=environment_container_manager_type,
+    ),
     silent: Optional[bool] = Field(
         description="Suppress output", default=environment_silent
     ),
@@ -887,7 +920,7 @@ async def create_service(
         description="MCP context for progress reporting", default=None
     ),
 ) -> Dict:
-    if manager_type != "docker":
+    if manager_type and manager_type != "docker":
         raise ValueError("Swarm operations are only supported on Docker")
     logger = logging.getLogger("ContainerManager")
     logger.debug(
@@ -913,7 +946,10 @@ async def create_service(
 )
 async def remove_service(
     service_id: str = Field(description="Service ID or name"),
-    manager_type: str = Field(description="Must be docker for swarm", default="docker"),
+    manager_type: Optional[str] = Field(
+        description="Container manager: must be docker for swarm (default: auto-detect)",
+        default=environment_container_manager_type,
+    ),
     silent: Optional[bool] = Field(
         description="Suppress output", default=environment_silent
     ),
@@ -924,7 +960,7 @@ async def remove_service(
         description="MCP context for progress reporting", default=None
     ),
 ) -> Dict:
-    if manager_type != "docker":
+    if manager_type and manager_type != "docker":
         raise ValueError("Swarm operations are only supported on Docker")
     logger = logging.getLogger("ContainerManager")
     logger.debug(
@@ -952,8 +988,9 @@ async def compose_up(
     compose_file: str = Field(description="Path to compose file"),
     detach: bool = Field(description="Detach mode", default=True),
     build: bool = Field(description="Build images", default=False),
-    manager_type: str = Field(
-        description="Container manager: docker, podman", default="docker"
+    manager_type: Optional[str] = Field(
+        description="Container manager: docker, podman (default: auto-detect)",
+        default=environment_container_manager_type,
     ),
     silent: Optional[bool] = Field(
         description="Suppress output", default=environment_silent
@@ -989,8 +1026,9 @@ async def compose_up(
 )
 async def compose_down(
     compose_file: str = Field(description="Path to compose file"),
-    manager_type: str = Field(
-        description="Container manager: docker, podman", default="docker"
+    manager_type: Optional[str] = Field(
+        description="Container manager: docker, podman (default: auto-detect)",
+        default=environment_container_manager_type,
     ),
     silent: Optional[bool] = Field(
         description="Suppress output", default=environment_silent
@@ -1026,8 +1064,9 @@ async def compose_down(
 )
 async def compose_ps(
     compose_file: str = Field(description="Path to compose file"),
-    manager_type: str = Field(
-        description="Container manager: docker, podman", default="docker"
+    manager_type: Optional[str] = Field(
+        description="Container manager: docker, podman (default: auto-detect)",
+        default=environment_container_manager_type,
     ),
     silent: Optional[bool] = Field(
         description="Suppress output", default=environment_silent
@@ -1064,8 +1103,9 @@ async def compose_ps(
 async def compose_logs(
     compose_file: str = Field(description="Path to compose file"),
     service: Optional[str] = Field(description="Specific service", default=None),
-    manager_type: str = Field(
-        description="Container manager: docker, podman", default="docker"
+    manager_type: Optional[str] = Field(
+        description="Container manager: docker, podman (default: auto-detect)",
+        default=environment_container_manager_type,
     ),
     silent: Optional[bool] = Field(
         description="Suppress output", default=environment_silent
@@ -1089,36 +1129,22 @@ async def compose_logs(
         raise RuntimeError(f"Failed to compose logs: {str(e)}")
 
 
-def container_manager_mcp(argv):
-    transport = "stdio"
-    host = "0.0.0.0"
-    port = 8000
-    try:
-        opts, args = getopt.getopt(
-            argv,
-            "ht:h:p:",
-            ["help", "transport=", "host=", "port="],
-        )
-    except getopt.GetoptError:
-        logger = logging.getLogger("ContainerManager")
-        logger.error("Incorrect arguments")
-        sys.exit(2)
-    for opt, arg in opts:
-        if opt in ("-h", "--help"):
-            sys.exit(2)
-        elif opt in ("-t", "--transport"):
-            transport = arg
-        elif opt in ("-h", "--host"):
-            host = arg
-        elif opt in ("-p", "--port"):
-            try:
-                port = int(arg)
-                if not (0 <= port <= 65535):
-                    print(f"Error: Port {arg} is out of valid range (0-65535).")
-                    sys.exit(1)
-            except ValueError:
-                print(f"Error: Port {arg} is not a valid integer.")
-                sys.exit(1)
+def container_manager_mcp():
+    parser = argparse.ArgumentParser(description="Container Manager MCP Server")
+    parser.add_argument(
+        "-t", "--transport", type=str, default="stdio", help="Transport (stdio/http)"
+    )
+    parser.add_argument("-h", "--host", type=str, default="0.0.0.0", help="Host")
+    parser.add_argument("-p", "--port", type=int, default=8000, help="Port")
+    args = parser.parse_args()
+
+    transport = args.transport
+    host = args.host
+    port = args.port
+    if not (0 <= port <= 65535):
+        print(f"Error: Port {port} is out of valid range (0-65535).")
+        sys.exit(1)
+
     setup_logging(is_mcp_server=True, log_file="container_manager_mcp.log")
     if transport == "stdio":
         mcp.run(transport="stdio")
@@ -1131,8 +1157,8 @@ def container_manager_mcp(argv):
 
 
 def main():
-    container_manager_mcp(sys.argv[1:])
+    container_manager_mcp()
 
 
 if __name__ == "__main__":
-    container_manager_mcp(sys.argv[1:])
+    container_manager_mcp()

{container_manager_mcp-0.0.12.dist-info → container_manager_mcp-1.0.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: container-manager-mcp
-Version: 0.0.12
+Version: 1.0.1
 Summary: Container Manager manage Docker, Docker Swarm, and Podman containers as an MCP Server
 Author-email: Audel Rouhi <knucklessg1@gmail.com>
 License: MIT
@@ -48,7 +48,7 @@ Dynamic: license-file
 ![PyPI - Wheel](https://img.shields.io/pypi/wheel/container-manager-mcp)
 ![PyPI - Implementation](https://img.shields.io/pypi/implementation/container-manager-mcp)
 
-*Version: 0.0.12*
+*Version: 1.0.1*
 
 Container Manager MCP Server provides a robust interface to manage Docker and Podman containers, networks, volumes, and Docker Swarm services through a FastMCP server, enabling programmatic and remote container management.
 

container_manager_mcp-1.0.1.dist-info/RECORD

@@ -0,0 +1,10 @@
+container_manager_mcp/__init__.py,sha256=N3bhKd_oh5YmBBl9N1omfZgaXhJyP0vOzH4VKxs68_g,506
+container_manager_mcp/__main__.py,sha256=zic5tX336HG8LfdzQQ0sDVx-tMSOsgOZCtaxHWgJ4Go,134
+container_manager_mcp/container_manager.py,sha256=9TPpZw2gB_rz4oLsu45jBeixkG9B-OYppsGM4ctqb5I,72495
+container_manager_mcp/container_manager_mcp.py,sha256=sUxkhCdsMtH4HZKdzJMAbxfJgawgXiWD8RoAsygJOZE,39788
+container_manager_mcp-1.0.1.dist-info/licenses/LICENSE,sha256=Z1xmcrPHBnGCETO_LLQJUeaSNBSnuptcDVTt4kaPUOE,1060
+container_manager_mcp-1.0.1.dist-info/METADATA,sha256=Apw7KYcfeJO2Yz3Es5OKPp2Q0Rq_15b9_mnNRtO2Zjk,8238
+container_manager_mcp-1.0.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+container_manager_mcp-1.0.1.dist-info/entry_points.txt,sha256=I23pXcCgAShlfYbENzs3kbw3l1lU9Gy7lODPfRqeeiA,156
+container_manager_mcp-1.0.1.dist-info/top_level.txt,sha256=B7QQLOd9mBdu0lsPKqyu4T8-zUtbqKzQJbMbtAzoozU,22
+container_manager_mcp-1.0.1.dist-info/RECORD,,

container_manager_mcp-0.0.12.dist-info/RECORD

@@ -1,10 +0,0 @@
-container_manager_mcp/__init__.py,sha256=N3bhKd_oh5YmBBl9N1omfZgaXhJyP0vOzH4VKxs68_g,506
-container_manager_mcp/__main__.py,sha256=zic5tX336HG8LfdzQQ0sDVx-tMSOsgOZCtaxHWgJ4Go,134
-container_manager_mcp/container_manager.py,sha256=hIdXyI7L2kFrJc_7bMOaQpKAPECxCVjaQoohqjmY-Iw,67859
-container_manager_mcp/container_manager_mcp.py,sha256=cIAN8YGflQ9nZEHodkYdQKo2GECAuTH7WB-oMhnAd_0,37959
-container_manager_mcp-0.0.12.dist-info/licenses/LICENSE,sha256=Z1xmcrPHBnGCETO_LLQJUeaSNBSnuptcDVTt4kaPUOE,1060
-container_manager_mcp-0.0.12.dist-info/METADATA,sha256=ItKjQvWeRj9e8J26zMjGilRfuFPywXf6afihA_knBdA,8240
-container_manager_mcp-0.0.12.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-container_manager_mcp-0.0.12.dist-info/entry_points.txt,sha256=I23pXcCgAShlfYbENzs3kbw3l1lU9Gy7lODPfRqeeiA,156
-container_manager_mcp-0.0.12.dist-info/top_level.txt,sha256=B7QQLOd9mBdu0lsPKqyu4T8-zUtbqKzQJbMbtAzoozU,22
-container_manager_mcp-0.0.12.dist-info/RECORD,,