moved nornsight off my_python

This commit is contained in:
2026-05-29 20:15:51 -04:00
parent 7d507fb7e1
commit 006ae6079a
2 changed files with 26 additions and 3 deletions
-1
View File
@@ -44,7 +44,6 @@
tiktoken tiktoken
tinytuya tinytuya
typer typer
uvicorn
websockets websockets
] ]
); );
+26 -2
View File
@@ -3,6 +3,12 @@ let
vars = import ../vars.nix; vars = import ../vars.nix;
stateDir = "${vars.services}/nornsight"; stateDir = "${vars.services}/nornsight";
appDir = "${stateDir}/app"; appDir = "${stateDir}/app";
binPath = pkgs.lib.makeBinPath [
pkgs.binutils
pkgs.libpq
pkgs.postgresql
pkgs.stdenv.cc
];
libraryPath = pkgs.lib.makeLibraryPath [ libraryPath = pkgs.lib.makeLibraryPath [
pkgs.libpq pkgs.libpq
pkgs.postgresql.lib pkgs.postgresql.lib
@@ -27,14 +33,20 @@ in
environment = { environment = {
HOME = stateDir; HOME = stateDir;
UV_CACHE_DIR = "${stateDir}/.cache/uv";
UV_PROJECT_ENVIRONMENT = "${appDir}/.venv";
UV_PYTHON = "${pkgs.python313}/bin/python3.13";
UV_PYTHON_DOWNLOADS = "never";
LD_LIBRARY_PATH = libraryPath; LD_LIBRARY_PATH = libraryPath;
PYTHONPATH = appDir; LIBRARY_PATH = libraryPath;
PSYCOPG_IMPL = "python";
}; };
path = with pkgs; [ path = with pkgs; [
bash bash
coreutils coreutils
git git
uv
]; ];
serviceConfig = { serviceConfig = {
@@ -56,6 +68,9 @@ in
script = '' script = ''
set -eu set -eu
export PATH="${binPath}:$PATH"
export LD_LIBRARY_PATH="${libraryPath}:''${LD_LIBRARY_PATH:-}"
export LIBRARY_PATH="${libraryPath}:''${LIBRARY_PATH:-}"
: "''${NORN_SIGHT_REPO_URL:?NORN_SIGHT_REPO_URL is required}" : "''${NORN_SIGHT_REPO_URL:?NORN_SIGHT_REPO_URL is required}"
branch="''${NORN_SIGHT_BRANCH:-main}" branch="''${NORN_SIGHT_BRANCH:-main}"
@@ -77,7 +92,16 @@ in
fi fi
cd "${appDir}" cd "${appDir}"
exec ${pkgs.my_python}/bin/python -m uvicorn pipelines.web.main:app --reload --host 0.0.0.0 --port 8001 uv sync --upgrade
uv run python - <<'PY'
import ctypes.util
import os
print(f"LD_LIBRARY_PATH={os.environ.get('LD_LIBRARY_PATH')}")
print(f"LIBRARY_PATH={os.environ.get('LIBRARY_PATH')}")
print(f"libpq={ctypes.util.find_library('pq')}")
PY
exec uv run uvicorn pipelines.web.main:app --reload --host 0.0.0.0 --port 8001
''; '';
}; };
} }