clonebox 0.1.25__py3-none-any.whl → 0.1.27__py3-none-any.whl

clonebox/dashboard.py

@@ -19,9 +19,7 @@ def _run_clonebox(args: List[str]) -> subprocess.CompletedProcess:
 
 def _render_table(title: str, headers: List[str], rows: List[List[str]]) -> str:
     head_html = "".join(f"<th>{h}</th>" for h in headers)
-    body_html = "".join(
-        "<tr>" + "".join(f"<td>{c}</td>" for c in row) + "</tr>" for row in rows
-    )
+    body_html = "".join("<tr>" + "".join(f"<td>{c}</td>" for c in row) + "</tr>" for row in rows)
 
     return (
         f"<h2>{title}</h2>"
@@ -73,7 +71,9 @@ async def api_vms() -> str:
     if not items:
         return "<h2>VMs</h2><p><em>No VMs found.</em></p>"
 
-    rows = [[str(i.get("name", "")), str(i.get("state", "")), str(i.get("uuid", ""))] for i in items]
+    rows = [
+        [str(i.get("name", "")), str(i.get("state", "")), str(i.get("uuid", ""))] for i in items
+    ]
     return _render_table("VMs", ["Name", "State", "UUID"], rows)
 
 

clonebox/detector.py

@@ -281,7 +281,6 @@ class SystemDetector:
             ".mozilla/firefox",
             ".cache/mozilla/firefox",
         ],
-        
         # IDEs and editors - settings, extensions, projects history
         "code": [".config/Code", ".vscode", ".vscode-server"],
         "vscode": [".config/Code", ".vscode", ".vscode-server"],
@@ -302,7 +301,6 @@ class SystemDetector:
         "nvim": [".config/nvim", ".local/share/nvim"],
         "emacs": [".emacs.d", ".emacs"],
         "cursor": [".config/Cursor", ".cursor"],
-        
         # Development tools
         "docker": [".docker"],
         "git": [".gitconfig", ".git-credentials", ".config/git"],
@@ -314,27 +312,22 @@ class SystemDetector:
         "go": [".go", "go"],
         "gradle": [".gradle"],
         "maven": [".m2"],
-        
         # Python environments
         "python": [".pyenv", ".virtualenvs", ".local/share/virtualenvs"],
         "python3": [".pyenv", ".virtualenvs", ".local/share/virtualenvs"],
         "conda": [".conda", "anaconda3", "miniconda3"],
-        
         # Node.js
         "node": [".nvm", ".node", ".npm"],
-        
         # Databases
         "postgres": [".pgpass", ".psqlrc", ".psql_history"],
         "mysql": [".my.cnf", ".mysql_history"],
         "mongodb": [".mongorc.js", ".dbshell"],
         "redis": [".rediscli_history"],
-        
         # Communication apps
         "slack": [".config/Slack"],
         "discord": [".config/discord"],
         "telegram": [".local/share/TelegramDesktop"],
         "teams": [".config/Microsoft/Microsoft Teams"],
-        
         # Other tools
         "postman": [".config/Postman"],
         "insomnia": [".config/Insomnia"],
@@ -346,7 +339,6 @@ class SystemDetector:
         "kubectl": [".kube"],
         "terraform": [".terraform.d"],
         "ansible": [".ansible"],
-        
         # General app data
         "spotify": [".config/spotify"],
         "vlc": [".config/vlc"],
@@ -360,12 +352,12 @@ class SystemDetector:
 
     def detect_app_data_dirs(self, applications: list) -> list:
         """Detect config/data directories for running applications.
-        
+
         Returns list of paths that contain user data needed by running apps.
         """
         app_data_paths = []
         seen_paths = set()
-        
+
         matched_patterns = set()
 
         for app in applications:
@@ -394,13 +386,15 @@ class SystemDetector:
                         size = self._get_dir_size(full_path, max_depth=2)
                     except Exception:
                         size = 0
