labops 0.3.2__tar.gz → 0.4.0__tar.gz

labops-0.4.0/.release-please-manifest.json

@@ -0,0 +1,3 @@
+{
+    ".": "0.4.0"
+}

{labops-0.3.2 → labops-0.4.0}/CHANGELOG.md

@@ -1,5 +1,25 @@
 # Changelog
 
+## [0.4.0](https://github.com/FreezeManny/labops/compare/labops-v0.3.2...labops-v0.4.0) (2026-04-22)
+
+
+### Features
+
+* add devcontainer commands and initialize docker attribute in Host model ([0838b09](https://github.com/FreezeManny/labops/commit/0838b099ecae1f0c51ac21b469234c561fae02a2))
+* add validation for duplicate web service ports in host, lxc, and vm models ([683dd75](https://github.com/FreezeManny/labops/commit/683dd7537fb2028064316f19137b243bdf4c202a))
+* added duplicate VMID Validation for proxmox host and lxc ([cb6d35a](https://github.com/FreezeManny/labops/commit/cb6d35ad07cafd7843c56c42cde98380600e0e41))
+* added proxy name duplication check ([c68baf6](https://github.com/FreezeManny/labops/commit/c68baf6d4bbc90ab4d217784fb324c16d3acb33e))
+* changed docker and webservice structure ([10a6da9](https://github.com/FreezeManny/labops/commit/10a6da94e1d6ddf0a6ba432243ee17412ed4af76))
+* Changed LXC Structure ([95b9615](https://github.com/FreezeManny/labops/commit/95b9615dc99e9747ccff7b2be2c2b8c0833c74c9))
+* enhance YAML validation by adding unique IP address check ([f9ecfdf](https://github.com/FreezeManny/labops/commit/f9ecfdf390b501832ec73bed8c2e761c2ce21662))
+* Improve error handling for duplicate ports, VM IDs, and IP addresses in validators ([5fb8aa4](https://github.com/FreezeManny/labops/commit/5fb8aa427e57aeb56afc1bc754a5e41fd43679ba))
+* Pretty output for one error ([6a570f0](https://github.com/FreezeManny/labops/commit/6a570f02d58ce9f0d0736968e8b0f1b3ce1e3166))
+
+
+### Bug Fixes
+
+* fixed validate ([e8d229f](https://github.com/FreezeManny/labops/commit/e8d229fa831bf3611f4680ce8205658b68adbf27))
+
 ## [0.3.2](https://github.com/FreezeManny/labops/compare/labops-v0.3.1...labops-v0.3.2) (2026-04-21)
 
 

{labops-0.3.2 → labops-0.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: labops
-Version: 0.3.2
+Version: 0.4.0
 Summary: YAML Based homeLAB
 License-File: LICENSE
 Requires-Python: >=3.14

{labops-0.3.2 → labops-0.4.0}/justfile

@@ -1,15 +1,28 @@
 runner    := "uv run labops_cli.py"
 system    := "debian"
-test_conf := "./test-samples/homelab-test.yml"
+test_conf := "./test-samples/homelab-complete.yml"
 
 test-args := ""
 # In normal use no --file is needed — the CLI walks up from cwd and finds
 # homelab.yml automatically, just like `docker compose` finds compose.yml.
 # Test recipes pass --file explicitly to point at the sample config.
 
+# ----------- DEVCONTAINER ------
+container-start:
+	devcontainer up --workspace-folder .
+	
+container-attach:
+	devcontainer exec --workspace-folder . bash
+
 pre-commit:
 	uv run pre-commit run --all-files
 
+build: 
+	uv build
+
+local-install:
+	pipx install --force $(ls -t dist/*.whl | head -n1) --force
+
 # ── Normal usage (auto-discovers homelab.yml from cwd) ────────────────────────
 
 validate:

labops-0.4.0/models/input_conf/common_validators/web_services.py

@@ -0,0 +1,34 @@
+from typing import TypeVar, Any
+from ..web_services import WebService
+from ..docker import Docker
+
+T = TypeVar("T")
+
+
+def check_duplicate_ws_ports(obj: T) -> T:
+    all_ports: set[int] = set()
+    errors: list[str] = []
+
+    web_services: WebService | None = getattr(obj, "web_services", None)
+    if web_services:
+        for ws in web_services.root:
+            if ws.port in all_ports:
+                errors.append(f"Duplicate port found: {ws.port}")
+            else:
+                all_ports.add(ws.port)
+
+    docker: Docker | None = getattr(obj, "docker", None)
+    if docker:
+        for stack in docker.stacks.values():
+            stack_ws: WebService | None = getattr(stack, "web_services", None)
+            if stack_ws:
+                for ws in stack_ws.root:
+                    if ws.port in all_ports:
+                        errors.append(f"Duplicate port found: {ws.port}")
+                    else:
+                        all_ports.add(ws.port)
+
+    if errors:
+        raise ValueError("\n".join(errors))
+
+    return obj

{labops-0.3.2 → labops-0.4.0}/models/input_conf/creds.py

@@ -2,6 +2,7 @@
 from pydantic import BaseModel, model_validator, field_validator, FilePath
 from typing import Optional, Dict, Any, Literal
 import os
+import typer
 
 class Creds(BaseModel):
     username: str
@@ -23,4 +24,6 @@ class Creds(BaseModel):
             raise ValueError('Mutual exclusion error: Cannot set both passwd and ssh_key_path.')
         if not has_passwd and not has_key:
             raise ValueError('Missing credentials: Must set either passwd or ssh_key_path.')
+        if has_passwd and not has_key:
+            typer.secho('WARNING: Using only password authentication. Some features only work with an SSH key.', fg=typer.colors.YELLOW)
         return self

labops-0.4.0/models/input_conf/custom_types.py

@@ -0,0 +1,5 @@
+from typing import Literal
+
+OSType = Literal["debian", "alpine", "redhat"]
+HostType = Literal["bare-metal", "proxmox"]
+

labops-0.4.0/models/input_conf/docker.py

@@ -0,0 +1,12 @@
+from pydantic import BaseModel, model_validator, DirectoryPath
+from typing import Optional, Dict
+
+from .web_services import WebServices
+
+class Docker(BaseModel):
+    root_path: str
+    stacks: Dict[str, StackEntry]
+    
+class StackEntry(BaseModel):
+    config_path: DirectoryPath
+    web_services: Optional[WebServices] = None

labops-0.4.0/models/input_conf/host.py

@@ -0,0 +1,69 @@
+from pydantic import BaseModel, model_validator, DirectoryPath
+from typing import Optional, Dict, Any, Literal
+from ipaddress import IPv4Address
+
+from .creds import Creds
+from .web_services import WebServices
+from .docker import Docker
+from .lxc import LXCs
+from .vm import VMs
+from .custom_types import HostType, OSType
+from .common_validators.web_services import check_duplicate_ws_ports
+
+class Host(BaseModel):
+    name: str = ""
+    type: HostType = "bare-metal"
+    os: OSType
+    ip: IPv4Address
+    creds: Optional[Creds] = None
+    lxc: Optional[LXCs] = None
+    vm: Optional[VMs] = None
+    docker: Optional[Docker] = None
+    web_services: Optional[WebServices] = None
+
+    @model_validator(mode="after")
+    def check_proxmox_support(self) -> "Host":
+        if self.type != "proxmox":
+            if self.lxc is not None or self.vm is not None:
+                raise ValueError(
+                    "Fields 'lxc' and 'vm' are only allowed when type is 'proxmox'"
+                )
+        return self
+
+    @model_validator(mode="after")
+    def check_duplicate_vmid(self) -> "Host":
+        all_ids: set[int] = set()
+        errors: list[str] = []
+        if self.lxc:
+            for lxc_obj in self.lxc.values():
+                if lxc_obj.vmid in all_ids:
+                    errors.append(f"Duplicate vmid found: {lxc_obj.vmid}")
+                else:
+                    all_ids.add(lxc_obj.vmid)
+        if self.vm:
+            for vm_obj in self.vm.values():
+                if vm_obj.vmid in all_ids:
+                    errors.append(f"Duplicate vmid found: {vm_obj.vmid}")
+                else:
+                    all_ids.add(vm_obj.vmid)
+        if errors:
+            raise ValueError("\n".join(errors))
+        return self
+
+    @model_validator(mode="after")
+    def check_duplicate_ws_ports(self) -> "Host":
+        return check_duplicate_ws_ports(self)
+
+    @model_validator(mode="after")
+    def propagate_lxc_vm_names(self) -> "Host":
+        # Inject the dictionary key as the 'name' attribute for child LXCs
+        if self.lxc:
+            for k, v in self.lxc.items():
+                v.name: str = k
+                
+        # Inject the dictionary key as the 'name' attribute for child VMs
+        if self.vm:
+            for k, v in self.vm.items():
+                v.name: str = k
+                
+        return self

labops-0.4.0/models/input_conf/lxc.py

@@ -0,0 +1,25 @@
+from pydantic import BaseModel, DirectoryPath, model_validator
+from ipaddress import IPv4Address
+from typing import Optional, Dict
+
+from .creds import Creds
+from .web_services import WebServices
+from .docker import Docker
+
+from .custom_types import OSType
+from .common_validators.web_services import check_duplicate_ws_ports
+
+class LXC(BaseModel):
+    name: str = ""
+    ip: IPv4Address
+    os: OSType
+    vmid: int
+    creds: Optional[Creds] = None
+    web_services: Optional[WebServices] = None
+    docker: Optional[Docker] = None
+
+    @model_validator(mode="after")
+    def validate_ws_ports(self) -> "LXC":
+        return check_duplicate_ws_ports(self)
+
+LXCs = Dict[str, LXC]

labops-0.4.0/models/input_conf/vm.py

@@ -0,0 +1,30 @@
+
+from pydantic import BaseModel, model_validator, DirectoryPath
+from typing import Optional, Dict, Any, Literal
+from ipaddress import IPv4Address
+
+from .creds import Creds
+from .web_services import WebServices
+from .docker import Docker
+from .lxc import LXC
+from .custom_types import OSType, HostType
+from .common_validators.web_services import check_duplicate_ws_ports
+
+class VM(BaseModel):
+    name: str = ""
+    type: HostType = "bare-metal"
+    os: OSType
+    ip: IPv4Address
+    vmid: int
+    creds: Optional[Creds] = None
+    lxc: Optional[Dict[str, LXC]] = None
+    vm: Optional[Dict[str, "VM"]] = None ## CHECK THIS
+    web_services: Optional[WebServices] = None
+    docker: Optional[Docker] = None
+
+    @model_validator(mode="after")
+    def validate_ws_ports(self) -> "VM":
+        return check_duplicate_ws_ports(self)
+
+
+VMs = Dict[str, VM]

labops-0.4.0/models/input_conf/web_services.py

@@ -0,0 +1,12 @@
+from pydantic import BaseModel, model_validator, DirectoryPath, RootModel
+from typing import Optional, Dict, List, Generator
+
+class WebServices(RootModel):
+    root: List[WebService]
+
+    def __getitem__(self, item: int) -> WebService:
+        return self.root[item]
+
+class WebService(BaseModel):
+    port: int
+    proxy_name: Optional[str] = None

labops-0.4.0/models/input_conf/yaml_root.py

@@ -0,0 +1,120 @@
+from pydantic import BaseModel, model_validator
+from typing import Optional, Dict, Any
+from ipaddress import IPv4Address
+
+from .lxc import LXC
+from .vm import VM
+from .web_services import WebService
+from .docker import Docker, StackEntry
+from models.input_conf.host import Host
+from models.input_conf.settings import Settings
+
+class YamlRoot(BaseModel):
+    settings: Settings
+    hosts: Optional[Dict[str, Host]] = None
+
+    @model_validator(mode="after")
+    def propagate_host_names(self) -> "YamlRoot":
+        if self.hosts:
+            for k, host in self.hosts.items():
+                host.name = k
+        return self
+
+    @model_validator(mode="after")
+    def validate_unique_ips(self) -> "YamlRoot":
+
+        all_ips: set[IPv4Address] = set()
+        errors: list[str] = []
+
+        def check_ips(node: object) -> None:
+            # Check for an 'ip' attribute of type IPv4Address
+            ip : IPv4Address | None = getattr(node, "ip", None)
+            if isinstance(ip, IPv4Address):
+                if ip in all_ips:
+                    errors.append(f"Duplicate IP address found across configuration: '{ip}'")
+                else:
+                    all_ips.add(ip)
+            # Check for lxc and vm attributes that are dict-like
+            lxc: LXC | None = getattr(node, "lxc", None)
+            if isinstance(lxc, dict):
+                for lxc_node in lxc.values():
+                    check_ips(lxc_node)
+            vm: VM | None = getattr(node, "vm", None)
+            if isinstance(vm, dict):
+                for vm_node in vm.values():
+                    check_ips(vm_node)
+
+        if self.hosts:
+            for host in self.hosts.values():
+                check_ips(host)
+
+        if errors:
+            raise ValueError("\n".join(errors))
+
+        return self
+
+    @model_validator(mode="after")
+    def validate_unique_names_and_proxy_names(self) -> "YamlRoot":
+        all_names: set[str] = set()
+        all_proxy_names: set[str] = set()
+        errors: list[str] = []
+
+        def check_proxy_names(node: object) -> None:
+            web_services: WebService | None = getattr(node, "web_services", None)
+            if web_services:
+                for ws in getattr(web_services, "root", []):
+                    proxy_name: str | None = getattr(ws, "proxy_name", None)
+                    if proxy_name:
+                        if proxy_name in all_proxy_names:
+                            errors.append(f"Duplicate proxy_name found across configuration: '{proxy_name}'")
+                        else:
+                            all_proxy_names.add(proxy_name)
+            docker: Docker | None = getattr(node, "docker", None)
+            if docker:
+                stacks: dict[str, StackEntry] = getattr(docker, "stacks", {})
+                for stack in stacks.values():
+                    stack_ws: WebService | None = getattr(stack, "web_services", None)
+                    if stack_ws:
+                        for ws in getattr(stack_ws, "root", []):
+                            proxy_name = getattr(ws, "proxy_name", None)
+                            if proxy_name:
+                                if proxy_name in all_proxy_names:
+                                    errors.append(f"Duplicate proxy_name found across configuration: '{proxy_name}'")
+                                else:
+                                    all_proxy_names.add(proxy_name)
+            lxc: LXC | None = getattr(node, "lxc", None)
+            if isinstance(lxc, dict):
+                for lxc_node in lxc.values():
+                    check_proxy_names(lxc_node)
+            vm: VM | None = getattr(node, "vm", None)
+            if isinstance(vm, dict):
+                for vm_node in vm.values():
+                    check_proxy_names(vm_node)
+
+        if self.hosts:
+            for k, host in self.hosts.items():
+                if k in all_names:
+                    errors.append(f"Duplicate name found across configuration: '{k}'")
+                else:
+                    all_names.add(k)
+
+                if host.lxc:
+                    for lxc_name in host.lxc.keys():
+                        if lxc_name in all_names:
+                            errors.append(f"Duplicate name found across configuration: '{lxc_name}'")
+                        else:
+                            all_names.add(lxc_name)
+
+                if host.vm:
+                    for vm_name in host.vm.keys():
+                        if vm_name in all_names:
+                            errors.append(f"Duplicate name found across configuration: '{vm_name}'")
+                        else:
+                            all_names.add(vm_name)
+
+                check_proxy_names(host)
+
+        if errors:
+            raise ValueError("\n".join(errors))
+
+        return self

{labops-0.3.2 → labops-0.4.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "labops"
-version = "0.3.2"
+version = "0.4.0"
 description = "YAML Based homeLAB"
 readme = "README.md"
 requires-python = ">=3.14"

{labops-0.3.2 → labops-0.4.0}/src/cli/host.py

@@ -4,7 +4,7 @@ from rich.table import Table
 
 from src.cli.core import get_model, resolve_targets, console, state
 from models.input_conf.yaml_root import YamlRoot
-from models.input_conf.hosts import Host
+from models.input_conf.host import Host
 import src.host as host
 
 app = typer.Typer(help="Manage bare-metal hosts.", no_args_is_help=True)

{labops-0.3.2 → labops-0.4.0}/src/cli/lxc.py

@@ -5,7 +5,8 @@ from rich.table import Table
 
 from src.cli.core import get_model, resolve_targets, console, state
 from models.input_conf.yaml_root import YamlRoot
-from models.input_conf.hosts import LXC, Host
+from models.input_conf.host import Host
+from models.input_conf.lxc import LXC
 import src.lxc as lxc
 
 app = typer.Typer(help="Manage Proxmox LXC containers from Config.", no_args_is_help=True)

{labops-0.3.2 → labops-0.4.0}/src/cli/validate.py

@@ -5,11 +5,11 @@ from rich.table import Table
 
 from src.cli.core import ConfigError, get_model, console
 from models.input_conf.yaml_root import YamlRoot
-from models.input_conf.hosts import Host
+from models.input_conf.host import Host
 
 app = typer.Typer(help="Validate configuration.")
 
-@app.callback()
+@app.callback(invoke_without_command=True)
 def validate(ctx: typer.Context) -> None:
     if ctx.invoked_subcommand:
         return

{labops-0.3.2 → labops-0.4.0}/src/cli/vm.py

@@ -4,7 +4,7 @@ from rich.table import Table
 
 from src.cli.core import get_model, resolve_targets, console
 from models.input_conf.yaml_root import YamlRoot
-from models.input_conf.hosts import Host
+from models.input_conf.host import Host
 import src.vm as vm
 
 app = typer.Typer(help="Manage virtual machines.", no_args_is_help=True)

{labops-0.3.2 → labops-0.4.0}/src/host/find.py

@@ -1,5 +1,5 @@
 from models.input_conf.yaml_root import YamlRoot
-from models.input_conf.hosts import Host
+from models.input_conf.host import Host
 
 def findAll(config: YamlRoot) -> list[Host]:
     if config.hosts is None:

{labops-0.3.2 → labops-0.4.0}/src/host/setup.py

@@ -2,7 +2,7 @@ from ansible_runner.runner import Runner
 from pathlib import Path
 import getpass
 
-from models.input_conf.hosts import Host
+from models.input_conf.host import Host
 from models.input_conf.creds import Creds
 from src.utils.ansible_runner import run_playbook
 

{labops-0.3.2 → labops-0.4.0}/src/host/update.py

@@ -1,6 +1,6 @@
 from ansible_runner.runner import Runner
-from models.input_conf.hosts import Host
-from models.input_conf.hosts import OSType
+from models.input_conf.host import Host
+from models.input_conf.host import OSType
 from models.input_conf.creds import Creds
 from src.utils.ansible_runner import run_playbook
 

{labops-0.3.2 → labops-0.4.0}/src/lxc/find.py

@@ -1,6 +1,7 @@
 from src.utils.ansible_runner import run_playbook
 from models.input_conf.yaml_root import YamlRoot
-from models.input_conf.hosts import Host, LXC
+from models.input_conf.host import Host
+from models.input_conf.lxc import LXC
 
 def findAll(config: YamlRoot) -> list[tuple[Host, LXC]]:
     """Returns a list of all LXCs found inside Proxmox hosts in the Yaml config."""

{labops-0.3.2 → labops-0.4.0}/src/lxc/update.py

@@ -1,5 +1,6 @@
 from src.utils.ansible_runner import run_playbook
-from models.input_conf.hosts import Host, LXC
+from models.input_conf.host import Host
+from models.input_conf.lxc import LXC
 from models.input_conf.creds import Creds
 
 def update(proxmox_lxc_pairs: list[tuple[Host, LXC]], default_creds: Creds, dry_run: bool = False, verbose: bool = False) -> None:

labops-0.4.0/src/utils/yaml_validator.py

@@ -0,0 +1,55 @@
+import os
+from pathlib import Path
+from typing import Dict, Any, Optional
+from pydantic import ValidationError
+from rich.console import Console
+from rich.panel import Panel
+
+from models.input_conf.yaml_root import YamlRoot
+
+console = Console()
+
+def validate_yaml(raw: Dict[str, Any], rootPath: str) -> Optional[YamlRoot]:
+    base_dir: Path = Path(rootPath).parent.resolve()
+    original_dir: str = os.getcwd()
+    
+    os.chdir(base_dir)
+
+    model = None
+    try:
+        # model_validate is the standard Pydantic V2 way to load from dictionaries
+        model: YamlRoot = YamlRoot.model_validate(raw) 
+        
+    except ValidationError as e:
+        error_messages = []
+        for error in e.errors():
+            # Extract the exact path of the failure (e.g., hosts.cprox)
+            location: str = ".".join(str(loc) for loc in error.get('loc', []))
+            
+            # Clean up the redundant Pydantic prefix
+            raw_msg: str = error.get('msg', '').replace('Value error, ', '')
+            
+            # A single validator may raise multiple newline-separated errors
+            for msg in raw_msg.split("\n"):
+                if location:
+                    error_messages.append(f"[bold yellow]{location}[/bold yellow]: [red]{msg}[/red]")
+                else:
+                    error_messages.append(f"[red]{msg}[/red]")
+                
+        formatted_errors = "\n".join(f"• {msg}" for msg in error_messages)
+        
+        # Print the styled error panel
+        console.print(
+            Panel(
+                formatted_errors, 
+                title="[bold red]YAML Validation Failed", 
+                border_style="red",
+                expand=False
+            )
+        )
+        
+    finally:
+        # Always ensure we return to the original working directory
+        os.chdir(original_dir)
+
+    return model

{labops-0.3.2 → labops-0.4.0}/src/vm/find.py

@@ -1,27 +1,27 @@
 from models.input_conf.yaml_root import YamlRoot
-from models.input_conf.hosts import Host
+from models.input_conf.vm import VM
 
 
-def findAll(config: YamlRoot) -> list[Host]:
+def findAll(config: YamlRoot) -> list[VM]:
     if config.hosts is None:
         raise KeyError("No hosts are defined in the configuration.")
     
-    vms: list[Host] = []
+    vms: list[VM] = []
     for host in config.hosts.values():
         if host.vm is not None:
             vms.extend(host.vm.values())
     return vms
 
-def find(config: YamlRoot, targets: list[str]) -> list[Host]:
+def find(config: YamlRoot, targets: list[str]) -> list[VM]:
     if config.hosts is None:
         raise KeyError("No hosts are defined in the configuration.")
         
-    all_vms: dict[str, Host] = {}
+    all_vms: dict[str, VM] = {}
     for host in config.hosts.values():
         if host.vm is not None:
             all_vms.update(host.vm)
             
-    found_vms: list[Host] = []
+    found_vms: list[VM] = []
     for target in targets:
         found = False
         if target in all_vms:

labops-0.4.0/test-samples/homelab-complete.yml

@@ -0,0 +1,105 @@
+settings:
+  default_creds:
+    username: root
+    passwd: changeme
+    #ssh_key_path: xxxxx
+  dns:
+    local_dns_suffix: .lab
+    pihole_location: 10.0.10.5 
+  proxy:
+    proxy_suffix: .mfritz.top
+    proxy_location: 10.0.10.6
+
+hosts:
+  proxmox_test:
+    type: proxmox
+    os: debian
+    ip: 10.0.10.4
+    lxc:
+      wireguard:
+        ip: 10.0.10.8
+        os: alpine
+        vmid: 101
+
+  cprox:
+    type: proxmox
+    os: debian
+    ip: 10.0.10.3
+    lxc:
+      wireguard:
+        ip: 10.0.10.2
+        os: alpine
+        vmid: 100
+      tailscale:
+        ip: 10.0.20.3
+        os: alpine
+        vmid: 101
+      docker:
+        ip: 10.0.10.6
+        os: debian
+        vmid: 102
+        docker:
+          root_path: "/home/manuel"
+          stacks:
+            nginx-proxy-manager:
+              config_path: "./docker/nginx/"
+              web_services:
+                - proxy_name: home
+                  port: 81
+            nebula-sync:
+              config_path: "./docker/nebula-sync/"
+            dfs-aip-interface:
+              config_path: "./docker/homeassistant/"
+              web_services:
+                - proxy_name: dfs-aip
+                  port: 8081
+
+      home:
+        ip: 10.0.10.10
+        os: debian
+        vmid: 103
+        docker:
+          root_path: "/home/manuel"
+          stacks:
+            homeassistant:
+              config_path: "./docker/homeassistant/"
+              web_services:
+                - proxy_name: esphome
+                  port: 6052
+                - proxy_name: home
+                  port: 8123
+                - proxy_name: z2mqtt
+                  port: 8080
+
+      pihole:
+        ip: 10.0.10.5
+        os: debian
+        vmid: 105
+        web_services:
+          - proxy_name: pihole
+            port: 8080
+
+    vm:
+      fr24-radar:
+        os: debian
+        ip: 10.0.50.149
+        vmid: 111
+
+  test-system:
+    os: debian
+    ip: 10.0.10.42
+
+  tmp-pi:
+    os: debian
+    ip: 10.0.10.254
+
+  lifeboat:
+    type: bare-metal
+    os: debian
+    ip: 10.0.10.9
+    web_services:
+      - proxy_name: pihole2
+        port: 8080
+
+
+

{labops-0.3.2 → labops-0.4.0}/uv.lock

@@ -268,7 +268,7 @@ wheels = [
 
 [[package]]
 name = "labops"
-version = "0.3.2"
+version = "0.4.0"
 source = { editable = "." }
 dependencies = [
     { name = "ansible-core" },

labops-0.3.2/.release-please-manifest.json

@@ -1,3 +0,0 @@
-{
-    ".": "0.3.2"
-}

labops-0.3.2/models/input_conf/hosts.py

@@ -1,61 +0,0 @@
-from pydantic import BaseModel, model_validator, DirectoryPath
-from typing import Optional, Dict, Any, Literal
-from ipaddress import IPv4Address
-
-from models.input_conf.creds import Creds
-
-OSType = Literal["debian", "alpine", "redhat"]
-HostType = Literal["bare-metal", "proxmox"]
-
-
-class WebService(BaseModel):
-    port: int
-    proxy_name: Optional[str] = None
-
-
-class DockerStack(BaseModel):
-    config_path: DirectoryPath
-    web_services: Optional[Dict[str, WebService]] = None
-
-
-class LXC(BaseModel):
-    name: str = ""
-    ip: IPv4Address
-    os: OSType
-    vmid: int
-    creds: Optional[Creds] = None
-    web_services: Optional[Dict[str, WebService]] = None
-    docker_stack: Optional[Dict[str, DockerStack]] = None
-
-class Host(BaseModel):
-    name: str = ""
-    type: HostType = "bare-metal"
-    os: OSType
-    ip: IPv4Address
-    creds: Optional[Creds] = None
-    lxc: Optional[Dict[str, LXC]] = None
-    vm: Optional[Dict[str, "Host"]] = None ## CHECK THIS
-    web_services: Optional[Dict[str, WebService]] = None
-
-    @model_validator(mode="after")
-    def check_proxmox_support(self) -> "Host":
-        if self.type != "proxmox":
-            if self.lxc is not None or self.vm is not None:
-                raise ValueError(
-                    "Fields 'lxc' and 'vm' are only allowed when type is 'proxmox'"
-                )
-        return self
-
-    @model_validator(mode="after")
-    def propagate_lxc_vm_names(self) -> "Host":
-        # Inject the dictionary key as the 'name' attribute for child LXCs
-        if self.lxc:
-            for k, v in self.lxc.items():
-                v.name = k
-                
-        # Inject the dictionary key as the 'name' attribute for child VMs
-        if self.vm:
-            for k, v in self.vm.items():
-                v.name = k
-                
-        return self

labops-0.3.2/models/input_conf/yaml_root.py

@@ -1,38 +0,0 @@
-from pydantic import BaseModel, model_validator
-from typing import Optional, Dict
-
-from models.input_conf.hosts import Host
-from models.input_conf.settings import Settings
-
-class YamlRoot(BaseModel):
-    settings: Settings
-    hosts: Optional[Dict[str, Host]] = None
-
-    @model_validator(mode="after")
-    def propagate_host_names(self) -> "YamlRoot":
-        if self.hosts:
-            for k, host in self.hosts.items():
-                host.name = k
-        return self
-
-    @model_validator(mode="after")
-    def validate_unique_names(self) -> "YamlRoot":
-        all_names = set()
-        if self.hosts:
-            for k, host in self.hosts.items():
-                if k in all_names:
-                    raise ValueError(f"Duplicate name found across configuration: '{k}'")
-                all_names.add(k)
-
-                if host.lxc:
-                    for lxc_name in host.lxc.keys():
-                        if lxc_name in all_names:
-                            raise ValueError(f"Duplicate name found across configuration: '{lxc_name}'")
-                        all_names.add(lxc_name)
-                
-                if host.vm:
-                    for vm_name in host.vm.keys():
-                        if vm_name in all_names:
-                            raise ValueError(f"Duplicate name found across configuration: '{vm_name}'")
-                        all_names.add(vm_name)
-        return self

labops-0.3.2/src/utils/yaml_validator.py

@@ -1,24 +0,0 @@
-from typing import Dict, Any, Optional
-from pydantic import ValidationError
-import os
-from pathlib import Path
-
-from models.input_conf.yaml_root import YamlRoot
-
-
-def validate_yaml(raw: Dict[str, Any], rootPath: str) -> Optional[YamlRoot]:
-    base_dir: Path = Path(rootPath).parent.resolve()
-    original_dir: str = os.getcwd()
-    os.chdir(base_dir)
-
-    model = None
-    try:
-        try:
-            model = YamlRoot(**raw)
-        except ValidationError as e:
-            print("Validation error in YAML structure:")
-            print(e)
-    finally:
-        os.chdir(original_dir)
-
-    return model

labops-0.3.2/test-samples/homelab-complete.yml

@@ -1,100 +0,0 @@
-settings:
-  default_creds:
-    username: root
-    passwd: changeme
-    #ssh_key_path: xxxxx
-  dns:
-    local_dns_suffix: .lab
-    pihole_location: 10.0.10.5 
-  proxy:
-    proxy_suffix: .mfritz.top
-    proxy_location: 10.0.10.6
-
-hosts:
-  cprox:
-    type: proxmox
-    os: debian
-    ip: 10.0.10.3
-    lxc:
-      wireguard:
-        ip: 10.0.10.2
-        os: alpine
-        vmid: 100
-      tailscale:
-        ip: 10.0.20.3
-        os: alpine
-        vmid: 101
-      docker:
-        ip: 10.0.10.6
-        os: debian
-        vmid: 102
-        docker_stack:
-          nginx-proxy-manager:
-            config_path: "./docker/nginx/"
-            web_services:
-              app:
-                port: 81
-                proxy_name: nginx
-          nebula-sync:
-            config_path: "./docker/nebula-sync/"
-          dfs-aip-interface:
-            config_path: "./docker/homeassistant/"
-            web_services:
-            dfs-aip:
-              port: 8081
-              proxy_name: dfs-aip
-
-      home:
-        ip: 10.0.10.10
-        os: debian
-        vmid: 103
-        docker_stack:
-          homeassistant:
-            config_path: "./docker/homeassistant/"
-            web_services:
-              esphome:
-                port: 6052
-              homeassistant:
-                port: 8123
-                proxy_name: home
-              zigbee2mqtt:
-                port: 8080
-                proxy_name: z2mqtt
-
-      pihole:
-        ip: 10.0.10.5
-        os: debian
-        vmid: 105
-        web_services:
-          admin-panel:
-            port: 8080
-            proxy_name: pihole
-
-    vm:
-      fr24-radar:
-        os: debian
-        ip: 10.0.50.149
-          # for later -> Add option to add dncp
-          # dhcp-reserve: # for later
-          #  ip: 10.0.30.5
-          #  mac: FF:FF:FF:FF:FF:FF
-
-  test-system:
-    os: debian
-    ip: 10.0.10.42
-
-  tmp-pi:
-    os: debian
-    ip: 10.0.10.254
-    # for later -> Add option to add dncp
-    # type: dhcp
-  lifeboat:
-    type: bare-metal
-    os: debian
-    ip: 10.0.10.9
-    web_services:
-      pihole:
-        port: 8080
-        proxy_name: pihole2
-      
-