add line counter tool and update README with code stats

https://claude.ai/code/session_01Gt1RfK8m2hxciLMMMYG8xg

.github/workflows/build_systems.yml

@@ -23,6 +23,6 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Build default package
-        run: "nixos-rebuild build --accept-flake-config --flake ./#${{ matrix.system }}"
+        run: "nixos-rebuild build --flake ./#${{ matrix.system }}"
       - name: copy to nix-cache
         run: nix copy --accept-flake-config --to unix:///host-nix/var/nix/daemon-socket/socket .#nixosConfigurations.${{ matrix.system }}.config.system.build.toplevel

.github/workflows/fix_eval_warnings.yml

@@ -0,0 +1,30 @@
+name: fix_eval_warnings
+on:
+  workflow_run:
+    workflows: ["build_systems"]
+    types: [completed]
+
+jobs:
+  check-warnings:
+    if: >-
+      github.event.workflow_run.conclusion != 'cancelled' &&
+      github.event.workflow_run.head_branch == 'main' &&
+      (github.event.workflow_run.event == 'push' || github.event.workflow_run.event == 'schedule')
+    runs-on: self-hosted
+    permissions:
+      contents: write
+      pull-requests: write
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Fix eval warnings
+        env:
+          GH_TOKEN: ${{ secrets.GH_TOKEN_FOR_UPDATES }}
+        run: >-
+          nix develop .#devShells.x86_64-linux.default -c
+          python -m python.eval_warnings.main
+          --run-id "${{ github.event.workflow_run.id }}"
+          --repo "${{ github.repository }}"
+          --ollama-url "${{ secrets.OLLAMA_URL }}"
+          --run-url "${{ github.event.workflow_run.html_url }}"

.github/workflows/merge_flake_lock_update.yml

@@ -6,18 +6,24 @@ on:
 
 jobs:
   merge:
-    runs-on: self-hosted
+    runs-on: ubuntu-latest
 
     permissions:
       contents: write
       pull-requests: write
 
     steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
       - name: merge_flake_lock_update
-        run: >-
+        run: |
-          nix develop .#devShells.x86_64-linux.default -c
+          pr_number=$(gh pr list --state open --author RichieCahill --label flake_lock_update --json number --jq '.[0].number')
-          python -m python.gitea_flake_lock merge
+          echo "pr_number=$pr_number" >> $GITHUB_ENV
-          --repo "${{ github.repository }}"
+          if [ -n "$pr_number" ]; then
+            gh pr merge "$pr_number" --rebase
+          else
+            echo "No open PR found with label flake_lock_update"
+          fi
         env:
-          GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GH_TOKEN_FOR_UPDATES }}
-          GITEA_URL: https://gitea.tmmworkshop.com

.github/workflows/pytest.yml

@@ -1,13 +1,13 @@
 name: pytest
 
 on:
-  workflow_dispatch:
   push:
     branches:
       - main
   pull_request:
     branches:
       - main
+  merge_group:
 
 jobs:
   pytest:

.github/workflows/update-flake-lock.yml

@@ -6,21 +6,18 @@ on:
 
 jobs:
   lockfile:
-    runs-on: self-hosted
+    runs-on: ubuntu-latest
-    permissions:
-      actions: write
-      contents: write
-      pull-requests: write
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
+      - name: Install Nix
+        uses: DeterminateSystems/nix-installer-action@main
       - name: Update flake.lock
-        run: nix flake update
+        uses: DeterminateSystems/update-flake-lock@main
-      - name: Create or update flake.lock PR
+        with:
-        env:
+          token: ${{ secrets.GH_TOKEN_FOR_UPDATES }}
-          GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
+          pr-title: "Update flake.lock"
-          GITEA_URL: https://gitea.tmmworkshop.com
+          pr-labels: |
-        run: >-
+            dependencies
-          nix develop .#devShells.x86_64-linux.default -c
+            automated
-          python -m python.gitea_flake_lock update
+            flake_lock_update
-          --repo "${{ github.repository }}"

.gitignore

@@ -169,6 +169,3 @@ test.*
 # Frontend build output
 frontend/dist/
 frontend/node_modules/
-
-# data from testing llms
-data/*

.vscode/settings.json

@@ -40,6 +40,7 @@
     "cgroupdriver",
     "charliermarsh",
     "Checkpointing",
+    "cloudflared",
     "codellama",
     "codezombiech",
     "compactmode",
@@ -203,7 +204,6 @@
     "peerconnection",
     "PESKYFOX",
     "PGID",
-    "pgvector",
     "pipewire",
     "pkgs",
     "plugdev",
@@ -308,7 +308,6 @@
     "usernamehw",
     "userprefs",
     "vaninventory",
-    "vdev",
     "vfat",
     "victron",
     "virt",

AGENTS.md

@@ -0,0 +1,12 @@
+## Dev environment tips
+
+- use treefmt to format all files
+- make python code ruff compliant
+- use pytest to test python code
+- always use the minimum amount of complexity
+- if judgment calls are easy to reverse make them. if not ask me first
+- Match existing code style.
+- Use builtin helpers getenv() over os.environ.get.
+- Prefer single-purpose functions over “do everything” helpers.
+- Avoid compatibility branches like PG_USER and POSTGRESQL_URL unless requested.
+- Keep helpers only if reused or they simplify the code otherwise inline.

README.md

@@ -1 +1,26 @@
 # dotfiles
+
+<!-- LINE-COUNT-START -->
+This repo has **20,055** lines of technical debt.
+
+| File Type | Lines | Percentage |
+|-----------|------:|-----------:|
+| .py | 11,441 | 57.0% |
+| .nix | 4,471 | 22.3% |
+| .yaml | 1,121 | 5.6% |
+| .html | 1,009 | 5.0% |
+| .json | 555 | 2.8% |
+| .yml | 479 | 2.4% |
+| .toml | 290 | 1.4% |
+| .css | 212 | 1.1% |
+| .gitignore | 199 | 1.0% |
+| .md | 75 | 0.4% |
+| .cfg | 73 | 0.4% |
+| .sh | 48 | 0.2% |
+| .mako | 36 | 0.2% |
+| .LICENSE | 21 | 0.1% |
+| .conf | 17 | 0.1% |
+| .Gemfile | 4 | 0.0% |
+| .svg | 3 | 0.0% |
+| .new | 1 | 0.0% |
+<!-- LINE-COUNT-END -->

common/global/default.nix

@@ -23,10 +23,7 @@
   boot = {
     tmp.useTmpfs = true;
     kernelPackages = lib.mkDefault pkgs.linuxPackages_6_12;
-    zfs = {
+    zfs.package = lib.mkDefault pkgs.zfs_2_4;
-      package = lib.mkDefault pkgs.zfs_2_4;
-      forceImportRoot = lib.mkDefault false;
-    };
   };
 
   hardware.enableRedistributableFirmware = true;
@@ -40,17 +37,10 @@
 
   nixpkgs = {
     overlays = builtins.attrValues outputs.overlays;
-    config = {
+    config.allowUnfree = true;
-      allowUnfree = true;
-      permittedInsecurePackages = [
-        "openssl-1.1.1w" # This is for discord-canary
-      ];
-    };
   };
 
   services = {
-    dbus.implementation = "dbus";
-
     # firmware update
     fwupd.enable = true;
 

common/global/nix.nix

@@ -34,7 +34,6 @@ in
       warn-dirty = false;
       flake-registry = ""; # disable global flake registries
       connect-timeout = 10;
-      download-buffer-size = 536870912;
       fallback = true;
     };
 

common/optional/monitoring-agent.nix

@@ -1,256 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-let
-  monitoringInterface = "ztwfunumly";
-  nodeTextfileDir = "/var/lib/prometheus-node-exporter-textfile";
-
-  mkProcessNameTemplate =
-    perPid: template: if perPid then "${template}:{{.PID}}:{{.StartTime}}" else template;
-
-  mkProcessMatchers = perPid: [
-    {
-      name = mkProcessNameTemplate perPid "{{.Username}}:{{.Matches.Module}}";
-      cmdline = [ "^/nix/store[^ ]*/bin/python[^ ]* -m (?P<Module>[^ ]+)" ];
-    }
-    {
-      name = mkProcessNameTemplate perPid "{{.Username}}:{{.Matches.Wrapped}}";
-      cmdline = [
-        "^/nix/store[^ ]*/bin/python[^ ]* /nix/store[^ ]*/bin/\\.?(?P<Wrapped>[^ /]+?)(?:-wrapped)?(?:\\s|$)"
-      ];
-    }
-    {
-      name = mkProcessNameTemplate perPid "{{.Username}}:{{.Matches.Wrapped}}";
-      cmdline = [
-        "^/nix/store[^ ]*/bin/node /nix/store[^ ]*-(?P<Wrapped>[A-Za-z0-9._+-]+)-[0-9][^ /]*/"
-      ];
-    }
-    {
-      name = mkProcessNameTemplate perPid "{{.Username}}:{{.Matches.Wrapped}}";
-      cmdline = [ "^/nix/store[^ ]*/(?:bin/|lib/[^ ]*/)?\\.?(?P<Wrapped>[^ /]+?)(?:-wrapped)?(?:\\s|$)" ];
-    }
-    {
-      name = mkProcessNameTemplate perPid "{{.Username}}:{{.ExeBase}}";
-      cmdline = [ ".+" ];
-    }
-  ];
-
-  perPidConfig = pkgs.writeText "process-exporter-per-pid.yaml" (
-    builtins.toJSON {
-      process_names = mkProcessMatchers true;
-    }
-  );
-
-  zpoolLatencyScript = pkgs.writeShellScript "zpool-latency-exporter" ''
-        set -euo pipefail
-
-        out_dir=${lib.escapeShellArg nodeTextfileDir}
-        host=${lib.escapeShellArg config.networking.hostName}
-        tmp_file="$(mktemp "$out_dir/zpool.prom.XXXXXX")"
-        trap 'rm -f "$tmp_file"' EXIT
-
-        pools="$(zpool list -H -o name | paste -sd, -)"
-
-        cat >"$tmp_file" <<'EOF'
-    # HELP zpool_iostat_total_wait_read_ns Average total read wait time reported by zpool iostat.
-    # TYPE zpool_iostat_total_wait_read_ns gauge
-    # HELP zpool_iostat_total_wait_write_ns Average total write wait time reported by zpool iostat.
-    # TYPE zpool_iostat_total_wait_write_ns gauge
-    # HELP zpool_iostat_disk_wait_read_ns Average disk read wait time reported by zpool iostat.
-    # TYPE zpool_iostat_disk_wait_read_ns gauge
-    # HELP zpool_iostat_disk_wait_write_ns Average disk write wait time reported by zpool iostat.
-    # TYPE zpool_iostat_disk_wait_write_ns gauge
-    # HELP zpool_iostat_syncq_wait_read_ns Average synchronous queue read wait time reported by zpool iostat.
-    # TYPE zpool_iostat_syncq_wait_read_ns gauge
-    # HELP zpool_iostat_syncq_wait_write_ns Average synchronous queue write wait time reported by zpool iostat.
-    # TYPE zpool_iostat_syncq_wait_write_ns gauge
-    # HELP zpool_iostat_asyncq_wait_read_ns Average asynchronous queue read wait time reported by zpool iostat.
-    # TYPE zpool_iostat_asyncq_wait_read_ns gauge
-    # HELP zpool_iostat_asyncq_wait_write_ns Average asynchronous queue write wait time reported by zpool iostat.
-    # TYPE zpool_iostat_asyncq_wait_write_ns gauge
-    EOF
-
-        zpool iostat -Hplvy -y 1 1 | awk -F '\t' -v host="$host" -v pools="$pools" '
-          function esc(str, out) {
-            out = str
-            gsub(/\\/, "\\\\", out)
-            gsub(/"/, "\\\"", out)
-            return out
-          }
-
-          function emit(metric, pool, vdev, value) {
-            if (value == "" || value == "-") {
-              return
-            }
-
-            printf "%s{host=\"%s\",pool=\"%s\",vdev=\"%s\"} %s\n",
-              metric,
-              esc(host),
-              esc(pool),
-              esc(vdev),
-              value
-          }
-
-          BEGIN {
-            split(pools, pool_names, ",")
-            for (idx in pool_names) {
-              if (pool_names[idx] != "") {
-                known_pools[pool_names[idx]] = 1
-              }
-            }
-          }
-
-          NF == 0 {
-            next
-          }
-
-          {
-            row_name = $1
-
-            if (row_name in known_pools) {
-              current_pool = row_name
-              current_vdev = "_pool"
-            } else if (current_pool == "") {
-              next
-            } else {
-              current_vdev = row_name
-            }
-
-            emit("zpool_iostat_total_wait_read_ns", current_pool, current_vdev, $8)
-            emit("zpool_iostat_total_wait_write_ns", current_pool, current_vdev, $9)
-            emit("zpool_iostat_disk_wait_read_ns", current_pool, current_vdev, $10)
-            emit("zpool_iostat_disk_wait_write_ns", current_pool, current_vdev, $11)
-            emit("zpool_iostat_syncq_wait_read_ns", current_pool, current_vdev, $12)
-            emit("zpool_iostat_syncq_wait_write_ns", current_pool, current_vdev, $13)
-            emit("zpool_iostat_asyncq_wait_read_ns", current_pool, current_vdev, $14)
-            emit("zpool_iostat_asyncq_wait_write_ns", current_pool, current_vdev, $15)
-          }
-        ' >>"$tmp_file"
-
-        mv "$tmp_file" "$out_dir/zpool.prom"
-        trap - EXIT
-  '';
-in
-{
-  networking.firewall.interfaces.${monitoringInterface}.allowedTCPPorts = [
-    9100
-    9134
-    9256
-    9257
-    9633
-  ];
-
-  services.prometheus.exporters = {
-    node = {
-      enable = true;
-      enabledCollectors = [
-        "pressure"
-        "processes"
-        "systemd"
-      ];
-      extraFlags = [ "--collector.textfile.directory=${nodeTextfileDir}" ];
-    };
-
-    process = {
-      enable = true;
-      user = "root";
-      group = "root";
-      settings.process_names = mkProcessMatchers false;
-      extraFlags = [
-        "-gather-smaps=false"
-        "-remove-empty-groups=true"
-        "-threads=false"
-      ];
-    };
-
-    smartctl.enable = true;
-    zfs.enable = true;
-  };
-
-  programs.atop = {
-    enable = true;
-    atopService.enable = true;
-    atopRotateTimer.enable = true;
-    atopacctService.enable = true;
-    settings.interval = 30;
-  };
-
-  systemd = {
-    services = {
-      prometheus-process-pid-exporter = {
-        description = "Prometheus process exporter with per-PID naming";
-        wantedBy = [ "multi-user.target" ];
-        after = [ "network.target" ];
-        serviceConfig = {
-          ExecStart = ''
-            ${pkgs.prometheus-process-exporter}/bin/process-exporter \
-              --web.listen-address 0.0.0.0:9257 \
-              --config.path ${perPidConfig} \
-              -children=false \
-              -gather-smaps=false \
-              -remove-empty-groups=true \
-              -threads=false
-          '';
-          User = "root";
-          Group = "root";
-          Restart = "always";
-          WorkingDirectory = "/tmp";
-          CapabilityBoundingSet = [ "" ];
-          DeviceAllow = [ "" ];
-          LockPersonality = true;
-          MemoryDenyWriteExecute = true;
-          NoNewPrivileges = true;
-          PrivateDevices = true;
-          PrivateTmp = true;
-          ProtectClock = true;
-          ProtectControlGroups = true;
-          ProtectHome = true;
-          ProtectHostname = true;
-          ProtectKernelLogs = true;
-          ProtectKernelModules = true;
-          ProtectKernelTunables = true;
-          ProtectSystem = "strict";
-          RemoveIPC = true;
-          RestrictAddressFamilies = [
-            "AF_INET"
-            "AF_INET6"
-          ];
-          RestrictNamespaces = true;
-          RestrictRealtime = true;
-          RestrictSUIDSGID = true;
-          SystemCallArchitectures = "native";
-          UMask = "0077";
-        };
-      };
-
-      zpool-latency-exporter = {
-        description = "Exports ZFS latency metrics for node_exporter textfile collection";
-        after = [ "zfs-import.target" ];
-        requires = [ "zfs-import.target" ];
-        path = [
-          config.boot.zfs.package
-          pkgs.coreutils
-          pkgs.gawk
-        ];
-        serviceConfig = {
-          Type = "oneshot";
-          ExecStart = zpoolLatencyScript;
-        };
-      };
-    };
-
-    timers.zpool-latency-exporter = {
-      wantedBy = [ "timers.target" ];
-      timerConfig = {
-        OnBootSec = "2m";
-        OnUnitActiveSec = "60s";
-        Unit = "zpool-latency-exporter.service";
-      };
-    };
-
-    tmpfiles.rules = [ "d ${nodeTextfileDir} 0755 root root - -" ];
-  };
-}

common/optional/syncthing_base.nix

@@ -12,7 +12,7 @@
       brain.id = "SSCGIPI-IV3VYKB-TRNIJE3-COV4T2H-CDBER7F-I2CGHYA-NWOEUDU-3T5QAAN"; # cspell:disable-line
       ipad.id = "KI76T3X-SFUGV2L-VSNYTKR-TSIUV5L-SHWD3HE-GQRGRCN-GY4UFMD-CW6Z6AX"; # cspell:disable-line
       jeeves.id = "ICRHXZW-ECYJCUZ-I4CZ64R-3XRK7CG-LL2HAAK-FGOHD22-BQA4AI6-5OAL6AG"; # cspell:disable-line
-      phone.id = "JPVQKQW-CFXOJXT-Q5G5F3H-QIDHDRE-GKHPTQB-GXZUQSP-U7FR7F7-INP3AAH"; # cspell:disable-line
+      phone.id = "TBRULKD-7DZPGGZ-F6LLB7J-MSO54AY-7KLPBIN-QOFK6PX-W2HBEWI-PHM2CQI"; # cspell:disable-line
       rhapsody-in-green.id = "ASL3KC4-3XEN6PA-7BQBRKE-A7JXLI6-DJT43BY-Q4WPOER-7UALUAZ-VTPQ6Q4"; # cspell:disable-line
     };
   };

common/optional/update.nix

@@ -4,7 +4,7 @@
     flags = [ "--accept-flake-config" ];
     randomizedDelaySec = "1h";
     persistent = true;
-    flake = "git+https://gitea.tmmworkshop.com/richie/dotfiles?ref=main";
+    flake = "github:RichieCahill/dotfiles";
     allowReboot = true;
     dates = "Sat *-*-* 06:00:00";
   };

docs/zfs_failed_root_import_recovry.md

@@ -1,76 +0,0 @@
-# ZFS failed root import recovery
-
-## Fast path
-
-If the machine fails to boot because ZFS refuses to import `root_pool`:
-
-### GRUB
-
-1. At the bootloader menu, select the normal NixOS entry.
-2. Press `e`.
-3. Find the line that starts with `linux`.
-4. Append this to the end of that line:
-
-```text
-zfs_force=1
-```
-
-5. Boot once with `Ctrl+x` or `F10`.
-
-### systemd-boot
-
-1. At the bootloader menu, highlight the normal NixOS entry.
-2. Press `e`.
-3. Append this to the end of the options line:
-
-```text
-zfs_force=1
-```
-
-4. Press `Enter` to boot once.
-
-## After boot
-
-Run:
-
-```bash
-sudo zpool status
-sudo zpool import
-journalctl -b | rg "ZFS|zfs|import|root_pool"
-```
-
-## Expected result
-
-`sudo zpool status` should show `root_pool` as `ONLINE`.
-
-## Reboot test
-
-Run:
-
-```bash
-sudo reboot
-```
-
-Do not add `zfs_force=1` the second time.
-
-## If it still fails
-
-Boot once more with:
-
-```text
-zfs_force=1
-```
-
-Then run:
-
-```bash
-sudo zpool status -v
-sudo zpool history | tail -n 50
-journalctl -b | rg "ZFS|zfs|import|root_pool"
-```
-
-## Notes
-
-- Root pool name is `root_pool`.
-- This is a one-time recovery path after disk moves, controller changes, dirty exports, or interrupted imports.
-- Some hosts also need the LUKS unlock USB key inserted before boot.

flake.lock

@@ -8,11 +8,11 @@
       },
       "locked": {
         "dir": "pkgs/firefox-addons",
-        "lastModified": 1781150628,
+        "lastModified": 1773979456,
-        "narHash": "sha256-b4mp8l3qWuSCyYYo9HSngDtcB3PpecYiOXjULrjwwlw=",
+        "narHash": "sha256-9kBMJ5IvxqNlkkj/swmE8uK1Sc7TL/LIRUI958m7uBM=",
         "owner": "rycee",
         "repo": "nur-expressions",
-        "rev": "753319310f4673a2dabbfab87482187b40bf9bac",
+        "rev": "81e28f47ac18d9e89513929c77e711e657b64851",
         "type": "gitlab"
       },
       "original": {
@@ -29,11 +29,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1781189114,
+        "lastModified": 1774007980,
-        "narHash": "sha256-5inaamLgUMWy+MOBE9ChF9QAF1o/74LFuHkI0W/9rqc=",
+        "narHash": "sha256-FOnZjElEI8pqqCvB6K/1JRHTE8o4rer8driivTpq2uo=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "486595d2cf49cfcd649b58a284fa11ac0e34da22",
+        "rev": "9670de2921812bc4e0452f6e3efd8c859696c183",
         "type": "github"
       },
       "original": {
@@ -43,15 +43,12 @@
       }
     },
     "nixos-hardware": {
-      "inputs": {
-        "nixpkgs": "nixpkgs"
-      },
       "locked": {
-        "lastModified": 1781168557,
+        "lastModified": 1774018263,
-        "narHash": "sha256-LOnLQ2tpYF9gqIDDr3+j3DbpJJr/QCH6zPRT2GzEUOE=",
+        "narHash": "sha256-HHYEwK1A22aSaxv2ibhMMkKvrDGKGlA/qObG4smrSqc=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "6358ff76821101c178e3ab4919a62799bfe3652e",
+        "rev": "2d4b4717b2534fad5c715968c1cece04a172b365",
         "type": "github"
       },
       "original": {
@@ -63,24 +60,27 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1767892417,
+        "lastModified": 1773821835,
-        "narHash": "sha256-8bW3q88CEg2u4hSP66Vf4lpbLonHz7hqDNBMcCY7E9U=",
+        "narHash": "sha256-TJ3lSQtW0E2JrznGVm8hOQGVpXjJyXY2guAxku2O9A4=",
-        "rev": "3497aa5c9457a9d88d71fa93a4a8368816fbeeba",
+        "owner": "nixos",
-        "type": "tarball",
+        "repo": "nixpkgs",
-        "url": "https://releases.nixos.org/nixos/unstable/nixos-26.05pre924538.3497aa5c9457/nixexprs.tar.xz"
+        "rev": "b40629efe5d6ec48dd1efba650c797ddbd39ace0",
+        "type": "github"
       },
       "original": {
-        "type": "tarball",
+        "owner": "nixos",
-        "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz"
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
       }
     },
     "nixpkgs-master": {
       "locked": {
-        "lastModified": 1781229721,
+        "lastModified": 1774051532,
-        "narHash": "sha256-ORvqDbb/LYxiJljGIejapjkc/kJbVote2N1WSb9W45I=",
+        "narHash": "sha256-d3CGMweyYIcPuTj5BKq+1Lx4zwlgL31nVtN647tOZKo=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "173d0ad7a974f8543a9ab01d2271b2e290341b33",
+        "rev": "8620c0b5cc8fbe76502442181be1d0514bc3a1b7",
         "type": "github"
       },
       "original": {
@@ -106,28 +106,12 @@
         "type": "github"
       }
     },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1781074563,
