Self-improving AI Employees for everyone
Python ai-agentsai-employeeai-employeesassistantautonomous-agentsco-employeescompanygrok-botinstinctloop-agentsmuseown-your-datapersonalself-hosted
refactor(machina): swap config.py to pydantic-settings (-13 LOC)
trohitgb7379e2fd97a
diff --git a/machina/commands/clean.py b/machina/commands/clean.pyindex 3e056aba..73339472 100644--- a/machina/commands/clean.py+++ b/machina/commands/clean.py@@ -52,7 +52,7 @@ def clean_command() -> None:# Step 1: kill anything on configured portsconsole.print("Stopping running processes...")killed_ports = 0- for port in cfg.ports.all():+ for port in cfg.all_ports:result = kill_port(port)if result.killed_pids:console.print(f" Port {port}: Killed {len(result.killed_pids)} process(es)")diff --git a/machina/commands/dev.py b/machina/commands/dev.pyindex 795d8824..282294f6 100644--- a/machina/commands/dev.py+++ b/machina/commands/dev.py@@ -59,7 +59,7 @@ def _build_specs(root: Path, cfg, *, daemon: bool, use_vite: bool) -> list[Serviname="client",argv=["pnpm", "run", "client:start"],cwd=root,- ready_port=cfg.ports.client,+ ready_port=cfg.client_port,ready_timeout=60.0,)else:@@ -67,7 +67,7 @@ def _build_specs(root: Path, cfg, *, daemon: bool, use_vite: bool) -> list[Serviname="client",argv=["node", str(static_client)],cwd=root,- ready_port=cfg.ports.client,+ ready_port=cfg.client_port,)backend_host = "0.0.0.0" if daemon else "127.0.0.1"@@ -76,11 +76,11 @@ def _build_specs(root: Path, cfg, *, daemon: bool, use_vite: bool) -> list[Serviargv=["uv", "run", "uvicorn", "main:app","--host", backend_host,- "--port", str(cfg.ports.backend),+ "--port", str(cfg.backend_port),"--log-level", "warning",],cwd=server_dir,- ready_port=cfg.ports.backend,+ ready_port=cfg.backend_port,)return [@@ -90,7 +90,7 @@ def _build_specs(root: Path, cfg, *, daemon: bool, use_vite: bool) -> list[Serviname="temporal",argv=["temporal-server", "api"],cwd=root,- ready_port=cfg.ports.temporal,+ ready_port=cfg.temporal_port,),]@@ -109,10 +109,10 @@ def dev_command(console.print("\n[bold]=== MachinaOS Starting ===[/]\n")console.print(f"Platform: {platform_name()}")console.print(f"Mode: {'Daemon (uvicorn)' if daemon else 'Development (uvicorn)'}")- console.print(f"Ports: {', '.join(str(p) for p in cfg.ports.all())}")+ console.print(f"Ports: {', '.join(str(p) for p in cfg.all_ports)}")console.print("Freeing ports...")- for port in cfg.ports.all():+ for port in cfg.all_ports:kill_port(port)_clear_vite_cache(root)diff --git a/machina/commands/start.py b/machina/commands/start.pyindex 83a375bd..1929f195 100644--- a/machina/commands/start.py+++ b/machina/commands/start.py@@ -119,7 +119,7 @@ def _build_specs(root: Path, cfg, *, temporal_running: bool) -> list[ServiceSpecbackend_argv = ["uv", "run", "uvicorn", "main:app","--host", backend_host,- "--port", str(cfg.ports.backend),+ "--port", str(cfg.backend_port),"--log-level", "warning",]@@ -128,13 +128,13 @@ def _build_specs(root: Path, cfg, *, temporal_running: bool) -> list[ServiceSpecname="client",argv=["node", str(static_client)],cwd=root,- ready_port=cfg.ports.client,+ ready_port=cfg.client_port,),ServiceSpec(name="server",argv=backend_argv,cwd=server_dir,- ready_port=cfg.ports.backend,+ ready_port=cfg.backend_port,),]if not temporal_running:@@ -143,7 +143,7 @@ def _build_specs(root: Path, cfg, *, temporal_running: bool) -> list[ServiceSpecname="temporal",argv=["temporal-server", "api"],cwd=root,- ready_port=cfg.ports.temporal,+ ready_port=cfg.temporal_port,))return specs@@ -162,15 +162,15 @@ def start_command() -> None:console.print("[dim]Temporal already running, skipping[/]")console.print("Freeing ports...")- for port in cfg.ports.all():+ for port in cfg.all_ports:kill_port(port)console.print("Ports ready")version = _read_version(root)console.print()console.print(f" [bold]MachinaOS[/] v{version}")- console.print(f" Frontend: http://localhost:{cfg.ports.client}")- console.print(f" Backend: http://localhost:{cfg.ports.backend}")+ console.print(f" Frontend: http://localhost:{cfg.client_port}")+ console.print(f" Backend: http://localhost:{cfg.backend_port}")console.print(f" Platform: {platform_name()}")console.print()diff --git a/machina/commands/stop.py b/machina/commands/stop.pyindex 151d965f..8145ea34 100644--- a/machina/commands/stop.py+++ b/machina/commands/stop.py@@ -28,12 +28,12 @@ def stop_command() -> None:console.print()console.print("[bold]Stopping MachinaOS services...[/]")console.print(f"Platform: {platform_name()}")- console.print(f"Ports: {', '.join(str(p) for p in cfg.ports.all())}")+ console.print(f"Ports: {', '.join(str(p) for p in cfg.all_ports)}")console.print(f"Temporal: enabled" if cfg.temporal_enabled else "Temporal: disabled")console.print()all_stopped = True- for port in cfg.ports.all():+ for port in cfg.all_ports:result = kill_port(port)status = "[green]\\[OK][/]" if result.port_free else "[red]\\[!!][/]"if result.port_free:diff --git a/machina/config.py b/machina/config.pyindex 3b818bf7..2c78fb7f 100644--- a/machina/config.py+++ b/machina/config.py@@ -1,76 +1,63 @@-""".env loader + port resolution.+"""Project configuration -- ports + flags from ``.env``.-Mirrors what ``scripts/utils.js:loadEnvConfig`` does, using-``python-dotenv`` instead of a custom parser.+Backed by ``pydantic-settings``: typed fields with automatic env-var+coercion, no hand-rolled int/bool parsers. The model loads ``.env``+(or ``.env.template`` as fallback) from the project root."""from __future__ import annotations-from dataclasses import dataclass, field+from functools import lru_cachefrom pathlib import Path-from dotenv import dotenv_values+from pydantic import Field+from pydantic_settings import BaseSettings, SettingsConfigDictfrom machina.platform_ import project_root-@dataclass(frozen=True)-class Ports:- client: int- backend: int- whatsapp: int- nodejs: int- temporal: int+def _env_file(root: Path) -> Path:+ primary = root / ".env"+ fallback = root / ".env.template"+ return primary if primary.exists() else fallback- def all(self) -> list[int]:- return [self.client, self.backend, self.whatsapp, self.nodejs, self.temporal]+class Config(BaseSettings):+ """Typed view over ``.env``; defaults match the JS ``loadEnvConfig``."""-@dataclass(frozen=True)-class Config:- raw: dict[str, str | None] = field(default_factory=dict)- ports: Ports = field(default_factory=lambda: Ports(3000, 3010, 9400, 3020, 7233))- temporal_enabled: bool = True- redis_enabled: bool = False---def _truthy(value: str | None) -> bool:- return (value or "").strip().lower() in {"true", "1", "yes", "on"}---def _int(value: str | None, default: int) -> int:- try:- return int(value) if value else default- except (TypeError, ValueError):- return default---def _temporal_port(address: str | None) -> int:- if not address:- return 7233- try:- return int(address.rsplit(":", 1)[-1])- except (ValueError, IndexError):- return 7233-+ model_config = SettingsConfigDict(+ env_file_encoding="utf-8",+ case_sensitive=False,+ extra="ignore",+ populate_by_name=True,+ )+ client_port: int = Field(default=3000, alias="VITE_CLIENT_PORT")+ backend_port: int = Field(default=3010, alias="PYTHON_BACKEND_PORT")+ whatsapp_port: int = Field(default=9400, alias="WHATSAPP_RPC_PORT")+ nodejs_port: int = Field(default=3020, alias="NODEJS_EXECUTOR_PORT")+ temporal_address: str = Field(default="localhost:7233", alias="TEMPORAL_SERVER_ADDRESS")+ temporal_enabled: bool = Field(default=True, alias="TEMPORAL_ENABLED")++ @property+ def temporal_port(self) -> int:+ try:+ return int(self.temporal_address.rsplit(":", 1)[-1])+ except (ValueError, IndexError):+ return 7233++ @property+ def all_ports(self) -> list[int]:+ return [+ self.client_port,+ self.backend_port,+ self.whatsapp_port,+ self.nodejs_port,+ self.temporal_port,+ ]+++@lru_cache(maxsize=1)def load_config(root: Path | None = None) -> Config:root = root or project_root()- env_path = root / ".env"- if not env_path.exists():- env_path = root / ".env.template"- raw = dotenv_values(env_path) if env_path.exists() else {}-- ports = Ports(- client=_int(raw.get("VITE_CLIENT_PORT"), 3000),- backend=_int(raw.get("PYTHON_BACKEND_PORT"), 3010),- whatsapp=_int(raw.get("WHATSAPP_RPC_PORT"), 9400),- nodejs=_int(raw.get("NODEJS_EXECUTOR_PORT"), 3020),- temporal=_temporal_port(raw.get("TEMPORAL_SERVER_ADDRESS")),- )- return Config(- raw=dict(raw),- ports=ports,- temporal_enabled=_truthy(raw.get("TEMPORAL_ENABLED")) or True,- redis_enabled=_truthy(raw.get("REDIS_ENABLED")),- )+ return Config(_env_file=str(_env_file(root)))diff --git a/machina/tests/test_dev.py b/machina/tests/test_dev.pyindex e54dc5a6..97b98071 100644--- a/machina/tests/test_dev.py+++ b/machina/tests/test_dev.py@@ -5,14 +5,11 @@ from __future__ import annotationsfrom pathlib import Pathfrom machina.commands import dev-from machina.config import Config, Ports+from machina.config import Configdef _cfg() -> Config:- return Config(- raw={},- ports=Ports(client=3000, backend=3010, whatsapp=9400, nodejs=3020, temporal=7233),- )+ return Config()def test_has_vite_false_when_missing(tmp_path: Path):diff --git a/machina/tests/test_start.py b/machina/tests/test_start.pyindex 1cdd5ea2..47725b54 100644--- a/machina/tests/test_start.py+++ b/machina/tests/test_start.py@@ -6,14 +6,11 @@ from pathlib import Pathfrom unittest.mock import patchfrom machina.commands import start-from machina.config import Config, Ports+from machina.config import Configdef _cfg() -> Config:- return Config(- raw={},- ports=Ports(client=3000, backend=3010, whatsapp=9400, nodejs=3020, temporal=7233),- )+ return Config()def test_venv_python_returns_none_when_missing(tmp_path: Path):