-                    app_data_paths.append({
-                        "path": str(full_path),
-                        "app": pattern,
-                        "type": "app_data",
-                        "size_mb": round(size / 1024 / 1024, 1),
-                    })
-        
+                    app_data_paths.append(
+                        {
+                            "path": str(full_path),
+                            "app": pattern,
+                            "type": "app_data",
+                            "size_mb": round(size / 1024 / 1024, 1),
+                        }
+                    )
+
         return app_data_paths
 
     def detect_all(self) -> SystemSnapshot:
@@ -645,13 +639,13 @@ class SystemDetector:
 
     def suggest_packages_for_apps(self, applications: list) -> dict:
         """Suggest packages based on detected applications.
-        
+
         Returns:
             dict with 'apt' and 'snap' keys containing lists of packages
         """
         apt_packages = set()
         snap_packages = set()
-        
+
         for app in applications:
             app_name = app.name.lower()
             for key, (package, install_type) in self.APP_TO_PACKAGE_MAP.items():
@@ -661,21 +655,18 @@ class SystemDetector:
                     else:
                         apt_packages.add(package)
                     break
-        
-        return {
-            "apt": sorted(list(apt_packages)),
-            "snap": sorted(list(snap_packages))
-        }
+
+        return {"apt": sorted(list(apt_packages)), "snap": sorted(list(snap_packages))}
 
     def suggest_packages_for_services(self, services: list) -> dict:
         """Suggest packages based on detected services.
-        
+
         Returns:
             dict with 'apt' and 'snap' keys containing lists of packages
         """
         apt_packages = set()
         snap_packages = set()
-        
+
         for service in services:
             service_name = service.name.lower()
             for key, (package, install_type) in self.APP_TO_PACKAGE_MAP.items():
@@ -685,11 +676,8 @@ class SystemDetector:
                     else:
                         apt_packages.add(package)
                     break
-        
-        return {
-            "apt": sorted(list(apt_packages)),
-            "snap": sorted(list(snap_packages))
-        }
+
+        return {"apt": sorted(list(apt_packages)), "snap": sorted(list(snap_packages))}
 
     def get_system_info(self) -> dict:
         """Get basic system information."""

clonebox/models.py

@@ -76,8 +76,17 @@ class CloneBoxConfig(BaseModel):
         if isinstance(data, dict):
             if "vm" in data and isinstance(data["vm"], dict):
                 return data
-            vm_fields = {"name", "ram_mb", "vcpus", "disk_size_gb", "gui", "base_image", 
-                        "network_mode", "username", "password"}
+            vm_fields = {
+                "name",
+                "ram_mb",
+                "vcpus",
+                "disk_size_gb",
+                "gui",
+                "base_image",
+                "network_mode",
+                "username",
+                "password",
+            }
             vm_data = {k: v for k, v in data.items() if k in vm_fields}
             if vm_data:
                 data = {k: v for k, v in data.items() if k not in vm_fields}
@@ -158,6 +167,14 @@ class ContainerConfig(BaseModel):
                 raise ValueError(f"Container path must be absolute: {container_path}")
         return v
 
+    @field_validator("ports", mode="before")
+    @classmethod
+    def coerce_ports(cls, v):
+        # Accept mapping like {"8080": "80"} -> ["8080:80"]
+        if isinstance(v, dict):
+            return [f"{k}:{val}" for k, val in v.items()]
+        return v
+
     @field_validator("ports")
     @classmethod
     def ports_must_be_valid(cls, v: List[str]) -> List[str]:

clonebox/profiles.py

@@ -32,11 +32,7 @@ def load_profile(profile_name: str, search_paths: list[Path]) -> Optional[Dict[s
 def _deep_merge(base: Dict[str, Any], override: Dict[str, Any]) -> Dict[str, Any]:
     merged: Dict[str, Any] = dict(base)
     for key, value in override.items():
-        if (
-            key in merged
-            and isinstance(merged[key], dict)
-            and isinstance(value, dict)
-        ):
+        if key in merged and isinstance(merged[key], dict) and isinstance(value, dict):
             merged[key] = _deep_merge(merged[key], value)
         else:
             merged[key] = value