Run the containers with the systemd configuration, 1:1
The containers now read the unchanged .env of the matching systemd instance (/home/llmadmin/mindnet_dev/.env, /home/llmadmin/mindnet/.env) and use the same Qdrant, Ollama, vault and collection prefix, so both can be compared side by side. Only container-specific values are overridden: host service addresses (host.docker.internal instead of 127.0.0.1) and the read-only vault. - deploy/appenv.py derives the vault mount and prefix from that .env and rejects application keys in the container-only file. - Remove the separate dev Qdrant, the synthetic test vault and the import step. - UI binds 0.0.0.0 like systemd; API stays loopback by default. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
eae30775e3
commit
6cdad8b046
20 files changed
+373
-415
No files matched your search
@@ -0,0 +1,78 @@
|
||||
"""
|
||||
FILE: tests/test_container_appenv.py
|
||||
DESCRIPTION: Prüft deploy/appenv.py: Aus der unveränderten .env der systemd-Instanz
|
||||
werden Vault-Mount und Präfix so abgeleitet, dass der Container dieselbe
|
||||
Konfiguration nutzt; die Container-Datei darf nichts davon überschreiben.
|
||||
"""
|
||||
import importlib.util
|
||||
import shlex
|
||||
from pathlib import Path
|
||||
|
||||
import pytest
|
||||
|
||||
DEPLOY = Path(__file__).resolve().parents[1] / "deploy"
|
||||
_spec = importlib.util.spec_from_file_location("mindnet_appenv", DEPLOY / "appenv.py")
|
||||
appenv = importlib.util.module_from_spec(_spec)
|
||||
_spec.loader.exec_module(appenv)
|
||||
|
||||
APP_ENV = "/home/llmadmin/mindnet_dev/.env"
|
||||
|
||||
|
||||
def _files(tmp_path, app_text, container_text="MINDNET_UI_PORT=8512\n"):
|
||||
app = tmp_path / "app.env"
|
||||
app.write_text(app_text, encoding="utf-8")
|
||||
container = tmp_path / "container.env"
|
||||
container.write_text(container_text, encoding="utf-8")
|
||||
return str(app), str(container)
|
||||
|
||||
|
||||
def test_parse_handles_export_quotes_and_comments(tmp_path):
|
||||
app, _ = _files(tmp_path, '# Kommentar\nexport A=1\nB="mit # Raute"\nC=wert # Kommentar\nD=\n')
|
||||
assert appenv.parse(app) == {"A": "1", "B": "mit # Raute", "C": "wert", "D": ""}
|
||||
|
||||
|
||||
@pytest.mark.parametrize("root, host, target", [
|
||||
("./vault", "/home/llmadmin/mindnet_dev/vault", "/app/vault"),
|
||||
("vault_dev", "/home/llmadmin/mindnet_dev/vault_dev", "/app/vault_dev"),
|
||||
("../shared/vault", "/home/llmadmin/shared/vault", "/shared/vault"),
|
||||
("/mnt/nas/vault/", "/mnt/nas/vault", "/mnt/nas/vault"),
|
||||
])
|
||||
def test_vault_mount_points_where_the_app_looks(root, host, target):
|
||||
# Relativ: systemd löst gegen WorkingDirectory (= Ordner der .env) auf, der Container gegen /app.
|
||||
assert appenv.vault_mount(APP_ENV, {"MINDNET_VAULT_ROOT": root}) == (host, target)
|
||||
|
||||
|
||||
def test_vault_mount_uses_app_default_when_unset():
|
||||
assert appenv.vault_mount(APP_ENV, {}) == ("/home/llmadmin/mindnet_dev/vault_master", "/app/vault_master")
|
||||
|
||||
|
||||
def test_derive_takes_prefix_from_systemd_env(tmp_path):
|
||||
app, container = _files(tmp_path, "COLLECTION_PREFIX=mindnet_dev\nMINDNET_VAULT_ROOT=/srv/vault\n")
|
||||
derived = appenv.derive(app, container)
|
||||
assert derived["MINDNET_EXPECTED_PREFIX"] == "mindnet_dev"
|
||||
assert derived["MINDNET_VAULT_HOST_PATH"] == derived["MINDNET_VAULT_TARGET"] == "/srv/vault"
|
||||
|
||||
|
||||
def test_derive_falls_back_to_app_default_prefix(tmp_path):
|
||||
app, container = _files(tmp_path, "MINDNET_VAULT_ROOT=/srv/vault\n")
|
||||
assert appenv.derive(app, container)["MINDNET_EXPECTED_PREFIX"] == "mindnet"
|
||||
|
||||
|
||||
@pytest.mark.parametrize("key", ["COLLECTION_PREFIX", "MINDNET_VAULT_ROOT", "OPENROUTER_API_KEY", "QDRANT_URL"])
|
||||
def test_container_env_must_not_override_app_config(tmp_path, key):
|
||||
app, container = _files(tmp_path, "COLLECTION_PREFIX=mindnet_dev\n", f"MINDNET_UI_PORT=8512\n{key}=x\n")
|
||||
with pytest.raises(appenv.AppEnvError, match=key):
|
||||
appenv.derive(app, container)
|
||||
|
||||
|
||||
def test_main_prints_shell_safe_assignments(tmp_path, capsys):
|
||||
app, container = _files(tmp_path, "COLLECTION_PREFIX=mindnet_dev\nMINDNET_VAULT_ROOT=/srv/my vault\n")
|
||||
assert appenv.main(["appenv.py", app, container]) == 0
|
||||
lines = capsys.readouterr().out.splitlines()
|
||||
parsed = dict(shlex.split(line)[0].split("=", 1) for line in lines)
|
||||
assert parsed["MINDNET_VAULT_HOST_PATH"] == "/srv/my vault"
|
||||
|
||||
|
||||
def test_main_reports_missing_file(tmp_path, capsys):
|
||||
assert appenv.main(["appenv.py", str(tmp_path / "fehlt.env"), str(tmp_path / "auch.env")]) == 1
|
||||
assert "appenv:" in capsys.readouterr().err
|
||||
Reference in new issue
Block a user