updated Dockerfile and ExApp's main.py to set those env variables

Signed-off-by: bigcat88 <[email protected]>

Author: bigcat88

Dockerfile

@@ -62,12 +62,17 @@ RUN --mount=type=cache,target=/root/.cache/pip \
         venv/bin/python -m pip install torch==2.7.0 torchvision torchaudio; \
     fi
 
+COPY ex_app/lib/exclude_nodes.py ex_app/lib/exclude_flows.py /ex_app/lib/
+COPY scripts/ci/get_excludes.py /get_excludes.py
 RUN --mount=type=cache,target=/root/.cache/pip \
     cd /Visionatrix && \
     venv/bin/python -m pip install "psycopg[binary]" greenlet && \
     venv/bin/python -m pip install . && \
-    venv/bin/python -m visionatrix install && \
-    rm visionatrix.db
+    VISIONATRIX_INSTALL_EXCLUDE_NODES="$(python /get_excludes.py nodes)" \
+        venv/bin/python -m visionatrix install && \
+    rm visionatrix.db && \
+    rm /get_excludes.py && \
+    rm -rf /ex_app
 
 # Setup nodejs and npm for building the front-end client
 RUN apt-get update && \

ex_app/lib/main.py

@@ -17,6 +17,8 @@
 from time import sleep
 
 import httpx
+from exclude_flows import EXCLUDE_FLOWS_IDS
+from exclude_nodes import EXCLUDE_NODES_IDS
 from fastapi import BackgroundTasks, Body, Depends, FastAPI, Request, responses
 from nc_py_api import NextcloudApp
 from nc_py_api.ex_app import (
@@ -74,6 +76,9 @@
 print("[DEBUG]: PROJECT_ROOT_FOLDER=", PROJECT_ROOT_FOLDER, flush=True)
 print("[DEBUG]: STATIC_FRONTEND_PRESENT=", STATIC_FRONTEND_PRESENT, flush=True)
 
+os.environ["VISIONATRIX_INSTALL_EXCLUDE_NODES"] = EXCLUDE_NODES_IDS
+os.environ["VISIONATRIX_EXCLUDE_FLOWS"] = EXCLUDE_FLOWS_IDS
+
 
 def _(text):
     return current_translator.get().gettext(text)

scripts/ci/get_excludes.py

@@ -1,13 +1,14 @@
 #!/usr/bin/env python3
 """
-Tiny helper for GitHub Actions.
+Tiny helper for GitHub Actions *and* Docker builds.
 
 Usage:
-    python3 scripts/ci/get_excludes.py flows   # → prints "id1;id2;…"
-    python3 scripts/ci/get_excludes.py nodes   # → prints "url1;url2;…"
+    python3 get_excludes.py flows   # → prints "id1;id2;…"
+    python3 get_excludes.py nodes   # → prints "url1;url2;…"
 
-It simply echoes the semicolon-joined list so the caller can redirect it
-into the desired environment variable.
+It echoes a semicolon-joined list so callers can assign it to an environment variable, e.g.:
+
+    VISIONATRIX_INSTALL_EXCLUDE_NODES="$(python /get_excludes.py nodes)"
 """
 
 from __future__ import annotations
@@ -28,21 +29,43 @@ def _import_list(file: Path, var: str) -> Sequence[str]:
     return value
 
 
+def find_repo_root() -> Path:
+    """
+    Locate directory that contains  ex_app/lib/ .
+    Strategy (first match wins):
+        1. Walk up from this script's directory.
+        2. Walk up from CWD (useful if script is executed via absolute path).
+        3. Fallback to filesystem root (where Dockerfile copies it as /ex_app/lib).
+    """
+    def search_up(start: Path) -> Path | None:
+        for p in [start, *list(start.parents)]:
+            if (p / "ex_app" / "lib").is_dir():
+                return p
+        return None
+
+    here = Path(__file__).resolve().parent
+    return search_up(here) or search_up(Path.cwd()) or Path("/")
+
+
 def main() -> None:
     if len(sys.argv) != 2 or sys.argv[1] not in {"flows", "nodes"}:
         print("Usage: get_excludes.py [flows|nodes]", file=sys.stderr)
         sys.exit(1)
 
     mode = sys.argv[1]
-    repo_root = Path(__file__).resolve().parents[2]   # <repo>/scripts/ci/…
+    repo_root = find_repo_root()   # <repo root> or "/" inside container
 
     if mode == "flows":
         py_file = repo_root / "ex_app" / "lib" / "exclude_flows.py"
         var_name = "EXCLUDE_FLOWS_IDS"
-    else:  # nodes
+    else:
         py_file = repo_root / "ex_app" / "lib" / "exclude_nodes.py"
         var_name = "EXCLUDE_NODES_IDS"
 
+    if not py_file.is_file():
+        print(f"Error: cannot locate {py_file}", file=sys.stderr)
+        sys.exit(2)
+
     items = _import_list(py_file, var_name)
     print(";".join(items))