-        "narHash": "sha256-md8WlXOlfnIeHeOScMTTHFyf2d6iaTwPl2apR5EQ3P4=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "9ae611a455b90cf061d8f332b977e387bda8e1ca",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "root": {
       "inputs": {
         "firefox-addons": "firefox-addons",
         "home-manager": "home-manager",
         "nixos-hardware": "nixos-hardware",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs",
         "nixpkgs-master": "nixpkgs-master",
         "nixpkgs-stable": "nixpkgs-stable",
         "sops-nix": "sops-nix",
@@ -141,11 +125,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1780547341,
+        "lastModified": 1773889674,
-        "narHash": "sha256-Gq8KNx5A7hBB3uGJaj6eQfLDIz5YdLu92gqBcvHvoUo=",
+        "narHash": "sha256-+ycaiVAk3MEshJTg35cBTUa0MizGiS+bgpYw/f8ohkg=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "9ed65852b6257fbeae4355bc24ecfea307ca759a",
+        "rev": "29b6519f3e0780452bca0ac0be4584f04ac16cc5",
         "type": "github"
       },
       "original": {

frontend/.gitignore

@@ -0,0 +1,24 @@
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+lerna-debug.log*
+
+node_modules
+dist
+dist-ssr
+*.local
+
+# Editor directories and files
+.vscode/*
+!.vscode/extensions.json
+.idea
+.DS_Store
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?

overlays/default.nix

@@ -25,7 +25,6 @@
         fastapi-cli
         httpx
         mypy
-        orjson
         polars
         psycopg
         pydantic
@@ -41,7 +40,6 @@
         sqlalchemy
         tenacity
         textual
-        tiktoken
         tinytuya
         typer
         websockets

pyproject.toml

@@ -26,7 +26,6 @@ dependencies = [
 [project.scripts]
 database = "python.database_cli:app"
 van-inventory = "python.van_inventory.main:serve"
-whisper-transcribe = "python.tools.whisper.transcribe:main"
 
 [dependency-groups]
 dev = [
@@ -51,7 +50,6 @@ lint.ignore = [
     "COM812", # (TEMP) conflicts when used with the formatter
     "ISC001", # (TEMP) conflicts when used with the formatter
     "S603",   # (PERM) This is known to cause a false positive
-    "S607",   # (PERM) This is becoming a consistent annoyance
 ]
 
 [tool.ruff.lint.per-file-ignores]
@@ -80,10 +78,15 @@ lint.ignore = [
 "python/congress_tracker/**" = [
     "TC003", # (perm) this creates issues because sqlalchemy uses these at runtime
 ]
-
+"python/eval_warnings/**" = [
+    "S607", # (perm) gh and git are expected on PATH in the runner environment
+]
 "python/alembic/**" = [
     "INP001", # (perm) this creates LSP issues for alembic
 ]
+"python/signal_bot/**" = [
+    "D107", # (perm) class docstrings cover __init__
+]
 
 [tool.ruff.lint.pydocstyle]
 convention = "google"

python/alembic/env.py

@@ -81,7 +81,6 @@ def include_name(
 
     """
     if type_ == "schema":
-        # allows a database with multiple schemas to have separate alembic revisions
         return name == target_metadata.schema
     return True
 

python/alembic/richie/versions/2026_03_29-removed_ds_table_from_richie_db_c8a794340928.py

@@ -1,187 +0,0 @@
-"""removed ds table from richie DB.
-
-Revision ID: c8a794340928
-Revises: 6b275323f435
-Create Date: 2026-03-29 15:29:23.643146
-
-"""
-
-from __future__ import annotations
-
-from typing import TYPE_CHECKING
-
-import sqlalchemy as sa
-from alembic import op
-from sqlalchemy.dialects import postgresql
-
-from python.orm import RichieBase
-
-if TYPE_CHECKING:
-    from collections.abc import Sequence
-
-# revision identifiers, used by Alembic.
-revision: str = "c8a794340928"
-down_revision: str | None = "6b275323f435"
-branch_labels: str | Sequence[str] | None = None
-depends_on: str | Sequence[str] | None = None
-
-schema = RichieBase.schema_name
-
-
-def upgrade() -> None:
-    """Upgrade."""
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.drop_table("vote_record", schema=schema)
-    op.drop_index(op.f("ix_vote_congress_chamber"), table_name="vote", schema=schema)
-    op.drop_index(op.f("ix_vote_date"), table_name="vote", schema=schema)
-    op.drop_index(op.f("ix_legislator_bioguide_id"), table_name="legislator", schema=schema)
-    op.drop_table("legislator", schema=schema)
-    op.drop_table("vote", schema=schema)
-    op.drop_index(op.f("ix_bill_congress"), table_name="bill", schema=schema)
-    op.drop_table("bill", schema=schema)
-    # ### end Alembic commands ###
-
-
-def downgrade() -> None:
-    """Downgrade."""
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.create_table(
-        "vote",
-        sa.Column("congress", sa.INTEGER(), autoincrement=False, nullable=False),
-        sa.Column("chamber", sa.VARCHAR(), autoincrement=False, nullable=False),
-        sa.Column("session", sa.INTEGER(), autoincrement=False, nullable=False),
-        sa.Column("number", sa.INTEGER(), autoincrement=False, nullable=False),
-        sa.Column("vote_type", sa.VARCHAR(), autoincrement=False, nullable=True),
-        sa.Column("question", sa.VARCHAR(), autoincrement=False, nullable=True),
-        sa.Column("result", sa.VARCHAR(), autoincrement=False, nullable=True),
-        sa.Column("result_text", sa.VARCHAR(), autoincrement=False, nullable=True),
-        sa.Column("vote_date", sa.DATE(), autoincrement=False, nullable=False),
-        sa.Column("yea_count", sa.INTEGER(), autoincrement=False, nullable=True),
-        sa.Column("nay_count", sa.INTEGER(), autoincrement=False, nullable=True),
-        sa.Column("not_voting_count", sa.INTEGER(), autoincrement=False, nullable=True),
-        sa.Column("present_count", sa.INTEGER(), autoincrement=False, nullable=True),
-        sa.Column("bill_id", sa.INTEGER(), autoincrement=False, nullable=True),
-        sa.Column("id", sa.INTEGER(), autoincrement=True, nullable=False),
-        sa.Column(
-            "created",
-            postgresql.TIMESTAMP(timezone=True),
-            server_default=sa.text("now()"),
-            autoincrement=False,
-            nullable=False,
-        ),
-        sa.Column(
-            "updated",
-            postgresql.TIMESTAMP(timezone=True),
-            server_default=sa.text("now()"),
-            autoincrement=False,
-            nullable=False,
-        ),
-        sa.ForeignKeyConstraint(["bill_id"], [f"{schema}.bill.id"], name=op.f("fk_vote_bill_id_bill")),
-        sa.PrimaryKeyConstraint("id", name=op.f("pk_vote")),
-        sa.UniqueConstraint(
-            "congress",
-            "chamber",
-            "session",
-            "number",
-            name=op.f("uq_vote_congress_chamber_session_number"),
-            postgresql_include=[],
-            postgresql_nulls_not_distinct=False,
-        ),
-        schema=schema,
-    )
-    op.create_index(op.f("ix_vote_date"), "vote", ["vote_date"], unique=False, schema=schema)
-    op.create_index(op.f("ix_vote_congress_chamber"), "vote", ["congress", "chamber"], unique=False, schema=schema)
-    op.create_table(
-        "vote_record",
-        sa.Column("vote_id", sa.INTEGER(), autoincrement=False, nullable=False),
-        sa.Column("legislator_id", sa.INTEGER(), autoincrement=False, nullable=False),
-        sa.Column("position", sa.VARCHAR(), autoincrement=False, nullable=False),
-        sa.ForeignKeyConstraint(
-            ["legislator_id"],
-            [f"{schema}.legislator.id"],
-            name=op.f("fk_vote_record_legislator_id_legislator"),
-            ondelete="CASCADE",
-        ),
-        sa.ForeignKeyConstraint(
-            ["vote_id"], [f"{schema}.vote.id"], name=op.f("fk_vote_record_vote_id_vote"), ondelete="CASCADE"
-        ),
-        sa.PrimaryKeyConstraint("vote_id", "legislator_id", name=op.f("pk_vote_record")),
-        schema=schema,
-    )
-    op.create_table(
-        "legislator",
-        sa.Column("bioguide_id", sa.TEXT(), autoincrement=False, nullable=False),
-        sa.Column("thomas_id", sa.VARCHAR(), autoincrement=False, nullable=True),
-        sa.Column("lis_id", sa.VARCHAR(), autoincrement=False, nullable=True),
-        sa.Column("govtrack_id", sa.INTEGER(), autoincrement=False, nullable=True),
-        sa.Column("opensecrets_id", sa.VARCHAR(), autoincrement=False, nullable=True),
-        sa.Column("fec_ids", sa.VARCHAR(), autoincrement=False, nullable=True),
-        sa.Column("first_name", sa.VARCHAR(), autoincrement=False, nullable=False),
-        sa.Column("last_name", sa.VARCHAR(), autoincrement=False, nullable=False),
-        sa.Column("official_full_name", sa.VARCHAR(), autoincrement=False, nullable=True),
-        sa.Column("nickname", sa.VARCHAR(), autoincrement=False, nullable=True),
-        sa.Column("birthday", sa.DATE(), autoincrement=False, nullable=True),
-        sa.Column("gender", sa.VARCHAR(), autoincrement=False, nullable=True),
-        sa.Column("current_party", sa.VARCHAR(), autoincrement=False, nullable=True),
-        sa.Column("current_state", sa.VARCHAR(), autoincrement=False, nullable=True),
-        sa.Column("current_district", sa.INTEGER(), autoincrement=False, nullable=True),
-        sa.Column("current_chamber", sa.VARCHAR(), autoincrement=False, nullable=True),
-        sa.Column("id", sa.INTEGER(), autoincrement=True, nullable=False),
-        sa.Column(
-            "created",
-            postgresql.TIMESTAMP(timezone=True),
-            server_default=sa.text("now()"),
-            autoincrement=False,
-            nullable=False,
-        ),
-        sa.Column(
-            "updated",
-            postgresql.TIMESTAMP(timezone=True),
-            server_default=sa.text("now()"),
-            autoincrement=False,
-            nullable=False,
-        ),
-        sa.PrimaryKeyConstraint("id", name=op.f("pk_legislator")),
-        schema=schema,
-    )
-    op.create_index(op.f("ix_legislator_bioguide_id"), "legislator", ["bioguide_id"], unique=True, schema=schema)
-    op.create_table(
-        "bill",
-        sa.Column("congress", sa.INTEGER(), autoincrement=False, nullable=False),
-        sa.Column("bill_type", sa.VARCHAR(), autoincrement=False, nullable=False),
-        sa.Column("number", sa.INTEGER(), autoincrement=False, nullable=False),
-        sa.Column("title", sa.VARCHAR(), autoincrement=False, nullable=True),
-        sa.Column("title_short", sa.VARCHAR(), autoincrement=False, nullable=True),
-        sa.Column("official_title", sa.VARCHAR(), autoincrement=False, nullable=True),
-        sa.Column("status", sa.VARCHAR(), autoincrement=False, nullable=True),
-        sa.Column("status_at", sa.DATE(), autoincrement=False, nullable=True),
-        sa.Column("sponsor_bioguide_id", sa.VARCHAR(), autoincrement=False, nullable=True),
-        sa.Column("subjects_top_term", sa.VARCHAR(), autoincrement=False, nullable=True),
-        sa.Column("id", sa.INTEGER(), autoincrement=True, nullable=False),
-        sa.Column(
-            "created",
-            postgresql.TIMESTAMP(timezone=True),
-            server_default=sa.text("now()"),
-            autoincrement=False,
-            nullable=False,
-        ),
-        sa.Column(
-            "updated",
-            postgresql.TIMESTAMP(timezone=True),
-            server_default=sa.text("now()"),
-            autoincrement=False,
-            nullable=False,
-        ),
-        sa.PrimaryKeyConstraint("id", name=op.f("pk_bill")),
-        sa.UniqueConstraint(
-            "congress",
-            "bill_type",
-            "number",
-            name=op.f("uq_bill_congress_type_number"),
-            postgresql_include=[],
-            postgresql_nulls_not_distinct=False,
-        ),
-        schema=schema,
-    )
-    op.create_index(op.f("ix_bill_congress"), "bill", ["congress"], unique=False, schema=schema)
-    # ### end Alembic commands ###

python/alembic/richie/versions/2026_06_03-adding_audiobook_libreary_metadata_d7864d1ffc17.py

@@ -1,93 +0,0 @@
-"""adding audiobook libreary metadata.
-
-Revision ID: d7864d1ffc17
-Revises: c8a794340928
-Create Date: 2026-06-03 20:24:09.200837
-
-"""
-
-from __future__ import annotations
-
-from typing import TYPE_CHECKING
-
-import sqlalchemy as sa
-from alembic import op
-
-from python.orm import RichieBase
-
-if TYPE_CHECKING:
-    from collections.abc import Sequence
-
-# revision identifiers, used by Alembic.
-revision: str = "d7864d1ffc17"
-down_revision: str | None = "c8a794340928"
-branch_labels: str | Sequence[str] | None = None
-depends_on: str | Sequence[str] | None = None
-
-schema = RichieBase.schema_name
-
-
-def upgrade() -> None:
-    """Upgrade."""
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.create_table(
-        "audiobook_author",
-        sa.Column("name", sa.String(), nullable=False),
-        sa.Column("id", sa.Integer(), nullable=False),
-        sa.Column("created", sa.DateTime(timezone=True), server_default=sa.text("now()"), nullable=False),
-        sa.Column("updated", sa.DateTime(timezone=True), server_default=sa.text("now()"), nullable=False),
-        sa.PrimaryKeyConstraint("id", name=op.f("pk_audiobook_author")),
-        sa.UniqueConstraint("name", name=op.f("uq_audiobook_author_name")),
-        schema=schema,
-    )
-    op.create_table(
-        "audiobook_series",
-        sa.Column("name", sa.String(), nullable=False),
-        sa.Column("author_id", sa.Integer(), nullable=False),
-        sa.Column("id", sa.Integer(), nullable=False),
-        sa.Column("created", sa.DateTime(timezone=True), server_default=sa.text("now()"), nullable=False),
-        sa.Column("updated", sa.DateTime(timezone=True), server_default=sa.text("now()"), nullable=False),
-        sa.ForeignKeyConstraint(
-            ["author_id"],
-            [f"{schema}.audiobook_author.id"],
-            name=op.f("fk_audiobook_series_author_id_audiobook_author"),
-            ondelete="CASCADE",
-        ),
-        sa.PrimaryKeyConstraint("id", name=op.f("pk_audiobook_series")),
-        sa.UniqueConstraint("author_id", "name", name=op.f("uq_audiobook_series_author_id")),
-        schema=schema,
-    )
-    op.create_table(
-        "audiobook",
-        sa.Column("title", sa.String(), nullable=False),
-        sa.Column("author_id", sa.Integer(), nullable=False),
-        sa.Column("series_id", sa.Integer(), nullable=True),
-        sa.Column("series_index", sa.Integer(), nullable=False),
-        sa.Column("id", sa.Integer(), nullable=False),
-        sa.Column("created", sa.DateTime(timezone=True), server_default=sa.text("now()"), nullable=False),
-        sa.Column("updated", sa.DateTime(timezone=True), server_default=sa.text("now()"), nullable=False),
-        sa.ForeignKeyConstraint(
-            ["author_id"],
-            [f"{schema}.audiobook_author.id"],
-            name=op.f("fk_audiobook_author_id_audiobook_author"),
-            ondelete="CASCADE",
-        ),
-        sa.ForeignKeyConstraint(
-            ["series_id"],
-            [f"{schema}.audiobook_series.id"],
-            name=op.f("fk_audiobook_series_id_audiobook_series"),
-            ondelete="SET NULL",
-        ),
-        sa.PrimaryKeyConstraint("id", name=op.f("pk_audiobook")),
-        schema=schema,
-    )
-    # ### end Alembic commands ###
-
-
-def downgrade() -> None:
-    """Downgrade."""
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.drop_table("audiobook", schema=schema)
-    op.drop_table("audiobook_series", schema=schema)
-    op.drop_table("audiobook_author", schema=schema)
-    # ### end Alembic commands ###

python/alembic/richie/versions/2026_06_10-updated_series_index_to_float_and_added__b3c60cc5beb5.py

@@ -1,63 +0,0 @@
-"""updated series_index to float and added UniqueConstraint to audiobook and audiobook_author.
-
-Revision ID: b3c60cc5beb5
-Revises: d7864d1ffc17
-Create Date: 2026-06-10 20:02:43.073725
-
-"""
-
-from __future__ import annotations
-
-from typing import TYPE_CHECKING
-
-import sqlalchemy as sa
-from alembic import op
-
-from python.orm import RichieBase
-
-if TYPE_CHECKING:
-    from collections.abc import Sequence
-
-# revision identifiers, used by Alembic.
-revision: str = "b3c60cc5beb5"
-down_revision: str | None = "d7864d1ffc17"
-branch_labels: str | Sequence[str] | None = None
-depends_on: str | Sequence[str] | None = None
-
-schema = RichieBase.schema_name
-
-
-def upgrade() -> None:
-    """Upgrade."""
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.alter_column(
-        "audiobook",
-        "series_index",
-        existing_type=sa.INTEGER(),
-        type_=sa.Float(),
-        existing_nullable=False,
-        schema=schema,
-    )
-    op.create_unique_constraint(
-        op.f("uq_audiobook_author_id"),
-        "audiobook",
-        ["author_id", "series_id", "title"],
-        schema=schema,
-        postgresql_nulls_not_distinct=True,
-    )
-    # ### end Alembic commands ###
-
-
-def downgrade() -> None:
-    """Downgrade."""
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.drop_constraint(op.f("uq_audiobook_author_id"), "audiobook", schema=schema, type_="unique")
-    op.alter_column(
-        "audiobook",
-        "series_index",
-        existing_type=sa.Float(),
-        type_=sa.INTEGER(),
-        existing_nullable=False,
-        schema=schema,
-    )
-    # ### end Alembic commands ###

python/alembic/signal_bot/versions/2026_03_17-seprating_signal_bot_database_6eaf696e07a5.py

@@ -0,0 +1,100 @@
+"""seprating signal_bot database.
+
+Revision ID: 6eaf696e07a5
+Revises:
+Create Date: 2026-03-17 21:35:37.612672
+
+"""
+
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+import sqlalchemy as sa
+from alembic import op
+from sqlalchemy.dialects import postgresql
+
+from python.orm import SignalBotBase
+
+if TYPE_CHECKING:
+    from collections.abc import Sequence
+
+# revision identifiers, used by Alembic.
+revision: str = "6eaf696e07a5"
+down_revision: str | None = None
+branch_labels: str | Sequence[str] | None = None
+depends_on: str | Sequence[str] | None = None
+
+schema = SignalBotBase.schema_name
+
+
+def upgrade() -> None:
+    """Upgrade."""
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table(
+        "dead_letter_message",
+        sa.Column("source", sa.String(), nullable=False),
+        sa.Column("message", sa.Text(), nullable=False),
+        sa.Column("received_at", sa.DateTime(timezone=True), nullable=False),
+        sa.Column(
+            "status", postgresql.ENUM("UNPROCESSED", "PROCESSED", name="message_status", schema=schema), nullable=False
+        ),
+        sa.Column("id", sa.Integer(), nullable=False),
+        sa.Column("created", sa.DateTime(timezone=True), server_default=sa.text("now()"), nullable=False),
+        sa.Column("updated", sa.DateTime(timezone=True), server_default=sa.text("now()"), nullable=False),
+        sa.PrimaryKeyConstraint("id", name=op.f("pk_dead_letter_message")),
+        schema=schema,
+    )
+    op.create_table(
+        "role",
+        sa.Column("name", sa.String(length=50), nullable=False),
+        sa.Column("id", sa.SmallInteger(), nullable=False),
+        sa.Column("created", sa.DateTime(timezone=True), server_default=sa.text("now()"), nullable=False),
+        sa.Column("updated", sa.DateTime(timezone=True), server_default=sa.text("now()"), nullable=False),
+        sa.PrimaryKeyConstraint("id", name=op.f("pk_role")),
+        sa.UniqueConstraint("name", name=op.f("uq_role_name")),
+        schema=schema,
+    )
+    op.create_table(
+        "signal_device",
+        sa.Column("phone_number", sa.String(length=50), nullable=False),
+        sa.Column("safety_number", sa.String(), nullable=True),
+        sa.Column(
+            "trust_level",
+            postgresql.ENUM("VERIFIED", "UNVERIFIED", "BLOCKED", name="trust_level", schema=schema),
+            nullable=False,
+        ),
+        sa.Column("last_seen", sa.DateTime(timezone=True), nullable=False),
+        sa.Column("id", sa.Integer(), nullable=False),
+        sa.Column("created", sa.DateTime(timezone=True), server_default=sa.text("now()"), nullable=False),
+        sa.Column("updated", sa.DateTime(timezone=True), server_default=sa.text("now()"), nullable=False),
+        sa.PrimaryKeyConstraint("id", name=op.f("pk_signal_device")),
+        sa.UniqueConstraint("phone_number", name=op.f("uq_signal_device_phone_number")),
+        schema=schema,
+    )
+    op.create_table(
+        "device_role",
+        sa.Column("device_id", sa.Integer(), nullable=False),
+        sa.Column("role_id", sa.SmallInteger(), nullable=False),
+        sa.Column("id", sa.Integer(), nullable=False),
+        sa.Column("created", sa.DateTime(timezone=True), server_default=sa.text("now()"), nullable=False),
+        sa.Column("updated", sa.DateTime(timezone=True), server_default=sa.text("now()"), nullable=False),
+        sa.ForeignKeyConstraint(
+            ["device_id"], [f"{schema}.signal_device.id"], name=op.f("fk_device_role_device_id_signal_device")
+        ),
+        sa.ForeignKeyConstraint(["role_id"], [f"{schema}.role.id"], name=op.f("fk_device_role_role_id_role")),
+        sa.PrimaryKeyConstraint("id", name=op.f("pk_device_role")),
+        sa.UniqueConstraint("device_id", "role_id", name="uq_device_role_device_role"),
+        schema=schema,
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    """Downgrade."""
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_table("device_role", schema=schema)
+    op.drop_table("signal_device", schema=schema)
+    op.drop_table("role", schema=schema)
+    op.drop_table("dead_letter_message", schema=schema)
+    # ### end Alembic commands ###

python/alembic/signal_bot/versions/2026_03_18-test_66bdd532bcab.py

@@ -0,0 +1,72 @@
+"""test.
+
+Revision ID: 66bdd532bcab
+Revises: 6eaf696e07a5
+Create Date: 2026-03-18 19:21:14.561568
+
+"""
+
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+import sqlalchemy as sa
+from alembic import op
+from sqlalchemy.dialects import postgresql
+
+from python.orm import SignalBotBase
+
+if TYPE_CHECKING:
+    from collections.abc import Sequence
+
+# revision identifiers, used by Alembic.
+revision: str = "66bdd532bcab"
+down_revision: str | None = "6eaf696e07a5"
+branch_labels: str | Sequence[str] | None = None
+depends_on: str | Sequence[str] | None = None
+
+schema = SignalBotBase.schema_name
+
+
+def upgrade() -> None:
+    """Upgrade."""
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.alter_column(
+        "dead_letter_message",
+        "status",
+        existing_type=postgresql.ENUM("UNPROCESSED", "PROCESSED", name="message_status", schema=schema),
+        type_=sa.Enum("UNPROCESSED", "PROCESSED", name="message_status", native_enum=False),
+        existing_nullable=False,
+        schema=schema,
+    )
+    op.alter_column(
+        "signal_device",
+        "trust_level",
+        existing_type=postgresql.ENUM("VERIFIED", "UNVERIFIED", "BLOCKED", name="trust_level", schema=schema),
+        type_=sa.Enum("VERIFIED", "UNVERIFIED", "BLOCKED", name="trust_level", native_enum=False),
+        existing_nullable=False,
+        schema=schema,
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    """Downgrade."""
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.alter_column(
+        "signal_device",
+        "trust_level",
+        existing_type=sa.Enum("VERIFIED", "UNVERIFIED", "BLOCKED", name="trust_level", native_enum=False),
+        type_=postgresql.ENUM("VERIFIED", "UNVERIFIED", "BLOCKED", name="trust_level", schema=schema),
+        existing_nullable=False,
+        schema=schema,
+    )
+    op.alter_column(
+        "dead_letter_message",
+        "status",
+        existing_type=sa.Enum("UNPROCESSED", "PROCESSED", name="message_status", native_enum=False),
+        type_=postgresql.ENUM("UNPROCESSED", "PROCESSED", name="message_status", schema=schema),
+        existing_nullable=False,
+        schema=schema,
+    )
+    # ### end Alembic commands ###

python/database_cli.py

@@ -83,6 +83,13 @@ DATABASES: dict[str, DatabaseConfig] = {
         base_class_name="VanInventoryBase",
         models_module="python.orm.van_inventory.models",
     ),
+    "signal_bot": DatabaseConfig(
+        env_prefix="SIGNALBOT",
+        version_location="python/alembic/signal_bot/versions",
+        base_module="python.orm.signal_bot.base",
+        base_class_name="SignalBotBase",
+        models_module="python.orm.signal_bot.models",
+    ),
 }
 
 

python/gitea.py

@@ -1,347 +0,0 @@
-"""Small Gitea API client for repository automation."""
-
-from __future__ import annotations
-
-from dataclasses import dataclass
-from typing import Self
-from urllib.parse import quote
-
-import httpx
-
-DEFAULT_PAGE_SIZE = 100
-EXPECTED_NO_CONTENT = 204
-EXPECTED_CREATED = 201
-EXPECTED_OK = 200
-
-
-@dataclass(frozen=True)
-class CreatedIssue:
-    """Issue data returned by Gitea."""
-
-    number: int | None
-    html_url: str | None
-    title: str
-
-
-@dataclass(frozen=True)
-class PullRequest:
-    """Pull request data returned by Gitea."""
-
-    number: int
-    title: str
-    html_url: str | None
-    labels: tuple[str, ...]
-    head_branch: str | None
-    base_branch: str | None
-
-
-@dataclass(frozen=True)
-class WorkflowJob:
-    """Workflow job data returned by Gitea Actions."""
-
-    id: int
-    name: str
-    run_id: int | None
-    status: str | None
-    conclusion: str | None
-
-
-class GiteaError(RuntimeError):
-    """Raised when Gitea rejects an API request."""
-
-
-def split_repo_name(repo: str) -> tuple[str, str]:
-    """Split an owner/repo string into its parts."""
-    owner, separator, repo_name = repo.partition("/")
-    if not separator or not owner or not repo_name:
-        msg = f"Invalid repository name: {repo}"
-        raise ValueError(msg)
-    return owner, repo_name
-
-
-class GiteaClient:
-    """HTTP client for the subset of Gitea APIs used in this repository."""
-
-    def __init__(
-        self,
-        *,
-        base_url: str,
-        token: str,
-        timeout: int = 30,
-        transport: httpx.BaseTransport | None = None,
-    ) -> None:
-        """Initialize the Gitea client."""
-        self._client = httpx.Client(
-            base_url=base_url.rstrip("/"),
-            timeout=timeout,
-            headers={"Authorization": f"token {token}"},
-            transport=transport,
-        )
-
-    def create_issue(
-        self,
-        *,
-        owner: str,
-        repo: str,
-        title: str,
-        body: str,
-        labels: list[int] | None = None,
-    ) -> CreatedIssue:
-        """Create a Gitea issue."""
-        payload: dict[str, object] = {"title": title, "body": body, "labels": labels or []}
-        response = self._request(
-            "POST",
-            f"/api/v1/repos/{owner}/{repo}/issues",
-            expected_statuses={EXPECTED_CREATED},
-            json=payload,
-        )
-        data = response.json()
-        return CreatedIssue(
-            number=_optional_int(data.get("number")),
-            html_url=_optional_str(data.get("html_url")),
-            title=str(data.get("title", title)),
-        )
-
-    def resolve_label_ids(self, *, owner: str, repo: str, labels: list[str]) -> list[int]:
-        """Resolve label names to Gitea label IDs."""
-        if not labels:
-            return []
-
-        available_labels: dict[str, int] = {}
-        page = 1
-        while True:
-            response = self._request(
-                "GET",
-                f"/api/v1/repos/{owner}/{repo}/labels",
-                params={"page": page, "limit": DEFAULT_PAGE_SIZE},
-            )
-            batch = response.json()
-            if not batch:
-                break
-            for label in batch:
-                label_name = str(label.get("name", ""))
-                label_id = _optional_int(label.get("id"))
-                if label_name and label_id is not None:
-                    available_labels[label_name] = label_id
-            if len(batch) < DEFAULT_PAGE_SIZE:
-                break
-            page += 1
-
-        missing = [label for label in labels if label not in available_labels]
-        if missing:
-            missing_names = ", ".join(sorted(missing))
-            msg = f"Missing Gitea labels: {missing_names}"
-            raise GiteaError(msg)
-
-        return [available_labels[label] for label in labels]
-
-    def list_open_pull_requests(
-        self,
-        *,
-        owner: str,
-        repo: str,
-        labels: list[str] | None = None,
-        head: str | None = None,
-    ) -> list[PullRequest]:
-        """List open pull requests for a repository."""
-        expected_labels = set(labels or [])
-        pull_requests: list[PullRequest] = []
-        page = 1
-        while True:
-            response = self._request(
-                "GET",
-                f"/api/v1/repos/{owner}/{repo}/pulls",
-                params={"state": "open", "page": page, "limit": DEFAULT_PAGE_SIZE},
-            )
-            batch = response.json()
-            if not batch:
-                break
-
-            for item in batch:
-                pull_request = _pull_request_from_api(item)
-                if head and pull_request.head_branch != head:
-                    continue
-                if expected_labels and not expected_labels.issubset(set(pull_request.labels)):
-                    continue
-                pull_requests.append(pull_request)
-
-            if len(batch) < DEFAULT_PAGE_SIZE:
-                break
-            page += 1
-
-        return pull_requests
-
-    def create_pull_request(
-        self,
-        *,
-        owner: str,
-        repo: str,
-        title: str,
-        body: str,
-        head: str,
-        base: str,
-        labels: list[str] | None = None,
-    ) -> PullRequest:
-        """Create a pull request."""
-        payload: dict[str, object] = {
-            "title": title,
-            "body": body,
-            "head": head,
-            "base": base,
-        }
-        if labels:
-            payload["labels"] = self.resolve_label_ids(owner=owner, repo=repo, labels=labels)
-
-        response = self._request(
-            "POST",
-            f"/api/v1/repos/{owner}/{repo}/pulls",
-            expected_statuses={EXPECTED_CREATED},
-            json=payload,
-        )
-        return _pull_request_from_api(response.json())
-
-    def merge_pull_request(
-        self,
-        *,
-        owner: str,
-        repo: str,
-        number: int,
-        merge_method: str = "rebase",
-        head_commit_id: str | None = None,
-        delete_branch_after_merge: bool = False,
-    ) -> None:
-        """Merge a pull request."""
-        payload: dict[str, object] = {
-            "Do": merge_method,
-            "delete_branch_after_merge": delete_branch_after_merge,
-        }
-        if head_commit_id:
-            payload["head_commit_id"] = head_commit_id
-
-        self._request(
-            "POST",
-            f"/api/v1/repos/{owner}/{repo}/pulls/{number}/merge",
-            json=payload,
-        )
-
-    def dispatch_workflow(self, *, owner: str, repo: str, workflow_id: str, ref: str) -> None:
-        """Trigger a workflow_dispatch run."""
-        workflow_path = quote(workflow_id, safe="")
-        self._request(
-            "POST",
-            f"/api/v1/repos/{owner}/{repo}/actions/workflows/{workflow_path}/dispatches",
-            expected_statuses={EXPECTED_OK, EXPECTED_NO_CONTENT},
-            json={"ref": ref},
-        )
-
-    def list_run_jobs(self, *, owner: str, repo: str, run_id: str | int) -> list[WorkflowJob]:
-        """List workflow jobs for a specific run."""
-        jobs: list[WorkflowJob] = []
-        page = 1
-        while True:
-            response = self._request(
-                "GET",
-                f"/api/v1/repos/{owner}/{repo}/actions/jobs",
-                params={"page": page, "limit": DEFAULT_PAGE_SIZE},
-            )
-            payload = response.json()
-            batch = payload.get("jobs", [])
-            if not batch:
-                break
-
-            for item in batch:
-                if str(item.get("run_id")) != str(run_id):
-                    continue
-                jobs.append(_workflow_job_from_api(item))
-
-            if len(batch) < DEFAULT_PAGE_SIZE:
-                break
-            page += 1
-
-        return jobs
-
-    def download_job_logs(self, *, owner: str, repo: str, job_id: int) -> str:
-        """Download logs for a workflow job."""
-        response = self._request(
-            "GET",
-            f"/api/v1/repos/{owner}/{repo}/actions/jobs/{job_id}/logs",
-        )
-        return response.text
-
-    def close(self) -> None:
-        """Close the underlying HTTP client."""
-        self._client.close()
-
-    def __enter__(self) -> Self:
-        """Enter the context manager."""
-        return self
-
-    def __exit__(self, *args: object) -> None:
-        """Close the HTTP client."""
-        self.close()
-
-    def _request(
-        self,
-        method: str,
-        path: str,
-        *,
-        expected_statuses: set[int] | None = None,
-        **kwargs: object,
-    ) -> httpx.Response:
-        """Send an HTTP request and validate the response status."""
-        response = self._client.request(method, path, **kwargs)
-        statuses = expected_statuses or {EXPECTED_OK}
-        if response.status_code not in statuses:
-            msg = f"Gitea request failed ({response.status_code}): {response.text}"
-            raise GiteaError(msg)
-        return response
-
-
-def _pull_request_from_api(data: dict[str, object]) -> PullRequest:
-    """Convert Gitea API pull-request data into a dataclass."""
-    number = _optional_int(data.get("number")) or _optional_int(data.get("index"))
-    if number is None:
-        msg = "Gitea pull request payload is missing a number"
-        raise GiteaError(msg)
-
-    labels = tuple(str(label.get("name", "")) for label in data.get("labels", []))
-    head = data.get("head", {})
-    base = data.get("base", {})
-    return PullRequest(
-        number=number,
-        title=str(data.get("title", "")),
-        html_url=_optional_str(data.get("html_url")),
-        labels=tuple(label for label in labels if label),
-        head_branch=_optional_str(head.get("ref")) or _optional_str(data.get("head_branch")),
-        base_branch=_optional_str(base.get("ref")) or _optional_str(data.get("base_branch")),
-    )
-
-
-def _workflow_job_from_api(data: dict[str, object]) -> WorkflowJob:
-    """Convert Gitea API workflow-job data into a dataclass."""
-    job_id = _optional_int(data.get("id"))
-    if job_id is None:
-        msg = "Gitea workflow job payload is missing an ID"
-        raise GiteaError(msg)
-
-    return WorkflowJob(
-        id=job_id,
-        name=str(data.get("name", "")),
-        run_id=_optional_int(data.get("run_id")),
-        status=_optional_str(data.get("status")),
-        conclusion=_optional_str(data.get("conclusion")),
-    )
-
-
-def _optional_int(value: object) -> int | None:
-    """Convert an API value to an integer when present."""
-    if value is None:
-        return None
-    return int(value)
-
-
-def _optional_str(value: object) -> str | None:
-    """Convert an API value to a string when present."""
-    if value is None:
-        return None
-    return str(value)

python/gitea_flake_lock.py

@@ -1,148 +0,0 @@
-"""Automation helpers for flake.lock pull requests on Gitea."""
-
-from __future__ import annotations
-
-import subprocess
-from os import getenv
-from typing import Annotated
-
-import typer
-
-from python.gitea import GiteaClient, PullRequest, split_repo_name
-
-DEFAULT_BASE_BRANCH = "main"
-DEFAULT_BRANCH = "automation/update-flake-lock"
-DEFAULT_GITEA_URL = "https://gitea.tmmworkshop.com"
-PR_LABELS = ["dependencies", "automated", "flake_lock_update"]
-PR_CHECK_WORKFLOWS = ["build_systems.yml", "treefmt.yml", "pytest.yml"]
-PR_TITLE = "Update flake.lock"
-PR_BODY = "Automated flake.lock update."
-
-app = typer.Typer(add_completion=False)
-
-
-def run_cmd(cmd: list[str], *, check: bool = True) -> subprocess.CompletedProcess[str]:
-    """Run a subprocess command."""
-    return subprocess.run(cmd, capture_output=True, text=True, check=check)
-
-
-def ensure_flake_lock_pull_request(
-    client: GiteaClient,
-    *,
-    owner: str,
-    repo: str,
-    branch: str,
-    base: str,
-) -> PullRequest:
-    """Return an existing flake.lock PR for the branch or create one."""
-    pull_requests = client.list_open_pull_requests(owner=owner, repo=repo, head=branch)
-    if pull_requests:
-        return pull_requests[0]
-
-    return client.create_pull_request(
-        owner=owner,
-        repo=repo,
-        title=PR_TITLE,
-        body=PR_BODY,
-        head=branch,
-        base=base,
-        labels=PR_LABELS,
-    )
-
-
-def find_flake_lock_pull_request(client: GiteaClient, *, owner: str, repo: str) -> PullRequest | None:
-    """Find the first open flake.lock pull request."""
-    pull_requests = client.list_open_pull_requests(owner=owner, repo=repo, labels=["flake_lock_update"])
-    if not pull_requests:
-        return None
-    return pull_requests[0]
-
-
-def dispatch_pull_request_checks(client: GiteaClient, *, owner: str, repo: str, branch: str) -> None:
-    """Dispatch the workflows that normally run for pull requests."""
-    for workflow in PR_CHECK_WORKFLOWS:
-        client.dispatch_workflow(owner=owner, repo=repo, workflow_id=workflow, ref=branch)
-
-
-def has_worktree_changes() -> bool:
-    """Return whether `flake.lock` has worktree changes."""
-    result = run_cmd(["git", "diff", "--quiet", "--", "flake.lock"], check=False)
-    return result.returncode != 0
-
-
-def commit_flake_lock_update(*, branch: str) -> None:
-    """Commit the updated lock file to the automation branch."""
-    run_cmd(["git", "config", "user.name", "gitea-actions[bot]"])
-    run_cmd(["git", "config", "user.email", "gitea-actions@tmmworkshop.com"])
-    run_cmd(["git", "checkout", "-B", branch])
-    run_cmd(["git", "add", "flake.lock"])
-    run_cmd(["git", "commit", "-m", "chore: update flake.lock"])
-
-
-def push_branch(*, branch: str) -> None:
-    """Push the automation branch to origin."""
-    run_cmd(["git", "push", "origin", f"HEAD:{branch}", "--force"])
-
-
-def _required_gitea_token() -> str:
-    """Read the required Gitea token from the environment."""
-    token = getenv("GITEA_TOKEN")
-    if token:
-        return token
-
-    msg = "GITEA_TOKEN environment variable is required"
-    raise RuntimeError(msg)
-
-
-@app.command()
-def update(
-    repo: Annotated[str, typer.Option("--repo", help="Gitea repository in owner/repo form")],
-    base: Annotated[str, typer.Option("--base", help="Base branch")] = DEFAULT_BASE_BRANCH,
-    branch: Annotated[str, typer.Option("--branch", help="Automation branch")] = DEFAULT_BRANCH,
-) -> None:
-    """Commit flake.lock changes and ensure a pull request exists."""
-    if not has_worktree_changes():
-        typer.echo("No flake.lock changes detected")
-        return
-
-    commit_flake_lock_update(branch=branch)
-    push_branch(branch=branch)
-
-    owner, repo_name = split_repo_name(repo)
-    with GiteaClient(
-        base_url=getenv("GITEA_URL", DEFAULT_GITEA_URL),
-        token=_required_gitea_token(),
-    ) as client:
-        pull_request = ensure_flake_lock_pull_request(
-            client,
-            owner=owner,
-            repo=repo_name,
-            branch=branch,
-            base=base,
-        )
-        # We can remove this if Gitea fixes the following issue:
-        # https://github.com/go-gitea/gitea/issues/33963
-        dispatch_pull_request_checks(client, owner=owner, repo=repo_name, branch=branch)
-    typer.echo(pull_request.html_url or f"Pull request #{pull_request.number}")
-
-
-@app.command()
-def merge(
-    repo: Annotated[str, typer.Option("--repo", help="Gitea repository in owner/repo form")],
-) -> None:
-    """Merge the first open flake.lock pull request."""
-    owner, repo_name = split_repo_name(repo)
-    with GiteaClient(
-        base_url=getenv("GITEA_URL", DEFAULT_GITEA_URL),
-        token=_required_gitea_token(),
-    ) as client:
-        pull_request = find_flake_lock_pull_request(client, owner=owner, repo=repo_name)
-        if not pull_request:
-            typer.echo("No open PR found with label flake_lock_update")
-            return
-        client.merge_pull_request(owner=owner, repo=repo_name, number=pull_request.number, merge_method="rebase")
-    typer.echo(f"Merged PR #{pull_request.number}")
-
-
-if __name__ == "__main__":
-    app()

python/orm/__init__.py

@@ -1,9 +1,11 @@
 """ORM package exports."""
 
 from python.orm.richie.base import RichieBase
+from python.orm.signal_bot.base import SignalBotBase
 from python.orm.van_inventory.base import VanInventoryBase
 
 __all__ = [
     "RichieBase",
+    "SignalBotBase",
     "VanInventoryBase",
 ]

python/orm/richie/__init__.py

@@ -2,8 +2,8 @@
 
 from __future__ import annotations
 
-from python.orm.richie.audiobook import Audiobook, AudiobookAuthor, AudiobookSeries
 from python.orm.richie.base import RichieBase, TableBase, TableBaseBig, TableBaseSmall
+from python.orm.richie.congress import Bill, Legislator, Vote, VoteRecord
 from python.orm.richie.contact import (
     Contact,
     ContactNeed,
@@ -13,16 +13,17 @@ from python.orm.richie.contact import (
 )
 
 __all__ = [
-    "Audiobook",
+    "Bill",
-    "AudiobookAuthor",
-    "AudiobookSeries",
     "Contact",
     "ContactNeed",
     "ContactRelationship",
+    "Legislator",
     "Need",
     "RelationshipType",
     "RichieBase",
     "TableBase",
     "TableBaseBig",
     "TableBaseSmall",
+    "Vote",
+    "VoteRecord",
 ]

python/orm/richie/audiobook.py

@@ -1,55 +0,0 @@
-"""Audiobook catalog models."""
-
-from __future__ import annotations
-
-from sqlalchemy import ForeignKey, String, UniqueConstraint
-from sqlalchemy.orm import Mapped, mapped_column, relationship
-
-from python.orm.richie.base import TableBase
-
-
-class AudiobookAuthor(TableBase):
-    """Canonical audiobook author."""
-
-    __tablename__ = "audiobook_author"
-    __table_args__ = (UniqueConstraint("name"),)
-
-    name: Mapped[str] = mapped_column(String, unique=True)
-
-    books: Mapped[list[Audiobook]] = relationship("Audiobook", back_populates="author")
-    series: Mapped[list[AudiobookSeries]] = relationship("AudiobookSeries", back_populates="author")
-
-
-class AudiobookSeries(TableBase):
-    """Canonical audiobook series."""
-
-    __tablename__ = "audiobook_series"
-    __table_args__ = (UniqueConstraint("author_id", "name"),)
-
-    name: Mapped[str] = mapped_column(String)
-    author_id: Mapped[int] = mapped_column(ForeignKey("main.audiobook_author.id", ondelete="CASCADE"))
-
-    author: Mapped[AudiobookAuthor] = relationship("AudiobookAuthor", back_populates="series")
-    books: Mapped[list[Audiobook]] = relationship("Audiobook", back_populates="series")
-
-
-class Audiobook(TableBase):
-    """Canonical audiobook title."""
-
-    __tablename__ = "audiobook"
-    __table_args__ = (
-        UniqueConstraint(
-            "author_id",
-            "series_id",
-            "title",
-            postgresql_nulls_not_distinct=True,
-        ),
-    )
-
-    title: Mapped[str] = mapped_column(String)
-    author_id: Mapped[int] = mapped_column(ForeignKey("main.audiobook_author.id", ondelete="CASCADE"))
-    series_id: Mapped[int | None] = mapped_column(ForeignKey("main.audiobook_series.id", ondelete="SET NULL"))
-    series_index: Mapped[float] = mapped_column(default=0.0)
-
-    author: Mapped[AudiobookAuthor] = relationship("AudiobookAuthor", back_populates="books")
-    series: Mapped[AudiobookSeries | None] = relationship("AudiobookSeries", back_populates="books")

python/orm/richie/congress.py

@@ -0,0 +1,150 @@
+"""Congress Tracker database models."""
+
+from __future__ import annotations
+
+from datetime import date
+
+from sqlalchemy import ForeignKey, Index, Text, UniqueConstraint
+from sqlalchemy.orm import Mapped, mapped_column, relationship
+
+from python.orm.richie.base import RichieBase, TableBase
+
+
+class Legislator(TableBase):
+    """Legislator model - members of Congress."""
+
+    __tablename__ = "legislator"
+
+    # Natural key - bioguide ID is the authoritative identifier
+    bioguide_id: Mapped[str] = mapped_column(Text, unique=True, index=True)
+
+    # Other IDs for cross-referencing
+    thomas_id: Mapped[str | None]
+    lis_id: Mapped[str | None]
+    govtrack_id: Mapped[int | None]
+    opensecrets_id: Mapped[str | None]
+    fec_ids: Mapped[str | None]  # JSON array stored as string
+
+    # Name info
+    first_name: Mapped[str]
+    last_name: Mapped[str]
+    official_full_name: Mapped[str | None]
+    nickname: Mapped[str | None]
+
+    # Bio
+    birthday: Mapped[date | None]
+    gender: Mapped[str | None]  # M/F
+
+    # Current term info (denormalized for query efficiency)
+    current_party: Mapped[str | None]
+    current_state: Mapped[str | None]
+    current_district: Mapped[int | None]  # House only
+    current_chamber: Mapped[str | None]  # rep/sen
+
+    # Relationships
+    vote_records: Mapped[list[VoteRecord]] = relationship(
+        "VoteRecord",
+        back_populates="legislator",
+        cascade="all, delete-orphan",
+    )
+
+
+class Bill(TableBase):
+    """Bill model - legislation introduced in Congress."""
+
+    __tablename__ = "bill"
+
+    # Composite natural key: congress + bill_type + number
+    congress: Mapped[int]
+    bill_type: Mapped[str]  # hr, s, hres, sres, hjres, sjres
+    number: Mapped[int]
+
+    # Bill info
+    title: Mapped[str | None]
+    title_short: Mapped[str | None]
+    official_title: Mapped[str | None]
+
+    # Status
+    status: Mapped[str | None]
+    status_at: Mapped[date | None]
+
+    # Sponsor
+    sponsor_bioguide_id: Mapped[str | None]
+
+    # Subjects
+    subjects_top_term: Mapped[str | None]
+
+    # Relationships
+    votes: Mapped[list[Vote]] = relationship(
+        "Vote",
+        back_populates="bill",
+    )
+
+    __table_args__ = (
+        UniqueConstraint("congress", "bill_type", "number", name="uq_bill_congress_type_number"),
+        Index("ix_bill_congress", "congress"),
+    )
+
+
+class Vote(TableBase):
+    """Vote model - roll call votes in Congress."""
+
+    __tablename__ = "vote"
+
+    # Composite natural key: congress + chamber + session + number
+    congress: Mapped[int]
+    chamber: Mapped[str]  # house/senate
+    session: Mapped[int]
+    number: Mapped[int]
+
+    # Vote details
+    vote_type: Mapped[str | None]
+    question: Mapped[str | None]
+    result: Mapped[str | None]
+    result_text: Mapped[str | None]
+
+    # Timing
+    vote_date: Mapped[date]
+
+    # Vote counts (denormalized for efficiency)
+    yea_count: Mapped[int | None]
+    nay_count: Mapped[int | None]
+    not_voting_count: Mapped[int | None]
+    present_count: Mapped[int | None]
+
+    # Related bill (optional - not all votes are on bills)
+    bill_id: Mapped[int | None] = mapped_column(ForeignKey("main.bill.id"))
+
+    # Relationships
+    bill: Mapped[Bill | None] = relationship("Bill", back_populates="votes")
+    vote_records: Mapped[list[VoteRecord]] = relationship(
+        "VoteRecord",
+        back_populates="vote",
+        cascade="all, delete-orphan",
+    )
+
+    __table_args__ = (
+        UniqueConstraint("congress", "chamber", "session", "number", name="uq_vote_congress_chamber_session_number"),
+        Index("ix_vote_date", "vote_date"),
+        Index("ix_vote_congress_chamber", "congress", "chamber"),
+    )
+
+
+class VoteRecord(RichieBase):
+    """Association table: Vote <-> Legislator with position."""
+
+    __tablename__ = "vote_record"
+
+    vote_id: Mapped[int] = mapped_column(
+        ForeignKey("main.vote.id", ondelete="CASCADE"),
+        primary_key=True,
+    )
+    legislator_id: Mapped[int] = mapped_column(
+        ForeignKey("main.legislator.id", ondelete="CASCADE"),
+        primary_key=True,
+    )
+    position: Mapped[str]  # Yea, Nay, Not Voting, Present
+
+    # Relationships
+    vote: Mapped[Vote] = relationship("Vote", back_populates="vote_records")
+    legislator: Mapped[Legislator] = relationship("Legislator", back_populates="vote_records")

python/orm/signal_bot/__init__.py

@@ -0,0 +1,16 @@
+"""Signal bot database ORM exports."""
+
+from __future__ import annotations
+
+from python.orm.signal_bot.base import SignalBotBase, SignalBotTableBase, SignalBotTableBaseSmall
+from python.orm.signal_bot.models import DeadLetterMessage, DeviceRole, RoleRecord, SignalDevice
+
+__all__ = [
+    "DeadLetterMessage",
+    "DeviceRole",
+    "RoleRecord",
+    "SignalBotBase",
+    "SignalBotTableBase",
+    "SignalBotTableBaseSmall",
+    "SignalDevice",
+]

python/orm/signal_bot/base.py

@@ -0,0 +1,52 @@
+"""Signal bot database ORM base."""
+
+from __future__ import annotations
+
+from datetime import datetime
+
+from sqlalchemy import DateTime, MetaData, SmallInteger, func
+from sqlalchemy.ext.declarative import AbstractConcreteBase
+from sqlalchemy.orm import DeclarativeBase, Mapped, mapped_column
+
+from python.orm.common import NAMING_CONVENTION
+
+
+class SignalBotBase(DeclarativeBase):
+    """Base class for signal_bot database ORM models."""
+
+    schema_name = "main"
+
+    metadata = MetaData(
+        schema=schema_name,
+        naming_convention=NAMING_CONVENTION,
+    )
+
+
+class _TableMixin:
+    """Shared timestamp columns for all table bases."""
+
+    created: Mapped[datetime] = mapped_column(
+        DateTime(timezone=True),
+        server_default=func.now(),
+    )
+    updated: Mapped[datetime] = mapped_column(
+        DateTime(timezone=True),
+        server_default=func.now(),
+        onupdate=func.now(),
+    )
+
+
+class SignalBotTableBaseSmall(_TableMixin, AbstractConcreteBase, SignalBotBase):
+    """Table with SmallInteger primary key."""
+
+    __abstract__ = True
+
+    id: Mapped[int] = mapped_column(SmallInteger, primary_key=True)
+
+
+class SignalBotTableBase(_TableMixin, AbstractConcreteBase, SignalBotBase):
+    """Table with Integer primary key."""
+
+    __abstract__ = True
+
+    id: Mapped[int] = mapped_column(primary_key=True)

python/orm/signal_bot/models.py

@@ -0,0 +1,62 @@
+"""Signal bot device, role, and dead letter ORM models."""
+
+from __future__ import annotations
+
+from datetime import datetime
+
+from sqlalchemy import DateTime, Enum, ForeignKey, SmallInteger, String, Text, UniqueConstraint
+from sqlalchemy.orm import Mapped, mapped_column, relationship
+
+from python.orm.signal_bot.base import SignalBotTableBase, SignalBotTableBaseSmall
+from python.signal_bot.models import MessageStatus, TrustLevel
+
+
+class RoleRecord(SignalBotTableBaseSmall):
+    """Lookup table for RBAC roles, keyed by smallint."""
+
+    __tablename__ = "role"
+
+    name: Mapped[str] = mapped_column(String(50), unique=True)
+
+
+class DeviceRole(SignalBotTableBase):
+    """Association between a device and a role."""
+
+    __tablename__ = "device_role"
+    __table_args__ = (
+        UniqueConstraint("device_id", "role_id", name="uq_device_role_device_role"),
+        {"schema": "main"},
+    )
+
+    device_id: Mapped[int] = mapped_column(ForeignKey("main.signal_device.id"))
+    role_id: Mapped[int] = mapped_column(SmallInteger, ForeignKey("main.role.id"))
+
+
+class SignalDevice(SignalBotTableBase):
+    """A Signal device tracked by phone number and safety number."""
+
+    __tablename__ = "signal_device"
+
+    phone_number: Mapped[str] = mapped_column(String(50), unique=True)
+    safety_number: Mapped[str | None]
+    trust_level: Mapped[TrustLevel] = mapped_column(
+        Enum(TrustLevel, name="trust_level", create_constraint=False, native_enum=False),
+        default=TrustLevel.UNVERIFIED,
+    )
+    last_seen: Mapped[datetime] = mapped_column(DateTime(timezone=True))
+
+    roles: Mapped[list[RoleRecord]] = relationship(secondary=DeviceRole.__table__)
+
+
+class DeadLetterMessage(SignalBotTableBase):
+    """A Signal message that failed processing and was sent to the dead letter queue."""
+
+    __tablename__ = "dead_letter_message"
+
+    source: Mapped[str]
+    message: Mapped[str] = mapped_column(Text)
+    received_at: Mapped[datetime] = mapped_column(DateTime(timezone=True))
+    status: Mapped[MessageStatus] = mapped_column(
+        Enum(MessageStatus, name="message_status", create_constraint=False, native_enum=False),
+        default=MessageStatus.UNPROCESSED,
+    )

python/signal_bot/__init__.py

@@ -0,0 +1 @@
+"""Signal command and control bot."""

python/signal_bot/commands/__init__.py

@@ -0,0 +1 @@
+"""Signal bot commands."""

python/signal_bot/commands/inventory.py

@@ -0,0 +1,137 @@
+"""Van inventory command — parse receipts and item lists via LLM, push to API."""
+
+from __future__ import annotations
+
+import json
+import logging
+from typing import TYPE_CHECKING, Any
+
+import httpx
+
+from python.signal_bot.models import InventoryItem, InventoryUpdate
+
+if TYPE_CHECKING:
+    from python.signal_bot.llm_client import LLMClient
+    from python.signal_bot.models import SignalMessage
+    from python.signal_bot.signal_client import SignalClient
+
+logger = logging.getLogger(__name__)
+
+SYSTEM_PROMPT = """\
+You are an inventory assistant. Extract items from the input and return ONLY
+a JSON array. Each element must have these fields:
+  - "name": item name (string)
+  - "quantity": numeric count or amount (default 1)
+  - "unit": unit of measure (e.g. "each", "lb", "oz", "gallon", "bag", "box")
+  - "category": category like "food", "tools", "supplies", etc.
+  - "notes": any extra detail (empty string if none)
+
+Example output:
+[{"name": "water bottles", "quantity": 6, "unit": "gallon", "category": "supplies", "notes": "1 gallon each"}]
+
+Return ONLY the JSON array, no other text.\
+"""
+
+IMAGE_PROMPT = "Extract all items from this receipt or inventory photo."
+TEXT_PROMPT = "Extract all items from this inventory list."
+
+
+def parse_llm_response(raw: str) -> list[InventoryItem]:
+    """Parse the LLM JSON response into InventoryItem list."""
+    text = raw.strip()
+    # Strip markdown code fences if present
+    if text.startswith("```"):
+        lines = text.split("\n")
+        lines = [line for line in lines if not line.startswith("```")]
+        text = "\n".join(lines)
+
+    items_data: list[dict[str, Any]] = json.loads(text)
+    return [InventoryItem.model_validate(item) for item in items_data]
+
+
+def _upsert_item(api_url: str, item: InventoryItem) -> None:
+    """Create or update an item via the van_inventory API.
+
+    Fetches existing items, and if one with the same name exists,
+    patches its quantity (summing). Otherwise creates a new item.
+    """
+    base = api_url.rstrip("/")
+    response = httpx.get(f"{base}/api/items", timeout=10)
+    response.raise_for_status()
+    existing: list[dict[str, Any]] = response.json()
+
+    match = next((e for e in existing if e["name"].lower() == item.name.lower()), None)
+
+    if match:
+        new_qty = match["quantity"] + item.quantity
+        patch = {"quantity": new_qty}
+        if item.category:
+            patch["category"] = item.category
+        response = httpx.patch(f"{base}/api/items/{match['id']}", json=patch, timeout=10)
+        response.raise_for_status()
+        return
+    payload = {
+        "name": item.name,
+        "quantity": item.quantity,
+        "unit": item.unit,
+        "category": item.category or None,
+    }
+    response = httpx.post(f"{base}/api/items", json=payload, timeout=10)
+    response.raise_for_status()
+
+
+def handle_inventory_update(
+    message: SignalMessage,
+    signal: SignalClient,
+    llm: LLMClient,
+    api_url: str,
+) -> InventoryUpdate:
+    """Process an inventory update from a Signal message.
+
+    Accepts either an image (receipt photo) or text list.
+    Uses the LLM to extract structured items, then pushes to the van_inventory API.
+    """
+    try:
+        logger.info(f"Processing inventory update from {message.source}")
+        if message.attachments:
+            image_data = signal.get_attachment(message.attachments[0])
+            raw_response = llm.chat(
+                IMAGE_PROMPT,
+                image_data=image_data,
+                system=SYSTEM_PROMPT,
+            )
+            source_type = "receipt_photo"
+        elif message.message.strip():
+            raw_response = llm.chat(
+                f"{TEXT_PROMPT}\n\n{message.message}",
+                system=SYSTEM_PROMPT,
+            )
+            source_type = "text_list"
+        else:
+            signal.reply(message, "Send a photo of a receipt or a text list of items to update inventory.")
+            return InventoryUpdate()
+
+        logger.info(f"{raw_response=}")
+
+        new_items = parse_llm_response(raw_response)
+
+        logger.info(f"{new_items=}")
+
+        for item in new_items:
+            _upsert_item(api_url, item)
+
+        summary = _format_summary(new_items)
+        signal.reply(message, f"Inventory updated with {len(new_items)} item(s):\n{summary}")
+
+        return InventoryUpdate(items=new_items, raw_response=raw_response, source_type=source_type)
+
+    except Exception:
+        logger.exception("Failed to process inventory update")
+        signal.reply(message, "Failed to process inventory update. Check logs for details.")
+        return InventoryUpdate()
+
+
+def _format_summary(items: list[InventoryItem]) -> str:
+    """Format items into a readable summary."""
+    lines = [f"  - {item.name} x{item.quantity} {item.unit} [{item.category}]" for item in items]
+    return "\n".join(lines)

python/signal_bot/commands/location.py

@@ -0,0 +1,64 @@
+"""Location command for the Signal bot."""
+
+from __future__ import annotations
+
+import logging
+from typing import TYPE_CHECKING, Any
+
+import httpx
+
+if TYPE_CHECKING:
+    from python.signal_bot.models import SignalMessage
+    from python.signal_bot.signal_client import SignalClient
+
+logger = logging.getLogger(__name__)
+
+
+def _get_entity_state(ha_url: str, ha_token: str, entity_id: str) -> dict[str, Any]:
+    """Fetch an entity's state from Home Assistant."""
+    entity_url = f"{ha_url}/api/states/{entity_id}"
+    logger.debug(f"Fetching {entity_url=}")
+    response = httpx.get(
+        entity_url,
+        headers={"Authorization": f"Bearer {ha_token}"},
+        timeout=30,
+    )
+    response.raise_for_status()
+    return response.json()
+
+
+def _format_location(latitude: str, longitude: str) -> str:
+    """Render a friendly location response."""
+    return f"Van location: {latitude}, {longitude}\nhttps://maps.google.com/?q={latitude},{longitude}"
+
+
+def handle_location_request(
+    message: SignalMessage,
+    signal: SignalClient,
+    ha_url: str | None,
+    ha_token: str | None,
+) -> None:
+    """Reply with van location from Home Assistant."""
+    if ha_url is None or ha_token is None:
+        signal.reply(message, "Location command is not configured (missing HA_URL or HA_TOKEN).")
+        return
+
+    lat_payload = None
+    lon_payload = None
+    try:
+        lat_payload = _get_entity_state(ha_url, ha_token, "sensor.van_last_known_latitude")
+        lon_payload = _get_entity_state(ha_url, ha_token, "sensor.van_last_known_longitude")
+    except httpx.HTTPError:
+        logger.exception("Couldn't fetch van location from Home Assistant right now.")
+        logger.debug(f"{ha_url=} {lat_payload=} {lon_payload=}")
+        signal.reply(message, "Couldn't fetch van location from Home Assistant right now.")
+        return
+
+    latitude = lat_payload.get("state", "")
+    longitude = lon_payload.get("state", "")
+
+    if not latitude or not longitude or latitude == "unavailable" or longitude == "unavailable":
+        signal.reply(message, "Van location is unavailable in Home Assistant right now.")
+        return
+
+    signal.reply(message, _format_location(latitude, longitude))

python/signal_bot/device_registry.py

@@ -0,0 +1,286 @@
+"""Device registry — tracks verified/unverified devices by safety number."""
+
+from __future__ import annotations
+
+import logging
+from datetime import datetime, timedelta
+from typing import TYPE_CHECKING, NamedTuple
+
+from sqlalchemy import delete, select
+from sqlalchemy.orm import Session
+
+from python.common import utcnow
+from python.orm.signal_bot.models import RoleRecord, SignalDevice
+from python.signal_bot.models import Role, TrustLevel
+
+if TYPE_CHECKING:
+    from sqlalchemy.engine import Engine
+
+    from python.signal_bot.signal_client import SignalClient
+
+logger = logging.getLogger(__name__)
+
+_BLOCKED_TTL = timedelta(minutes=60)
+_DEFAULT_TTL = timedelta(minutes=5)
+
+
+class _CacheEntry(NamedTuple):
+    expires: datetime
+    trust_level: TrustLevel
+    has_safety_number: bool
+    safety_number: str | None
+    roles: list[Role]
+
+
+class DeviceRegistry:
+    """Manage device trust based on Signal safety numbers.
+
+    Devices start as UNVERIFIED. An admin verifies them over SSH by calling
+    ``verify(phone_number)`` which marks the device VERIFIED and also tells
+    signal-cli to trust the identity.
+
+    Only VERIFIED devices may execute commands.
+    """
+
+    def __init__(self, signal_client: SignalClient, engine: Engine) -> None:
+        self.signal_client = signal_client
+        self.engine = engine
+        self._contact_cache: dict[str, _CacheEntry] = {}
+
+    def is_verified(self, phone_number: str) -> bool:
+        """Check if a phone number is verified."""
+        if entry := self._cached(phone_number):
+            return entry.trust_level == TrustLevel.VERIFIED
+        device = self._load_device(phone_number)
+        return device is not None and device.trust_level == TrustLevel.VERIFIED
+
+    def record_contact(self, phone_number: str, safety_number: str | None = None) -> None:
+        """Record seeing a device. Creates entry if new, updates last_seen."""
+        now = utcnow()
+
+        entry = self._cached(phone_number)
+        if entry and entry.safety_number == safety_number:
+            return
+
+        with Session(self.engine) as session:
+            device = session.execute(
+                select(SignalDevice).where(SignalDevice.phone_number == phone_number)
+            ).scalar_one_or_none()
+
+            if device:
+                if device.safety_number != safety_number and device.trust_level != TrustLevel.BLOCKED:
+                    logger.warning(f"Safety number changed for {phone_number}, resetting to UNVERIFIED")
+                    device.safety_number = safety_number
+                    device.trust_level = TrustLevel.UNVERIFIED
+                device.last_seen = now
+            else:
+                device = SignalDevice(
+                    phone_number=phone_number,
+                    safety_number=safety_number,
+                    trust_level=TrustLevel.UNVERIFIED,
+                    last_seen=now,
+                )
+                session.add(device)
+                logger.info(f"New device registered: {phone_number}")
+
+            session.commit()
+            self._update_cache(phone_number, device)
+
+    def has_safety_number(self, phone_number: str) -> bool:
+        """Check if a device has a safety number on file."""
+        if entry := self._cached(phone_number):
+            return entry.has_safety_number
+        device = self._load_device(phone_number)
+        return device is not None and device.safety_number is not None
+
+    def verify(self, phone_number: str) -> bool:
+        """Mark a device as verified. Called by admin over SSH.
+
+        Returns True if the device was found and verified.
+        """
+        with Session(self.engine) as session:
+            device = session.execute(
+                select(SignalDevice).where(SignalDevice.phone_number == phone_number)
+            ).scalar_one_or_none()
+
+            if not device:
+                logger.warning(f"Cannot verify unknown device: {phone_number}")
+                return False
+
+            device.trust_level = TrustLevel.VERIFIED
+            self.signal_client.trust_identity(phone_number, trust_all_known_keys=True)
+            session.commit()
+            self._update_cache(phone_number, device)
+            logger.info(f"Device verified: {phone_number}")
+            return True
+
+    def block(self, phone_number: str) -> bool:
+        """Block a device."""
+        return self._set_trust(phone_number, TrustLevel.BLOCKED, "Device blocked")
+
+    def unverify(self, phone_number: str) -> bool:
+        """Reset a device to unverified."""
+        return self._set_trust(phone_number, TrustLevel.UNVERIFIED)
+
+    # -- role management ------------------------------------------------------
+
+    def get_roles(self, phone_number: str) -> list[Role]:
+        """Return the roles for a device, defaulting to empty."""
+        if entry := self._cached(phone_number):
+            return entry.roles
+        device = self._load_device(phone_number)
+        return _extract_roles(device) if device else []
+
+    def has_role(self, phone_number: str, role: Role) -> bool:
+        """Check if a device has a specific role or is admin."""
+        roles = self.get_roles(phone_number)
+        return Role.ADMIN in roles or role in roles
+
+    def grant_role(self, phone_number: str, role: Role) -> bool:
+        """Add a role to a device. Called by admin over SSH."""
+        with Session(self.engine) as session:
+            device = session.execute(
+                select(SignalDevice).where(SignalDevice.phone_number == phone_number)
+            ).scalar_one_or_none()
+
+            if not device:
+                logger.warning(f"Cannot grant role for unknown device: {phone_number}")
+                return False
+
+            if any(record.name == role for record in device.roles):
+                return True
+
+            role_record = session.execute(select(RoleRecord).where(RoleRecord.name == role)).scalar_one_or_none()
+
+            if not role_record:
+                logger.warning(f"Unknown role: {role}")
+                return False
+
+            device.roles.append(role_record)
+            session.commit()
+            self._update_cache(phone_number, device)
+            logger.info(f"Device {phone_number} granted role {role}")
+            return True
+
+    def revoke_role(self, phone_number: str, role: Role) -> bool:
+        """Remove a role from a device. Called by admin over SSH."""
+        with Session(self.engine) as session:
+            device = session.execute(
+                select(SignalDevice).where(SignalDevice.phone_number == phone_number)
+            ).scalar_one_or_none()
+
+            if not device:
+                logger.warning(f"Cannot revoke role for unknown device: {phone_number}")
+                return False
+
+            device.roles = [record for record in device.roles if record.name != role]
+            session.commit()
+            self._update_cache(phone_number, device)
+            logger.info(f"Device {phone_number} revoked role {role}")
+            return True
+
+    def set_roles(self, phone_number: str, roles: list[Role]) -> bool:
+        """Replace all roles for a device. Called by admin over SSH."""
+        with Session(self.engine) as session:
+            device = session.execute(
+                select(SignalDevice).where(SignalDevice.phone_number == phone_number)
+            ).scalar_one_or_none()
+
+            if not device:
+                logger.warning(f"Cannot set roles for unknown device: {phone_number}")
+                return False
+
+            role_names = [str(role) for role in roles]
+            records = list(session.execute(select(RoleRecord).where(RoleRecord.name.in_(role_names))).scalars().all())
+            device.roles = records
+            session.commit()
+            self._update_cache(phone_number, device)
+            logger.info(f"Device {phone_number} roles set to {role_names}")
+            return True
+
+    # -- queries --------------------------------------------------------------
+
+    def list_devices(self) -> list[SignalDevice]:
+        """Return all known devices."""
+        with Session(self.engine) as session:
+            return list(session.execute(select(SignalDevice)).scalars().all())
+
+    def sync_identities(self) -> None:
+        """Pull identity list from signal-cli and record any new ones."""
+        identities = self.signal_client.get_identities()
+        for identity in identities:
+            number = identity.get("number", "")
+            safety = identity.get("safety_number", identity.get("fingerprint", ""))
+            if number:
+                self.record_contact(number, safety)
+
+    # -- internals ------------------------------------------------------------
+
+    def _cached(self, phone_number: str) -> _CacheEntry | None:
+        """Return the cache entry if it exists and hasn't expired."""
+        entry = self._contact_cache.get(phone_number)
+        if entry and utcnow() < entry.expires:
+            return entry
+        return None
+
+    def _load_device(self, phone_number: str) -> SignalDevice | None:
+        """Fetch a device by phone number (with joined roles)."""
+        with Session(self.engine) as session:
+            return session.execute(
+                select(SignalDevice).where(SignalDevice.phone_number == phone_number)
+            ).scalar_one_or_none()
+
+    def _update_cache(self, phone_number: str, device: SignalDevice) -> None:
+        """Refresh the cache entry for a device."""
+        ttl = _BLOCKED_TTL if device.trust_level == TrustLevel.BLOCKED else _DEFAULT_TTL
+        self._contact_cache[phone_number] = _CacheEntry(
+            expires=utcnow() + ttl,
+            trust_level=device.trust_level,
+            has_safety_number=device.safety_number is not None,
+            safety_number=device.safety_number,
+            roles=_extract_roles(device),
+        )
+
+    def _set_trust(self, phone_number: str, level: str, log_msg: str | None = None) -> bool:
+        """Update the trust level for a device."""
+        with Session(self.engine) as session:
+            device = session.execute(
+                select(SignalDevice).where(SignalDevice.phone_number == phone_number)
+            ).scalar_one_or_none()
+
+            if not device:
+                return False
+
+            device.trust_level = level
+            session.commit()
+            self._update_cache(phone_number, device)
+            if log_msg:
+                logger.info(f"{log_msg}: {phone_number}")
+            return True
+
+
+def _extract_roles(device: SignalDevice) -> list[Role]:
+    """Convert a device's RoleRecord objects to a list of Role enums."""
+    return [Role(record.name) for record in device.roles]
+
+
+def sync_roles(engine: Engine) -> None:
+    """Sync the Role enum to the role table, adding new and removing stale entries."""
+    expected = {role.value for role in Role}
+
+    with Session(engine) as session:
+        existing = {record.name for record in session.execute(select(RoleRecord)).scalars().all()}
+
+        to_add = expected - existing
+        to_remove = existing - expected
+
+        for name in to_add:
+            session.add(RoleRecord(name=name))
+            logger.info(f"Role added: {name}")
+
+        if to_remove:
+            session.execute(delete(RoleRecord).where(RoleRecord.name.in_(to_remove)))
+            for name in to_remove:
+                logger.info(f"Role removed: {name}")
+
+        session.commit()

python/signal_bot/llm_client.py

@@ -0,0 +1,80 @@
+"""Flexible LLM client for ollama backends."""
+
+from __future__ import annotations
+
+import base64
+import logging
+from typing import Any, Self
+
+import httpx
+
+logger = logging.getLogger(__name__)
+
+
+class LLMClient:
+    """Talk to an ollama instance.
+
+    Args:
+        model: Ollama model name.
+        host: Ollama host.
+        port: Ollama port.
+        temperature: Sampling temperature.
+    """
+
+    def __init__(
+        self,
+        *,
+        model: str,
+        host: str,
+        port: int = 11434,
+        temperature: float = 0.1,
+        timeout: int = 300,
+    ) -> None:
+        self.model = model
+        self.temperature = temperature
+        self._client = httpx.Client(base_url=f"http://{host}:{port}", timeout=timeout)
+
+    def chat(self, prompt: str, image_data: bytes | None = None, system: str | None = None) -> str:
+        """Send a text prompt and return the response."""
+        messages: list[dict[str, Any]] = []
+        if system:
+            messages.append({"role": "system", "content": system})
+
+        user_msg = {"role": "user", "content": prompt}
+        if image_data:
+            user_msg["images"] = [base64.b64encode(image_data).decode()]
+
+        messages.append(user_msg)
+        return self._generate(messages)
+
+    def _generate(self, messages: list[dict[str, Any]]) -> str:
+        """Call the ollama chat API."""
+        payload = {
+            "model": self.model,
+            "messages": messages,
+            "stream": False,
+            "options": {"temperature": self.temperature},
+        }
+        logger.info(f"LLM request to {self.model}")
+        response = self._client.post("/api/chat", json=payload)
+        response.raise_for_status()
+        data = response.json()
+        return data["message"]["content"]
+
+    def list_models(self) -> list[str]:
+        """List available models on the ollama instance."""
+        response = self._client.get("/api/tags")
+        response.raise_for_status()
+        return [m["name"] for m in response.json().get("models", [])]
+
+    def __enter__(self) -> Self:
+        """Enter the context manager."""
+        return self
+
+    def __exit__(self, *args: object) -> None:
+        """Close the HTTP client on exit."""
+        self.close()
+
+    def close(self) -> None:
+        """Close the HTTP client."""
+        self._client.close()

python/signal_bot/main.py

@@ -0,0 +1,239 @@
+"""Signal command and control bot — main entry point."""
+
+from __future__ import annotations
+
+import logging
+from dataclasses import dataclass
+from os import getenv
+from typing import TYPE_CHECKING, Annotated
+
+if TYPE_CHECKING:
+    from collections.abc import Callable
+
+import typer
+from alembic.command import upgrade
+from sqlalchemy.orm import Session
+from tenacity import before_sleep_log, retry, stop_after_attempt, wait_exponential
+
+from python.common import configure_logger, utcnow
+from python.database_cli import DATABASES
+from python.orm.common import get_postgres_engine
+from python.orm.signal_bot.models import DeadLetterMessage
+from python.signal_bot.commands.inventory import handle_inventory_update
+from python.signal_bot.commands.location import handle_location_request
+from python.signal_bot.device_registry import DeviceRegistry, sync_roles
+from python.signal_bot.llm_client import LLMClient
+from python.signal_bot.models import BotConfig, MessageStatus, Role, SignalMessage
+from python.signal_bot.signal_client import SignalClient
+
+logger = logging.getLogger(__name__)
+
+
+@dataclass(frozen=True, slots=True)
+class Command:
+    """A registered bot command."""
+
+    action: Callable[[SignalMessage, str], None]
+    help_text: str
+    role: Role | None  # None = no role required (always allowed)
+
+
+class Bot:
+    """Holds shared resources and dispatches incoming messages to command handlers."""
+
+    def __init__(
+        self,
+        signal: SignalClient,
+        llm: LLMClient,
+        registry: DeviceRegistry,
+        config: BotConfig,
+    ) -> None:
+        self.signal = signal
+        self.llm = llm
+        self.registry = registry
+        self.config = config
+        self.commands: dict[str, Command] = {
+            "help": Command(action=self._help, help_text="show this help message", role=None),
+            "status": Command(action=self._status, help_text="show bot status", role=Role.STATUS),
+            "inventory": Command(
+                action=self._inventory,
+                help_text="update van inventory from a text list or receipt photo",
+                role=Role.INVENTORY,
+            ),
+            "location": Command(
+                action=self._location,
+                help_text="get current van location",
+                role=Role.LOCATION,
+            ),
+        }
+
+    # -- actions --------------------------------------------------------------
+
+    def _help(self, message: SignalMessage, _cmd: str) -> None:
+        """Return help text filtered to the sender's roles."""
+        self.signal.reply(message, self._build_help(self.registry.get_roles(message.source)))
+
+    def _status(self, message: SignalMessage, _cmd: str) -> None:
+        """Return the status of the bot."""
+        models = self.llm.list_models()
+        model_list = ", ".join(models[:10])
+        device_count = len(self.registry.list_devices())
+        self.signal.reply(
+            message,
+            f"Bot online.\nLLM: {self.llm.model}\nAvailable models: {model_list}\nKnown devices: {device_count}",
+        )
+
+    def _inventory(self, message: SignalMessage, _cmd: str) -> None:
+        """Process an inventory update."""
+        handle_inventory_update(message, self.signal, self.llm, self.config.inventory_api_url)
+
+    def _location(self, message: SignalMessage, _cmd: str) -> None:
+        """Reply with current van location."""
+        handle_location_request(message, self.signal, self.config.ha_url, self.config.ha_token)
+
+    # -- dispatch -------------------------------------------------------------
+
+    def _build_help(self, roles: list[Role]) -> str:
+        """Build help text showing only the commands the user can access."""
+        is_admin = Role.ADMIN in roles
+        lines = ["Available commands:"]
+        for name, cmd in self.commands.items():
+            if cmd.role is None or is_admin or cmd.role in roles:
+                lines.append(f"  {name:20s} — {cmd.help_text}")
+        return "\n".join(lines)
+
+    def dispatch(self, message: SignalMessage) -> None:
+        """Route an incoming message to the right command handler."""
+        source = message.source
+
+        if not self.registry.is_verified(source):
+            logger.info(f"Device {source} not verified, ignoring message")
+            return
+
+        if not self.registry.has_safety_number(source) and self.registry.has_role(source, Role.ADMIN):
+            logger.warning(f"Admin device {source} missing safety number, ignoring message")
+            return
+
+        text = message.message.strip()
+        parts = text.split()
+
+        if not parts and not message.attachments:
+            return
+
+        cmd = parts[0].lower() if parts else ""
+
+        logger.info(f"f{source=} running {cmd=} with {message=}")
+
+        command = self.commands.get(cmd)
+        if command is None:
+            if message.attachments:
+                command = self.commands["inventory"]
+                cmd = "inventory"
+            else:
+                return
+
+        if command.role is not None and not self.registry.has_role(source, command.role):
+            logger.warning(f"Device {source} denied access to {cmd!r}")
+            self.signal.reply(message, f"Permission denied: you do not have the '{command.role}' role.")
+            return
+
+        command.action(message, cmd)
+
+    def process_message(self, message: SignalMessage) -> None:
+        """Process a single message, sending it to the dead letter queue after repeated failures."""
+        max_attempts = self.config.max_message_attempts
+        for attempt in range(1, max_attempts + 1):
+            try:
+                safety_number = self.signal.get_safety_number(message.source)
+                self.registry.record_contact(message.source, safety_number)
+                self.dispatch(message)
+            except Exception:
+                logger.exception(f"Failed to process message (attempt {attempt}/{max_attempts})")
+            else:
+                return
+
+        logger.error(f"Message from {message.source} failed {max_attempts} times, sending to dead letter queue")
+        with Session(self.config.engine) as session:
+            session.add(
+                DeadLetterMessage(
+                    source=message.source,
+                    message=message.message,
+                    received_at=utcnow(),
+                    status=MessageStatus.UNPROCESSED,
+                )
+            )
+            session.commit()
+
+    def run(self) -> None:
+        """Listen for messages via WebSocket, reconnecting on failure."""
+        logger.info("Bot started — listening via WebSocket")
+
+        @retry(
+            stop=stop_after_attempt(self.config.max_retries),
+            wait=wait_exponential(multiplier=self.config.reconnect_delay, max=self.config.max_reconnect_delay),
+            before_sleep=before_sleep_log(logger, logging.WARNING),
+            reraise=True,
+        )
+        def _listen() -> None:
+            for message in self.signal.listen():
+                logger.info(f"Message from {message.source}: {message.message[:80]}")
+                self.process_message(message)
+
+        try:
+            _listen()
+        except Exception:
+            logger.critical("Max retries exceeded, shutting down")
+            raise
+
+
+def main(
+    log_level: Annotated[str, typer.Option()] = "DEBUG",
+    llm_timeout: Annotated[int, typer.Option()] = 600,
+) -> None:
+    """Run the Signal command and control bot."""
+    configure_logger(log_level)
+    signal_api_url = getenv("SIGNAL_API_URL")
+    phone_number = getenv("SIGNAL_PHONE_NUMBER")
+    inventory_api_url = getenv("INVENTORY_API_URL")
+
+    if signal_api_url is None:
+        error = "SIGNAL_API_URL environment variable not set"
+        raise ValueError(error)
+    if phone_number is None:
+        error = "SIGNAL_PHONE_NUMBER environment variable not set"
+        raise ValueError(error)
+    if inventory_api_url is None:
+        error = "INVENTORY_API_URL environment variable not set"
+        raise ValueError(error)
+
+    signal_bot_config = DATABASES["signal_bot"].alembic_config()
+    upgrade(signal_bot_config, "head")
+    engine = get_postgres_engine(name="SIGNALBOT")
+    sync_roles(engine)
+    config = BotConfig(
+        signal_api_url=signal_api_url,
+        phone_number=phone_number,
+        inventory_api_url=inventory_api_url,
+        ha_url=getenv("HA_URL"),
+        ha_token=getenv("HA_TOKEN"),
+        engine=engine,
+    )
+
+    llm_host = getenv("LLM_HOST")
+    llm_model = getenv("LLM_MODEL", "qwen3-vl:32b")
+    llm_port = int(getenv("LLM_PORT", "11434"))
+    if llm_host is None:
+        error = "LLM_HOST environment variable not set"
+        raise ValueError(error)
+
+    with (
+        SignalClient(config.signal_api_url, config.phone_number) as signal,
+        LLMClient(model=llm_model, host=llm_host, port=llm_port, timeout=llm_timeout) as llm,
+    ):
+        registry = DeviceRegistry(signal, engine)
+        bot = Bot(signal, llm, registry, config)
+        bot.run()
+
+
+if __name__ == "__main__":
+    typer.run(main)

python/signal_bot/models.py

@@ -0,0 +1,97 @@
+"""Models for the Signal command and control bot."""
+
+from __future__ import annotations
+
+from datetime import datetime  # noqa: TC003 - pydantic needs this at runtime
+from enum import StrEnum
+from typing import Any
+
+from pydantic import BaseModel, ConfigDict
+from sqlalchemy.engine import Engine  # noqa: TC002 - pydantic needs this at runtime
+
+
+class TrustLevel(StrEnum):
+    """Device trust level."""
+
+    VERIFIED = "verified"
+    UNVERIFIED = "unverified"
+    BLOCKED = "blocked"
+
+
+class Role(StrEnum):
+    """RBAC roles — one per command, plus admin which grants all."""
+
+    ADMIN = "admin"
+    STATUS = "status"
+    INVENTORY = "inventory"
+    LOCATION = "location"
+
+
+class MessageStatus(StrEnum):
+    """Dead letter queue message status."""
+
+    UNPROCESSED = "unprocessed"
+    PROCESSED = "processed"
+
+
+class Device(BaseModel):
+    """A registered device tracked by safety number."""
+
+    phone_number: str
+    safety_number: str
+    trust_level: TrustLevel = TrustLevel.UNVERIFIED
+    first_seen: datetime
+    last_seen: datetime
+
+
+class SignalMessage(BaseModel):
+    """An incoming Signal message."""
+
+    source: str
+    timestamp: int
+    message: str = ""
+    attachments: list[str] = []
+    group_id: str | None = None
+    is_receipt: bool = False
+
+
+class SignalEnvelope(BaseModel):
+    """Raw envelope from signal-cli-rest-api."""
+
+    envelope: dict[str, Any]
+    account: str | None = None
+
+
+class InventoryItem(BaseModel):
+    """An item in the van inventory."""
+
+    name: str
+    quantity: float = 1
+    unit: str = "each"
+    category: str = ""
+    notes: str = ""
+
+
+class InventoryUpdate(BaseModel):
+    """Result of processing an inventory update."""
+
+    items: list[InventoryItem] = []
+    raw_response: str = ""
+    source_type: str = ""  # "receipt_photo" or "text_list"
+
+
+class BotConfig(BaseModel):
+    """Top-level bot configuration."""
+
+    model_config = ConfigDict(arbitrary_types_allowed=True)
+
+    signal_api_url: str
+    phone_number: str
+    inventory_api_url: str
+    ha_url: str | None = None
+    ha_token: str | None = None
+    engine: Engine
+    reconnect_delay: int = 5
+    max_reconnect_delay: int = 300
+    max_retries: int = 10
+    max_message_attempts: int = 3

python/signal_bot/signal_client.py

@@ -0,0 +1,141 @@
+"""Client for the signal-cli-rest-api."""
+
+from __future__ import annotations
+
+import json
+import logging
+from typing import TYPE_CHECKING, Any, Self
+
+import httpx
+import websockets.sync.client
+
+if TYPE_CHECKING:
+    from collections.abc import Generator
+
+from python.signal_bot.models import SignalMessage
+
+logger = logging.getLogger(__name__)
+
+
+def _parse_envelope(envelope: dict[str, Any]) -> SignalMessage | None:
+    """Parse a signal-cli envelope into a SignalMessage, or None if not a data message."""
+    data_message = envelope.get("dataMessage")
+    if not data_message:
+        return None
+
+    attachment_ids = [att["id"] for att in data_message.get("attachments", []) if "id" in att]
+
+    group_info = data_message.get("groupInfo")
+    group_id = group_info.get("groupId") if group_info else None
+
+    return SignalMessage(
+        source=envelope.get("source", ""),
+        timestamp=envelope.get("timestamp", 0),
+        message=data_message.get("message", "") or "",
+        attachments=attachment_ids,
+        group_id=group_id,
+    )
+
+
+class SignalClient:
+    """Communicate with signal-cli-rest-api.
+
+    Args:
+        base_url: URL of the signal-cli-rest-api (e.g. http://localhost:8989).
+        phone_number: The registered phone number to send/receive as.
+    """
+
+    def __init__(self, base_url: str, phone_number: str) -> None:
+        self.base_url = base_url.rstrip("/")
+        self.phone_number = phone_number
+        self._client = httpx.Client(base_url=self.base_url, timeout=30)
+
+    def _ws_url(self) -> str:
+        """Build the WebSocket URL from the base HTTP URL."""
+        url = self.base_url.replace("http://", "ws://").replace("https://", "wss://")
+        return f"{url}/v1/receive/{self.phone_number}"
+
+    def listen(self) -> Generator[SignalMessage]:
+        """Connect via WebSocket and yield messages as they arrive."""
+        ws_url = self._ws_url()
+        logger.info(f"Connecting to WebSocket: {ws_url}")
+
+        with websockets.sync.client.connect(ws_url) as ws:
+            for raw in ws:
+                try:
+                    data = json.loads(raw)
+                    envelope = data.get("envelope", {})
+                    message = _parse_envelope(envelope)
+                    if message:
+                        yield message
+                except json.JSONDecodeError:
+                    logger.warning(f"Non-JSON WebSocket frame: {raw[:200]}")
+
+    def send(self, recipient: str, message: str) -> None:
+        """Send a text message."""
+        payload = {
+            "message": message,
+            "number": self.phone_number,
+            "recipients": [recipient],
+        }
+        response = self._client.post("/v2/send", json=payload)
+        response.raise_for_status()
+
+    def send_to_group(self, group_id: str, message: str) -> None:
+        """Send a message to a group."""
+        payload = {
+            "message": message,
+            "number": self.phone_number,
+            "recipients": [group_id],
+        }
+        response = self._client.post("/v2/send", json=payload)
+        response.raise_for_status()
+
+    def get_attachment(self, attachment_id: str) -> bytes:
+        """Download an attachment by ID."""
+        response = self._client.get(f"/v1/attachments/{attachment_id}")
+        response.raise_for_status()
+        return response.content
+
+    def get_identities(self) -> list[dict[str, Any]]:
+        """List known identities and their trust levels."""
+        response = self._client.get(f"/v1/identities/{self.phone_number}")
+        response.raise_for_status()
+        return response.json()
+
+    def get_safety_number(self, phone_number: str) -> str | None:
+        """Look up the safety number for a contact from signal-cli's local store."""
+        for identity in self.get_identities():
+            if identity.get("number") == phone_number:
+                return identity.get("safety_number", identity.get("fingerprint", ""))
+        return None
+
+    def trust_identity(self, number_to_trust: str, *, trust_all_known_keys: bool = False) -> None:
+        """Trust an identity (verify safety number)."""
+        payload: dict[str, Any] = {}
+        if trust_all_known_keys:
+            payload["trust_all_known_keys"] = True
+        response = self._client.put(
+            f"/v1/identities/{self.phone_number}/trust/{number_to_trust}",
+            json=payload,
+        )
+        response.raise_for_status()
+
+    def reply(self, message: SignalMessage, text: str) -> None:
+        """Reply to a message, routing to group or individual."""
+        if message.group_id:
+            self.send_to_group(message.group_id, text)
+        else:
+            self.send(message.source, text)
+
+    def __enter__(self) -> Self:
+        """Enter the context manager."""
+        return self
+
+    def __exit__(self, *args: object) -> None:
+        """Close the HTTP client on exit."""
+        self.close()
+
+    def close(self) -> None:
+        """Close the HTTP client."""
+        self._client.close()

python/tools/audiobook/__init__.py

@@ -1 +0,0 @@
-"""Audiobook tools."""

python/tools/audiobook/audible_convert.py

@@ -1,471 +0,0 @@
-"""Convert Audible AAX downloads into Audiobookshelf-friendly M4B files."""
-
-from __future__ import annotations
-
-import json
-import logging
-import re
-import shutil
-import subprocess
-from concurrent.futures import ThreadPoolExecutor
-from dataclasses import asdict, dataclass
-from os import getenv
-from pathlib import Path  # noqa: TC003 This is required for the typer CLI
-from typing import TYPE_CHECKING, Annotated, Any
-from uuid import uuid7
-
-import typer
-
-from python.common import configure_logger
-from python.orm.common import get_postgres_engine
-from python.tools.audiobook.metadata_agent import (
-    AgentConfig,
-    StandardBookMetadata,
-    standard_book_metadata,
-    write_agent_log,
-)
-
-if TYPE_CHECKING:
-    from sqlalchemy.engine import Engine
-
-logger = logging.getLogger(__name__)
-
-SENSITIVE_COMMAND_ARGUMENTS = {"-activation_bytes"}
-BOOK_RANGE_PATTERN = re.compile(r"(?:^|-)books?-(?P<start>[1-9]\d*)-(?P<end>[1-9]\d*)(?:-|$)")
-
-
-@dataclass(frozen=True)
-class ConversionConfig:
-    """Runtime settings for one conversion command."""
-
-    resolved_output: Path
-    ollama_api_key: str
-    agent_config: AgentConfig
-    engine: Engine
-    activation_bytes: str | None
-    dry_run: bool
-    overwrite: bool
-    work_directory_name: str = ".audible_convert"
-    dry_run_directory_name: str = "dry-run"
-    temp_directory_name: str = "tmp"
-    log_directory_name: str = "logs"
-    review_directory_name: str = "review"
-
-
-@dataclass(frozen=True)
-class ConcurrentConversionResult:
-    """Result from running ffmpeg and metadata resolution together."""
-
-    metadata: StandardBookMetadata | None
-    conversion_error: Exception | None
-    metadata_error: Exception | None
-
-
-class CommandExecutionError(RuntimeError):
-    """Command failed without exposing sensitive arguments."""
-
-    def __init__(self, arguments: list[str], returncode: int) -> None:
-        """Create a redacted command failure."""
-        self.arguments = tuple(arguments)
-        self.returncode = returncode
-        command = " ".join(redact_command_arguments(arguments))
-        super().__init__(f"Command failed with exit code {returncode}: {command}")
-
-
-def main(
-    input_directory: Annotated[Path, typer.Argument(help="Directory audible-cli downloads AAX files into.")],
-    output_directory: Annotated[Path, typer.Argument(help="Audiobook output directory.")],
-    *,
-    dry_run: Annotated[
-        bool,
-        typer.Option("--dry-run", help="Print planned output files and write marker files without converting."),
-    ] = False,
-    overwrite: Annotated[bool, typer.Option("--overwrite", help="Overwrite existing M4B files.")] = False,
-) -> None:
-    """Convert AAX files from a download directory into M4B files."""
-    configure_logger()
-    resolved_input = input_directory.resolve(strict=True)
-    resolved_output = output_directory.resolve()
-    if not dry_run:
-        resolved_output.mkdir(parents=True, exist_ok=True)
-
-    ollama_api_key = getenv("OLLAMA_API_KEY")
-    if not ollama_api_key:
-        msg = "OLLAMA_API_KEY is required for audiobook metadata resolution"
-        raise RuntimeError(msg)
-
-    config = ConversionConfig(
-        resolved_output=resolved_output,
-        ollama_api_key=ollama_api_key,
-        agent_config=AgentConfig(),
-        engine=get_postgres_engine(name="RICHIE"),
-        activation_bytes=getenv("AUDIBLE_ACTIVATION_BYTES"),
-        dry_run=dry_run,
-        overwrite=overwrite,
-    )
-
-    aax_files = sorted(resolved_input.glob("*.aax"))
-    if not aax_files:
-        logger.info("No AAX files found in %s", resolved_input)
-        return
-    for aax_file in aax_files:
-        logger.info("Converting %s", aax_file)
-        convert_aax_file_with_agent(aax_file, config)
-
-
-def run_command(arguments: list[str], *, capture: bool = False) -> subprocess.CompletedProcess[str]:
-    """Run a command and return the completed process.
-
-    Args:
-        arguments: Command and arguments to run.
-        capture: Whether to capture stdout and stderr.
-
-    Returns:
-        The completed process.
-    """
-    logger.debug("%s", " ".join(redact_command_arguments(arguments)))
-    try:
-        return subprocess.run(arguments, check=True, capture_output=capture, text=True)
-    except subprocess.CalledProcessError as error:
-        raise CommandExecutionError(arguments, error.returncode) from error
-
-
-def redact_command_arguments(arguments: list[str]) -> list[str]:
-    """Return command arguments with sensitive values redacted."""
-    redacted = []
-    redact_next = False
-    for argument in arguments:
-        if redact_next:
-            redacted.append("<redacted>")
-            redact_next = False
-            continue
-
-        redacted.append(argument)
-        redact_next = argument in SENSITIVE_COMMAND_ARGUMENTS
-    return redacted
-
-
-def read_metadata(aax_file: Path) -> dict[str, str]:
-    """Read ffprobe format tags from an AAX file.
-
-    Args:
-        aax_file: AAX file to inspect.
-
-    Returns:
-        Lower-cased metadata tag names mapped to their values.
-    """
-    completed = run_command(
-        [
-            "ffprobe",
-            "-v",
-            "quiet",
-            "-print_format",
-            "json",
-            "-show_format",
-            str(aax_file),
-        ],
-        capture=True,
-    )
-    ffprobe_data: dict[str, Any] = json.loads(completed.stdout)
-    tags = ffprobe_data.get("format", {}).get("tags", {})
-    return {str(key).lower(): str(value) for key, value in tags.items()}
-
-
-def output_stem(metadata: StandardBookMetadata) -> str:
-    """Build the output stem for a book.
-
-    Args:
-        metadata: Book metadata.
-
-    Returns:
-        Output stem in author-series_01-title form.
-    """
-    index_slug = series_index_slug(metadata.series_index, metadata.title)
-    return f"{metadata.author}-{metadata.series}_{index_slug}-{metadata.title}"
-
-
-def series_index_slug(series_index: float, title: str = "") -> str:
-    """Return a filename-safe series index."""
-    if title_range := title_series_range_slug(series_index, title):
-        return title_range
-    index = float(series_index)
-    if index.is_integer():
-        return f"{int(index):02}"
-    return f"{int(index):02}.5"
-
-
-def title_series_range_slug(series_index: float, title: str) -> str | None:
-    """Return a series range slug found in an omnibus title."""
-    index = float(series_index)
-    if not index.is_integer():
-        return None
-    first_index = int(index)
-    for match in BOOK_RANGE_PATTERN.finditer(title):
-        start = int(match.group("start"))
-        end = int(match.group("end"))
-        if start == first_index and end > start:
-            return f"{start:02}-{end:02}"
-    return None
-
-
-def metadata_output_path(output_directory: Path, metadata: StandardBookMetadata) -> Path:
-    """Build the final M4B path from resolved metadata."""
-    stem = output_stem(metadata)
-    return output_directory / stem / f"{stem}.m4b"
-
-
-def convert_aax_file(
-    aax_file: Path,
-    destination: Path,
-    activation_bytes: str | None,
-    *,
-    overwrite: bool,
-) -> None:
-    """Convert an AAX file into an M4B file.
-
-    Args:
-        aax_file: Source AAX file.
-        destination: Destination M4B file.
-        activation_bytes: Optional Audible activation bytes for ffmpeg.
-        overwrite: Whether to overwrite an existing M4B.
-    """
-    if destination.exists() and not overwrite:
-        logger.info("Skipping existing file %s", destination)
-        return
-
-    destination.parent.mkdir(parents=True, exist_ok=True)
-    arguments = ["ffmpeg", "-hide_banner", "-y" if overwrite else "-n"]
-    if activation_bytes:
-        arguments.extend(["-activation_bytes", activation_bytes])
-    arguments.extend(["-i", str(aax_file), "-map_metadata", "0", "-c", "copy", str(destination)])
-    run_command(arguments)
-
-
-def write_review_file(
-    *,
-    destination: Path | None,
-    ffprobe_metadata: dict[str, str],
-    log_file: Path,
-    metadata: StandardBookMetadata | None,
-    reason: str,
-    review_file: Path,
-    source: Path,
-    temp_file: Path | None,
-) -> None:
-    """Write a manual review file for an unresolved conversion."""
-    review_file.parent.mkdir(parents=True, exist_ok=True)
-    payload = {
-        "destination": str(destination) if destination else None,
-        "ffprobe_metadata": ffprobe_metadata,
-        "metadata": asdict(metadata) if metadata else None,
-        "reason": reason,
-        "source": str(source),
-        "temp_file": str(temp_file) if temp_file else None,
-    }
-    review_file.write_text(json.dumps(payload, indent=2, sort_keys=True), encoding="utf-8")
-    write_agent_log(log_file, "review_written", path=str(review_file), reason=reason)
-
-
-def cleanup_temp_output(temp_file: Path) -> None:
-    """Remove a run's temporary output directory."""
-    shutil.rmtree(temp_file.parent, ignore_errors=True)
-
-
-def dry_run_aax_file_with_agent(
-    aax_file: Path,
-    ffprobe_metadata: dict[str, str],
-    engine: Engine,
-    config: ConversionConfig,
-    log_file: Path,
-    review_file: Path,
-) -> None:
-    """Resolve and print the planned output path without converting."""
-    metadata = standard_book_metadata(
-        aax_file.name,
-        ffprobe_metadata,
-        engine,
-        log_file,
-        config.ollama_api_key,
-        config.agent_config,
-    )
-    destination = None if metadata.needs_review else metadata_output_path(config.resolved_output, metadata)
-    if metadata.needs_review:
-        write_review_file(
-            destination=destination,
-            ffprobe_metadata=ffprobe_metadata,
-            log_file=log_file,
-            metadata=metadata,
-            reason="metadata_needs_review",
-            review_file=review_file,
-            source=aax_file,
-            temp_file=None,
-        )
-        typer.echo(f"{aax_file} -> REVIEW {review_file}")
-    else:
-        stem = output_stem(metadata)
-        dry_run_file = (
-            config.resolved_output / config.work_directory_name / config.dry_run_directory_name / stem / f"{stem}.m4b"
-        )
-        dry_run_file.parent.mkdir(parents=True, exist_ok=True)
-        dry_run_file.write_text(f"{destination}\n", encoding="utf-8")
-        write_agent_log(
-            log_file,
-            "dry_run_file_written",
-            destination=str(destination),
-            path=str(dry_run_file),
-        )
-        typer.echo(f"{aax_file} -> {destination}")
-
-
-def convert_temp_file_and_resolve_metadata(
-    aax_file: Path,
-    temp_file: Path,
-    ffprobe_metadata: dict[str, str],
-    config: ConversionConfig,
-    log_file: Path,
-) -> ConcurrentConversionResult:
-    """Run ffmpeg and metadata resolution in parallel."""
-    conversion_error: Exception | None = None
-    metadata_error: Exception | None = None
-    metadata: StandardBookMetadata | None = None
-
-    with ThreadPoolExecutor(max_workers=2) as executor:
-        conversion_future = executor.submit(
-            convert_aax_file,
-            aax_file,
-            temp_file,
-            config.activation_bytes,
-            overwrite=True,
-        )
-        metadata_future = executor.submit(
-            standard_book_metadata,
-            aax_file.name,
-            ffprobe_metadata,
-            config.engine,
-            log_file,
-            config.ollama_api_key,
-            config.agent_config,
-        )
-
-        conversion_error = conversion_future.exception()
-        if conversion_error is None:
-            conversion_future.result()
-
-        metadata_error = metadata_future.exception()
-        if metadata_error is None:
-            metadata = metadata_future.result()
-
-    return ConcurrentConversionResult(
-        metadata=metadata,
-        conversion_error=conversion_error,
-        metadata_error=metadata_error,
-    )
-
-
-def convert_aax_file_with_agent(aax_file: Path, config: ConversionConfig) -> None:
-    """Convert one AAX file using the metadata agent for the final path."""
-    run_id = uuid7().hex
-    log_file = config.resolved_output / config.work_directory_name / config.log_directory_name / f"{run_id}.jsonl"
-    review_file = config.resolved_output / config.work_directory_name / config.review_directory_name / f"{run_id}.json"
-    write_agent_log(log_file, "conversion_start", source=str(aax_file), dry_run=config.dry_run)
-    try:
-        ffprobe_metadata = read_metadata(aax_file)
-    except Exception as error:
-        logger.exception("ffprobe failed")
-        write_review_file(
-            destination=None,
-            ffprobe_metadata={},
-            log_file=log_file,
-            metadata=None,
-            reason=f"ffprobe_failed: {error}",
-            review_file=review_file,
-            source=aax_file,
-            temp_file=None,
-        )
-        return
-
-    if config.dry_run:
-        dry_run_aax_file_with_agent(
-            aax_file,
-            ffprobe_metadata,
-            config.engine,
-            config,
-            log_file,
-            review_file,
-        )
-        return
-
-    temp_file = (
-        config.resolved_output / config.work_directory_name / config.temp_directory_name / run_id / "converted.m4b"
-    )
-    temp_file.parent.mkdir(parents=True, exist_ok=True)
-
-    result = convert_temp_file_and_resolve_metadata(aax_file, temp_file, ffprobe_metadata, config, log_file)
-
-    if result.conversion_error:
-        reason = f"ffmpeg_failed: {result.conversion_error}"
-        write_review_file(
-            destination=None,
-            ffprobe_metadata=ffprobe_metadata,
-            log_file=log_file,
-            metadata=result.metadata,
-            reason=reason,
-            review_file=review_file,
-            source=aax_file,
-            temp_file=temp_file if temp_file.exists() else None,
-        )
-        return
-
-    if result.metadata_error:
-        write_review_file(
-            destination=None,
-            ffprobe_metadata=ffprobe_metadata,
-            log_file=log_file,
-            metadata=None,
-            reason=f"metadata_failed: {result.metadata_error}",
-            review_file=review_file,
-            source=aax_file,
-            temp_file=temp_file,
-        )
-        return
-
-    if result.metadata is None or result.metadata.needs_review:
-        write_review_file(
-            destination=None,
-            ffprobe_metadata=ffprobe_metadata,
-            log_file=log_file,
-            metadata=result.metadata,
-            reason="metadata_needs_review",
-            review_file=review_file,
-            source=aax_file,
-            temp_file=temp_file,
-        )
-        return
-
-    destination = metadata_output_path(config.resolved_output, result.metadata)
-    if destination.exists() and not config.overwrite:
-        write_agent_log(log_file, "destination_exists", destination=str(destination))
-        cleanup_temp_output(temp_file)
-        return
-
-    destination.parent.mkdir(parents=True, exist_ok=True)
-    try:
-        temp_file.replace(destination)
-    except Exception as error:  # noqa: BLE001
-        write_review_file(
-            destination=destination,
-            ffprobe_metadata=ffprobe_metadata,
-            log_file=log_file,
-            metadata=result.metadata,
-            reason=f"rename_failed: {error}",
-            review_file=review_file,
-            source=aax_file,
-            temp_file=temp_file if temp_file.exists() else None,
-        )
-    else:
-        cleanup_temp_output(temp_file)
-        write_agent_log(log_file, "conversion_complete", destination=str(destination))
-
-
-if __name__ == "__main__":
-    typer.run(main)

python/tools/audiobook/catalog.py

@@ -1,176 +0,0 @@
-"""Import audiobook catalog authors and series from CSV files."""
-
-from __future__ import annotations
-
-import csv
-import logging
-from pathlib import Path  # noqa: TC003 This is required for the typer CLI
-from typing import Annotated
-
-import typer
-from sqlalchemy import select
-from sqlalchemy.orm import Session
-
-from python.common import configure_logger
-from python.orm.common import get_postgres_engine
-from python.orm.richie import AudiobookAuthor, AudiobookSeries
-
-logger = logging.getLogger(__name__)
-
-AUTHOR_NAME_COLUMN = "author_name"
-ID_COLUMN = "id"
-NAME_COLUMN = "name"
-
-
-class CatalogImportError(ValueError):
-    """CSV catalog import failed validation."""
-
-
-def main(
-    authors_csv: Annotated[Path, typer.Argument(help="CSV with name and optional id.")],
-    series_csv: Annotated[Path, typer.Argument(help="CSV with name, author_name, and optional id.")],
-) -> None:
-    """Upsert audiobook authors and series from CSV files."""
-    configure_logger()
-    try:
-        engine = get_postgres_engine(name="RICHIE")
-        with Session(engine) as session:
-            author_count = upsert_authors_from_csv(session, authors_csv)
-            series_count = upsert_series_from_csv(session, series_csv)
-            session.commit()
-    except CatalogImportError as error:
-        typer.echo(str(error), err=True)
-        raise typer.Exit(code=1) from error
-
-    logger.info("Upserted %s authors and %s series", author_count, series_count)
-
-
-def upsert_authors_from_csv(session: Session, authors_csv: Path) -> int:
-    """Upsert authors from a CSV file."""
-    count = 0
-    for row_number, row in csv_rows(authors_csv):
-        name = required_csv_value(row, authors_csv, row_number, NAME_COLUMN)
-        upsert_author(session, name, csv_id(row, authors_csv, row_number))
-        count += 1
-    return count
-
-
-def upsert_series_from_csv(session: Session, series_csv: Path) -> int:
-    """Upsert series from a CSV file."""
-    count = 0
-    for row_number, row in csv_rows(series_csv):
-        series_name = required_csv_value(row, series_csv, row_number, NAME_COLUMN)
-        author_name = required_csv_value(row, series_csv, row_number, AUTHOR_NAME_COLUMN)
-        author = find_author_by_name(session, author_name)
-        if author is None:
-            msg = f"{series_csv}:{row_number}: author not found: {author_name}"
-            raise CatalogImportError(msg)
-        upsert_series(session, series_name, author, csv_id(row, series_csv, row_number))
-        count += 1
-    return count
-
-
-def upsert_author(session: Session, name: str, author_id: int | None) -> AudiobookAuthor:
-    """Upsert one author by id or exact name."""
-    if author_id is not None:
-        author = session.get(AudiobookAuthor, author_id)
-        if author is None:
-            author = AudiobookAuthor(id=author_id, name=name)
-            session.add(author)
-        else:
-            author.name = name
-        session.flush()
-        return author
-
-    author = find_author_by_name(session, name)
-    if author is None:
-        author = AudiobookAuthor(name=name)
-        session.add(author)
-        session.flush()
-    return author
-
-
-def upsert_series(
-    session: Session,
-    name: str,
-    author: AudiobookAuthor,
-    series_id: int | None,
-) -> AudiobookSeries:
-    """Upsert one series by id or exact author/name match."""
-    if series_id is not None:
-        series = session.get(AudiobookSeries, series_id)
-        if series is None:
-            series = AudiobookSeries(id=series_id, name=name, author=author)
-            session.add(series)
-        else:
-            series.name = name
-            series.author = author
-        session.flush()
-        return series
-
-    series = find_series_by_name_and_author(session, name, author.id)
-    if series is None:
-        series = AudiobookSeries(name=name, author=author)
-        session.add(series)
-        session.flush()
-    return series
-
-
-def find_author_by_name(session: Session, name: str) -> AudiobookAuthor | None:
-    """Find one author by exact name."""
-    return session.scalar(select(AudiobookAuthor).where(AudiobookAuthor.name == name))
-
-
-def find_series_by_name_and_author(
-    session: Session,
-    name: str,
-    author_id: int,
-) -> AudiobookSeries | None:
-    """Find one series by exact name and author."""
-    return session.scalar(
-        select(AudiobookSeries).where(
-            AudiobookSeries.name == name,
-            AudiobookSeries.author_id == author_id,
-        ),
-    )
-
-
-def csv_rows(csv_path: Path) -> list[tuple[int, dict[str, str | None]]]:
-    """Read a CSV file as numbered rows."""
-    with csv_path.open(newline="", encoding="utf-8") as file:
-        reader = csv.DictReader(file)
-        if reader.fieldnames is None:
-            msg = f"{csv_path}: missing CSV header"
-            raise CatalogImportError(msg)
-        return [(row_number, row) for row_number, row in enumerate(reader, start=2)]
-
-
-def required_csv_value(
-    row: dict[str, str | None],
-    csv_path: Path,
-    row_number: int,
-    column: str,
-) -> str:
-    """Read a required CSV value."""
-    value = row.get(column)
-    if value and value.strip():
-        return value.strip()
-    msg = f"{csv_path}:{row_number}: missing required column value: {column}"
-    raise CatalogImportError(msg)
-
-
-def csv_id(row: dict[str, str | None], csv_path: Path, row_number: int) -> int | None:
-    """Read an optional id field from a CSV row."""
-    value = row.get(ID_COLUMN)
-    if value is None or not value.strip():
-        return None
-    try:
-        return int(value)
-    except ValueError as error:
-        msg = f"{csv_path}:{row_number}: id must be an integer: {value}"
-        raise CatalogImportError(msg) from error
-    return None
-
-
-if __name__ == "__main__":
-    typer.run(main)

python/tools/audiobook/llm_tool_calling.py

@@ -1,599 +0,0 @@
-"""LLM tool calling support for audiobook metadata resolution."""
-
-from __future__ import annotations
-
-import json
-import re
-import time
-from collections.abc import Callable
-from dataclasses import dataclass
-from typing import TYPE_CHECKING
-
-from sqlalchemy import or_, select
-
-from python.orm.richie import Audiobook, AudiobookAuthor, AudiobookSeries
-
-if TYPE_CHECKING:
-    from pathlib import Path
-
-    from sqlalchemy.orm import Session
-
-    from python.tools.audiobook.metadata_agent import AgentConfig
-
-CATALOG_SLUG_PATTERN = re.compile(r"^[a-z0-9]+(?:_[a-z0-9]+)*$")
-TITLE_SLUG_PATTERN = re.compile(r"^[a-z0-9]+(?:-[a-z0-9]+)*$")
-
-LogWriter = Callable[..., None]
-
-
-class MetadataResolutionError(ValueError):
-    """Metadata resolution failed validation."""
-
-
-@dataclass(frozen=True)
-class EnsuredBook:
-    """Book row plus whether it was created."""
-
-    book: Audiobook
-    action: str
-
-
-class CatalogToolRegistry:
-    """Controlled catalog tools exposed to the metadata model."""
-
-    def __init__(
-        self,
-        session: Session,
-        log_path: Path,
-        config: AgentConfig,
-        write_log: LogWriter,
-    ) -> None:
-        """Create a registry bound to one database session and audit log."""
-        self.session = session
-        self.log_path = log_path
-        self.config = config
-        self.write_log = write_log
-        self.seen_author_ids: set[int] = set()
-        self.seen_series_ids: set[int] = set()
-        self.seen_book_ids: set[int] = set()
-        self.created_author_ids: set[int] = set()
-        self.created_series_ids: set[int] = set()
-        self.created_book_ids: set[int] = set()
-
-    def tool_schemas(self) -> list[dict[str, object]]:
-        """Return Ollama tool schemas."""
-        schemas = [
-            {
-                "type": "function",
-                "function": {
-                    "name": "search_authors",
-                    "description": "Search canonical audiobook authors by slug or noisy source text.",
-                    "parameters": {
-                        "type": "object",
-                        "properties": {"query": {"type": "string"}},
-                        "required": ["query"],
-                    },
-                },
-            },
-            {
-                "type": "function",
-                "function": {
-                    "name": "search_series",
-                    "description": "Search canonical audiobook series by slug or noisy source text.",
-                    "parameters": {
-                        "type": "object",
-                        "properties": {
-                            "query": {"type": "string"},
-                            "author_id": {"type": ["integer", "null"]},
-                        },
-                        "required": ["query"],
-                    },
-                },
-            },
-            {
-                "type": "function",
-                "function": {
-                    "name": "search_books",
-                    "description": "Search canonical audiobook titles with optional author and series filters.",
-                    "parameters": {
-                        "type": "object",
-                        "properties": {
-                            "query": {"type": "string"},
-                            "author_id": {"type": ["integer", "null"]},
-                            "series_id": {"type": ["integer", "null"]},
-                        },
-                        "required": ["query"],
-                    },
-                },
-            },
-            {
-                "type": "function",
-                "function": {
-                    "name": "ensure_author",
-                    "description": "Normalize an author name to a catalog slug, then return or create that author.",
-                    "parameters": {
-                        "type": "object",
-                        "properties": {"name": {"type": "string"}},
-                        "required": ["name"],
-                    },
-                },
-            },
-            {
-                "type": "function",
-                "function": {
-                    "name": "ensure_series",
-                    "description": "Normalize a series name to a catalog slug, then return or create it for an author.",
-                    "parameters": {
-                        "type": "object",
-                        "properties": {
-                            "name": {"type": "string"},
-                            "author_id": {"type": "integer"},
-                        },
-                        "required": ["name", "author_id"],
-                    },
-                },
-            },
-            {
-                "type": "function",
-                "function": {
-                    "name": "ensure_book",
-                    "description": "Normalize a title to a book slug, then return or create it for an author/series.",
-                    "parameters": {
-                        "type": "object",
-                        "properties": {
-                            "title": {"type": "string"},
-                            "author_id": {"type": "integer"},
-                            "series_id": {"type": ["integer", "null"]},
-                            "series_index": {"type": "number", "multipleOf": 0.5},
-                        },
-                        "required": ["title", "author_id", "series_id", "series_index"],
-                    },
-                },
-            },
-        ]
-        enabled_tool_names = set(self.config.tool_names)
-        return [schema for schema in schemas if schema["function"]["name"] in enabled_tool_names]
-
-    def run(self, name: str, arguments: dict[str, object]) -> list[dict[str, object]]:
-        """Run one catalog tool and audit the call."""
-        handlers = {
-            "search_authors": self.run_search_authors,
-            "search_series": self.run_search_series,
-            "search_books": self.run_search_books,
-            "ensure_author": self.run_ensure_author,
-            "ensure_series": self.run_ensure_series,
-            "ensure_book": self.run_ensure_book,
-        }
-        handler = handlers.get(name)
-        if handler is None:
-            self.write_log(self.log_path, "tool_error", tool=name, arguments=arguments, error="unknown_tool")
-            msg = f"Unknown audiobook metadata tool: {name}"
-            raise MetadataResolutionError(msg)
-        if name not in self.config.tool_names:
-            self.write_log(self.log_path, "tool_error", tool=name, arguments=arguments, error="tool_not_enabled")
-            msg = f"Audiobook metadata tool is not enabled: {name}"
-            raise MetadataResolutionError(msg)
-
-        started = time.perf_counter()
-        self.write_log(self.log_path, "tool_call", tool=name, arguments=arguments)
-        result = handler(arguments)
-        duration_ms = round((time.perf_counter() - started) * 1000, 3)
-        self.write_log(
-            self.log_path,
-            "tool_result",
-            tool=name,
-            duration_ms=duration_ms,
-            result_count=len(result),
-            preview=result[:3],
-        )
-        return result
-
-    def get_author(self, author_id: int) -> AudiobookAuthor | None:
-        """Return an author by id."""
-        return self.session.get(AudiobookAuthor, author_id)
-
-    def get_book(self, book_id: int) -> Audiobook | None:
-        """Return a book by id."""
-        return self.session.get(Audiobook, book_id)
-
-    def get_series(self, series_id: int) -> AudiobookSeries | None:
-        """Return a series by id."""
-        return self.session.get(AudiobookSeries, series_id)
-
-    def prune_unused_created_rows(self, *, author_id: int, book_id: int | None, series_id: int | None) -> None:
-        """Remove catalog rows created during this run but not used by final metadata."""
-        used_book_ids = {book_id} if book_id is not None else set()
-        for created_book_id in self.created_book_ids - used_book_ids:
-            if book := self.get_book(created_book_id):
-                self.session.delete(book)
-
-        self.session.flush()
-        used_series_ids = {series_id} if series_id is not None else set()
-        for created_series_id in self.created_series_ids - used_series_ids:
-            series = self.get_series(created_series_id)
-            if series and not series.books:
-                self.session.delete(series)
-
-        self.session.flush()
-        for created_author_id in self.created_author_ids - {author_id}:
-            author = self.get_author(created_author_id)
-            if author and not author.books and not author.series:
-                self.session.delete(author)
-
-    def run_search_authors(self, arguments: dict[str, object]) -> list[dict[str, object]]:
-        """Search authors from tool arguments and remember returned ids."""
-        query = required_string(arguments, "query")
-        statement = select(AudiobookAuthor).order_by(AudiobookAuthor.name).limit(self.config.max_tool_results)
-        if terms := query_terms(query):
-            statement = statement.where(or_(*(AudiobookAuthor.name.ilike(f"%{term}%") for term in terms)))
-
-        authors = self.session.scalars(statement).all()
-        self.seen_author_ids.update(author.id for author in authors)
-        return [{"id": author.id, "name": author.name} for author in authors]
-
-    def run_search_series(self, arguments: dict[str, object]) -> list[dict[str, object]]:
-        """Search series from tool arguments and remember returned ids."""
-        query = required_string(arguments, "query")
-        author_id = optional_int(arguments.get("author_id"), "author_id")
-        statement = select(AudiobookSeries).order_by(AudiobookSeries.name).limit(self.config.max_tool_results)
-        if terms := query_terms(query):
-            statement = statement.where(or_(*(AudiobookSeries.name.ilike(f"%{term}%") for term in terms)))
-        if author_id is not None:
-            statement = statement.where(AudiobookSeries.author_id == author_id)
-
-        series_rows = self.session.scalars(statement).all()
-        self.seen_series_ids.update(series.id for series in series_rows)
-        self.seen_author_ids.update(series.author_id for series in series_rows)
-        return [
-            {
-                "id": series.id,
-                "name": series.name,
-                "author_id": series.author_id,
-                "author": series.author.name,
-            }
-            for series in series_rows
-        ]
-
-    def run_search_books(self, arguments: dict[str, object]) -> list[dict[str, object]]:
-        """Search books from tool arguments and remember returned ids."""
-        query = required_string(arguments, "query")
-        author_id = optional_int(arguments.get("author_id"), "author_id")
-        series_id = optional_int(arguments.get("series_id"), "series_id")
-        statement = select(Audiobook).order_by(Audiobook.title).limit(self.config.max_tool_results)
-        if terms := query_terms(query):
-            statement = statement.where(or_(*(Audiobook.title.ilike(f"%{term}%") for term in terms)))
-        if author_id is not None:
-            statement = statement.where(Audiobook.author_id == author_id)
-        if series_id is not None:
-            statement = statement.where(Audiobook.series_id == series_id)
-
-        books = self.session.scalars(statement).all()
-        self.seen_book_ids.update(book.id for book in books)
-        self.seen_author_ids.update(book.author_id for book in books)
-        self.seen_series_ids.update(book.series_id for book in books if book.series_id is not None)
-        return [
-            {
-                "id": book.id,
-                "title": book.title,
-                "author_id": book.author_id,
-                "author": book.author.name,
-                "series_id": book.series_id,
-                "series": book.series.name if book.series else self.config.standalone_series,
-                "series_index": book.series_index,
-            }
-            for book in books
-        ]
-
-    def run_ensure_author(self, arguments: dict[str, object]) -> list[dict[str, object]]:
-        """Ensure an author from tool arguments and return a tool result."""
-        name = normalize_catalog_slug(required_string(arguments, "name"))
-        validate_catalog_slug(name, "author")
-        author = self.session.scalar(select(AudiobookAuthor).where(AudiobookAuthor.name == name))
-        action = "existing"
-        if author is None:
-            author = AudiobookAuthor(name=name)
-            self.session.add(author)
-            self.session.flush()
-            self.created_author_ids.add(author.id)
-            action = "created"
-
-        self.seen_author_ids.add(author.id)
-        return [{"id": author.id, "name": author.name, "action": action}]
-
-    def run_ensure_series(self, arguments: dict[str, object]) -> list[dict[str, object]]:
-        """Ensure a series from tool arguments and return a tool result."""
-        name = normalize_catalog_slug(required_string(arguments, "name"))
-        author_id = required_int(arguments, "author_id")
-        validate_catalog_slug(name, "series")
-        author = self.required_author(author_id)
-        series = self.find_series_by_catalog_slug(name, author.id)
-        action = "existing"
-        if series is None:
-            series = AudiobookSeries(name=name, author=author)
-            self.session.add(series)
-            self.session.flush()
-            self.created_series_ids.add(series.id)
-            action = "created"
-
-        self.seen_author_ids.add(author.id)
-        self.seen_series_ids.add(series.id)
-        return [self.series_result(series, action)]
-
-    def run_ensure_book(self, arguments: dict[str, object]) -> list[dict[str, object]]:
-        """Ensure a book from tool arguments and return a tool result."""
-        title = required_string(arguments, "title")
-        author_id = required_int(arguments, "author_id")
-        series_id = optional_int(arguments.get("series_id"), "series_id")
-        series_index = required_series_index(arguments, "series_index")
-        ensured = self.ensure_book(title, author_id, series_id, series_index)
-        return [self.book_result(ensured.book, ensured.action)]
-
-    def ensure_book(
-        self,
-        title: str,
-        author_id: int,
-        series_id: int | None,
-        series_index: float,
-    ) -> EnsuredBook:
-        """Return an existing book row, or create it after validating ownership."""
-        title = normalize_title_slug(title)
-        validate_title_slug(title)
-        author = self.required_author(author_id)
-        series = None
-        if series_id is None:
-            if series_index != 0:
-                msg = "standalone books must use series_index 0"
-                raise MetadataResolutionError(msg)
-        else:
-            series = self.required_series(series_id)
-            if series.author_id != author.id:
-                msg = f"series_id {series_id} does not belong to author_id {author_id}"
-                raise MetadataResolutionError(msg)
-            if series_index <= 0:
-                msg = "series books must use a positive series_index"
-                raise MetadataResolutionError(msg)
-
-        statement = select(Audiobook).where(
-            Audiobook.title == title,
-            Audiobook.author_id == author.id,
-        )
-        if series is None:
-            statement = statement.where(Audiobook.series_id.is_(None))
-        else:
-            statement = statement.where(Audiobook.series_id == series.id)
-        book = self.session.scalar(statement)
-        if book is None:
-            book = Audiobook(title=title, author=author, series=series, series_index=series_index)
-            self.session.add(book)
-            self.session.flush()
-            self.created_book_ids.add(book.id)
-            action = "created"
-        else:
-            action = "existing"
-
-        self.seen_book_ids.add(book.id)
-        self.seen_author_ids.add(author.id)
-        if book.series_id is not None:
-            self.seen_series_ids.add(book.series_id)
-        return EnsuredBook(book=book, action=action)
-
-    def required_author(self, author_id: int) -> AudiobookAuthor:
-        """Return an author or fail metadata resolution."""
-        author = self.get_author(author_id)
-        if author is None:
-            msg = f"author_id {author_id} does not exist"
-            raise MetadataResolutionError(msg)
-        return author
-
-    def required_series(self, series_id: int) -> AudiobookSeries:
-        """Return a series or fail metadata resolution."""
-        series = self.get_series(series_id)
-        if series is None:
-            msg = f"series_id {series_id} does not exist"
-            raise MetadataResolutionError(msg)
-        return series
-
-    def find_series_by_catalog_slug(self, name: str, author_id: int) -> AudiobookSeries | None:
-        """Return a series by exact slug or underscore-insensitive slug."""
-        exact = self.session.scalar(
-            select(AudiobookSeries).where(
-                AudiobookSeries.name == name,
-                AudiobookSeries.author_id == author_id,
-            ),
-        )
-        if exact is not None:
-            return exact
-
-        compact_name = compact_catalog_slug(name)
-        series_rows = self.session.scalars(
-            select(AudiobookSeries).where(AudiobookSeries.author_id == author_id).order_by(AudiobookSeries.name),
-        ).all()
-        for series in series_rows:
-            if compact_catalog_slug(series.name) == compact_name:
-                return series
-        return None
-
-    def series_result(self, series: AudiobookSeries, action: str) -> dict[str, object]:
-        """Build a normalized series tool result."""
-        return {
-            "id": series.id,
-            "name": series.name,
-            "author_id": series.author_id,
-            "author": series.author.name,
-            "action": action,
-        }
-
-    def book_result(self, book: Audiobook, action: str) -> dict[str, object]:
-        """Build a normalized book tool result."""
-        return {
-            "id": book.id,
-            "title": book.title,
-            "author_id": book.author_id,
-            "author": book.author.name,
-            "series_id": book.series_id,
-            "series": book.series.name if book.series else self.config.standalone_series,
-            "series_index": book.series_index,
-            "action": action,
-        }
-
-
-def run_tool_calls(
-    messages: list[dict[str, object]],
-    message: dict[str, object],
-    tool_calls: list[tuple[str, dict[str, object]]],
-    registry: CatalogToolRegistry,
-    log_path: Path,
-    write_log: LogWriter,
-) -> str | None:
-    """Run tool calls, append tool messages, and return fatal error text when stopped."""
-    messages.append(message)
-    for tool_name, arguments in tool_calls:
-        try:
-            tool_result = registry.run(tool_name, arguments)
-        except MetadataResolutionError as error:
-            if is_fatal_tool_error(error):
-                return str(error)
-            write_log(log_path, "tool_error", tool=tool_name, arguments=arguments, error=str(error))
-            messages.append(
-                {
-                    "role": "tool",
-                    "tool_name": tool_name,
-                    "content": json.dumps({"error": str(error)}, sort_keys=True),
-                },
-            )
-            continue
-        messages.append(
-            {
-                "role": "tool",
-                "tool_name": tool_name,
-                "content": json.dumps(tool_result, sort_keys=True),
-            },
-        )
-    return None
-
-
-def parse_tool_calls(message: dict[str, object]) -> list[tuple[str, dict[str, object]]]:
-    """Parse Ollama tool calls from a response message."""
-    raw_tool_calls = message.get("tool_calls") or []
-    if not isinstance(raw_tool_calls, list):
-        msg = "tool_calls must be a list"
-        raise MetadataResolutionError(msg)
-
-    tool_calls = []
-    for raw_call in raw_tool_calls:
-        if not isinstance(raw_call, dict):
-            msg = "tool call must be an object"
-            raise MetadataResolutionError(msg)
-        function = raw_call.get("function")
-        if not isinstance(function, dict):
-            msg = "tool call is missing function"
-            raise MetadataResolutionError(msg)
-        name = function.get("name")
-        if not isinstance(name, str) or not name:
-            msg = "tool call is missing function name"
-            raise MetadataResolutionError(msg)
-        arguments = parse_tool_arguments(function.get("arguments", {}))
-        tool_calls.append((name, arguments))
-    return tool_calls
-
-
-def parse_tool_arguments(raw_arguments: object) -> dict[str, object]:
-    """Parse tool call arguments returned by Ollama."""
-    if isinstance(raw_arguments, dict):
-        return {str(key): value for key, value in raw_arguments.items()}
-    if isinstance(raw_arguments, str):
-        parsed = json.loads(raw_arguments) if raw_arguments else {}
-        if isinstance(parsed, dict):
-            return {str(key): value for key, value in parsed.items()}
-    msg = "tool arguments must be an object"
-    raise MetadataResolutionError(msg)
-
-
-def validate_title_slug(title: str) -> None:
-    """Validate a canonical book title slug."""
-    if not TITLE_SLUG_PATTERN.fullmatch(title):
-        msg = f"title slug is invalid: {title}"
-        raise MetadataResolutionError(msg)
-
-
-def validate_catalog_slug(value: str, label: str) -> None:
-    """Validate a canonical catalog slug."""
-    if not CATALOG_SLUG_PATTERN.fullmatch(value):
-        msg = f"{label} slug is invalid: {value}"
-        raise MetadataResolutionError(msg)
-
-
-def normalize_catalog_slug(value: str) -> str:
-    """Normalize noisy catalog names into lower snake-case slugs."""
-    return re.sub(r"[^a-z0-9]+", "_", value.strip().casefold()).strip("_")
-
-
-def compact_catalog_slug(value: str) -> str:
-    """Return a catalog slug comparison key that ignores underscores."""
-    return normalize_catalog_slug(value).replace("_", "")
-
-
-def normalize_title_slug(value: str) -> str:
-    """Normalize noisy book titles into lower kebab-case slugs."""
-    return re.sub(r"[^a-z0-9]+", "-", value.strip().casefold()).strip("-")
-
-
-def is_fatal_tool_error(error: MetadataResolutionError) -> bool:
-    """Return whether a tool error should stop the agent immediately."""
-    message = str(error)
-    return message.startswith(
-        (
-            "Unknown audiobook metadata tool",
-            "Audiobook metadata tool is not enabled",
-        ),
-    )
-
-
-def query_terms(query: str) -> tuple[str, ...]:
-    """Return text variants useful for matching noisy audiobook metadata."""
-    normalized = query.strip().casefold()
-    underscore_slug = normalize_catalog_slug(normalized)
-    compact_slug = compact_catalog_slug(normalized)
-    hyphen_slug = normalize_title_slug(normalized)
-    return tuple(dict.fromkeys(term for term in (normalized, underscore_slug, compact_slug, hyphen_slug) if term))
-
-
-def required_string(data: dict[str, object], key: str) -> str:
-    """Read a required string field."""
-    value = data.get(key)
-    if not isinstance(value, str) or not value.strip():
-        msg = f"{key} must be a non-empty string"
-        raise MetadataResolutionError(msg)
-    return value.strip()
-
-
-def required_int(data: dict[str, object], key: str) -> int:
-    """Read a required integer field."""
-    value = data.get(key)
-    if isinstance(value, bool) or not isinstance(value, int):
-        msg = f"{key} must be an integer"
-        raise MetadataResolutionError(msg)
-    return value
-
-
-def required_series_index(data: dict[str, object], key: str) -> float:
-    """Read a required whole-number or half-number series index."""
-    value = data.get(key)
-    if isinstance(value, bool) or not isinstance(value, int | float):
-        msg = f"{key} must be a number"
-        raise MetadataResolutionError(msg)
-    series_index = float(value)
-    if not (series_index * 2).is_integer():
-        msg = f"{key} must be a whole number or .5 increment"
-        raise MetadataResolutionError(msg)
-    return series_index
-
-
-def optional_int(value: object, key: str) -> int | None:
-    """Read an optional integer field."""
-    if value is None:
-        return None
-    if isinstance(value, bool) or not isinstance(value, int):
-        msg = f"{key} must be an integer or null"
-        raise MetadataResolutionError(msg)
-    return value

python/tools/audiobook/metadata_agent.py

@@ -1,575 +0,0 @@
-"""Resolve audiobook metadata with a controlled Ollama tool loop."""
-
-from __future__ import annotations
-
-import json
-import re
-from dataclasses import asdict, dataclass, is_dataclass, replace
-from os import PathLike
-from typing import TYPE_CHECKING
-
-import httpx
-from sqlalchemy.orm import Session
-
-from python.common import utcnow
-from python.tools.audiobook.llm_tool_calling import (
-    CatalogToolRegistry,
-    MetadataResolutionError,
-    normalize_title_slug,
-    optional_int,
-    parse_tool_calls,
-    required_int,
-    required_series_index,
-    required_string,
-    run_tool_calls,
-    validate_catalog_slug,
-    validate_title_slug,
-)
-
-if TYPE_CHECKING:
-    from pathlib import Path
-
-    from sqlalchemy.engine import Engine
-
-    from python.orm.richie import AudiobookAuthor
-
-FENCED_JSON_PATTERN = re.compile(r"^```(?:json)?\s*(?P<json>.*?)\s*```$", re.IGNORECASE | re.DOTALL)
-
-
-@dataclass(frozen=True)
-class AgentConfig:
-    """Runtime settings for the audiobook metadata agent."""
-
-    model: str = "deepseek-v4-flash:cloud"
-    ollama_chat_url: str = "https://ollama.com/api/chat"
-    http_timeout_seconds: int = 300
-    max_agent_turns: int = 8
-    max_tool_results: int = 10
-    min_confidence: float = 0.85
-    invalid_final_retries: int = 1
-    standalone_series: str = "standalone"
-    tool_names: tuple[str, ...] = (
-        "search_authors",
-        "search_series",
-        "search_books",
-        "ensure_author",
-        "ensure_series",
-        "ensure_book",
-    )
-
-
-@dataclass(frozen=True)
-class StandardBookMetadata:
-    """Canonical metadata for the final audiobook path."""
-
-    author_id: int
-    author: str
-    book_id: int | None
-    title: str
-    series_id: int | None
-    series: str
-    series_index: float
-    confidence: float
-    needs_review: bool
-    evidence: list[str]
-
-
-@dataclass(frozen=True)
-class FinalMetadataFields:
-    """Raw model fields after schema validation."""
-
-    author_id: int
-    book_id: int | None
-    title: str
-    series_id: int | None
-    series_index: float
-    confidence: float
-    evidence: list[str]
-
-
-@dataclass(frozen=True)
-class ResolvedBookFields:
-    """Book fields after optional catalog book resolution."""
-
-    book_id: int | None
-    title: str
-    series_id: int | None
-    series_index: float
-
-
-@dataclass(frozen=True)
-class AgentStepResult:
-    """Outcome from one model response."""
-
-    metadata: StandardBookMetadata | None
-    invalid_final_count: int
-    should_continue: bool
-
-
-def standard_book_metadata(
-    aax_file_name: str,
-    aax_metadata_from_ffprobe: dict[str, str],
-    engine: Engine,
-    log_path: Path,
-    ollama_api_key: str,
-    config: AgentConfig,
-) -> StandardBookMetadata:
-    """Resolve canonical audiobook metadata with the configured Ollama Cloud model."""
-    with Session(engine) as session:
-        registry = CatalogToolRegistry(session, log_path, config, write_agent_log)
-        agent = AudiobookMetadataAgent(
-            registry=registry, log_path=log_path, ollama_api_key=ollama_api_key, config=config
-        )
-        metadata = agent.run(aax_file_name, aax_metadata_from_ffprobe)
-        if metadata.needs_review:
-            session.rollback()
-        else:
-            registry.prune_unused_created_rows(
-                author_id=metadata.author_id,
-                book_id=metadata.book_id,
-                series_id=metadata.series_id,
-            )
-            session.commit()
-        return metadata
-
-
-class AudiobookMetadataAgent:
-    """Ollama-backed metadata resolver with a fixed local tool registry."""
-
-    def __init__(
-        self,
-        *,
-        registry: CatalogToolRegistry,
-        log_path: Path,
-        ollama_api_key: str,
-        config: AgentConfig,
-    ) -> None:
-        """Create an Ollama metadata agent."""
-        self._registry = registry
-        self._log_path = log_path
-        self._ollama_api_key = ollama_api_key
-        self._config = config
-
-    def run(self, aax_file_name: str, aax_metadata_from_ffprobe: dict[str, str]) -> StandardBookMetadata:
-        """Resolve metadata for one AAX file."""
-        messages = [
-            {"role": "system", "content": system_prompt()},
-            {"role": "user", "content": user_prompt(aax_file_name, aax_metadata_from_ffprobe)},
-        ]
-        invalid_final_count = 0
-        result: StandardBookMetadata | None = None
-
-        for turn in range(1, self._config.max_agent_turns + 1):
-            step = self.run_step(messages, turn, invalid_final_count)
-            invalid_final_count = step.invalid_final_count
-            if step.should_continue:
-                continue
-            result = step.metadata
-            break
-
-        if result is None:
-            return self.force_final_response(messages)
-        return result
-
-    def run_step(
-        self,
-        messages: list[dict[str, object]],
-        turn: int,
-        invalid_final_count: int,
-    ) -> AgentStepResult:
-        """Run one model turn and return the next agent-loop action."""
-        data = self.chat(messages, turn)
-        message = data.get("message")
-        if not isinstance(message, dict):
-            return AgentStepResult(
-                metadata=review_metadata("Ollama response did not include a message", self._config),
-                invalid_final_count=invalid_final_count,
-                should_continue=False,
-            )
-
-        try:
-            tool_calls = parse_tool_calls(message)
-        except (json.JSONDecodeError, MetadataResolutionError) as error:
-            return AgentStepResult(
-                metadata=review_metadata(str(error), self._config),
-                invalid_final_count=invalid_final_count,
-                should_continue=False,
-            )
-        if tool_calls:
-            fatal_error = run_tool_calls(messages, message, tool_calls, self._registry, self._log_path, write_agent_log)
-            if fatal_error is not None:
-                return AgentStepResult(
-                    metadata=review_metadata(fatal_error, self._config),
-                    invalid_final_count=invalid_final_count,
-                    should_continue=False,
-                )
-            return AgentStepResult(metadata=None, invalid_final_count=invalid_final_count, should_continue=True)
-        return self.handle_final_message(messages, message, invalid_final_count)
-
-    def handle_final_message(
-        self,
-        messages: list[dict[str, object]],
-        message: dict[str, object],
-        invalid_final_count: int,
-    ) -> AgentStepResult:
-        """Validate a final model message or request one retry."""
-        content = message.get("content")
-        if not isinstance(content, str):
-            return AgentStepResult(
-                metadata=review_metadata("Ollama final response did not include string content", self._config),
-                invalid_final_count=invalid_final_count,
-                should_continue=False,
-            )
-
-        try:
-            resolved = self.validate_final(parse_final_json_content(content))
-        except (json.JSONDecodeError, MetadataResolutionError) as error:
-            return self.handle_invalid_final(messages, error, invalid_final_count)
-
-        write_agent_log(self._log_path, "final_metadata", metadata=resolved)
-        return AgentStepResult(metadata=resolved, invalid_final_count=invalid_final_count, should_continue=False)
-
-    def handle_invalid_final(
-        self,
-        messages: list[dict[str, object]],
-        error: json.JSONDecodeError | MetadataResolutionError,
-        invalid_final_count: int,
-    ) -> AgentStepResult:
-        """Log invalid final JSON and either retry or return review metadata."""
-        invalid_final_count += 1
-        write_agent_log(
-            self._log_path,
-            "final_validation_error",
-            error=str(error),
-            invalid_final_count=invalid_final_count,
-        )
-        if invalid_final_count > self._config.invalid_final_retries:
-            return AgentStepResult(
-                metadata=review_metadata(str(error), self._config),
-                invalid_final_count=invalid_final_count,
-                should_continue=False,
-            )
-        messages.append(
-            {
-                "role": "user",
-                "content": (
-                    "Your previous final answer was invalid. Return only valid JSON matching the required "
-                    f"schema. Validation error: {error}"
-                ),
-            },
-        )
-        return AgentStepResult(metadata=None, invalid_final_count=invalid_final_count, should_continue=True)
-
-    def force_final_response(self, messages: list[dict[str, object]]) -> StandardBookMetadata:
-        """Request a no-tool final answer after the normal turn limit."""
-        messages.append({"role": "user", "content": forced_final_prompt()})
-        write_agent_log(self._log_path, "forced_final_request", reason="max_turns")
-        data = self.chat(messages, self._config.max_agent_turns + 1, tools_enabled=False)
-        message = data.get("message")
-        if not isinstance(message, dict):
-            return review_metadata("Ollama forced final response did not include a message", self._config)
-        content = message.get("content")
-        if not isinstance(content, str):
-            return review_metadata("Ollama forced final response did not include string content", self._config)
-        try:
-            resolved = self.validate_final(parse_final_json_content(content))
-        except (json.JSONDecodeError, MetadataResolutionError) as error:
-            return review_metadata(f"Ollama forced final response was invalid: {error}", self._config)
-        write_agent_log(self._log_path, "final_metadata", metadata=resolved)
-        return resolved
-
-    def chat(self, messages: list[dict[str, object]], turn: int, *, tools_enabled: bool = True) -> dict[str, object]:
-        """Send one chat request to Ollama and log the request and response."""
-        payload = {
-            "model": self._config.model,
-            "messages": messages,
-            "stream": False,
-            "options": {"temperature": 0.1},
-        }
-        tool_names = []
-        if tools_enabled:
-            payload["tools"] = self._registry.tool_schemas()
-            tool_names = self._config.tool_names
-        write_agent_log(
-            self._log_path,
-            "model_request",
-            model=self._config.model,
-            turn=turn,
-            message_count=len(messages),
-            tool_names=tool_names,
-            tools_enabled=tools_enabled,
-        )
-        write_agent_log(
-            self._log_path,
-            "llm_messages_sent",
-            model=self._config.model,
-            turn=turn,
-            messages=messages,
-            tools_enabled=tools_enabled,
-        )
-        response = httpx.post(
-            self._config.ollama_chat_url,
-            headers={"Authorization": f"Bearer {self._ollama_api_key}"},
-            json=payload,
-            timeout=self._config.http_timeout_seconds,
-        )
-        response.raise_for_status()
-        raw_data = response.json()
-        if not isinstance(raw_data, dict):
-            return {}
-        data = {str(key): value for key, value in raw_data.items()}
-        message = data.get("message", {})
-        content = message.get("content") if isinstance(message, dict) else ""
-        write_agent_log(
-            self._log_path,
-            "llm_message_received",
-            model=self._config.model,
-            turn=turn,
-            message=message,
-        )
-        write_agent_log(
-            self._log_path,
-            "model_response",
-            model=self._config.model,
-            turn=turn,
-            has_tool_calls=bool(isinstance(message, dict) and message.get("tool_calls")),
-            content_chars=len(content) if isinstance(content, str) else 0,
-        )
-        return data
-
-    def validate_final(self, raw_metadata: object) -> StandardBookMetadata:
-        """Validate final model metadata against catalog rows."""
-        fields = parse_final_metadata_fields(raw_metadata)
-        fields = replace(fields, title=normalize_title_slug(fields.title))
-        author = self.validate_author(fields.author_id)
-        validate_title_slug(fields.title)
-        book_fields = self.resolve_book_fields(fields)
-        series = self.validate_series(fields.author_id, book_fields.series_id, book_fields.series_index)
-
-        return StandardBookMetadata(
-            author_id=fields.author_id,
-            author=author.name,
-            book_id=book_fields.book_id,
-            title=book_fields.title,
-            series_id=book_fields.series_id,
-            series=series,
-            series_index=book_fields.series_index,
-            confidence=fields.confidence,
-            needs_review=fields.confidence < self._config.min_confidence,
-            evidence=fields.evidence,
-        )
-
-    def validate_author(self, author_id: int) -> AudiobookAuthor:
-        """Validate that an author id was seen and exists."""
-        if author_id not in self._registry.seen_author_ids:
-            msg = f"author_id {author_id} was not returned by search_authors"
-            raise MetadataResolutionError(msg)
-        author = self._registry.get_author(author_id)
-        if author is None:
-            msg = f"author_id {author_id} does not exist"
-            raise MetadataResolutionError(msg)
-        validate_catalog_slug(author.name, "author")
-        return author
-
-    def resolve_book_fields(self, fields: FinalMetadataFields) -> ResolvedBookFields:
-        """Resolve final book fields from a seen book id or created book."""
-        if fields.book_id is None:
-            ensured = self._registry.ensure_book(
-                fields.title,
-                fields.author_id,
-                fields.series_id,
-                fields.series_index,
-            )
-            return ResolvedBookFields(
-                book_id=ensured.book.id,
-                title=ensured.book.title,
-                series_id=ensured.book.series_id,
-                series_index=ensured.book.series_index,
-            )
-
-        if fields.book_id not in self._registry.seen_book_ids:
-            msg = f"book_id {fields.book_id} was not returned by search_books"
-            raise MetadataResolutionError(msg)
-        book = self._registry.get_book(fields.book_id)
-        if book is None:
-            msg = f"book_id {fields.book_id} does not exist"
-            raise MetadataResolutionError(msg)
-        if book.author_id != fields.author_id:
-            msg = f"book_id {fields.book_id} does not belong to author_id {fields.author_id}"
-            raise MetadataResolutionError(msg)
-        return ResolvedBookFields(
-            book_id=fields.book_id,
-            title=book.title,
-            series_id=book.series_id,
-            series_index=book.series_index,
-        )
-
-    def validate_series(self, author_id: int, series_id: int | None, series_index: float) -> str:
-        """Validate final series fields and return the canonical series slug."""
-        if series_id is None:
-            if series_index != 0:
-                msg = "standalone books must use series_index 0"
-                raise MetadataResolutionError(msg)
-            return self._config.standalone_series
-
-        if series_id not in self._registry.seen_series_ids:
-            msg = f"series_id {series_id} was not returned by search_series"
-            raise MetadataResolutionError(msg)
-        series = self._registry.get_series(series_id)
-        if series is None:
-            msg = f"series_id {series_id} does not exist"
-            raise MetadataResolutionError(msg)
-        if series.author_id != author_id:
-            msg = f"series_id {series_id} does not belong to author_id {author_id}"
-            raise MetadataResolutionError(msg)
-        if series_index <= 0:
-            msg = "series books must use a positive series_index"
-            raise MetadataResolutionError(msg)
-        validate_catalog_slug(series.name, "series")
-        return series.name
-
-
-def write_agent_log(log_path: Path, event: str, **fields: object) -> None:
-    """Append one JSONL audit event."""
-    log_path.parent.mkdir(parents=True, exist_ok=True)
-    record = {
-        "created": utcnow().isoformat(),
-        "event": event,
-        **{key: json_log_value(value) for key, value in fields.items()},
-    }
-    with log_path.open("a", encoding="utf-8") as file:
-        file.write(json.dumps(record, sort_keys=True))
-        file.write("\n")
-
-
-def json_log_value(value: object) -> object:
-    """Return a JSON-serializable value for audit logs."""
-    if is_dataclass(value) and not isinstance(value, type):
-        return json_log_value(asdict(value))
-    if isinstance(value, dict):
-        return {str(key): json_log_value(item) for key, item in value.items()}
-    if isinstance(value, list | tuple):
-        return [json_log_value(item) for item in value]
-    if isinstance(value, set):
-        return [json_log_value(item) for item in sorted(value, key=str)]
-    if isinstance(value, PathLike):
-        return str(value)
-    return value
-
-
-def system_prompt() -> str:
-    """Return the stable system prompt."""
-    return """You standardize Audible audiobook metadata against a private catalog.
-
-Rules:
-- You must use the provided tools before returning final metadata.
-- Only use author_id, series_id, or book_id values returned by tools.
-- Return final metadata as JSON only. Do not wrap it in Markdown.
-- The final JSON object must contain author_id, book_id, title, series_id, series_index, confidence, and evidence.
-- title must be a canonical title slug using lower-case words separated by hyphens.
-- Use series_id null and series_index 0 for standalone books.
-- If you use a series_id, series_index must be a whole number or .5 value greater than 0.
-- Treat series slugs that differ only by underscores as the same series. Prefer the existing catalog row instead of
-  creating a new series.
-- Detect omnibus or box-set editions that contain multiple numbered novels, books, or novellas.
-- For an omnibus, make a best-effort range from the filename, tags, and catalog rows. Keep series_index as the
-  first covered book number and include the range in the title when the source title includes it, for example
-  books-1-3.
-- Be careful with omnibuses of novels or novellas later published as one book: keep the omnibus as the audiobook's
-  book record unless catalog rows clearly identify a better match.
-- Do not create publisher collections or author collections as series unless the book metadata clearly gives a
-  numbered series.
-- Series belong to authors. Use a series_id only when it belongs to the selected author_id.
-- Always search for the author before creating one. If no exact author slug exists, call ensure_author.
-- Always search for a series with author_id before creating one. If no exact series slug exists, call ensure_series.
-- Always search for a book before creating one. If no exact title slug exists, call ensure_book.
-- If a tool returns an error, correct your tool arguments or final metadata before continuing.
-- confidence must be a number from 0 to 1.
-- evidence must be a short list of strings explaining which filename, tags, and catalog rows support the answer."""
-
-
-def forced_final_prompt() -> str:
-    """Return the no-tools finalization prompt."""
-    return (
-        "Stop calling tools. Return final metadata as JSON only using the tool results already provided. "
-        "If search_books returned no matching rows but author and series are known, use book_id null and resolve "
-        "the title slug from the AAX filename and ffprobe tags. The validator will create the missing book. "
-        "Use only author_id and series_id values returned by earlier tool results."
-    )
-
-
-def user_prompt(aax_file_name: str, metadata: dict[str, str]) -> str:
-    """Build the user prompt from source metadata."""
-    return (
-        "Resolve this Audible audiobook.\n\n"
-        f"AAX file name: {aax_file_name}\n\n"
-        "ffprobe format tags:\n"
-        f"{json.dumps(metadata, indent=2, sort_keys=True)}"
-    )
-
-
-def parse_final_json_content(content: str) -> object:
-    """Parse final model content, accepting bare or fenced JSON."""
-    stripped = content.strip()
-    if match := FENCED_JSON_PATTERN.fullmatch(stripped):
-        stripped = match.group("json").strip()
-    return json.loads(stripped)
-
-
-def parse_final_metadata_fields(raw_metadata: object) -> FinalMetadataFields:
-    """Parse the model's final JSON object into typed fields."""
-    if not isinstance(raw_metadata, dict):
-        msg = "Final metadata must be a JSON object"
-        raise MetadataResolutionError(msg)
-    data = {str(key): value for key, value in raw_metadata.items()}
-    return FinalMetadataFields(
-        author_id=required_int(data, "author_id"),
-        book_id=optional_int(data.get("book_id"), "book_id"),
-        title=required_string(data, "title"),
-        series_id=optional_int(data.get("series_id"), "series_id"),
-        series_index=required_series_index(data, "series_index"),
-        confidence=required_float(data, "confidence"),
-        evidence=required_string_list(data, "evidence"),
-    )
-
-
-def review_metadata(reason: str, config: AgentConfig) -> StandardBookMetadata:
-    """Return a metadata result that must be reviewed manually."""
-    return StandardBookMetadata(
-        author_id=0,
-        author="unknown_author",
-        book_id=None,
-        title="unknown-title",
-        series_id=None,
-        series=config.standalone_series,
-        series_index=0,
-        confidence=0,
-        needs_review=True,
-        evidence=[reason],
-    )
-
-
-def required_float(data: dict[str, object], key: str) -> float:
-    """Read a required float field."""
-    value = data.get(key)
-    if isinstance(value, bool) or not isinstance(value, int | float):
-        msg = f"{key} must be a number"
-        raise MetadataResolutionError(msg)
-    confidence = float(value)
-    if confidence < 0 or confidence > 1:
-        msg = f"{key} must be between 0 and 1"
-        raise MetadataResolutionError(msg)
-    return confidence
-
-
-def required_string_list(data: dict[str, object], key: str) -> list[str]:
-    """Read a required list of strings."""
-    value = data.get(key)
-    if not isinstance(value, list) or not value or not all(isinstance(item, str) for item in value):
-        msg = f"{key} must be a non-empty list of strings"
-        raise MetadataResolutionError(msg)
-    strings = [item.strip() for item in value if item.strip()]
-    if not strings:
-        msg = f"{key} must include at least one non-empty string"
-        raise MetadataResolutionError(msg)
-    return strings

python/tools/snapshot_manager.py

@@ -34,9 +34,8 @@ def main(config_file: Path) -> None:
                 logger.error(msg)
                 signal_alert(msg)
                 continue
-            count_lookup = get_count_lookup(config_file, dataset.name)
+
-            logger.info(f"using {count_lookup} for {dataset.name}")
+            get_snapshots_to_delete(dataset, get_count_lookup(config_file, dataset.name))
-            get_snapshots_to_delete(dataset, count_lookup)
     except Exception:
         logger.exception("snapshot_manager failed")
         signal_alert("snapshot_manager failed")
@@ -100,7 +99,6 @@ def get_snapshots_to_delete(
     """
     snapshots = dataset.get_snapshots()
 
-    logger.info(f"calculating snapshots for {dataset.name} to be deleted")
     if not snapshots:
         logger.info(f"{dataset.name} has no snapshots")
         return

python/tools/whisper/Dockerfile

@@ -1,17 +0,0 @@
-FROM nvidia/cuda:12.4.1-cudnn-runtime-ubuntu22.04
-
-ENV DEBIAN_FRONTEND=noninteractive \
-    PYTHONDONTWRITEBYTECODE=1 \
-    PYTHONUNBUFFERED=1
-
-RUN apt-get update \
-    && apt-get install -y --no-install-recommends python3 python3-pip ffmpeg \
-    && rm -rf /var/lib/apt/lists/*
-
-RUN pip3 install --no-cache-dir --upgrade pip \
-    && pip3 install --no-cache-dir faster-whisper requests
-
-WORKDIR /app
-COPY python/tools/whisper/inference.py /app/inference.py
-
-ENTRYPOINT ["python3", "/app/inference.py"]

python/tools/whisper/Dockerfile.dockerignore

@@ -1,2 +0,0 @@
-*
-!python/tools/whisper/inference.py

python/tools/whisper/__init__.py

@@ -1 +0,0 @@
-"""Whisper transcription tools (host orchestrator and container entrypoint)."""

python/tools/whisper/inference.py

@@ -1,136 +0,0 @@
-"""Container entrypoint that transcribes a directory of audio files with faster-whisper.
-
-Run inside the whisper-transcribe docker image; segment timestamps are grouped
-into one-minute buckets so the output reads as ``[HH:MM:00] text``.
-"""
-
-from __future__ import annotations
-
-import argparse
-import logging
-from pathlib import Path
-
-from faster_whisper import WhisperModel
-
-logger = logging.getLogger(__name__)
-
-AUDIO_EXTENSIONS = {".mp3", ".wav", ".m4a", ".flac", ".ogg", ".opus", ".mp4", ".mkv", ".webm", ".aac"}
-BUCKET_SECONDS = 60
-BEAM_SIZE = 5
-SECONDS_PER_HOUR = 3600
-SECONDS_PER_MINUTE = 60
-
-
-def format_timestamp(total_seconds: float) -> str:
-    """Render a whole-minute timestamp as ``HH:MM:00``.
-
-    Args:
-        total_seconds: Offset in seconds from the start of the audio.
-
-    Returns:
-        A zero-padded ``HH:MM:00`` string.
-    """
-    hours = int(total_seconds // SECONDS_PER_HOUR)
-    minutes = int((total_seconds % SECONDS_PER_HOUR) // SECONDS_PER_MINUTE)
-    return f"{hours:02d}:{minutes:02d}:00"
-
-
-def transcribe_file(model: WhisperModel, audio_path: Path, output_path: Path) -> None:
-    """Transcribe one audio file and write the bucketed transcript to disk.
-
-    Args:
-        model: Loaded faster-whisper model.
-        audio_path: Source audio file.
-        output_path: Destination ``.txt`` path.
-    """
-    logger.info("Transcribing %s", audio_path)
-    segments, info = model.transcribe(
-        str(audio_path),
-        language="en",
-        beam_size=BEAM_SIZE,
-        vad_filter=True,
-    )
-    logger.info("Duration %.1fs", info.duration)
-
-    buckets: dict[int, list[str]] = {}
-    for segment in segments:
-        bucket = int(segment.start // BUCKET_SECONDS)
-        buckets.setdefault(bucket, []).append(segment.text.strip())
-
-    lines = [f"[{format_timestamp(bucket * BUCKET_SECONDS)}] {' '.join(buckets[bucket])}" for bucket in sorted(buckets)]
-    output_path.write_text("\n\n".join(lines) + "\n", encoding="utf-8")
-    logger.info("Wrote %s", output_path)
-
-
-def find_audio_files(input_directory: Path) -> list[Path]:
-    """Collect every audio file under ``input_directory``.
-
-    Args:
-        input_directory: Directory to walk recursively.
-
-    Returns:
-        Sorted list of audio file paths.
-    """
-    return sorted(
-        path for path in input_directory.rglob("*") if path.is_file() and path.suffix.lower() in AUDIO_EXTENSIONS
-    )
-
-
-def configure_container_logger() -> None:
-    """Configure logging for the container (stdout, INFO)."""
-    logging.basicConfig(
-        level=logging.INFO,
-        format="%(asctime)s %(levelname)s %(message)s",
-    )
-
-
-def parse_arguments() -> argparse.Namespace:
-    """Parse CLI arguments for the container entrypoint.
-
-    Returns:
-        Parsed argparse namespace.
-    """
-    parser = argparse.ArgumentParser(description=__doc__)
-    parser.add_argument("--input", type=Path, default=Path("/audio"))
-    parser.add_argument("--output", type=Path, default=Path("/output"))
-    parser.add_argument("--model", default="large-v3")
-    parser.add_argument(
-        "--download-only",
-        action="store_true",
-        help="Download the model into the cache volume and exit without transcribing.",
-    )
-    return parser.parse_args()
-
-
-def main() -> None:
-    """Load the model, then either exit (download-only) or transcribe the directory."""
-    configure_container_logger()
-    arguments = parse_arguments()
-
-    logger.info("Loading model %s on CUDA", arguments.model)
-    model = WhisperModel(arguments.model, device="cuda", compute_type="float16")
-
-    if arguments.download_only:
-        logger.info("Model ready; exiting (download-only mode)")
-        return
-
-    arguments.output.mkdir(parents=True, exist_ok=True)
-
-    audio_files = find_audio_files(arguments.input)
-    if not audio_files:
-        logger.warning("No audio files found in %s", arguments.input)
-        return
-
-    logger.info("Found %d audio file(s)", len(audio_files))
-    for audio_path in audio_files:
-        relative = audio_path.relative_to(arguments.input)
-        output_path = arguments.output / relative.with_suffix(".txt")
-        output_path.parent.mkdir(parents=True, exist_ok=True)
-        if output_path.exists():
-            logger.info("Skip %s (already transcribed)", relative)
-            continue
-        transcribe_file(model, audio_path, output_path)
-
-
-if __name__ == "__main__":
-    main()

python/tools/whisper/transcribe.py

@@ -1,167 +0,0 @@
-"""Build and run the whisper transcription docker container on demand.
-
-The container is started fresh for each invocation and removed on exit
-(``docker run --rm``). The model is cached in a named docker volume so
-only the first run pays the download cost.
-"""
-
-from __future__ import annotations
-
-import logging
-import subprocess
-from pathlib import Path
-from typing import Annotated
-
-import typer
-
-from python.common import configure_logger
-
-logger = logging.getLogger(__name__)
-
-
-class Config:
-    """Paths and names for the whisper-transcribe Docker workflow."""
-
-    image_tag = "whisper-transcribe:latest"
-    model_volume = "whisper-models"
-    repo_root = Path(__file__).resolve().parents[3]
-    dockerfile = Path(__file__).resolve().parent / "Dockerfile"
-    huggingface_cache = "/root/.cache/huggingface"
-
-
-def run_docker(arguments: list[str]) -> None:
-    """Run a docker subcommand, streaming output and raising on failure.
-
-    Args:
-        arguments: Arguments to pass to the ``docker`` binary.
-
-    Raises:
-        subprocess.CalledProcessError: If docker exits non-zero.
-    """
-    logger.info("docker %s", " ".join(arguments))
-    subprocess.run(["docker", *arguments], check=True)
-
-
-def build_image() -> None:
-    """Build the whisper-transcribe image using the repo root as build context."""
-    logger.info("Building image %s", Config.image_tag)
-    run_docker(
-        [
-            "build",
-            "--tag",
-            Config.image_tag,
-            "--file",
-            str(Config.dockerfile),
-            str(Config.repo_root),
-        ],
-    )
-
-
-def model_cache_present(model: str) -> bool:
-    """Check whether the given model is already downloaded in the cache volume.
-
-    Args:
-        model: faster-whisper model name (e.g. ``large-v3``).
-
-    Returns:
-        True if the HuggingFace cache directory for the model exists in the volume.
-    """
-    cache_directory = f"hub/models--Systran--faster-whisper-{model}"
-    completed = subprocess.run(
-        [
-            "docker",
-            "run",
-            "--rm",
-            "--volume",
-            f"{Config.model_volume}:/cache",
-            "alpine",
-            "test",
-            "-d",
-            f"/cache/{cache_directory}",
-        ],
-        check=False,
-    )
-    return completed.returncode == 0
-
-
-def download_model(model: str) -> None:
-    """Download the model into the cache volume and exit.
-
-    Args:
-        model: faster-whisper model name.
-    """
-    logger.info("Downloading model %s into volume %s", model, Config.model_volume)
-    run_docker(
-        [
-            "run",
-            "--rm",
-            "--device=nvidia.com/gpu=all",
-            "--ipc=host",
-            "--volume",
-            f"{Config.model_volume}:{Config.huggingface_cache}",
-            Config.image_tag,
-            "--model",
-            model,
-            "--download-only",
-        ],
-    )
-
-
-def transcribe(input_directory: Path, output_directory: Path, model: str) -> None:
-    """Run transcription on every audio file under ``input_directory``.
-
-    Args:
-        input_directory: Host path containing audio files (mounted read-only).
-        output_directory: Host path for ``.txt`` transcripts.
-        model: faster-whisper model name.
-    """
-    logger.info("Transcribing %s -> %s (model=%s)", input_directory, output_directory, model)
-    run_docker(
-        [
-            "run",
-            "--rm",
-            "--device=nvidia.com/gpu=all",
-            "--ipc=host",
-            "--volume",
-            f"{input_directory}:/audio:ro",
-            "--volume",
-            f"{output_directory}:/output",
-            "--volume",
-            f"{Config.model_volume}:{Config.huggingface_cache}",
-            Config.image_tag,
-            "--model",
-            model,
-        ],
-    )
-
-
-def main(
-    input_directory: Annotated[Path, typer.Argument(help="Directory of audio files to transcribe.")],
-    output_directory: Annotated[Path, typer.Argument(help="Directory to write .txt transcripts to.")],
-    model: Annotated[str, typer.Option(help="faster-whisper model name.")] = "large-v3",
-    *,
-    force_download: Annotated[
-        bool,
-        typer.Option("--force-download", help="Re-download the model even if already cached."),
-    ] = False,
-) -> None:
-    """Build the image, ensure the model is cached, then transcribe and stop."""
-    configure_logger()
-
-    resolved_input = input_directory.resolve(strict=True)
-    output_directory.mkdir(parents=True, exist_ok=True)
-    resolved_output = output_directory.resolve()
-
-    build_image()
-
-    if force_download or not model_cache_present(model):
-        download_model(model)
-    else:
-        logger.info("Model %s already cached in volume %s", model, Config.model_volume)
-
-    transcribe(resolved_input, resolved_output, model)
-    logger.info("Done. Container stopped.")
-
-
-if __name__ == "__main__":
-    typer.run(main)

systems/bob/default.nix

@@ -1,39 +1,28 @@
-{ inputs, pkgs, ... }:
+{ inputs, ... }:
 {
   imports = [
-    "${inputs.self}/users/math"
     "${inputs.self}/users/richie"
-    "${inputs.self}/users/steve"
     "${inputs.self}/common/global"
+    "${inputs.self}/common/optional/desktop.nix"
     "${inputs.self}/common/optional/docker.nix"
     "${inputs.self}/common/optional/scanner.nix"
-    "${inputs.self}/common/optional/monitoring-agent.nix"
     "${inputs.self}/common/optional/steam.nix"
     "${inputs.self}/common/optional/syncthing_base.nix"
     "${inputs.self}/common/optional/systemd-boot.nix"
     "${inputs.self}/common/optional/update.nix"
     "${inputs.self}/common/optional/yubikey.nix"
     "${inputs.self}/common/optional/zerotier.nix"
+    "${inputs.self}/common/optional/brain_substituter.nix"
     "${inputs.self}/common/optional/nvidia.nix"
     ./hardware.nix
     ./syncthing.nix
     ./llms.nix
   ];
 
-  boot = {
-    kernelPackages = pkgs.linuxPackages_6_18;
-    zfs.package = pkgs.zfs_2_4;
-  };
-
   networking = {
     hostName = "bob";
     hostId = "7c678a41";
-    firewall = {
+    firewall.enable = true;
-      enable = true;
-      allowedTCPPorts = [
-        8000
-      ];
-    };
     networkmanager.enable = true;
   };
 

systems/bob/hardware.nix

@@ -28,13 +28,9 @@
         allowDiscards = true;
         keyFileSize = 4096;
         keyFile = "/dev/disk/by-id/usb-Samsung_Flash_Drive_FIT_0374620080067131-0:0";
+        fallbackToPassword = true;
       };
     };
-
-    zfs.extraPools = [
-      "storage"
-    ];
-
     kernelModules = [ "kvm-amd" ];
     extraModulePackages = [ ];
   };

systems/bob/llms.nix

@@ -23,7 +23,6 @@
       "magistral:24b"
       "ministral-3:14b"
       "nemotron-3-nano:30b"
-      "nemotron-3-nano:4b"
       "nemotron-cascade-2:30b"
       "qwen3-coder:30b"
       "qwen3-embedding:0.6b"
@@ -42,14 +41,11 @@
       "qwen3:8b"
       "qwen3.5:27b"
       "qwen3.5:35b"
-      "qwen3.6:27b"
-      "qwen3.6:35b"
-      "rinex20/translategemma3:12b"
       "translategemma:12b"
       "translategemma:27b"
       "translategemma:4b"
     ];
-    models = "/zfs/storage/models";
+    models = "/zfs/models";
     openFirewall = true;
   };
 }

systems/bob/syncthing.nix

@@ -31,15 +31,5 @@
       ];
       fsWatcherEnabled = true;
     };
-    "recordings" = {
-      path = "/home/richie/recordings";
-      devices = [
-        "jeeves"
-        "phone"
-        "rhapsody-in-green"
-      ];
-      fsWatcherEnabled = true;
-    };
-
   };
 }

systems/brain/hardware.nix

@@ -26,6 +26,7 @@
         allowDiscards = true;
         keyFileSize = 4096;
         keyFile = "/dev/disk/by-id/usb-USB_SanDisk_3.2Gen1_03021630090925173333-0:0";
+        fallbackToPassword = true;
       };
     };
     kernelModules = [ "kvm-intel" ];

systems/jeeves/default.nix

@@ -4,21 +4,17 @@ let
 in
 {
   imports = [
-    "${inputs.self}/users/dov"
-    "${inputs.self}/users/math"
     "${inputs.self}/users/richie"
-    "${inputs.self}/users/steve"
+    "${inputs.self}/users/math"
+    "${inputs.self}/users/dov"
     "${inputs.self}/common/global"
     "${inputs.self}/common/optional/docker.nix"
-    "${inputs.self}/common/optional/monitoring-agent.nix"
     "${inputs.self}/common/optional/ssh_decrypt.nix"
     "${inputs.self}/common/optional/syncthing_base.nix"
     "${inputs.self}/common/optional/update.nix"
     "${inputs.self}/common/optional/zerotier.nix"
-    ./monitoring
     ./docker
     ./services
-    ./web_services
     ./hardware.nix
     ./networking.nix
     ./programs.nix
@@ -39,10 +35,5 @@ in
     zerotierone.joinNetworks = [ "a09acf02330d37b9" ];
   };
 
-  users.groups = {
-    nornsight = { };
-    nornsight-admin = { };
-  };
-
   system.stateVersion = "24.05";
 }

systems/jeeves/hardware.nix

@@ -9,6 +9,7 @@ let
     inherit device;
     keyFileSize = 4096;
     keyFile = "/dev/disk/by-id/usb-XIAO_USB_Drive_24587CE29074-0:0";
+    fallbackToPassword = true;
   };
   makeLuksSSD =
     device:

systems/jeeves/monitoring/dashboards/overview.json

@@ -1,426 +0,0 @@
-{
-  "annotations": {
-    "list": [
-      {
-        "builtIn": 1,
-        "datasource": {
-          "type": "grafana",
-          "uid": "-- Grafana --"
-        },
-        "enable": true,
-        "hide": true,
-        "iconColor": "rgba(0, 211, 255, 1)",
-        "name": "Annotations & Alerts",
-        "type": "dashboard"
-      }
-    ]
-  },
-  "editable": true,
-  "fiscalYearStartMonth": 0,
-  "graphTooltip": 0,
-  "links": [],
-  "panels": [
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "prom-main"
-      },
-      "fieldConfig": {
-        "defaults": {
-          "unit": "percent"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 8,
-        "w": 6,
-        "x": 0,
-        "y": 0
-      },
-      "id": 1,
-      "options": {
-        "legend": {
-          "displayMode": "list",
-          "placement": "bottom"
-        },
-        "tooltip": {
-          "mode": "multi"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "prom-main"
-          },
-          "editorMode": "code",
-          "expr": "100 * (1 - avg by (instance) (rate(node_cpu_seconds_total{mode=\"idle\"}[5m])))",
-          "legendFormat": "{{instance}}",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "CPU Used",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "prom-main"
-      },
-      "fieldConfig": {
-        "defaults": {
-          "unit": "percent"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 8,
-        "w": 6,
-        "x": 6,
-        "y": 0
-      },
-      "id": 2,
-      "options": {
-        "legend": {
-          "displayMode": "list",
-          "placement": "bottom"
-        },
-        "tooltip": {
-          "mode": "multi"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "prom-main"
-          },
-          "editorMode": "code",
-          "expr": "100 * (1 - (node_memory_MemAvailable_bytes / node_memory_MemTotal_bytes))",
-          "legendFormat": "{{instance}}",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "RAM Used",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "prom-main"
-      },
-      "fieldConfig": {
-        "defaults": {
-          "unit": "percent"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 8,
-        "w": 6,
-        "x": 12,
-        "y": 0
-      },
-      "id": 3,
-      "options": {
-        "legend": {
-          "displayMode": "list",
-          "placement": "bottom"
-        },
-        "tooltip": {
-          "mode": "multi"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "prom-main"
-          },
-          "editorMode": "code",
-          "expr": "100 * (1 - (node_memory_SwapFree_bytes / node_memory_SwapTotal_bytes))",
-          "legendFormat": "{{instance}}",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "Swap Used",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "prom-main"
-      },
-      "fieldConfig": {
-        "defaults": {
-          "unit": "short"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 8,
-        "w": 6,
-        "x": 18,
-        "y": 0
-      },
-      "id": 4,
-      "options": {
-        "legend": {
-          "displayMode": "list",
-          "placement": "bottom"
-        },
-        "tooltip": {
-          "mode": "multi"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "prom-main"
-          },
-          "editorMode": "code",
-          "expr": "node_load1",
-          "legendFormat": "{{instance}} load1",
-          "range": true,
-          "refId": "A"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "prom-main"
-          },
-          "editorMode": "code",
-          "expr": "node_load5",
-          "legendFormat": "{{instance}} load5",
-          "range": true,
-          "refId": "B"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "prom-main"
-          },
-          "editorMode": "code",
-          "expr": "node_load15",
-          "legendFormat": "{{instance}} load15",
-          "range": true,
-          "refId": "C"
-        }
-      ],
-      "title": "Load",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "prom-main"
-      },
-      "fieldConfig": {
-        "defaults": {
-          "unit": "Bps"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 9,
-        "w": 12,
-        "x": 0,
-        "y": 8
-      },
-      "id": 5,
-      "options": {
-        "legend": {
-          "displayMode": "list",
-          "placement": "bottom"
-        },
-        "tooltip": {
-          "mode": "multi"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "prom-main"
-          },
-          "editorMode": "code",
-          "expr": "sum by (instance) (rate(node_disk_read_bytes_total[5m]))",
-          "legendFormat": "{{instance}} read",
-          "range": true,
-          "refId": "A"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "prom-main"
-          },
-          "editorMode": "code",
-          "expr": "sum by (instance) (rate(node_disk_written_bytes_total[5m]))",
-          "legendFormat": "{{instance}} write",
-          "range": true,
-          "refId": "B"
-        }
-      ],
-      "title": "Disk Throughput",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "prom-main"
-      },
-      "fieldConfig": {
-        "defaults": {
-          "unit": "percent"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 9,
-        "w": 12,
-        "x": 12,
-        "y": 8
-      },
-      "id": 6,
-      "options": {
-        "cellHeight": "sm",
-        "showHeader": true,
-        "sortBy": [
-          {
-            "desc": true,
-            "displayName": "Value"
-          }
-        ]
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "prom-main"
-          },
-          "editorMode": "code",
-          "expr": "100 * (1 - (node_filesystem_avail_bytes{mountpoint=~\"(/|/home|/var|/zfs.*)\",fstype!=\"\"} / node_filesystem_size_bytes{mountpoint=~\"(/|/home|/var|/zfs.*)\",fstype!=\"\"}))",
-          "format": "table",
-          "instant": true,
-          "legendFormat": "{{instance}} {{mountpoint}}",
-          "refId": "A"
-        }
-      ],
-      "title": "Filesystem Usage",
-      "type": "table"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "prom-main"
-      },
-      "fieldConfig": {
-        "defaults": {
-          "unit": "percentunit"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 10,
-        "w": 12,
-        "x": 0,
-        "y": 17
-      },
-      "id": 7,
-      "options": {
-        "cellHeight": "sm",
-        "showHeader": true,
-        "sortBy": [
-          {
-            "desc": true,
-            "displayName": "Value"
-          }
-        ]
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "prom-main"
-          },
-          "editorMode": "code",
-          "expr": "topk(10, rate(namedprocess_namegroup_cpu_seconds_total[5m]))",
-          "format": "table",
-          "instant": true,
-          "legendFormat": "{{instance}} {{groupname}}",
-          "refId": "A"
-        }
-      ],
-      "title": "Top Grouped CPU",
-      "type": "table"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "prom-main"
-      },
-      "fieldConfig": {
-        "defaults": {
-          "unit": "bytes"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 10,
-        "w": 12,
-        "x": 12,
-        "y": 17
-      },
-      "id": 8,
-      "options": {
-        "cellHeight": "sm",
-        "showHeader": true,
-        "sortBy": [
-          {
-            "desc": true,
-            "displayName": "Value"
-          }
-        ]
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "prom-main"
-          },
-          "editorMode": "code",
-          "expr": "topk(10, namedprocess_namegroup_memory_bytes{memtype=\"resident\"})",
-          "format": "table",
-          "instant": true,
-          "legendFormat": "{{instance}} {{groupname}}",
-          "refId": "A"
-        }
-      ],
-      "title": "Top Grouped Memory",
-      "type": "table"
-    }
-  ],
-  "refresh": "30s",
-  "schemaVersion": 39,
-  "style": "dark",
-  "tags": [
-    "monitoring"
-  ],
-  "templating": {
-    "list": []
-  },
-  "time": {
-    "from": "now-24h",
-    "to": "now"
-  },
-  "timepicker": {},
-  "timezone": "",
-  "title": "Overview",
-  "uid": "monitor-overview",
-  "version": 1,
-  "weekStart": ""
-}

systems/jeeves/monitoring/dashboards/process-history-grouped.json

@@ -1,216 +0,0 @@
-{
-  "annotations": {
-    "list": [
-      {
-        "builtIn": 1,
-        "datasource": {
-          "type": "grafana",
-          "uid": "-- Grafana --"
-        },
-        "enable": true,
-        "hide": true,
-        "iconColor": "rgba(0, 211, 255, 1)",
-        "name": "Annotations & Alerts",
-        "type": "dashboard"
-      }
-    ]
-  },
-  "editable": true,
-  "fiscalYearStartMonth": 0,
-  "graphTooltip": 0,
-  "links": [],
-  "panels": [
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "prom-main"
-      },
-      "fieldConfig": {
-        "defaults": {
-          "unit": "percentunit"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 10,
-        "w": 12,
-        "x": 0,
-        "y": 0
-      },
-      "id": 1,
-      "options": {
-        "legend": {
-          "displayMode": "list",
-          "placement": "bottom"
-        },
-        "tooltip": {
-          "mode": "multi"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "prom-main"
-          },
-          "editorMode": "code",
-          "expr": "topk(10, rate(namedprocess_namegroup_cpu_seconds_total[5m]))",
-          "legendFormat": "{{instance}} {{groupname}}",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "Grouped CPU",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "prom-main"
-      },
-      "fieldConfig": {
-        "defaults": {
-          "unit": "bytes"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 10,
-        "w": 12,
-        "x": 12,
-        "y": 0
-      },
-      "id": 2,
-      "options": {
-        "legend": {
-          "displayMode": "list",
-          "placement": "bottom"
-        },
-        "tooltip": {
-          "mode": "multi"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "prom-main"
-          },
-          "editorMode": "code",
-          "expr": "topk(10, namedprocess_namegroup_memory_bytes{memtype=\"resident\"})",
-          "legendFormat": "{{instance}} {{groupname}}",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "Grouped Resident Memory",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "prom-main"
-      },
-      "fieldConfig": {
-        "defaults": {
-          "unit": "Bps"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 10,
-        "w": 12,
-        "x": 0,
-        "y": 10
-      },
-      "id": 3,
-      "options": {
-        "legend": {
-          "displayMode": "list",
-          "placement": "bottom"
-        },
-        "tooltip": {
-          "mode": "multi"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "prom-main"
-          },
-          "editorMode": "code",
-          "expr": "topk(10, rate(namedprocess_namegroup_read_bytes_total[5m]))",
-          "legendFormat": "{{instance}} {{groupname}}",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "Grouped Read I/O",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "prom-main"
-      },
-      "fieldConfig": {
-        "defaults": {
-          "unit": "Bps"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 10,
-        "w": 12,
-        "x": 12,
-        "y": 10
-      },
-      "id": 4,
-      "options": {
-        "legend": {
-          "displayMode": "list",
-          "placement": "bottom"
-        },
-        "tooltip": {
-          "mode": "multi"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "prom-main"
-          },
-          "editorMode": "code",
-          "expr": "topk(10, rate(namedprocess_namegroup_write_bytes_total[5m]))",
-          "legendFormat": "{{instance}} {{groupname}}",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "Grouped Write I/O",
-      "type": "timeseries"
-    }
-  ],
-  "refresh": "30s",
-  "schemaVersion": 39,
-  "style": "dark",
-  "tags": [
-    "monitoring",
-    "process"
-  ],
-  "templating": {
-    "list": []
-  },
-  "time": {
-    "from": "now-7d",
-    "to": "now"
-  },
-  "timepicker": {},
-  "timezone": "",
-  "title": "Process History Grouped",
-  "uid": "monitor-process-history",
-  "version": 1,
-  "weekStart": ""
-}

systems/jeeves/monitoring/dashboards/process-live-pid.json

@@ -1,224 +0,0 @@
-{
-  "annotations": {
-    "list": [
-      {
-        "builtIn": 1,
-        "datasource": {
-          "type": "grafana",
-          "uid": "-- Grafana --"
-        },
-        "enable": true,
-        "hide": true,
-        "iconColor": "rgba(0, 211, 255, 1)",
-        "name": "Annotations & Alerts",
-        "type": "dashboard"
-      }
-    ]
-  },
-  "editable": true,
-  "fiscalYearStartMonth": 0,
-  "graphTooltip": 0,
-  "links": [],
-  "panels": [
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "prom-pid-short"
-      },
-      "fieldConfig": {
-        "defaults": {
-          "unit": "percentunit"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 10,
-        "w": 12,
-        "x": 0,
-        "y": 0
-      },
-      "id": 1,
-      "options": {
-        "cellHeight": "sm",
-        "showHeader": true,
-        "sortBy": [
-          {
-            "desc": true,
-            "displayName": "Value"
-          }
-        ]
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "prom-pid-short"
-          },
-          "editorMode": "code",
-          "expr": "topk(20, rate(namedprocess_namegroup_cpu_seconds_total[2m]))",
-          "format": "table",
-          "instant": true,
-          "legendFormat": "{{instance}} {{groupname}}",
-          "refId": "A"
-        }
-      ],
-      "title": "Top PID CPU",
-      "type": "table"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "prom-pid-short"
-      },
-      "fieldConfig": {
-        "defaults": {
-          "unit": "bytes"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 10,
-        "w": 12,
-        "x": 12,
-        "y": 0
-      },
-      "id": 2,
-      "options": {
-        "cellHeight": "sm",
-        "showHeader": true,
-        "sortBy": [
-          {
-            "desc": true,
-            "displayName": "Value"
-          }
-        ]
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "prom-pid-short"
-          },
-          "editorMode": "code",
-          "expr": "topk(20, namedprocess_namegroup_memory_bytes{memtype=\"resident\"})",
-          "format": "table",
-          "instant": true,
-          "legendFormat": "{{instance}} {{groupname}}",
-          "refId": "A"
-        }
-      ],
-      "title": "Top PID RSS",
-      "type": "table"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "prom-pid-short"
-      },
-      "fieldConfig": {
-        "defaults": {
-          "unit": "Bps"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 10,
-        "w": 12,
-        "x": 0,
-        "y": 10
-      },
-      "id": 3,
-      "options": {
-        "cellHeight": "sm",
-        "showHeader": true,
-        "sortBy": [
-          {
-            "desc": true,
-            "displayName": "Value"
-          }
-        ]
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "prom-pid-short"
-          },
-          "editorMode": "code",
-          "expr": "topk(20, rate(namedprocess_namegroup_read_bytes_total[2m]))",
-          "format": "table",
-          "instant": true,
-          "legendFormat": "{{instance}} {{groupname}}",
-          "refId": "A"
-        }
-      ],
-      "title": "Top PID Read I/O",
-      "type": "table"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "prom-pid-short"
-      },
-      "fieldConfig": {
-        "defaults": {
-          "unit": "Bps"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 10,
-        "w": 12,
-        "x": 12,
-        "y": 10
-      },
-      "id": 4,
-      "options": {
-        "cellHeight": "sm",
-        "showHeader": true,
-        "sortBy": [
-          {
-            "desc": true,
-            "displayName": "Value"
-          }
-        ]
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "prom-pid-short"
-          },
-          "editorMode": "code",
-          "expr": "topk(20, rate(namedprocess_namegroup_write_bytes_total[2m]))",
-          "format": "table",
-          "instant": true,
-          "legendFormat": "{{instance}} {{groupname}}",
-          "refId": "A"
-        }
-      ],
-      "title": "Top PID Write I/O",
-      "type": "table"
-    }
-  ],
-  "refresh": "15s",
-  "schemaVersion": 39,
-  "style": "dark",
-  "tags": [
-    "monitoring",
-    "process"
-  ],
-  "templating": {
-    "list": []
-  },
-  "time": {
-    "from": "now-10m",
-    "to": "now"
-  },
-  "timepicker": {},
-  "timezone": "",
-  "title": "Process Live PID",
-  "uid": "monitor-process-pid",
-  "version": 1,
-  "weekStart": ""
-}

systems/jeeves/monitoring/dashboards/storage-zfs.json

@@ -1,351 +0,0 @@
-{
-  "annotations": {
-    "list": [
-      {
-        "builtIn": 1,
-        "datasource": {
-          "type": "grafana",
-          "uid": "-- Grafana --"
-        },
-        "enable": true,
-        "hide": true,
-        "iconColor": "rgba(0, 211, 255, 1)",
-        "name": "Annotations & Alerts",
-        "type": "dashboard"
-      }
-    ]
-  },
-  "editable": true,
-  "fiscalYearStartMonth": 0,
-  "graphTooltip": 0,
-  "links": [],
-  "panels": [
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "prom-main"
-      },
-      "fieldConfig": {
-        "defaults": {
-          "unit": "percent"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 8,
-        "w": 8,
-        "x": 0,
-        "y": 0
-      },
-      "id": 1,
-      "options": {
-        "legend": {
-          "displayMode": "list",
-          "placement": "bottom"
-        },
-        "tooltip": {
-          "mode": "multi"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "prom-main"
-          },
-          "editorMode": "code",
-          "expr": "100 * (zfs_pool_allocated_bytes / zfs_pool_size_bytes)",
-          "legendFormat": "{{instance}} {{pool}}",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "Pool Usage",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "prom-main"
-      },
-      "fieldConfig": {
-        "defaults": {
-          "unit": "bytes"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 8,
-        "w": 8,
-        "x": 8,
-        "y": 0
-      },
-      "id": 2,
-      "options": {
-        "legend": {
-          "displayMode": "list",
-          "placement": "bottom"
-        },
-        "tooltip": {
-          "mode": "multi"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "prom-main"
-          },
-          "editorMode": "code",
-          "expr": "zfs_pool_free_bytes",
-          "legendFormat": "{{instance}} {{pool}}",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "Pool Free Bytes",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "prom-main"
-      },
-      "fieldConfig": {
-        "defaults": {
-          "unit": "bytes"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 8,
-        "w": 8,
-        "x": 16,
-        "y": 0
-      },
-      "id": 3,
-      "options": {
-        "cellHeight": "sm",
-        "showHeader": true,
-        "sortBy": [
-          {
-            "desc": true,
-            "displayName": "Value"
-          }
-        ]
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "prom-main"
-          },
-          "editorMode": "code",
-          "expr": "topk(20, zfs_dataset_used_bytes{type=\"filesystem\"})",
-          "format": "table",
-          "instant": true,
-          "legendFormat": "{{instance}} {{name}}",
-          "refId": "A"
-        }
-      ],
-      "title": "Top Filesystems by Used Bytes",
-      "type": "table"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "prom-main"
-      },
-      "fieldConfig": {
-        "defaults": {
-          "unit": "ns"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 9,
-        "w": 12,
-        "x": 0,
-        "y": 8
-      },
-      "id": 4,
-      "options": {
-        "legend": {
-          "displayMode": "list",
-          "placement": "bottom"
-        },
-        "tooltip": {
-          "mode": "multi"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "prom-main"
-          },
-          "editorMode": "code",
-          "expr": "topk(20, zpool_iostat_total_wait_read_ns{vdev!=\"_pool\"})",
-          "legendFormat": "{{host}} {{pool}} {{vdev}}",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "ZFS Read Wait",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "prom-main"
-      },
-      "fieldConfig": {
-        "defaults": {
-          "unit": "ns"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 9,
-        "w": 12,
-        "x": 12,
-        "y": 8
-      },
-      "id": 5,
-      "options": {
-        "legend": {
-          "displayMode": "list",
-          "placement": "bottom"
-        },
-        "tooltip": {
-          "mode": "multi"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "prom-main"
-          },
-          "editorMode": "code",
-          "expr": "topk(20, zpool_iostat_total_wait_write_ns{vdev!=\"_pool\"})",
-          "legendFormat": "{{host}} {{pool}} {{vdev}}",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "ZFS Write Wait",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "prom-main"
-      },
-      "fieldConfig": {
-        "defaults": {
-          "unit": "celsius"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 9,
-        "w": 12,
-        "x": 0,
-        "y": 17
-      },
-      "id": 6,
-      "options": {
-        "cellHeight": "sm",
-        "showHeader": true,
-        "sortBy": [
-          {
-            "desc": true,
-            "displayName": "Value"
-          }
-        ]
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "prom-main"
-          },
-          "editorMode": "code",
-          "expr": "smartctl_device_temperature{temperature_type=\"current\"}",
-          "format": "table",
-          "instant": true,
-          "legendFormat": "{{instance}} {{device}}",
-          "refId": "A"
-        }
-      ],
-      "title": "Disk Temperature",
-      "type": "table"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "prom-main"
-      },
-      "fieldConfig": {
-        "defaults": {
-          "unit": "short"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 9,
-        "w": 12,
-        "x": 12,
-        "y": 17
-      },
-      "id": 7,
-      "options": {
-        "cellHeight": "sm",
-        "showHeader": true,
-        "sortBy": [
-          {
-            "desc": false,
-            "displayName": "Value"
-          }
-        ]
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "prom-main"
-          },
-          "editorMode": "code",
-          "expr": "smartctl_device_smart_status",
-          "format": "table",
-          "instant": true,
-          "legendFormat": "{{instance}} {{device}}",
-          "refId": "A"
-        }
-      ],
-      "title": "SMART Health",
-      "type": "table"
-    }
-  ],
-  "refresh": "30s",
-  "schemaVersion": 39,
-  "style": "dark",
-  "tags": [
-    "monitoring",
-    "zfs"
-  ],
-  "templating": {
-    "list": []
-  },
-  "time": {
-    "from": "now-24h",
-    "to": "now"
-  },
-  "timepicker": {},
-  "timezone": "",
-  "title": "Storage and ZFS",
-  "uid": "monitor-storage",
-  "version": 1,
-  "weekStart": ""
-}

systems/jeeves/monitoring/default.nix

@@ -1,186 +0,0 @@
-{
-  lib,
-  pkgs,
-  ...
-}:
-let
-  vars = import ../vars.nix;
-
-  prometheusDataRoot = "${vars.database}/prometheus";
-  mainPrometheusDataDir = "${prometheusDataRoot}/main";
-  pidPrometheusDataDir = "${prometheusDataRoot}/pid-short";
-
-  prometheusYaml = pkgs.formats.yaml { };
-
-  mkPrometheusConfig =
-    name: cfg:
-    let
-      configFile = prometheusYaml.generate "${name}.yaml" cfg;
-    in
-    pkgs.runCommand "${name}-checked.yaml"
-      {
-        nativeBuildInputs = [ pkgs.prometheus.cli ];
-      }
-      ''
-        promtool check config ${configFile}
-        cp ${configFile} $out
-      '';
-
-  mkTarget = host: address: {
-    targets = [ address ];
-    labels.instance = host;
-  };
-
-  mainPrometheusConfig = mkPrometheusConfig "prometheus-main" {
-    global = {
-      scrape_interval = "30s";
-      scrape_timeout = "10s";
-      evaluation_interval = "30s";
-    };
-    scrape_configs = [
-      {
-        job_name = "node";
-        static_configs = [
-          (mkTarget "jeeves" "192.168.90.40:9100")
-          (mkTarget "bob" "192.168.90.25:9100")
-        ];
-      }
-      {
-        job_name = "process_grouped";
-        static_configs = [
-          (mkTarget "jeeves" "192.168.90.40:9256")
-          (mkTarget "bob" "192.168.90.25:9256")
-        ];
-      }
-      {
-        job_name = "smartctl";
-        static_configs = [
-          (mkTarget "jeeves" "192.168.90.40:9633")
-          (mkTarget "bob" "192.168.90.25:9633")
-        ];
-      }
-      {
-        job_name = "zfs";
-        static_configs = [
-          (mkTarget "jeeves" "192.168.90.40:9134")
-          (mkTarget "bob" "192.168.90.25:9134")
-        ];
-      }
-    ];
-  };
-
-  pidPrometheusConfig = mkPrometheusConfig "prometheus-pid-short" {
-    global = {
-      scrape_interval = "15s";
-      scrape_timeout = "10s";
-      evaluation_interval = "15s";
-    };
-    scrape_configs = [
-      {
-        job_name = "process_pid";
-        static_configs = [
-          (mkTarget "jeeves" "192.168.90.40:9257")
-          (mkTarget "bob" "192.168.90.25:9257")
-        ];
-      }
-    ];
-  };
-
-  mkPrometheusService =
-    {
-      dataDir,
-      configFile,
-      port,
-      retention,
-    }:
-    {
-      after = [
-        "zfs-media-database-prometheus.mount"
-        "network.target"
-      ];
-      requires = [ "zfs-media-database-prometheus.mount" ];
-      wantedBy = [ "multi-user.target" ];
-      unitConfig.RequiresMountsFor = [ dataDir ];
-      serviceConfig = {
-        ExecStart = "${lib.getExe pkgs.prometheus} ${
-          lib.escapeShellArgs [
-            "--config.file=${configFile}"
-            "--storage.tsdb.path=${dataDir}"
-            "--storage.tsdb.retention.time=${retention}"
-            "--web.listen-address=127.0.0.1:${toString port}"
-          ]
-        }";
-        User = "prometheus";
-        Group = "prometheus";
-        Restart = "always";
-        RestartSec = "5s";
-        WorkingDirectory = dataDir;
-        ReadWritePaths = [ dataDir ];
-        CapabilityBoundingSet = [ "" ];
-        DeviceAllow = [ "/dev/null rw" ];
-        DevicePolicy = "strict";
-        LockPersonality = true;
-        MemoryDenyWriteExecute = true;
-        NoNewPrivileges = true;
-        PrivateDevices = true;
-        PrivateTmp = true;
-        ProtectClock = true;
-        ProtectControlGroups = true;
-        ProtectHome = true;
-        ProtectHostname = true;
-        ProtectKernelLogs = true;
-        ProtectKernelModules = true;
-        ProtectKernelTunables = true;
-        ProtectProc = "invisible";
-        ProtectSystem = "strict";
-        RemoveIPC = true;
-        RestrictAddressFamilies = [
-          "AF_INET"
-          "AF_INET6"
-          "AF_UNIX"
-        ];
-        RestrictNamespaces = true;
-        RestrictRealtime = true;
-        RestrictSUIDSGID = true;
-        SystemCallArchitectures = "native";
-        SystemCallFilter = [
-          "@system-service"
-          "~@privileged"
-        ];
-      };
-    };
-in
-{
-  users = {
-    groups.prometheus = { };
-    users.prometheus = {
-      isSystemUser = true;
-      group = "prometheus";
-      description = "Prometheus daemon user";
-    };
-  };
-
-  systemd = {
-    services = {
-      prometheus-main = mkPrometheusService {
-        configFile = mainPrometheusConfig;
-        dataDir = mainPrometheusDataDir;
-        port = 9090;
-        retention = "90d";
-      };
-
-      prometheus-pid-short = mkPrometheusService {
-        configFile = pidPrometheusConfig;
-        dataDir = pidPrometheusDataDir;
-        port = 9092;
-        retention = "10m";
-      };
-    };
-
-    tmpfiles.rules = [
-      "d ${prometheusDataRoot} 0755 root root - -"
-      "d ${mainPrometheusDataDir} 0750 prometheus prometheus - -"
-      "d ${pidPrometheusDataDir} 0750 prometheus prometheus - -"
-    ];
-  };
-}

systems/jeeves/networking.nix

@@ -1,13 +1,4 @@
 {
-  # Docker loads br_netfilter on jeeves. Disable bridge netfilter so
-  # br-nix-builder behaves like a pure L2 bridge and bridged traffic
-  # does not hit the host firewall/rpfilter path.
-  boot.kernel.sysctl = {
-    "net.bridge.bridge-nf-call-arptables" = 0;
-    "net.bridge.bridge-nf-call-ip6tables" = 0;
-    "net.bridge.bridge-nf-call-iptables" = 0;
-  };
-
   networking = {
     hostName = "jeeves";
     hostId = "0e15ce35";
@@ -43,18 +34,11 @@
       };
     };
     networks = {
-      "10-Primary" = {
+      "10-1GB_Primary" = {
-        matchConfig.Name = "enp97s0";
+        matchConfig.Name = "enp97s0f1";
         address = [ "192.168.99.14/24" ];
-        dns = [
-          "192.168.99.1"
-          "2600:4040:abfb:d700::1"
-        ];
         routes = [ { Gateway = "192.168.99.1"; } ];
         vlan = [ "internet-vlan" ];
-        dhcpV4Config.UseDNS = false;
-        dhcpV6Config.UseDNS = false;
-        ipv6AcceptRAConfig.UseDNS = false;
         linkConfig.RequiredForOnline = "routable";
       };
       "50-internet-vlan" = {
@@ -65,10 +49,23 @@
       "60-br-nix-builder" = {
         matchConfig.Name = "br-nix-builder";
         bridgeConfig = { };
-        networkConfig = {
+        address = [ "192.168.3.10/24" ];
-          IPv6AcceptRA = false;
+        routingPolicyRules = [
-          LinkLocalAddressing = "no";
+          {
-        };
+            From = "192.168.3.0/24";
+            Table = 100;
+            Priority = 100;
+          }
+        ];
+        routes = [
+          {
+            Gateway = "192.168.3.1";
+            Table = 100;
+            GatewayOnLink = false;
+            Metric = 2048;
+            PreferredSource = "192.168.3.10";
+          }
+        ];
         linkConfig.RequiredForOnline = "no";
       };
     };

systems/jeeves/programs.nix

@@ -3,6 +3,5 @@
   environment.systemPackages = with pkgs; [
     filebot
     docker-compose
-    ffmpeg
   ];
 }

systems/jeeves/runners/default.nix

@@ -1,7 +1,20 @@
-{ ... }:
+{ pkgs, ... }:
 {
   imports = [ ./nix_builder.nix ];
 
+  users = {
+    users.github-runners = {
+      shell = pkgs.bash;
+      isSystemUser = true;
+      group = "github-runners";
+      uid = 601;
+      openssh.authorizedKeys.keys = [
+        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIA/S8i+BNX/12JNKg+5EKGX7Aqimt5KM+ve3wt/SyWuO github-runners" # cspell:disable-line
+      ];
+    };
+    groups.github-runners.gid = 601;
+  };
+
   services.nix_builder.containers = {
     nix-builder-00.enable = true;
     nix-builder-01.enable = true;

systems/jeeves/runners/nix_builder.nix

@@ -2,7 +2,6 @@
   config,
   lib,
   outputs,
-  utils,
   ...
 }:
 
@@ -10,8 +9,6 @@ with lib;
 let
   vars = import ../vars.nix;
   cfg = config.services.nix_builder;
-  runnerUsername = "gitea-runner";
-  runnerUserid = 601;
 in
 {
   options.services.nix_builder = {
@@ -26,40 +23,37 @@ in
         types.submodule (
           { name, ... }:
           {
-            options.enable = mkEnableOption "Gitea runner container";
+            options.enable = mkEnableOption "GitHub runner container";
           }
         )
       );
       default = { };
-      description = "Gitea runner container configurations";
+      description = "GitHub runner container configurations";
     };
   };
 
   config = {
-    users = {
-      users.${runnerUsername} = {
-        isSystemUser = true;
-        group = runnerUsername;
-        uid = runnerUserid;
-      };
-      groups.${runnerUsername}.gid = runnerUserid;
-    };
-
     containers = mapAttrs (
       name: containerCfg:
       mkIf containerCfg.enable {
         autoStart = true;
         privateNetwork = true;
         hostBridge = cfg.bridgeName;
+        ephemeral = true;
         bindMounts = {
+          storage = {
+            hostPath = "/zfs/media/github-runners/${name}";
+            mountPoint = "/zfs/media/github-runners/${name}";
+            isReadOnly = false;
+          };
           host-nix = {
             mountPoint = "/host-nix/var/nix/daemon-socket";
             hostPath = "/nix/var/nix/daemon-socket";
             isReadOnly = false;
           };
-          token = {
+          pat = {
-            hostPath = "${vars.secrets}/services/gitea-runners";
+            hostPath = "${vars.secrets}/services/github-runners/runner_pat";
-            mountPoint = "/run/secrets/gitea-runners";
+            mountPoint = "${vars.secrets}/services/github-runners/runner_pat";
             isReadOnly = true;
           };
         };
@@ -98,69 +92,46 @@ in
                 "nix-command"
               ];
               sandbox = true;
-              allowed-users = [ "gitea-runner" ];
+              allowed-users = [ "github-runners" ];
               trusted-users = [
                 "root"
-                "gitea-runner"
+                "github-runners"
               ];
             };
             nixpkgs = {
               overlays = builtins.attrValues outputs.overlays;
               config.allowUnfree = true;
             };
-            users = {
+            services.github-runners.${name} = {
-              users.${runnerUsername} = {
-                isSystemUser = true;
-                group = runnerUsername;
-                uid = runnerUserid;
-              };
-              groups.${runnerUsername}.gid = runnerUserid;
-            };
-            services.gitea-actions-runner.instances.${name} = {
               enable = true;
-              name = "jeeves-${name}";
+              replace = true;
-              url = "http://192.168.99.14:6443/";
+              workDir = "/zfs/media/github-runners/${name}";
-              labels = [
+              url = "https://github.com/RichieCahill/dotfiles";
-                "self-hosted:host"
+              extraLabels = [ "nixos" ];
-                "nixos:host"
+              tokenFile = "${vars.secrets}/services/github-runners/runner_pat";
-              ];
+              user = "github-runners";
-              tokenFile = "/run/secrets/gitea-runners/registration-token";
+              group = "github-runners";
-              hostPackages = with pkgs; [
+              extraPackages = with pkgs; [
-                bash
-                coreutils
-                curl
-                gawk
                 gitMinimal
-                gnused
+                gh
-                my_python
-                nix
                 nixfmt
                 nixos-rebuild
-                nodejs
                 treefmt
-                wget
+                my_python
               ];
             };
-            systemd.services."gitea-runner-${utils.escapeSystemdPath name}" = {
+            users = {
-              serviceConfig = {
+              users.github-runners = {
-                DynamicUser = mkForce false;
+                shell = pkgs.bash;
-                User = mkForce runnerUsername;
+                isSystemUser = true;
-                Group = mkForce runnerUsername;
+                group = "github-runners";
+                uid = 601;
               };
+              groups.github-runners.gid = 601;
             };
             system.stateVersion = "24.05";
           };
       }
     ) cfg.containers;
-
-    systemd.services = builtins.listToAttrs (
-      map (name: {
-        name = "container@${name}";
-        value = {
-          requires = [ "gitea.service" ];
-          after = [ "gitea.service" ];
-        };
-      }) (builtins.attrNames (filterAttrs (_: c: c.enable) cfg.containers))
-    );
   };
 }

systems/jeeves/scripts/zfs.sh

@@ -15,21 +15,18 @@ sudo zpool add storage -o ashift=12 logs mirror
 sudo zpool create scratch -o ashift=12 -O acltype=posixacl -O atime=off -O dnodesize=auto -O xattr=sa -O compression=zstd -O encryption=aes-256-gcm -O keyformat=hex -O keylocation=file:///key -m /zfs/scratch
 
 # media datasets
-sudo zfs create media/temp -o sync=disabled -o redundant_metadata=none
 sudo zfs create media/secure -o encryption=aes-256-gcm -o keyformat=hex -o keylocation=file:///root/zfs.key
 sudo zfs create media/secure/docker -o compression=zstd-9
 sudo zfs create media/secure/github-runners -o compression=zstd-9 -o sync=disabled
 sudo zfs create media/secure/home_assistant -o compression=zstd-19
 sudo zfs create media/secure/notes -o copies=2
-sudo zfs create media/secure/postgres -o mountpoint=/zfs/media/database/postgres -o recordsize=16k -o primarycache=metadata
+sudo zfs create media/secure/postgres -o recordsize=16k -o primarycache=metadata
-sudo zfs create media/secure/postgres-wal -o mountpoint=/zfs/media/database/postgres-wal -o recordsize=32k -o primarycache=metadata -o special_small_blocks=32K -o compression=lz4 -o secondarycache=none -o logbias=latency
-sudo zfs create media/secure/prometheus -o mountpoint=/zfs/media/database/prometheus -o compression=lz4
 sudo zfs create media/secure/services -o compression=zstd-9
 sudo zfs create media/secure/share -o mountpoint=/zfs/media/share -o exec=off
 
 # scratch datasets
 sudo zfs create scratch/kafka -o mountpoint=/zfs/scratch/kafka -o recordsize=1M
-sudo zfs create scratch/transmission -o mountpoint=/zfs/scratch/transmission -o recordsize=16k -o sync=disabled -o redundant_metadata=none
+sudo zfs create scratch/transmission -o mountpoint=/zfs/scratch/transmission -o recordsize=16k -o sync=disabled
 
 # storage datasets
 sudo zfs create storage/ollama -o recordsize=1M -o compression=zstd-19 -o sync=disabled
@@ -42,4 +39,3 @@ sudo zfs create storage/secure/plex -o recordsize=1M -o compression=zstd-19
 sudo zfs create storage/secure/secrets -o compression=zstd-19 -o copies=3
 sudo zfs create storage/secure/syncthing -o compression=zstd-19
 sudo zfs create storage/secure/transmission -o recordsize=1M -o compression=zstd-9 -o exec=off -o sync=disabled
-sudo zfs create storage/secure/important -o compression=zstd-19 -o copies=2 -o mountpoint=/zfs/storage/important

systems/jeeves/services/audiobookshelf.nix

@@ -3,10 +3,7 @@ let
   vars = import ../vars.nix;
 in
 {
-  services.audiobookshelf = {
+  services.audiobookshelf.enable = true;
-    enable = true;
-    port = 8000;
-  };
   systemd.services.audiobookshelf.serviceConfig.WorkingDirectory =
     lib.mkForce "${vars.docker_configs}/audiobookshelf";
   users.users.audiobookshelf.home = lib.mkForce "${vars.docker_configs}/audiobookshelf";

systems/jeeves/services/camofox-browser.nix

@@ -1,80 +0,0 @@
-{
-  ...
-}:
-let
-  vars = import ../vars.nix;
-in
-{
-  systemd.tmpfiles.rules = [
-    "d ${vars.docker_configs}/camofox-browser 0750 root root - -"
-  ];
-
-  containers.camofox-browser = {
-    autoStart = true;
-    privateNetwork = false;
-    bindMounts = {
-      camofox-browser = {
-        hostPath = "${vars.docker_configs}/camofox-browser";
-        mountPoint = "/var/lib/camofox-browser";
-        isReadOnly = false;
-      };
-    };
-    config =
-      {
-        pkgs,
-        lib,
-        ...
-      }:
-      {
-        networking.hostName = "camofox-browser";
-
-        environment.systemPackages = with pkgs; [
-          ffmpeg
-          git
-          nodejs
-          python3Packages.yt-dlp
-        ];
-
-        systemd.services.camofox-browser = {
-          description = "Camofox browser server";
-          wantedBy = [ "multi-user.target" ];
-          after = [ "network.target" ];
-          environment = {
-            CAMOFOX_HOST = "127.0.0.1";
-            CAMOFOX_PORT = "9377";
-            HOME = "/var/lib/camofox-browser";
-          };
-          path = with pkgs; [
-            bash
-            coreutils
-            git
-            nodejs
-          ];
-          serviceConfig = {
-            Restart = "always";
-            RestartSec = "5s";
-            WorkingDirectory = "/var/lib/camofox-browser";
-          };
-          script = ''
-            set -eu
-
-            app_dir=/var/lib/camofox-browser/app
-
-            if [ ! -d "$app_dir/.git" ]; then
-              git clone --depth 1 https://github.com/jo-inc/camofox-browser "$app_dir"
-            fi
-
-            cd "$app_dir"
-
-            if [ ! -d node_modules ]; then
-              npm install
-            fi
-
-            exec npm start
-          '';
-        };
-
-        system.stateVersion = lib.mkDefault "24.05";
-      };
-  };
-}

systems/jeeves/services/cloud_flare_tunnel.nix

@@ -0,0 +1,17 @@
+{ pkgs, ... }:
+let
+  vars = import ../vars.nix;
+in
+{
+  systemd.services.cloud_flare_tunnel = {
+    description = "cloud_flare_tunnel proxy's traffic through cloudflare";
+    after = [ "network.target" ];
+    wantedBy = [ "multi-user.target" ];
+    serviceConfig = {
+      Type = "simple";
+      EnvironmentFile = "${vars.secrets}/docker/cloud_flare_tunnel";
+      ExecStart = "${pkgs.cloudflared}/bin/cloudflared --no-autoupdate tunnel run";
+      Restart = "on-failure";
+    };
+  };
+}

systems/jeeves/services/gitea.nix

@@ -2,10 +2,7 @@ let
   vars = import ../vars.nix;
 in
 {
-  networking.firewall.allowedTCPPorts = [
+  networking.firewall.allowedTCPPorts = [ 6443 ];
-    6443
-    2223
-  ];
 
   services.gitea = {
     enable = true;
@@ -21,17 +18,13 @@ in
       createDatabase = false;
     };
     settings = {
-      actions = {
-        ENABLED = true;
-        DEFAULT_ACTIONS_URL = "github";
-      };
       service.DISABLE_REGISTRATION = true;
       server = {
         DOMAIN = "tmmworkshop.com";
         ROOT_URL = "https://gitea.tmmworkshop.com/";
         HTTP_PORT = 6443;
         SSH_PORT = 2223;
-        SSH_LISTEN_PORT = 2223;
+        SSH_LISTEN_PORT = 2224;
         START_SSH_SERVER = true;
         PUBLIC_URL_DETECTION = "auto";
       };

systems/jeeves/services/grafana.nix

@@ -1,80 +0,0 @@
-{
-  ...
-}:
-let
-  vars = import ../vars.nix;
-  grafanaDataDir = "${vars.services}/grafana";
-in
-{
-  networking.firewall.allowedTCPPorts = [ 3000 ];
-
-  services.grafana = {
-    enable = true;
-    dataDir = grafanaDataDir;
-    settings = {
-      database.type = "sqlite3";
-      security = {
-        admin_password = "$__file{${vars.secrets}/services/grafana/admin_password}";
-        admin_user = "admin";
-        secret_key = "$__file{${vars.secrets}/services/grafana/secret_key}";
-      };
-      server = {
-        http_addr = "192.168.90.40";
-        http_port = 3000;
-        root_url = "http://192.168.90.40:3000/";
-      };
-    };
-    provision = {
-      enable = true;
-      dashboards.settings = {
-        apiVersion = 1;
-        providers = [
-          {
-            name = "monitoring";
-            folder = "Monitoring";
-            type = "file";
-            disableDeletion = false;
-            editable = false;
-            allowUiUpdates = false;
-            updateIntervalSeconds = 30;
-            options.path = ../monitoring/dashboards;
-          }
-        ];
-      };
-      datasources.settings = {
-        apiVersion = 1;
-        prune = true;
-        datasources = [
-          {
-            access = "proxy";
-            editable = false;
-            isDefault = true;
-            name = "prom-main";
-            type = "prometheus";
-            uid = "prom-main";
-            url = "http://127.0.0.1:9090";
-          }
-          {
-            access = "proxy";
-            editable = false;
-            name = "prom-pid-short";
-            type = "prometheus";
-            uid = "prom-pid-short";
-            url = "http://127.0.0.1:9092";
-          }
-        ];
-      };
-    };
-  };
-
-  systemd = {
-    services.grafana.after = [
-      "prometheus-main.service"
-      "prometheus-pid-short.service"
-    ];
-
-    tmpfiles.rules = [
-      "d ${grafanaDataDir} 0750 grafana grafana - -"
-    ];
-  };
-}

systems/jeeves/services/haproxy.cfg

@@ -6,7 +6,6 @@ global
 defaults
   log global
   mode http
-  option httplog
   retries 3
   maxconn 2000
   timeout connect 5s
@@ -23,38 +22,24 @@ defaults
 #Application Setup
 frontend ContentSwitching
   bind *:80 v4v6
-  bind *:443 v4v6 ssl crt /var/lib/acme/audiobookshelf.tmmworkshop.com/full.pem crt /var/lib/acme/cache.tmmworkshop.com/full.pem crt /var/lib/acme/jellyfin.tmmworkshop.com/full.pem crt /var/lib/acme/share.tmmworkshop.com/full.pem crt /var/lib/acme/gitea.tmmworkshop.com/full.pem crt /var/lib/acme/www.norn-sight.com/full.pem
+  bind *:443 v4v6 ssl crt /zfs/storage/secrets/docker/cloudflare.pem
   mode  http
-
-  # ACME challenge routing (must be first)
-  acl is_acme path_beg /.well-known/acme-challenge/
-
   # tmmworkshop.com
   acl host_audiobookshelf  hdr(host) -i audiobookshelf.tmmworkshop.com
   acl host_cache  hdr(host) -i cache.tmmworkshop.com
   acl host_jellyfin  hdr(host) -i jellyfin.tmmworkshop.com
   acl host_share  hdr(host) -i share.tmmworkshop.com
+  acl host_gcw  hdr(host) -i gcw.tmmworkshop.com
+  acl host_n8n  hdr(host) -i n8n.tmmworkshop.com
   acl host_gitea  hdr(host) -i gitea.tmmworkshop.com
-  acl host_norn_sight  hdr(host) -i www.norn-sight.com
 
-  # Hosts allowed to serve plain HTTP (add entries to skip the HTTPS redirect)
-  acl allow_http hdr(host) -i __none__
-  # acl allow_http hdr(host) -i example.tmmworkshop.com
-
-  # Redirect all HTTP to HTTPS unless on the allow list or ACME challenge
-  http-request redirect scheme https code 301 if !{ ssl_fc } !allow_http !is_acme
-
-  use_backend acme_challenge if is_acme
   use_backend audiobookshelf_nodes if host_audiobookshelf
   use_backend cache_nodes  if host_cache
   use_backend jellyfin if host_jellyfin
   use_backend share_nodes  if host_share
+  use_backend gcw_nodes  if host_gcw
+  use_backend n8n  if host_n8n
   use_backend gitea  if host_gitea
-  use_backend norn_sight  if host_norn_sight
-
-backend acme_challenge
-  mode http
-  server acme 127.0.0.1:8402
 
 backend audiobookshelf_nodes
   mode http
@@ -75,10 +60,14 @@ backend share_nodes
   mode http
   server server 127.0.0.1:8091
 
+backend gcw_nodes
+  mode http
+  server server 127.0.0.1:8092
+
+backend n8n
+  mode http
+  server server 127.0.0.1:5678
+
 backend gitea
   mode http
   server server 127.0.0.1:6443
-
-backend norn_sight
-  mode http
-  server server 127.0.0.1:8001

systems/jeeves/services/kafka.nix

@@ -3,7 +3,7 @@ let
 in
 {
   services.apache-kafka = {
-    enable = false;
+    enable = true;
     settings = {
       listeners = [ "PLAINTEXT://localhost:9092" ];
       "log.dirs" = [ vars.kafka ];

systems/jeeves/services/nornsight.nix

@@ -1,107 +0,0 @@
-{ pkgs, ... }:
-let
-  vars = import ../vars.nix;
-  stateDir = "${vars.services}/nornsight";
-  appDir = "${stateDir}/app";
-  binPath = pkgs.lib.makeBinPath [
-    pkgs.binutils
-    pkgs.libpq
-    pkgs.postgresql
-    pkgs.stdenv.cc
-  ];
-  libraryPath = pkgs.lib.makeLibraryPath [
-    pkgs.libpq
-    pkgs.postgresql.lib
-  ];
-in
-{
-  systemd.tmpfiles.rules = [
-    "d ${stateDir} 0750 nornsight nornsight - -"
-  ];
-
-  users.users.nornsight = {
-    isSystemUser = true;
-    group = "nornsight";
-    home = stateDir;
-  };
-
-  systemd.services.nornsight = {
-    description = "Norn Sight";
-    after = [ "network-online.target" ];
-    wants = [ "network-online.target" ];
-    wantedBy = [ "multi-user.target" ];
-
-    environment = {
-      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;
-      LIBRARY_PATH = libraryPath;
-      PSYCOPG_IMPL = "python";
-    };
-
-    path = with pkgs; [
-      bash
-      coreutils
-      git
-      uv
-    ];
-
-    serviceConfig = {
-      Type = "simple";
-      User = "nornsight";
-      Group = "nornsight";
-      EnvironmentFile = "-${vars.secrets}/services/nornsight";
-      WorkingDirectory = stateDir;
-      Restart = "on-failure";
-      RestartSec = "5s";
-      StandardOutput = "journal";
-      StandardError = "journal";
-      NoNewPrivileges = true;
-      PrivateTmp = true;
-      ProtectHome = true;
-      ProtectSystem = "strict";
-      ReadWritePaths = [ stateDir ];
-    };
-
-    script = ''
-      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}"
-      branch="''${NORN_SIGHT_BRANCH:-main}"
-
-      if [ -d "${appDir}/.git" ]; then
-        current_origin="$(git -C "${appDir}" remote get-url origin)"
-        if [ "$current_origin" != "$NORN_SIGHT_REPO_URL" ]; then
-          rm -rf "${appDir}"
-        fi
-      fi
-
-      if [ ! -d "${appDir}/.git" ]; then
-        git clone --branch "$branch" "$NORN_SIGHT_REPO_URL" "${appDir}"
-      else
-        cd "${appDir}"
-        git fetch origin "$branch"
-        git checkout "$branch"
-        git pull --ff-only origin "$branch"
-      fi
-
-      cd "${appDir}"
-      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 --host 0.0.0.0 --port 8001
-    '';
-  };
-}

systems/jeeves/services/postgress.nix

@@ -5,14 +5,9 @@ in
 {
   networking.firewall.allowedTCPPorts = [ 5432 ];
 
-  # Symlink pg_wal to a ZFS dataset on the special (metadata) vdev for fast WAL writes
-  # this is required for systemd sandboxing
-  systemd.services.postgresql.serviceConfig.ReadWritePaths = [ "/zfs/media/database/postgres-wal" ];
-
   services.postgresql = {
     enable = true;
     package = pkgs.postgresql_17_jit;
-    extensions = ps: with ps; [ pgvector ];
     enableTCPIP = true;
     enableJIT = true;
     dataDir = "${vars.database}/postgres";
@@ -38,19 +33,12 @@ in
       # signalbot
       local signalbot  signalbot   trust
 
-      # hedgedoc
-      local hedgedoc   hedgedoc    trust
-
       # math
       local postgres  math   trust
       host  postgres  math   127.0.0.1/32    trust
       host  postgres  math   ::1/128         trust
       host  postgres  math   192.168.90.1/24 trust
 
-      local data_science_dev  math   trust
-      host  data_science_dev  math   127.0.0.1/32    trust
-      host  data_science_dev  math   ::1/128         trust
-      host  data_science_dev  math   192.168.90.1/24 trust
     '';
 
     identMap = ''
@@ -120,19 +108,10 @@ in
           login = true;
         };
       }
-      {
-        name = "hedgedoc";
-        ensureDBOwnership = true;
-        ensureClauses = {
-          login = true;
-        };
-      }
     ];
     ensureDatabases = [
-      "data_science_dev"
       "hass"
       "gitea"
-      "hedgedoc"
       "math"
       "n8n"
       "richie"

systems/jeeves/services/signal_bot.nix

@@ -0,0 +1,57 @@
+{
+  pkgs,
+  inputs,
+  ...
+}:
+let
+  vars = import ../vars.nix;
+in
+{
+  users = {
+    users.signalbot = {
+      isSystemUser = true;
+      group = "signalbot";
+    };
+    groups.signalbot = { };
+  };
+
+  systemd.services.signal-bot = {
+    description = "Signal command and control bot";
+    after = [
+      "network.target"
+      "podman-signal_cli_rest_api.service"
+    ];
+    wants = [ "podman-signal_cli_rest_api.service" ];
+    wantedBy = [ "multi-user.target" ];
+
+    environment = {
+      PYTHONPATH = "${inputs.self}";
+      SIGNALBOT_DB = "signalbot";
+      SIGNALBOT_USER = "signalbot";
+      SIGNALBOT_HOST = "/run/postgresql";
+      SIGNALBOT_PORT = "5432";
+    };
+
+    serviceConfig = {
+      Type = "simple";
+      WorkingDirectory = "${inputs.self}";
+      User = "signalbot";
+      Group = "signalbot";
+      EnvironmentFile = "${vars.secrets}/services/signal-bot";
+      ExecStart = "${pkgs.my_python}/bin/python -m python.signal_bot.main";
+      StateDirectory = "signal-bot";
+      Restart = "on-failure";
+      RestartSec = "10s";
+      StandardOutput = "journal";
+      StandardError = "journal";
+      NoNewPrivileges = true;
+      ProtectSystem = "strict";
+      ProtectHome = "read-only";
+      PrivateTmp = true;
+      ReadWritePaths = [ "/var/lib/signal-bot" ];
+      ReadOnlyPaths = [
+        "${inputs.self}"
+      ];
+    };
+  };
+}

systems/jeeves/services/validate_system.toml

@@ -1,6 +1,7 @@
 zpool = ["root_pool", "storage", "media"]
 services = [
     "audiobookshelf",
+    "cloud_flare_tunnel",
     "haproxy",
     "docker",
     "home-assistant",

systems/jeeves/snapshot_config.toml

@@ -4,7 +4,6 @@ hourly = 24
 daily = 0
 monthly = 0
 
-# root_pool
 ["root_pool/home"]
 15_min = 8
 hourly = 24
@@ -28,96 +27,57 @@ monthly = 0
 hourly = 24
 daily = 30
 monthly = 6
-# storage
-["storage/ollama"]
-15_min = 2
-hourly = 0
-daily = 0
-monthly = 0
 
-["storage/secure"]
+["storage/plex"]
-15_min = 0
-hourly = 0
-daily = 0
-monthly = 0
-
-["storage/secure/plex"]
 15_min = 6
 hourly = 2
 daily = 1
 monthly = 0
 
-["storage/secure/transmission"]
+["media/plex"]
-15_min = 4
+15_min = 6
-hourly = 0
+hourly = 2
-daily = 0
+daily = 1
 monthly = 0
 
-["storage/secure/secrets"]
+["media/notes"]
 15_min = 8
 hourly = 24
 daily = 30
 monthly = 12
 
-# media
+["media/docker"]
-["media/temp"]
+15_min = 3
-15_min = 2
+hourly = 12
-hourly = 0
+daily = 14
-daily = 0
+monthly = 2
-monthly = 0
+
-
+["media/services"]
-["media/secure"]
+15_min = 3
-15_min = 0
+hourly = 12
-hourly = 0
+daily = 14
-daily = 0
+monthly = 2
-monthly = 0
+
-
+["media/home_assistant"]
-["media/secure/plex"]
-15_min = 6
-hourly = 2
-daily = 1
-monthly = 0
-
-["media/secure/postgres-wal"]
-15_min = 4
-hourly = 2
-daily = 0
-monthly = 0
-
-
-["media/secure/postgres"]
-15_min = 8
-hourly = 24
-daily = 7
-monthly = 0
-
-["media/secure/share"]
-15_min = 4
-hourly = 0
-daily = 0
-monthly = 0
-
-["media/secure/github-runners"]
-15_min = 6
-hourly = 2
-daily = 1
-monthly = 0
-
-["media/secure/notes"]
-15_min = 8
-hourly = 24
-daily = 30
-monthly = 12
-
-["media/secure/docker"]
 15_min = 3
 hourly = 12
 daily = 14
 monthly = 2
 
-# scratch
 ["scratch/transmission"]
-15_min = 2
+15_min = 0
+hourly = 0
+daily = 0
+monthly = 0
+
+["storage/transmission"]
+15_min = 0
+hourly = 0
+daily = 0
+monthly = 0
+
+["storage/ollama"]
+15_min = 0
 hourly = 0
 daily = 0
 monthly = 0

systems/jeeves/syncthing.nix

@@ -10,14 +10,6 @@ in
     settings = {
       devices.davids-server.id = "7GXTDGR-AOXFW2O-K6J7NM3-XYZNRRW-AKHAFWM-GBOWUPQ-OA6JIWD-ER7RDQL"; # cspell:disable-line
       folders = {
-        photos = {
-          path = "${vars.syncthing}/important";
-          devices = [
-            "rhapsody-in-green"
-            "phone"
-          ];
-          fsWatcherEnabled = true;
-        };
         "dotfiles" = {
           path = "/home/richie/dotfiles";
           devices = [
@@ -97,16 +89,7 @@ in
           ];
           fsWatcherEnabled = true;
         };
-        "recordings" = {
+        #
-          path = "/home/richie/recordings";
-          devices = [
-            "bob"
-            "phone"
-            "rhapsody-in-green"
-          ];
-          fsWatcherEnabled = true;
-        };
-        # davids-server
         "davids-backup1" = {
           id = "8229p-8z3tm"; # cspell:disable-line
           path = "${vars.syncthing}/davids_backups/1";

systems/jeeves/web_services/acme.nix

@@ -1,74 +0,0 @@
-let
-  domains = [
-    "audiobookshelf"
-    "cache"
-    "gitea"
-    "jellyfin"
-    "share"
-  ];
-  extraDomains = [ "www.norn-sight.com" ];
-
-  makeCert = name: {
-    name = "${name}.tmmworkshop.com";
-    value = {
-      webroot = "/var/lib/acme/.challenges";
-      group = "acme";
-      reloadServices = [ "haproxy.service" ];
-    };
-  };
-
-  makeExtraCert = name: {
-    inherit name;
-    value = {
-      webroot = "/var/lib/acme/.challenges";
-      group = "acme";
-      reloadServices = [ "haproxy.service" ];
-    };
-  };
-
-  acmeServices =
-    map (domain: "acme-${domain}.tmmworkshop.com.service") domains
-    ++ map (domain: "acme-${domain}.service") extraDomains;
-in
-{
-  users.users.haproxy.extraGroups = [ "acme" ];
-
-  security.acme = {
-    acceptTerms = true;
-    defaults.email = "Richie@tmmworkshop.com";
-    certs = builtins.listToAttrs ((map makeCert domains) ++ (map makeExtraCert extraDomains));
-  };
-
-  # Minimal nginx to serve ACME HTTP-01 challenge files for HAProxy
-  services.nginx = {
-    enable = true;
-    virtualHosts."acme-challenge" = {
-      listen = [
-        {
-          addr = "127.0.0.1";
-          port = 8402;
-        }
-      ];
-      locations."/.well-known/acme-challenge/" = {
-        root = "/var/lib/acme/.challenges";
-      };
-    };
-  };
-
-  # Ensure the challenge directory exists with correct permissions
-  systemd.tmpfiles.rules = [
-    "d /var/lib/acme/.challenges 0750 acme acme - -"
-    "d /var/lib/acme/.challenges/.well-known 0750 acme acme - -"
-    "d /var/lib/acme/.challenges/.well-known/acme-challenge 0750 acme acme - -"
-  ];
-
-  users.users.nginx.extraGroups = [ "acme" ];
-
-  # HAProxy needs certs to exist before it can bind :443.
-  # NixOS's acme module generates self-signed placeholders on first boot
-  # via acme-<domain>.service — just make HAProxy wait for them.
-  systemd.services.haproxy = {
-    after = acmeServices;
-    wants = acmeServices;
-  };
-}

systems/jeeves/web_services/default.nix

@@ -1,9 +0,0 @@
-{ lib, ... }:
-{
-  imports =
-    let
-      files = builtins.attrNames (builtins.readDir ./.);
-      nixFiles = builtins.filter (name: lib.hasSuffix ".nix" name && name != "default.nix") files;
-    in
-    map (file: ./. + "/${file}") nixFiles;
-}

systems/rhapsody-in-green/agent_logger.nix

@@ -1,35 +0,0 @@
-{
-  pkgs,
-  inputs,
-  ...
-}:
-{
-  systemd.services.agent-logger = {
-    description = "Unified agent logger";
-    after = [ "local-fs.target" ];
-    wantedBy = [ "multi-user.target" ];
-
-    environment = {
-      AGENT_LOG_DB = "/var/lib/agent-logger/agent_log.sqlite";
-      HOME = "/home/richie";
-      PYTHONPATH = "${inputs.self}";
-    };
-
-    serviceConfig = {
-      Type = "simple";
-      User = "richie";
-      WorkingDirectory = "/home/richie";
-      ExecStart = "${pkgs.my_python}/bin/python -m python.agent_logger.main";
-      StateDirectory = "agent-logger";
-      Restart = "on-failure";
-      RestartSec = "5s";
-      StandardOutput = "journal";
-      StandardError = "journal";
-      NoNewPrivileges = true;
-      ProtectSystem = "strict";
-      ProtectHome = "read-only";
-      PrivateTmp = true;
-      ReadOnlyPaths = [ "${inputs.self}" ];
-    };
-  };
-}

systems/rhapsody-in-green/default.nix

@@ -11,8 +11,8 @@
     "${inputs.self}/common/optional/yubikey.nix"
     "${inputs.self}/common/optional/zerotier.nix"
     ./hardware.nix
+    ./llms.nix
     ./open_webui.nix
-    ./programs.nix
     ./qmk.nix
     ./syncthing.nix
     inputs.nixos-hardware.nixosModules.framework-13-7040-amd
@@ -23,20 +23,11 @@
     hostId = "6404140d";
     firewall = {
       enable = true;
-      allowedTCPPorts = [
+      allowedTCPPorts = [ ];
-        8000
-        8080
-        8081
-      ];
     };
     networkmanager.enable = true;
   };
 
-  programs.appimage = {
-    enable = true;
-    binfmt = true; # allows *.AppImage to be run directly
-  };
-
   services = {
     openssh.ports = [ 922 ];
     flatpak.enable = true;

systems/rhapsody-in-green/llms.nix

@@ -0,0 +1,30 @@
+{
+  services.ollama = {
+    user = "ollama";
+    enable = true;
+    host = "127.0.0.1";
+    syncModels = true;
+    loadModels = [
+      "deepscaler:1.5b"
+      "deepseek-r1:8b"
+      "gemma3:12b"
+      "gemma3:27b"
+      "gpt-oss:20b"
+      "lfm2:24b"
+      "qwen3:14b"
+      "qwen3.5:27b"
+    ];
+  };
+  systemd.services = {
+    ollama.serviceConfig = {
+      Nice = 19;
+      IOSchedulingPriority = 7;
+    };
+    ollama-model-loader.serviceConfig = {
+      Nice = 19;
+      CPUWeight = 50;
+      IOSchedulingClass = "idle";
+      IOSchedulingPriority = 7;
+    };
+  };
+}

systems/rhapsody-in-green/open_webui.nix

@@ -1,7 +1,6 @@
 {
   services.open-webui = {
     enable = true;
-    host = "0.0.0.0";
     environment = {
       ANONYMIZED_TELEMETRY = "False";
       DO_NOT_TRACK = "True";

systems/rhapsody-in-green/programs.nix

@@ -1,6 +0,0 @@
-{ pkgs, ... }:
-{
-  environment.systemPackages = with pkgs; [
-    ffmpeg
-  ];
-}

systems/rhapsody-in-green/syncthing.nix

@@ -39,14 +39,6 @@
       ];
       fsWatcherEnabled = true;
     };
-    photos = {
-      path = "/home/richie/photos";
-      devices = [
-        "jeeves"
-        "phone"
-      ];
-      fsWatcherEnabled = true;
-    };
     "projects" = {
       id = "vyma6-lqqrz"; # cspell:disable-line
       path = "/home/richie/projects";
@@ -63,15 +55,6 @@
       ];
       fsWatcherEnabled = true;
     };
-    "recordings" = {
-      path = "/home/richie/recordings";
-      devices = [
-        "bob"
-        "jeeves"
-        "phone"
-      ];
-      fsWatcherEnabled = true;
-    };
     "vault" = {
       path = "/home/richie/vault";
       devices = [

tests/conftest.py

@@ -0,0 +1,40 @@
+"""Shared test fixtures."""
+
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+import pytest
+from sqlalchemy import create_engine, event
+
+from python.orm.signal_bot.base import SignalBotBase
+
+if TYPE_CHECKING:
+    from collections.abc import Generator
+
+    from sqlalchemy.engine import Engine
+
+
+@pytest.fixture(scope="session")
+def sqlite_engine() -> Generator[Engine]:
+    """Create an in-memory SQLite engine for testing."""
+    engine = create_engine("sqlite:///:memory:")
+
+    @event.listens_for(engine, "connect")
+    def _set_sqlite_pragma(dbapi_connection, _connection_record):
+        cursor = dbapi_connection.cursor()
+        cursor.execute("PRAGMA foreign_keys=ON")
+        cursor.close()
+
+    SignalBotBase.metadata.create_all(engine)
+    yield engine
+    engine.dispose()
+
+
+@pytest.fixture
+def engine(sqlite_engine: Engine) -> Generator[Engine]:
+    """Yield the shared engine after cleaning all tables between tests."""
+    yield sqlite_engine
+    with sqlite_engine.begin() as connection:
+        for table in reversed(SignalBotBase.metadata.sorted_tables):
+            connection.execute(table.delete())

tests/test_audiobook_catalog.py

@@ -1,126 +0,0 @@
-"""test_audiobook_catalog."""
-
-from __future__ import annotations
-
-import pytest
-from sqlalchemy import create_engine, select
-from sqlalchemy.orm import sessionmaker
-
-from python.orm.richie import AudiobookAuthor, AudiobookSeries, RichieBase
-from python.tools.audiobook import catalog
-
-
-@pytest.fixture
-def audiobook_session():
-    engine = create_engine("sqlite+pysqlite:///:memory:", future=True)
-    RichieBase.metadata.create_all(engine)
-    with sessionmaker(bind=engine, expire_on_commit=False, future=True)() as session:
-        yield session
-    engine.dispose()
-
-
-def test_upsert_catalog_csv_inserts_and_updates_authors_and_series(tmp_path, audiobook_session) -> None:
-    audiobook_session.add_all(
-        [
-            AudiobookAuthor(id=10, name="old_author"),
-            AudiobookAuthor(id=11, name="craig_alanson"),
-        ],
-    )
-    audiobook_session.commit()
-    authors_csv = tmp_path / "authors.csv"
-    series_csv = tmp_path / "series.csv"
-    authors_csv.write_text(
-        "name,id\n"
-        "glynn_stewart,\n"
-        "craig_alanson,\n"
-        "updated_author,10\n",
-        encoding="utf-8",
-    )
-    series_csv.write_text(
-        "name,author_name,id\n"
-        "starships_mage,glynn_stewart,\n"
-        "expeditionary_force,craig_alanson,\n",
-        encoding="utf-8",
-    )
-
-    author_count = catalog.upsert_authors_from_csv(audiobook_session, authors_csv)
-    series_count = catalog.upsert_series_from_csv(audiobook_session, series_csv)
-    audiobook_session.commit()
-
-    authors = audiobook_session.scalars(select(AudiobookAuthor).order_by(AudiobookAuthor.id)).all()
-    series = audiobook_session.scalars(select(AudiobookSeries).order_by(AudiobookSeries.name)).all()
-    assert author_count == 3
-    assert series_count == 2
-    assert [(author.id, author.name) for author in authors] == [
-        (10, "updated_author"),
-        (11, "craig_alanson"),
-        (12, "glynn_stewart"),
-    ]
-    assert [(row.name, row.author.name) for row in series] == [
-        ("expeditionary_force", "craig_alanson"),
-        ("starships_mage", "glynn_stewart"),
-    ]
-
-
-def test_upsert_series_csv_updates_series_by_id(tmp_path, audiobook_session) -> None:
-    author = AudiobookAuthor(id=1, name="glynn_stewart")
-    audiobook_session.add_all(
-        [
-            author,
-            AudiobookSeries(id=7, name="old_series", author=author),
-        ],
-    )
-    audiobook_session.commit()
-    series_csv = tmp_path / "series.csv"
-    series_csv.write_text(
-        "name,author_name,id\n"
-        "starships_mage,glynn_stewart,7\n",
-        encoding="utf-8",
-    )
-
-    count = catalog.upsert_series_from_csv(audiobook_session, series_csv)
-    audiobook_session.commit()
-
-    series = audiobook_session.get(AudiobookSeries, 7)
-    assert count == 1
-    assert series.name == "starships_mage"
-    assert series.author.name == "glynn_stewart"
-
-
-def test_upsert_csv_allows_missing_id_column(tmp_path, audiobook_session) -> None:
-    authors_csv = tmp_path / "authors.csv"
-    series_csv = tmp_path / "series.csv"
-    authors_csv.write_text(
-        "name\n"
-        "glynn_stewart\n",
-        encoding="utf-8",
-    )
-    series_csv.write_text(
-        "name,author_name\n"
-        "starships_mage,glynn_stewart\n",
-        encoding="utf-8",
-    )
-
-    author_count = catalog.upsert_authors_from_csv(audiobook_session, authors_csv)
-    series_count = catalog.upsert_series_from_csv(audiobook_session, series_csv)
-    audiobook_session.commit()
-
-    series = audiobook_session.scalar(select(AudiobookSeries))
-    assert author_count == 1
-    assert series_count == 1
-    assert series.name == "starships_mage"
-    assert series.author.name == "glynn_stewart"
-
-
-def test_upsert_series_csv_rejects_unknown_author(tmp_path, audiobook_session) -> None:
-    series_csv = tmp_path / "series.csv"
-    series_csv.write_text(
-        "name,author_name,id\n"
-        "starships_mage,glynn_stewart,\n",
-        encoding="utf-8",
-    )
-
-    with pytest.raises(catalog.CatalogImportError) as error:
-        catalog.upsert_series_from_csv(audiobook_session, series_csv)
-
-    assert "author not found: glynn_stewart" in str(error.value)

tests/test_gitea_flake_lock.py

@@ -1,113 +0,0 @@
-"""Tests for Gitea flake.lock automation."""
-
-from __future__ import annotations
-
-from python.gitea import PullRequest
-from python.gitea_flake_lock import (
-    PR_CHECK_WORKFLOWS,
-    PR_LABELS,
-    dispatch_pull_request_checks,
-    ensure_flake_lock_pull_request,
-    find_flake_lock_pull_request,
-)
-
-
-def _pull_request(number=1, head_branch="automation/update-flake-lock"):
-    return PullRequest(
-        number=number,
-        title="Update flake.lock",
-        html_url=f"https://gitea.example.test/pulls/{number}",
-        labels=(),
-        head_branch=head_branch,
-        base_branch="main",
-    )
-
-
-class FakeGiteaClient:
-    def __init__(self, pull_requests=None):
-        self.pull_requests = pull_requests or []
-        self.dispatch_calls = []
-        self.list_calls = []
-        self.create_calls = []
-
-    def list_open_pull_requests(self, **kwargs):
-        self.list_calls.append(kwargs)
-        return self.pull_requests
-
-    def create_pull_request(self, **kwargs):
-        self.create_calls.append(kwargs)
-        return _pull_request()
-
-    def dispatch_workflow(self, **kwargs):
-        self.dispatch_calls.append(kwargs)
-
-
-def test_ensure_flake_lock_pull_request_finds_by_branch():
-    pull_request = _pull_request()
-    client = FakeGiteaClient([pull_request])
-
-    result = ensure_flake_lock_pull_request(
-        client,
-        owner="Richie",
-        repo="dotfiles",
-        branch="automation/update-flake-lock",
-        base="main",
-    )
-
-    assert result == pull_request
-    assert client.list_calls == [
-        {"owner": "Richie", "repo": "dotfiles", "head": "automation/update-flake-lock"},
-    ]
-    assert client.create_calls == []
-
-
-def test_ensure_flake_lock_pull_request_creates_with_labels():
-    client = FakeGiteaClient()
-
-    ensure_flake_lock_pull_request(
-        client,
-        owner="Richie",
-        repo="dotfiles",
-        branch="automation/update-flake-lock",
-        base="main",
-    )
-
-    assert client.create_calls == [
-        {
-            "owner": "Richie",
-            "repo": "dotfiles",
-            "title": "Update flake.lock",
-            "body": "Automated flake.lock update.",
-            "head": "automation/update-flake-lock",
-            "base": "main",
-            "labels": PR_LABELS,
-        },
-    ]
-
-
-def test_find_flake_lock_pull_request_finds_by_label():
-    pull_request = _pull_request()
-    client = FakeGiteaClient([pull_request])
-
-    result = find_flake_lock_pull_request(client, owner="Richie", repo="dotfiles")
-
-    assert result == pull_request
-    assert client.list_calls == [
-        {"owner": "Richie", "repo": "dotfiles", "labels": ["flake_lock_update"]},
-    ]
-
-
-def test_dispatch_pull_request_checks_runs_each_workflow():
-    client = FakeGiteaClient()
-
-    dispatch_pull_request_checks(client, owner="Richie", repo="dotfiles", branch="automation/update-flake-lock")
-
-    assert client.dispatch_calls == [
-        {
-            "owner": "Richie",
-            "repo": "dotfiles",
-            "workflow_id": workflow,
-            "ref": "automation/update-flake-lock",
-        }
-        for workflow in PR_CHECK_WORKFLOWS
-    ]

tests/test_signal_bot.py

@@ -0,0 +1,321 @@
+"""Tests for the Signal command and control bot."""
+
+from __future__ import annotations
+
+import json
+from datetime import timedelta
+from unittest.mock import MagicMock, patch
+
+import pytest
+
+from python.signal_bot.commands.inventory import (
+    _format_summary,
+    parse_llm_response,
+)
+from python.signal_bot.commands.location import _format_location, handle_location_request
+from python.signal_bot.device_registry import _BLOCKED_TTL, _DEFAULT_TTL, DeviceRegistry, _CacheEntry
+from python.signal_bot.llm_client import LLMClient
+from python.signal_bot.main import Bot
+from python.signal_bot.models import (
+    BotConfig,
+    InventoryItem,
+    SignalMessage,
+    TrustLevel,
+)
+from python.signal_bot.signal_client import SignalClient
+
+
+class TestModels:
+    def test_trust_level_values(self):
+        assert TrustLevel.VERIFIED == "verified"
+        assert TrustLevel.UNVERIFIED == "unverified"
+        assert TrustLevel.BLOCKED == "blocked"
+
+    def test_signal_message_defaults(self):
+        msg = SignalMessage(source="+1234", timestamp=0)
+        assert msg.message == ""
+        assert msg.attachments == []
+        assert msg.group_id is None
+
+    def test_inventory_item_defaults(self):
+        item = InventoryItem(name="wrench")
+        assert item.quantity == 1
+        assert item.unit == "each"
+        assert item.category == ""
+
+
+class TestInventoryParsing:
+    def test_parse_llm_response_basic(self):
+        raw = '[{"name": "water", "quantity": 6, "unit": "gallon", "category": "supplies", "notes": ""}]'
+        items = parse_llm_response(raw)
+        assert len(items) == 1
+        assert items[0].name == "water"
+        assert items[0].quantity == 6
+        assert items[0].unit == "gallon"
+
+    def test_parse_llm_response_with_code_fence(self):
+        raw = '```json\n[{"name": "tape", "quantity": 1, "unit": "each", "category": "tools", "notes": ""}]\n```'
+        items = parse_llm_response(raw)
+        assert len(items) == 1
+        assert items[0].name == "tape"
+
+    def test_parse_llm_response_invalid_json(self):
+        with pytest.raises(json.JSONDecodeError):
+            parse_llm_response("not json at all")
+
+    def test_format_summary(self):
+        items = [InventoryItem(name="water", quantity=6, unit="gallon", category="supplies")]
+        summary = _format_summary(items)
+        assert "water" in summary
+        assert "x6" in summary
+        assert "gallon" in summary
+
+
+class TestDeviceRegistry:
+    @pytest.fixture
+    def signal_mock(self):
+        return MagicMock(spec=SignalClient)
+
+    @pytest.fixture
+    def registry(self, signal_mock, engine):
+        return DeviceRegistry(signal_mock, engine)
+
+    def test_new_device_is_unverified(self, registry):
+        registry.record_contact("+1234", "abc123")
+        assert not registry.is_verified("+1234")
+
+    def test_verify_device(self, registry):
+        registry.record_contact("+1234", "abc123")
+        assert registry.verify("+1234")
+        assert registry.is_verified("+1234")
+
+    def test_verify_unknown_device(self, registry):
+        assert not registry.verify("+9999")
+
+    def test_block_device(self, registry):
+        registry.record_contact("+1234", "abc123")
+        assert registry.block("+1234")
+        assert not registry.is_verified("+1234")
+
+    def test_safety_number_change_resets_trust(self, registry):
+        registry.record_contact("+1234", "abc123")
+        registry.verify("+1234")
+        assert registry.is_verified("+1234")
+        registry.record_contact("+1234", "different_safety_number")
+        assert not registry.is_verified("+1234")
+
+    def test_persistence(self, signal_mock, engine):
+        reg1 = DeviceRegistry(signal_mock, engine)
+        reg1.record_contact("+1234", "abc123")
+        reg1.verify("+1234")
+
+        reg2 = DeviceRegistry(signal_mock, engine)
+        assert reg2.is_verified("+1234")
+
+    def test_list_devices(self, registry):
+        registry.record_contact("+1234", "abc")
+        registry.record_contact("+5678", "def")
+        assert len(registry.list_devices()) == 2
+
+
+class TestContactCache:
+    @pytest.fixture
+    def signal_mock(self):
+        return MagicMock(spec=SignalClient)
+
+    @pytest.fixture
+    def registry(self, signal_mock, engine):
+        return DeviceRegistry(signal_mock, engine)
+
+    def test_second_call_uses_cache(self, registry):
+        registry.record_contact("+1234", "abc")
+        assert "+1234" in registry._contact_cache
+
+        with patch.object(registry, "engine") as mock_engine:
+            registry.record_contact("+1234", "abc")
+            mock_engine.assert_not_called()
+
+    def test_unverified_gets_default_ttl(self, registry):
+        registry.record_contact("+1234", "abc")
+        from python.common import utcnow
+
+        entry = registry._contact_cache["+1234"]
+        expected = utcnow() + _DEFAULT_TTL
+        assert abs((entry.expires - expected).total_seconds()) < 2
+        assert entry.trust_level == TrustLevel.UNVERIFIED
+        assert entry.has_safety_number is True
+
+    def test_blocked_gets_blocked_ttl(self, registry):
+        registry.record_contact("+1234", "abc")
+        registry.block("+1234")
+        from python.common import utcnow
+
+        entry = registry._contact_cache["+1234"]
+        expected = utcnow() + _BLOCKED_TTL
+        assert abs((entry.expires - expected).total_seconds()) < 2
+        assert entry.trust_level == TrustLevel.BLOCKED
+
+    def test_verify_updates_cache(self, registry):
+        registry.record_contact("+1234", "abc")
+        registry.verify("+1234")
+        entry = registry._contact_cache["+1234"]
+        assert entry.trust_level == TrustLevel.VERIFIED
+
+    def test_block_updates_cache(self, registry):
+        registry.record_contact("+1234", "abc")
+        registry.block("+1234")
+        entry = registry._contact_cache["+1234"]
+        assert entry.trust_level == TrustLevel.BLOCKED
+
+    def test_unverify_updates_cache(self, registry):
+        registry.record_contact("+1234", "abc")
+        registry.verify("+1234")
+        registry.unverify("+1234")
+        entry = registry._contact_cache["+1234"]
+        assert entry.trust_level == TrustLevel.UNVERIFIED
+
+    def test_is_verified_uses_cache(self, registry):
+        registry.record_contact("+1234", "abc")
+        registry.verify("+1234")
+        with patch.object(registry, "engine") as mock_engine:
+            assert registry.is_verified("+1234") is True
+            mock_engine.assert_not_called()
+
+    def test_has_safety_number_uses_cache(self, registry):
+        registry.record_contact("+1234", "abc")
+        with patch.object(registry, "engine") as mock_engine:
+            assert registry.has_safety_number("+1234") is True
+            mock_engine.assert_not_called()
+
+    def test_no_safety_number_cached(self, registry):
+        registry.record_contact("+1234", None)
+        with patch.object(registry, "engine") as mock_engine:
+            assert registry.has_safety_number("+1234") is False
+            mock_engine.assert_not_called()
+
+    def test_expired_cache_hits_db(self, registry):
+        registry.record_contact("+1234", "abc")
+        old = registry._contact_cache["+1234"]
+        registry._contact_cache["+1234"] = _CacheEntry(
+            expires=old.expires - timedelta(minutes=10),
+            trust_level=old.trust_level,
+            has_safety_number=old.has_safety_number,
+            safety_number=old.safety_number,
+            roles=old.roles,
+        )
+
+        with patch("python.signal_bot.device_registry.Session") as mock_session_cls:
+            mock_session = MagicMock()
+            mock_session_cls.return_value.__enter__ = MagicMock(return_value=mock_session)
+            mock_session_cls.return_value.__exit__ = MagicMock(return_value=False)
+            mock_device = MagicMock()
+            mock_device.trust_level = TrustLevel.UNVERIFIED
+            mock_session.execute.return_value.scalar_one_or_none.return_value = mock_device
+            registry.record_contact("+1234", "abc")
+            mock_session.execute.assert_called_once()
+
+
+class TestLocationCommand:
+    def test_format_location(self):
+        response = _format_location("12.34", "56.78")
+        assert "12.34, 56.78" in response
+        assert "maps.google.com" in response
+
+    def test_handle_location_request_without_config(self):
+        signal = MagicMock(spec=SignalClient)
+        message = SignalMessage(source="+1234", timestamp=0, message="location")
+        handle_location_request(message, signal, None, None)
+        signal.reply.assert_called_once()
+        assert "not configured" in signal.reply.call_args[0][1]
+
+
+class TestDispatch:
+    @pytest.fixture
+    def signal_mock(self):
+        return MagicMock(spec=SignalClient)
+
+    @pytest.fixture
+    def llm_mock(self):
+        return MagicMock(spec=LLMClient)
+
+    @pytest.fixture
+    def registry_mock(self):
+        mock = MagicMock(spec=DeviceRegistry)
+        mock.is_verified.return_value = True
+        mock.has_safety_number.return_value = True
+        mock.has_role.return_value = False
+        mock.get_roles.return_value = []
+        return mock
+
+    @pytest.fixture
+    def config(self, engine):
+        return BotConfig(
+            signal_api_url="http://localhost:8080",
+            phone_number="+1234567890",
+            inventory_api_url="http://localhost:9090",
+            engine=engine,
+        )
+
+    @pytest.fixture
+    def bot(self, signal_mock, llm_mock, registry_mock, config):
+        return Bot(signal_mock, llm_mock, registry_mock, config)
+
+    def test_unverified_device_ignored(self, bot, signal_mock, registry_mock):
+        registry_mock.is_verified.return_value = False
+        msg = SignalMessage(source="+1234", timestamp=0, message="help")
+        bot.dispatch(msg)
+        signal_mock.reply.assert_not_called()
+
+    def test_admin_without_safety_number_ignored(self, bot, signal_mock, registry_mock):
+        registry_mock.has_safety_number.return_value = False
+        registry_mock.has_role.return_value = True
+        msg = SignalMessage(source="+1234", timestamp=0, message="help")
+        bot.dispatch(msg)
+        signal_mock.reply.assert_not_called()
+
+    def test_non_admin_without_safety_number_allowed(self, bot, signal_mock, registry_mock):
+        registry_mock.has_safety_number.return_value = False
+        registry_mock.has_role.return_value = False
+        registry_mock.get_roles.return_value = []
+        msg = SignalMessage(source="+1234", timestamp=0, message="help")
+        bot.dispatch(msg)
+        signal_mock.reply.assert_called_once()
+
+    def test_help_command(self, bot, signal_mock, registry_mock):
+        msg = SignalMessage(source="+1234", timestamp=0, message="help")
+        bot.dispatch(msg)
+        signal_mock.reply.assert_called_once()
+        assert "Available commands" in signal_mock.reply.call_args[0][1]
+
+    def test_unknown_command_ignored(self, bot, signal_mock):
+        msg = SignalMessage(source="+1234", timestamp=0, message="foobar")
+        bot.dispatch(msg)
+        signal_mock.reply.assert_not_called()
+
+    def test_non_command_message_ignored(self, bot, signal_mock):
+        msg = SignalMessage(source="+1234", timestamp=0, message="hello there")
+        bot.dispatch(msg)
+        signal_mock.reply.assert_not_called()
+
+    def test_status_command(self, bot, signal_mock, llm_mock, registry_mock):
+        llm_mock.list_models.return_value = ["model1", "model2"]
+        llm_mock.model = "test:7b"
+        registry_mock.list_devices.return_value = []
+        registry_mock.has_role.return_value = True
+        msg = SignalMessage(source="+1234", timestamp=0, message="status")
+        bot.dispatch(msg)
+        signal_mock.reply.assert_called_once()
+        assert "Bot online" in signal_mock.reply.call_args[0][1]
+
+    def test_location_command(self, bot, signal_mock, registry_mock, config):
+        registry_mock.has_role.return_value = True
+        msg = SignalMessage(source="+1234", timestamp=0, message="location")
+        with patch("python.signal_bot.main.handle_location_request") as mock_location:
+            bot.dispatch(msg)
+
+        mock_location.assert_called_once_with(
+            msg,
+            signal_mock,
+            config.ha_url,
+            config.ha_token,
+        )