mirror of
https://github.com/RichieCahill/dotfiles.git
synced 2026-04-21 14:49:10 -04:00
Compare commits
185 Commits
feature/ad
...
claude/she
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3301bb0aea | ||
|
|
a076cb47f3 | ||
| 76da6cbc54 | |||
| c83bbe2c24 | |||
| 7611a3b2df | |||
| aec5e3e22b | |||
| 4e3273d5ec | |||
| b5ee7c2dc2 | |||
| 958b06ecf0 | |||
| 71ad8ab29e | |||
| 852759c510 | |||
| d684d5d62c | |||
| f1e394565d | |||
| 754ced4822 | |||
| 5b054dfc8f | |||
| 663833d4fa | |||
| 433ec9a38e | |||
| 3a3267ee9a | |||
| 0497a50a43 | |||
| 6365dd8067 | |||
| a6fbbd245f | |||
| 7ad321e5e2 | |||
| 14338e34df | |||
| c73aa5c98a | |||
| f762f12bd2 | |||
| ab5df442c6 | |||
|
|
f11c9bed58 | ||
|
|
ab2d8dbd51 | ||
|
|
42ede19472 | ||
|
|
f4f33eacc4 | ||
|
|
51f6cd23ad | ||
| 3dadb145b7 | |||
| 75a67294ea | |||
| 58b25f2e89 | |||
| 568bf8dd38 | |||
| 82851eb287 | |||
| b7bce0bcb9 | |||
| 583af965ad | |||
| ec80bf1c5f | |||
| bd490334f5 | |||
| e893ea0f57 | |||
| 18f149b831 | |||
| 69f5b87e5f | |||
| 66acc010ca | |||
| e8f3a563be | |||
| 8f1d765cad | |||
| 4f0ba687c4 | |||
|
|
27891c3903 | ||
| ccdc61b4dd | |||
| 1d732bf41c | |||
| 13ba118cfc | |||
| 47c6f42d2f | |||
|
|
ff9dcde5d9 | ||
| 7de800b519 | |||
| 55767ad555 | |||
| c262ff9048 | |||
|
|
9abac2978a | ||
| 70d20e55d2 | |||
| f038f248a1 | |||
| af828fc9c4 | |||
| 4d121ae9f9 | |||
| 959d599ff9 | |||
| d470243fdd | |||
| d96c93fa17 | |||
| 6bea380e3d | |||
| 56c933c8cb | |||
| e7dae1eb4b | |||
| 17ebe50ac9 | |||
| 97b35ce27b | |||
|
|
595579fe8b | ||
| fcfbce4e16 | |||
| 80af3377e6 | |||
| 557c1a4d5d | |||
| 89e37249af | |||
|
|
ccd523b4d0 | ||
| 606035432b | |||
| 4d2f6831e3 | |||
| 86e72d1da0 | |||
| 139727bf50 | |||
| 88c2f1b139 | |||
| e75a3ef9c6 | |||
| 258f918794 | |||
| cf4635922e | |||
| 0615ece46a | |||
| 8afa4fce6c | |||
| 8bbcd37933 | |||
| 037b2f9cf7 | |||
| 7dbc4c248f | |||
| 08dffc6f6d | |||
| 0109167b10 | |||
| b87f6b0b34 | |||
| 35376c3fca | |||
| 0c218f2551 | |||
| d0b66496a1 | |||
| 5101da4914 | |||
| 393545868f | |||
| 6bb7904782 | |||
| 59147834f7 | |||
|
|
52235239d0 | ||
|
|
9e43c3e8b8 | ||
| 156d624d81 | |||
| 9a7cf03a00 | |||
| 6299d42f75 | |||
| e6472b2cf5 | |||
| 41d3a8fe1a | |||
|
|
e6ac8f8021 | ||
| 0f8f6f96d6 | |||
| 4cb4bd6f3d | |||
| c046710258 | |||
| 7f9fbe3602 | |||
|
|
8ee3b4d6e5 | ||
| 18b7fb2d60 | |||
| 2f1fa5c750 | |||
| 164d0dd59e | |||
| d4459643ab | |||
| c09dba0c37 | |||
| 409f376166 | |||
| a9a6e1f932 | |||
| 6472f07a88 | |||
|
|
51c79f6b40 | ||
| b0d5147296 | |||
| c56082b516 | |||
| 34b728c88f | |||
| 5697458bad | |||
| 276c2ac74b | |||
| 69e5aa20d5 | |||
| 3d1f773fa5 | |||
| 14dd1fe52e | |||
| 30fe41ea1b | |||
| 3a17c5514d | |||
| c6586db91e | |||
| 81b199373e | |||
| a957e23041 | |||
| 52389f729d | |||
| cc2a609f52 | |||
| ca4693a1ba | |||
| 90e5e0855d | |||
| e339667c2b | |||
| 85540ee920 | |||
| 3be1b8aa8f | |||
| 7c56954cda | |||
| 290f972346 | |||
| 72c3ccfb6d | |||
| 9630633ff5 | |||
| 8c83f306b2 | |||
| 5b4609dc3b | |||
| d1be25c6e8 | |||
| 31910586d2 | |||
| b8dfd0852a | |||
| 6ce622e93e | |||
| 55e652a51d | |||
| b5455a5483 | |||
| 8baf388061 | |||
| 7ffb7b4a37 | |||
| eb04f4a56d | |||
| 5b8e543226 | |||
| da48f62195 | |||
| 60f2ab1039 | |||
| c1de454005 | |||
| 391e37b746 | |||
|
|
27565173d4 | ||
| 0c0ed92cb4 | |||
|
|
cc9996d6fa | ||
| 102f36eb1b | |||
| 9ec988729b | |||
| 4e3c25afb4 | |||
| 0d482aca4b | |||
|
|
c624781d84 | ||
| f4996b71e4 | |||
| 58a29214d3 | |||
| c4171b56b5 | |||
| d6d48516ea | |||
| ae882ba578 | |||
| 100b8145e8 | |||
| e99cd8e54a | |||
| de9348432c | |||
| b1fa596f37 | |||
| 908bccb8dc | |||
| b8cc9c5772 | |||
| d62076a900 | |||
| 0c9bd40659 | |||
| f713b8d4fa | |||
| ddba7d1068 | |||
| 41aad90140 | |||
| 76cd6e1188 |
2
.github/workflows/build_systems.yml
vendored
2
.github/workflows/build_systems.yml
vendored
@@ -25,4 +25,4 @@ jobs:
|
|||||||
- name: Build default package
|
- name: Build default package
|
||||||
run: "nixos-rebuild build --flake ./#${{ matrix.system }}"
|
run: "nixos-rebuild build --flake ./#${{ matrix.system }}"
|
||||||
- name: copy to nix-cache
|
- name: copy to nix-cache
|
||||||
run: nix copy --to ssh://jeeves .#nixosConfigurations.${{ matrix.system }}.config.system.build.toplevel
|
run: nix copy --accept-flake-config --to unix:///host-nix/var/nix/daemon-socket/socket .#nixosConfigurations.${{ matrix.system }}.config.system.build.toplevel
|
||||||
|
|||||||
30
.github/workflows/fix_eval_warnings.yml
vendored
Normal file
30
.github/workflows/fix_eval_warnings.yml
vendored
Normal file
@@ -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 }}"
|
||||||
2
.github/workflows/pytest.yml
vendored
2
.github/workflows/pytest.yml
vendored
@@ -16,4 +16,4 @@ jobs:
|
|||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
- name: Run tests
|
- name: Run tests
|
||||||
run: pytest tests
|
run: nix develop .#devShells.x86_64-linux.default -c pytest tests
|
||||||
|
|||||||
4
.gitignore
vendored
4
.gitignore
vendored
@@ -165,3 +165,7 @@ test.*
|
|||||||
|
|
||||||
# syncthing
|
# syncthing
|
||||||
.stfolder
|
.stfolder
|
||||||
|
|
||||||
|
# Frontend build output
|
||||||
|
frontend/dist/
|
||||||
|
frontend/node_modules/
|
||||||
|
|||||||
28
.vscode/settings.json
vendored
28
.vscode/settings.json
vendored
@@ -77,11 +77,11 @@
|
|||||||
"esphome",
|
"esphome",
|
||||||
"extest",
|
"extest",
|
||||||
"fadvise",
|
"fadvise",
|
||||||
|
"fastfetch",
|
||||||
"fastforwardteam",
|
"fastforwardteam",
|
||||||
"FASTFOX",
|
"FASTFOX",
|
||||||
"ffmpegthumbnailer",
|
"ffmpegthumbnailer",
|
||||||
"filebot",
|
"filebot",
|
||||||
"filebrowser",
|
|
||||||
"fileroller",
|
"fileroller",
|
||||||
"findbar",
|
"findbar",
|
||||||
"Fira",
|
"Fira",
|
||||||
@@ -98,6 +98,7 @@
|
|||||||
"getch",
|
"getch",
|
||||||
"getmaxyx",
|
"getmaxyx",
|
||||||
"ghdeploy",
|
"ghdeploy",
|
||||||
|
"gitea",
|
||||||
"globalprivacycontrol",
|
"globalprivacycontrol",
|
||||||
"gparted",
|
"gparted",
|
||||||
"gtts",
|
"gtts",
|
||||||
@@ -116,7 +117,9 @@
|
|||||||
"httpchk",
|
"httpchk",
|
||||||
"hurlenko",
|
"hurlenko",
|
||||||
"hwloc",
|
"hwloc",
|
||||||
|
"ical",
|
||||||
"ignorelist",
|
"ignorelist",
|
||||||
|
"improv",
|
||||||
"INITDB",
|
"INITDB",
|
||||||
"iocharset",
|
"iocharset",
|
||||||
"ioit",
|
"ioit",
|
||||||
@@ -126,6 +129,8 @@
|
|||||||
"jnoortheen",
|
"jnoortheen",
|
||||||
"jsbc",
|
"jsbc",
|
||||||
"kagi",
|
"kagi",
|
||||||
|
"keyformat",
|
||||||
|
"keylocation",
|
||||||
"kuma",
|
"kuma",
|
||||||
"lazer",
|
"lazer",
|
||||||
"levelname",
|
"levelname",
|
||||||
@@ -162,7 +167,6 @@
|
|||||||
"mypy",
|
"mypy",
|
||||||
"ncdu",
|
"ncdu",
|
||||||
"nemo",
|
"nemo",
|
||||||
"neofetch",
|
|
||||||
"nerdfonts",
|
"nerdfonts",
|
||||||
"netdev",
|
"netdev",
|
||||||
"netdevs",
|
"netdevs",
|
||||||
@@ -225,12 +229,10 @@
|
|||||||
"pylint",
|
"pylint",
|
||||||
"pymetno",
|
"pymetno",
|
||||||
"pymodbus",
|
"pymodbus",
|
||||||
|
"pyopenweathermap",
|
||||||
"pyownet",
|
"pyownet",
|
||||||
"pytest",
|
"pytest",
|
||||||
"qbit",
|
"qalculate",
|
||||||
"qbittorrent",
|
|
||||||
"qbittorrentvpn",
|
|
||||||
"qbitvpn",
|
|
||||||
"quicksuggest",
|
"quicksuggest",
|
||||||
"radarr",
|
"radarr",
|
||||||
"readahead",
|
"readahead",
|
||||||
@@ -252,8 +254,10 @@
|
|||||||
"schemeless",
|
"schemeless",
|
||||||
"scrollback",
|
"scrollback",
|
||||||
"SECUREFOX",
|
"SECUREFOX",
|
||||||
|
"sessionmaker",
|
||||||
"sessionstore",
|
"sessionstore",
|
||||||
"shellcheck",
|
"shellcheck",
|
||||||
|
"signalbot",
|
||||||
"signon",
|
"signon",
|
||||||
"Signons",
|
"Signons",
|
||||||
"skia",
|
"skia",
|
||||||
@@ -263,6 +267,7 @@
|
|||||||
"socialtracking",
|
"socialtracking",
|
||||||
"sonarr",
|
"sonarr",
|
||||||
"sponsorblock",
|
"sponsorblock",
|
||||||
|
"sqlalchemy",
|
||||||
"sqltools",
|
"sqltools",
|
||||||
"ssdp",
|
"ssdp",
|
||||||
"SSHOPTS",
|
"SSHOPTS",
|
||||||
@@ -284,11 +289,14 @@
|
|||||||
"topstories",
|
"topstories",
|
||||||
"treefmt",
|
"treefmt",
|
||||||
"twimg",
|
"twimg",
|
||||||
|
"typedmonarchmoney",
|
||||||
"typer",
|
"typer",
|
||||||
"uaccess",
|
"uaccess",
|
||||||
|
"ubiquiti",
|
||||||
"ublock",
|
"ublock",
|
||||||
"uiprotect",
|
"uiprotect",
|
||||||
"uitour",
|
"uitour",
|
||||||
|
"unifi",
|
||||||
"unrar",
|
"unrar",
|
||||||
"unsubmitted",
|
"unsubmitted",
|
||||||
"uptimekuma",
|
"uptimekuma",
|
||||||
@@ -299,6 +307,7 @@
|
|||||||
"useragent",
|
"useragent",
|
||||||
"usernamehw",
|
"usernamehw",
|
||||||
"userprefs",
|
"userprefs",
|
||||||
|
"vaninventory",
|
||||||
"vfat",
|
"vfat",
|
||||||
"victron",
|
"victron",
|
||||||
"virt",
|
"virt",
|
||||||
@@ -325,5 +334,10 @@
|
|||||||
"zoxide",
|
"zoxide",
|
||||||
"zram",
|
"zram",
|
||||||
"zstd"
|
"zstd"
|
||||||
]
|
],
|
||||||
|
"python-envs.defaultEnvManager": "ms-python.python:system",
|
||||||
|
"python-envs.pythonProjects": [],
|
||||||
|
"python.testing.pytestArgs": ["tests"],
|
||||||
|
"python.testing.unittestEnabled": false,
|
||||||
|
"python.testing.pytestEnabled": true
|
||||||
}
|
}
|
||||||
|
|||||||
12
AGENTS.md
Normal file
12
AGENTS.md
Normal file
@@ -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.
|
||||||
@@ -23,7 +23,7 @@
|
|||||||
boot = {
|
boot = {
|
||||||
tmp.useTmpfs = true;
|
tmp.useTmpfs = true;
|
||||||
kernelPackages = lib.mkDefault pkgs.linuxPackages_6_12;
|
kernelPackages = lib.mkDefault pkgs.linuxPackages_6_12;
|
||||||
zfs.package = lib.mkDefault pkgs.zfs_2_3;
|
zfs.package = lib.mkDefault pkgs.zfs_2_4;
|
||||||
};
|
};
|
||||||
|
|
||||||
hardware.enableRedistributableFirmware = true;
|
hardware.enableRedistributableFirmware = true;
|
||||||
@@ -44,7 +44,10 @@
|
|||||||
# firmware update
|
# firmware update
|
||||||
fwupd.enable = true;
|
fwupd.enable = true;
|
||||||
|
|
||||||
snapshot_manager.enable = lib.mkDefault true;
|
snapshot_manager = {
|
||||||
|
enable = lib.mkDefault true;
|
||||||
|
PYTHONPATH = "${inputs.self}/";
|
||||||
|
};
|
||||||
|
|
||||||
zfs = {
|
zfs = {
|
||||||
trim.enable = lib.mkDefault true;
|
trim.enable = lib.mkDefault true;
|
||||||
|
|||||||
@@ -33,6 +33,8 @@ in
|
|||||||
];
|
];
|
||||||
warn-dirty = false;
|
warn-dirty = false;
|
||||||
flake-registry = ""; # disable global flake registries
|
flake-registry = ""; # disable global flake registries
|
||||||
|
connect-timeout = 10;
|
||||||
|
fallback = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
# Add each flake input as a registry and nix_path
|
# Add each flake input as a registry and nix_path
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
{
|
{
|
||||||
inputs,
|
|
||||||
pkgs,
|
pkgs,
|
||||||
lib,
|
lib,
|
||||||
config,
|
config,
|
||||||
@@ -17,6 +16,12 @@ in
|
|||||||
default = ./snapshot_config.toml;
|
default = ./snapshot_config.toml;
|
||||||
description = "Path to the snapshot_manager TOML config.";
|
description = "Path to the snapshot_manager TOML config.";
|
||||||
};
|
};
|
||||||
|
PYTHONPATH = lib.mkOption {
|
||||||
|
type = lib.types.str;
|
||||||
|
description = ''
|
||||||
|
the PYTHONPATH to use for the snapshot_manager service.
|
||||||
|
'';
|
||||||
|
};
|
||||||
EnvironmentFile = lib.mkOption {
|
EnvironmentFile = lib.mkOption {
|
||||||
type = lib.types.nullOr (lib.types.coercedTo lib.types.path toString lib.types.str);
|
type = lib.types.nullOr (lib.types.coercedTo lib.types.path toString lib.types.str);
|
||||||
default = null;
|
default = null;
|
||||||
@@ -35,11 +40,12 @@ in
|
|||||||
requires = [ "zfs-import.target" ];
|
requires = [ "zfs-import.target" ];
|
||||||
after = [ "zfs-import.target" ];
|
after = [ "zfs-import.target" ];
|
||||||
path = [ pkgs.zfs ];
|
path = [ pkgs.zfs ];
|
||||||
|
environment = {
|
||||||
|
PYTHONPATH = cfg.PYTHONPATH;
|
||||||
|
};
|
||||||
serviceConfig = {
|
serviceConfig = {
|
||||||
Type = "oneshot";
|
Type = "oneshot";
|
||||||
ExecStart = "${
|
ExecStart = "${pkgs.my_python}/bin/python -m python.tools.snapshot_manager ${lib.escapeShellArg cfg.path}";
|
||||||
inputs.system_tools.packages.${pkgs.system}.default
|
|
||||||
}/bin/snapshot_manager ${lib.escapeShellArg cfg.path}";
|
|
||||||
}
|
}
|
||||||
// lib.optionalAttrs (cfg.EnvironmentFile != null) {
|
// lib.optionalAttrs (cfg.EnvironmentFile != null) {
|
||||||
EnvironmentFile = cfg.EnvironmentFile;
|
EnvironmentFile = cfg.EnvironmentFile;
|
||||||
|
|||||||
@@ -37,6 +37,8 @@
|
|||||||
TcpKeepAlive = "no";
|
TcpKeepAlive = "no";
|
||||||
X11Forwarding = lib.mkDefault false;
|
X11Forwarding = lib.mkDefault false;
|
||||||
KexAlgorithms = [
|
KexAlgorithms = [
|
||||||
|
"sntrup761x25519-sha512@openssh.com"
|
||||||
|
"mlkem768x25519-sha256"
|
||||||
"curve25519-sha256@libssh.org"
|
"curve25519-sha256@libssh.org"
|
||||||
"diffie-hellman-group-exchange-sha256"
|
"diffie-hellman-group-exchange-sha256"
|
||||||
];
|
];
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
{ pkgs, ... }:
|
{ pkgs, ... }:
|
||||||
{
|
{
|
||||||
boot = {
|
boot = {
|
||||||
kernelPackages = pkgs.linuxPackages_6_16;
|
kernelPackages = pkgs.linuxPackages_6_18;
|
||||||
zfs.package = pkgs.zfs_2_3;
|
zfs.package = pkgs.zfs_2_4;
|
||||||
};
|
};
|
||||||
|
|
||||||
hardware.bluetooth = {
|
hardware.bluetooth = {
|
||||||
|
|||||||
@@ -1,120 +0,0 @@
|
|||||||
esphome:
|
|
||||||
name: batteries
|
|
||||||
friendly_name: batteries
|
|
||||||
|
|
||||||
platformio_options:
|
|
||||||
build_unflags:
|
|
||||||
- -fno-lto
|
|
||||||
- -Og
|
|
||||||
- -O0
|
|
||||||
build_flags:
|
|
||||||
- -flto
|
|
||||||
- -Os
|
|
||||||
- -Wl,--gc-sections
|
|
||||||
|
|
||||||
esp32:
|
|
||||||
board: esp32dev
|
|
||||||
framework:
|
|
||||||
type: arduino
|
|
||||||
|
|
||||||
logger:
|
|
||||||
|
|
||||||
api:
|
|
||||||
encryption:
|
|
||||||
key: !secret api_key
|
|
||||||
|
|
||||||
external_components:
|
|
||||||
- source: github://syssi/esphome-jk-bms@main
|
|
||||||
|
|
||||||
ota:
|
|
||||||
- platform: esphome
|
|
||||||
password: !secret ota_password
|
|
||||||
|
|
||||||
wifi:
|
|
||||||
ssid: !secret wifi_ssid
|
|
||||||
password: !secret wifi_password
|
|
||||||
fast_connect: true
|
|
||||||
|
|
||||||
ble_client:
|
|
||||||
- mac_address: "C8:47:80:29:0F:DB"
|
|
||||||
id: jk_ble0
|
|
||||||
- mac_address: "C8:47:80:37:9D:DD"
|
|
||||||
id: jk_ble1
|
|
||||||
|
|
||||||
jk_bms_ble:
|
|
||||||
- ble_client_id: jk_ble0
|
|
||||||
protocol_version: JK02_32S
|
|
||||||
throttle: 1s
|
|
||||||
id: jk_bms0
|
|
||||||
|
|
||||||
- ble_client_id: jk_ble1
|
|
||||||
protocol_version: JK02_32S
|
|
||||||
throttle: 1s
|
|
||||||
id: jk_bms1
|
|
||||||
|
|
||||||
sensor:
|
|
||||||
# BMS1 sensors
|
|
||||||
- platform: jk_bms_ble
|
|
||||||
jk_bms_ble_id: jk_bms0
|
|
||||||
total_voltage:
|
|
||||||
name: "JK0 Total Voltage"
|
|
||||||
state_of_charge:
|
|
||||||
name: "JK0 SoC"
|
|
||||||
power:
|
|
||||||
name: "JK0 Power"
|
|
||||||
temperature_sensor_1:
|
|
||||||
name: "JK0 Temp 1"
|
|
||||||
temperature_sensor_2:
|
|
||||||
name: "JK0 Temp 2"
|
|
||||||
charging_cycles:
|
|
||||||
name: "JK0 charging cycles"
|
|
||||||
balancing_current:
|
|
||||||
name: "JK0 balancing current"
|
|
||||||
|
|
||||||
# BMS2 sensors
|
|
||||||
- platform: jk_bms_ble
|
|
||||||
jk_bms_ble_id: jk_bms1
|
|
||||||
total_voltage:
|
|
||||||
name: "JK1 Total Voltage"
|
|
||||||
state_of_charge:
|
|
||||||
name: "JK1 SoC"
|
|
||||||
power:
|
|
||||||
name: "Jk1 Power"
|
|
||||||
temperature_sensor_1:
|
|
||||||
name: "JK1 Temp 1"
|
|
||||||
temperature_sensor_2:
|
|
||||||
name: "Jk1 Temp 2"
|
|
||||||
charging_cycles:
|
|
||||||
name: "JK1 charging cycles"
|
|
||||||
balancing_current:
|
|
||||||
name: "JK1 balancing current"
|
|
||||||
|
|
||||||
text_sensor:
|
|
||||||
- platform: jk_bms_ble
|
|
||||||
jk_bms_ble_id: jk_bms0
|
|
||||||
errors:
|
|
||||||
name: "JK0 Errors"
|
|
||||||
|
|
||||||
- platform: jk_bms_ble
|
|
||||||
jk_bms_ble_id: jk_bms1
|
|
||||||
errors:
|
|
||||||
name: "JK1 Errors"
|
|
||||||
|
|
||||||
switch:
|
|
||||||
- platform: jk_bms_ble
|
|
||||||
jk_bms_ble_id: jk_bms0
|
|
||||||
charging:
|
|
||||||
name: "JK0 Charging"
|
|
||||||
discharging:
|
|
||||||
name: "JK0 Discharging"
|
|
||||||
balancer:
|
|
||||||
name: "JK0 Balancing"
|
|
||||||
|
|
||||||
- platform: jk_bms_ble
|
|
||||||
jk_bms_ble_id: jk_bms1
|
|
||||||
charging:
|
|
||||||
name: "JK1 Charging"
|
|
||||||
discharging:
|
|
||||||
name: "JK1 Discharging"
|
|
||||||
balancer:
|
|
||||||
name: "JK1 Balancing"
|
|
||||||
132
esphome/battery0.yml
Normal file
132
esphome/battery0.yml
Normal file
@@ -0,0 +1,132 @@
|
|||||||
|
esphome:
|
||||||
|
name: batteries
|
||||||
|
friendly_name: batteries
|
||||||
|
|
||||||
|
esp32:
|
||||||
|
board: esp32dev
|
||||||
|
framework:
|
||||||
|
type: arduino
|
||||||
|
|
||||||
|
logger:
|
||||||
|
|
||||||
|
api:
|
||||||
|
encryption:
|
||||||
|
key: !secret api_key
|
||||||
|
|
||||||
|
external_components:
|
||||||
|
- source: github://syssi/esphome-jk-bms@main
|
||||||
|
|
||||||
|
ota:
|
||||||
|
- platform: esphome
|
||||||
|
password: !secret ota_password
|
||||||
|
|
||||||
|
wifi:
|
||||||
|
ssid: !secret wifi_ssid
|
||||||
|
password: !secret wifi_password
|
||||||
|
fast_connect: on
|
||||||
|
|
||||||
|
captive_portal:
|
||||||
|
|
||||||
|
esp32_ble_tracker:
|
||||||
|
scan_parameters:
|
||||||
|
interval: 1100ms
|
||||||
|
window: 1100ms
|
||||||
|
active: true
|
||||||
|
|
||||||
|
ble_client:
|
||||||
|
- mac_address: "C8:47:80:29:0F:DB"
|
||||||
|
id: jk_ble0
|
||||||
|
|
||||||
|
jk_bms_ble:
|
||||||
|
- ble_client_id: jk_ble0
|
||||||
|
protocol_version: JK02_32S
|
||||||
|
throttle: 1s
|
||||||
|
id: jk_bms0
|
||||||
|
|
||||||
|
button:
|
||||||
|
- platform: jk_bms_ble
|
||||||
|
retrieve_settings:
|
||||||
|
name: "JK0 retrieve settings"
|
||||||
|
retrieve_device_info:
|
||||||
|
name: "JK0 retrieve device info"
|
||||||
|
|
||||||
|
sensor:
|
||||||
|
- platform: jk_bms_ble
|
||||||
|
jk_bms_ble_id: jk_bms0
|
||||||
|
total_voltage:
|
||||||
|
name: "JK0 Total Voltage"
|
||||||
|
state_of_charge:
|
||||||
|
name: "JK0 SoC"
|
||||||
|
charging_power:
|
||||||
|
name: "JK0 charging power"
|
||||||
|
discharging_power:
|
||||||
|
name: "JK0 discharging power"
|
||||||
|
temperature_sensor_1:
|
||||||
|
name: "JK0 Temp 1"
|
||||||
|
temperature_sensor_2:
|
||||||
|
name: "JK0 Temp 2"
|
||||||
|
balancing:
|
||||||
|
name: "JK0 balancing"
|
||||||
|
total_runtime:
|
||||||
|
name: "JK0 total runtime"
|
||||||
|
balancing_current:
|
||||||
|
name: "JK0 balancing current"
|
||||||
|
delta_cell_voltage:
|
||||||
|
name: "JK0 cell delta voltage"
|
||||||
|
average_cell_voltage:
|
||||||
|
name: "JK0 cell average voltage"
|
||||||
|
cell_voltage_1:
|
||||||
|
name: "JK0 cell voltage 1"
|
||||||
|
cell_voltage_2:
|
||||||
|
name: "JK0 cell voltage 2"
|
||||||
|
cell_voltage_3:
|
||||||
|
name: "JK0 cell voltage 3"
|
||||||
|
cell_voltage_4:
|
||||||
|
name: "JK0 cell voltage 4"
|
||||||
|
cell_voltage_5:
|
||||||
|
name: "JK0 cell voltage 5"
|
||||||
|
cell_voltage_6:
|
||||||
|
name: "JK0 cell voltage 6"
|
||||||
|
cell_voltage_7:
|
||||||
|
name: "JK0 cell voltage 7"
|
||||||
|
cell_voltage_8:
|
||||||
|
name: "JK0 cell voltage 8"
|
||||||
|
cell_resistance_1:
|
||||||
|
name: "JK0 cell resistance 1"
|
||||||
|
cell_resistance_2:
|
||||||
|
name: "JK0 cell resistance 2"
|
||||||
|
cell_resistance_3:
|
||||||
|
name: "JK0 cell resistance 3"
|
||||||
|
cell_resistance_4:
|
||||||
|
name: "JK0 cell resistance 4"
|
||||||
|
cell_resistance_5:
|
||||||
|
name: "JK0 cell resistance 5"
|
||||||
|
cell_resistance_6:
|
||||||
|
name: "JK0 cell resistance 6"
|
||||||
|
cell_resistance_7:
|
||||||
|
name: "JK0 cell resistance 7"
|
||||||
|
cell_resistance_8:
|
||||||
|
name: "JK0 cell resistance 8"
|
||||||
|
total_charging_cycle_capacity:
|
||||||
|
name: "JK0 total charging cycle capacity"
|
||||||
|
|
||||||
|
text_sensor:
|
||||||
|
- platform: jk_bms_ble
|
||||||
|
jk_bms_ble_id: jk_bms0
|
||||||
|
errors:
|
||||||
|
name: "JK0 Errors"
|
||||||
|
|
||||||
|
switch:
|
||||||
|
- platform: jk_bms_ble
|
||||||
|
jk_bms_ble_id: jk_bms0
|
||||||
|
charging:
|
||||||
|
name: "JK0 Charging"
|
||||||
|
discharging:
|
||||||
|
name: "JK0 Discharging"
|
||||||
|
balancer:
|
||||||
|
name: "JK0 Balancing"
|
||||||
|
|
||||||
|
- platform: ble_client
|
||||||
|
ble_client_id: jk_ble0
|
||||||
|
name: "JK0 enable bluetooth connection"
|
||||||
|
id: ble_client_switch0
|
||||||
132
esphome/battery1.yml
Normal file
132
esphome/battery1.yml
Normal file
@@ -0,0 +1,132 @@
|
|||||||
|
esphome:
|
||||||
|
name: battery1
|
||||||
|
friendly_name: battery1
|
||||||
|
|
||||||
|
esp32:
|
||||||
|
board: esp32dev
|
||||||
|
framework:
|
||||||
|
type: arduino
|
||||||
|
|
||||||
|
logger:
|
||||||
|
|
||||||
|
api:
|
||||||
|
encryption:
|
||||||
|
key: !secret api_key
|
||||||
|
|
||||||
|
external_components:
|
||||||
|
- source: github://syssi/esphome-jk-bms@main
|
||||||
|
|
||||||
|
ota:
|
||||||
|
- platform: esphome
|
||||||
|
password: !secret ota_password
|
||||||
|
|
||||||
|
wifi:
|
||||||
|
ssid: !secret wifi_ssid
|
||||||
|
password: !secret wifi_password
|
||||||
|
fast_connect: on
|
||||||
|
|
||||||
|
captive_portal:
|
||||||
|
|
||||||
|
esp32_ble_tracker:
|
||||||
|
scan_parameters:
|
||||||
|
interval: 1100ms
|
||||||
|
window: 1100ms
|
||||||
|
active: true
|
||||||
|
|
||||||
|
ble_client:
|
||||||
|
- mac_address: "C8:47:80:37:9D:DD"
|
||||||
|
id: jk_ble1
|
||||||
|
|
||||||
|
jk_bms_ble:
|
||||||
|
- ble_client_id: jk_ble1
|
||||||
|
protocol_version: JK02_32S
|
||||||
|
throttle: 1s
|
||||||
|
id: jk_bms1
|
||||||
|
|
||||||
|
button:
|
||||||
|
- platform: jk_bms_ble
|
||||||
|
retrieve_settings:
|
||||||
|
name: "JK1 retrieve settings"
|
||||||
|
retrieve_device_info:
|
||||||
|
name: "JK1 retrieve device info"
|
||||||
|
|
||||||
|
sensor:
|
||||||
|
- platform: jk_bms_ble
|
||||||
|
jk_bms_ble_id: jk_bms1
|
||||||
|
total_voltage:
|
||||||
|
name: "JK1 Total Voltage"
|
||||||
|
state_of_charge:
|
||||||
|
name: "JK1 SoC"
|
||||||
|
charging_power:
|
||||||
|
name: "JK1 charging power"
|
||||||
|
discharging_power:
|
||||||
|
name: "JK1 discharging power"
|
||||||
|
temperature_sensor_1:
|
||||||
|
name: "JK1 Temp 1"
|
||||||
|
temperature_sensor_2:
|
||||||
|
name: "JK1 Temp 2"
|
||||||
|
balancing:
|
||||||
|
name: "JK1 balancing"
|
||||||
|
total_runtime:
|
||||||
|
name: "JK1 total runtime"
|
||||||
|
balancing_current:
|
||||||
|
name: "JK1 balancing current"
|
||||||
|
delta_cell_voltage:
|
||||||
|
name: "JK1 cell delta voltage"
|
||||||
|
average_cell_voltage:
|
||||||
|
name: "JK1 cell average voltage"
|
||||||
|
cell_voltage_1:
|
||||||
|
name: "JK1 cell voltage 1"
|
||||||
|
cell_voltage_2:
|
||||||
|
name: "JK1 cell voltage 2"
|
||||||
|
cell_voltage_3:
|
||||||
|
name: "JK1 cell voltage 3"
|
||||||
|
cell_voltage_4:
|
||||||
|
name: "JK1 cell voltage 4"
|
||||||
|
cell_voltage_5:
|
||||||
|
name: "JK1 cell voltage 5"
|
||||||
|
cell_voltage_6:
|
||||||
|
name: "JK1 cell voltage 6"
|
||||||
|
cell_voltage_7:
|
||||||
|
name: "JK1 cell voltage 7"
|
||||||
|
cell_voltage_8:
|
||||||
|
name: "JK1 cell voltage 8"
|
||||||
|
cell_resistance_1:
|
||||||
|
name: "JK1 cell resistance 1"
|
||||||
|
cell_resistance_2:
|
||||||
|
name: "JK1 cell resistance 2"
|
||||||
|
cell_resistance_3:
|
||||||
|
name: "JK1 cell resistance 3"
|
||||||
|
cell_resistance_4:
|
||||||
|
name: "JK1 cell resistance 4"
|
||||||
|
cell_resistance_5:
|
||||||
|
name: "JK1 cell resistance 5"
|
||||||
|
cell_resistance_6:
|
||||||
|
name: "JK1 cell resistance 6"
|
||||||
|
cell_resistance_7:
|
||||||
|
name: "JK1 cell resistance 7"
|
||||||
|
cell_resistance_8:
|
||||||
|
name: "JK1 cell resistance 8"
|
||||||
|
total_charging_cycle_capacity:
|
||||||
|
name: "JK1 total charging cycle capacity"
|
||||||
|
|
||||||
|
text_sensor:
|
||||||
|
- platform: jk_bms_ble
|
||||||
|
jk_bms_ble_id: jk_bms1
|
||||||
|
errors:
|
||||||
|
name: "JK1 Errors"
|
||||||
|
|
||||||
|
switch:
|
||||||
|
- platform: jk_bms_ble
|
||||||
|
jk_bms_ble_id: jk_bms1
|
||||||
|
charging:
|
||||||
|
name: "JK1 Charging"
|
||||||
|
discharging:
|
||||||
|
name: "JK1 Discharging"
|
||||||
|
balancer:
|
||||||
|
name: "JK1 Balancing"
|
||||||
|
|
||||||
|
- platform: ble_client
|
||||||
|
ble_client_id: jk_ble1
|
||||||
|
name: "JK1 enable bluetooth connection"
|
||||||
|
id: ble_client_switch0
|
||||||
48
esphome/environment.yml
Normal file
48
esphome/environment.yml
Normal file
@@ -0,0 +1,48 @@
|
|||||||
|
esphome:
|
||||||
|
name: "environment"
|
||||||
|
friendly_name: "environment"
|
||||||
|
|
||||||
|
esp32:
|
||||||
|
board: esp32dev
|
||||||
|
framework:
|
||||||
|
type: arduino
|
||||||
|
|
||||||
|
i2c:
|
||||||
|
sda: GPIO21
|
||||||
|
scl: GPIO22
|
||||||
|
scan: True
|
||||||
|
id: bus_a
|
||||||
|
|
||||||
|
sensor:
|
||||||
|
- platform: aht10
|
||||||
|
i2c_id: bus_a
|
||||||
|
address: 0x38
|
||||||
|
variant: AHT20
|
||||||
|
temperature:
|
||||||
|
name: "environment Temperature"
|
||||||
|
id: aht10_temperature
|
||||||
|
humidity:
|
||||||
|
name: "environment Humidity"
|
||||||
|
id: aht10_humidity
|
||||||
|
update_interval: 5s
|
||||||
|
|
||||||
|
web_server:
|
||||||
|
port: 80
|
||||||
|
|
||||||
|
logger:
|
||||||
|
level: DEBUG
|
||||||
|
|
||||||
|
api:
|
||||||
|
encryption:
|
||||||
|
key: !secret api_key
|
||||||
|
|
||||||
|
ota:
|
||||||
|
- platform: esphome
|
||||||
|
password: !secret ota_password
|
||||||
|
|
||||||
|
wifi:
|
||||||
|
ssid: !secret wifi_ssid
|
||||||
|
password: !secret wifi_password
|
||||||
|
fast_connect: on
|
||||||
|
|
||||||
|
captive_portal:
|
||||||
135
flake.lock
generated
135
flake.lock
generated
@@ -8,11 +8,11 @@
|
|||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"dir": "pkgs/firefox-addons",
|
"dir": "pkgs/firefox-addons",
|
||||||
"lastModified": 1760673822,
|
"lastModified": 1772824881,
|
||||||
"narHash": "sha256-h+liPhhMw1yYvkDGLHzQJQShQs+yLjNgjfAyZX+sRrM=",
|
"narHash": "sha256-NqX+JCA8hRV3GoYrsqnHB2IWKte1eQ8NK2WVbJkORcw=",
|
||||||
"owner": "rycee",
|
"owner": "rycee",
|
||||||
"repo": "nur-expressions",
|
"repo": "nur-expressions",
|
||||||
"rev": "5cca27f1bb30a26140d0cf60ab34daa45b4fa11f",
|
"rev": "07e1616c9b13fe4794dad4bcc33cd7088c554465",
|
||||||
"type": "gitlab"
|
"type": "gitlab"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -29,11 +29,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1760662441,
|
"lastModified": 1772807318,
|
||||||
"narHash": "sha256-mlDqR1Ntgs9uYYEAUR1IhamKBO0lxoNS4zGLzEZaY0A=",
|
"narHash": "sha256-Qjw6ILt8cb2HQQpCmWNLMZZ63wEo1KjTQt+1BcQBr7k=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "722792af097dff5790f1a66d271a47759f477755",
|
"rev": "daa2c221320809f5514edde74d0ad0193ad54ed8",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -44,11 +44,11 @@
|
|||||||
},
|
},
|
||||||
"nixos-hardware": {
|
"nixos-hardware": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1760106635,
|
"lastModified": 1771969195,
|
||||||
"narHash": "sha256-2GoxVaKWTHBxRoeUYSjv0AfSOx4qw5CWSFz2b+VolKU=",
|
"narHash": "sha256-qwcDBtrRvJbrrnv1lf/pREQi8t2hWZxVAyeMo7/E9sw=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixos-hardware",
|
"repo": "nixos-hardware",
|
||||||
"rev": "9ed85f8afebf2b7478f25db0a98d0e782c0ed903",
|
"rev": "41c6b421bdc301b2624486e11905c9af7b8ec68e",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -60,11 +60,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1760524057,
|
"lastModified": 1772624091,
|
||||||
"narHash": "sha256-EVAqOteLBFmd7pKkb0+FIUyzTF61VKi7YmvP1tw4nEw=",
|
"narHash": "sha256-QKyJ0QGWBn6r0invrMAK8dmJoBYWoOWy7lN+UHzW1jc=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "544961dfcce86422ba200ed9a0b00dd4b1486ec5",
|
"rev": "80bdc1e5ce51f56b19791b52b2901187931f5353",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -76,11 +76,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs-master": {
|
"nixpkgs-master": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1760751316,
|
"lastModified": 1772842888,
|
||||||
"narHash": "sha256-1296zQfPiLZNrLKzX1t+kunadeI/mH82hKze3voduEI=",
|
"narHash": "sha256-bQRYIwRb9xuEMHTLd5EzjHhYMKzbUbIo7abFV84iUjM=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "d85429339c0bcf0428084fe1306c970aed364417",
|
"rev": "af5157af67f118e13172750f63012f199b61e3a1",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -106,56 +106,6 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"pyproject-build-systems": {
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs": [
|
|
||||||
"system_tools",
|
|
||||||
"nixpkgs"
|
|
||||||
],
|
|
||||||
"pyproject-nix": [
|
|
||||||
"system_tools",
|
|
||||||
"pyproject-nix"
|
|
||||||
],
|
|
||||||
"uv2nix": [
|
|
||||||
"system_tools",
|
|
||||||
"uv2nix"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1744599653,
|
|
||||||
"narHash": "sha256-nysSwVVjG4hKoOjhjvE6U5lIKA8sEr1d1QzEfZsannU=",
|
|
||||||
"owner": "pyproject-nix",
|
|
||||||
"repo": "build-system-pkgs",
|
|
||||||
"rev": "7dba6dbc73120e15b558754c26024f6c93015dd7",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "pyproject-nix",
|
|
||||||
"repo": "build-system-pkgs",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"pyproject-nix": {
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs": [
|
|
||||||
"system_tools",
|
|
||||||
"nixpkgs"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1746540146,
|
|
||||||
"narHash": "sha256-QxdHGNpbicIrw5t6U3x+ZxeY/7IEJ6lYbvsjXmcxFIM=",
|
|
||||||
"owner": "pyproject-nix",
|
|
||||||
"repo": "pyproject.nix",
|
|
||||||
"rev": "e09c10c24ebb955125fda449939bfba664c467fd",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "pyproject-nix",
|
|
||||||
"repo": "pyproject.nix",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"root": {
|
"root": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"firefox-addons": "firefox-addons",
|
"firefox-addons": "firefox-addons",
|
||||||
@@ -165,7 +115,6 @@
|
|||||||
"nixpkgs-master": "nixpkgs-master",
|
"nixpkgs-master": "nixpkgs-master",
|
||||||
"nixpkgs-stable": "nixpkgs-stable",
|
"nixpkgs-stable": "nixpkgs-stable",
|
||||||
"sops-nix": "sops-nix",
|
"sops-nix": "sops-nix",
|
||||||
"system_tools": "system_tools",
|
|
||||||
"systems": "systems"
|
"systems": "systems"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -176,11 +125,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1760393368,
|
"lastModified": 1772495394,
|
||||||
"narHash": "sha256-8mN3kqyqa2PKY0wwZ2UmMEYMcxvNTwLaOrrDsw6Qi4E=",
|
"narHash": "sha256-hmIvE/slLKEFKNEJz27IZ8BKlAaZDcjIHmkZ7GCEjfw=",
|
||||||
"owner": "Mic92",
|
"owner": "Mic92",
|
||||||
"repo": "sops-nix",
|
"repo": "sops-nix",
|
||||||
"rev": "ab8d56e85b8be14cff9d93735951e30c3e86a437",
|
"rev": "1d9b98a29a45abe9c4d3174bd36de9f28755e3ff",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -189,29 +138,6 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"system_tools": {
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs": [
|
|
||||||
"nixpkgs"
|
|
||||||
],
|
|
||||||
"pyproject-build-systems": "pyproject-build-systems",
|
|
||||||
"pyproject-nix": "pyproject-nix",
|
|
||||||
"uv2nix": "uv2nix"
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1760751967,
|
|
||||||
"narHash": "sha256-u/uciy9kpM/CBZKl05iAZRaOTwUHiuI0L/qbkk2mLUg=",
|
|
||||||
"owner": "RichieCahill",
|
|
||||||
"repo": "system_tools",
|
|
||||||
"rev": "a125c3e5c01cecbc3f2a842ffb1abb1210c35706",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "RichieCahill",
|
|
||||||
"repo": "system_tools",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"systems": {
|
"systems": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1689347949,
|
"lastModified": 1689347949,
|
||||||
@@ -226,31 +152,6 @@
|
|||||||
"repo": "default-linux",
|
"repo": "default-linux",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
|
||||||
"uv2nix": {
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs": [
|
|
||||||
"system_tools",
|
|
||||||
"nixpkgs"
|
|
||||||
],
|
|
||||||
"pyproject-nix": [
|
|
||||||
"system_tools",
|
|
||||||
"pyproject-nix"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1747441483,
|
|
||||||
"narHash": "sha256-W8BFXk5R0TuJcjIhcGoMpSOaIufGXpizK0pm+uTqynA=",
|
|
||||||
"owner": "pyproject-nix",
|
|
||||||
"repo": "uv2nix",
|
|
||||||
"rev": "582024dc64663e9f88d467c2f7f7b20d278349de",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "pyproject-nix",
|
|
||||||
"repo": "uv2nix",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"root": "root",
|
"root": "root",
|
||||||
|
|||||||
@@ -31,11 +31,6 @@
|
|||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
|
|
||||||
system_tools = {
|
|
||||||
url = "github:RichieCahill/system_tools";
|
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
|
||||||
};
|
|
||||||
|
|
||||||
sops-nix = {
|
sops-nix = {
|
||||||
url = "github:Mic92/sops-nix";
|
url = "github:Mic92/sops-nix";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
@@ -59,6 +54,7 @@
|
|||||||
system:
|
system:
|
||||||
import nixpkgs {
|
import nixpkgs {
|
||||||
inherit system;
|
inherit system;
|
||||||
|
overlays = builtins.attrValues outputs.overlays;
|
||||||
config.allowUnfree = true;
|
config.allowUnfree = true;
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|||||||
24
frontend/.gitignore
vendored
Normal file
24
frontend/.gitignore
vendored
Normal file
@@ -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?
|
||||||
73
frontend/README.md
Normal file
73
frontend/README.md
Normal file
@@ -0,0 +1,73 @@
|
|||||||
|
# React + TypeScript + Vite
|
||||||
|
|
||||||
|
This template provides a minimal setup to get React working in Vite with HMR and some ESLint rules.
|
||||||
|
|
||||||
|
Currently, two official plugins are available:
|
||||||
|
|
||||||
|
- [@vitejs/plugin-react](https://github.com/vitejs/vite-plugin-react/blob/main/packages/plugin-react) uses [Babel](https://babeljs.io/) (or [oxc](https://oxc.rs) when used in [rolldown-vite](https://vite.dev/guide/rolldown)) for Fast Refresh
|
||||||
|
- [@vitejs/plugin-react-swc](https://github.com/vitejs/vite-plugin-react/blob/main/packages/plugin-react-swc) uses [SWC](https://swc.rs/) for Fast Refresh
|
||||||
|
|
||||||
|
## React Compiler
|
||||||
|
|
||||||
|
The React Compiler is not enabled on this template because of its impact on dev & build performances. To add it, see [this documentation](https://react.dev/learn/react-compiler/installation).
|
||||||
|
|
||||||
|
## Expanding the ESLint configuration
|
||||||
|
|
||||||
|
If you are developing a production application, we recommend updating the configuration to enable type-aware lint rules:
|
||||||
|
|
||||||
|
```js
|
||||||
|
export default defineConfig([
|
||||||
|
globalIgnores(['dist']),
|
||||||
|
{
|
||||||
|
files: ['**/*.{ts,tsx}'],
|
||||||
|
extends: [
|
||||||
|
// Other configs...
|
||||||
|
|
||||||
|
// Remove tseslint.configs.recommended and replace with this
|
||||||
|
tseslint.configs.recommendedTypeChecked,
|
||||||
|
// Alternatively, use this for stricter rules
|
||||||
|
tseslint.configs.strictTypeChecked,
|
||||||
|
// Optionally, add this for stylistic rules
|
||||||
|
tseslint.configs.stylisticTypeChecked,
|
||||||
|
|
||||||
|
// Other configs...
|
||||||
|
],
|
||||||
|
languageOptions: {
|
||||||
|
parserOptions: {
|
||||||
|
project: ['./tsconfig.node.json', './tsconfig.app.json'],
|
||||||
|
tsconfigRootDir: import.meta.dirname,
|
||||||
|
},
|
||||||
|
// other options...
|
||||||
|
},
|
||||||
|
},
|
||||||
|
])
|
||||||
|
```
|
||||||
|
|
||||||
|
You can also install [eslint-plugin-react-x](https://github.com/Rel1cx/eslint-react/tree/main/packages/plugins/eslint-plugin-react-x) and [eslint-plugin-react-dom](https://github.com/Rel1cx/eslint-react/tree/main/packages/plugins/eslint-plugin-react-dom) for React-specific lint rules:
|
||||||
|
|
||||||
|
```js
|
||||||
|
// eslint.config.js
|
||||||
|
import reactX from 'eslint-plugin-react-x'
|
||||||
|
import reactDom from 'eslint-plugin-react-dom'
|
||||||
|
|
||||||
|
export default defineConfig([
|
||||||
|
globalIgnores(['dist']),
|
||||||
|
{
|
||||||
|
files: ['**/*.{ts,tsx}'],
|
||||||
|
extends: [
|
||||||
|
// Other configs...
|
||||||
|
// Enable lint rules for React
|
||||||
|
reactX.configs['recommended-typescript'],
|
||||||
|
// Enable lint rules for React DOM
|
||||||
|
reactDom.configs.recommended,
|
||||||
|
],
|
||||||
|
languageOptions: {
|
||||||
|
parserOptions: {
|
||||||
|
project: ['./tsconfig.node.json', './tsconfig.app.json'],
|
||||||
|
tsconfigRootDir: import.meta.dirname,
|
||||||
|
},
|
||||||
|
// other options...
|
||||||
|
},
|
||||||
|
},
|
||||||
|
])
|
||||||
|
```
|
||||||
23
frontend/eslint.config.js
Normal file
23
frontend/eslint.config.js
Normal file
@@ -0,0 +1,23 @@
|
|||||||
|
import js from '@eslint/js'
|
||||||
|
import globals from 'globals'
|
||||||
|
import reactHooks from 'eslint-plugin-react-hooks'
|
||||||
|
import reactRefresh from 'eslint-plugin-react-refresh'
|
||||||
|
import tseslint from 'typescript-eslint'
|
||||||
|
import { defineConfig, globalIgnores } from 'eslint/config'
|
||||||
|
|
||||||
|
export default defineConfig([
|
||||||
|
globalIgnores(['dist']),
|
||||||
|
{
|
||||||
|
files: ['**/*.{ts,tsx}'],
|
||||||
|
extends: [
|
||||||
|
js.configs.recommended,
|
||||||
|
tseslint.configs.recommended,
|
||||||
|
reactHooks.configs.flat.recommended,
|
||||||
|
reactRefresh.configs.vite,
|
||||||
|
],
|
||||||
|
languageOptions: {
|
||||||
|
ecmaVersion: 2020,
|
||||||
|
globals: globals.browser,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
])
|
||||||
13
frontend/index.html
Normal file
13
frontend/index.html
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
<!doctype html>
|
||||||
|
<html lang="en">
|
||||||
|
<head>
|
||||||
|
<meta charset="UTF-8" />
|
||||||
|
<link rel="icon" type="image/svg+xml" href="/vite.svg" />
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||||
|
<title>frontend</title>
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<div id="root"></div>
|
||||||
|
<script type="module" src="/src/main.tsx"></script>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
3315
frontend/package-lock.json
generated
Normal file
3315
frontend/package-lock.json
generated
Normal file
File diff suppressed because it is too large
Load Diff
31
frontend/package.json
Normal file
31
frontend/package.json
Normal file
@@ -0,0 +1,31 @@
|
|||||||
|
{
|
||||||
|
"name": "frontend",
|
||||||
|
"private": true,
|
||||||
|
"version": "0.0.0",
|
||||||
|
"type": "module",
|
||||||
|
"scripts": {
|
||||||
|
"dev": "vite",
|
||||||
|
"build": "tsc -b && vite build",
|
||||||
|
"lint": "eslint .",
|
||||||
|
"preview": "vite preview"
|
||||||
|
},
|
||||||
|
"dependencies": {
|
||||||
|
"react": "^19.2.0",
|
||||||
|
"react-dom": "^19.2.0",
|
||||||
|
"react-router-dom": "^7.12.0"
|
||||||
|
},
|
||||||
|
"devDependencies": {
|
||||||
|
"@eslint/js": "^9.39.1",
|
||||||
|
"@types/node": "^24.10.1",
|
||||||
|
"@types/react": "^19.2.5",
|
||||||
|
"@types/react-dom": "^19.2.3",
|
||||||
|
"@vitejs/plugin-react": "^5.1.1",
|
||||||
|
"eslint": "^9.39.1",
|
||||||
|
"eslint-plugin-react-hooks": "^7.0.1",
|
||||||
|
"eslint-plugin-react-refresh": "^0.4.24",
|
||||||
|
"globals": "^16.5.0",
|
||||||
|
"typescript": "~5.9.3",
|
||||||
|
"typescript-eslint": "^8.46.4",
|
||||||
|
"vite": "^7.2.4"
|
||||||
|
}
|
||||||
|
}
|
||||||
1
frontend/public/vite.svg
Normal file
1
frontend/public/vite.svg
Normal file
@@ -0,0 +1 @@
|
|||||||
|
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="31.88" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 257"><defs><linearGradient id="IconifyId1813088fe1fbc01fb466" x1="-.828%" x2="57.636%" y1="7.652%" y2="78.411%"><stop offset="0%" stop-color="#41D1FF"></stop><stop offset="100%" stop-color="#BD34FE"></stop></linearGradient><linearGradient id="IconifyId1813088fe1fbc01fb467" x1="43.376%" x2="50.316%" y1="2.242%" y2="89.03%"><stop offset="0%" stop-color="#FFEA83"></stop><stop offset="8.333%" stop-color="#FFDD35"></stop><stop offset="100%" stop-color="#FFA800"></stop></linearGradient></defs><path fill="url(#IconifyId1813088fe1fbc01fb466)" d="M255.153 37.938L134.897 252.976c-2.483 4.44-8.862 4.466-11.382.048L.875 37.958c-2.746-4.814 1.371-10.646 6.827-9.67l120.385 21.517a6.537 6.537 0 0 0 2.322-.004l117.867-21.483c5.438-.991 9.574 4.796 6.877 9.62Z"></path><path fill="url(#IconifyId1813088fe1fbc01fb467)" d="M185.432.063L96.44 17.501a3.268 3.268 0 0 0-2.634 3.014l-5.474 92.456a3.268 3.268 0 0 0 3.997 3.378l24.777-5.718c2.318-.535 4.413 1.507 3.936 3.838l-7.361 36.047c-.495 2.426 1.782 4.5 4.151 3.78l15.304-4.649c2.372-.72 4.652 1.36 4.15 3.788l-11.698 56.621c-.732 3.542 3.979 5.473 5.943 2.437l1.313-2.028l72.516-144.72c1.215-2.423-.88-5.186-3.54-4.672l-25.505 4.922c-2.396.462-4.435-1.77-3.759-4.114l16.646-57.705c.677-2.35-1.37-4.583-3.769-4.113Z"></path></svg>
|
||||||
|
After Width: | Height: | Size: 1.5 KiB |
654
frontend/src/App.css
Normal file
654
frontend/src/App.css
Normal file
@@ -0,0 +1,654 @@
|
|||||||
|
* {
|
||||||
|
box-sizing: border-box;
|
||||||
|
}
|
||||||
|
|
||||||
|
body {
|
||||||
|
margin: 0;
|
||||||
|
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, sans-serif;
|
||||||
|
background: var(--color-bg);
|
||||||
|
color: var(--color-text);
|
||||||
|
}
|
||||||
|
|
||||||
|
.app {
|
||||||
|
max-width: 1000px;
|
||||||
|
margin: 0 auto;
|
||||||
|
padding: 20px;
|
||||||
|
}
|
||||||
|
|
||||||
|
nav {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 20px;
|
||||||
|
padding: 15px 0;
|
||||||
|
border-bottom: 1px solid var(--color-border);
|
||||||
|
margin-bottom: 20px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.theme-toggle {
|
||||||
|
margin-left: auto;
|
||||||
|
}
|
||||||
|
|
||||||
|
nav a {
|
||||||
|
color: var(--color-primary);
|
||||||
|
text-decoration: none;
|
||||||
|
font-weight: 500;
|
||||||
|
}
|
||||||
|
|
||||||
|
nav a:hover {
|
||||||
|
text-decoration: underline;
|
||||||
|
}
|
||||||
|
|
||||||
|
main {
|
||||||
|
background: var(--color-bg-card);
|
||||||
|
padding: 20px;
|
||||||
|
border-radius: 8px;
|
||||||
|
box-shadow: var(--shadow);
|
||||||
|
}
|
||||||
|
|
||||||
|
.header {
|
||||||
|
display: flex;
|
||||||
|
justify-content: space-between;
|
||||||
|
align-items: center;
|
||||||
|
margin-bottom: 20px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.header h1 {
|
||||||
|
margin: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.btn {
|
||||||
|
display: inline-block;
|
||||||
|
padding: 8px 16px;
|
||||||
|
border: 1px solid var(--color-border);
|
||||||
|
border-radius: 4px;
|
||||||
|
background: var(--color-bg-card);
|
||||||
|
color: var(--color-text);
|
||||||
|
text-decoration: none;
|
||||||
|
cursor: pointer;
|
||||||
|
font-size: 14px;
|
||||||
|
margin-left: 8px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.btn:hover {
|
||||||
|
background: var(--color-bg-hover);
|
||||||
|
}
|
||||||
|
|
||||||
|
.btn-primary {
|
||||||
|
background: var(--color-primary);
|
||||||
|
border-color: var(--color-primary);
|
||||||
|
color: white;
|
||||||
|
}
|
||||||
|
|
||||||
|
.btn-primary:hover {
|
||||||
|
background: var(--color-primary-hover);
|
||||||
|
}
|
||||||
|
|
||||||
|
.btn-danger {
|
||||||
|
background: var(--color-danger);
|
||||||
|
border-color: var(--color-danger);
|
||||||
|
color: white;
|
||||||
|
}
|
||||||
|
|
||||||
|
.btn-danger:hover {
|
||||||
|
background: var(--color-danger-hover);
|
||||||
|
}
|
||||||
|
|
||||||
|
.btn-small {
|
||||||
|
padding: 4px 8px;
|
||||||
|
font-size: 12px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.btn:disabled {
|
||||||
|
opacity: 0.6;
|
||||||
|
cursor: not-allowed;
|
||||||
|
}
|
||||||
|
|
||||||
|
table {
|
||||||
|
width: 100%;
|
||||||
|
border-collapse: collapse;
|
||||||
|
}
|
||||||
|
|
||||||
|
th,
|
||||||
|
td {
|
||||||
|
padding: 12px;
|
||||||
|
text-align: left;
|
||||||
|
border-bottom: 1px solid var(--color-border-light);
|
||||||
|
}
|
||||||
|
|
||||||
|
th {
|
||||||
|
font-weight: 600;
|
||||||
|
background: var(--color-bg-muted);
|
||||||
|
}
|
||||||
|
|
||||||
|
tr:hover {
|
||||||
|
background: var(--color-bg-muted);
|
||||||
|
}
|
||||||
|
|
||||||
|
.error {
|
||||||
|
background: var(--color-bg-error);
|
||||||
|
color: var(--color-text-error);
|
||||||
|
padding: 10px;
|
||||||
|
border-radius: 4px;
|
||||||
|
margin-bottom: 20px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.info-grid {
|
||||||
|
display: grid;
|
||||||
|
grid-template-columns: repeat(auto-fill, minmax(200px, 1fr));
|
||||||
|
gap: 10px;
|
||||||
|
margin-bottom: 20px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.section {
|
||||||
|
margin-top: 30px;
|
||||||
|
padding-top: 20px;
|
||||||
|
border-top: 1px solid var(--color-border-light);
|
||||||
|
}
|
||||||
|
|
||||||
|
.section h3 {
|
||||||
|
margin-top: 0;
|
||||||
|
margin-bottom: 15px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.section h4 {
|
||||||
|
margin: 15px 0 10px;
|
||||||
|
font-size: 14px;
|
||||||
|
color: var(--color-text-muted);
|
||||||
|
}
|
||||||
|
|
||||||
|
.section ul {
|
||||||
|
list-style: none;
|
||||||
|
padding: 0;
|
||||||
|
margin: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.section li {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 10px;
|
||||||
|
padding: 8px 0;
|
||||||
|
border-bottom: 1px solid var(--color-border-lighter);
|
||||||
|
}
|
||||||
|
|
||||||
|
.tag {
|
||||||
|
display: inline-block;
|
||||||
|
background: var(--color-tag-bg);
|
||||||
|
padding: 2px 8px;
|
||||||
|
border-radius: 12px;
|
||||||
|
font-size: 12px;
|
||||||
|
color: var(--color-text-muted);
|
||||||
|
}
|
||||||
|
|
||||||
|
.add-form {
|
||||||
|
display: flex;
|
||||||
|
gap: 10px;
|
||||||
|
margin-top: 15px;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
}
|
||||||
|
|
||||||
|
.add-form select,
|
||||||
|
.add-form input {
|
||||||
|
padding: 8px;
|
||||||
|
border: 1px solid var(--color-border);
|
||||||
|
border-radius: 4px;
|
||||||
|
min-width: 200px;
|
||||||
|
background: var(--color-bg-card);
|
||||||
|
color: var(--color-text);
|
||||||
|
}
|
||||||
|
|
||||||
|
.form-group {
|
||||||
|
margin-bottom: 20px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.form-group label {
|
||||||
|
display: block;
|
||||||
|
font-weight: 500;
|
||||||
|
margin-bottom: 5px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.form-group input,
|
||||||
|
.form-group textarea,
|
||||||
|
.form-group select {
|
||||||
|
width: 100%;
|
||||||
|
padding: 10px;
|
||||||
|
border: 1px solid var(--color-border);
|
||||||
|
border-radius: 4px;
|
||||||
|
font-size: 14px;
|
||||||
|
background: var(--color-bg-card);
|
||||||
|
color: var(--color-text);
|
||||||
|
}
|
||||||
|
|
||||||
|
.form-group textarea {
|
||||||
|
resize: vertical;
|
||||||
|
}
|
||||||
|
|
||||||
|
.form-row {
|
||||||
|
display: grid;
|
||||||
|
grid-template-columns: 1fr 1fr;
|
||||||
|
gap: 20px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.checkbox-group {
|
||||||
|
display: flex;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
gap: 15px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.checkbox-label {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 5px;
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
|
||||||
|
.form-actions {
|
||||||
|
display: flex;
|
||||||
|
gap: 10px;
|
||||||
|
margin-top: 30px;
|
||||||
|
padding-top: 20px;
|
||||||
|
border-top: 1px solid var(--color-border-light);
|
||||||
|
}
|
||||||
|
|
||||||
|
.need-list .header {
|
||||||
|
margin-bottom: 20px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.need-form {
|
||||||
|
background: var(--color-bg-muted);
|
||||||
|
padding: 20px;
|
||||||
|
border-radius: 4px;
|
||||||
|
margin-bottom: 20px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.need-items {
|
||||||
|
list-style: none;
|
||||||
|
padding: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.need-items li {
|
||||||
|
display: flex;
|
||||||
|
justify-content: space-between;
|
||||||
|
align-items: flex-start;
|
||||||
|
padding: 15px;
|
||||||
|
border: 1px solid var(--color-border-light);
|
||||||
|
border-radius: 4px;
|
||||||
|
margin-bottom: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.need-info p {
|
||||||
|
margin: 5px 0 0;
|
||||||
|
color: var(--color-text-muted);
|
||||||
|
font-size: 14px;
|
||||||
|
}
|
||||||
|
|
||||||
|
a {
|
||||||
|
color: var(--color-primary);
|
||||||
|
}
|
||||||
|
|
||||||
|
a:hover {
|
||||||
|
text-decoration: underline;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Graph styles */
|
||||||
|
.graph-container {
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.graph-hint {
|
||||||
|
color: var(--color-text-muted);
|
||||||
|
font-size: 14px;
|
||||||
|
margin-bottom: 15px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.selected-info {
|
||||||
|
margin-top: 15px;
|
||||||
|
padding: 15px;
|
||||||
|
background: var(--color-bg-muted);
|
||||||
|
border-radius: 8px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.selected-info h3 {
|
||||||
|
margin: 0 0 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.selected-info p {
|
||||||
|
margin: 5px 0;
|
||||||
|
color: var(--color-text-muted);
|
||||||
|
}
|
||||||
|
|
||||||
|
.legend {
|
||||||
|
margin-top: 20px;
|
||||||
|
padding: 15px;
|
||||||
|
background: var(--color-bg-muted);
|
||||||
|
border-radius: 8px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.legend h4 {
|
||||||
|
margin: 0 0 10px;
|
||||||
|
font-size: 14px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.legend-items {
|
||||||
|
display: flex;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
gap: 15px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.legend-item {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 8px;
|
||||||
|
font-size: 12px;
|
||||||
|
color: var(--color-text-muted);
|
||||||
|
}
|
||||||
|
|
||||||
|
.legend-line {
|
||||||
|
width: 30px;
|
||||||
|
border-radius: 2px;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Weight control styles */
|
||||||
|
.weight-control {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 8px;
|
||||||
|
font-size: 12px;
|
||||||
|
color: var(--color-text-muted);
|
||||||
|
}
|
||||||
|
|
||||||
|
.weight-control input[type="range"] {
|
||||||
|
width: 80px;
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
|
||||||
|
.weight-value {
|
||||||
|
min-width: 20px;
|
||||||
|
text-align: center;
|
||||||
|
font-weight: 600;
|
||||||
|
}
|
||||||
|
|
||||||
|
.weight-display {
|
||||||
|
font-size: 12px;
|
||||||
|
color: var(--color-text-muted);
|
||||||
|
margin-left: auto;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* ID Card Styles */
|
||||||
|
.id-card {
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.id-card-inner {
|
||||||
|
background: linear-gradient(135deg, #0a0a0f 0%, #1a1a2e 50%, #0a0a0f 100%);
|
||||||
|
background-image:
|
||||||
|
radial-gradient(white 1px, transparent 1px),
|
||||||
|
linear-gradient(135deg, #0a0a0f 0%, #1a1a2e 50%, #0a0a0f 100%);
|
||||||
|
background-size: 50px 50px, 100% 100%;
|
||||||
|
background-position: 0 0, 0 0;
|
||||||
|
color: #fff;
|
||||||
|
border-radius: 12px;
|
||||||
|
padding: 25px;
|
||||||
|
min-height: 500px;
|
||||||
|
position: relative;
|
||||||
|
overflow: hidden;
|
||||||
|
}
|
||||||
|
|
||||||
|
.id-card-header {
|
||||||
|
display: flex;
|
||||||
|
justify-content: space-between;
|
||||||
|
align-items: flex-start;
|
||||||
|
margin-bottom: 15px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.id-card-header-left {
|
||||||
|
flex: 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
.id-card-header-right {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
align-items: flex-end;
|
||||||
|
gap: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.id-card-title {
|
||||||
|
font-size: 2.5rem;
|
||||||
|
font-weight: 700;
|
||||||
|
margin: 0;
|
||||||
|
color: #fff;
|
||||||
|
text-shadow: 2px 2px 4px rgba(0,0,0,0.5);
|
||||||
|
}
|
||||||
|
|
||||||
|
.id-profile-pic {
|
||||||
|
width: 80px;
|
||||||
|
height: 80px;
|
||||||
|
border-radius: 8px;
|
||||||
|
object-fit: cover;
|
||||||
|
border: 2px solid rgba(255,255,255,0.3);
|
||||||
|
}
|
||||||
|
|
||||||
|
.id-profile-placeholder {
|
||||||
|
width: 80px;
|
||||||
|
height: 80px;
|
||||||
|
border-radius: 8px;
|
||||||
|
background: linear-gradient(135deg, #4ecdc4 0%, #44a8a0 100%);
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
border: 2px solid rgba(255,255,255,0.3);
|
||||||
|
}
|
||||||
|
|
||||||
|
.id-profile-placeholder span {
|
||||||
|
font-size: 2rem;
|
||||||
|
font-weight: 700;
|
||||||
|
color: #fff;
|
||||||
|
text-shadow: 1px 1px 2px rgba(0,0,0,0.3);
|
||||||
|
}
|
||||||
|
|
||||||
|
.id-card-actions {
|
||||||
|
display: flex;
|
||||||
|
gap: 8px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.id-card-actions .btn {
|
||||||
|
background: rgba(255,255,255,0.1);
|
||||||
|
border-color: rgba(255,255,255,0.3);
|
||||||
|
color: #fff;
|
||||||
|
}
|
||||||
|
|
||||||
|
.id-card-actions .btn:hover {
|
||||||
|
background: rgba(255,255,255,0.2);
|
||||||
|
}
|
||||||
|
|
||||||
|
.id-card-body {
|
||||||
|
display: grid;
|
||||||
|
grid-template-columns: 1fr 1.5fr;
|
||||||
|
gap: 30px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.id-card-left {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
gap: 8px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.id-field {
|
||||||
|
font-size: 1rem;
|
||||||
|
line-height: 1.4;
|
||||||
|
}
|
||||||
|
|
||||||
|
.id-field-block {
|
||||||
|
margin-top: 15px;
|
||||||
|
font-size: 0.95rem;
|
||||||
|
line-height: 1.5;
|
||||||
|
}
|
||||||
|
|
||||||
|
.id-label {
|
||||||
|
color: #4ecdc4;
|
||||||
|
font-weight: 500;
|
||||||
|
}
|
||||||
|
|
||||||
|
.id-card-right {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
gap: 20px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.id-bio {
|
||||||
|
font-size: 0.9rem;
|
||||||
|
line-height: 1.6;
|
||||||
|
color: #e0e0e0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.id-relationships {
|
||||||
|
margin-top: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.id-section-title {
|
||||||
|
font-size: 1.5rem;
|
||||||
|
margin: 0 0 15px;
|
||||||
|
color: #fff;
|
||||||
|
border-bottom: 1px solid rgba(255,255,255,0.2);
|
||||||
|
padding-bottom: 8px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.id-rel-group {
|
||||||
|
margin-bottom: 12px;
|
||||||
|
font-size: 0.9rem;
|
||||||
|
line-height: 1.6;
|
||||||
|
}
|
||||||
|
|
||||||
|
.id-rel-label {
|
||||||
|
color: #a0a0a0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.id-rel-group a {
|
||||||
|
color: #4ecdc4;
|
||||||
|
text-decoration: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.id-rel-group a:hover {
|
||||||
|
text-decoration: underline;
|
||||||
|
}
|
||||||
|
|
||||||
|
.id-rel-type {
|
||||||
|
color: #888;
|
||||||
|
font-size: 0.85em;
|
||||||
|
}
|
||||||
|
|
||||||
|
.id-card-warnings {
|
||||||
|
margin-top: 30px;
|
||||||
|
padding-top: 20px;
|
||||||
|
border-top: 1px solid rgba(255,255,255,0.2);
|
||||||
|
display: flex;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
gap: 20px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.id-warning {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 8px;
|
||||||
|
font-size: 0.9rem;
|
||||||
|
color: #ff6b6b;
|
||||||
|
}
|
||||||
|
|
||||||
|
.warning-dot {
|
||||||
|
width: 8px;
|
||||||
|
height: 8px;
|
||||||
|
background: #ff6b6b;
|
||||||
|
border-radius: 50%;
|
||||||
|
flex-shrink: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.warning-desc {
|
||||||
|
color: #ccc;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Management section */
|
||||||
|
.id-card-manage {
|
||||||
|
margin-top: 20px;
|
||||||
|
background: var(--color-bg-muted);
|
||||||
|
border-radius: 8px;
|
||||||
|
padding: 15px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.id-card-manage summary {
|
||||||
|
cursor: pointer;
|
||||||
|
font-weight: 600;
|
||||||
|
font-size: 1.1rem;
|
||||||
|
padding: 5px 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.id-card-manage[open] summary {
|
||||||
|
margin-bottom: 15px;
|
||||||
|
border-bottom: 1px solid var(--color-border-light);
|
||||||
|
padding-bottom: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.manage-section {
|
||||||
|
margin-bottom: 25px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.manage-section h3 {
|
||||||
|
margin: 0 0 15px;
|
||||||
|
font-size: 1rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.manage-relationships {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
gap: 10px;
|
||||||
|
margin-bottom: 15px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.manage-rel-item {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 12px;
|
||||||
|
padding: 10px;
|
||||||
|
background: var(--color-bg-card);
|
||||||
|
border-radius: 6px;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
}
|
||||||
|
|
||||||
|
.manage-rel-item a {
|
||||||
|
font-weight: 500;
|
||||||
|
min-width: 120px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.manage-needs-list {
|
||||||
|
list-style: none;
|
||||||
|
padding: 0;
|
||||||
|
margin: 0 0 15px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.manage-needs-list li {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 12px;
|
||||||
|
padding: 10px;
|
||||||
|
background: var(--color-bg-card);
|
||||||
|
border-radius: 6px;
|
||||||
|
margin-bottom: 8px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.manage-needs-list li .btn {
|
||||||
|
margin-left: auto;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Responsive adjustments */
|
||||||
|
@media (max-width: 768px) {
|
||||||
|
.id-card-body {
|
||||||
|
grid-template-columns: 1fr;
|
||||||
|
}
|
||||||
|
|
||||||
|
.id-card-title {
|
||||||
|
font-size: 1.8rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.id-card-header {
|
||||||
|
flex-direction: column;
|
||||||
|
gap: 15px;
|
||||||
|
}
|
||||||
|
}
|
||||||
50
frontend/src/App.tsx
Normal file
50
frontend/src/App.tsx
Normal file
@@ -0,0 +1,50 @@
|
|||||||
|
import { useEffect, useState } from "react";
|
||||||
|
import { Link, Route, Routes } from "react-router-dom";
|
||||||
|
import { ContactDetail } from "./components/ContactDetail";
|
||||||
|
import { ContactForm } from "./components/ContactForm";
|
||||||
|
import { ContactList } from "./components/ContactList";
|
||||||
|
import { NeedList } from "./components/NeedList";
|
||||||
|
import { RelationshipGraph } from "./components/RelationshipGraph";
|
||||||
|
import "./App.css";
|
||||||
|
|
||||||
|
function App() {
|
||||||
|
const [theme, setTheme] = useState<"light" | "dark">(() => {
|
||||||
|
return (localStorage.getItem("theme") as "light" | "dark") || "light";
|
||||||
|
});
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
document.documentElement.setAttribute("data-theme", theme);
|
||||||
|
localStorage.setItem("theme", theme);
|
||||||
|
}, [theme]);
|
||||||
|
|
||||||
|
const toggleTheme = () => {
|
||||||
|
setTheme((prev) => (prev === "light" ? "dark" : "light"));
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="app">
|
||||||
|
<nav>
|
||||||
|
<Link to="/contacts">Contacts</Link>
|
||||||
|
<Link to="/graph">Graph</Link>
|
||||||
|
<Link to="/needs">Needs</Link>
|
||||||
|
<button className="btn btn-small theme-toggle" onClick={toggleTheme}>
|
||||||
|
{theme === "light" ? "Dark" : "Light"}
|
||||||
|
</button>
|
||||||
|
</nav>
|
||||||
|
|
||||||
|
<main>
|
||||||
|
<Routes>
|
||||||
|
<Route path="/" element={<ContactList />} />
|
||||||
|
<Route path="/contacts" element={<ContactList />} />
|
||||||
|
<Route path="/contacts/new" element={<ContactForm />} />
|
||||||
|
<Route path="/contacts/:id" element={<ContactDetail />} />
|
||||||
|
<Route path="/contacts/:id/edit" element={<ContactForm />} />
|
||||||
|
<Route path="/graph" element={<RelationshipGraph />} />
|
||||||
|
<Route path="/needs" element={<NeedList />} />
|
||||||
|
</Routes>
|
||||||
|
</main>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
export default App;
|
||||||
105
frontend/src/api/client.ts
Normal file
105
frontend/src/api/client.ts
Normal file
@@ -0,0 +1,105 @@
|
|||||||
|
import type {
|
||||||
|
Contact,
|
||||||
|
ContactCreate,
|
||||||
|
ContactListItem,
|
||||||
|
ContactRelationship,
|
||||||
|
ContactRelationshipCreate,
|
||||||
|
ContactRelationshipUpdate,
|
||||||
|
ContactUpdate,
|
||||||
|
GraphData,
|
||||||
|
Need,
|
||||||
|
NeedCreate,
|
||||||
|
} from "../types";
|
||||||
|
|
||||||
|
const API_BASE = "";
|
||||||
|
|
||||||
|
async function request<T>(
|
||||||
|
endpoint: string,
|
||||||
|
options?: RequestInit
|
||||||
|
): Promise<T> {
|
||||||
|
const response = await fetch(`${API_BASE}${endpoint}`, {
|
||||||
|
...options,
|
||||||
|
headers: {
|
||||||
|
"Content-Type": "application/json",
|
||||||
|
...options?.headers,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
if (!response.ok) {
|
||||||
|
const error = await response.json().catch(() => ({}));
|
||||||
|
throw new Error(error.detail || `HTTP ${response.status}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
return response.json();
|
||||||
|
}
|
||||||
|
|
||||||
|
export const api = {
|
||||||
|
// Needs
|
||||||
|
needs: {
|
||||||
|
list: () => request<Need[]>("/api/needs"),
|
||||||
|
get: (id: number) => request<Need>(`/api/needs/${id}`),
|
||||||
|
create: (data: NeedCreate) =>
|
||||||
|
request<Need>("/api/needs", {
|
||||||
|
method: "POST",
|
||||||
|
body: JSON.stringify(data),
|
||||||
|
}),
|
||||||
|
delete: (id: number) =>
|
||||||
|
request<{ deleted: boolean }>(`/api/needs/${id}`, { method: "DELETE" }),
|
||||||
|
},
|
||||||
|
|
||||||
|
// Contacts
|
||||||
|
contacts: {
|
||||||
|
list: (skip = 0, limit = 100) =>
|
||||||
|
request<ContactListItem[]>(`/api/contacts?skip=${skip}&limit=${limit}`),
|
||||||
|
get: (id: number) => request<Contact>(`/api/contacts/${id}`),
|
||||||
|
create: (data: ContactCreate) =>
|
||||||
|
request<Contact>("/api/contacts", {
|
||||||
|
method: "POST",
|
||||||
|
body: JSON.stringify(data),
|
||||||
|
}),
|
||||||
|
update: (id: number, data: ContactUpdate) =>
|
||||||
|
request<Contact>(`/api/contacts/${id}`, {
|
||||||
|
method: "PATCH",
|
||||||
|
body: JSON.stringify(data),
|
||||||
|
}),
|
||||||
|
delete: (id: number) =>
|
||||||
|
request<{ deleted: boolean }>(`/api/contacts/${id}`, { method: "DELETE" }),
|
||||||
|
|
||||||
|
// Contact-Need relationships
|
||||||
|
addNeed: (contactId: number, needId: number) =>
|
||||||
|
request<{ added: boolean }>(`/api/contacts/${contactId}/needs/${needId}`, {
|
||||||
|
method: "POST",
|
||||||
|
}),
|
||||||
|
removeNeed: (contactId: number, needId: number) =>
|
||||||
|
request<{ removed: boolean }>(`/api/contacts/${contactId}/needs/${needId}`, {
|
||||||
|
method: "DELETE",
|
||||||
|
}),
|
||||||
|
|
||||||
|
// Contact-Contact relationships
|
||||||
|
getRelationships: (contactId: number) =>
|
||||||
|
request<ContactRelationship[]>(`/api/contacts/${contactId}/relationships`),
|
||||||
|
addRelationship: (contactId: number, data: ContactRelationshipCreate) =>
|
||||||
|
request<ContactRelationship>(`/api/contacts/${contactId}/relationships`, {
|
||||||
|
method: "POST",
|
||||||
|
body: JSON.stringify(data),
|
||||||
|
}),
|
||||||
|
updateRelationship: (contactId: number, relatedContactId: number, data: ContactRelationshipUpdate) =>
|
||||||
|
request<ContactRelationship>(
|
||||||
|
`/api/contacts/${contactId}/relationships/${relatedContactId}`,
|
||||||
|
{
|
||||||
|
method: "PATCH",
|
||||||
|
body: JSON.stringify(data),
|
||||||
|
}
|
||||||
|
),
|
||||||
|
removeRelationship: (contactId: number, relatedContactId: number) =>
|
||||||
|
request<{ deleted: boolean }>(
|
||||||
|
`/api/contacts/${contactId}/relationships/${relatedContactId}`,
|
||||||
|
{ method: "DELETE" }
|
||||||
|
),
|
||||||
|
},
|
||||||
|
|
||||||
|
// Graph
|
||||||
|
graph: {
|
||||||
|
get: () => request<GraphData>("/api/graph"),
|
||||||
|
},
|
||||||
|
};
|
||||||
1
frontend/src/assets/react.svg
Normal file
1
frontend/src/assets/react.svg
Normal file
@@ -0,0 +1 @@
|
|||||||
|
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="35.93" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 228"><path fill="#00D8FF" d="M210.483 73.824a171.49 171.49 0 0 0-8.24-2.597c.465-1.9.893-3.777 1.273-5.621c6.238-30.281 2.16-54.676-11.769-62.708c-13.355-7.7-35.196.329-57.254 19.526a171.23 171.23 0 0 0-6.375 5.848a155.866 155.866 0 0 0-4.241-3.917C100.759 3.829 77.587-4.822 63.673 3.233C50.33 10.957 46.379 33.89 51.995 62.588a170.974 170.974 0 0 0 1.892 8.48c-3.28.932-6.445 1.924-9.474 2.98C17.309 83.498 0 98.307 0 113.668c0 15.865 18.582 31.778 46.812 41.427a145.52 145.52 0 0 0 6.921 2.165a167.467 167.467 0 0 0-2.01 9.138c-5.354 28.2-1.173 50.591 12.134 58.266c13.744 7.926 36.812-.22 59.273-19.855a145.567 145.567 0 0 0 5.342-4.923a168.064 168.064 0 0 0 6.92 6.314c21.758 18.722 43.246 26.282 56.54 18.586c13.731-7.949 18.194-32.003 12.4-61.268a145.016 145.016 0 0 0-1.535-6.842c1.62-.48 3.21-.974 4.76-1.488c29.348-9.723 48.443-25.443 48.443-41.52c0-15.417-17.868-30.326-45.517-39.844Zm-6.365 70.984c-1.4.463-2.836.91-4.3 1.345c-3.24-10.257-7.612-21.163-12.963-32.432c5.106-11 9.31-21.767 12.459-31.957c2.619.758 5.16 1.557 7.61 2.4c23.69 8.156 38.14 20.213 38.14 29.504c0 9.896-15.606 22.743-40.946 31.14Zm-10.514 20.834c2.562 12.94 2.927 24.64 1.23 33.787c-1.524 8.219-4.59 13.698-8.382 15.893c-8.067 4.67-25.32-1.4-43.927-17.412a156.726 156.726 0 0 1-6.437-5.87c7.214-7.889 14.423-17.06 21.459-27.246c12.376-1.098 24.068-2.894 34.671-5.345a134.17 134.17 0 0 1 1.386 6.193ZM87.276 214.515c-7.882 2.783-14.16 2.863-17.955.675c-8.075-4.657-11.432-22.636-6.853-46.752a156.923 156.923 0 0 1 1.869-8.499c10.486 2.32 22.093 3.988 34.498 4.994c7.084 9.967 14.501 19.128 21.976 27.15a134.668 134.668 0 0 1-4.877 4.492c-9.933 8.682-19.886 14.842-28.658 17.94ZM50.35 144.747c-12.483-4.267-22.792-9.812-29.858-15.863c-6.35-5.437-9.555-10.836-9.555-15.216c0-9.322 13.897-21.212 37.076-29.293c2.813-.98 5.757-1.905 8.812-2.773c3.204 10.42 7.406 21.315 12.477 32.332c-5.137 11.18-9.399 22.249-12.634 32.792a134.718 134.718 0 0 1-6.318-1.979Zm12.378-84.26c-4.811-24.587-1.616-43.134 6.425-47.789c8.564-4.958 27.502 2.111 47.463 19.835a144.318 144.318 0 0 1 3.841 3.545c-7.438 7.987-14.787 17.08-21.808 26.988c-12.04 1.116-23.565 2.908-34.161 5.309a160.342 160.342 0 0 1-1.76-7.887Zm110.427 27.268a347.8 347.8 0 0 0-7.785-12.803c8.168 1.033 15.994 2.404 23.343 4.08c-2.206 7.072-4.956 14.465-8.193 22.045a381.151 381.151 0 0 0-7.365-13.322Zm-45.032-43.861c5.044 5.465 10.096 11.566 15.065 18.186a322.04 322.04 0 0 0-30.257-.006c4.974-6.559 10.069-12.652 15.192-18.18ZM82.802 87.83a323.167 323.167 0 0 0-7.227 13.238c-3.184-7.553-5.909-14.98-8.134-22.152c7.304-1.634 15.093-2.97 23.209-3.984a321.524 321.524 0 0 0-7.848 12.897Zm8.081 65.352c-8.385-.936-16.291-2.203-23.593-3.793c2.26-7.3 5.045-14.885 8.298-22.6a321.187 321.187 0 0 0 7.257 13.246c2.594 4.48 5.28 8.868 8.038 13.147Zm37.542 31.03c-5.184-5.592-10.354-11.779-15.403-18.433c4.902.192 9.899.29 14.978.29c5.218 0 10.376-.117 15.453-.343c-4.985 6.774-10.018 12.97-15.028 18.486Zm52.198-57.817c3.422 7.8 6.306 15.345 8.596 22.52c-7.422 1.694-15.436 3.058-23.88 4.071a382.417 382.417 0 0 0 7.859-13.026a347.403 347.403 0 0 0 7.425-13.565Zm-16.898 8.101a358.557 358.557 0 0 1-12.281 19.815a329.4 329.4 0 0 1-23.444.823c-7.967 0-15.716-.248-23.178-.732a310.202 310.202 0 0 1-12.513-19.846h.001a307.41 307.41 0 0 1-10.923-20.627a310.278 310.278 0 0 1 10.89-20.637l-.001.001a307.318 307.318 0 0 1 12.413-19.761c7.613-.576 15.42-.876 23.31-.876H128c7.926 0 15.743.303 23.354.883a329.357 329.357 0 0 1 12.335 19.695a358.489 358.489 0 0 1 11.036 20.54a329.472 329.472 0 0 1-11 20.722Zm22.56-122.124c8.572 4.944 11.906 24.881 6.52 51.026c-.344 1.668-.73 3.367-1.15 5.09c-10.622-2.452-22.155-4.275-34.23-5.408c-7.034-10.017-14.323-19.124-21.64-27.008a160.789 160.789 0 0 1 5.888-5.4c18.9-16.447 36.564-22.941 44.612-18.3ZM128 90.808c12.625 0 22.86 10.235 22.86 22.86s-10.235 22.86-22.86 22.86s-22.86-10.235-22.86-22.86s10.235-22.86 22.86-22.86Z"></path></svg>
|
||||||
|
After Width: | Height: | Size: 4.0 KiB |
456
frontend/src/components/ContactDetail.tsx
Normal file
456
frontend/src/components/ContactDetail.tsx
Normal file
@@ -0,0 +1,456 @@
|
|||||||
|
import { useEffect, useState } from "react";
|
||||||
|
import { Link, useParams } from "react-router-dom";
|
||||||
|
import { api } from "../api/client";
|
||||||
|
import type { Contact, ContactListItem, Need, RelationshipTypeValue } from "../types";
|
||||||
|
import { RELATIONSHIP_TYPES } from "../types";
|
||||||
|
|
||||||
|
export function ContactDetail() {
|
||||||
|
const { id } = useParams<{ id: string }>();
|
||||||
|
const [contact, setContact] = useState<Contact | null>(null);
|
||||||
|
const [allNeeds, setAllNeeds] = useState<Need[]>([]);
|
||||||
|
const [allContacts, setAllContacts] = useState<ContactListItem[]>([]);
|
||||||
|
const [loading, setLoading] = useState(true);
|
||||||
|
const [error, setError] = useState<string | null>(null);
|
||||||
|
|
||||||
|
const [newNeedId, setNewNeedId] = useState<number | "">("");
|
||||||
|
const [newRelContactId, setNewRelContactId] = useState<number | "">("");
|
||||||
|
const [newRelType, setNewRelType] = useState<RelationshipTypeValue | "">("");
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (!id) return;
|
||||||
|
Promise.all([
|
||||||
|
api.contacts.get(Number(id)),
|
||||||
|
api.needs.list(),
|
||||||
|
api.contacts.list(),
|
||||||
|
])
|
||||||
|
.then(([c, n, contacts]) => {
|
||||||
|
setContact(c);
|
||||||
|
setAllNeeds(n);
|
||||||
|
setAllContacts(contacts.filter((ct) => ct.id !== Number(id)));
|
||||||
|
})
|
||||||
|
.catch((err) => setError(err.message))
|
||||||
|
.finally(() => setLoading(false));
|
||||||
|
}, [id]);
|
||||||
|
|
||||||
|
const handleAddNeed = async () => {
|
||||||
|
if (!contact || newNeedId === "") return;
|
||||||
|
try {
|
||||||
|
await api.contacts.addNeed(contact.id, Number(newNeedId));
|
||||||
|
const updated = await api.contacts.get(contact.id);
|
||||||
|
setContact(updated);
|
||||||
|
setNewNeedId("");
|
||||||
|
} catch (err) {
|
||||||
|
setError(err instanceof Error ? err.message : "Failed to add need");
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleRemoveNeed = async (needId: number) => {
|
||||||
|
if (!contact) return;
|
||||||
|
try {
|
||||||
|
await api.contacts.removeNeed(contact.id, needId);
|
||||||
|
const updated = await api.contacts.get(contact.id);
|
||||||
|
setContact(updated);
|
||||||
|
} catch (err) {
|
||||||
|
setError(err instanceof Error ? err.message : "Failed to remove need");
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleAddRelationship = async () => {
|
||||||
|
if (!contact || newRelContactId === "" || newRelType === "") return;
|
||||||
|
try {
|
||||||
|
await api.contacts.addRelationship(contact.id, {
|
||||||
|
related_contact_id: Number(newRelContactId),
|
||||||
|
relationship_type: newRelType,
|
||||||
|
});
|
||||||
|
const updated = await api.contacts.get(contact.id);
|
||||||
|
setContact(updated);
|
||||||
|
setNewRelContactId("");
|
||||||
|
setNewRelType("");
|
||||||
|
} catch (err) {
|
||||||
|
setError(
|
||||||
|
err instanceof Error ? err.message : "Failed to add relationship"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleRemoveRelationship = async (relatedContactId: number) => {
|
||||||
|
if (!contact) return;
|
||||||
|
try {
|
||||||
|
await api.contacts.removeRelationship(contact.id, relatedContactId);
|
||||||
|
const updated = await api.contacts.get(contact.id);
|
||||||
|
setContact(updated);
|
||||||
|
} catch (err) {
|
||||||
|
setError(
|
||||||
|
err instanceof Error ? err.message : "Failed to remove relationship"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleUpdateWeight = async (relatedContactId: number, newWeight: number) => {
|
||||||
|
if (!contact) return;
|
||||||
|
try {
|
||||||
|
await api.contacts.updateRelationship(contact.id, relatedContactId, {
|
||||||
|
closeness_weight: newWeight,
|
||||||
|
});
|
||||||
|
const updated = await api.contacts.get(contact.id);
|
||||||
|
setContact(updated);
|
||||||
|
} catch (err) {
|
||||||
|
setError(
|
||||||
|
err instanceof Error ? err.message : "Failed to update weight"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
if (loading) return <div>Loading...</div>;
|
||||||
|
if (error) return <div className="error">Error: {error}</div>;
|
||||||
|
if (!contact) return <div>Contact not found</div>;
|
||||||
|
|
||||||
|
const availableNeeds = allNeeds.filter(
|
||||||
|
(n) => !contact.needs.some((cn) => cn.id === n.id)
|
||||||
|
);
|
||||||
|
|
||||||
|
const getContactName = (contactId: number) => {
|
||||||
|
const c = allContacts.find((ct) => ct.id === contactId);
|
||||||
|
return c?.name || `Contact #${contactId}`;
|
||||||
|
};
|
||||||
|
|
||||||
|
const getRelationshipDisplayName = (type: string) => {
|
||||||
|
const rt = RELATIONSHIP_TYPES.find((r) => r.value === type);
|
||||||
|
return rt?.displayName || type;
|
||||||
|
};
|
||||||
|
|
||||||
|
// Group relationships by category for display
|
||||||
|
const groupRelationships = () => {
|
||||||
|
const familial: typeof contact.related_to = [];
|
||||||
|
const friends: typeof contact.related_to = [];
|
||||||
|
const partners: typeof contact.related_to = [];
|
||||||
|
const professional: typeof contact.related_to = [];
|
||||||
|
const other: typeof contact.related_to = [];
|
||||||
|
|
||||||
|
const familialTypes = ['parent', 'child', 'sibling', 'grandparent', 'grandchild', 'aunt_uncle', 'niece_nephew', 'cousin', 'in_law'];
|
||||||
|
const friendTypes = ['best_friend', 'close_friend', 'friend', 'acquaintance', 'neighbor'];
|
||||||
|
const partnerTypes = ['spouse', 'partner'];
|
||||||
|
const professionalTypes = ['mentor', 'mentee', 'business_partner', 'colleague', 'manager', 'direct_report', 'client'];
|
||||||
|
|
||||||
|
for (const rel of contact.related_to) {
|
||||||
|
if (familialTypes.includes(rel.relationship_type)) {
|
||||||
|
familial.push(rel);
|
||||||
|
} else if (friendTypes.includes(rel.relationship_type)) {
|
||||||
|
friends.push(rel);
|
||||||
|
} else if (partnerTypes.includes(rel.relationship_type)) {
|
||||||
|
partners.push(rel);
|
||||||
|
} else if (professionalTypes.includes(rel.relationship_type)) {
|
||||||
|
professional.push(rel);
|
||||||
|
} else {
|
||||||
|
other.push(rel);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return { familial, friends, partners, professional, other };
|
||||||
|
};
|
||||||
|
|
||||||
|
const relationshipGroups = groupRelationships();
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="id-card">
|
||||||
|
<div className="id-card-inner">
|
||||||
|
{/* Header with name and profile pic */}
|
||||||
|
<div className="id-card-header">
|
||||||
|
<div className="id-card-header-left">
|
||||||
|
<h1 className="id-card-title">I.D.: {contact.name}</h1>
|
||||||
|
</div>
|
||||||
|
<div className="id-card-header-right">
|
||||||
|
{contact.profile_pic ? (
|
||||||
|
<img
|
||||||
|
src={contact.profile_pic}
|
||||||
|
alt={`${contact.name}'s profile`}
|
||||||
|
className="id-profile-pic"
|
||||||
|
/>
|
||||||
|
) : (
|
||||||
|
<div className="id-profile-placeholder">
|
||||||
|
<span>{contact.name.charAt(0).toUpperCase()}</span>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
<div className="id-card-actions">
|
||||||
|
<Link to={`/contacts/${contact.id}/edit`} className="btn btn-small">
|
||||||
|
Edit
|
||||||
|
</Link>
|
||||||
|
<Link to="/contacts" className="btn btn-small">
|
||||||
|
Back
|
||||||
|
</Link>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="id-card-body">
|
||||||
|
{/* Left column - Basic info */}
|
||||||
|
<div className="id-card-left">
|
||||||
|
{contact.legal_name && (
|
||||||
|
<div className="id-field">Legal name: {contact.legal_name}</div>
|
||||||
|
)}
|
||||||
|
{contact.suffix && (
|
||||||
|
<div className="id-field">Suffix: {contact.suffix}</div>
|
||||||
|
)}
|
||||||
|
{contact.gender && (
|
||||||
|
<div className="id-field">Gender: {contact.gender}</div>
|
||||||
|
)}
|
||||||
|
{contact.age && (
|
||||||
|
<div className="id-field">Age: {contact.age}</div>
|
||||||
|
)}
|
||||||
|
{contact.current_job && (
|
||||||
|
<div className="id-field">Job: {contact.current_job}</div>
|
||||||
|
)}
|
||||||
|
{contact.social_structure_style && (
|
||||||
|
<div className="id-field">Social style: {contact.social_structure_style}</div>
|
||||||
|
)}
|
||||||
|
{contact.self_sufficiency_score !== null && (
|
||||||
|
<div className="id-field">Self-Sufficiency: {contact.self_sufficiency_score}</div>
|
||||||
|
)}
|
||||||
|
{contact.timezone && (
|
||||||
|
<div className="id-field">Timezone: {contact.timezone}</div>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{contact.safe_conversation_starters && (
|
||||||
|
<div className="id-field-block">
|
||||||
|
<span className="id-label">Safe con starters:</span> {contact.safe_conversation_starters}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{contact.topics_to_avoid && (
|
||||||
|
<div className="id-field-block">
|
||||||
|
<span className="id-label">Topics to avoid:</span> {contact.topics_to_avoid}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{contact.goals && (
|
||||||
|
<div className="id-field-block">
|
||||||
|
<span className="id-label">Goals:</span> {contact.goals}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Right column - Bio and Relationships */}
|
||||||
|
<div className="id-card-right">
|
||||||
|
{contact.bio && (
|
||||||
|
<div className="id-bio">
|
||||||
|
<span className="id-label">Bio:</span> {contact.bio}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
|
<div className="id-relationships">
|
||||||
|
<h2 className="id-section-title">Relationships</h2>
|
||||||
|
|
||||||
|
{relationshipGroups.familial.length > 0 && (
|
||||||
|
<div className="id-rel-group">
|
||||||
|
<span className="id-rel-label">Familial:</span>{" "}
|
||||||
|
{relationshipGroups.familial.map((rel, i) => (
|
||||||
|
<span key={rel.related_contact_id}>
|
||||||
|
<Link to={`/contacts/${rel.related_contact_id}`}>
|
||||||
|
{getContactName(rel.related_contact_id)}
|
||||||
|
</Link>
|
||||||
|
<span className="id-rel-type">({getRelationshipDisplayName(rel.relationship_type)})</span>
|
||||||
|
{i < relationshipGroups.familial.length - 1 && ", "}
|
||||||
|
</span>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{relationshipGroups.partners.length > 0 && (
|
||||||
|
<div className="id-rel-group">
|
||||||
|
<span className="id-rel-label">Partners:</span>{" "}
|
||||||
|
{relationshipGroups.partners.map((rel, i) => (
|
||||||
|
<span key={rel.related_contact_id}>
|
||||||
|
<Link to={`/contacts/${rel.related_contact_id}`}>
|
||||||
|
{getContactName(rel.related_contact_id)}
|
||||||
|
</Link>
|
||||||
|
{i < relationshipGroups.partners.length - 1 && ", "}
|
||||||
|
</span>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{relationshipGroups.friends.length > 0 && (
|
||||||
|
<div className="id-rel-group">
|
||||||
|
<span className="id-rel-label">Friends:</span>{" "}
|
||||||
|
{relationshipGroups.friends.map((rel, i) => (
|
||||||
|
<span key={rel.related_contact_id}>
|
||||||
|
<Link to={`/contacts/${rel.related_contact_id}`}>
|
||||||
|
{getContactName(rel.related_contact_id)}
|
||||||
|
</Link>
|
||||||
|
{i < relationshipGroups.friends.length - 1 && ", "}
|
||||||
|
</span>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{relationshipGroups.professional.length > 0 && (
|
||||||
|
<div className="id-rel-group">
|
||||||
|
<span className="id-rel-label">Professional:</span>{" "}
|
||||||
|
{relationshipGroups.professional.map((rel, i) => (
|
||||||
|
<span key={rel.related_contact_id}>
|
||||||
|
<Link to={`/contacts/${rel.related_contact_id}`}>
|
||||||
|
{getContactName(rel.related_contact_id)}
|
||||||
|
</Link>
|
||||||
|
<span className="id-rel-type">({getRelationshipDisplayName(rel.relationship_type)})</span>
|
||||||
|
{i < relationshipGroups.professional.length - 1 && ", "}
|
||||||
|
</span>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{relationshipGroups.other.length > 0 && (
|
||||||
|
<div className="id-rel-group">
|
||||||
|
<span className="id-rel-label">Other:</span>{" "}
|
||||||
|
{relationshipGroups.other.map((rel, i) => (
|
||||||
|
<span key={rel.related_contact_id}>
|
||||||
|
<Link to={`/contacts/${rel.related_contact_id}`}>
|
||||||
|
{getContactName(rel.related_contact_id)}
|
||||||
|
</Link>
|
||||||
|
<span className="id-rel-type">({getRelationshipDisplayName(rel.relationship_type)})</span>
|
||||||
|
{i < relationshipGroups.other.length - 1 && ", "}
|
||||||
|
</span>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{contact.related_from.length > 0 && (
|
||||||
|
<div className="id-rel-group">
|
||||||
|
<span className="id-rel-label">Known by:</span>{" "}
|
||||||
|
{contact.related_from.map((rel, i) => (
|
||||||
|
<span key={rel.contact_id}>
|
||||||
|
<Link to={`/contacts/${rel.contact_id}`}>
|
||||||
|
{getContactName(rel.contact_id)}
|
||||||
|
</Link>
|
||||||
|
{i < contact.related_from.length - 1 && ", "}
|
||||||
|
</span>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Needs/Warnings at bottom */}
|
||||||
|
{contact.needs.length > 0 && (
|
||||||
|
<div className="id-card-warnings">
|
||||||
|
{contact.needs.map((need) => (
|
||||||
|
<div key={need.id} className="id-warning">
|
||||||
|
<span className="warning-dot"></span>
|
||||||
|
Warning: {need.name}
|
||||||
|
{need.description && <span className="warning-desc"> - {need.description}</span>}
|
||||||
|
</div>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Management section (expandable) */}
|
||||||
|
<details className="id-card-manage">
|
||||||
|
<summary>Manage Contact</summary>
|
||||||
|
|
||||||
|
<div className="manage-section">
|
||||||
|
<h3>Manage Relationships</h3>
|
||||||
|
<div className="manage-relationships">
|
||||||
|
{contact.related_to.map((rel) => (
|
||||||
|
<div key={rel.related_contact_id} className="manage-rel-item">
|
||||||
|
<Link to={`/contacts/${rel.related_contact_id}`}>
|
||||||
|
{getContactName(rel.related_contact_id)}
|
||||||
|
</Link>
|
||||||
|
<span className="tag">{getRelationshipDisplayName(rel.relationship_type)}</span>
|
||||||
|
<label className="weight-control">
|
||||||
|
<span>Closeness:</span>
|
||||||
|
<input
|
||||||
|
type="range"
|
||||||
|
min="1"
|
||||||
|
max="10"
|
||||||
|
value={rel.closeness_weight}
|
||||||
|
onChange={(e) => handleUpdateWeight(rel.related_contact_id, Number(e.target.value))}
|
||||||
|
/>
|
||||||
|
<span className="weight-value">{rel.closeness_weight}</span>
|
||||||
|
</label>
|
||||||
|
<button
|
||||||
|
onClick={() => handleRemoveRelationship(rel.related_contact_id)}
|
||||||
|
className="btn btn-small btn-danger"
|
||||||
|
>
|
||||||
|
Remove
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{allContacts.length > 0 && (
|
||||||
|
<div className="add-form">
|
||||||
|
<select
|
||||||
|
value={newRelContactId}
|
||||||
|
onChange={(e) =>
|
||||||
|
setNewRelContactId(
|
||||||
|
e.target.value ? Number(e.target.value) : ""
|
||||||
|
)
|
||||||
|
}
|
||||||
|
>
|
||||||
|
<option value="">Select contact...</option>
|
||||||
|
{allContacts.map((c) => (
|
||||||
|
<option key={c.id} value={c.id}>
|
||||||
|
{c.name}
|
||||||
|
</option>
|
||||||
|
))}
|
||||||
|
</select>
|
||||||
|
<select
|
||||||
|
value={newRelType}
|
||||||
|
onChange={(e) => setNewRelType(e.target.value as RelationshipTypeValue | "")}
|
||||||
|
>
|
||||||
|
<option value="">Select relationship type...</option>
|
||||||
|
{RELATIONSHIP_TYPES.map((rt) => (
|
||||||
|
<option key={rt.value} value={rt.value}>
|
||||||
|
{rt.displayName}
|
||||||
|
</option>
|
||||||
|
))}
|
||||||
|
</select>
|
||||||
|
<button onClick={handleAddRelationship} className="btn btn-primary">
|
||||||
|
Add Relationship
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="manage-section">
|
||||||
|
<h3>Manage Needs/Warnings</h3>
|
||||||
|
<ul className="manage-needs-list">
|
||||||
|
{contact.needs.map((need) => (
|
||||||
|
<li key={need.id}>
|
||||||
|
<strong>{need.name}</strong>
|
||||||
|
{need.description && <span> - {need.description}</span>}
|
||||||
|
<button
|
||||||
|
onClick={() => handleRemoveNeed(need.id)}
|
||||||
|
className="btn btn-small btn-danger"
|
||||||
|
>
|
||||||
|
Remove
|
||||||
|
</button>
|
||||||
|
</li>
|
||||||
|
))}
|
||||||
|
</ul>
|
||||||
|
{availableNeeds.length > 0 && (
|
||||||
|
<div className="add-form">
|
||||||
|
<select
|
||||||
|
value={newNeedId}
|
||||||
|
onChange={(e) =>
|
||||||
|
setNewNeedId(e.target.value ? Number(e.target.value) : "")
|
||||||
|
}
|
||||||
|
>
|
||||||
|
<option value="">Select a need...</option>
|
||||||
|
{availableNeeds.map((n) => (
|
||||||
|
<option key={n.id} value={n.id}>
|
||||||
|
{n.name}
|
||||||
|
</option>
|
||||||
|
))}
|
||||||
|
</select>
|
||||||
|
<button onClick={handleAddNeed} className="btn btn-primary">
|
||||||
|
Add Need
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
</details>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
325
frontend/src/components/ContactForm.tsx
Normal file
325
frontend/src/components/ContactForm.tsx
Normal file
@@ -0,0 +1,325 @@
|
|||||||
|
import { useEffect, useState } from "react";
|
||||||
|
import { useNavigate, useParams } from "react-router-dom";
|
||||||
|
import { api } from "../api/client";
|
||||||
|
import type { ContactCreate, Need } from "../types";
|
||||||
|
|
||||||
|
export function ContactForm() {
|
||||||
|
const { id } = useParams<{ id: string }>();
|
||||||
|
const navigate = useNavigate();
|
||||||
|
const isEdit = Boolean(id);
|
||||||
|
|
||||||
|
const [allNeeds, setAllNeeds] = useState<Need[]>([]);
|
||||||
|
const [loading, setLoading] = useState(isEdit);
|
||||||
|
const [error, setError] = useState<string | null>(null);
|
||||||
|
const [submitting, setSubmitting] = useState(false);
|
||||||
|
|
||||||
|
const [form, setForm] = useState<ContactCreate>({
|
||||||
|
name: "",
|
||||||
|
age: null,
|
||||||
|
bio: null,
|
||||||
|
current_job: null,
|
||||||
|
gender: null,
|
||||||
|
goals: null,
|
||||||
|
legal_name: null,
|
||||||
|
profile_pic: null,
|
||||||
|
safe_conversation_starters: null,
|
||||||
|
self_sufficiency_score: null,
|
||||||
|
social_structure_style: null,
|
||||||
|
ssn: null,
|
||||||
|
suffix: null,
|
||||||
|
timezone: null,
|
||||||
|
topics_to_avoid: null,
|
||||||
|
need_ids: [],
|
||||||
|
});
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
const loadData = async () => {
|
||||||
|
try {
|
||||||
|
const needs = await api.needs.list();
|
||||||
|
setAllNeeds(needs);
|
||||||
|
|
||||||
|
if (id) {
|
||||||
|
const contact = await api.contacts.get(Number(id));
|
||||||
|
setForm({
|
||||||
|
name: contact.name,
|
||||||
|
age: contact.age,
|
||||||
|
bio: contact.bio,
|
||||||
|
current_job: contact.current_job,
|
||||||
|
gender: contact.gender,
|
||||||
|
goals: contact.goals,
|
||||||
|
legal_name: contact.legal_name,
|
||||||
|
profile_pic: contact.profile_pic,
|
||||||
|
safe_conversation_starters: contact.safe_conversation_starters,
|
||||||
|
self_sufficiency_score: contact.self_sufficiency_score,
|
||||||
|
social_structure_style: contact.social_structure_style,
|
||||||
|
ssn: contact.ssn,
|
||||||
|
suffix: contact.suffix,
|
||||||
|
timezone: contact.timezone,
|
||||||
|
topics_to_avoid: contact.topics_to_avoid,
|
||||||
|
need_ids: contact.needs.map((n) => n.id),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
} catch (err) {
|
||||||
|
setError(err instanceof Error ? err.message : "Failed to load data");
|
||||||
|
} finally {
|
||||||
|
setLoading(false);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
loadData();
|
||||||
|
}, [id]);
|
||||||
|
|
||||||
|
const handleSubmit = async (e: React.FormEvent) => {
|
||||||
|
e.preventDefault();
|
||||||
|
setSubmitting(true);
|
||||||
|
setError(null);
|
||||||
|
|
||||||
|
try {
|
||||||
|
if (isEdit) {
|
||||||
|
await api.contacts.update(Number(id), form);
|
||||||
|
navigate(`/contacts/${id}`);
|
||||||
|
} else {
|
||||||
|
const created = await api.contacts.create(form);
|
||||||
|
navigate(`/contacts/${created.id}`);
|
||||||
|
}
|
||||||
|
} catch (err) {
|
||||||
|
setError(err instanceof Error ? err.message : "Save failed");
|
||||||
|
setSubmitting(false);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const updateField = <K extends keyof ContactCreate>(
|
||||||
|
field: K,
|
||||||
|
value: ContactCreate[K]
|
||||||
|
) => {
|
||||||
|
setForm((prev) => ({ ...prev, [field]: value }));
|
||||||
|
};
|
||||||
|
|
||||||
|
const toggleNeed = (needId: number) => {
|
||||||
|
setForm((prev) => ({
|
||||||
|
...prev,
|
||||||
|
need_ids: prev.need_ids?.includes(needId)
|
||||||
|
? prev.need_ids.filter((id) => id !== needId)
|
||||||
|
: [...(prev.need_ids || []), needId],
|
||||||
|
}));
|
||||||
|
};
|
||||||
|
|
||||||
|
if (loading) return <div>Loading...</div>;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="contact-form">
|
||||||
|
<h1>{isEdit ? "Edit Contact" : "New Contact"}</h1>
|
||||||
|
|
||||||
|
{error && <div className="error">{error}</div>}
|
||||||
|
|
||||||
|
<form onSubmit={handleSubmit}>
|
||||||
|
<div className="form-group">
|
||||||
|
<label htmlFor="name">Name *</label>
|
||||||
|
<input
|
||||||
|
id="name"
|
||||||
|
type="text"
|
||||||
|
value={form.name}
|
||||||
|
onChange={(e) => updateField("name", e.target.value)}
|
||||||
|
required
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="form-row">
|
||||||
|
<div className="form-group">
|
||||||
|
<label htmlFor="legal_name">Legal Name</label>
|
||||||
|
<input
|
||||||
|
id="legal_name"
|
||||||
|
type="text"
|
||||||
|
value={form.legal_name || ""}
|
||||||
|
onChange={(e) =>
|
||||||
|
updateField("legal_name", e.target.value || null)
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<div className="form-group">
|
||||||
|
<label htmlFor="suffix">Suffix</label>
|
||||||
|
<input
|
||||||
|
id="suffix"
|
||||||
|
type="text"
|
||||||
|
value={form.suffix || ""}
|
||||||
|
onChange={(e) => updateField("suffix", e.target.value || null)}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="form-row">
|
||||||
|
<div className="form-group">
|
||||||
|
<label htmlFor="age">Age</label>
|
||||||
|
<input
|
||||||
|
id="age"
|
||||||
|
type="number"
|
||||||
|
value={form.age ?? ""}
|
||||||
|
onChange={(e) =>
|
||||||
|
updateField("age", e.target.value ? Number(e.target.value) : null)
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<div className="form-group">
|
||||||
|
<label htmlFor="gender">Gender</label>
|
||||||
|
<input
|
||||||
|
id="gender"
|
||||||
|
type="text"
|
||||||
|
value={form.gender || ""}
|
||||||
|
onChange={(e) => updateField("gender", e.target.value || null)}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="form-group">
|
||||||
|
<label htmlFor="current_job">Current Job</label>
|
||||||
|
<input
|
||||||
|
id="current_job"
|
||||||
|
type="text"
|
||||||
|
value={form.current_job || ""}
|
||||||
|
onChange={(e) =>
|
||||||
|
updateField("current_job", e.target.value || null)
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="form-group">
|
||||||
|
<label htmlFor="timezone">Timezone</label>
|
||||||
|
<input
|
||||||
|
id="timezone"
|
||||||
|
type="text"
|
||||||
|
value={form.timezone || ""}
|
||||||
|
onChange={(e) => updateField("timezone", e.target.value || null)}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="form-group">
|
||||||
|
<label htmlFor="profile_pic">Profile Picture URL</label>
|
||||||
|
<input
|
||||||
|
id="profile_pic"
|
||||||
|
type="url"
|
||||||
|
placeholder="https://example.com/photo.jpg"
|
||||||
|
value={form.profile_pic || ""}
|
||||||
|
onChange={(e) => updateField("profile_pic", e.target.value || null)}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="form-group">
|
||||||
|
<label htmlFor="bio">Bio</label>
|
||||||
|
<textarea
|
||||||
|
id="bio"
|
||||||
|
value={form.bio || ""}
|
||||||
|
onChange={(e) => updateField("bio", e.target.value || null)}
|
||||||
|
rows={3}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="form-group">
|
||||||
|
<label htmlFor="goals">Goals</label>
|
||||||
|
<textarea
|
||||||
|
id="goals"
|
||||||
|
value={form.goals || ""}
|
||||||
|
onChange={(e) => updateField("goals", e.target.value || null)}
|
||||||
|
rows={3}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="form-group">
|
||||||
|
<label htmlFor="social_structure_style">Social Structure Style</label>
|
||||||
|
<input
|
||||||
|
id="social_structure_style"
|
||||||
|
type="text"
|
||||||
|
value={form.social_structure_style || ""}
|
||||||
|
onChange={(e) =>
|
||||||
|
updateField("social_structure_style", e.target.value || null)
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="form-group">
|
||||||
|
<label htmlFor="self_sufficiency_score">
|
||||||
|
Self-Sufficiency Score (1-10)
|
||||||
|
</label>
|
||||||
|
<input
|
||||||
|
id="self_sufficiency_score"
|
||||||
|
type="number"
|
||||||
|
min="1"
|
||||||
|
max="10"
|
||||||
|
value={form.self_sufficiency_score ?? ""}
|
||||||
|
onChange={(e) =>
|
||||||
|
updateField(
|
||||||
|
"self_sufficiency_score",
|
||||||
|
e.target.value ? Number(e.target.value) : null
|
||||||
|
)
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="form-group">
|
||||||
|
<label htmlFor="safe_conversation_starters">
|
||||||
|
Safe Conversation Starters
|
||||||
|
</label>
|
||||||
|
<textarea
|
||||||
|
id="safe_conversation_starters"
|
||||||
|
value={form.safe_conversation_starters || ""}
|
||||||
|
onChange={(e) =>
|
||||||
|
updateField("safe_conversation_starters", e.target.value || null)
|
||||||
|
}
|
||||||
|
rows={2}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="form-group">
|
||||||
|
<label htmlFor="topics_to_avoid">Topics to Avoid</label>
|
||||||
|
<textarea
|
||||||
|
id="topics_to_avoid"
|
||||||
|
value={form.topics_to_avoid || ""}
|
||||||
|
onChange={(e) =>
|
||||||
|
updateField("topics_to_avoid", e.target.value || null)
|
||||||
|
}
|
||||||
|
rows={2}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="form-group">
|
||||||
|
<label htmlFor="ssn">SSN</label>
|
||||||
|
<input
|
||||||
|
id="ssn"
|
||||||
|
type="text"
|
||||||
|
value={form.ssn || ""}
|
||||||
|
onChange={(e) => updateField("ssn", e.target.value || null)}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{allNeeds.length > 0 && (
|
||||||
|
<div className="form-group">
|
||||||
|
<label>Needs/Accommodations</label>
|
||||||
|
<div className="checkbox-group">
|
||||||
|
{allNeeds.map((need) => (
|
||||||
|
<label key={need.id} className="checkbox-label">
|
||||||
|
<input
|
||||||
|
type="checkbox"
|
||||||
|
checked={form.need_ids?.includes(need.id) || false}
|
||||||
|
onChange={() => toggleNeed(need.id)}
|
||||||
|
/>
|
||||||
|
{need.name}
|
||||||
|
</label>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
|
<div className="form-actions">
|
||||||
|
<button type="submit" className="btn btn-primary" disabled={submitting}>
|
||||||
|
{submitting ? "Saving..." : "Save"}
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
className="btn"
|
||||||
|
onClick={() => navigate(isEdit ? `/contacts/${id}` : "/contacts")}
|
||||||
|
>
|
||||||
|
Cancel
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
79
frontend/src/components/ContactList.tsx
Normal file
79
frontend/src/components/ContactList.tsx
Normal file
@@ -0,0 +1,79 @@
|
|||||||
|
import { useEffect, useState } from "react";
|
||||||
|
import { Link } from "react-router-dom";
|
||||||
|
import { api } from "../api/client";
|
||||||
|
import type { ContactListItem } from "../types";
|
||||||
|
|
||||||
|
export function ContactList() {
|
||||||
|
const [contacts, setContacts] = useState<ContactListItem[]>([]);
|
||||||
|
const [loading, setLoading] = useState(true);
|
||||||
|
const [error, setError] = useState<string | null>(null);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
api.contacts
|
||||||
|
.list()
|
||||||
|
.then(setContacts)
|
||||||
|
.catch((err) => setError(err.message))
|
||||||
|
.finally(() => setLoading(false));
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
const handleDelete = async (id: number) => {
|
||||||
|
if (!confirm("Delete this contact?")) return;
|
||||||
|
try {
|
||||||
|
await api.contacts.delete(id);
|
||||||
|
setContacts((prev) => prev.filter((c) => c.id !== id));
|
||||||
|
} catch (err) {
|
||||||
|
setError(err instanceof Error ? err.message : "Delete failed");
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
if (loading) return <div>Loading...</div>;
|
||||||
|
if (error) return <div className="error">Error: {error}</div>;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="contact-list">
|
||||||
|
<div className="header">
|
||||||
|
<h1>Contacts</h1>
|
||||||
|
<Link to="/contacts/new" className="btn btn-primary">
|
||||||
|
Add Contact
|
||||||
|
</Link>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{contacts.length === 0 ? (
|
||||||
|
<p>No contacts yet.</p>
|
||||||
|
) : (
|
||||||
|
<table>
|
||||||
|
<thead>
|
||||||
|
<tr>
|
||||||
|
<th>Name</th>
|
||||||
|
<th>Job</th>
|
||||||
|
<th>Timezone</th>
|
||||||
|
<th>Actions</th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
|
{contacts.map((contact) => (
|
||||||
|
<tr key={contact.id}>
|
||||||
|
<td>
|
||||||
|
<Link to={`/contacts/${contact.id}`}>{contact.name}</Link>
|
||||||
|
</td>
|
||||||
|
<td>{contact.current_job || "-"}</td>
|
||||||
|
<td>{contact.timezone || "-"}</td>
|
||||||
|
<td>
|
||||||
|
<Link to={`/contacts/${contact.id}/edit`} className="btn">
|
||||||
|
Edit
|
||||||
|
</Link>
|
||||||
|
<button
|
||||||
|
onClick={() => handleDelete(contact.id)}
|
||||||
|
className="btn btn-danger"
|
||||||
|
>
|
||||||
|
Delete
|
||||||
|
</button>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
))}
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
117
frontend/src/components/NeedList.tsx
Normal file
117
frontend/src/components/NeedList.tsx
Normal file
@@ -0,0 +1,117 @@
|
|||||||
|
import { useEffect, useState } from "react";
|
||||||
|
import { api } from "../api/client";
|
||||||
|
import type { Need, NeedCreate } from "../types";
|
||||||
|
|
||||||
|
export function NeedList() {
|
||||||
|
const [needs, setNeeds] = useState<Need[]>([]);
|
||||||
|
const [loading, setLoading] = useState(true);
|
||||||
|
const [error, setError] = useState<string | null>(null);
|
||||||
|
const [showForm, setShowForm] = useState(false);
|
||||||
|
const [form, setForm] = useState<NeedCreate>({ name: "", description: null });
|
||||||
|
const [submitting, setSubmitting] = useState(false);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
api.needs
|
||||||
|
.list()
|
||||||
|
.then(setNeeds)
|
||||||
|
.catch((err) => setError(err.message))
|
||||||
|
.finally(() => setLoading(false));
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
const handleSubmit = async (e: React.FormEvent) => {
|
||||||
|
e.preventDefault();
|
||||||
|
if (!form.name.trim()) return;
|
||||||
|
|
||||||
|
setSubmitting(true);
|
||||||
|
try {
|
||||||
|
const created = await api.needs.create(form);
|
||||||
|
setNeeds((prev) => [...prev, created]);
|
||||||
|
setForm({ name: "", description: null });
|
||||||
|
setShowForm(false);
|
||||||
|
} catch (err) {
|
||||||
|
setError(err instanceof Error ? err.message : "Create failed");
|
||||||
|
} finally {
|
||||||
|
setSubmitting(false);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleDelete = async (id: number) => {
|
||||||
|
if (!confirm("Delete this need?")) return;
|
||||||
|
try {
|
||||||
|
await api.needs.delete(id);
|
||||||
|
setNeeds((prev) => prev.filter((n) => n.id !== id));
|
||||||
|
} catch (err) {
|
||||||
|
setError(err instanceof Error ? err.message : "Delete failed");
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
if (loading) return <div>Loading...</div>;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="need-list">
|
||||||
|
<div className="header">
|
||||||
|
<h1>Needs / Accommodations</h1>
|
||||||
|
<button
|
||||||
|
onClick={() => setShowForm(!showForm)}
|
||||||
|
className="btn btn-primary"
|
||||||
|
>
|
||||||
|
{showForm ? "Cancel" : "Add Need"}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{error && <div className="error">{error}</div>}
|
||||||
|
|
||||||
|
{showForm && (
|
||||||
|
<form onSubmit={handleSubmit} className="need-form">
|
||||||
|
<div className="form-group">
|
||||||
|
<label htmlFor="name">Name *</label>
|
||||||
|
<input
|
||||||
|
id="name"
|
||||||
|
type="text"
|
||||||
|
value={form.name}
|
||||||
|
onChange={(e) => setForm({ ...form, name: e.target.value })}
|
||||||
|
placeholder="e.g., Light Sensitive, ADHD"
|
||||||
|
required
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<div className="form-group">
|
||||||
|
<label htmlFor="description">Description</label>
|
||||||
|
<textarea
|
||||||
|
id="description"
|
||||||
|
value={form.description || ""}
|
||||||
|
onChange={(e) =>
|
||||||
|
setForm({ ...form, description: e.target.value || null })
|
||||||
|
}
|
||||||
|
placeholder="Optional description..."
|
||||||
|
rows={2}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<button type="submit" className="btn btn-primary" disabled={submitting}>
|
||||||
|
{submitting ? "Creating..." : "Create"}
|
||||||
|
</button>
|
||||||
|
</form>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{needs.length === 0 ? (
|
||||||
|
<p>No needs defined yet.</p>
|
||||||
|
) : (
|
||||||
|
<ul className="need-items">
|
||||||
|
{needs.map((need) => (
|
||||||
|
<li key={need.id}>
|
||||||
|
<div className="need-info">
|
||||||
|
<strong>{need.name}</strong>
|
||||||
|
{need.description && <p>{need.description}</p>}
|
||||||
|
</div>
|
||||||
|
<button
|
||||||
|
onClick={() => handleDelete(need.id)}
|
||||||
|
className="btn btn-danger"
|
||||||
|
>
|
||||||
|
Delete
|
||||||
|
</button>
|
||||||
|
</li>
|
||||||
|
))}
|
||||||
|
</ul>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
330
frontend/src/components/RelationshipGraph.tsx
Normal file
330
frontend/src/components/RelationshipGraph.tsx
Normal file
@@ -0,0 +1,330 @@
|
|||||||
|
import { useEffect, useRef, useState } from "react";
|
||||||
|
import { api } from "../api/client";
|
||||||
|
import type { GraphData, GraphEdge, GraphNode } from "../types";
|
||||||
|
import { RELATIONSHIP_TYPES } from "../types";
|
||||||
|
|
||||||
|
interface SimNode extends GraphNode {
|
||||||
|
x: number;
|
||||||
|
y: number;
|
||||||
|
vx: number;
|
||||||
|
vy: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
interface SimEdge extends GraphEdge {
|
||||||
|
sourceNode: SimNode;
|
||||||
|
targetNode: SimNode;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function RelationshipGraph() {
|
||||||
|
const canvasRef = useRef<HTMLCanvasElement>(null);
|
||||||
|
const [data, setData] = useState<GraphData | null>(null);
|
||||||
|
const [error, setError] = useState<string | null>(null);
|
||||||
|
const [loading, setLoading] = useState(true);
|
||||||
|
const [selectedNode, setSelectedNode] = useState<SimNode | null>(null);
|
||||||
|
const nodesRef = useRef<SimNode[]>([]);
|
||||||
|
const edgesRef = useRef<SimEdge[]>([]);
|
||||||
|
const dragNodeRef = useRef<SimNode | null>(null);
|
||||||
|
const animationRef = useRef<number>(0);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
api.graph.get()
|
||||||
|
.then(setData)
|
||||||
|
.catch((err) => setError(err.message))
|
||||||
|
.finally(() => setLoading(false));
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (!data || !canvasRef.current) return;
|
||||||
|
|
||||||
|
const canvas = canvasRef.current;
|
||||||
|
const maybeCtx = canvas.getContext("2d");
|
||||||
|
if (!maybeCtx) return;
|
||||||
|
const ctx: CanvasRenderingContext2D = maybeCtx;
|
||||||
|
|
||||||
|
const width = canvas.width;
|
||||||
|
const height = canvas.height;
|
||||||
|
const centerX = width / 2;
|
||||||
|
const centerY = height / 2;
|
||||||
|
|
||||||
|
// Initialize nodes with random positions
|
||||||
|
const nodes: SimNode[] = data.nodes.map((node) => ({
|
||||||
|
...node,
|
||||||
|
x: centerX + (Math.random() - 0.5) * 300,
|
||||||
|
y: centerY + (Math.random() - 0.5) * 300,
|
||||||
|
vx: 0,
|
||||||
|
vy: 0,
|
||||||
|
}));
|
||||||
|
nodesRef.current = nodes;
|
||||||
|
|
||||||
|
const nodeMap = new Map(nodes.map((n) => [n.id, n]));
|
||||||
|
|
||||||
|
// Create edges with node references
|
||||||
|
const edges: SimEdge[] = data.edges
|
||||||
|
.map((edge) => {
|
||||||
|
const sourceNode = nodeMap.get(edge.source);
|
||||||
|
const targetNode = nodeMap.get(edge.target);
|
||||||
|
if (!sourceNode || !targetNode) return null;
|
||||||
|
return { ...edge, sourceNode, targetNode };
|
||||||
|
})
|
||||||
|
.filter((e): e is SimEdge => e !== null);
|
||||||
|
edgesRef.current = edges;
|
||||||
|
|
||||||
|
// Force simulation parameters
|
||||||
|
const repulsion = 5000;
|
||||||
|
const springStrength = 0.05;
|
||||||
|
const baseSpringLength = 150;
|
||||||
|
const damping = 0.9;
|
||||||
|
const centerPull = 0.01;
|
||||||
|
|
||||||
|
function simulate() {
|
||||||
|
const nodes = nodesRef.current;
|
||||||
|
const edges = edgesRef.current;
|
||||||
|
|
||||||
|
// Reset forces
|
||||||
|
for (const node of nodes) {
|
||||||
|
node.vx = 0;
|
||||||
|
node.vy = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Repulsion between all nodes
|
||||||
|
for (let i = 0; i < nodes.length; i++) {
|
||||||
|
for (let j = i + 1; j < nodes.length; j++) {
|
||||||
|
const dx = nodes[j].x - nodes[i].x;
|
||||||
|
const dy = nodes[j].y - nodes[i].y;
|
||||||
|
const dist = Math.sqrt(dx * dx + dy * dy) || 1;
|
||||||
|
const force = repulsion / (dist * dist);
|
||||||
|
const fx = (dx / dist) * force;
|
||||||
|
const fy = (dy / dist) * force;
|
||||||
|
nodes[i].vx -= fx;
|
||||||
|
nodes[i].vy -= fy;
|
||||||
|
nodes[j].vx += fx;
|
||||||
|
nodes[j].vy += fy;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Spring forces for edges - closer relationships = shorter springs
|
||||||
|
// Weight is 1-10, normalize to 0-1 for calculations
|
||||||
|
for (const edge of edges) {
|
||||||
|
const dx = edge.targetNode.x - edge.sourceNode.x;
|
||||||
|
const dy = edge.targetNode.y - edge.sourceNode.y;
|
||||||
|
const dist = Math.sqrt(dx * dx + dy * dy) || 1;
|
||||||
|
// Higher weight (1-10) = shorter ideal length
|
||||||
|
// Normalize: weight 10 -> 0.5x length, weight 1 -> 1.4x length
|
||||||
|
const normalizedWeight = edge.closeness_weight / 10;
|
||||||
|
const idealLength = baseSpringLength * (1.5 - normalizedWeight);
|
||||||
|
const displacement = dist - idealLength;
|
||||||
|
const force = springStrength * displacement;
|
||||||
|
const fx = (dx / dist) * force;
|
||||||
|
const fy = (dy / dist) * force;
|
||||||
|
edge.sourceNode.vx += fx;
|
||||||
|
edge.sourceNode.vy += fy;
|
||||||
|
edge.targetNode.vx -= fx;
|
||||||
|
edge.targetNode.vy -= fy;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Pull toward center
|
||||||
|
for (const node of nodes) {
|
||||||
|
node.vx += (centerX - node.x) * centerPull;
|
||||||
|
node.vy += (centerY - node.y) * centerPull;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Apply velocities with damping (skip dragged node)
|
||||||
|
for (const node of nodes) {
|
||||||
|
if (node === dragNodeRef.current) continue;
|
||||||
|
node.x += node.vx * damping;
|
||||||
|
node.y += node.vy * damping;
|
||||||
|
// Keep within bounds
|
||||||
|
node.x = Math.max(30, Math.min(width - 30, node.x));
|
||||||
|
node.y = Math.max(30, Math.min(height - 30, node.y));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function getEdgeColor(weight: number): string {
|
||||||
|
// Interpolate from light gray (distant) to dark blue (close)
|
||||||
|
// weight is 1-10, normalize to 0-1
|
||||||
|
const normalized = weight / 10;
|
||||||
|
const hue = 220;
|
||||||
|
const saturation = 70;
|
||||||
|
const lightness = 80 - normalized * 40;
|
||||||
|
return `hsl(${hue}, ${saturation}%, ${lightness}%)`;
|
||||||
|
}
|
||||||
|
|
||||||
|
function draw(context: CanvasRenderingContext2D) {
|
||||||
|
const nodes = nodesRef.current;
|
||||||
|
const edges = edgesRef.current;
|
||||||
|
|
||||||
|
context.clearRect(0, 0, width, height);
|
||||||
|
|
||||||
|
// Draw edges
|
||||||
|
for (const edge of edges) {
|
||||||
|
// Weight is 1-10, scale line width accordingly
|
||||||
|
const lineWidth = 1 + (edge.closeness_weight / 10) * 3;
|
||||||
|
context.strokeStyle = getEdgeColor(edge.closeness_weight);
|
||||||
|
context.lineWidth = lineWidth;
|
||||||
|
context.beginPath();
|
||||||
|
context.moveTo(edge.sourceNode.x, edge.sourceNode.y);
|
||||||
|
context.lineTo(edge.targetNode.x, edge.targetNode.y);
|
||||||
|
context.stroke();
|
||||||
|
|
||||||
|
// Draw relationship type label at midpoint
|
||||||
|
const midX = (edge.sourceNode.x + edge.targetNode.x) / 2;
|
||||||
|
const midY = (edge.sourceNode.y + edge.targetNode.y) / 2;
|
||||||
|
context.fillStyle = "#666";
|
||||||
|
context.font = "10px sans-serif";
|
||||||
|
context.textAlign = "center";
|
||||||
|
const typeInfo = RELATIONSHIP_TYPES.find(t => t.value === edge.relationship_type);
|
||||||
|
const label = typeInfo?.displayName || edge.relationship_type;
|
||||||
|
context.fillText(label, midX, midY - 5);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Draw nodes
|
||||||
|
for (const node of nodes) {
|
||||||
|
const isSelected = node === selectedNode;
|
||||||
|
const radius = isSelected ? 25 : 20;
|
||||||
|
|
||||||
|
// Node circle
|
||||||
|
context.beginPath();
|
||||||
|
context.arc(node.x, node.y, radius, 0, Math.PI * 2);
|
||||||
|
context.fillStyle = isSelected ? "#0066cc" : "#fff";
|
||||||
|
context.fill();
|
||||||
|
context.strokeStyle = "#0066cc";
|
||||||
|
context.lineWidth = 2;
|
||||||
|
context.stroke();
|
||||||
|
|
||||||
|
// Node label
|
||||||
|
context.fillStyle = isSelected ? "#fff" : "#333";
|
||||||
|
context.font = "12px sans-serif";
|
||||||
|
context.textAlign = "center";
|
||||||
|
context.textBaseline = "middle";
|
||||||
|
const name = node.name.length > 10 ? node.name.slice(0, 9) + "…" : node.name;
|
||||||
|
context.fillText(name, node.x, node.y);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function animate() {
|
||||||
|
simulate();
|
||||||
|
draw(ctx);
|
||||||
|
animationRef.current = requestAnimationFrame(animate);
|
||||||
|
}
|
||||||
|
|
||||||
|
animate();
|
||||||
|
|
||||||
|
return () => {
|
||||||
|
cancelAnimationFrame(animationRef.current);
|
||||||
|
};
|
||||||
|
}, [data, selectedNode]);
|
||||||
|
|
||||||
|
// Mouse interaction handlers
|
||||||
|
useEffect(() => {
|
||||||
|
const canvas = canvasRef.current;
|
||||||
|
if (!canvas) return;
|
||||||
|
|
||||||
|
function getNodeAtPosition(x: number, y: number): SimNode | null {
|
||||||
|
for (const node of nodesRef.current) {
|
||||||
|
const dx = x - node.x;
|
||||||
|
const dy = y - node.y;
|
||||||
|
if (dx * dx + dy * dy < 400) {
|
||||||
|
return node;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
function handleMouseDown(e: MouseEvent) {
|
||||||
|
const rect = canvas!.getBoundingClientRect();
|
||||||
|
const x = e.clientX - rect.left;
|
||||||
|
const y = e.clientY - rect.top;
|
||||||
|
const node = getNodeAtPosition(x, y);
|
||||||
|
if (node) {
|
||||||
|
dragNodeRef.current = node;
|
||||||
|
setSelectedNode(node);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function handleMouseMove(e: MouseEvent) {
|
||||||
|
if (!dragNodeRef.current) return;
|
||||||
|
const rect = canvas!.getBoundingClientRect();
|
||||||
|
dragNodeRef.current.x = e.clientX - rect.left;
|
||||||
|
dragNodeRef.current.y = e.clientY - rect.top;
|
||||||
|
}
|
||||||
|
|
||||||
|
function handleMouseUp() {
|
||||||
|
dragNodeRef.current = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
canvas.addEventListener("mousedown", handleMouseDown);
|
||||||
|
canvas.addEventListener("mousemove", handleMouseMove);
|
||||||
|
canvas.addEventListener("mouseup", handleMouseUp);
|
||||||
|
canvas.addEventListener("mouseleave", handleMouseUp);
|
||||||
|
|
||||||
|
return () => {
|
||||||
|
canvas.removeEventListener("mousedown", handleMouseDown);
|
||||||
|
canvas.removeEventListener("mousemove", handleMouseMove);
|
||||||
|
canvas.removeEventListener("mouseup", handleMouseUp);
|
||||||
|
canvas.removeEventListener("mouseleave", handleMouseUp);
|
||||||
|
};
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
if (loading) return <p>Loading graph...</p>;
|
||||||
|
if (error) return <div className="error">{error}</div>;
|
||||||
|
if (!data) return <p>No data available</p>;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="graph-container">
|
||||||
|
<div className="header">
|
||||||
|
<h1>Relationship Graph</h1>
|
||||||
|
</div>
|
||||||
|
<p className="graph-hint">
|
||||||
|
Drag nodes to reposition. Closer relationships have shorter, darker edges.
|
||||||
|
</p>
|
||||||
|
<canvas
|
||||||
|
ref={canvasRef}
|
||||||
|
width={900}
|
||||||
|
height={600}
|
||||||
|
style={{
|
||||||
|
border: "1px solid var(--color-border)",
|
||||||
|
borderRadius: "8px",
|
||||||
|
background: "var(--color-bg)",
|
||||||
|
cursor: "grab",
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
{selectedNode && (
|
||||||
|
<div className="selected-info">
|
||||||
|
<h3>{selectedNode.name}</h3>
|
||||||
|
{selectedNode.current_job && <p>Job: {selectedNode.current_job}</p>}
|
||||||
|
<a href={`/contacts/${selectedNode.id}`}>View details</a>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
<div className="legend">
|
||||||
|
<h4>Relationship Closeness (1-10)</h4>
|
||||||
|
<div className="legend-items">
|
||||||
|
<div className="legend-item">
|
||||||
|
<span className="legend-line" style={{ background: getEdgeColorCSS(10), height: "4px" }}></span>
|
||||||
|
<span>10 - Very Close (Spouse, Partner)</span>
|
||||||
|
</div>
|
||||||
|
<div className="legend-item">
|
||||||
|
<span className="legend-line" style={{ background: getEdgeColorCSS(7), height: "3px" }}></span>
|
||||||
|
<span>7 - Close (Family, Best Friend)</span>
|
||||||
|
</div>
|
||||||
|
<div className="legend-item">
|
||||||
|
<span className="legend-line" style={{ background: getEdgeColorCSS(4), height: "2px" }}></span>
|
||||||
|
<span>4 - Moderate (Friend, Colleague)</span>
|
||||||
|
</div>
|
||||||
|
<div className="legend-item">
|
||||||
|
<span className="legend-line" style={{ background: getEdgeColorCSS(2), height: "1px" }}></span>
|
||||||
|
<span>2 - Distant (Acquaintance)</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
function getEdgeColorCSS(weight: number): string {
|
||||||
|
// weight is 1-10, normalize to 0-1
|
||||||
|
const normalized = weight / 10;
|
||||||
|
const hue = 220;
|
||||||
|
const saturation = 70;
|
||||||
|
const lightness = 80 - normalized * 40;
|
||||||
|
return `hsl(${hue}, ${saturation}%, ${lightness}%)`;
|
||||||
|
}
|
||||||
62
frontend/src/index.css
Normal file
62
frontend/src/index.css
Normal file
@@ -0,0 +1,62 @@
|
|||||||
|
:root {
|
||||||
|
/* Light theme (default) */
|
||||||
|
--color-bg: #f5f5f5;
|
||||||
|
--color-bg-card: #ffffff;
|
||||||
|
--color-bg-hover: #f0f0f0;
|
||||||
|
--color-bg-muted: #f9f9f9;
|
||||||
|
--color-bg-error: #ffe0e0;
|
||||||
|
|
||||||
|
--color-text: #333333;
|
||||||
|
--color-text-muted: #666666;
|
||||||
|
--color-text-error: #cc0000;
|
||||||
|
|
||||||
|
--color-border: #dddddd;
|
||||||
|
--color-border-light: #eeeeee;
|
||||||
|
--color-border-lighter: #f0f0f0;
|
||||||
|
|
||||||
|
--color-primary: #0066cc;
|
||||||
|
--color-primary-hover: #0055aa;
|
||||||
|
|
||||||
|
--color-danger: #cc3333;
|
||||||
|
--color-danger-hover: #aa2222;
|
||||||
|
|
||||||
|
--color-tag-bg: #e0e0e0;
|
||||||
|
|
||||||
|
--shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
|
||||||
|
|
||||||
|
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, sans-serif;
|
||||||
|
line-height: 1.5;
|
||||||
|
font-weight: 400;
|
||||||
|
color: var(--color-text);
|
||||||
|
background-color: var(--color-bg);
|
||||||
|
font-synthesis: none;
|
||||||
|
text-rendering: optimizeLegibility;
|
||||||
|
-webkit-font-smoothing: antialiased;
|
||||||
|
-moz-osx-font-smoothing: grayscale;
|
||||||
|
}
|
||||||
|
|
||||||
|
[data-theme="dark"] {
|
||||||
|
--color-bg: #1a1a1a;
|
||||||
|
--color-bg-card: #2d2d2d;
|
||||||
|
--color-bg-hover: #3d3d3d;
|
||||||
|
--color-bg-muted: #252525;
|
||||||
|
--color-bg-error: #4a2020;
|
||||||
|
|
||||||
|
--color-text: #e0e0e0;
|
||||||
|
--color-text-muted: #a0a0a0;
|
||||||
|
--color-text-error: #ff6b6b;
|
||||||
|
|
||||||
|
--color-border: #404040;
|
||||||
|
--color-border-light: #353535;
|
||||||
|
--color-border-lighter: #303030;
|
||||||
|
|
||||||
|
--color-primary: #4da6ff;
|
||||||
|
--color-primary-hover: #7dbfff;
|
||||||
|
|
||||||
|
--color-danger: #ff6b6b;
|
||||||
|
--color-danger-hover: #ff8a8a;
|
||||||
|
|
||||||
|
--color-tag-bg: #404040;
|
||||||
|
|
||||||
|
--shadow: 0 1px 3px rgba(0, 0, 0, 0.3);
|
||||||
|
}
|
||||||
13
frontend/src/main.tsx
Normal file
13
frontend/src/main.tsx
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
import { StrictMode } from "react";
|
||||||
|
import { createRoot } from "react-dom/client";
|
||||||
|
import { BrowserRouter } from "react-router-dom";
|
||||||
|
import App from "./App.tsx";
|
||||||
|
import "./index.css";
|
||||||
|
|
||||||
|
createRoot(document.getElementById("root")!).render(
|
||||||
|
<StrictMode>
|
||||||
|
<BrowserRouter>
|
||||||
|
<App />
|
||||||
|
</BrowserRouter>
|
||||||
|
</StrictMode>
|
||||||
|
);
|
||||||
155
frontend/src/types/index.ts
Normal file
155
frontend/src/types/index.ts
Normal file
@@ -0,0 +1,155 @@
|
|||||||
|
export interface Need {
|
||||||
|
id: number;
|
||||||
|
name: string;
|
||||||
|
description: string | null;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface NeedCreate {
|
||||||
|
name: string;
|
||||||
|
description?: string | null;
|
||||||
|
}
|
||||||
|
|
||||||
|
export const RELATIONSHIP_TYPES = [
|
||||||
|
{ value: 'spouse', displayName: 'Spouse', defaultWeight: 10 },
|
||||||
|
{ value: 'partner', displayName: 'Partner', defaultWeight: 10 },
|
||||||
|
{ value: 'parent', displayName: 'Parent', defaultWeight: 9 },
|
||||||
|
{ value: 'child', displayName: 'Child', defaultWeight: 9 },
|
||||||
|
{ value: 'sibling', displayName: 'Sibling', defaultWeight: 9 },
|
||||||
|
{ value: 'best_friend', displayName: 'Best Friend', defaultWeight: 8 },
|
||||||
|
{ value: 'grandparent', displayName: 'Grandparent', defaultWeight: 7 },
|
||||||
|
{ value: 'grandchild', displayName: 'Grandchild', defaultWeight: 7 },
|
||||||
|
{ value: 'aunt_uncle', displayName: 'Aunt/Uncle', defaultWeight: 7 },
|
||||||
|
{ value: 'niece_nephew', displayName: 'Niece/Nephew', defaultWeight: 7 },
|
||||||
|
{ value: 'cousin', displayName: 'Cousin', defaultWeight: 7 },
|
||||||
|
{ value: 'in_law', displayName: 'In-Law', defaultWeight: 7 },
|
||||||
|
{ value: 'close_friend', displayName: 'Close Friend', defaultWeight: 6 },
|
||||||
|
{ value: 'friend', displayName: 'Friend', defaultWeight: 6 },
|
||||||
|
{ value: 'mentor', displayName: 'Mentor', defaultWeight: 5 },
|
||||||
|
{ value: 'mentee', displayName: 'Mentee', defaultWeight: 5 },
|
||||||
|
{ value: 'business_partner', displayName: 'Business Partner', defaultWeight: 5 },
|
||||||
|
{ value: 'colleague', displayName: 'Colleague', defaultWeight: 4 },
|
||||||
|
{ value: 'manager', displayName: 'Manager', defaultWeight: 4 },
|
||||||
|
{ value: 'direct_report', displayName: 'Direct Report', defaultWeight: 4 },
|
||||||
|
{ value: 'client', displayName: 'Client', defaultWeight: 4 },
|
||||||
|
{ value: 'acquaintance', displayName: 'Acquaintance', defaultWeight: 3 },
|
||||||
|
{ value: 'neighbor', displayName: 'Neighbor', defaultWeight: 3 },
|
||||||
|
{ value: 'ex', displayName: 'Ex', defaultWeight: 2 },
|
||||||
|
{ value: 'other', displayName: 'Other', defaultWeight: 2 },
|
||||||
|
] as const;
|
||||||
|
|
||||||
|
export type RelationshipTypeValue = typeof RELATIONSHIP_TYPES[number]['value'];
|
||||||
|
|
||||||
|
export interface ContactRelationship {
|
||||||
|
contact_id: number;
|
||||||
|
related_contact_id: number;
|
||||||
|
relationship_type: string;
|
||||||
|
closeness_weight: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface ContactRelationshipCreate {
|
||||||
|
related_contact_id: number;
|
||||||
|
relationship_type: RelationshipTypeValue;
|
||||||
|
closeness_weight?: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface ContactRelationshipUpdate {
|
||||||
|
relationship_type?: RelationshipTypeValue;
|
||||||
|
closeness_weight?: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface GraphNode {
|
||||||
|
id: number;
|
||||||
|
name: string;
|
||||||
|
current_job: string | null;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface GraphEdge {
|
||||||
|
source: number;
|
||||||
|
target: number;
|
||||||
|
relationship_type: string;
|
||||||
|
closeness_weight: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface GraphData {
|
||||||
|
nodes: GraphNode[];
|
||||||
|
edges: GraphEdge[];
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface Contact {
|
||||||
|
id: number;
|
||||||
|
name: string;
|
||||||
|
age: number | null;
|
||||||
|
bio: string | null;
|
||||||
|
current_job: string | null;
|
||||||
|
gender: string | null;
|
||||||
|
goals: string | null;
|
||||||
|
legal_name: string | null;
|
||||||
|
profile_pic: string | null;
|
||||||
|
safe_conversation_starters: string | null;
|
||||||
|
self_sufficiency_score: number | null;
|
||||||
|
social_structure_style: string | null;
|
||||||
|
ssn: string | null;
|
||||||
|
suffix: string | null;
|
||||||
|
timezone: string | null;
|
||||||
|
topics_to_avoid: string | null;
|
||||||
|
needs: Need[];
|
||||||
|
related_to: ContactRelationship[];
|
||||||
|
related_from: ContactRelationship[];
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface ContactListItem {
|
||||||
|
id: number;
|
||||||
|
name: string;
|
||||||
|
age: number | null;
|
||||||
|
bio: string | null;
|
||||||
|
current_job: string | null;
|
||||||
|
gender: string | null;
|
||||||
|
goals: string | null;
|
||||||
|
legal_name: string | null;
|
||||||
|
profile_pic: string | null;
|
||||||
|
safe_conversation_starters: string | null;
|
||||||
|
self_sufficiency_score: number | null;
|
||||||
|
social_structure_style: string | null;
|
||||||
|
ssn: string | null;
|
||||||
|
suffix: string | null;
|
||||||
|
timezone: string | null;
|
||||||
|
topics_to_avoid: string | null;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface ContactCreate {
|
||||||
|
name: string;
|
||||||
|
age?: number | null;
|
||||||
|
bio?: string | null;
|
||||||
|
current_job?: string | null;
|
||||||
|
gender?: string | null;
|
||||||
|
goals?: string | null;
|
||||||
|
legal_name?: string | null;
|
||||||
|
profile_pic?: string | null;
|
||||||
|
safe_conversation_starters?: string | null;
|
||||||
|
self_sufficiency_score?: number | null;
|
||||||
|
social_structure_style?: string | null;
|
||||||
|
ssn?: string | null;
|
||||||
|
suffix?: string | null;
|
||||||
|
timezone?: string | null;
|
||||||
|
topics_to_avoid?: string | null;
|
||||||
|
need_ids?: number[];
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface ContactUpdate {
|
||||||
|
name?: string | null;
|
||||||
|
age?: number | null;
|
||||||
|
bio?: string | null;
|
||||||
|
current_job?: string | null;
|
||||||
|
gender?: string | null;
|
||||||
|
goals?: string | null;
|
||||||
|
legal_name?: string | null;
|
||||||
|
profile_pic?: string | null;
|
||||||
|
safe_conversation_starters?: string | null;
|
||||||
|
self_sufficiency_score?: number | null;
|
||||||
|
social_structure_style?: string | null;
|
||||||
|
ssn?: string | null;
|
||||||
|
suffix?: string | null;
|
||||||
|
timezone?: string | null;
|
||||||
|
topics_to_avoid?: string | null;
|
||||||
|
need_ids?: number[] | null;
|
||||||
|
}
|
||||||
28
frontend/tsconfig.app.json
Normal file
28
frontend/tsconfig.app.json
Normal file
@@ -0,0 +1,28 @@
|
|||||||
|
{
|
||||||
|
"compilerOptions": {
|
||||||
|
"tsBuildInfoFile": "./node_modules/.tmp/tsconfig.app.tsbuildinfo",
|
||||||
|
"target": "ES2022",
|
||||||
|
"useDefineForClassFields": true,
|
||||||
|
"lib": ["ES2022", "DOM", "DOM.Iterable"],
|
||||||
|
"module": "ESNext",
|
||||||
|
"types": ["vite/client"],
|
||||||
|
"skipLibCheck": true,
|
||||||
|
|
||||||
|
/* Bundler mode */
|
||||||
|
"moduleResolution": "bundler",
|
||||||
|
"allowImportingTsExtensions": true,
|
||||||
|
"verbatimModuleSyntax": true,
|
||||||
|
"moduleDetection": "force",
|
||||||
|
"noEmit": true,
|
||||||
|
"jsx": "react-jsx",
|
||||||
|
|
||||||
|
/* Linting */
|
||||||
|
"strict": true,
|
||||||
|
"noUnusedLocals": true,
|
||||||
|
"noUnusedParameters": true,
|
||||||
|
"erasableSyntaxOnly": true,
|
||||||
|
"noFallthroughCasesInSwitch": true,
|
||||||
|
"noUncheckedSideEffectImports": true
|
||||||
|
},
|
||||||
|
"include": ["src"]
|
||||||
|
}
|
||||||
7
frontend/tsconfig.json
Normal file
7
frontend/tsconfig.json
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
{
|
||||||
|
"files": [],
|
||||||
|
"references": [
|
||||||
|
{ "path": "./tsconfig.app.json" },
|
||||||
|
{ "path": "./tsconfig.node.json" }
|
||||||
|
]
|
||||||
|
}
|
||||||
26
frontend/tsconfig.node.json
Normal file
26
frontend/tsconfig.node.json
Normal file
@@ -0,0 +1,26 @@
|
|||||||
|
{
|
||||||
|
"compilerOptions": {
|
||||||
|
"tsBuildInfoFile": "./node_modules/.tmp/tsconfig.node.tsbuildinfo",
|
||||||
|
"target": "ES2023",
|
||||||
|
"lib": ["ES2023"],
|
||||||
|
"module": "ESNext",
|
||||||
|
"types": ["node"],
|
||||||
|
"skipLibCheck": true,
|
||||||
|
|
||||||
|
/* Bundler mode */
|
||||||
|
"moduleResolution": "bundler",
|
||||||
|
"allowImportingTsExtensions": true,
|
||||||
|
"verbatimModuleSyntax": true,
|
||||||
|
"moduleDetection": "force",
|
||||||
|
"noEmit": true,
|
||||||
|
|
||||||
|
/* Linting */
|
||||||
|
"strict": true,
|
||||||
|
"noUnusedLocals": true,
|
||||||
|
"noUnusedParameters": true,
|
||||||
|
"erasableSyntaxOnly": true,
|
||||||
|
"noFallthroughCasesInSwitch": true,
|
||||||
|
"noUncheckedSideEffectImports": true
|
||||||
|
},
|
||||||
|
"include": ["vite.config.ts"]
|
||||||
|
}
|
||||||
11
frontend/vite.config.ts
Normal file
11
frontend/vite.config.ts
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
import { defineConfig } from "vite";
|
||||||
|
import react from "@vitejs/plugin-react";
|
||||||
|
|
||||||
|
export default defineConfig({
|
||||||
|
plugins: [react()],
|
||||||
|
server: {
|
||||||
|
proxy: {
|
||||||
|
"/api": "http://localhost:8000",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
});
|
||||||
@@ -3,34 +3,48 @@
|
|||||||
# When applied, the stable nixpkgs set (declared in the flake inputs) will be accessible through 'pkgs.stable'
|
# When applied, the stable nixpkgs set (declared in the flake inputs) will be accessible through 'pkgs.stable'
|
||||||
stable = final: _prev: {
|
stable = final: _prev: {
|
||||||
stable = import inputs.nixpkgs-stable {
|
stable = import inputs.nixpkgs-stable {
|
||||||
system = final.system;
|
system = final.stdenv.hostPlatform.system;
|
||||||
config.allowUnfree = true;
|
config.allowUnfree = true;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
# When applied, the master nixpkgs set (declared in the flake inputs) will be accessible through 'pkgs.master'
|
# When applied, the master nixpkgs set (declared in the flake inputs) will be accessible through 'pkgs.master'
|
||||||
master = final: _prev: {
|
master = final: _prev: {
|
||||||
master = import inputs.nixpkgs-master {
|
master = import inputs.nixpkgs-master {
|
||||||
system = final.system;
|
system = final.stdenv.hostPlatform.system;
|
||||||
config.allowUnfree = true;
|
config.allowUnfree = true;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
python-env = final: _prev: {
|
python-env = final: _prev: {
|
||||||
my_python = final.python313.withPackages (
|
my_python = final.python314.withPackages (
|
||||||
ps: with ps; [
|
ps: with ps; [
|
||||||
|
alembic
|
||||||
apprise
|
apprise
|
||||||
apscheduler
|
apscheduler
|
||||||
|
fastapi
|
||||||
|
fastapi-cli
|
||||||
|
httpx
|
||||||
mypy
|
mypy
|
||||||
polars
|
polars
|
||||||
|
psycopg
|
||||||
|
pydantic
|
||||||
pyfakefs
|
pyfakefs
|
||||||
pytest
|
pytest
|
||||||
pytest-cov
|
pytest-cov
|
||||||
pytest-mock
|
pytest-mock
|
||||||
pytest-xdist
|
pytest-xdist
|
||||||
|
python-multipart
|
||||||
requests
|
requests
|
||||||
ruff
|
ruff
|
||||||
|
scalene
|
||||||
|
sqlalchemy
|
||||||
|
sqlalchemy
|
||||||
|
tenacity
|
||||||
|
textual
|
||||||
|
tinytuya
|
||||||
typer
|
typer
|
||||||
types-requests
|
types-requests
|
||||||
|
websockets
|
||||||
]
|
]
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -7,7 +7,27 @@ requires-python = "~=3.13.0"
|
|||||||
readme = "README.md"
|
readme = "README.md"
|
||||||
license = "MIT"
|
license = "MIT"
|
||||||
# these dependencies are a best effort and aren't guaranteed to work
|
# these dependencies are a best effort and aren't guaranteed to work
|
||||||
dependencies = ["apprise", "apscheduler", "polars", "requests", "typer"]
|
# for up-to-date dependencies, see overlays/default.nix
|
||||||
|
dependencies = [
|
||||||
|
"alembic",
|
||||||
|
"apprise",
|
||||||
|
"apscheduler",
|
||||||
|
"httpx",
|
||||||
|
"python-multipart",
|
||||||
|
"polars",
|
||||||
|
"psycopg[binary]",
|
||||||
|
"pydantic",
|
||||||
|
"pyyaml",
|
||||||
|
"requests",
|
||||||
|
"sqlalchemy",
|
||||||
|
"typer",
|
||||||
|
"websockets",
|
||||||
|
]
|
||||||
|
|
||||||
|
[project.scripts]
|
||||||
|
database = "python.database_cli:app"
|
||||||
|
van-inventory = "python.van_inventory.main:serve"
|
||||||
|
sheet-music-ocr = "python.sheet_music_ocr.main:app"
|
||||||
|
|
||||||
[dependency-groups]
|
[dependency-groups]
|
||||||
dev = [
|
dev = [
|
||||||
@@ -38,15 +58,38 @@ lint.ignore = [
|
|||||||
[tool.ruff.lint.per-file-ignores]
|
[tool.ruff.lint.per-file-ignores]
|
||||||
|
|
||||||
"tests/**" = [
|
"tests/**" = [
|
||||||
|
"ANN", # (perm) type annotations not needed in tests
|
||||||
|
"D", # (perm) docstrings not needed in tests
|
||||||
|
"PLR2004", # (perm) magic values are fine in test assertions
|
||||||
"S101", # (perm) pytest needs asserts
|
"S101", # (perm) pytest needs asserts
|
||||||
]
|
]
|
||||||
"python/random/**" = [
|
"python/stuff/**" = [
|
||||||
"T201", # (perm) I don't care about print statements dir
|
"T201", # (perm) I don't care about print statements dir
|
||||||
]
|
]
|
||||||
"python/testing/**" = [
|
"python/testing/**" = [
|
||||||
"T201", # (perm) I don't care about print statements dir
|
"T201", # (perm) I don't care about print statements dir
|
||||||
"ERA001", # (perm) I don't care about print statements dir
|
"ERA001", # (perm) I don't care about print statements dir
|
||||||
]
|
]
|
||||||
|
"python/splendor/**" = [
|
||||||
|
"S311", # (perm) there is no security issue here
|
||||||
|
"T201", # (perm) I don't care about print statements dir
|
||||||
|
"PLR2004", # (temps) need to think about this
|
||||||
|
]
|
||||||
|
"python/orm/**" = [
|
||||||
|
"TC003", # (perm) this creates issues because sqlalchemy uses these at runtime
|
||||||
|
]
|
||||||
|
"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]
|
[tool.ruff.lint.pydocstyle]
|
||||||
convention = "google"
|
convention = "google"
|
||||||
|
|||||||
121
python/alembic/env.py
Normal file
121
python/alembic/env.py
Normal file
@@ -0,0 +1,121 @@
|
|||||||
|
"""Alembic."""
|
||||||
|
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import logging
|
||||||
|
import sys
|
||||||
|
from pathlib import Path
|
||||||
|
from typing import TYPE_CHECKING, Any, Literal
|
||||||
|
|
||||||
|
from alembic import context
|
||||||
|
from alembic.script import write_hooks
|
||||||
|
from sqlalchemy.schema import CreateSchema
|
||||||
|
|
||||||
|
from python.common import bash_wrapper
|
||||||
|
from python.orm.common import get_postgres_engine
|
||||||
|
|
||||||
|
if TYPE_CHECKING:
|
||||||
|
from collections.abc import MutableMapping
|
||||||
|
|
||||||
|
from sqlalchemy.orm import DeclarativeBase
|
||||||
|
|
||||||
|
config = context.config
|
||||||
|
|
||||||
|
base_class: type[DeclarativeBase] = config.attributes.get("base")
|
||||||
|
if base_class is None:
|
||||||
|
error = "No base class provided. Use the database CLI to run alembic commands."
|
||||||
|
raise RuntimeError(error)
|
||||||
|
|
||||||
|
target_metadata = base_class.metadata
|
||||||
|
logging.basicConfig(
|
||||||
|
level="DEBUG",
|
||||||
|
datefmt="%Y-%m-%dT%H:%M:%S%z",
|
||||||
|
format="%(asctime)s %(levelname)s %(filename)s:%(lineno)d - %(message)s",
|
||||||
|
handlers=[logging.StreamHandler(sys.stdout)],
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
@write_hooks.register("dynamic_schema")
|
||||||
|
def dynamic_schema(filename: str, _options: dict[Any, Any]) -> None:
|
||||||
|
"""Dynamic schema."""
|
||||||
|
original_file = Path(filename).read_text()
|
||||||
|
schema_name = base_class.schema_name
|
||||||
|
dynamic_schema_file_part1 = original_file.replace(f"schema='{schema_name}'", "schema=schema")
|
||||||
|
dynamic_schema_file = dynamic_schema_file_part1.replace(f"'{schema_name}.", "f'{schema}.")
|
||||||
|
Path(filename).write_text(dynamic_schema_file)
|
||||||
|
|
||||||
|
|
||||||
|
@write_hooks.register("import_postgresql")
|
||||||
|
def import_postgresql(filename: str, _options: dict[Any, Any]) -> None:
|
||||||
|
"""Add postgresql dialect import when postgresql types are used."""
|
||||||
|
content = Path(filename).read_text()
|
||||||
|
if "postgresql." in content and "from sqlalchemy.dialects import postgresql" not in content:
|
||||||
|
content = content.replace(
|
||||||
|
"import sqlalchemy as sa\n",
|
||||||
|
"import sqlalchemy as sa\nfrom sqlalchemy.dialects import postgresql\n",
|
||||||
|
)
|
||||||
|
Path(filename).write_text(content)
|
||||||
|
|
||||||
|
|
||||||
|
@write_hooks.register("ruff")
|
||||||
|
def ruff_check_and_format(filename: str, _options: dict[Any, Any]) -> None:
|
||||||
|
"""Docstring for ruff_check_and_format."""
|
||||||
|
bash_wrapper(f"ruff check --fix {filename}")
|
||||||
|
bash_wrapper(f"ruff format {filename}")
|
||||||
|
|
||||||
|
|
||||||
|
def include_name(
|
||||||
|
name: str | None,
|
||||||
|
type_: Literal["schema", "table", "column", "index", "unique_constraint", "foreign_key_constraint"],
|
||||||
|
_parent_names: MutableMapping[Literal["schema_name", "table_name", "schema_qualified_table_name"], str | None],
|
||||||
|
) -> bool:
|
||||||
|
"""Filter tables to be included in the migration.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
name (str): The name of the table.
|
||||||
|
type_ (str): The type of the table.
|
||||||
|
_parent_names (MutableMapping): The names of the parent tables.
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
bool: True if the table should be included, False otherwise.
|
||||||
|
|
||||||
|
"""
|
||||||
|
if type_ == "schema":
|
||||||
|
return name == target_metadata.schema
|
||||||
|
return True
|
||||||
|
|
||||||
|
|
||||||
|
def run_migrations_online() -> None:
|
||||||
|
"""Run migrations in 'online' mode.
|
||||||
|
|
||||||
|
In this scenario we need to create an Engine
|
||||||
|
and associate a connection with the context.
|
||||||
|
|
||||||
|
"""
|
||||||
|
env_prefix = config.attributes.get("env_prefix", "POSTGRES")
|
||||||
|
connectable = get_postgres_engine(name=env_prefix)
|
||||||
|
|
||||||
|
with connectable.connect() as connection:
|
||||||
|
schema = base_class.schema_name
|
||||||
|
if not connectable.dialect.has_schema(connection, schema):
|
||||||
|
answer = input(f"Schema {schema!r} does not exist. Create it? [y/N] ")
|
||||||
|
if answer.lower() != "y":
|
||||||
|
error = f"Schema {schema!r} does not exist. Exiting."
|
||||||
|
raise SystemExit(error)
|
||||||
|
connection.execute(CreateSchema(schema))
|
||||||
|
connection.commit()
|
||||||
|
|
||||||
|
context.configure(
|
||||||
|
connection=connection,
|
||||||
|
target_metadata=target_metadata,
|
||||||
|
include_schemas=True,
|
||||||
|
version_table_schema=schema,
|
||||||
|
include_name=include_name,
|
||||||
|
)
|
||||||
|
|
||||||
|
with context.begin_transaction():
|
||||||
|
context.run_migrations()
|
||||||
|
connection.commit()
|
||||||
|
|
||||||
|
|
||||||
|
run_migrations_online()
|
||||||
@@ -0,0 +1,113 @@
|
|||||||
|
"""created contact api.
|
||||||
|
|
||||||
|
Revision ID: edd7dd61a3d2
|
||||||
|
Revises:
|
||||||
|
Create Date: 2026-01-11 15:45:59.909266
|
||||||
|
|
||||||
|
"""
|
||||||
|
|
||||||
|
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 = "edd7dd61a3d2"
|
||||||
|
down_revision: str | None = None
|
||||||
|
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(
|
||||||
|
"contact",
|
||||||
|
sa.Column("name", sa.String(), nullable=False),
|
||||||
|
sa.Column("age", sa.Integer(), nullable=True),
|
||||||
|
sa.Column("bio", sa.String(), nullable=True),
|
||||||
|
sa.Column("current_job", sa.String(), nullable=True),
|
||||||
|
sa.Column("gender", sa.String(), nullable=True),
|
||||||
|
sa.Column("goals", sa.String(), nullable=True),
|
||||||
|
sa.Column("legal_name", sa.String(), nullable=True),
|
||||||
|
sa.Column("profile_pic", sa.String(), nullable=True),
|
||||||
|
sa.Column("safe_conversation_starters", sa.String(), nullable=True),
|
||||||
|
sa.Column("self_sufficiency_score", sa.Integer(), nullable=True),
|
||||||
|
sa.Column("social_structure_style", sa.String(), nullable=True),
|
||||||
|
sa.Column("ssn", sa.String(), nullable=True),
|
||||||
|
sa.Column("suffix", sa.String(), nullable=True),
|
||||||
|
sa.Column("timezone", sa.String(), nullable=True),
|
||||||
|
sa.Column("topics_to_avoid", sa.String(), nullable=True),
|
||||||
|
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_contact")),
|
||||||
|
schema=schema,
|
||||||
|
)
|
||||||
|
op.create_table(
|
||||||
|
"need",
|
||||||
|
sa.Column("name", sa.String(), nullable=False),
|
||||||
|
sa.Column("description", sa.String(), nullable=True),
|
||||||
|
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_need")),
|
||||||
|
schema=schema,
|
||||||
|
)
|
||||||
|
op.create_table(
|
||||||
|
"contact_need",
|
||||||
|
sa.Column("contact_id", sa.Integer(), nullable=False),
|
||||||
|
sa.Column("need_id", sa.Integer(), nullable=False),
|
||||||
|
sa.ForeignKeyConstraint(
|
||||||
|
["contact_id"],
|
||||||
|
[f"{schema}.contact.id"],
|
||||||
|
name=op.f("fk_contact_need_contact_id_contact"),
|
||||||
|
ondelete="CASCADE",
|
||||||
|
),
|
||||||
|
sa.ForeignKeyConstraint(
|
||||||
|
["need_id"], [f"{schema}.need.id"], name=op.f("fk_contact_need_need_id_need"), ondelete="CASCADE"
|
||||||
|
),
|
||||||
|
sa.PrimaryKeyConstraint("contact_id", "need_id", name=op.f("pk_contact_need")),
|
||||||
|
schema=schema,
|
||||||
|
)
|
||||||
|
op.create_table(
|
||||||
|
"contact_relationship",
|
||||||
|
sa.Column("contact_id", sa.Integer(), nullable=False),
|
||||||
|
sa.Column("related_contact_id", sa.Integer(), nullable=False),
|
||||||
|
sa.Column("relationship_type", sa.String(length=100), nullable=False),
|
||||||
|
sa.Column("closeness_weight", sa.Integer(), nullable=False),
|
||||||
|
sa.ForeignKeyConstraint(
|
||||||
|
["contact_id"],
|
||||||
|
[f"{schema}.contact.id"],
|
||||||
|
name=op.f("fk_contact_relationship_contact_id_contact"),
|
||||||
|
ondelete="CASCADE",
|
||||||
|
),
|
||||||
|
sa.ForeignKeyConstraint(
|
||||||
|
["related_contact_id"],
|
||||||
|
[f"{schema}.contact.id"],
|
||||||
|
name=op.f("fk_contact_relationship_related_contact_id_contact"),
|
||||||
|
ondelete="CASCADE",
|
||||||
|
),
|
||||||
|
sa.PrimaryKeyConstraint("contact_id", "related_contact_id", name=op.f("pk_contact_relationship")),
|
||||||
|
schema=schema,
|
||||||
|
)
|
||||||
|
# ### end Alembic commands ###
|
||||||
|
|
||||||
|
|
||||||
|
def downgrade() -> None:
|
||||||
|
"""Downgrade."""
|
||||||
|
# ### commands auto generated by Alembic - please adjust! ###
|
||||||
|
op.drop_table("contact_relationship", schema=schema)
|
||||||
|
op.drop_table("contact_need", schema=schema)
|
||||||
|
op.drop_table("need", schema=schema)
|
||||||
|
op.drop_table("contact", schema=schema)
|
||||||
|
# ### end Alembic commands ###
|
||||||
@@ -0,0 +1,135 @@
|
|||||||
|
"""add congress tracker tables.
|
||||||
|
|
||||||
|
Revision ID: 3f71565e38de
|
||||||
|
Revises: edd7dd61a3d2
|
||||||
|
Create Date: 2026-02-12 16:36:09.457303
|
||||||
|
|
||||||
|
"""
|
||||||
|
|
||||||
|
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 = "3f71565e38de"
|
||||||
|
down_revision: str | None = "edd7dd61a3d2"
|
||||||
|
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(
|
||||||
|
"bill",
|
||||||
|
sa.Column("congress", sa.Integer(), nullable=False),
|
||||||
|
sa.Column("bill_type", sa.String(), nullable=False),
|
||||||
|
sa.Column("number", sa.Integer(), nullable=False),
|
||||||
|
sa.Column("title", sa.String(), nullable=True),
|
||||||
|
sa.Column("title_short", sa.String(), nullable=True),
|
||||||
|
sa.Column("official_title", sa.String(), nullable=True),
|
||||||
|
sa.Column("status", sa.String(), nullable=True),
|
||||||
|
sa.Column("status_at", sa.Date(), nullable=True),
|
||||||
|
sa.Column("sponsor_bioguide_id", sa.String(), nullable=True),
|
||||||
|
sa.Column("subjects_top_term", sa.String(), nullable=True),
|
||||||
|
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_bill")),
|
||||||
|
sa.UniqueConstraint("congress", "bill_type", "number", name="uq_bill_congress_type_number"),
|
||||||
|
schema=schema,
|
||||||
|
)
|
||||||
|
op.create_index("ix_bill_congress", "bill", ["congress"], unique=False, schema=schema)
|
||||||
|
op.create_table(
|
||||||
|
"legislator",
|
||||||
|
sa.Column("bioguide_id", sa.Text(), nullable=False),
|
||||||
|
sa.Column("thomas_id", sa.String(), nullable=True),
|
||||||
|
sa.Column("lis_id", sa.String(), nullable=True),
|
||||||
|
sa.Column("govtrack_id", sa.Integer(), nullable=True),
|
||||||
|
sa.Column("opensecrets_id", sa.String(), nullable=True),
|
||||||
|
sa.Column("fec_ids", sa.String(), nullable=True),
|
||||||
|
sa.Column("first_name", sa.String(), nullable=False),
|
||||||
|
sa.Column("last_name", sa.String(), nullable=False),
|
||||||
|
sa.Column("official_full_name", sa.String(), nullable=True),
|
||||||
|
sa.Column("nickname", sa.String(), nullable=True),
|
||||||
|
sa.Column("birthday", sa.Date(), nullable=True),
|
||||||
|
sa.Column("gender", sa.String(), nullable=True),
|
||||||
|
sa.Column("current_party", sa.String(), nullable=True),
|
||||||
|
sa.Column("current_state", sa.String(), nullable=True),
|
||||||
|
sa.Column("current_district", sa.Integer(), nullable=True),
|
||||||
|
sa.Column("current_chamber", sa.String(), nullable=True),
|
||||||
|
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_legislator")),
|
||||||
|
schema=schema,
|
||||||
|
)
|
||||||
|
op.create_index(op.f("ix_legislator_bioguide_id"), "legislator", ["bioguide_id"], unique=True, schema=schema)
|
||||||
|
op.create_table(
|
||||||
|
"vote",
|
||||||
|
sa.Column("congress", sa.Integer(), nullable=False),
|
||||||
|
sa.Column("chamber", sa.String(), nullable=False),
|
||||||
|
sa.Column("session", sa.Integer(), nullable=False),
|
||||||
|
sa.Column("number", sa.Integer(), nullable=False),
|
||||||
|
sa.Column("vote_type", sa.String(), nullable=True),
|
||||||
|
sa.Column("question", sa.String(), nullable=True),
|
||||||
|
sa.Column("result", sa.String(), nullable=True),
|
||||||
|
sa.Column("result_text", sa.String(), nullable=True),
|
||||||
|
sa.Column("vote_date", sa.Date(), nullable=False),
|
||||||
|
sa.Column("yea_count", sa.Integer(), nullable=True),
|
||||||
|
sa.Column("nay_count", sa.Integer(), nullable=True),
|
||||||
|
sa.Column("not_voting_count", sa.Integer(), nullable=True),
|
||||||
|
sa.Column("present_count", sa.Integer(), nullable=True),
|
||||||
|
sa.Column("bill_id", sa.Integer(), nullable=True),
|
||||||
|
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(["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="uq_vote_congress_chamber_session_number"),
|
||||||
|
schema=schema,
|
||||||
|
)
|
||||||
|
op.create_index("ix_vote_congress_chamber", "vote", ["congress", "chamber"], unique=False, schema=schema)
|
||||||
|
op.create_index("ix_vote_date", "vote", ["vote_date"], unique=False, schema=schema)
|
||||||
|
op.create_table(
|
||||||
|
"vote_record",
|
||||||
|
sa.Column("vote_id", sa.Integer(), nullable=False),
|
||||||
|
sa.Column("legislator_id", sa.Integer(), nullable=False),
|
||||||
|
sa.Column("position", sa.String(), 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,
|
||||||
|
)
|
||||||
|
# ### end Alembic commands ###
|
||||||
|
|
||||||
|
|
||||||
|
def downgrade() -> None:
|
||||||
|
"""Downgrade."""
|
||||||
|
# ### commands auto generated by Alembic - please adjust! ###
|
||||||
|
op.drop_table("vote_record", schema=schema)
|
||||||
|
op.drop_index("ix_vote_date", table_name="vote", schema=schema)
|
||||||
|
op.drop_index("ix_vote_congress_chamber", table_name="vote", schema=schema)
|
||||||
|
op.drop_table("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_index("ix_bill_congress", table_name="bill", schema=schema)
|
||||||
|
op.drop_table("bill", schema=schema)
|
||||||
|
# ### end Alembic commands ###
|
||||||
@@ -0,0 +1,58 @@
|
|||||||
|
"""adding SignalDevice for DeviceRegistry for signal bot.
|
||||||
|
|
||||||
|
Revision ID: 4c410c16e39c
|
||||||
|
Revises: 3f71565e38de
|
||||||
|
Create Date: 2026-03-09 14:51:24.228976
|
||||||
|
|
||||||
|
"""
|
||||||
|
|
||||||
|
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 = "4c410c16e39c"
|
||||||
|
down_revision: str | None = "3f71565e38de"
|
||||||
|
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(
|
||||||
|
"signal_device",
|
||||||
|
sa.Column("phone_number", sa.String(length=50), nullable=False),
|
||||||
|
sa.Column("safety_number", sa.String(), nullable=False),
|
||||||
|
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,
|
||||||
|
)
|
||||||
|
# ### end Alembic commands ###
|
||||||
|
|
||||||
|
|
||||||
|
def downgrade() -> None:
|
||||||
|
"""Downgrade."""
|
||||||
|
# ### commands auto generated by Alembic - please adjust! ###
|
||||||
|
op.drop_table("signal_device", schema=schema)
|
||||||
|
# ### end Alembic commands ###
|
||||||
@@ -0,0 +1,41 @@
|
|||||||
|
"""fixed safety number logic.
|
||||||
|
|
||||||
|
Revision ID: 99fec682516c
|
||||||
|
Revises: 4c410c16e39c
|
||||||
|
Create Date: 2026-03-09 16:25:25.085806
|
||||||
|
|
||||||
|
"""
|
||||||
|
|
||||||
|
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 = "99fec682516c"
|
||||||
|
down_revision: str | None = "4c410c16e39c"
|
||||||
|
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("signal_device", "safety_number", existing_type=sa.VARCHAR(), nullable=True, schema=schema)
|
||||||
|
# ### end Alembic commands ###
|
||||||
|
|
||||||
|
|
||||||
|
def downgrade() -> None:
|
||||||
|
"""Downgrade."""
|
||||||
|
# ### commands auto generated by Alembic - please adjust! ###
|
||||||
|
op.alter_column("signal_device", "safety_number", existing_type=sa.VARCHAR(), nullable=False, schema=schema)
|
||||||
|
# ### end Alembic commands ###
|
||||||
@@ -0,0 +1,54 @@
|
|||||||
|
"""add dead_letter_message table.
|
||||||
|
|
||||||
|
Revision ID: a1b2c3d4e5f6
|
||||||
|
Revises: 99fec682516c
|
||||||
|
Create Date: 2026-03-10 12:00:00.000000
|
||||||
|
|
||||||
|
"""
|
||||||
|
|
||||||
|
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 = "a1b2c3d4e5f6"
|
||||||
|
down_revision: str | None = "99fec682516c"
|
||||||
|
branch_labels: str | Sequence[str] | None = None
|
||||||
|
depends_on: str | Sequence[str] | None = None
|
||||||
|
|
||||||
|
schema = RichieBase.schema_name
|
||||||
|
|
||||||
|
|
||||||
|
def upgrade() -> None:
|
||||||
|
"""Upgrade."""
|
||||||
|
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,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def downgrade() -> None:
|
||||||
|
"""Downgrade."""
|
||||||
|
op.drop_table("dead_letter_message", schema=schema)
|
||||||
|
op.execute(sa.text(f"DROP TYPE IF EXISTS {schema}.message_status"))
|
||||||
36
python/alembic/script.py.mako
Normal file
36
python/alembic/script.py.mako
Normal file
@@ -0,0 +1,36 @@
|
|||||||
|
"""${message}.
|
||||||
|
|
||||||
|
Revision ID: ${up_revision}
|
||||||
|
Revises: ${down_revision | comma,n}
|
||||||
|
Create Date: ${create_date}
|
||||||
|
|
||||||
|
"""
|
||||||
|
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
from typing import TYPE_CHECKING
|
||||||
|
|
||||||
|
import sqlalchemy as sa
|
||||||
|
|
||||||
|
from alembic import op
|
||||||
|
from python.orm import ${config.attributes["base"].__name__}
|
||||||
|
|
||||||
|
if TYPE_CHECKING:
|
||||||
|
from collections.abc import Sequence
|
||||||
|
|
||||||
|
# revision identifiers, used by Alembic.
|
||||||
|
revision: str = ${repr(up_revision)}
|
||||||
|
down_revision: str | None = ${repr(down_revision)}
|
||||||
|
branch_labels: str | Sequence[str] | None = ${repr(branch_labels)}
|
||||||
|
depends_on: str | Sequence[str] | None = ${repr(depends_on)}
|
||||||
|
|
||||||
|
schema=${config.attributes["base"].__name__}.schema_name
|
||||||
|
|
||||||
|
def upgrade() -> None:
|
||||||
|
"""Upgrade."""
|
||||||
|
${upgrades if upgrades else "pass"}
|
||||||
|
|
||||||
|
|
||||||
|
def downgrade() -> None:
|
||||||
|
"""Downgrade."""
|
||||||
|
${downgrades if downgrades else "pass"}
|
||||||
@@ -0,0 +1,80 @@
|
|||||||
|
"""starting van invintory.
|
||||||
|
|
||||||
|
Revision ID: 15e733499804
|
||||||
|
Revises:
|
||||||
|
Create Date: 2026-03-08 00:18:20.759720
|
||||||
|
|
||||||
|
"""
|
||||||
|
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
from typing import TYPE_CHECKING
|
||||||
|
|
||||||
|
import sqlalchemy as sa
|
||||||
|
from alembic import op
|
||||||
|
|
||||||
|
from python.orm import VanInventoryBase
|
||||||
|
|
||||||
|
if TYPE_CHECKING:
|
||||||
|
from collections.abc import Sequence
|
||||||
|
|
||||||
|
# revision identifiers, used by Alembic.
|
||||||
|
revision: str = "15e733499804"
|
||||||
|
down_revision: str | None = None
|
||||||
|
branch_labels: str | Sequence[str] | None = None
|
||||||
|
depends_on: str | Sequence[str] | None = None
|
||||||
|
|
||||||
|
schema = VanInventoryBase.schema_name
|
||||||
|
|
||||||
|
|
||||||
|
def upgrade() -> None:
|
||||||
|
"""Upgrade."""
|
||||||
|
# ### commands auto generated by Alembic - please adjust! ###
|
||||||
|
op.create_table(
|
||||||
|
"items",
|
||||||
|
sa.Column("name", sa.String(), nullable=False),
|
||||||
|
sa.Column("quantity", sa.Float(), nullable=False),
|
||||||
|
sa.Column("unit", sa.String(), nullable=False),
|
||||||
|
sa.Column("category", sa.String(), nullable=True),
|
||||||
|
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_items")),
|
||||||
|
sa.UniqueConstraint("name", name=op.f("uq_items_name")),
|
||||||
|
schema=schema,
|
||||||
|
)
|
||||||
|
op.create_table(
|
||||||
|
"meals",
|
||||||
|
sa.Column("name", sa.String(), nullable=False),
|
||||||
|
sa.Column("instructions", sa.String(), nullable=True),
|
||||||
|
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_meals")),
|
||||||
|
sa.UniqueConstraint("name", name=op.f("uq_meals_name")),
|
||||||
|
schema=schema,
|
||||||
|
)
|
||||||
|
op.create_table(
|
||||||
|
"meal_ingredients",
|
||||||
|
sa.Column("meal_id", sa.Integer(), nullable=False),
|
||||||
|
sa.Column("item_id", sa.Integer(), nullable=False),
|
||||||
|
sa.Column("quantity_needed", sa.Float(), 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(["item_id"], [f"{schema}.items.id"], name=op.f("fk_meal_ingredients_item_id_items")),
|
||||||
|
sa.ForeignKeyConstraint(["meal_id"], [f"{schema}.meals.id"], name=op.f("fk_meal_ingredients_meal_id_meals")),
|
||||||
|
sa.PrimaryKeyConstraint("id", name=op.f("pk_meal_ingredients")),
|
||||||
|
sa.UniqueConstraint("meal_id", "item_id", name=op.f("uq_meal_ingredients_meal_id")),
|
||||||
|
schema=schema,
|
||||||
|
)
|
||||||
|
# ### end Alembic commands ###
|
||||||
|
|
||||||
|
|
||||||
|
def downgrade() -> None:
|
||||||
|
"""Downgrade."""
|
||||||
|
# ### commands auto generated by Alembic - please adjust! ###
|
||||||
|
op.drop_table("meal_ingredients", schema=schema)
|
||||||
|
op.drop_table("meals", schema=schema)
|
||||||
|
op.drop_table("items", schema=schema)
|
||||||
|
# ### end Alembic commands ###
|
||||||
1
python/api/__init__.py
Normal file
1
python/api/__init__.py
Normal file
@@ -0,0 +1 @@
|
|||||||
|
"""FastAPI applications."""
|
||||||
16
python/api/dependencies.py
Normal file
16
python/api/dependencies.py
Normal file
@@ -0,0 +1,16 @@
|
|||||||
|
"""FastAPI dependencies."""
|
||||||
|
|
||||||
|
from collections.abc import Iterator
|
||||||
|
from typing import Annotated
|
||||||
|
|
||||||
|
from fastapi import Depends, Request
|
||||||
|
from sqlalchemy.orm import Session
|
||||||
|
|
||||||
|
|
||||||
|
def get_db(request: Request) -> Iterator[Session]:
|
||||||
|
"""Get database session from app state."""
|
||||||
|
with Session(request.app.state.engine) as session:
|
||||||
|
yield session
|
||||||
|
|
||||||
|
|
||||||
|
DbSession = Annotated[Session, Depends(get_db)]
|
||||||
117
python/api/main.py
Normal file
117
python/api/main.py
Normal file
@@ -0,0 +1,117 @@
|
|||||||
|
"""FastAPI interface for Contact database."""
|
||||||
|
|
||||||
|
import logging
|
||||||
|
import shutil
|
||||||
|
import subprocess
|
||||||
|
import tempfile
|
||||||
|
from collections.abc import AsyncIterator
|
||||||
|
from contextlib import asynccontextmanager
|
||||||
|
from os import environ
|
||||||
|
from pathlib import Path
|
||||||
|
from typing import Annotated
|
||||||
|
|
||||||
|
import typer
|
||||||
|
import uvicorn
|
||||||
|
from fastapi import FastAPI
|
||||||
|
|
||||||
|
from python.api.routers import contact_router, create_frontend_router
|
||||||
|
from python.common import configure_logger
|
||||||
|
from python.orm.common import get_postgres_engine
|
||||||
|
|
||||||
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|
||||||
|
def create_app(frontend_dir: Path | None = None) -> FastAPI:
|
||||||
|
"""Create and configure the FastAPI application."""
|
||||||
|
|
||||||
|
@asynccontextmanager
|
||||||
|
async def lifespan(app: FastAPI) -> AsyncIterator[None]:
|
||||||
|
"""Manage application lifespan."""
|
||||||
|
app.state.engine = get_postgres_engine()
|
||||||
|
yield
|
||||||
|
app.state.engine.dispose()
|
||||||
|
|
||||||
|
app = FastAPI(title="Contact Database API", lifespan=lifespan)
|
||||||
|
|
||||||
|
app.include_router(contact_router)
|
||||||
|
|
||||||
|
if frontend_dir:
|
||||||
|
logger.info(f"Serving frontend from {frontend_dir}")
|
||||||
|
frontend_router = create_frontend_router(frontend_dir)
|
||||||
|
app.include_router(frontend_router)
|
||||||
|
|
||||||
|
return app
|
||||||
|
|
||||||
|
|
||||||
|
def build_frontend(source_dir: Path | None, cache_dir: Path | None = None) -> Path | None:
|
||||||
|
"""Run npm build and copy output to a temp directory.
|
||||||
|
|
||||||
|
Works even if source_dir is read-only by copying to a temp directory first.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
source_dir: Frontend source directory.
|
||||||
|
cache_dir: Optional npm cache directory for faster repeated builds.
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Path to frontend build directory, or None if no source_dir provided.
|
||||||
|
"""
|
||||||
|
if not source_dir:
|
||||||
|
return None
|
||||||
|
|
||||||
|
if not source_dir.exists():
|
||||||
|
error = f"Frontend directory {source_dir} does not exist"
|
||||||
|
raise FileExistsError(error)
|
||||||
|
|
||||||
|
logger.info("Building frontend from %s...", source_dir)
|
||||||
|
|
||||||
|
# Copy source to a writable temp directory
|
||||||
|
build_dir = Path(tempfile.mkdtemp(prefix="contact_frontend_build_"))
|
||||||
|
shutil.copytree(source_dir, build_dir, dirs_exist_ok=True)
|
||||||
|
|
||||||
|
env = dict(environ)
|
||||||
|
if cache_dir:
|
||||||
|
cache_dir.mkdir(parents=True, exist_ok=True)
|
||||||
|
env["npm_config_cache"] = str(cache_dir)
|
||||||
|
|
||||||
|
subprocess.run(["npm", "install"], cwd=build_dir, env=env, check=True) # noqa: S607
|
||||||
|
subprocess.run(["npm", "run", "build"], cwd=build_dir, env=env, check=True) # noqa: S607
|
||||||
|
|
||||||
|
dist_dir = build_dir / "dist"
|
||||||
|
if not dist_dir.exists():
|
||||||
|
error = f"Build output not found at {dist_dir}"
|
||||||
|
raise FileNotFoundError(error)
|
||||||
|
|
||||||
|
output_dir = Path(tempfile.mkdtemp(prefix="contact_frontend_"))
|
||||||
|
shutil.copytree(dist_dir, output_dir, dirs_exist_ok=True)
|
||||||
|
logger.info(f"Frontend built and copied to {output_dir}")
|
||||||
|
|
||||||
|
shutil.rmtree(build_dir)
|
||||||
|
|
||||||
|
return output_dir
|
||||||
|
|
||||||
|
|
||||||
|
def serve(
|
||||||
|
host: Annotated[str, typer.Option("--host", "-h", help="Host to bind to")],
|
||||||
|
frontend_dir: Annotated[
|
||||||
|
Path | None,
|
||||||
|
typer.Option(
|
||||||
|
"--frontend-dir",
|
||||||
|
"-f",
|
||||||
|
help="Frontend source directory. If provided, runs npm build and serves from temp dir.",
|
||||||
|
),
|
||||||
|
] = None,
|
||||||
|
port: Annotated[int, typer.Option("--port", "-p", help="Port to bind to")] = 8000,
|
||||||
|
log_level: Annotated[str, typer.Option("--log-level", "-l", help="Log level")] = "INFO",
|
||||||
|
) -> None:
|
||||||
|
"""Start the Contact API server."""
|
||||||
|
configure_logger(log_level)
|
||||||
|
|
||||||
|
cache_dir = Path(environ["HOME"]) / ".npm"
|
||||||
|
serve_dir = build_frontend(frontend_dir, cache_dir=cache_dir)
|
||||||
|
|
||||||
|
app = create_app(frontend_dir=serve_dir)
|
||||||
|
uvicorn.run(app, host=host, port=port)
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
typer.run(serve)
|
||||||
6
python/api/routers/__init__.py
Normal file
6
python/api/routers/__init__.py
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
"""API routers."""
|
||||||
|
|
||||||
|
from python.api.routers.contact import router as contact_router
|
||||||
|
from python.api.routers.frontend import create_frontend_router
|
||||||
|
|
||||||
|
__all__ = ["contact_router", "create_frontend_router"]
|
||||||
459
python/api/routers/contact.py
Normal file
459
python/api/routers/contact.py
Normal file
@@ -0,0 +1,459 @@
|
|||||||
|
"""Contact API router."""
|
||||||
|
|
||||||
|
from fastapi import APIRouter, HTTPException
|
||||||
|
from pydantic import BaseModel
|
||||||
|
from sqlalchemy import select
|
||||||
|
from sqlalchemy.orm import selectinload
|
||||||
|
|
||||||
|
from python.api.dependencies import DbSession
|
||||||
|
from python.orm.richie.contact import Contact, ContactRelationship, Need, RelationshipType
|
||||||
|
|
||||||
|
|
||||||
|
class NeedBase(BaseModel):
|
||||||
|
"""Base schema for Need."""
|
||||||
|
|
||||||
|
name: str
|
||||||
|
description: str | None = None
|
||||||
|
|
||||||
|
|
||||||
|
class NeedCreate(NeedBase):
|
||||||
|
"""Schema for creating a Need."""
|
||||||
|
|
||||||
|
|
||||||
|
class NeedResponse(NeedBase):
|
||||||
|
"""Schema for Need response."""
|
||||||
|
|
||||||
|
id: int
|
||||||
|
|
||||||
|
model_config = {"from_attributes": True}
|
||||||
|
|
||||||
|
|
||||||
|
class ContactRelationshipCreate(BaseModel):
|
||||||
|
"""Schema for creating a contact relationship."""
|
||||||
|
|
||||||
|
related_contact_id: int
|
||||||
|
relationship_type: RelationshipType
|
||||||
|
closeness_weight: int | None = None
|
||||||
|
|
||||||
|
|
||||||
|
class ContactRelationshipUpdate(BaseModel):
|
||||||
|
"""Schema for updating a contact relationship."""
|
||||||
|
|
||||||
|
relationship_type: RelationshipType | None = None
|
||||||
|
closeness_weight: int | None = None
|
||||||
|
|
||||||
|
|
||||||
|
class ContactRelationshipResponse(BaseModel):
|
||||||
|
"""Schema for contact relationship response."""
|
||||||
|
|
||||||
|
contact_id: int
|
||||||
|
related_contact_id: int
|
||||||
|
relationship_type: str
|
||||||
|
closeness_weight: int
|
||||||
|
|
||||||
|
model_config = {"from_attributes": True}
|
||||||
|
|
||||||
|
|
||||||
|
class RelationshipTypeInfo(BaseModel):
|
||||||
|
"""Information about a relationship type."""
|
||||||
|
|
||||||
|
value: str
|
||||||
|
display_name: str
|
||||||
|
default_weight: int
|
||||||
|
|
||||||
|
|
||||||
|
class GraphNode(BaseModel):
|
||||||
|
"""Node in the relationship graph."""
|
||||||
|
|
||||||
|
id: int
|
||||||
|
name: str
|
||||||
|
current_job: str | None = None
|
||||||
|
|
||||||
|
|
||||||
|
class GraphEdge(BaseModel):
|
||||||
|
"""Edge in the relationship graph."""
|
||||||
|
|
||||||
|
source: int
|
||||||
|
target: int
|
||||||
|
relationship_type: str
|
||||||
|
closeness_weight: int
|
||||||
|
|
||||||
|
|
||||||
|
class GraphData(BaseModel):
|
||||||
|
"""Complete graph data for visualization."""
|
||||||
|
|
||||||
|
nodes: list[GraphNode]
|
||||||
|
edges: list[GraphEdge]
|
||||||
|
|
||||||
|
|
||||||
|
class ContactBase(BaseModel):
|
||||||
|
"""Base schema for Contact."""
|
||||||
|
|
||||||
|
name: str
|
||||||
|
age: int | None = None
|
||||||
|
bio: str | None = None
|
||||||
|
current_job: str | None = None
|
||||||
|
gender: str | None = None
|
||||||
|
goals: str | None = None
|
||||||
|
legal_name: str | None = None
|
||||||
|
profile_pic: str | None = None
|
||||||
|
safe_conversation_starters: str | None = None
|
||||||
|
self_sufficiency_score: int | None = None
|
||||||
|
social_structure_style: str | None = None
|
||||||
|
ssn: str | None = None
|
||||||
|
suffix: str | None = None
|
||||||
|
timezone: str | None = None
|
||||||
|
topics_to_avoid: str | None = None
|
||||||
|
|
||||||
|
|
||||||
|
class ContactCreate(ContactBase):
|
||||||
|
"""Schema for creating a Contact."""
|
||||||
|
|
||||||
|
need_ids: list[int] = []
|
||||||
|
|
||||||
|
|
||||||
|
class ContactUpdate(BaseModel):
|
||||||
|
"""Schema for updating a Contact."""
|
||||||
|
|
||||||
|
name: str | None = None
|
||||||
|
age: int | None = None
|
||||||
|
bio: str | None = None
|
||||||
|
current_job: str | None = None
|
||||||
|
gender: str | None = None
|
||||||
|
goals: str | None = None
|
||||||
|
legal_name: str | None = None
|
||||||
|
profile_pic: str | None = None
|
||||||
|
safe_conversation_starters: str | None = None
|
||||||
|
self_sufficiency_score: int | None = None
|
||||||
|
social_structure_style: str | None = None
|
||||||
|
ssn: str | None = None
|
||||||
|
suffix: str | None = None
|
||||||
|
timezone: str | None = None
|
||||||
|
topics_to_avoid: str | None = None
|
||||||
|
need_ids: list[int] | None = None
|
||||||
|
|
||||||
|
|
||||||
|
class ContactResponse(ContactBase):
|
||||||
|
"""Schema for Contact response with relationships."""
|
||||||
|
|
||||||
|
id: int
|
||||||
|
needs: list[NeedResponse] = []
|
||||||
|
related_to: list[ContactRelationshipResponse] = []
|
||||||
|
related_from: list[ContactRelationshipResponse] = []
|
||||||
|
|
||||||
|
model_config = {"from_attributes": True}
|
||||||
|
|
||||||
|
|
||||||
|
class ContactListResponse(ContactBase):
|
||||||
|
"""Schema for Contact list response."""
|
||||||
|
|
||||||
|
id: int
|
||||||
|
|
||||||
|
model_config = {"from_attributes": True}
|
||||||
|
|
||||||
|
|
||||||
|
router = APIRouter(prefix="/api", tags=["contacts"])
|
||||||
|
|
||||||
|
|
||||||
|
@router.post("/needs", response_model=NeedResponse)
|
||||||
|
def create_need(need: NeedCreate, db: DbSession) -> Need:
|
||||||
|
"""Create a new need."""
|
||||||
|
db_need = Need(name=need.name, description=need.description)
|
||||||
|
db.add(db_need)
|
||||||
|
db.commit()
|
||||||
|
db.refresh(db_need)
|
||||||
|
return db_need
|
||||||
|
|
||||||
|
|
||||||
|
@router.get("/needs", response_model=list[NeedResponse])
|
||||||
|
def list_needs(db: DbSession) -> list[Need]:
|
||||||
|
"""List all needs."""
|
||||||
|
return list(db.scalars(select(Need)).all())
|
||||||
|
|
||||||
|
|
||||||
|
@router.get("/needs/{need_id}", response_model=NeedResponse)
|
||||||
|
def get_need(need_id: int, db: DbSession) -> Need:
|
||||||
|
"""Get a need by ID."""
|
||||||
|
need = db.get(Need, need_id)
|
||||||
|
if not need:
|
||||||
|
raise HTTPException(status_code=404, detail="Need not found")
|
||||||
|
return need
|
||||||
|
|
||||||
|
|
||||||
|
@router.delete("/needs/{need_id}")
|
||||||
|
def delete_need(need_id: int, db: DbSession) -> dict[str, bool]:
|
||||||
|
"""Delete a need by ID."""
|
||||||
|
need = db.get(Need, need_id)
|
||||||
|
if not need:
|
||||||
|
raise HTTPException(status_code=404, detail="Need not found")
|
||||||
|
db.delete(need)
|
||||||
|
db.commit()
|
||||||
|
return {"deleted": True}
|
||||||
|
|
||||||
|
|
||||||
|
@router.post("/contacts", response_model=ContactResponse)
|
||||||
|
def create_contact(contact: ContactCreate, db: DbSession) -> Contact:
|
||||||
|
"""Create a new contact."""
|
||||||
|
need_ids = contact.need_ids
|
||||||
|
contact_data = contact.model_dump(exclude={"need_ids"})
|
||||||
|
db_contact = Contact(**contact_data)
|
||||||
|
|
||||||
|
if need_ids:
|
||||||
|
needs = list(db.scalars(select(Need).where(Need.id.in_(need_ids))).all())
|
||||||
|
db_contact.needs = needs
|
||||||
|
|
||||||
|
db.add(db_contact)
|
||||||
|
db.commit()
|
||||||
|
db.refresh(db_contact)
|
||||||
|
return db_contact
|
||||||
|
|
||||||
|
|
||||||
|
@router.get("/contacts", response_model=list[ContactListResponse])
|
||||||
|
def list_contacts(
|
||||||
|
db: DbSession,
|
||||||
|
skip: int = 0,
|
||||||
|
limit: int = 100,
|
||||||
|
) -> list[Contact]:
|
||||||
|
"""List all contacts with pagination."""
|
||||||
|
return list(db.scalars(select(Contact).offset(skip).limit(limit)).all())
|
||||||
|
|
||||||
|
|
||||||
|
@router.get("/contacts/{contact_id}", response_model=ContactResponse)
|
||||||
|
def get_contact(contact_id: int, db: DbSession) -> Contact:
|
||||||
|
"""Get a contact by ID with all relationships."""
|
||||||
|
contact = db.scalar(
|
||||||
|
select(Contact)
|
||||||
|
.where(Contact.id == contact_id)
|
||||||
|
.options(
|
||||||
|
selectinload(Contact.needs),
|
||||||
|
selectinload(Contact.related_to),
|
||||||
|
selectinload(Contact.related_from),
|
||||||
|
)
|
||||||
|
)
|
||||||
|
if not contact:
|
||||||
|
raise HTTPException(status_code=404, detail="Contact not found")
|
||||||
|
return contact
|
||||||
|
|
||||||
|
|
||||||
|
@router.patch("/contacts/{contact_id}", response_model=ContactResponse)
|
||||||
|
def update_contact(
|
||||||
|
contact_id: int,
|
||||||
|
contact: ContactUpdate,
|
||||||
|
db: DbSession,
|
||||||
|
) -> Contact:
|
||||||
|
"""Update a contact by ID."""
|
||||||
|
db_contact = db.get(Contact, contact_id)
|
||||||
|
if not db_contact:
|
||||||
|
raise HTTPException(status_code=404, detail="Contact not found")
|
||||||
|
|
||||||
|
update_data = contact.model_dump(exclude_unset=True)
|
||||||
|
need_ids = update_data.pop("need_ids", None)
|
||||||
|
|
||||||
|
for key, value in update_data.items():
|
||||||
|
setattr(db_contact, key, value)
|
||||||
|
|
||||||
|
if need_ids is not None:
|
||||||
|
needs = list(db.scalars(select(Need).where(Need.id.in_(need_ids))).all())
|
||||||
|
db_contact.needs = needs
|
||||||
|
|
||||||
|
db.commit()
|
||||||
|
db.refresh(db_contact)
|
||||||
|
return db_contact
|
||||||
|
|
||||||
|
|
||||||
|
@router.delete("/contacts/{contact_id}")
|
||||||
|
def delete_contact(contact_id: int, db: DbSession) -> dict[str, bool]:
|
||||||
|
"""Delete a contact by ID."""
|
||||||
|
contact = db.get(Contact, contact_id)
|
||||||
|
if not contact:
|
||||||
|
raise HTTPException(status_code=404, detail="Contact not found")
|
||||||
|
db.delete(contact)
|
||||||
|
db.commit()
|
||||||
|
return {"deleted": True}
|
||||||
|
|
||||||
|
|
||||||
|
@router.post("/contacts/{contact_id}/needs/{need_id}")
|
||||||
|
def add_need_to_contact(
|
||||||
|
contact_id: int,
|
||||||
|
need_id: int,
|
||||||
|
db: DbSession,
|
||||||
|
) -> dict[str, bool]:
|
||||||
|
"""Add a need to a contact."""
|
||||||
|
contact = db.get(Contact, contact_id)
|
||||||
|
if not contact:
|
||||||
|
raise HTTPException(status_code=404, detail="Contact not found")
|
||||||
|
|
||||||
|
need = db.get(Need, need_id)
|
||||||
|
if not need:
|
||||||
|
raise HTTPException(status_code=404, detail="Need not found")
|
||||||
|
|
||||||
|
if need not in contact.needs:
|
||||||
|
contact.needs.append(need)
|
||||||
|
db.commit()
|
||||||
|
|
||||||
|
return {"added": True}
|
||||||
|
|
||||||
|
|
||||||
|
@router.delete("/contacts/{contact_id}/needs/{need_id}")
|
||||||
|
def remove_need_from_contact(
|
||||||
|
contact_id: int,
|
||||||
|
need_id: int,
|
||||||
|
db: DbSession,
|
||||||
|
) -> dict[str, bool]:
|
||||||
|
"""Remove a need from a contact."""
|
||||||
|
contact = db.get(Contact, contact_id)
|
||||||
|
if not contact:
|
||||||
|
raise HTTPException(status_code=404, detail="Contact not found")
|
||||||
|
|
||||||
|
need = db.get(Need, need_id)
|
||||||
|
if not need:
|
||||||
|
raise HTTPException(status_code=404, detail="Need not found")
|
||||||
|
|
||||||
|
if need in contact.needs:
|
||||||
|
contact.needs.remove(need)
|
||||||
|
db.commit()
|
||||||
|
|
||||||
|
return {"removed": True}
|
||||||
|
|
||||||
|
|
||||||
|
@router.post(
|
||||||
|
"/contacts/{contact_id}/relationships",
|
||||||
|
response_model=ContactRelationshipResponse,
|
||||||
|
)
|
||||||
|
def add_contact_relationship(
|
||||||
|
contact_id: int,
|
||||||
|
relationship: ContactRelationshipCreate,
|
||||||
|
db: DbSession,
|
||||||
|
) -> ContactRelationship:
|
||||||
|
"""Add a relationship between two contacts."""
|
||||||
|
contact = db.get(Contact, contact_id)
|
||||||
|
if not contact:
|
||||||
|
raise HTTPException(status_code=404, detail="Contact not found")
|
||||||
|
|
||||||
|
related_contact = db.get(Contact, relationship.related_contact_id)
|
||||||
|
if not related_contact:
|
||||||
|
raise HTTPException(status_code=404, detail="Related contact not found")
|
||||||
|
|
||||||
|
if contact_id == relationship.related_contact_id:
|
||||||
|
raise HTTPException(status_code=400, detail="Cannot relate contact to itself")
|
||||||
|
|
||||||
|
# Use provided weight or default from relationship type
|
||||||
|
weight = relationship.closeness_weight
|
||||||
|
if weight is None:
|
||||||
|
weight = relationship.relationship_type.default_weight
|
||||||
|
|
||||||
|
db_relationship = ContactRelationship(
|
||||||
|
contact_id=contact_id,
|
||||||
|
related_contact_id=relationship.related_contact_id,
|
||||||
|
relationship_type=relationship.relationship_type.value,
|
||||||
|
closeness_weight=weight,
|
||||||
|
)
|
||||||
|
db.add(db_relationship)
|
||||||
|
db.commit()
|
||||||
|
db.refresh(db_relationship)
|
||||||
|
return db_relationship
|
||||||
|
|
||||||
|
|
||||||
|
@router.get(
|
||||||
|
"/contacts/{contact_id}/relationships",
|
||||||
|
response_model=list[ContactRelationshipResponse],
|
||||||
|
)
|
||||||
|
def get_contact_relationships(
|
||||||
|
contact_id: int,
|
||||||
|
db: DbSession,
|
||||||
|
) -> list[ContactRelationship]:
|
||||||
|
"""Get all relationships for a contact."""
|
||||||
|
contact = db.get(Contact, contact_id)
|
||||||
|
if not contact:
|
||||||
|
raise HTTPException(status_code=404, detail="Contact not found")
|
||||||
|
|
||||||
|
outgoing = list(db.scalars(select(ContactRelationship).where(ContactRelationship.contact_id == contact_id)).all())
|
||||||
|
incoming = list(
|
||||||
|
db.scalars(select(ContactRelationship).where(ContactRelationship.related_contact_id == contact_id)).all()
|
||||||
|
)
|
||||||
|
return outgoing + incoming
|
||||||
|
|
||||||
|
|
||||||
|
@router.patch(
|
||||||
|
"/contacts/{contact_id}/relationships/{related_contact_id}",
|
||||||
|
response_model=ContactRelationshipResponse,
|
||||||
|
)
|
||||||
|
def update_contact_relationship(
|
||||||
|
contact_id: int,
|
||||||
|
related_contact_id: int,
|
||||||
|
update: ContactRelationshipUpdate,
|
||||||
|
db: DbSession,
|
||||||
|
) -> ContactRelationship:
|
||||||
|
"""Update a relationship between two contacts."""
|
||||||
|
relationship = db.scalar(
|
||||||
|
select(ContactRelationship).where(
|
||||||
|
ContactRelationship.contact_id == contact_id,
|
||||||
|
ContactRelationship.related_contact_id == related_contact_id,
|
||||||
|
)
|
||||||
|
)
|
||||||
|
if not relationship:
|
||||||
|
raise HTTPException(status_code=404, detail="Relationship not found")
|
||||||
|
|
||||||
|
if update.relationship_type is not None:
|
||||||
|
relationship.relationship_type = update.relationship_type.value
|
||||||
|
if update.closeness_weight is not None:
|
||||||
|
relationship.closeness_weight = update.closeness_weight
|
||||||
|
|
||||||
|
db.commit()
|
||||||
|
db.refresh(relationship)
|
||||||
|
return relationship
|
||||||
|
|
||||||
|
|
||||||
|
@router.delete("/contacts/{contact_id}/relationships/{related_contact_id}")
|
||||||
|
def remove_contact_relationship(
|
||||||
|
contact_id: int,
|
||||||
|
related_contact_id: int,
|
||||||
|
db: DbSession,
|
||||||
|
) -> dict[str, bool]:
|
||||||
|
"""Remove a relationship between two contacts."""
|
||||||
|
relationship = db.scalar(
|
||||||
|
select(ContactRelationship).where(
|
||||||
|
ContactRelationship.contact_id == contact_id,
|
||||||
|
ContactRelationship.related_contact_id == related_contact_id,
|
||||||
|
)
|
||||||
|
)
|
||||||
|
if not relationship:
|
||||||
|
raise HTTPException(status_code=404, detail="Relationship not found")
|
||||||
|
|
||||||
|
db.delete(relationship)
|
||||||
|
db.commit()
|
||||||
|
return {"deleted": True}
|
||||||
|
|
||||||
|
|
||||||
|
@router.get("/relationship-types")
|
||||||
|
def list_relationship_types() -> list[RelationshipTypeInfo]:
|
||||||
|
"""List all available relationship types with their default weights."""
|
||||||
|
return [
|
||||||
|
RelationshipTypeInfo(
|
||||||
|
value=rt.value,
|
||||||
|
display_name=rt.display_name,
|
||||||
|
default_weight=rt.default_weight,
|
||||||
|
)
|
||||||
|
for rt in RelationshipType
|
||||||
|
]
|
||||||
|
|
||||||
|
|
||||||
|
@router.get("/graph")
|
||||||
|
def get_relationship_graph(db: DbSession) -> GraphData:
|
||||||
|
"""Get all contacts and relationships as graph data for visualization."""
|
||||||
|
contacts = list(db.scalars(select(Contact)).all())
|
||||||
|
relationships = list(db.scalars(select(ContactRelationship)).all())
|
||||||
|
|
||||||
|
nodes = [GraphNode(id=c.id, name=c.name, current_job=c.current_job) for c in contacts]
|
||||||
|
|
||||||
|
edges = [
|
||||||
|
GraphEdge(
|
||||||
|
source=rel.contact_id,
|
||||||
|
target=rel.related_contact_id,
|
||||||
|
relationship_type=rel.relationship_type,
|
||||||
|
closeness_weight=rel.closeness_weight,
|
||||||
|
)
|
||||||
|
for rel in relationships
|
||||||
|
]
|
||||||
|
|
||||||
|
return GraphData(nodes=nodes, edges=edges)
|
||||||
24
python/api/routers/frontend.py
Normal file
24
python/api/routers/frontend.py
Normal file
@@ -0,0 +1,24 @@
|
|||||||
|
"""Frontend SPA router."""
|
||||||
|
|
||||||
|
from pathlib import Path
|
||||||
|
|
||||||
|
from fastapi import APIRouter
|
||||||
|
from fastapi.responses import FileResponse
|
||||||
|
from fastapi.staticfiles import StaticFiles
|
||||||
|
|
||||||
|
|
||||||
|
def create_frontend_router(frontend_dir: Path) -> APIRouter:
|
||||||
|
"""Create a router for serving the frontend SPA."""
|
||||||
|
router = APIRouter(tags=["frontend"])
|
||||||
|
|
||||||
|
router.mount("/assets", StaticFiles(directory=frontend_dir / "assets"), name="assets")
|
||||||
|
|
||||||
|
@router.get("/{full_path:path}")
|
||||||
|
async def serve_spa(full_path: str) -> FileResponse:
|
||||||
|
"""Serve React SPA for all non-API routes."""
|
||||||
|
file_path = frontend_dir / full_path
|
||||||
|
if file_path.is_file():
|
||||||
|
return FileResponse(file_path)
|
||||||
|
return FileResponse(frontend_dir / "index.html")
|
||||||
|
|
||||||
|
return router
|
||||||
59
python/database.py
Normal file
59
python/database.py
Normal file
@@ -0,0 +1,59 @@
|
|||||||
|
"""database."""
|
||||||
|
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import logging
|
||||||
|
from typing import TYPE_CHECKING
|
||||||
|
|
||||||
|
from sqlalchemy import inspect
|
||||||
|
from sqlalchemy.exc import NoInspectionAvailable
|
||||||
|
|
||||||
|
if TYPE_CHECKING:
|
||||||
|
from collections.abc import Sequence
|
||||||
|
|
||||||
|
from sqlalchemy.orm import Session
|
||||||
|
|
||||||
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|
||||||
|
def safe_insert(orm_objects: Sequence[object], session: Session) -> list[tuple[Exception, object]]:
|
||||||
|
"""Safer insert at allows for partial rollbacks.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
orm_objects (Sequence[object]): Tables to insert.
|
||||||
|
session (Session): Database session.
|
||||||
|
"""
|
||||||
|
if unmapped := [orm_object for orm_object in orm_objects if not _is_mapped_instance(orm_object)]:
|
||||||
|
error = f"safe_insert expects ORM-mapped instances {unmapped}"
|
||||||
|
raise TypeError(error)
|
||||||
|
return _safe_insert(orm_objects, session)
|
||||||
|
|
||||||
|
|
||||||
|
def _safe_insert(objects: Sequence[object], session: Session) -> list[tuple[Exception, object]]:
|
||||||
|
exceptions: list[tuple[Exception, object]] = []
|
||||||
|
try:
|
||||||
|
session.add_all(objects)
|
||||||
|
session.commit()
|
||||||
|
|
||||||
|
except Exception as error:
|
||||||
|
session.rollback()
|
||||||
|
|
||||||
|
objects_len = len(objects)
|
||||||
|
if objects_len == 1:
|
||||||
|
logger.exception(objects)
|
||||||
|
return [(error, objects[0])]
|
||||||
|
|
||||||
|
middle = objects_len // 2
|
||||||
|
exceptions.extend(_safe_insert(objects=objects[:middle], session=session))
|
||||||
|
exceptions.extend(_safe_insert(objects=objects[middle:], session=session))
|
||||||
|
return exceptions
|
||||||
|
|
||||||
|
|
||||||
|
def _is_mapped_instance(obj: object) -> bool:
|
||||||
|
"""Return True if `obj` is a SQLAlchemy ORM-mapped instance."""
|
||||||
|
try:
|
||||||
|
inspect(obj) # raises NoInspectionAvailable if not mapped
|
||||||
|
except NoInspectionAvailable:
|
||||||
|
return False
|
||||||
|
else:
|
||||||
|
return True
|
||||||
115
python/database_cli.py
Normal file
115
python/database_cli.py
Normal file
@@ -0,0 +1,115 @@
|
|||||||
|
"""CLI wrapper around alembic for multi-database support.
|
||||||
|
|
||||||
|
Usage:
|
||||||
|
database <db_name> <command> [args...]
|
||||||
|
|
||||||
|
Examples:
|
||||||
|
database van_inventory upgrade head
|
||||||
|
database van_inventory downgrade head-1
|
||||||
|
database van_inventory revision --autogenerate -m "add meals table"
|
||||||
|
database van_inventory check
|
||||||
|
database richie check
|
||||||
|
database richie upgrade head
|
||||||
|
"""
|
||||||
|
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
from dataclasses import dataclass
|
||||||
|
from importlib import import_module
|
||||||
|
from typing import TYPE_CHECKING, Annotated
|
||||||
|
|
||||||
|
import typer
|
||||||
|
from alembic.config import CommandLine, Config
|
||||||
|
|
||||||
|
if TYPE_CHECKING:
|
||||||
|
from sqlalchemy.orm import DeclarativeBase
|
||||||
|
|
||||||
|
|
||||||
|
@dataclass(frozen=True)
|
||||||
|
class DatabaseConfig:
|
||||||
|
"""Configuration for a database."""
|
||||||
|
|
||||||
|
env_prefix: str
|
||||||
|
version_location: str
|
||||||
|
base_module: str
|
||||||
|
base_class_name: str
|
||||||
|
models_module: str
|
||||||
|
script_location: str = "python/alembic"
|
||||||
|
file_template: str = "%%(year)d_%%(month).2d_%%(day).2d-%%(slug)s_%%(rev)s"
|
||||||
|
|
||||||
|
def get_base(self) -> type[DeclarativeBase]:
|
||||||
|
"""Import and return the Base class."""
|
||||||
|
module = import_module(self.base_module)
|
||||||
|
return getattr(module, self.base_class_name)
|
||||||
|
|
||||||
|
def import_models(self) -> None:
|
||||||
|
"""Import ORM models so alembic autogenerate can detect them."""
|
||||||
|
import_module(self.models_module)
|
||||||
|
|
||||||
|
def alembic_config(self) -> Config:
|
||||||
|
"""Build an alembic Config for this database."""
|
||||||
|
# Runtime import needed — Config is in TYPE_CHECKING for the return type annotation
|
||||||
|
from alembic.config import Config as AlembicConfig # noqa: PLC0415
|
||||||
|
|
||||||
|
cfg = AlembicConfig()
|
||||||
|
cfg.set_main_option("script_location", self.script_location)
|
||||||
|
cfg.set_main_option("file_template", self.file_template)
|
||||||
|
cfg.set_main_option("prepend_sys_path", ".")
|
||||||
|
cfg.set_main_option("version_path_separator", "os")
|
||||||
|
cfg.set_main_option("version_locations", self.version_location)
|
||||||
|
cfg.set_main_option("revision_environment", "true")
|
||||||
|
cfg.set_section_option("post_write_hooks", "hooks", "dynamic_schema,import_postgresql,ruff")
|
||||||
|
cfg.set_section_option("post_write_hooks", "dynamic_schema.type", "dynamic_schema")
|
||||||
|
cfg.set_section_option("post_write_hooks", "import_postgresql.type", "import_postgresql")
|
||||||
|
cfg.set_section_option("post_write_hooks", "ruff.type", "ruff")
|
||||||
|
cfg.attributes["base"] = self.get_base()
|
||||||
|
cfg.attributes["env_prefix"] = self.env_prefix
|
||||||
|
self.import_models()
|
||||||
|
return cfg
|
||||||
|
|
||||||
|
|
||||||
|
DATABASES: dict[str, DatabaseConfig] = {
|
||||||
|
"richie": DatabaseConfig(
|
||||||
|
env_prefix="RICHIE",
|
||||||
|
version_location="python/alembic/richie/versions",
|
||||||
|
base_module="python.orm.richie.base",
|
||||||
|
base_class_name="RichieBase",
|
||||||
|
models_module="python.orm.richie",
|
||||||
|
),
|
||||||
|
"van_inventory": DatabaseConfig(
|
||||||
|
env_prefix="VAN_INVENTORY",
|
||||||
|
version_location="python/alembic/van_inventory/versions",
|
||||||
|
base_module="python.orm.van_inventory.base",
|
||||||
|
base_class_name="VanInventoryBase",
|
||||||
|
models_module="python.orm.van_inventory.models",
|
||||||
|
),
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
app = typer.Typer(help="Multi-database alembic wrapper.")
|
||||||
|
|
||||||
|
|
||||||
|
@app.command(
|
||||||
|
context_settings={"allow_extra_args": True, "ignore_unknown_options": True},
|
||||||
|
)
|
||||||
|
def main(
|
||||||
|
ctx: typer.Context,
|
||||||
|
db_name: Annotated[str, typer.Argument(help=f"Database name. Options: {', '.join(DATABASES)}")],
|
||||||
|
command: Annotated[str, typer.Argument(help="Alembic command (upgrade, downgrade, revision, check, etc.)")],
|
||||||
|
) -> None:
|
||||||
|
"""Run an alembic command against the specified database."""
|
||||||
|
db_config = DATABASES.get(db_name)
|
||||||
|
if not db_config:
|
||||||
|
typer.echo(f"Unknown database: {db_name!r}. Available: {', '.join(DATABASES)}", err=True)
|
||||||
|
raise typer.Exit(code=1)
|
||||||
|
|
||||||
|
alembic_cfg = db_config.alembic_config()
|
||||||
|
|
||||||
|
cmd_line = CommandLine()
|
||||||
|
options = cmd_line.parser.parse_args([command, *ctx.args])
|
||||||
|
cmd_line.run_cmd(alembic_cfg, options)
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
app()
|
||||||
|
|
||||||
1
python/eval_warnings/__init__.py
Normal file
1
python/eval_warnings/__init__.py
Normal file
@@ -0,0 +1 @@
|
|||||||
|
"""Detect Nix evaluation warnings from build logs and create PRs with LLM-suggested fixes."""
|
||||||
449
python/eval_warnings/main.py
Normal file
449
python/eval_warnings/main.py
Normal file
@@ -0,0 +1,449 @@
|
|||||||
|
"""Detect Nix evaluation warnings and create PRs with LLM-suggested fixes."""
|
||||||
|
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import hashlib
|
||||||
|
import logging
|
||||||
|
import re
|
||||||
|
import subprocess
|
||||||
|
from dataclasses import dataclass
|
||||||
|
from io import BytesIO
|
||||||
|
from pathlib import Path
|
||||||
|
from typing import Annotated
|
||||||
|
from zipfile import ZipFile
|
||||||
|
|
||||||
|
import typer
|
||||||
|
from httpx import HTTPError, post
|
||||||
|
|
||||||
|
from python.common import configure_logger
|
||||||
|
|
||||||
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|
||||||
|
@dataclass(frozen=True)
|
||||||
|
class EvalWarning:
|
||||||
|
"""A single Nix evaluation warning."""
|
||||||
|
|
||||||
|
system: str
|
||||||
|
message: str
|
||||||
|
|
||||||
|
|
||||||
|
@dataclass
|
||||||
|
class FileChange:
|
||||||
|
"""A file change suggested by the LLM."""
|
||||||
|
|
||||||
|
file_path: str
|
||||||
|
original: str
|
||||||
|
fixed: str
|
||||||
|
|
||||||
|
|
||||||
|
def run_cmd(cmd: list[str], *, check: bool = True) -> subprocess.CompletedProcess[str]:
|
||||||
|
"""Run a subprocess command and return the result.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
cmd: Command and arguments.
|
||||||
|
check: Whether to raise on non-zero exit.
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
CompletedProcess with captured stdout/stderr.
|
||||||
|
"""
|
||||||
|
logger.debug("Running: %s", " ".join(cmd))
|
||||||
|
return subprocess.run(cmd, capture_output=True, text=True, check=check)
|
||||||
|
|
||||||
|
|
||||||
|
def download_logs(run_id: str, repo: str) -> dict[str, str]:
|
||||||
|
"""Download build logs for a GitHub Actions run.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
run_id: The workflow run ID.
|
||||||
|
repo: The GitHub repository (owner/repo).
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Dict mapping zip entry names to their text content, filtered to build log files.
|
||||||
|
|
||||||
|
Raises:
|
||||||
|
RuntimeError: If log download fails.
|
||||||
|
"""
|
||||||
|
result = subprocess.run(
|
||||||
|
["gh", "api", f"repos/{repo}/actions/runs/{run_id}/logs"],
|
||||||
|
capture_output=True,
|
||||||
|
check=False,
|
||||||
|
)
|
||||||
|
if result.returncode != 0:
|
||||||
|
msg = f"Failed to download logs: {result.stderr.decode(errors='replace')}"
|
||||||
|
raise RuntimeError(msg)
|
||||||
|
|
||||||
|
logs: dict[str, str] = {}
|
||||||
|
with ZipFile(BytesIO(result.stdout)) as zip_file:
|
||||||
|
for name in zip_file.namelist():
|
||||||
|
if name.startswith("build-") and name.endswith(".txt"):
|
||||||
|
logs[name] = zip_file.read(name).decode(errors="replace")
|
||||||
|
|
||||||
|
return logs
|
||||||
|
|
||||||
|
|
||||||
|
def parse_warnings(logs: dict[str, str]) -> set[EvalWarning]:
|
||||||
|
"""Parse Nix evaluation warnings from build log contents.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
logs: Dict mapping zip entry names (e.g. "build-bob/2_Build.txt") to their text.
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Deduplicated set of warnings.
|
||||||
|
"""
|
||||||
|
warnings: set[EvalWarning] = set()
|
||||||
|
warning_pattern = re.compile(r"(?:^[\d\-T:.Z]+ )?(warning:|trace: warning:)")
|
||||||
|
timestamp_prefix = re.compile(r"^[\d\-T:.Z]+ ")
|
||||||
|
|
||||||
|
for name, content in sorted(logs.items()):
|
||||||
|
system = name.split("/")[0].removeprefix("build-")
|
||||||
|
for line in content.splitlines():
|
||||||
|
if warning_pattern.search(line):
|
||||||
|
message = timestamp_prefix.sub("", line).strip()
|
||||||
|
if message.startswith("warning: ignoring untrusted flake configuration setting"):
|
||||||
|
continue
|
||||||
|
logger.debug(f"Found warning: {line}")
|
||||||
|
warnings.add(EvalWarning(system=system, message=message))
|
||||||
|
|
||||||
|
logger.info("Found %d unique warnings", len(warnings))
|
||||||
|
return warnings
|
||||||
|
|
||||||
|
|
||||||
|
def extract_referenced_files(warnings: set[EvalWarning]) -> dict[str, str]:
|
||||||
|
"""Extract file paths referenced in warnings and read their contents.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
warnings: List of parsed warnings.
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Dict mapping repo-relative file paths to their contents.
|
||||||
|
"""
|
||||||
|
paths: set[str] = set()
|
||||||
|
warning_text = "\n".join(w.message for w in warnings)
|
||||||
|
|
||||||
|
nix_store_path = re.compile(r"/nix/store/[^/]+-source/([^:]+\.nix)")
|
||||||
|
for match in nix_store_path.finditer(warning_text):
|
||||||
|
paths.add(match.group(1))
|
||||||
|
|
||||||
|
repo_relative_path = re.compile(r"(?<![/\w])(systems|common|users|overlays)/[^:\s]+\.nix")
|
||||||
|
for match in repo_relative_path.finditer(warning_text):
|
||||||
|
paths.add(match.group(0))
|
||||||
|
|
||||||
|
files: dict[str, str] = {}
|
||||||
|
for path_str in sorted(paths):
|
||||||
|
path = Path(path_str)
|
||||||
|
if path.is_file():
|
||||||
|
files[path_str] = path.read_text()
|
||||||
|
|
||||||
|
if not files and Path("flake.nix").is_file():
|
||||||
|
files["flake.nix"] = Path("flake.nix").read_text()
|
||||||
|
|
||||||
|
logger.info("Extracted %d referenced files", len(files))
|
||||||
|
return files
|
||||||
|
|
||||||
|
|
||||||
|
def compute_warning_hash(warnings: set[EvalWarning]) -> str:
|
||||||
|
"""Compute a short hash of the warning set for deduplication.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
warnings: List of warnings.
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
8-character hex hash.
|
||||||
|
"""
|
||||||
|
text = "\n".join(sorted(f"[{w.system}] {w.message}" for w in warnings))
|
||||||
|
return hashlib.sha256(text.encode()).hexdigest()[:8]
|
||||||
|
|
||||||
|
|
||||||
|
def check_duplicate_pr(warning_hash: str) -> bool:
|
||||||
|
"""Check if an open PR already exists for this warning hash.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
warning_hash: The hash to check.
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
True if a duplicate PR exists.
|
||||||
|
|
||||||
|
Raises:
|
||||||
|
RuntimeError: If the gh CLI call fails.
|
||||||
|
"""
|
||||||
|
result = run_cmd(
|
||||||
|
[
|
||||||
|
"gh",
|
||||||
|
"pr",
|
||||||
|
"list",
|
||||||
|
"--state",
|
||||||
|
"open",
|
||||||
|
"--label",
|
||||||
|
"eval-warning-fix",
|
||||||
|
"--json",
|
||||||
|
"title",
|
||||||
|
"--jq",
|
||||||
|
".[].title",
|
||||||
|
],
|
||||||
|
check=False,
|
||||||
|
)
|
||||||
|
if result.returncode != 0:
|
||||||
|
msg = f"Failed to check for duplicate PRs: {result.stderr}"
|
||||||
|
raise RuntimeError(msg)
|
||||||
|
|
||||||
|
for title in result.stdout.splitlines():
|
||||||
|
if warning_hash in title:
|
||||||
|
logger.info("Duplicate PR found for hash %s", warning_hash)
|
||||||
|
return True
|
||||||
|
return False
|
||||||
|
|
||||||
|
|
||||||
|
def query_ollama(
|
||||||
|
warnings: set[EvalWarning],
|
||||||
|
files: dict[str, str],
|
||||||
|
ollama_url: str,
|
||||||
|
) -> str | None:
|
||||||
|
"""Query Ollama for a fix suggestion.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
warnings: List of warnings.
|
||||||
|
files: Referenced file contents.
|
||||||
|
ollama_url: Ollama API base URL.
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
LLM response text, or None on failure.
|
||||||
|
"""
|
||||||
|
warning_text = "\n".join(f"[{w.system}] {w.message}" for w in warnings)
|
||||||
|
file_context = "\n".join(f"--- FILE: {path} ---\n{content}\n--- END FILE ---" for path, content in files.items())
|
||||||
|
|
||||||
|
prompt = f"""You are a NixOS configuration expert. \
|
||||||
|
Analyze the following Nix evaluation warnings and suggest fixes.
|
||||||
|
|
||||||
|
## Warnings
|
||||||
|
{warning_text}
|
||||||
|
|
||||||
|
## Referenced Files
|
||||||
|
{file_context}
|
||||||
|
|
||||||
|
## Instructions
|
||||||
|
- Identify the root cause of each warning
|
||||||
|
- Provide the exact file changes needed to fix the warnings
|
||||||
|
- Output your response in two clearly separated sections:
|
||||||
|
1. **REASONING**: Brief explanation of what causes each warning and how to fix it
|
||||||
|
2. **CHANGES**: For each file that needs changes, output a block like:
|
||||||
|
FILE: path/to/file.nix
|
||||||
|
<<<<<<< ORIGINAL
|
||||||
|
the original lines to replace
|
||||||
|
=======
|
||||||
|
the replacement lines
|
||||||
|
>>>>>>> FIXED
|
||||||
|
- Only suggest changes for files that exist in the repository
|
||||||
|
- Do not add unnecessary complexity
|
||||||
|
- Preserve the existing code style
|
||||||
|
- If a warning comes from upstream nixpkgs and cannot be fixed in this repo, \
|
||||||
|
say so in REASONING and do not suggest changes"""
|
||||||
|
|
||||||
|
try:
|
||||||
|
response = post(
|
||||||
|
f"{ollama_url}/api/generate",
|
||||||
|
json={
|
||||||
|
"model": "qwen3-coder:30b",
|
||||||
|
"prompt": prompt,
|
||||||
|
"stream": False,
|
||||||
|
"options": {"num_predict": 4096},
|
||||||
|
},
|
||||||
|
timeout=300,
|
||||||
|
)
|
||||||
|
response.raise_for_status()
|
||||||
|
except HTTPError:
|
||||||
|
logger.exception("Ollama request failed")
|
||||||
|
return None
|
||||||
|
|
||||||
|
return response.json().get("response")
|
||||||
|
|
||||||
|
|
||||||
|
def parse_changes(response: str) -> list[FileChange]:
|
||||||
|
"""Parse file changes from the **CHANGES** section of the LLM response.
|
||||||
|
|
||||||
|
Expects blocks in the format:
|
||||||
|
FILE: path/to/file.nix
|
||||||
|
<<<<<<< ORIGINAL
|
||||||
|
...
|
||||||
|
=======
|
||||||
|
...
|
||||||
|
>>>>>>> FIXED
|
||||||
|
|
||||||
|
Args:
|
||||||
|
response: Raw LLM response text.
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
List of parsed file changes.
|
||||||
|
"""
|
||||||
|
if "**CHANGES**" not in response:
|
||||||
|
logger.warning("LLM response missing **CHANGES** section")
|
||||||
|
return []
|
||||||
|
|
||||||
|
changes_section = response.split("**CHANGES**", 1)[1]
|
||||||
|
|
||||||
|
changes: list[FileChange] = []
|
||||||
|
current_file = ""
|
||||||
|
section: str | None = None
|
||||||
|
original_lines: list[str] = []
|
||||||
|
fixed_lines: list[str] = []
|
||||||
|
|
||||||
|
for line in changes_section.splitlines():
|
||||||
|
stripped = line.strip()
|
||||||
|
if stripped.startswith("FILE:"):
|
||||||
|
current_file = stripped.removeprefix("FILE:").strip()
|
||||||
|
elif stripped == "<<<<<<< ORIGINAL":
|
||||||
|
section = "original"
|
||||||
|
original_lines = []
|
||||||
|
elif stripped == "=======" and section == "original":
|
||||||
|
section = "fixed"
|
||||||
|
fixed_lines = []
|
||||||
|
elif stripped == ">>>>>>> FIXED" and section == "fixed":
|
||||||
|
section = None
|
||||||
|
if current_file:
|
||||||
|
changes.append(FileChange(current_file, "\n".join(original_lines), "\n".join(fixed_lines)))
|
||||||
|
elif section == "original":
|
||||||
|
original_lines.append(line)
|
||||||
|
elif section == "fixed":
|
||||||
|
fixed_lines.append(line)
|
||||||
|
|
||||||
|
logger.info("Parsed %d file changes", len(changes))
|
||||||
|
return changes
|
||||||
|
|
||||||
|
|
||||||
|
def apply_changes(changes: list[FileChange]) -> int:
|
||||||
|
"""Apply file changes to the working directory.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
changes: List of changes to apply.
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Number of changes successfully applied.
|
||||||
|
"""
|
||||||
|
applied = 0
|
||||||
|
cwd = Path.cwd().resolve()
|
||||||
|
for change in changes:
|
||||||
|
path = Path(change.file_path).resolve()
|
||||||
|
if not path.is_relative_to(cwd):
|
||||||
|
logger.warning("Path traversal blocked: %s", change.file_path)
|
||||||
|
continue
|
||||||
|
if not path.is_file():
|
||||||
|
logger.warning("File not found: %s", change.file_path)
|
||||||
|
continue
|
||||||
|
|
||||||
|
content = path.read_text()
|
||||||
|
if change.original not in content:
|
||||||
|
logger.warning("Original text not found in %s", change.file_path)
|
||||||
|
continue
|
||||||
|
|
||||||
|
path.write_text(content.replace(change.original, change.fixed, 1))
|
||||||
|
logger.info("Applied fix to %s", change.file_path)
|
||||||
|
applied += 1
|
||||||
|
|
||||||
|
return applied
|
||||||
|
|
||||||
|
|
||||||
|
def create_pr(
|
||||||
|
warning_hash: str,
|
||||||
|
warnings: set[EvalWarning],
|
||||||
|
llm_response: str,
|
||||||
|
run_url: str,
|
||||||
|
) -> None:
|
||||||
|
"""Create a git branch and PR with the applied fixes.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
warning_hash: Short hash for branch naming and deduplication.
|
||||||
|
warnings: Original warnings for the PR body.
|
||||||
|
llm_response: Full LLM response for extracting reasoning.
|
||||||
|
run_url: URL to the triggering build run.
|
||||||
|
"""
|
||||||
|
branch = f"fix/eval-warning-{warning_hash}"
|
||||||
|
warning_text = "\n".join(f"[{w.system}] {w.message}" for w in warnings)
|
||||||
|
|
||||||
|
if "**REASONING**" not in llm_response:
|
||||||
|
logger.warning("LLM response missing **REASONING** section")
|
||||||
|
reasoning = ""
|
||||||
|
else:
|
||||||
|
_, after = llm_response.split("**REASONING**", 1)
|
||||||
|
reasoning = "\n".join(after.split("**CHANGES**", 1)[0].strip().splitlines()[:50])
|
||||||
|
|
||||||
|
run_cmd(["git", "config", "user.name", "github-actions[bot]"])
|
||||||
|
run_cmd(["git", "config", "user.email", "github-actions[bot]@users.noreply.github.com"])
|
||||||
|
run_cmd(["git", "checkout", "-b", branch])
|
||||||
|
run_cmd(["git", "add", "-A"])
|
||||||
|
|
||||||
|
diff_result = run_cmd(["git", "diff", "--cached", "--quiet"], check=False)
|
||||||
|
if diff_result.returncode == 0:
|
||||||
|
logger.info("No file changes to commit")
|
||||||
|
return
|
||||||
|
|
||||||
|
run_cmd(["git", "commit", "-m", f"fix: resolve nix evaluation warnings ({warning_hash})"])
|
||||||
|
run_cmd(["git", "push", "origin", branch, "--force"])
|
||||||
|
|
||||||
|
body = f"""## Nix Evaluation Warnings
|
||||||
|
|
||||||
|
Detected in [build_systems run]({run_url}):
|
||||||
|
|
||||||
|
```
|
||||||
|
{warning_text}
|
||||||
|
```
|
||||||
|
|
||||||
|
## LLM Analysis (qwen3-coder:30b)
|
||||||
|
|
||||||
|
{reasoning}
|
||||||
|
|
||||||
|
---
|
||||||
|
*Auto-generated by fix_eval_warnings. Review carefully before merging.*"""
|
||||||
|
|
||||||
|
run_cmd(
|
||||||
|
[
|
||||||
|
"gh",
|
||||||
|
"pr",
|
||||||
|
"create",
|
||||||
|
"--title",
|
||||||
|
f"fix: resolve nix eval warnings ({warning_hash})",
|
||||||
|
"--label",
|
||||||
|
"automated",
|
||||||
|
"--label",
|
||||||
|
"eval-warning-fix",
|
||||||
|
"--body",
|
||||||
|
body,
|
||||||
|
]
|
||||||
|
)
|
||||||
|
logger.info("PR created on branch %s", branch)
|
||||||
|
|
||||||
|
|
||||||
|
def main(
|
||||||
|
run_id: Annotated[str, typer.Option("--run-id", help="GitHub Actions run ID")],
|
||||||
|
repo: Annotated[str, typer.Option("--repo", help="GitHub repository (owner/repo)")],
|
||||||
|
ollama_url: Annotated[str, typer.Option("--ollama-url", help="Ollama API base URL")],
|
||||||
|
run_url: Annotated[str, typer.Option("--run-url", help="URL to the triggering build run")],
|
||||||
|
log_level: Annotated[str, typer.Option("--log-level", "-l", help="Log level")] = "INFO",
|
||||||
|
) -> None:
|
||||||
|
"""Detect Nix evaluation warnings and create PRs with LLM-suggested fixes."""
|
||||||
|
configure_logger(log_level)
|
||||||
|
|
||||||
|
logs = download_logs(run_id, repo)
|
||||||
|
warnings = parse_warnings(logs)
|
||||||
|
if not warnings:
|
||||||
|
return
|
||||||
|
|
||||||
|
warning_hash = compute_warning_hash(warnings)
|
||||||
|
if check_duplicate_pr(warning_hash):
|
||||||
|
return
|
||||||
|
|
||||||
|
files = extract_referenced_files(warnings)
|
||||||
|
llm_response = query_ollama(warnings, files, ollama_url)
|
||||||
|
if not llm_response:
|
||||||
|
return
|
||||||
|
|
||||||
|
changes = parse_changes(llm_response)
|
||||||
|
applied = apply_changes(changes)
|
||||||
|
if applied == 0:
|
||||||
|
logger.info("No changes could be applied")
|
||||||
|
return
|
||||||
|
|
||||||
|
create_pr(warning_hash, warnings, llm_response, run_url)
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
typer.run(main)
|
||||||
1
python/heater/__init__.py
Normal file
1
python/heater/__init__.py
Normal file
@@ -0,0 +1 @@
|
|||||||
|
"""Tuya heater control service."""
|
||||||
69
python/heater/controller.py
Normal file
69
python/heater/controller.py
Normal file
@@ -0,0 +1,69 @@
|
|||||||
|
"""TinyTuya device controller for heater."""
|
||||||
|
|
||||||
|
import logging
|
||||||
|
|
||||||
|
import tinytuya
|
||||||
|
|
||||||
|
from python.heater.models import ActionResult, DeviceConfig, HeaterStatus
|
||||||
|
|
||||||
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
# DPS mapping for heater
|
||||||
|
DPS_POWER = "1" # bool: on/off
|
||||||
|
DPS_SETPOINT = "101" # int: target temp (read-only)
|
||||||
|
DPS_STATE = "102" # str: "Stop", "Heat", etc.
|
||||||
|
DPS_UNKNOWN = "104" # int: unknown
|
||||||
|
DPS_ERROR = "108" # int: last error code
|
||||||
|
|
||||||
|
|
||||||
|
class HeaterController:
|
||||||
|
"""Controls a Tuya heater device via local network."""
|
||||||
|
|
||||||
|
def __init__(self, config: DeviceConfig) -> None:
|
||||||
|
"""Initialize the controller."""
|
||||||
|
self.device = tinytuya.Device(config.device_id, config.ip, config.local_key)
|
||||||
|
self.device.set_version(config.version)
|
||||||
|
self.device.set_socketTimeout(0.5)
|
||||||
|
self.device.set_socketRetryLimit(1)
|
||||||
|
|
||||||
|
def status(self) -> HeaterStatus:
|
||||||
|
"""Get current heater status."""
|
||||||
|
data = self.device.status()
|
||||||
|
|
||||||
|
if "Error" in data:
|
||||||
|
logger.error("Device error: %s", data)
|
||||||
|
return HeaterStatus(power=False, raw_dps={"error": data["Error"]})
|
||||||
|
|
||||||
|
dps = data.get("dps", {})
|
||||||
|
return HeaterStatus(
|
||||||
|
power=bool(dps.get(DPS_POWER, False)),
|
||||||
|
setpoint=dps.get(DPS_SETPOINT),
|
||||||
|
state=dps.get(DPS_STATE),
|
||||||
|
error_code=dps.get(DPS_ERROR),
|
||||||
|
raw_dps=dps,
|
||||||
|
)
|
||||||
|
|
||||||
|
def turn_on(self) -> ActionResult:
|
||||||
|
"""Turn heater on."""
|
||||||
|
try:
|
||||||
|
self.device.set_value(index=DPS_POWER, value=True)
|
||||||
|
return ActionResult(success=True, action="on", power=True)
|
||||||
|
except Exception as error:
|
||||||
|
logger.exception("Failed to turn on")
|
||||||
|
return ActionResult(success=False, action="on", error=str(error))
|
||||||
|
|
||||||
|
def turn_off(self) -> ActionResult:
|
||||||
|
"""Turn heater off."""
|
||||||
|
try:
|
||||||
|
self.device.set_value(index=DPS_POWER, value=False)
|
||||||
|
return ActionResult(success=True, action="off", power=False)
|
||||||
|
except Exception as error:
|
||||||
|
logger.exception("Failed to turn off")
|
||||||
|
return ActionResult(success=False, action="off", error=str(error))
|
||||||
|
|
||||||
|
def toggle(self) -> ActionResult:
|
||||||
|
"""Toggle heater power state."""
|
||||||
|
status = self.status()
|
||||||
|
if status.power:
|
||||||
|
return self.turn_off()
|
||||||
|
return self.turn_on()
|
||||||
85
python/heater/main.py
Normal file
85
python/heater/main.py
Normal file
@@ -0,0 +1,85 @@
|
|||||||
|
"""FastAPI heater control service."""
|
||||||
|
|
||||||
|
import logging
|
||||||
|
from collections.abc import AsyncIterator
|
||||||
|
from contextlib import asynccontextmanager
|
||||||
|
from typing import Annotated
|
||||||
|
|
||||||
|
import typer
|
||||||
|
import uvicorn
|
||||||
|
from fastapi import FastAPI, HTTPException
|
||||||
|
|
||||||
|
from python.common import configure_logger
|
||||||
|
from python.heater.controller import HeaterController
|
||||||
|
from python.heater.models import ActionResult, DeviceConfig, HeaterStatus
|
||||||
|
|
||||||
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|
||||||
|
def create_app(config: DeviceConfig) -> FastAPI:
|
||||||
|
"""Create FastAPI application."""
|
||||||
|
|
||||||
|
@asynccontextmanager
|
||||||
|
async def lifespan(app: FastAPI) -> AsyncIterator[None]:
|
||||||
|
app.state.controller = HeaterController(config)
|
||||||
|
yield
|
||||||
|
|
||||||
|
app = FastAPI(
|
||||||
|
title="Heater Control API",
|
||||||
|
description="Fast local control for Tuya heater",
|
||||||
|
lifespan=lifespan,
|
||||||
|
)
|
||||||
|
|
||||||
|
@app.get("/status")
|
||||||
|
def get_status() -> HeaterStatus:
|
||||||
|
return app.state.controller.status()
|
||||||
|
|
||||||
|
@app.post("/on")
|
||||||
|
def heater_on() -> ActionResult:
|
||||||
|
result = app.state.controller.turn_on()
|
||||||
|
if not result.success:
|
||||||
|
raise HTTPException(status_code=500, detail=result.error)
|
||||||
|
return result
|
||||||
|
|
||||||
|
@app.post("/off")
|
||||||
|
def heater_off() -> ActionResult:
|
||||||
|
result = app.state.controller.turn_off()
|
||||||
|
if not result.success:
|
||||||
|
raise HTTPException(status_code=500, detail=result.error)
|
||||||
|
return result
|
||||||
|
|
||||||
|
@app.post("/toggle")
|
||||||
|
def heater_toggle() -> ActionResult:
|
||||||
|
result = app.state.controller.toggle()
|
||||||
|
if not result.success:
|
||||||
|
raise HTTPException(status_code=500, detail=result.error)
|
||||||
|
return result
|
||||||
|
|
||||||
|
return app
|
||||||
|
|
||||||
|
|
||||||
|
def serve(
|
||||||
|
host: Annotated[str, typer.Option("--host", "-h", help="Host to bind to")],
|
||||||
|
port: Annotated[int, typer.Option("--port", "-p", help="Port to bind to")] = 8124,
|
||||||
|
log_level: Annotated[str, typer.Option("--log-level", "-l", help="Log level")] = "INFO",
|
||||||
|
device_id: Annotated[str | None, typer.Option("--device-id", envvar="TUYA_DEVICE_ID")] = None,
|
||||||
|
device_ip: Annotated[str | None, typer.Option("--device-ip", envvar="TUYA_DEVICE_IP")] = None,
|
||||||
|
local_key: Annotated[str | None, typer.Option("--local-key", envvar="TUYA_LOCAL_KEY")] = None,
|
||||||
|
) -> None:
|
||||||
|
"""Start the heater control API server."""
|
||||||
|
configure_logger(log_level)
|
||||||
|
|
||||||
|
logger.info("Starting heater control API server")
|
||||||
|
|
||||||
|
if not device_id or not device_ip or not local_key:
|
||||||
|
error = "Must provide device ID, IP, and local key"
|
||||||
|
raise typer.Exit(error)
|
||||||
|
|
||||||
|
config = DeviceConfig(device_id=device_id, ip=device_ip, local_key=local_key)
|
||||||
|
|
||||||
|
app = create_app(config)
|
||||||
|
uvicorn.run(app, host=host, port=port)
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
typer.run(serve)
|
||||||
31
python/heater/models.py
Normal file
31
python/heater/models.py
Normal file
@@ -0,0 +1,31 @@
|
|||||||
|
"""Pydantic models for heater API."""
|
||||||
|
|
||||||
|
from pydantic import BaseModel, Field
|
||||||
|
|
||||||
|
|
||||||
|
class DeviceConfig(BaseModel):
|
||||||
|
"""Tuya device configuration."""
|
||||||
|
|
||||||
|
device_id: str
|
||||||
|
ip: str
|
||||||
|
local_key: str
|
||||||
|
version: float = 3.5
|
||||||
|
|
||||||
|
|
||||||
|
class HeaterStatus(BaseModel):
|
||||||
|
"""Current heater status."""
|
||||||
|
|
||||||
|
power: bool
|
||||||
|
setpoint: int | None = None
|
||||||
|
state: str | None = None # "Stop", "Heat", etc.
|
||||||
|
error_code: int | None = None
|
||||||
|
raw_dps: dict[str, object] = Field(default_factory=dict)
|
||||||
|
|
||||||
|
|
||||||
|
class ActionResult(BaseModel):
|
||||||
|
"""Result of a heater action."""
|
||||||
|
|
||||||
|
success: bool
|
||||||
|
action: str
|
||||||
|
power: bool | None = None
|
||||||
|
error: str | None = None
|
||||||
9
python/orm/__init__.py
Normal file
9
python/orm/__init__.py
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
"""ORM package exports."""
|
||||||
|
|
||||||
|
from python.orm.richie.base import RichieBase
|
||||||
|
from python.orm.van_inventory.base import VanInventoryBase
|
||||||
|
|
||||||
|
__all__ = [
|
||||||
|
"RichieBase",
|
||||||
|
"VanInventoryBase",
|
||||||
|
]
|
||||||
51
python/orm/common.py
Normal file
51
python/orm/common.py
Normal file
@@ -0,0 +1,51 @@
|
|||||||
|
"""Shared ORM definitions."""
|
||||||
|
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
from os import getenv
|
||||||
|
from typing import cast
|
||||||
|
|
||||||
|
from sqlalchemy import create_engine
|
||||||
|
from sqlalchemy.engine import URL, Engine
|
||||||
|
|
||||||
|
NAMING_CONVENTION = {
|
||||||
|
"ix": "ix_%(table_name)s_%(column_0_name)s",
|
||||||
|
"uq": "uq_%(table_name)s_%(column_0_name)s",
|
||||||
|
"ck": "ck_%(table_name)s_%(constraint_name)s",
|
||||||
|
"fk": "fk_%(table_name)s_%(column_0_name)s_%(referred_table_name)s",
|
||||||
|
"pk": "pk_%(table_name)s",
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
def get_connection_info(name: str) -> tuple[str, str, str, str, str | None]:
|
||||||
|
"""Get connection info from environment variables."""
|
||||||
|
database = getenv(f"{name}_DB")
|
||||||
|
host = getenv(f"{name}_HOST")
|
||||||
|
port = getenv(f"{name}_PORT")
|
||||||
|
username = getenv(f"{name}_USER")
|
||||||
|
password = getenv(f"{name}_PASSWORD")
|
||||||
|
|
||||||
|
if None in (database, host, port, username):
|
||||||
|
error = f"Missing environment variables for Postgres connection.\n{database=}\n{host=}\n{port=}\n{username=}\n"
|
||||||
|
raise ValueError(error)
|
||||||
|
return cast("tuple[str, str, str, str, str | None]", (database, host, port, username, password))
|
||||||
|
|
||||||
|
|
||||||
|
def get_postgres_engine(*, name: str = "POSTGRES", pool_pre_ping: bool = True) -> Engine:
|
||||||
|
"""Create a SQLAlchemy engine from environment variables."""
|
||||||
|
database, host, port, username, password = get_connection_info(name)
|
||||||
|
|
||||||
|
url = URL.create(
|
||||||
|
drivername="postgresql+psycopg",
|
||||||
|
username=username,
|
||||||
|
password=password,
|
||||||
|
host=host,
|
||||||
|
port=int(port),
|
||||||
|
database=database,
|
||||||
|
)
|
||||||
|
|
||||||
|
return create_engine(
|
||||||
|
url=url,
|
||||||
|
pool_pre_ping=pool_pre_ping,
|
||||||
|
pool_recycle=1800,
|
||||||
|
)
|
||||||
31
python/orm/richie/__init__.py
Normal file
31
python/orm/richie/__init__.py
Normal file
@@ -0,0 +1,31 @@
|
|||||||
|
"""Richie database ORM exports."""
|
||||||
|
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
from python.orm.richie.base import RichieBase, TableBase
|
||||||
|
from python.orm.richie.congress import Bill, Legislator, Vote, VoteRecord
|
||||||
|
from python.orm.richie.contact import (
|
||||||
|
Contact,
|
||||||
|
ContactNeed,
|
||||||
|
ContactRelationship,
|
||||||
|
Need,
|
||||||
|
RelationshipType,
|
||||||
|
)
|
||||||
|
from python.orm.richie.dead_letter_message import DeadLetterMessage
|
||||||
|
from python.orm.richie.signal_device import SignalDevice
|
||||||
|
|
||||||
|
__all__ = [
|
||||||
|
"Bill",
|
||||||
|
"Contact",
|
||||||
|
"ContactNeed",
|
||||||
|
"ContactRelationship",
|
||||||
|
"DeadLetterMessage",
|
||||||
|
"Legislator",
|
||||||
|
"Need",
|
||||||
|
"RelationshipType",
|
||||||
|
"RichieBase",
|
||||||
|
"SignalDevice",
|
||||||
|
"TableBase",
|
||||||
|
"Vote",
|
||||||
|
"VoteRecord",
|
||||||
|
]
|
||||||
39
python/orm/richie/base.py
Normal file
39
python/orm/richie/base.py
Normal file
@@ -0,0 +1,39 @@
|
|||||||
|
"""Richie database ORM base."""
|
||||||
|
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
from datetime import datetime
|
||||||
|
|
||||||
|
from sqlalchemy import DateTime, MetaData, func
|
||||||
|
from sqlalchemy.ext.declarative import AbstractConcreteBase
|
||||||
|
from sqlalchemy.orm import DeclarativeBase, Mapped, mapped_column
|
||||||
|
|
||||||
|
from python.orm.common import NAMING_CONVENTION
|
||||||
|
|
||||||
|
|
||||||
|
class RichieBase(DeclarativeBase):
|
||||||
|
"""Base class for richie database ORM models."""
|
||||||
|
|
||||||
|
schema_name = "main"
|
||||||
|
|
||||||
|
metadata = MetaData(
|
||||||
|
schema=schema_name,
|
||||||
|
naming_convention=NAMING_CONVENTION,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
class TableBase(AbstractConcreteBase, RichieBase):
|
||||||
|
"""Abstract concrete base for richie tables with IDs and timestamps."""
|
||||||
|
|
||||||
|
__abstract__ = True
|
||||||
|
|
||||||
|
id: Mapped[int] = mapped_column(primary_key=True)
|
||||||
|
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(),
|
||||||
|
)
|
||||||
150
python/orm/richie/congress.py
Normal file
150
python/orm/richie/congress.py
Normal file
@@ -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")
|
||||||
168
python/orm/richie/contact.py
Normal file
168
python/orm/richie/contact.py
Normal file
@@ -0,0 +1,168 @@
|
|||||||
|
"""Contact database models."""
|
||||||
|
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
from enum import StrEnum
|
||||||
|
|
||||||
|
from sqlalchemy import ForeignKey, String
|
||||||
|
from sqlalchemy.orm import Mapped, mapped_column, relationship
|
||||||
|
|
||||||
|
from python.orm.richie.base import RichieBase, TableBase
|
||||||
|
|
||||||
|
|
||||||
|
class RelationshipType(StrEnum):
|
||||||
|
"""Relationship types with default closeness weights.
|
||||||
|
|
||||||
|
Default weight is an integer 1-10 where 10 = closest relationship.
|
||||||
|
Users can override this per-relationship in the UI.
|
||||||
|
"""
|
||||||
|
|
||||||
|
SPOUSE = "spouse"
|
||||||
|
PARTNER = "partner"
|
||||||
|
PARENT = "parent"
|
||||||
|
CHILD = "child"
|
||||||
|
SIBLING = "sibling"
|
||||||
|
BEST_FRIEND = "best_friend"
|
||||||
|
GRANDPARENT = "grandparent"
|
||||||
|
GRANDCHILD = "grandchild"
|
||||||
|
AUNT_UNCLE = "aunt_uncle"
|
||||||
|
NIECE_NEPHEW = "niece_nephew"
|
||||||
|
COUSIN = "cousin"
|
||||||
|
IN_LAW = "in_law"
|
||||||
|
CLOSE_FRIEND = "close_friend"
|
||||||
|
FRIEND = "friend"
|
||||||
|
MENTOR = "mentor"
|
||||||
|
MENTEE = "mentee"
|
||||||
|
BUSINESS_PARTNER = "business_partner"
|
||||||
|
COLLEAGUE = "colleague"
|
||||||
|
MANAGER = "manager"
|
||||||
|
DIRECT_REPORT = "direct_report"
|
||||||
|
CLIENT = "client"
|
||||||
|
ACQUAINTANCE = "acquaintance"
|
||||||
|
NEIGHBOR = "neighbor"
|
||||||
|
EX = "ex"
|
||||||
|
OTHER = "other"
|
||||||
|
|
||||||
|
@property
|
||||||
|
def default_weight(self) -> int:
|
||||||
|
"""Return the default closeness weight (1-10) for this relationship type."""
|
||||||
|
weights = {
|
||||||
|
RelationshipType.SPOUSE: 10,
|
||||||
|
RelationshipType.PARTNER: 10,
|
||||||
|
RelationshipType.PARENT: 9,
|
||||||
|
RelationshipType.CHILD: 9,
|
||||||
|
RelationshipType.SIBLING: 9,
|
||||||
|
RelationshipType.BEST_FRIEND: 8,
|
||||||
|
RelationshipType.GRANDPARENT: 7,
|
||||||
|
RelationshipType.GRANDCHILD: 7,
|
||||||
|
RelationshipType.AUNT_UNCLE: 7,
|
||||||
|
RelationshipType.NIECE_NEPHEW: 7,
|
||||||
|
RelationshipType.COUSIN: 7,
|
||||||
|
RelationshipType.IN_LAW: 7,
|
||||||
|
RelationshipType.CLOSE_FRIEND: 6,
|
||||||
|
RelationshipType.FRIEND: 6,
|
||||||
|
RelationshipType.MENTOR: 5,
|
||||||
|
RelationshipType.MENTEE: 5,
|
||||||
|
RelationshipType.BUSINESS_PARTNER: 5,
|
||||||
|
RelationshipType.COLLEAGUE: 4,
|
||||||
|
RelationshipType.MANAGER: 4,
|
||||||
|
RelationshipType.DIRECT_REPORT: 4,
|
||||||
|
RelationshipType.CLIENT: 4,
|
||||||
|
RelationshipType.ACQUAINTANCE: 3,
|
||||||
|
RelationshipType.NEIGHBOR: 3,
|
||||||
|
RelationshipType.EX: 2,
|
||||||
|
RelationshipType.OTHER: 2,
|
||||||
|
}
|
||||||
|
return weights.get(self, 5)
|
||||||
|
|
||||||
|
@property
|
||||||
|
def display_name(self) -> str:
|
||||||
|
"""Return a human-readable display name."""
|
||||||
|
return self.value.replace("_", " ").title()
|
||||||
|
|
||||||
|
|
||||||
|
class ContactNeed(RichieBase):
|
||||||
|
"""Association table: Contact <-> Need."""
|
||||||
|
|
||||||
|
__tablename__ = "contact_need"
|
||||||
|
|
||||||
|
contact_id: Mapped[int] = mapped_column(
|
||||||
|
ForeignKey("main.contact.id", ondelete="CASCADE"),
|
||||||
|
primary_key=True,
|
||||||
|
)
|
||||||
|
need_id: Mapped[int] = mapped_column(
|
||||||
|
ForeignKey("main.need.id", ondelete="CASCADE"),
|
||||||
|
primary_key=True,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
class ContactRelationship(RichieBase):
|
||||||
|
"""Association table: Contact <-> Contact with relationship type and weight."""
|
||||||
|
|
||||||
|
__tablename__ = "contact_relationship"
|
||||||
|
|
||||||
|
contact_id: Mapped[int] = mapped_column(
|
||||||
|
ForeignKey("main.contact.id", ondelete="CASCADE"),
|
||||||
|
primary_key=True,
|
||||||
|
)
|
||||||
|
related_contact_id: Mapped[int] = mapped_column(
|
||||||
|
ForeignKey("main.contact.id", ondelete="CASCADE"),
|
||||||
|
primary_key=True,
|
||||||
|
)
|
||||||
|
relationship_type: Mapped[str] = mapped_column(String(100))
|
||||||
|
closeness_weight: Mapped[int] = mapped_column(default=5)
|
||||||
|
|
||||||
|
|
||||||
|
class Contact(TableBase):
|
||||||
|
"""Contact model."""
|
||||||
|
|
||||||
|
__tablename__ = "contact"
|
||||||
|
|
||||||
|
name: Mapped[str]
|
||||||
|
|
||||||
|
age: Mapped[int | None]
|
||||||
|
bio: Mapped[str | None]
|
||||||
|
current_job: Mapped[str | None]
|
||||||
|
gender: Mapped[str | None]
|
||||||
|
goals: Mapped[str | None]
|
||||||
|
legal_name: Mapped[str | None]
|
||||||
|
profile_pic: Mapped[str | None]
|
||||||
|
safe_conversation_starters: Mapped[str | None]
|
||||||
|
self_sufficiency_score: Mapped[int | None]
|
||||||
|
social_structure_style: Mapped[str | None]
|
||||||
|
ssn: Mapped[str | None]
|
||||||
|
suffix: Mapped[str | None]
|
||||||
|
timezone: Mapped[str | None]
|
||||||
|
topics_to_avoid: Mapped[str | None]
|
||||||
|
|
||||||
|
needs: Mapped[list[Need]] = relationship(
|
||||||
|
"Need",
|
||||||
|
secondary=ContactNeed.__table__,
|
||||||
|
back_populates="contacts",
|
||||||
|
)
|
||||||
|
|
||||||
|
related_to: Mapped[list[ContactRelationship]] = relationship(
|
||||||
|
"ContactRelationship",
|
||||||
|
foreign_keys=[ContactRelationship.contact_id],
|
||||||
|
cascade="all, delete-orphan",
|
||||||
|
)
|
||||||
|
related_from: Mapped[list[ContactRelationship]] = relationship(
|
||||||
|
"ContactRelationship",
|
||||||
|
foreign_keys=[ContactRelationship.related_contact_id],
|
||||||
|
cascade="all, delete-orphan",
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
class Need(TableBase):
|
||||||
|
"""Need/accommodation model (e.g., light sensitive, ADHD)."""
|
||||||
|
|
||||||
|
__tablename__ = "need"
|
||||||
|
|
||||||
|
name: Mapped[str]
|
||||||
|
description: Mapped[str | None]
|
||||||
|
|
||||||
|
contacts: Mapped[list[Contact]] = relationship(
|
||||||
|
"Contact",
|
||||||
|
secondary=ContactNeed.__table__,
|
||||||
|
back_populates="needs",
|
||||||
|
)
|
||||||
26
python/orm/richie/dead_letter_message.py
Normal file
26
python/orm/richie/dead_letter_message.py
Normal file
@@ -0,0 +1,26 @@
|
|||||||
|
"""Dead letter queue for Signal bot messages that fail processing."""
|
||||||
|
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
from datetime import datetime
|
||||||
|
|
||||||
|
from sqlalchemy import DateTime, Text
|
||||||
|
from sqlalchemy.dialects.postgresql import ENUM
|
||||||
|
from sqlalchemy.orm import Mapped, mapped_column
|
||||||
|
|
||||||
|
from python.orm.richie.base import TableBase
|
||||||
|
from python.signal_bot.models import MessageStatus
|
||||||
|
|
||||||
|
|
||||||
|
class DeadLetterMessage(TableBase):
|
||||||
|
"""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_type=True, schema="main"),
|
||||||
|
default=MessageStatus.UNPROCESSED,
|
||||||
|
)
|
||||||
26
python/orm/richie/signal_device.py
Normal file
26
python/orm/richie/signal_device.py
Normal file
@@ -0,0 +1,26 @@
|
|||||||
|
"""Signal bot device registry models."""
|
||||||
|
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
from datetime import datetime
|
||||||
|
|
||||||
|
from sqlalchemy import DateTime, String
|
||||||
|
from sqlalchemy.dialects.postgresql import ENUM
|
||||||
|
from sqlalchemy.orm import Mapped, mapped_column
|
||||||
|
|
||||||
|
from python.orm.richie.base import TableBase
|
||||||
|
from python.signal_bot.models import TrustLevel
|
||||||
|
|
||||||
|
|
||||||
|
class SignalDevice(TableBase):
|
||||||
|
"""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_type=True, schema="main"),
|
||||||
|
default=TrustLevel.UNVERIFIED,
|
||||||
|
)
|
||||||
|
last_seen: Mapped[datetime] = mapped_column(DateTime(timezone=True))
|
||||||
1
python/orm/van_inventory/__init__.py
Normal file
1
python/orm/van_inventory/__init__.py
Normal file
@@ -0,0 +1 @@
|
|||||||
|
"""Van inventory database ORM exports."""
|
||||||
39
python/orm/van_inventory/base.py
Normal file
39
python/orm/van_inventory/base.py
Normal file
@@ -0,0 +1,39 @@
|
|||||||
|
"""Van inventory database ORM base."""
|
||||||
|
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
from datetime import datetime
|
||||||
|
|
||||||
|
from sqlalchemy import DateTime, MetaData, func
|
||||||
|
from sqlalchemy.ext.declarative import AbstractConcreteBase
|
||||||
|
from sqlalchemy.orm import DeclarativeBase, Mapped, mapped_column
|
||||||
|
|
||||||
|
from python.orm.common import NAMING_CONVENTION
|
||||||
|
|
||||||
|
|
||||||
|
class VanInventoryBase(DeclarativeBase):
|
||||||
|
"""Base class for van_inventory database ORM models."""
|
||||||
|
|
||||||
|
schema_name = "main"
|
||||||
|
|
||||||
|
metadata = MetaData(
|
||||||
|
schema=schema_name,
|
||||||
|
naming_convention=NAMING_CONVENTION,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
class VanTableBase(AbstractConcreteBase, VanInventoryBase):
|
||||||
|
"""Abstract concrete base for van_inventory tables with IDs and timestamps."""
|
||||||
|
|
||||||
|
__abstract__ = True
|
||||||
|
|
||||||
|
id: Mapped[int] = mapped_column(primary_key=True)
|
||||||
|
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(),
|
||||||
|
)
|
||||||
46
python/orm/van_inventory/models.py
Normal file
46
python/orm/van_inventory/models.py
Normal file
@@ -0,0 +1,46 @@
|
|||||||
|
"""Van inventory ORM models."""
|
||||||
|
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
from sqlalchemy import ForeignKey, UniqueConstraint
|
||||||
|
from sqlalchemy.orm import Mapped, mapped_column, relationship
|
||||||
|
|
||||||
|
from python.orm.van_inventory.base import VanTableBase
|
||||||
|
|
||||||
|
|
||||||
|
class Item(VanTableBase):
|
||||||
|
"""A food item in the van."""
|
||||||
|
|
||||||
|
__tablename__ = "items"
|
||||||
|
|
||||||
|
name: Mapped[str] = mapped_column(unique=True)
|
||||||
|
quantity: Mapped[float] = mapped_column(default=0)
|
||||||
|
unit: Mapped[str]
|
||||||
|
category: Mapped[str | None]
|
||||||
|
|
||||||
|
meal_ingredients: Mapped[list[MealIngredient]] = relationship(back_populates="item")
|
||||||
|
|
||||||
|
|
||||||
|
class Meal(VanTableBase):
|
||||||
|
"""A meal that can be made from items in the van."""
|
||||||
|
|
||||||
|
__tablename__ = "meals"
|
||||||
|
|
||||||
|
name: Mapped[str] = mapped_column(unique=True)
|
||||||
|
instructions: Mapped[str | None]
|
||||||
|
|
||||||
|
ingredients: Mapped[list[MealIngredient]] = relationship(back_populates="meal")
|
||||||
|
|
||||||
|
|
||||||
|
class MealIngredient(VanTableBase):
|
||||||
|
"""Links a meal to the items it requires, with quantities."""
|
||||||
|
|
||||||
|
__tablename__ = "meal_ingredients"
|
||||||
|
__table_args__ = (UniqueConstraint("meal_id", "item_id"),)
|
||||||
|
|
||||||
|
meal_id: Mapped[int] = mapped_column(ForeignKey("meals.id"))
|
||||||
|
item_id: Mapped[int] = mapped_column(ForeignKey("items.id"))
|
||||||
|
quantity_needed: Mapped[float]
|
||||||
|
|
||||||
|
meal: Mapped[Meal] = relationship(back_populates="ingredients")
|
||||||
|
item: Mapped[Item] = relationship(back_populates="meal_ingredients")
|
||||||
1
python/sheet_music_ocr/__init__.py
Normal file
1
python/sheet_music_ocr/__init__.py
Normal file
@@ -0,0 +1 @@
|
|||||||
|
"""Sheet music OCR tool using Audiveris."""
|
||||||
62
python/sheet_music_ocr/audiveris.py
Normal file
62
python/sheet_music_ocr/audiveris.py
Normal file
@@ -0,0 +1,62 @@
|
|||||||
|
"""Audiveris subprocess wrapper for optical music recognition."""
|
||||||
|
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import shutil
|
||||||
|
import subprocess
|
||||||
|
from typing import TYPE_CHECKING
|
||||||
|
|
||||||
|
if TYPE_CHECKING:
|
||||||
|
from pathlib import Path
|
||||||
|
|
||||||
|
|
||||||
|
class AudiverisError(Exception):
|
||||||
|
"""Raised when Audiveris processing fails."""
|
||||||
|
|
||||||
|
|
||||||
|
def find_audiveris() -> str:
|
||||||
|
"""Find the Audiveris executable on PATH.
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Path to the audiveris executable.
|
||||||
|
|
||||||
|
Raises:
|
||||||
|
AudiverisError: If Audiveris is not found.
|
||||||
|
"""
|
||||||
|
path = shutil.which("audiveris")
|
||||||
|
if not path:
|
||||||
|
msg = "Audiveris not found on PATH. Install it via 'nix develop' or add it to your environment."
|
||||||
|
raise AudiverisError(msg)
|
||||||
|
return path
|
||||||
|
|
||||||
|
|
||||||
|
def run_audiveris(input_path: Path, output_dir: Path) -> Path:
|
||||||
|
"""Run Audiveris on an input file and return the path to the generated .mxl.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
input_path: Path to the input sheet music file (PDF, PNG, JPG, TIFF).
|
||||||
|
output_dir: Directory where Audiveris will write its output.
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Path to the generated .mxl file.
|
||||||
|
|
||||||
|
Raises:
|
||||||
|
AudiverisError: If Audiveris fails or produces no output.
|
||||||
|
"""
|
||||||
|
audiveris = find_audiveris()
|
||||||
|
result = subprocess.run(
|
||||||
|
[audiveris, "-batch", "-export", "-output", str(output_dir), str(input_path)],
|
||||||
|
capture_output=True,
|
||||||
|
text=True,
|
||||||
|
check=False,
|
||||||
|
)
|
||||||
|
if result.returncode != 0:
|
||||||
|
msg = f"Audiveris failed (exit {result.returncode}):\n{result.stderr}"
|
||||||
|
raise AudiverisError(msg)
|
||||||
|
|
||||||
|
mxl_files = list(output_dir.rglob("*.mxl"))
|
||||||
|
if not mxl_files:
|
||||||
|
msg = f"Audiveris produced no .mxl output in {output_dir}"
|
||||||
|
raise AudiverisError(msg)
|
||||||
|
|
||||||
|
return mxl_files[0]
|
||||||
123
python/sheet_music_ocr/main.py
Normal file
123
python/sheet_music_ocr/main.py
Normal file
@@ -0,0 +1,123 @@
|
|||||||
|
"""CLI tool for converting scanned sheet music to MusicXML.
|
||||||
|
|
||||||
|
Usage:
|
||||||
|
sheet-music-ocr convert scan.pdf
|
||||||
|
sheet-music-ocr convert scan.png -o output.mxml
|
||||||
|
sheet-music-ocr review output.mxml --provider claude
|
||||||
|
"""
|
||||||
|
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import tempfile
|
||||||
|
import zipfile
|
||||||
|
from pathlib import Path
|
||||||
|
from typing import Annotated
|
||||||
|
|
||||||
|
import typer
|
||||||
|
|
||||||
|
from python.sheet_music_ocr.audiveris import AudiverisError, run_audiveris
|
||||||
|
from python.sheet_music_ocr.review import LLMProvider, ReviewError, review_mxml
|
||||||
|
|
||||||
|
SUPPORTED_EXTENSIONS = {".pdf", ".png", ".jpg", ".jpeg", ".tiff", ".tif"}
|
||||||
|
|
||||||
|
app = typer.Typer(help="Convert scanned sheet music to MusicXML using Audiveris.")
|
||||||
|
|
||||||
|
|
||||||
|
def extract_mxml_from_mxl(mxl_path: Path, output_path: Path) -> Path:
|
||||||
|
"""Extract the MusicXML file from an .mxl archive.
|
||||||
|
|
||||||
|
An .mxl file is a ZIP archive containing one or more .xml MusicXML files.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
mxl_path: Path to the .mxl file.
|
||||||
|
output_path: Path where the extracted .mxml file should be written.
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
The output path.
|
||||||
|
|
||||||
|
Raises:
|
||||||
|
FileNotFoundError: If no MusicXML file is found inside the archive.
|
||||||
|
"""
|
||||||
|
with zipfile.ZipFile(mxl_path, "r") as zf:
|
||||||
|
xml_names = [n for n in zf.namelist() if n.endswith(".xml") and not n.startswith("META-INF")]
|
||||||
|
if not xml_names:
|
||||||
|
msg = f"No MusicXML (.xml) file found inside {mxl_path}"
|
||||||
|
raise FileNotFoundError(msg)
|
||||||
|
with zf.open(xml_names[0]) as src, output_path.open("wb") as dst:
|
||||||
|
dst.write(src.read())
|
||||||
|
return output_path
|
||||||
|
|
||||||
|
|
||||||
|
@app.command()
|
||||||
|
def convert(
|
||||||
|
input_file: Annotated[Path, typer.Argument(help="Path to sheet music scan (PDF, PNG, JPG, TIFF).")],
|
||||||
|
output: Annotated[
|
||||||
|
Path | None,
|
||||||
|
typer.Option("--output", "-o", help="Output .mxml file path. Defaults to <input_stem>.mxml."),
|
||||||
|
] = None,
|
||||||
|
) -> None:
|
||||||
|
"""Convert a scanned sheet music file to MusicXML."""
|
||||||
|
if not input_file.exists():
|
||||||
|
typer.echo(f"Error: {input_file} does not exist.", err=True)
|
||||||
|
raise typer.Exit(code=1)
|
||||||
|
|
||||||
|
if input_file.suffix.lower() not in SUPPORTED_EXTENSIONS:
|
||||||
|
typer.echo(
|
||||||
|
f"Error: Unsupported format '{input_file.suffix}'. Supported: {', '.join(sorted(SUPPORTED_EXTENSIONS))}",
|
||||||
|
err=True,
|
||||||
|
)
|
||||||
|
raise typer.Exit(code=1)
|
||||||
|
|
||||||
|
output_path = output or input_file.with_suffix(".mxml")
|
||||||
|
|
||||||
|
with tempfile.TemporaryDirectory() as tmpdir:
|
||||||
|
try:
|
||||||
|
mxl_path = run_audiveris(input_file, Path(tmpdir))
|
||||||
|
except AudiverisError as e:
|
||||||
|
typer.echo(f"Error: {e}", err=True)
|
||||||
|
raise typer.Exit(code=1) from e
|
||||||
|
|
||||||
|
try:
|
||||||
|
extract_mxml_from_mxl(mxl_path, output_path)
|
||||||
|
except FileNotFoundError as e:
|
||||||
|
typer.echo(f"Error: {e}", err=True)
|
||||||
|
raise typer.Exit(code=1) from e
|
||||||
|
|
||||||
|
typer.echo(f"Written: {output_path}")
|
||||||
|
|
||||||
|
|
||||||
|
@app.command()
|
||||||
|
def review(
|
||||||
|
input_file: Annotated[Path, typer.Argument(help="Path to MusicXML (.mxml) file to review.")],
|
||||||
|
output: Annotated[
|
||||||
|
Path | None,
|
||||||
|
typer.Option("--output", "-o", help="Output path for corrected .mxml. Defaults to overwriting input."),
|
||||||
|
] = None,
|
||||||
|
provider: Annotated[
|
||||||
|
LLMProvider,
|
||||||
|
typer.Option("--provider", "-p", help="LLM provider to use."),
|
||||||
|
] = LLMProvider.CLAUDE,
|
||||||
|
) -> None:
|
||||||
|
"""Review and fix a MusicXML file using an LLM."""
|
||||||
|
if not input_file.exists():
|
||||||
|
typer.echo(f"Error: {input_file} does not exist.", err=True)
|
||||||
|
raise typer.Exit(code=1)
|
||||||
|
|
||||||
|
if input_file.suffix.lower() != ".mxml":
|
||||||
|
typer.echo("Error: Input file must be a .mxml file.", err=True)
|
||||||
|
raise typer.Exit(code=1)
|
||||||
|
|
||||||
|
output_path = output or input_file
|
||||||
|
|
||||||
|
try:
|
||||||
|
corrected = review_mxml(input_file, provider)
|
||||||
|
except ReviewError as e:
|
||||||
|
typer.echo(f"Error: {e}", err=True)
|
||||||
|
raise typer.Exit(code=1) from e
|
||||||
|
|
||||||
|
output_path.write_text(corrected, encoding="utf-8")
|
||||||
|
typer.echo(f"Reviewed: {output_path}")
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
app()
|
||||||
126
python/sheet_music_ocr/review.py
Normal file
126
python/sheet_music_ocr/review.py
Normal file
@@ -0,0 +1,126 @@
|
|||||||
|
"""LLM-based MusicXML review and correction.
|
||||||
|
|
||||||
|
Supports both Claude (Anthropic) and OpenAI APIs for reviewing
|
||||||
|
MusicXML output from Audiveris and suggesting/applying fixes.
|
||||||
|
"""
|
||||||
|
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import enum
|
||||||
|
import os
|
||||||
|
from typing import TYPE_CHECKING
|
||||||
|
|
||||||
|
import httpx
|
||||||
|
|
||||||
|
if TYPE_CHECKING:
|
||||||
|
from pathlib import Path
|
||||||
|
|
||||||
|
REVIEW_PROMPT = """\
|
||||||
|
You are a music notation expert. Review the following MusicXML file produced by \
|
||||||
|
optical music recognition (Audiveris). Look for and fix common OCR errors including:
|
||||||
|
|
||||||
|
- Incorrect note pitches or durations
|
||||||
|
- Wrong or missing key signatures, time signatures, or clefs
|
||||||
|
- Incorrect rest durations or placements
|
||||||
|
- Missing or incorrect accidentals
|
||||||
|
- Wrong beam groupings or tuplets
|
||||||
|
- Garbled or misspelled lyrics and text annotations
|
||||||
|
- Missing or incorrect dynamic markings
|
||||||
|
- Incorrect measure numbers or barline types
|
||||||
|
- Voice/staff assignment errors
|
||||||
|
|
||||||
|
Return ONLY the corrected MusicXML. Do not include any explanation, commentary, or \
|
||||||
|
markdown formatting. Output the raw XML directly.
|
||||||
|
|
||||||
|
Here is the MusicXML to review:
|
||||||
|
|
||||||
|
"""
|
||||||
|
|
||||||
|
_TIMEOUT = 300
|
||||||
|
|
||||||
|
|
||||||
|
class LLMProvider(enum.StrEnum):
|
||||||
|
"""Supported LLM providers."""
|
||||||
|
|
||||||
|
CLAUDE = "claude"
|
||||||
|
OPENAI = "openai"
|
||||||
|
|
||||||
|
|
||||||
|
class ReviewError(Exception):
|
||||||
|
"""Raised when LLM review fails."""
|
||||||
|
|
||||||
|
|
||||||
|
def _get_api_key(provider: LLMProvider) -> str:
|
||||||
|
env_var = "ANTHROPIC_API_KEY" if provider == LLMProvider.CLAUDE else "OPENAI_API_KEY"
|
||||||
|
key = os.environ.get(env_var)
|
||||||
|
if not key:
|
||||||
|
msg = f"{env_var} environment variable is not set."
|
||||||
|
raise ReviewError(msg)
|
||||||
|
return key
|
||||||
|
|
||||||
|
|
||||||
|
def _call_claude(content: str, api_key: str) -> str:
|
||||||
|
response = httpx.post(
|
||||||
|
"https://api.anthropic.com/v1/messages",
|
||||||
|
headers={
|
||||||
|
"x-api-key": api_key,
|
||||||
|
"anthropic-version": "2023-06-01",
|
||||||
|
"content-type": "application/json",
|
||||||
|
},
|
||||||
|
json={
|
||||||
|
"model": "claude-sonnet-4-20250514",
|
||||||
|
"max_tokens": 16384,
|
||||||
|
"messages": [{"role": "user", "content": REVIEW_PROMPT + content}],
|
||||||
|
},
|
||||||
|
timeout=_TIMEOUT,
|
||||||
|
)
|
||||||
|
if response.status_code != 200: # noqa: PLR2004
|
||||||
|
msg = f"Claude API error ({response.status_code}): {response.text}"
|
||||||
|
raise ReviewError(msg)
|
||||||
|
|
||||||
|
data = response.json()
|
||||||
|
return data["content"][0]["text"]
|
||||||
|
|
||||||
|
|
||||||
|
def _call_openai(content: str, api_key: str) -> str:
|
||||||
|
response = httpx.post(
|
||||||
|
"https://api.openai.com/v1/chat/completions",
|
||||||
|
headers={
|
||||||
|
"Authorization": f"Bearer {api_key}",
|
||||||
|
"Content-Type": "application/json",
|
||||||
|
},
|
||||||
|
json={
|
||||||
|
"model": "gpt-4o",
|
||||||
|
"messages": [{"role": "user", "content": REVIEW_PROMPT + content}],
|
||||||
|
"max_tokens": 16384,
|
||||||
|
},
|
||||||
|
timeout=_TIMEOUT,
|
||||||
|
)
|
||||||
|
if response.status_code != 200: # noqa: PLR2004
|
||||||
|
msg = f"OpenAI API error ({response.status_code}): {response.text}"
|
||||||
|
raise ReviewError(msg)
|
||||||
|
|
||||||
|
data = response.json()
|
||||||
|
return data["choices"][0]["message"]["content"]
|
||||||
|
|
||||||
|
|
||||||
|
def review_mxml(mxml_path: Path, provider: LLMProvider) -> str:
|
||||||
|
"""Review a MusicXML file using an LLM and return corrected content.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
mxml_path: Path to the .mxml file to review.
|
||||||
|
provider: Which LLM provider to use.
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
The corrected MusicXML content as a string.
|
||||||
|
|
||||||
|
Raises:
|
||||||
|
ReviewError: If the API call fails or the key is missing.
|
||||||
|
FileNotFoundError: If the input file does not exist.
|
||||||
|
"""
|
||||||
|
content = mxml_path.read_text(encoding="utf-8")
|
||||||
|
api_key = _get_api_key(provider)
|
||||||
|
|
||||||
|
if provider == LLMProvider.CLAUDE:
|
||||||
|
return _call_claude(content, api_key)
|
||||||
|
return _call_openai(content, api_key)
|
||||||
1
python/signal_bot/__init__.py
Normal file
1
python/signal_bot/__init__.py
Normal file
@@ -0,0 +1 @@
|
|||||||
|
"""Signal command and control bot."""
|
||||||
1
python/signal_bot/commands/__init__.py
Normal file
1
python/signal_bot/commands/__init__.py
Normal file
@@ -0,0 +1 @@
|
|||||||
|
"""Signal bot commands."""
|
||||||
137
python/signal_bot/commands/inventory.py
Normal file
137
python/signal_bot/commands/inventory.py
Normal file
@@ -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)
|
||||||
185
python/signal_bot/device_registry.py
Normal file
185
python/signal_bot/device_registry.py
Normal file
@@ -0,0 +1,185 @@
|
|||||||
|
"""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 select
|
||||||
|
from sqlalchemy.orm import Session
|
||||||
|
|
||||||
|
from python.common import utcnow
|
||||||
|
from python.orm.richie.signal_device import SignalDevice
|
||||||
|
from python.signal_bot.models import 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
|
||||||
|
|
||||||
|
|
||||||
|
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.get_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()
|
||||||
|
|
||||||
|
ttl = _BLOCKED_TTL if device.trust_level == TrustLevel.BLOCKED else _DEFAULT_TTL
|
||||||
|
self._contact_cache[phone_number] = _CacheEntry(
|
||||||
|
expires=now + ttl,
|
||||||
|
trust_level=device.trust_level,
|
||||||
|
has_safety_number=device.safety_number is not None,
|
||||||
|
safety_number=device.safety_number,
|
||||||
|
)
|
||||||
|
|
||||||
|
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.get_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._contact_cache[phone_number] = _CacheEntry(
|
||||||
|
expires=utcnow() + _DEFAULT_TTL,
|
||||||
|
trust_level=TrustLevel.VERIFIED,
|
||||||
|
has_safety_number=device.safety_number is not None,
|
||||||
|
safety_number=device.safety_number,
|
||||||
|
)
|
||||||
|
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)
|
||||||
|
|
||||||
|
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)
|
||||||
|
|
||||||
|
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 get_device(self, phone_number: str) -> SignalDevice | None:
|
||||||
|
"""Fetch a device by phone number."""
|
||||||
|
with Session(self.engine) as session:
|
||||||
|
return session.execute(
|
||||||
|
select(SignalDevice).where(SignalDevice.phone_number == phone_number)
|
||||||
|
).scalar_one_or_none()
|
||||||
|
|
||||||
|
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()
|
||||||
|
ttl = _BLOCKED_TTL if level == TrustLevel.BLOCKED else _DEFAULT_TTL
|
||||||
|
self._contact_cache[phone_number] = _CacheEntry(
|
||||||
|
expires=utcnow() + ttl,
|
||||||
|
trust_level=level,
|
||||||
|
has_safety_number=device.safety_number is not None,
|
||||||
|
safety_number=device.safety_number,
|
||||||
|
)
|
||||||
|
if log_msg:
|
||||||
|
logger.info(f"{log_msg}: {phone_number}")
|
||||||
|
return True
|
||||||
72
python/signal_bot/llm_client.py
Normal file
72
python/signal_bot/llm_client.py
Normal file
@@ -0,0 +1,72 @@
|
|||||||
|
"""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) -> None:
|
||||||
|
self.model = model
|
||||||
|
self.temperature = temperature
|
||||||
|
self._client = httpx.Client(base_url=f"http://{host}:{port}", timeout=120)
|
||||||
|
|
||||||
|
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()
|
||||||
231
python/signal_bot/main.py
Normal file
231
python/signal_bot/main.py
Normal file
@@ -0,0 +1,231 @@
|
|||||||
|
"""Signal command and control bot — main entry point."""
|
||||||
|
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import logging
|
||||||
|
from os import getenv
|
||||||
|
from typing import Annotated
|
||||||
|
|
||||||
|
import typer
|
||||||
|
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.orm.common import get_postgres_engine
|
||||||
|
from python.orm.richie.dead_letter_message import DeadLetterMessage
|
||||||
|
from python.signal_bot.commands.inventory import handle_inventory_update
|
||||||
|
from python.signal_bot.device_registry import DeviceRegistry
|
||||||
|
from python.signal_bot.llm_client import LLMClient
|
||||||
|
from python.signal_bot.models import BotConfig, MessageStatus, SignalMessage
|
||||||
|
from python.signal_bot.signal_client import SignalClient
|
||||||
|
|
||||||
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|
||||||
|
HELP_TEXT = (
|
||||||
|
"Available commands:\n"
|
||||||
|
" inventory <text list> — update van inventory from a text list\n"
|
||||||
|
" inventory (+ photo) — update van inventory from a receipt photo\n"
|
||||||
|
" status — show bot status\n"
|
||||||
|
" help — show this help message\n"
|
||||||
|
"Send a receipt photo with the message 'inventory' to scan it.\n"
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def help_action(
|
||||||
|
signal: SignalClient,
|
||||||
|
message: SignalMessage,
|
||||||
|
_llm: LLMClient,
|
||||||
|
_registry: DeviceRegistry,
|
||||||
|
_config: BotConfig,
|
||||||
|
_cmd: str,
|
||||||
|
) -> None:
|
||||||
|
"""Return the help text for the bot."""
|
||||||
|
signal.reply(message, HELP_TEXT)
|
||||||
|
|
||||||
|
|
||||||
|
def status_action(
|
||||||
|
signal: SignalClient,
|
||||||
|
message: SignalMessage,
|
||||||
|
llm: LLMClient,
|
||||||
|
registry: DeviceRegistry,
|
||||||
|
_config: BotConfig,
|
||||||
|
_cmd: str,
|
||||||
|
) -> None:
|
||||||
|
"""Return the status of the bot."""
|
||||||
|
models = llm.list_models()
|
||||||
|
model_list = ", ".join(models[:10])
|
||||||
|
device_count = len(registry.list_devices())
|
||||||
|
signal.reply(
|
||||||
|
message,
|
||||||
|
f"Bot online.\nLLM: {llm.model}\nAvailable models: {model_list}\nKnown devices: {device_count}",
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def unknown_action(
|
||||||
|
signal: SignalClient,
|
||||||
|
message: SignalMessage,
|
||||||
|
_llm: LLMClient,
|
||||||
|
_registry: DeviceRegistry,
|
||||||
|
_config: BotConfig,
|
||||||
|
cmd: str,
|
||||||
|
) -> None:
|
||||||
|
"""Return an error message for an unknown command."""
|
||||||
|
signal.reply(message, f"Unknown command: {cmd}\n\n{HELP_TEXT}")
|
||||||
|
|
||||||
|
|
||||||
|
def inventory_action(
|
||||||
|
signal: SignalClient,
|
||||||
|
message: SignalMessage,
|
||||||
|
llm: LLMClient,
|
||||||
|
_registry: DeviceRegistry,
|
||||||
|
config: BotConfig,
|
||||||
|
_cmd: str,
|
||||||
|
) -> None:
|
||||||
|
"""Process an inventory update."""
|
||||||
|
handle_inventory_update(message, signal, llm, config.inventory_api_url)
|
||||||
|
|
||||||
|
|
||||||
|
def dispatch(
|
||||||
|
message: SignalMessage,
|
||||||
|
signal: SignalClient,
|
||||||
|
llm: LLMClient,
|
||||||
|
registry: DeviceRegistry,
|
||||||
|
config: BotConfig,
|
||||||
|
) -> None:
|
||||||
|
"""Route an incoming message to the right command handler."""
|
||||||
|
source = message.source
|
||||||
|
|
||||||
|
if not registry.is_verified(source) or not registry.has_safety_number(source):
|
||||||
|
logger.info(f"Device {source} not verified, 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 ""
|
||||||
|
|
||||||
|
commands = {
|
||||||
|
"help": help_action,
|
||||||
|
"status": status_action,
|
||||||
|
"inventory": inventory_action,
|
||||||
|
}
|
||||||
|
logger.info(f"f{source=} running {cmd=} with {message=}")
|
||||||
|
action = commands.get(cmd)
|
||||||
|
if action is None:
|
||||||
|
if message.attachments:
|
||||||
|
action = inventory_action
|
||||||
|
cmd = "inventory"
|
||||||
|
else:
|
||||||
|
return
|
||||||
|
|
||||||
|
action(signal, message, llm, registry, config, cmd)
|
||||||
|
|
||||||
|
|
||||||
|
def _process_message(
|
||||||
|
message: SignalMessage,
|
||||||
|
signal: SignalClient,
|
||||||
|
llm: LLMClient,
|
||||||
|
registry: DeviceRegistry,
|
||||||
|
config: BotConfig,
|
||||||
|
) -> None:
|
||||||
|
"""Process a single message, sending it to the dead letter queue after repeated failures."""
|
||||||
|
max_attempts = config.max_message_attempts
|
||||||
|
for attempt in range(1, max_attempts + 1):
|
||||||
|
try:
|
||||||
|
safety_number = signal.get_safety_number(message.source)
|
||||||
|
registry.record_contact(message.source, safety_number)
|
||||||
|
dispatch(message, signal, llm, registry, config)
|
||||||
|
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(config.engine) as session:
|
||||||
|
session.add(
|
||||||
|
DeadLetterMessage(
|
||||||
|
source=message.source,
|
||||||
|
message=message.message,
|
||||||
|
received_at=utcnow(),
|
||||||
|
status=MessageStatus.UNPROCESSED,
|
||||||
|
)
|
||||||
|
)
|
||||||
|
session.commit()
|
||||||
|
|
||||||
|
|
||||||
|
def run_loop(
|
||||||
|
config: BotConfig,
|
||||||
|
signal: SignalClient,
|
||||||
|
llm: LLMClient,
|
||||||
|
registry: DeviceRegistry,
|
||||||
|
) -> None:
|
||||||
|
"""Listen for messages via WebSocket, reconnecting on failure."""
|
||||||
|
logger.info("Bot started — listening via WebSocket")
|
||||||
|
|
||||||
|
@retry(
|
||||||
|
stop=stop_after_attempt(config.max_retries),
|
||||||
|
wait=wait_exponential(multiplier=config.reconnect_delay, max=config.max_reconnect_delay),
|
||||||
|
before_sleep=before_sleep_log(logger, logging.WARNING),
|
||||||
|
reraise=True,
|
||||||
|
)
|
||||||
|
def _listen() -> None:
|
||||||
|
for message in signal.listen():
|
||||||
|
logger.info(f"Message from {message.source}: {message.message[:80]}")
|
||||||
|
_process_message(message, signal, llm, registry, config)
|
||||||
|
|
||||||
|
try:
|
||||||
|
_listen()
|
||||||
|
except Exception:
|
||||||
|
logger.critical("Max retries exceeded, shutting down")
|
||||||
|
raise
|
||||||
|
|
||||||
|
|
||||||
|
def main(
|
||||||
|
log_level: Annotated[str, typer.Option()] = "INFO",
|
||||||
|
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)
|
||||||
|
|
||||||
|
engine = get_postgres_engine(name="SIGNALBOT")
|
||||||
|
config = BotConfig(
|
||||||
|
signal_api_url=signal_api_url,
|
||||||
|
phone_number=phone_number,
|
||||||
|
inventory_api_url=inventory_api_url,
|
||||||
|
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)
|
||||||
|
run_loop(config, signal, llm, registry)
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
typer.run(main)
|
||||||
86
python/signal_bot/models.py
Normal file
86
python/signal_bot/models.py
Normal file
@@ -0,0 +1,86 @@
|
|||||||
|
"""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 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
|
||||||
|
engine: Engine
|
||||||
|
reconnect_delay: int = 5
|
||||||
|
max_reconnect_delay: int = 300
|
||||||
|
max_retries: int = 10
|
||||||
|
max_message_attempts: int = 3
|
||||||
141
python/signal_bot/signal_client.py
Normal file
141
python/signal_bot/signal_client.py
Normal file
@@ -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()
|
||||||
1
python/splendor/.gitignore
vendored
Normal file
1
python/splendor/.gitignore
vendored
Normal file
@@ -0,0 +1 @@
|
|||||||
|
game_data/
|
||||||
675
python/splendor/base.py
Normal file
675
python/splendor/base.py
Normal file
@@ -0,0 +1,675 @@
|
|||||||
|
"""Base logic for the Splendor game."""
|
||||||
|
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import itertools
|
||||||
|
import json
|
||||||
|
import random
|
||||||
|
from dataclasses import dataclass, field
|
||||||
|
from typing import TYPE_CHECKING, Literal, Protocol
|
||||||
|
|
||||||
|
if TYPE_CHECKING:
|
||||||
|
from collections.abc import Sequence
|
||||||
|
from pathlib import Path
|
||||||
|
|
||||||
|
GemColor = Literal["white", "blue", "green", "red", "black", "gold"]
|
||||||
|
|
||||||
|
GEM_COLORS: tuple[GemColor, ...] = (
|
||||||
|
"white",
|
||||||
|
"blue",
|
||||||
|
"green",
|
||||||
|
"red",
|
||||||
|
"black",
|
||||||
|
"gold",
|
||||||
|
)
|
||||||
|
BASE_COLORS: tuple[GemColor, ...] = (
|
||||||
|
"white",
|
||||||
|
"blue",
|
||||||
|
"green",
|
||||||
|
"red",
|
||||||
|
"black",
|
||||||
|
)
|
||||||
|
|
||||||
|
GEM_ORDER: list[GemColor] = list(GEM_COLORS)
|
||||||
|
GEM_INDEX: dict[GemColor, int] = {c: i for i, c in enumerate(GEM_ORDER)}
|
||||||
|
BASE_INDEX: dict[GemColor, int] = {c: i for i, c in enumerate(BASE_COLORS)}
|
||||||
|
|
||||||
|
|
||||||
|
@dataclass(frozen=True)
|
||||||
|
class Card:
|
||||||
|
"""Development card: gives points + a permanent gem discount."""
|
||||||
|
|
||||||
|
tier: int
|
||||||
|
points: int
|
||||||
|
color: GemColor
|
||||||
|
cost: dict[GemColor, int]
|
||||||
|
|
||||||
|
|
||||||
|
@dataclass(frozen=True)
|
||||||
|
class Noble:
|
||||||
|
"""Noble tile: gives points if you have enough bonuses."""
|
||||||
|
|
||||||
|
name: str
|
||||||
|
points: int
|
||||||
|
requirements: dict[GemColor, int]
|
||||||
|
|
||||||
|
|
||||||
|
@dataclass
|
||||||
|
class PlayerState:
|
||||||
|
"""State of a player in the game."""
|
||||||
|
|
||||||
|
strategy: Strategy
|
||||||
|
tokens: dict[GemColor, int] = field(default_factory=lambda: dict.fromkeys(GEM_COLORS, 0))
|
||||||
|
discounts: dict[GemColor, int] = field(default_factory=lambda: dict.fromkeys(GEM_COLORS, 0))
|
||||||
|
cards: list[Card] = field(default_factory=list)
|
||||||
|
reserved: list[Card] = field(default_factory=list)
|
||||||
|
nobles: list[Noble] = field(default_factory=list)
|
||||||
|
card_score: int = 0
|
||||||
|
noble_score: int = 0
|
||||||
|
|
||||||
|
def total_tokens(self) -> int:
|
||||||
|
"""Total tokens in player's bank."""
|
||||||
|
return sum(self.tokens.values())
|
||||||
|
|
||||||
|
def add_noble(self, noble: Noble) -> None:
|
||||||
|
"""Add a noble to the player."""
|
||||||
|
self.nobles.append(noble)
|
||||||
|
self.noble_score = sum(noble.points for noble in self.nobles)
|
||||||
|
|
||||||
|
def add_card(self, card: Card) -> None:
|
||||||
|
"""Add a card to the player."""
|
||||||
|
self.cards.append(card)
|
||||||
|
self.card_score = sum(card.points for card in self.cards)
|
||||||
|
|
||||||
|
@property
|
||||||
|
def score(self) -> int:
|
||||||
|
"""Total points in player's cards + nobles."""
|
||||||
|
return self.card_score + self.noble_score
|
||||||
|
|
||||||
|
def can_afford(self, card: Card) -> bool:
|
||||||
|
"""Check if player can afford card, using discounts + gold."""
|
||||||
|
missing = 0
|
||||||
|
gold = self.tokens["gold"]
|
||||||
|
|
||||||
|
for color, cost in card.cost.items():
|
||||||
|
missing += max(0, cost - self.discounts.get(color, 0) - self.tokens.get(color, 0))
|
||||||
|
if missing > gold:
|
||||||
|
return False
|
||||||
|
|
||||||
|
return True
|
||||||
|
|
||||||
|
def pay_for_card(self, card: Card) -> dict[GemColor, int]:
|
||||||
|
"""Pay tokens for card, move card to tableau, return payment for bank."""
|
||||||
|
if not self.can_afford(card):
|
||||||
|
msg = f"cannot afford card {card}"
|
||||||
|
raise ValueError(msg)
|
||||||
|
|
||||||
|
payment: dict[GemColor, int] = dict.fromkeys(GEM_COLORS, 0)
|
||||||
|
gold_available = self.tokens["gold"]
|
||||||
|
|
||||||
|
for color in BASE_COLORS:
|
||||||
|
cost = card.cost.get(color, 0)
|
||||||
|
effective_cost = max(0, cost - self.discounts.get(color, 0))
|
||||||
|
|
||||||
|
use = min(self.tokens[color], effective_cost)
|
||||||
|
self.tokens[color] -= use
|
||||||
|
payment[color] += use
|
||||||
|
|
||||||
|
remaining = effective_cost - use
|
||||||
|
if remaining > 0:
|
||||||
|
use_gold = min(gold_available, remaining)
|
||||||
|
gold_available -= use_gold
|
||||||
|
self.tokens["gold"] -= use_gold
|
||||||
|
payment["gold"] += use_gold
|
||||||
|
|
||||||
|
self.add_card(card)
|
||||||
|
self.discounts[card.color] += 1
|
||||||
|
return payment
|
||||||
|
|
||||||
|
|
||||||
|
def get_default_starting_tokens(player_count: int) -> dict[GemColor, int]:
|
||||||
|
"""get_default_starting_tokens."""
|
||||||
|
token_count = (player_count * player_count - 3 * player_count + 10) // 2
|
||||||
|
return {
|
||||||
|
"white": token_count,
|
||||||
|
"blue": token_count,
|
||||||
|
"green": token_count,
|
||||||
|
"red": token_count,
|
||||||
|
"black": token_count,
|
||||||
|
"gold": 5,
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@dataclass
|
||||||
|
class GameConfig:
|
||||||
|
"""Game configuration: gems, bank, cards, nobles, etc."""
|
||||||
|
|
||||||
|
win_score: int = 15
|
||||||
|
table_cards_per_tier: int = 4
|
||||||
|
reserve_limit: int = 3
|
||||||
|
token_limit: int = 10
|
||||||
|
turn_limit: int = 1000
|
||||||
|
minimum_tokens_to_buy_2: int = 4
|
||||||
|
max_token_take: int = 3
|
||||||
|
|
||||||
|
cards: list[Card] = field(default_factory=list)
|
||||||
|
nobles: list[Noble] = field(default_factory=list)
|
||||||
|
|
||||||
|
|
||||||
|
class GameState:
|
||||||
|
"""Game state: players, bank, decks, table, available nobles, etc."""
|
||||||
|
|
||||||
|
def __init__(
|
||||||
|
self,
|
||||||
|
config: GameConfig,
|
||||||
|
players: list[PlayerState],
|
||||||
|
bank: dict[GemColor, int],
|
||||||
|
decks_by_tier: dict[int, list[Card]],
|
||||||
|
table_by_tier: dict[int, list[Card]],
|
||||||
|
available_nobles: list[Noble],
|
||||||
|
) -> None:
|
||||||
|
"""Game state."""
|
||||||
|
self.config = config
|
||||||
|
self.players = players
|
||||||
|
self.bank = bank
|
||||||
|
self.decks_by_tier = decks_by_tier
|
||||||
|
self.table_by_tier = table_by_tier
|
||||||
|
self.available_nobles = available_nobles
|
||||||
|
self.noble_min_requirements = 0
|
||||||
|
self.get_noble_min_requirements()
|
||||||
|
self.current_player_index = 0
|
||||||
|
self.finished = False
|
||||||
|
|
||||||
|
def get_noble_min_requirements(self) -> None:
|
||||||
|
"""Find the minimum requirement for all available nobles."""
|
||||||
|
test = 0
|
||||||
|
|
||||||
|
for noble in self.available_nobles:
|
||||||
|
test = max(test, min(foo for foo in noble.requirements.values()))
|
||||||
|
|
||||||
|
self.noble_min_requirements = test
|
||||||
|
|
||||||
|
def next_player(self) -> None:
|
||||||
|
"""Advance to the next player."""
|
||||||
|
self.current_player_index = (self.current_player_index + 1) % len(self.players)
|
||||||
|
|
||||||
|
@property
|
||||||
|
def current_player(self) -> PlayerState:
|
||||||
|
"""Current player."""
|
||||||
|
return self.players[self.current_player_index]
|
||||||
|
|
||||||
|
def refill_table(self) -> None:
|
||||||
|
"""Refill face-up cards from decks."""
|
||||||
|
for tier, deck in self.decks_by_tier.items():
|
||||||
|
table = self.table_by_tier[tier]
|
||||||
|
while len(table) < self.config.table_cards_per_tier and deck:
|
||||||
|
table.append(deck.pop())
|
||||||
|
|
||||||
|
def check_winner_simple(self) -> PlayerState | None:
|
||||||
|
"""Simplified: end immediately when someone hits win_score."""
|
||||||
|
eligible = [player for player in self.players if player.score >= self.config.win_score]
|
||||||
|
if not eligible:
|
||||||
|
return None
|
||||||
|
eligible.sort(
|
||||||
|
key=lambda p: (p.score, -len(p.cards)),
|
||||||
|
reverse=True,
|
||||||
|
)
|
||||||
|
self.finished = True
|
||||||
|
return eligible[0]
|
||||||
|
|
||||||
|
|
||||||
|
class Action:
|
||||||
|
"""Marker protocol for actions."""
|
||||||
|
|
||||||
|
|
||||||
|
@dataclass
|
||||||
|
class TakeDifferent(Action):
|
||||||
|
"""Take up to 3 different gem colors."""
|
||||||
|
|
||||||
|
colors: list[GemColor]
|
||||||
|
|
||||||
|
|
||||||
|
@dataclass
|
||||||
|
class TakeDouble(Action):
|
||||||
|
"""Take two of the same color."""
|
||||||
|
|
||||||
|
color: GemColor
|
||||||
|
|
||||||
|
|
||||||
|
@dataclass
|
||||||
|
class BuyCard(Action):
|
||||||
|
"""Buy a face-up card."""
|
||||||
|
|
||||||
|
tier: int
|
||||||
|
index: int
|
||||||
|
|
||||||
|
|
||||||
|
@dataclass
|
||||||
|
class BuyCardReserved(Action):
|
||||||
|
"""Buy a face-up card."""
|
||||||
|
|
||||||
|
index: int
|
||||||
|
|
||||||
|
|
||||||
|
@dataclass
|
||||||
|
class ReserveCard(Action):
|
||||||
|
"""Reserve a face-up card."""
|
||||||
|
|
||||||
|
tier: int
|
||||||
|
index: int | None = None
|
||||||
|
from_deck: bool = False
|
||||||
|
|
||||||
|
|
||||||
|
class Strategy(Protocol):
|
||||||
|
"""Implement this to make a bot or human controller."""
|
||||||
|
|
||||||
|
def __init__(self, name: str) -> None:
|
||||||
|
"""Initialize a strategy."""
|
||||||
|
self.name = name
|
||||||
|
|
||||||
|
def choose_action(self, game: GameState, player: PlayerState) -> Action | None:
|
||||||
|
"""Return an Action, or None to concede/end."""
|
||||||
|
raise NotImplementedError
|
||||||
|
|
||||||
|
def choose_discard(
|
||||||
|
self,
|
||||||
|
game: GameState, # noqa: ARG002
|
||||||
|
player: PlayerState,
|
||||||
|
excess: int,
|
||||||
|
) -> dict[GemColor, int]:
|
||||||
|
"""Called if player has more than token_limit tokens after an action.
|
||||||
|
|
||||||
|
Default: naive auto-discard.
|
||||||
|
"""
|
||||||
|
return auto_discard_tokens(player, excess)
|
||||||
|
|
||||||
|
def choose_noble(
|
||||||
|
self,
|
||||||
|
game: GameState, # noqa: ARG002
|
||||||
|
player: PlayerState, # noqa: ARG002
|
||||||
|
nobles: list[Noble],
|
||||||
|
) -> Noble:
|
||||||
|
"""Called if player qualifies for multiple nobles. Default: first."""
|
||||||
|
return nobles[0]
|
||||||
|
|
||||||
|
|
||||||
|
def auto_discard_tokens(player: PlayerState, excess: int) -> dict[GemColor, int]:
|
||||||
|
"""Very dumb discard logic: discard from colors you have the most of."""
|
||||||
|
to_discard: dict[GemColor, int] = dict.fromkeys(GEM_COLORS, 0)
|
||||||
|
remaining = excess
|
||||||
|
while remaining > 0:
|
||||||
|
color = max(player.tokens, key=lambda c: player.tokens[c])
|
||||||
|
if player.tokens[color] == 0:
|
||||||
|
break
|
||||||
|
player.tokens[color] -= 1
|
||||||
|
to_discard[color] += 1
|
||||||
|
remaining -= 1
|
||||||
|
return to_discard
|
||||||
|
|
||||||
|
|
||||||
|
def enforce_token_limit(
|
||||||
|
game: GameState,
|
||||||
|
strategy: Strategy,
|
||||||
|
player: PlayerState,
|
||||||
|
) -> None:
|
||||||
|
"""If player has more than token_limit tokens, force discards."""
|
||||||
|
limit = game.config.token_limit
|
||||||
|
total = player.total_tokens()
|
||||||
|
if total <= limit:
|
||||||
|
return
|
||||||
|
excess = total - limit
|
||||||
|
discards = strategy.choose_discard(game, player, excess)
|
||||||
|
for color, amount in discards.items():
|
||||||
|
available = player.tokens[color]
|
||||||
|
to_remove = min(amount, available)
|
||||||
|
if to_remove <= 0:
|
||||||
|
continue
|
||||||
|
player.tokens[color] -= to_remove
|
||||||
|
game.bank[color] += to_remove
|
||||||
|
remaining = player.total_tokens() - limit
|
||||||
|
if remaining > 0:
|
||||||
|
auto = auto_discard_tokens(player, remaining)
|
||||||
|
for color, amount in auto.items():
|
||||||
|
game.bank[color] += amount
|
||||||
|
|
||||||
|
|
||||||
|
def _check_nobles_for_player(player: PlayerState, noble: Noble) -> bool:
|
||||||
|
# this rule is slower
|
||||||
|
for color, cost in noble.requirements.items(): # noqa: SIM110
|
||||||
|
if player.discounts[color] < cost:
|
||||||
|
return False
|
||||||
|
return True
|
||||||
|
|
||||||
|
|
||||||
|
def check_nobles_for_player(
|
||||||
|
game: GameState,
|
||||||
|
strategy: Strategy,
|
||||||
|
player: PlayerState,
|
||||||
|
) -> None:
|
||||||
|
"""Award at most one noble to player if they qualify."""
|
||||||
|
if game.noble_min_requirements > max(player.discounts.values()):
|
||||||
|
return
|
||||||
|
|
||||||
|
candidates = [noble for noble in game.available_nobles if _check_nobles_for_player(player, noble)]
|
||||||
|
|
||||||
|
if not candidates:
|
||||||
|
return
|
||||||
|
|
||||||
|
chosen = candidates[0] if len(candidates) == 1 else strategy.choose_noble(game, player, candidates)
|
||||||
|
|
||||||
|
if chosen not in game.available_nobles:
|
||||||
|
return
|
||||||
|
game.available_nobles.remove(chosen)
|
||||||
|
game.get_noble_min_requirements()
|
||||||
|
|
||||||
|
player.add_noble(chosen)
|
||||||
|
|
||||||
|
|
||||||
|
def apply_take_different(game: GameState, strategy: Strategy, action: TakeDifferent) -> None:
|
||||||
|
"""Mutate game state according to action."""
|
||||||
|
player = game.current_player
|
||||||
|
|
||||||
|
colors = [color for color in action.colors if color in BASE_COLORS and game.bank[color] > 0]
|
||||||
|
if not (1 <= len(colors) <= game.config.max_token_take):
|
||||||
|
return
|
||||||
|
|
||||||
|
for color in colors:
|
||||||
|
game.bank[color] -= 1
|
||||||
|
player.tokens[color] += 1
|
||||||
|
|
||||||
|
enforce_token_limit(game, strategy, player)
|
||||||
|
|
||||||
|
|
||||||
|
def apply_take_double(game: GameState, strategy: Strategy, action: TakeDouble) -> None:
|
||||||
|
"""Mutate game state according to action."""
|
||||||
|
player = game.current_player
|
||||||
|
color = action.color
|
||||||
|
if color not in BASE_COLORS:
|
||||||
|
return
|
||||||
|
if game.bank[color] < game.config.minimum_tokens_to_buy_2:
|
||||||
|
return
|
||||||
|
game.bank[color] -= 2
|
||||||
|
player.tokens[color] += 2
|
||||||
|
enforce_token_limit(game, strategy, player)
|
||||||
|
|
||||||
|
|
||||||
|
def apply_buy_card(game: GameState, _strategy: Strategy, action: BuyCard) -> None:
|
||||||
|
"""Mutate game state according to action."""
|
||||||
|
player = game.current_player
|
||||||
|
|
||||||
|
row = game.table_by_tier.get(action.tier)
|
||||||
|
if row is None or not (0 <= action.index < len(row)):
|
||||||
|
return
|
||||||
|
card = row[action.index]
|
||||||
|
if not player.can_afford(card):
|
||||||
|
return
|
||||||
|
row.pop(action.index)
|
||||||
|
payment = player.pay_for_card(card)
|
||||||
|
for color, amount in payment.items():
|
||||||
|
game.bank[color] += amount
|
||||||
|
game.refill_table()
|
||||||
|
|
||||||
|
|
||||||
|
def apply_buy_card_reserved(game: GameState, _strategy: Strategy, action: BuyCardReserved) -> None:
|
||||||
|
"""Mutate game state according to action."""
|
||||||
|
player = game.current_player
|
||||||
|
if not (0 <= action.index < len(player.reserved)):
|
||||||
|
return
|
||||||
|
card = player.reserved[action.index]
|
||||||
|
if not player.can_afford(card):
|
||||||
|
return
|
||||||
|
player.reserved.pop(action.index)
|
||||||
|
payment = player.pay_for_card(card)
|
||||||
|
for color, amount in payment.items():
|
||||||
|
game.bank[color] += amount
|
||||||
|
|
||||||
|
|
||||||
|
def apply_reserve_card(game: GameState, strategy: Strategy, action: ReserveCard) -> None:
|
||||||
|
"""Mutate game state according to action."""
|
||||||
|
player = game.current_player
|
||||||
|
|
||||||
|
if len(player.reserved) >= game.config.reserve_limit:
|
||||||
|
return
|
||||||
|
|
||||||
|
card: Card | None = None
|
||||||
|
if action.from_deck:
|
||||||
|
deck = game.decks_by_tier.get(action.tier)
|
||||||
|
if deck:
|
||||||
|
card = deck.pop()
|
||||||
|
else:
|
||||||
|
row = game.table_by_tier.get(action.tier)
|
||||||
|
if row is None:
|
||||||
|
return
|
||||||
|
if action.index is None or not (0 <= action.index < len(row)):
|
||||||
|
return
|
||||||
|
card = row.pop(action.index)
|
||||||
|
game.refill_table()
|
||||||
|
|
||||||
|
if card is None:
|
||||||
|
return
|
||||||
|
player.reserved.append(card)
|
||||||
|
|
||||||
|
if game.bank["gold"] > 0:
|
||||||
|
game.bank["gold"] -= 1
|
||||||
|
player.tokens["gold"] += 1
|
||||||
|
enforce_token_limit(game, strategy, player)
|
||||||
|
|
||||||
|
|
||||||
|
def apply_action(game: GameState, strategy: Strategy, action: Action) -> None:
|
||||||
|
"""Mutate game state according to action."""
|
||||||
|
actions = {
|
||||||
|
TakeDifferent: apply_take_different,
|
||||||
|
TakeDouble: apply_take_double,
|
||||||
|
BuyCard: apply_buy_card,
|
||||||
|
ReserveCard: apply_reserve_card,
|
||||||
|
BuyCardReserved: apply_buy_card_reserved,
|
||||||
|
}
|
||||||
|
action_func = actions.get(type(action))
|
||||||
|
if action_func is None:
|
||||||
|
msg = f"Unknown action type: {type(action)}"
|
||||||
|
raise ValueError(msg)
|
||||||
|
action_func(game, strategy, action)
|
||||||
|
|
||||||
|
|
||||||
|
# not sure how to simplify this yet
|
||||||
|
def get_legal_actions( # noqa: C901
|
||||||
|
game: GameState,
|
||||||
|
player: PlayerState | None = None,
|
||||||
|
) -> list[Action]:
|
||||||
|
"""Enumerate all syntactically legal actions for the given player.
|
||||||
|
|
||||||
|
This enforces:
|
||||||
|
- token-taking rules
|
||||||
|
- reserve limits
|
||||||
|
- affordability for buys
|
||||||
|
"""
|
||||||
|
if player is None:
|
||||||
|
player = game.players[game.current_player_index]
|
||||||
|
|
||||||
|
actions: list[Action] = []
|
||||||
|
|
||||||
|
colors_available = [c for c in BASE_COLORS if game.bank[c] > 0]
|
||||||
|
for r in (1, 2, 3):
|
||||||
|
actions.extend(TakeDifferent(colors=list(combo)) for combo in itertools.combinations(colors_available, r))
|
||||||
|
|
||||||
|
actions.extend(
|
||||||
|
TakeDouble(color=color) for color in BASE_COLORS if game.bank[color] >= game.config.minimum_tokens_to_buy_2
|
||||||
|
)
|
||||||
|
|
||||||
|
for tier, row in game.table_by_tier.items():
|
||||||
|
for idx, card in enumerate(row):
|
||||||
|
if player.can_afford(card):
|
||||||
|
actions.append(BuyCard(tier=tier, index=idx))
|
||||||
|
|
||||||
|
for idx, card in enumerate(player.reserved):
|
||||||
|
if player.can_afford(card):
|
||||||
|
actions.append(BuyCardReserved(index=idx))
|
||||||
|
|
||||||
|
if len(player.reserved) < game.config.reserve_limit:
|
||||||
|
for tier, row in game.table_by_tier.items():
|
||||||
|
for idx, _ in enumerate(row):
|
||||||
|
actions.append(
|
||||||
|
ReserveCard(tier=tier, index=idx, from_deck=False),
|
||||||
|
)
|
||||||
|
for tier, deck in game.decks_by_tier.items():
|
||||||
|
if deck:
|
||||||
|
actions.append(
|
||||||
|
ReserveCard(tier=tier, index=None, from_deck=True),
|
||||||
|
)
|
||||||
|
|
||||||
|
return actions
|
||||||
|
|
||||||
|
|
||||||
|
def create_random_cards_tier(
|
||||||
|
tier: int,
|
||||||
|
card_count: int,
|
||||||
|
cost_choices: list[int],
|
||||||
|
point_choices: list[int],
|
||||||
|
) -> list[Card]:
|
||||||
|
"""Create a random set of cards for a given tier."""
|
||||||
|
cards: list[Card] = []
|
||||||
|
|
||||||
|
for color in BASE_COLORS:
|
||||||
|
for _ in range(card_count):
|
||||||
|
cost = dict.fromkeys(GEM_COLORS, 0)
|
||||||
|
for c in BASE_COLORS:
|
||||||
|
if c == color:
|
||||||
|
continue
|
||||||
|
cost[c] = random.choice(cost_choices)
|
||||||
|
points = random.choice(point_choices)
|
||||||
|
cards.append(Card(tier=tier, points=points, color=color, cost=cost))
|
||||||
|
|
||||||
|
return cards
|
||||||
|
|
||||||
|
|
||||||
|
def create_random_cards() -> list[Card]:
|
||||||
|
"""Generate a generic but Splendor-ish set of cards.
|
||||||
|
|
||||||
|
This is not the official deck, but structured similarly enough for play.
|
||||||
|
"""
|
||||||
|
cards: list[Card] = []
|
||||||
|
cards.extend(
|
||||||
|
create_random_cards_tier(
|
||||||
|
tier=1,
|
||||||
|
card_count=5,
|
||||||
|
cost_choices=[0, 1, 1, 2],
|
||||||
|
point_choices=[0, 0, 1],
|
||||||
|
)
|
||||||
|
)
|
||||||
|
cards.extend(
|
||||||
|
create_random_cards_tier(
|
||||||
|
tier=2,
|
||||||
|
card_count=4,
|
||||||
|
cost_choices=[2, 3, 4],
|
||||||
|
point_choices=[1, 2, 2, 3],
|
||||||
|
)
|
||||||
|
)
|
||||||
|
cards.extend(
|
||||||
|
create_random_cards_tier(
|
||||||
|
tier=3,
|
||||||
|
card_count=3,
|
||||||
|
cost_choices=[4, 5, 6],
|
||||||
|
point_choices=[3, 4, 5],
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
random.shuffle(cards)
|
||||||
|
return cards
|
||||||
|
|
||||||
|
|
||||||
|
def create_random_nobles() -> list[Noble]:
|
||||||
|
"""A small set of noble tiles, roughly Splendor-ish."""
|
||||||
|
nobles: list[Noble] = []
|
||||||
|
|
||||||
|
base_requirements: list[dict[GemColor, int]] = [
|
||||||
|
{"white": 3, "blue": 3, "green": 3},
|
||||||
|
{"blue": 3, "green": 3, "red": 3},
|
||||||
|
{"green": 3, "red": 3, "black": 3},
|
||||||
|
{"red": 3, "black": 3, "white": 3},
|
||||||
|
{"black": 3, "white": 3, "blue": 3},
|
||||||
|
{"white": 4, "blue": 4},
|
||||||
|
{"green": 4, "red": 4},
|
||||||
|
{"blue": 4, "black": 4},
|
||||||
|
]
|
||||||
|
|
||||||
|
for idx, req in enumerate(base_requirements, start=1):
|
||||||
|
nobles.append(
|
||||||
|
Noble(
|
||||||
|
name=f"Noble {idx}",
|
||||||
|
points=3,
|
||||||
|
requirements=dict(req.items()),
|
||||||
|
),
|
||||||
|
)
|
||||||
|
return nobles
|
||||||
|
|
||||||
|
|
||||||
|
def load_nobles(file: Path) -> list[Noble]:
|
||||||
|
"""Load nobles from a file."""
|
||||||
|
nobles = json.loads(file.read_text())
|
||||||
|
return [Noble(**noble) for noble in nobles]
|
||||||
|
|
||||||
|
|
||||||
|
def load_cards(file: Path) -> list[Card]:
|
||||||
|
"""Load cards from a file."""
|
||||||
|
cards = json.loads(file.read_text())
|
||||||
|
return [Card(**card) for card in cards]
|
||||||
|
|
||||||
|
|
||||||
|
def new_game(
|
||||||
|
strategies: Sequence[Strategy],
|
||||||
|
config: GameConfig,
|
||||||
|
) -> GameState:
|
||||||
|
"""Create a new game state from a config + list of players."""
|
||||||
|
num_players = len(strategies)
|
||||||
|
bank = get_default_starting_tokens(num_players)
|
||||||
|
|
||||||
|
decks_by_tier: dict[int, list[Card]] = {1: [], 2: [], 3: []}
|
||||||
|
for card in config.cards:
|
||||||
|
decks_by_tier.setdefault(card.tier, []).append(card)
|
||||||
|
for deck in decks_by_tier.values():
|
||||||
|
random.shuffle(deck)
|
||||||
|
|
||||||
|
table_by_tier: dict[int, list[Card]] = {1: [], 2: [], 3: []}
|
||||||
|
players = [PlayerState(strategy=strategy) for strategy in strategies]
|
||||||
|
|
||||||
|
nobles = list(config.nobles)
|
||||||
|
random.shuffle(nobles)
|
||||||
|
nobles = nobles[: num_players + 1]
|
||||||
|
|
||||||
|
game = GameState(
|
||||||
|
config=config,
|
||||||
|
players=players,
|
||||||
|
bank=bank,
|
||||||
|
decks_by_tier=decks_by_tier,
|
||||||
|
table_by_tier=table_by_tier,
|
||||||
|
available_nobles=nobles,
|
||||||
|
)
|
||||||
|
game.refill_table()
|
||||||
|
return game
|
||||||
|
|
||||||
|
|
||||||
|
def run_game(game: GameState) -> tuple[PlayerState, int]:
|
||||||
|
"""Run a full game loop until someone wins or a player returns None."""
|
||||||
|
turn_count = 0
|
||||||
|
while not game.finished:
|
||||||
|
turn_count += 1
|
||||||
|
player = game.current_player
|
||||||
|
strategy = player.strategy
|
||||||
|
action = strategy.choose_action(game, player)
|
||||||
|
if action is None:
|
||||||
|
game.finished = True
|
||||||
|
break
|
||||||
|
|
||||||
|
apply_action(game, strategy, action)
|
||||||
|
check_nobles_for_player(game, strategy, player)
|
||||||
|
|
||||||
|
winner = game.check_winner_simple()
|
||||||
|
if winner is not None:
|
||||||
|
return winner, turn_count
|
||||||
|
|
||||||
|
game.next_player()
|
||||||
|
if turn_count >= game.config.turn_limit:
|
||||||
|
break
|
||||||
|
|
||||||
|
fallback = max(game.players, key=lambda player: player.score)
|
||||||
|
return fallback, turn_count
|
||||||
288
python/splendor/bot.py
Normal file
288
python/splendor/bot.py
Normal file
@@ -0,0 +1,288 @@
|
|||||||
|
"""Bot for Splendor game."""
|
||||||
|
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import random
|
||||||
|
|
||||||
|
from .base import (
|
||||||
|
BASE_COLORS,
|
||||||
|
Action,
|
||||||
|
BuyCard,
|
||||||
|
BuyCardReserved,
|
||||||
|
Card,
|
||||||
|
GameState,
|
||||||
|
GemColor,
|
||||||
|
PlayerState,
|
||||||
|
ReserveCard,
|
||||||
|
Strategy,
|
||||||
|
TakeDifferent,
|
||||||
|
TakeDouble,
|
||||||
|
auto_discard_tokens,
|
||||||
|
get_legal_actions,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def can_bot_afford(player: PlayerState, card: Card) -> bool:
|
||||||
|
"""Check if player can afford card, using discounts + gold."""
|
||||||
|
missing = 0
|
||||||
|
gold = player.tokens["gold"]
|
||||||
|
for color, cost in card.cost.items():
|
||||||
|
missing += max(0, cost - player.discounts.get(color, 0) - player.tokens.get(color, 0))
|
||||||
|
if missing > gold:
|
||||||
|
return False
|
||||||
|
|
||||||
|
return True
|
||||||
|
|
||||||
|
|
||||||
|
class RandomBot(Strategy):
|
||||||
|
"""Dumb bot that follows rules but doesn't think."""
|
||||||
|
|
||||||
|
def __init__(self, name: str) -> None:
|
||||||
|
"""Initialize the bot."""
|
||||||
|
super().__init__(name=name)
|
||||||
|
|
||||||
|
def choose_action(self, game: GameState, player: PlayerState) -> Action | None:
|
||||||
|
"""Choose an action for the current player."""
|
||||||
|
affordable: list[tuple[int, int]] = []
|
||||||
|
for tier, row in game.table_by_tier.items():
|
||||||
|
for idx, card in enumerate(row):
|
||||||
|
if can_bot_afford(player, card):
|
||||||
|
affordable.append((tier, idx))
|
||||||
|
if affordable and random.random() < 0.5:
|
||||||
|
tier, idx = random.choice(affordable)
|
||||||
|
return BuyCard(tier=tier, index=idx)
|
||||||
|
|
||||||
|
if random.random() < 0.2:
|
||||||
|
tier = random.choice([1, 2, 3])
|
||||||
|
row = game.table_by_tier.get(tier, [])
|
||||||
|
if row:
|
||||||
|
idx = random.randrange(len(row))
|
||||||
|
return ReserveCard(tier=tier, index=idx, from_deck=False)
|
||||||
|
|
||||||
|
if random.random() < 0.5:
|
||||||
|
colors_for_double = [c for c in BASE_COLORS if game.bank[c] >= 4]
|
||||||
|
if colors_for_double:
|
||||||
|
return TakeDouble(color=random.choice(colors_for_double))
|
||||||
|
|
||||||
|
colors_for_diff = [c for c in BASE_COLORS if game.bank[c] > 0]
|
||||||
|
random.shuffle(colors_for_diff)
|
||||||
|
return TakeDifferent(colors=colors_for_diff[:3])
|
||||||
|
|
||||||
|
def choose_discard(
|
||||||
|
self,
|
||||||
|
game: GameState, # noqa: ARG002
|
||||||
|
player: PlayerState,
|
||||||
|
excess: int,
|
||||||
|
) -> dict[GemColor, int]:
|
||||||
|
"""Choose how many tokens to discard."""
|
||||||
|
return auto_discard_tokens(player, excess)
|
||||||
|
|
||||||
|
|
||||||
|
def check_cards_in_tier(row: list[Card], player: PlayerState) -> list[int]:
|
||||||
|
"""Check if player can afford card, using discounts + gold."""
|
||||||
|
return [index for index, card in enumerate(row) if can_bot_afford(player, card)]
|
||||||
|
|
||||||
|
|
||||||
|
class PersonalizedBot(Strategy):
|
||||||
|
"""PersonalizedBot."""
|
||||||
|
|
||||||
|
"""Dumb bot that follows rules but doesn't think."""
|
||||||
|
|
||||||
|
def __init__(self, name: str) -> None:
|
||||||
|
"""Initialize the bot."""
|
||||||
|
super().__init__(name=name)
|
||||||
|
|
||||||
|
def choose_action(self, game: GameState, player: PlayerState) -> Action | None:
|
||||||
|
"""Choose an action for the current player."""
|
||||||
|
for tier in (1, 2, 3):
|
||||||
|
row = game.table_by_tier[tier]
|
||||||
|
if affordable := check_cards_in_tier(row, player):
|
||||||
|
index = random.choice(affordable)
|
||||||
|
return BuyCard(tier=tier, index=index)
|
||||||
|
|
||||||
|
colors_for_diff = [c for c in BASE_COLORS if game.bank[c] > 0]
|
||||||
|
random.shuffle(colors_for_diff)
|
||||||
|
return TakeDifferent(colors=colors_for_diff[:3])
|
||||||
|
|
||||||
|
def choose_discard(
|
||||||
|
self,
|
||||||
|
game: GameState, # noqa: ARG002
|
||||||
|
player: PlayerState,
|
||||||
|
excess: int,
|
||||||
|
) -> dict[GemColor, int]:
|
||||||
|
"""Choose how many tokens to discard."""
|
||||||
|
return auto_discard_tokens(player, excess)
|
||||||
|
|
||||||
|
|
||||||
|
class PersonalizedBot2(Strategy):
|
||||||
|
"""PersonalizedBot2."""
|
||||||
|
|
||||||
|
"""Dumb bot that follows rules but doesn't think."""
|
||||||
|
|
||||||
|
def __init__(self, name: str) -> None:
|
||||||
|
"""Initialize the bot."""
|
||||||
|
super().__init__(name=name)
|
||||||
|
|
||||||
|
def choose_action(self, game: GameState, player: PlayerState) -> Action | None:
|
||||||
|
"""Choose an action for the current player."""
|
||||||
|
tiers = (1, 2, 3)
|
||||||
|
for tier in tiers:
|
||||||
|
row = game.table_by_tier[tier]
|
||||||
|
if affordable := check_cards_in_tier(row, player):
|
||||||
|
index = random.choice(affordable)
|
||||||
|
return BuyCard(tier=tier, index=index)
|
||||||
|
|
||||||
|
if affordable := check_cards_in_tier(player.reserved, player):
|
||||||
|
index = random.choice(affordable)
|
||||||
|
return BuyCardReserved(index=index)
|
||||||
|
|
||||||
|
colors_for_diff = [c for c in BASE_COLORS if game.bank[c] > 0]
|
||||||
|
if len(colors_for_diff) >= 3:
|
||||||
|
random.shuffle(colors_for_diff)
|
||||||
|
return TakeDifferent(colors=colors_for_diff[:3])
|
||||||
|
|
||||||
|
for tier in tiers:
|
||||||
|
len_deck = len(game.decks_by_tier[tier])
|
||||||
|
if len_deck:
|
||||||
|
return ReserveCard(tier=tier, index=None, from_deck=True)
|
||||||
|
|
||||||
|
return TakeDifferent(colors=colors_for_diff[:3])
|
||||||
|
|
||||||
|
def choose_discard(
|
||||||
|
self,
|
||||||
|
game: GameState, # noqa: ARG002
|
||||||
|
player: PlayerState,
|
||||||
|
excess: int,
|
||||||
|
) -> dict[GemColor, int]:
|
||||||
|
"""Choose how many tokens to discard."""
|
||||||
|
return auto_discard_tokens(player, excess)
|
||||||
|
|
||||||
|
|
||||||
|
def buy_card_reserved(player: PlayerState) -> Action | None:
|
||||||
|
"""Buy a card reserved."""
|
||||||
|
if affordable := check_cards_in_tier(player.reserved, player):
|
||||||
|
index = random.choice(affordable)
|
||||||
|
return BuyCardReserved(index=index)
|
||||||
|
return None
|
||||||
|
|
||||||
|
|
||||||
|
def buy_card(game: GameState, player: PlayerState) -> Action | None:
|
||||||
|
"""Buy a card."""
|
||||||
|
for tier in (1, 2, 3):
|
||||||
|
row = game.table_by_tier[tier]
|
||||||
|
if affordable := check_cards_in_tier(row, player):
|
||||||
|
index = random.choice(affordable)
|
||||||
|
return BuyCard(tier=tier, index=index)
|
||||||
|
return None
|
||||||
|
|
||||||
|
|
||||||
|
def take_tokens(game: GameState) -> Action | None:
|
||||||
|
"""Take tokens."""
|
||||||
|
colors_for_diff = [color for color in BASE_COLORS if game.bank[color] > 0]
|
||||||
|
if len(colors_for_diff) >= 3:
|
||||||
|
random.shuffle(colors_for_diff)
|
||||||
|
return TakeDifferent(colors=colors_for_diff[: game.config.max_token_take])
|
||||||
|
return None
|
||||||
|
|
||||||
|
|
||||||
|
class PersonalizedBot3(Strategy):
|
||||||
|
"""PersonalizedBot3."""
|
||||||
|
|
||||||
|
"""Dumb bot that follows rules but doesn't think."""
|
||||||
|
|
||||||
|
def __init__(self, name: str) -> None:
|
||||||
|
"""Initialize the bot."""
|
||||||
|
super().__init__(name=name)
|
||||||
|
|
||||||
|
def choose_action(self, game: GameState, player: PlayerState) -> Action | None:
|
||||||
|
"""Choose an action for the current player."""
|
||||||
|
print(len(get_legal_actions(game, player)))
|
||||||
|
print(get_legal_actions(game, player))
|
||||||
|
if action := buy_card_reserved(player):
|
||||||
|
return action
|
||||||
|
if action := buy_card(game, player):
|
||||||
|
return action
|
||||||
|
|
||||||
|
colors_for_diff = [color for color in BASE_COLORS if game.bank[color] > 0]
|
||||||
|
if len(colors_for_diff) >= 3:
|
||||||
|
random.shuffle(colors_for_diff)
|
||||||
|
return TakeDifferent(colors=colors_for_diff[:3])
|
||||||
|
|
||||||
|
for tier in (1, 2, 3):
|
||||||
|
len_deck = len(game.decks_by_tier[tier])
|
||||||
|
if len_deck:
|
||||||
|
return ReserveCard(tier=tier, index=None, from_deck=True)
|
||||||
|
|
||||||
|
return TakeDifferent(colors=colors_for_diff[:3])
|
||||||
|
|
||||||
|
def choose_discard(
|
||||||
|
self,
|
||||||
|
game: GameState, # noqa: ARG002
|
||||||
|
player: PlayerState,
|
||||||
|
excess: int,
|
||||||
|
) -> dict[GemColor, int]:
|
||||||
|
"""Choose how many tokens to discard."""
|
||||||
|
return auto_discard_tokens(player, excess)
|
||||||
|
|
||||||
|
|
||||||
|
def estimate_value_of_card(game: GameState, player: PlayerState, color: GemColor) -> int:
|
||||||
|
"""Estimate value of a color in the player's bank."""
|
||||||
|
return game.bank[color] - player.discounts.get(color, 0)
|
||||||
|
|
||||||
|
|
||||||
|
def estimate_value_of_token(game: GameState, player: PlayerState, color: GemColor) -> int:
|
||||||
|
"""Estimate value of a color in the player's bank."""
|
||||||
|
return game.bank[color] - player.discounts.get(color, 0)
|
||||||
|
|
||||||
|
|
||||||
|
class PersonalizedBot4(Strategy):
|
||||||
|
"""PersonalizedBot4."""
|
||||||
|
|
||||||
|
def __init__(self, name: str) -> None:
|
||||||
|
"""Initialize the bot."""
|
||||||
|
super().__init__(name=name)
|
||||||
|
|
||||||
|
def filter_actions(self, actions: list[Action]) -> list[Action]:
|
||||||
|
"""Filter actions to only take different."""
|
||||||
|
return [
|
||||||
|
action
|
||||||
|
for action in actions
|
||||||
|
if (isinstance(action, TakeDifferent) and len(action.colors) == 3) or not isinstance(action, TakeDifferent)
|
||||||
|
]
|
||||||
|
|
||||||
|
def choose_action(self, game: GameState, player: PlayerState) -> Action | None:
|
||||||
|
"""Choose an action for the current player."""
|
||||||
|
legal_actions = get_legal_actions(game, player)
|
||||||
|
print(len(legal_actions))
|
||||||
|
|
||||||
|
good_actions = self.filter_actions(legal_actions)
|
||||||
|
print(len(good_actions))
|
||||||
|
|
||||||
|
print(good_actions)
|
||||||
|
|
||||||
|
print(len(get_legal_actions(game, player)))
|
||||||
|
if action := buy_card_reserved(player):
|
||||||
|
return action
|
||||||
|
if action := buy_card(game, player):
|
||||||
|
return action
|
||||||
|
|
||||||
|
colors_for_diff = [color for color in BASE_COLORS if game.bank[color] > 0]
|
||||||
|
if len(colors_for_diff) >= 3:
|
||||||
|
random.shuffle(colors_for_diff)
|
||||||
|
return TakeDifferent(colors=colors_for_diff[:3])
|
||||||
|
|
||||||
|
for tier in (1, 2, 3):
|
||||||
|
len_deck = len(game.decks_by_tier[tier])
|
||||||
|
if len_deck:
|
||||||
|
return ReserveCard(tier=tier, index=None, from_deck=True)
|
||||||
|
|
||||||
|
return TakeDifferent(colors=colors_for_diff[:3])
|
||||||
|
|
||||||
|
def choose_discard(
|
||||||
|
self,
|
||||||
|
game: GameState, # noqa: ARG002
|
||||||
|
player: PlayerState,
|
||||||
|
excess: int,
|
||||||
|
) -> dict[GemColor, int]:
|
||||||
|
"""Choose how many tokens to discard."""
|
||||||
|
return auto_discard_tokens(player, excess)
|
||||||
724
python/splendor/human.py
Normal file
724
python/splendor/human.py
Normal file
@@ -0,0 +1,724 @@
|
|||||||
|
"""Splendor game."""
|
||||||
|
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import sys
|
||||||
|
from typing import TYPE_CHECKING, Any
|
||||||
|
|
||||||
|
from textual.app import App, ComposeResult
|
||||||
|
from textual.containers import Horizontal, Vertical
|
||||||
|
from textual.widget import Widget
|
||||||
|
from textual.widgets import Footer, Header, Input, Static
|
||||||
|
|
||||||
|
from .base import (
|
||||||
|
BASE_COLORS,
|
||||||
|
GEM_COLORS,
|
||||||
|
Action,
|
||||||
|
BuyCard,
|
||||||
|
BuyCardReserved,
|
||||||
|
Card,
|
||||||
|
GameState,
|
||||||
|
GemColor,
|
||||||
|
Noble,
|
||||||
|
PlayerState,
|
||||||
|
ReserveCard,
|
||||||
|
Strategy,
|
||||||
|
TakeDifferent,
|
||||||
|
TakeDouble,
|
||||||
|
)
|
||||||
|
|
||||||
|
if TYPE_CHECKING:
|
||||||
|
from collections.abc import Mapping
|
||||||
|
|
||||||
|
# Abbreviations used when rendering costs
|
||||||
|
COST_ABBR: dict[GemColor, str] = {
|
||||||
|
"white": "W",
|
||||||
|
"blue": "B",
|
||||||
|
"green": "G",
|
||||||
|
"red": "R",
|
||||||
|
"black": "K",
|
||||||
|
"gold": "O",
|
||||||
|
}
|
||||||
|
|
||||||
|
# Abbreviations players can type on the command line
|
||||||
|
COLOR_ABBR_TO_FULL: dict[str, GemColor] = {
|
||||||
|
"w": "white",
|
||||||
|
"b": "blue",
|
||||||
|
"g": "green",
|
||||||
|
"r": "red",
|
||||||
|
"k": "black",
|
||||||
|
"o": "gold",
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
def parse_color_token(raw: str) -> GemColor:
|
||||||
|
"""Convert user input into a GemColor.
|
||||||
|
|
||||||
|
Supports:
|
||||||
|
- full names: white, blue, green, red, black, gold
|
||||||
|
- abbreviations: w, b, g, r, k, o
|
||||||
|
"""
|
||||||
|
key = raw.lower()
|
||||||
|
|
||||||
|
# full color names first
|
||||||
|
if key in BASE_COLORS:
|
||||||
|
return key # type: ignore[return-value]
|
||||||
|
|
||||||
|
# abbreviations
|
||||||
|
if key in COLOR_ABBR_TO_FULL:
|
||||||
|
return COLOR_ABBR_TO_FULL[key]
|
||||||
|
|
||||||
|
error = f"Unknown color: {raw}"
|
||||||
|
raise ValueError(error)
|
||||||
|
|
||||||
|
|
||||||
|
def format_cost(cost: Mapping[GemColor, int]) -> str:
|
||||||
|
"""Format a cost/requirements dict as colored tokens like 'B:2, R:1'.
|
||||||
|
|
||||||
|
Uses `color_token` internally so colors are guaranteed to match your bank.
|
||||||
|
"""
|
||||||
|
parts: list[str] = []
|
||||||
|
for color in GEM_COLORS:
|
||||||
|
n = cost.get(color, 0)
|
||||||
|
if not n:
|
||||||
|
continue
|
||||||
|
|
||||||
|
# color_token gives us e.g. "[blue]blue: 3[/]"
|
||||||
|
token = color_token(color, n)
|
||||||
|
|
||||||
|
# Turn the leading color name into the abbreviation (blue: 3 → B:3)
|
||||||
|
# We only replace the first occurrence.
|
||||||
|
full = f"{color}:"
|
||||||
|
abbr = f"{COST_ABBR[color]}:"
|
||||||
|
token = token.replace(full, abbr, 1)
|
||||||
|
|
||||||
|
parts.append(token)
|
||||||
|
|
||||||
|
return ", ".join(parts) if parts else "-"
|
||||||
|
|
||||||
|
|
||||||
|
def format_card(card: Card) -> str:
|
||||||
|
"""Readable card line using dataclass fields instead of __str__."""
|
||||||
|
color_abbr = COST_ABBR[card.color]
|
||||||
|
header = f"T{card.tier} {color_abbr} P{card.points}"
|
||||||
|
cost_str = format_cost(card.cost)
|
||||||
|
return f"{header} ({cost_str})"
|
||||||
|
|
||||||
|
|
||||||
|
def format_noble(noble: Noble) -> str:
|
||||||
|
"""Readable noble line using dataclass fields instead of __str__."""
|
||||||
|
cost_str = format_cost(noble.requirements)
|
||||||
|
return f"{noble.name} +{noble.points} ({cost_str})"
|
||||||
|
|
||||||
|
|
||||||
|
def format_tokens(tokens: Mapping[GemColor, int]) -> str:
|
||||||
|
"""Colored 'color: n' list for a token dict."""
|
||||||
|
return " ".join(color_token(c, tokens.get(c, 0)) for c in GEM_COLORS)
|
||||||
|
|
||||||
|
|
||||||
|
def format_discounts(discounts: Mapping[GemColor, int]) -> str:
|
||||||
|
"""Colored discounts, skipping zeros."""
|
||||||
|
parts: list[str] = []
|
||||||
|
for c in GEM_COLORS:
|
||||||
|
n = discounts.get(c, 0)
|
||||||
|
if not n:
|
||||||
|
continue
|
||||||
|
abbr = COST_ABBR[c]
|
||||||
|
fg, bg = COLOR_STYLE[c]
|
||||||
|
parts.append(f"[{fg} on {bg}]{abbr}:{n}[/{fg} on {bg}]")
|
||||||
|
return ", ".join(parts) if parts else "-"
|
||||||
|
|
||||||
|
|
||||||
|
COLOR_STYLE: dict[GemColor, tuple[str, str]] = {
|
||||||
|
"white": ("black", "white"), # fg, bg
|
||||||
|
"blue": ("bright_white", "blue"),
|
||||||
|
"green": ("bright_white", "sea_green4"),
|
||||||
|
"red": ("white", "red3"),
|
||||||
|
"black": ("white", "grey0"),
|
||||||
|
"gold": ("black", "yellow3"),
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
def fmt_gem(color: GemColor) -> str:
|
||||||
|
"""Render gem name with fg/bg matching real token color."""
|
||||||
|
fg, bg = COLOR_STYLE[color]
|
||||||
|
return f"[{fg} on {bg}] {color} [/{fg} on {bg}]"
|
||||||
|
|
||||||
|
|
||||||
|
def fmt_number(value: int) -> str:
|
||||||
|
"""Return a Rich-markup colored 'value' string."""
|
||||||
|
return f"[bold cyan]{value}[/]"
|
||||||
|
|
||||||
|
|
||||||
|
def color_token(name: GemColor, amount: int) -> str:
|
||||||
|
"""Return a Rich-markup colored 'name: n' string."""
|
||||||
|
# Map Splendor colors -> terminal colors
|
||||||
|
color_map: Mapping[GemColor, str] = {
|
||||||
|
"white": "white",
|
||||||
|
"blue": "blue",
|
||||||
|
"green": "green",
|
||||||
|
"red": "red",
|
||||||
|
"black": "grey70", # 'black' is unreadable on dark backgrounds
|
||||||
|
"gold": "yellow",
|
||||||
|
}
|
||||||
|
style = color_map.get(name, "white")
|
||||||
|
return f"[{style}]{name}: {amount}[/]"
|
||||||
|
|
||||||
|
|
||||||
|
class Board(Widget):
|
||||||
|
"""Big board widget with the layout you sketched."""
|
||||||
|
|
||||||
|
def __init__(self, game: GameState, me: PlayerState, **kwargs: Any) -> None: # noqa: ANN401
|
||||||
|
"""Initialize the board widget."""
|
||||||
|
super().__init__(**kwargs)
|
||||||
|
self.game = game
|
||||||
|
self.me = me
|
||||||
|
|
||||||
|
def compose(self) -> ComposeResult:
|
||||||
|
"""Compose the board widget."""
|
||||||
|
# Structure:
|
||||||
|
# ┌ bank row
|
||||||
|
# ├ middle row (tiers | nobles)
|
||||||
|
# └ players row
|
||||||
|
with Vertical(id="board_root"):
|
||||||
|
yield Static(id="bank_box")
|
||||||
|
with Horizontal(id="middle_row"):
|
||||||
|
with Vertical(id="tiers_box"):
|
||||||
|
yield Static(id="tier1_box")
|
||||||
|
yield Static(id="tier2_box")
|
||||||
|
yield Static(id="tier3_box")
|
||||||
|
yield Static(id="nobles_box")
|
||||||
|
yield Static(id="players_box")
|
||||||
|
|
||||||
|
def on_mount(self) -> None:
|
||||||
|
"""Refresh the board content."""
|
||||||
|
self.refresh_content()
|
||||||
|
|
||||||
|
def refresh_content(self) -> None:
|
||||||
|
"""Refresh the board content."""
|
||||||
|
self._render_bank()
|
||||||
|
self._render_tiers()
|
||||||
|
self._render_nobles()
|
||||||
|
self._render_players()
|
||||||
|
|
||||||
|
# --- sections ----------------------------------------------------
|
||||||
|
|
||||||
|
def _render_bank(self) -> None:
|
||||||
|
bank = self.game.bank
|
||||||
|
parts: list[str] = ["[b]Bank:[/b]"]
|
||||||
|
# One line, all tokens colored
|
||||||
|
parts.append(format_tokens(bank))
|
||||||
|
self.query_one("#bank_box", Static).update("\n".join(parts))
|
||||||
|
|
||||||
|
def _render_tiers(self) -> None:
|
||||||
|
for tier in (1, 2, 3):
|
||||||
|
box = self.query_one(f"#tier{tier}_box", Static)
|
||||||
|
cards: list[Card] = self.game.table_by_tier.get(tier, [])
|
||||||
|
lines: list[str] = [f"[b]Tier {tier} cards:[/b]"]
|
||||||
|
if not cards:
|
||||||
|
lines.append(" (none)")
|
||||||
|
else:
|
||||||
|
for idx, card in enumerate(cards):
|
||||||
|
lines.append(f" [{idx}] {format_card(card)}")
|
||||||
|
box.update("\n".join(lines))
|
||||||
|
|
||||||
|
def _render_nobles(self) -> None:
|
||||||
|
nobles_box = self.query_one("#nobles_box", Static)
|
||||||
|
lines: list[str] = ["[b]Nobles[/b]"]
|
||||||
|
if not self.game.available_nobles:
|
||||||
|
lines.append(" (none)")
|
||||||
|
else:
|
||||||
|
lines.extend(" - " + format_noble(noble) for noble in self.game.available_nobles)
|
||||||
|
nobles_box.update("\n".join(lines))
|
||||||
|
|
||||||
|
def _render_players(self) -> None:
|
||||||
|
players_box = self.query_one("#players_box", Static)
|
||||||
|
lines: list[str] = ["[b]Players:[/b]", ""]
|
||||||
|
for player in self.game.players:
|
||||||
|
mark = "*" if player is self.me else " "
|
||||||
|
token_str = format_tokens(player.tokens)
|
||||||
|
discount_str = format_discounts(player.discounts)
|
||||||
|
|
||||||
|
lines.append(
|
||||||
|
f"{mark} {player.name:10} Score={player.score:2d} Discounts={discount_str}",
|
||||||
|
)
|
||||||
|
lines.append(f" Tokens: {token_str}")
|
||||||
|
|
||||||
|
if player.nobles:
|
||||||
|
noble_names = ", ".join(n.name for n in player.nobles)
|
||||||
|
lines.append(f" Nobles: {noble_names}")
|
||||||
|
|
||||||
|
# Optional: show counts of cards / reserved
|
||||||
|
if player.cards:
|
||||||
|
lines.append(f" Cards: {len(player.cards)}")
|
||||||
|
if player.reserved:
|
||||||
|
lines.append(f" Reserved: {len(player.reserved)}")
|
||||||
|
|
||||||
|
lines.append("")
|
||||||
|
players_box.update("\n".join(lines))
|
||||||
|
|
||||||
|
|
||||||
|
class ActionApp(App[None]):
|
||||||
|
"""Textual app that asks for a single action command and returns an Action."""
|
||||||
|
|
||||||
|
CSS = """
|
||||||
|
Screen {
|
||||||
|
/* 3 rows: command zone, board, footer */
|
||||||
|
layout: grid;
|
||||||
|
grid-size: 1 3;
|
||||||
|
grid-rows: auto 1fr auto;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Top area with input + instructions */
|
||||||
|
#command_zone {
|
||||||
|
grid-columns: 1;
|
||||||
|
grid-rows: 1;
|
||||||
|
padding: 1 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Board sits in the middle row and can grow */
|
||||||
|
#board {
|
||||||
|
grid-columns: 1;
|
||||||
|
grid-rows: 2;
|
||||||
|
padding: 0 1 1 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
Footer {
|
||||||
|
grid-columns: 1;
|
||||||
|
grid-rows: 3;
|
||||||
|
}
|
||||||
|
|
||||||
|
Input {
|
||||||
|
border: round $accent;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* === Board layout === */
|
||||||
|
|
||||||
|
#board_root {
|
||||||
|
/* outer frame around the whole board area */
|
||||||
|
border: heavy white;
|
||||||
|
padding: 0 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Bank row: full width */
|
||||||
|
#bank_box {
|
||||||
|
border: heavy white;
|
||||||
|
padding: 0 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Middle row: tiers (left) + nobles (right) */
|
||||||
|
#middle_row {
|
||||||
|
layout: horizontal;
|
||||||
|
}
|
||||||
|
|
||||||
|
#tiers_box {
|
||||||
|
border: heavy white;
|
||||||
|
padding: 0 1;
|
||||||
|
width: 70%;
|
||||||
|
}
|
||||||
|
|
||||||
|
#tier1_box,
|
||||||
|
#tier2_box,
|
||||||
|
#tier3_box {
|
||||||
|
border-bottom: heavy white;
|
||||||
|
padding: 0 0 1 0;
|
||||||
|
margin-bottom: 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
#nobles_box {
|
||||||
|
border: heavy white;
|
||||||
|
padding: 0 1;
|
||||||
|
width: 30%;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Players row: full width at bottom */
|
||||||
|
#players_box {
|
||||||
|
border: heavy white;
|
||||||
|
padding: 0 1;
|
||||||
|
}
|
||||||
|
"""
|
||||||
|
|
||||||
|
def __init__(self, game: GameState, player: PlayerState) -> None:
|
||||||
|
"""Initialize the action app."""
|
||||||
|
super().__init__()
|
||||||
|
self.game = game
|
||||||
|
self.player = player
|
||||||
|
self.result: Action | None = None
|
||||||
|
self.message: str = ""
|
||||||
|
|
||||||
|
def compose(self) -> ComposeResult:
|
||||||
|
"""Compose the action app."""
|
||||||
|
# Row 1: input + Actions text
|
||||||
|
with Vertical(id="command_zone"):
|
||||||
|
yield Input(
|
||||||
|
placeholder="Enter command, e.g. '1 white blue red' or '1 w b r' or 'q'",
|
||||||
|
id="input_line",
|
||||||
|
)
|
||||||
|
yield Static("", id="prompt")
|
||||||
|
|
||||||
|
# Row 2: board
|
||||||
|
yield Board(self.game, self.player, id="board")
|
||||||
|
|
||||||
|
# Row 3: footer
|
||||||
|
yield Footer()
|
||||||
|
|
||||||
|
def on_mount(self) -> None:
|
||||||
|
"""Mount the action app."""
|
||||||
|
self._update_prompt()
|
||||||
|
self.query_one(Input).focus()
|
||||||
|
|
||||||
|
def _update_prompt(self) -> None:
|
||||||
|
lines: list[str] = []
|
||||||
|
lines.append("[bold underline]Actions:[/]")
|
||||||
|
lines.append(
|
||||||
|
" [bold green]1[/] <colors...> - Take up to 3 different gem colors "
|
||||||
|
"(e.g. [cyan]1 white blue red[/] or [cyan]1 w b r[/])",
|
||||||
|
)
|
||||||
|
lines.append(
|
||||||
|
f" [bold green]2[/] <color> - Take 2 of the same color (needs {fmt_number(4)} in bank, "
|
||||||
|
"e.g. [cyan]2 blue[/] or [cyan]2 b[/])",
|
||||||
|
)
|
||||||
|
lines.append(
|
||||||
|
" [bold green]3[/] <tier> <idx> - Buy a face-up card (e.g. [cyan]3 1 0[/] for tier 1, index 0)",
|
||||||
|
)
|
||||||
|
lines.append(" [bold green]4[/] <idx> - Buy a reserved card")
|
||||||
|
lines.append(" [bold green]5[/] <tier> <idx> - Reserve a face-up card")
|
||||||
|
lines.append(" [bold green]6[/] <tier> - Reserve top card of a deck")
|
||||||
|
lines.append(" [bold red]q[/] - Quit game")
|
||||||
|
if self.message:
|
||||||
|
lines.append("")
|
||||||
|
lines.append(f"[bold red]Message:[/] {self.message}")
|
||||||
|
self.query_one("#prompt", Static).update("\n".join(lines))
|
||||||
|
|
||||||
|
def _cmd_1(self, parts: list[str]) -> str | None:
|
||||||
|
"""Take up to 3 different gem colors: 1 white blue red OR 1 w b r."""
|
||||||
|
color_names = parts[1:]
|
||||||
|
if not color_names:
|
||||||
|
return "Need at least one color (full name or abbreviation)."
|
||||||
|
colors: list[GemColor] = []
|
||||||
|
for name in color_names:
|
||||||
|
color = parse_color_token(name)
|
||||||
|
if self.game.bank[color] <= 0:
|
||||||
|
return f"No tokens left for color: {color}"
|
||||||
|
colors.append(color)
|
||||||
|
self.result = TakeDifferent(colors=colors[:3])
|
||||||
|
self.exit()
|
||||||
|
return None
|
||||||
|
|
||||||
|
def _cmd_2(self, parts: list[str]) -> str | None:
|
||||||
|
"""Take two of the same color."""
|
||||||
|
if len(parts) < 2:
|
||||||
|
return "Usage: 2 <color>"
|
||||||
|
color = parse_color_token(parts[1])
|
||||||
|
if self.game.bank[color] < self.game.config.minimum_tokens_to_buy_2:
|
||||||
|
return "Bank must have at least 4 of that color."
|
||||||
|
self.result = TakeDouble(color=color)
|
||||||
|
self.exit()
|
||||||
|
return None
|
||||||
|
|
||||||
|
def _cmd_3(self, parts: list[str]) -> str | None:
|
||||||
|
"""Buy face-up card."""
|
||||||
|
if len(parts) < 3:
|
||||||
|
return "Usage: 3 <tier> <index>"
|
||||||
|
tier = int(parts[1])
|
||||||
|
idx = int(parts[2])
|
||||||
|
self.result = BuyCard(tier=tier, index=idx)
|
||||||
|
self.exit()
|
||||||
|
return None
|
||||||
|
|
||||||
|
def _cmd_4(self, parts: list[str]) -> str | None:
|
||||||
|
"""Buy reserved card."""
|
||||||
|
if len(parts) < 2:
|
||||||
|
return "Usage: 4 <reserved_index>"
|
||||||
|
idx = int(parts[1])
|
||||||
|
if not (0 <= idx < len(self.player.reserved)):
|
||||||
|
return "Reserved index out of range."
|
||||||
|
self.result = BuyCardReserved(tier=0, index=idx)
|
||||||
|
self.exit()
|
||||||
|
return None
|
||||||
|
|
||||||
|
def _cmd_5(self, parts: list[str]) -> str | None:
|
||||||
|
"""Reserve face-up card."""
|
||||||
|
if len(parts) < 3:
|
||||||
|
return "Usage: 5 <tier> <index>"
|
||||||
|
tier = int(parts[1])
|
||||||
|
idx = int(parts[2])
|
||||||
|
self.result = ReserveCard(tier=tier, index=idx, from_deck=False)
|
||||||
|
self.exit()
|
||||||
|
return None
|
||||||
|
|
||||||
|
def _cmd_6(self, parts: list[str]) -> str | None:
|
||||||
|
"""Reserve top of deck."""
|
||||||
|
if len(parts) < 2:
|
||||||
|
return "Usage: 6 <tier>"
|
||||||
|
tier = int(parts[1])
|
||||||
|
self.result = ReserveCard(tier=tier, index=None, from_deck=True)
|
||||||
|
self.exit()
|
||||||
|
return None
|
||||||
|
|
||||||
|
def _unknown_cmd(self, _parts: list[str]) -> str:
|
||||||
|
return "Unknown command."
|
||||||
|
|
||||||
|
def on_input_submitted(self, event: Input.Submitted) -> None:
|
||||||
|
"""Handle user input."""
|
||||||
|
text = (event.value or "").strip()
|
||||||
|
event.input.value = ""
|
||||||
|
if not text:
|
||||||
|
return
|
||||||
|
if text.lower() in {"q", "quit", "0"}:
|
||||||
|
self.result = None
|
||||||
|
self.exit()
|
||||||
|
return
|
||||||
|
|
||||||
|
parts = text.split()
|
||||||
|
|
||||||
|
cmds = {
|
||||||
|
"1": self._cmd_1,
|
||||||
|
"2": self._cmd_2,
|
||||||
|
"3": self._cmd_3,
|
||||||
|
"4": self._cmd_4,
|
||||||
|
"5": self._cmd_5,
|
||||||
|
"6": self._cmd_6,
|
||||||
|
}
|
||||||
|
cmd = parts[0]
|
||||||
|
|
||||||
|
error = cmds.get(cmd, self._unknown_cmd)(parts)
|
||||||
|
|
||||||
|
if error:
|
||||||
|
self.message = error
|
||||||
|
self._update_prompt()
|
||||||
|
return
|
||||||
|
|
||||||
|
|
||||||
|
class DiscardApp(App[None]):
|
||||||
|
"""Textual app to choose discards when over token limit."""
|
||||||
|
|
||||||
|
CSS = """
|
||||||
|
Screen {
|
||||||
|
layout: vertical;
|
||||||
|
}
|
||||||
|
|
||||||
|
#command_zone {
|
||||||
|
padding: 1 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
#board {
|
||||||
|
padding: 0 1 1 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
Input {
|
||||||
|
border: round $accent;
|
||||||
|
}
|
||||||
|
"""
|
||||||
|
|
||||||
|
def __init__(self, game: GameState, player: PlayerState) -> None:
|
||||||
|
"""Initialize the discard app."""
|
||||||
|
super().__init__()
|
||||||
|
self.game = game
|
||||||
|
self.player = player
|
||||||
|
self.discards: dict[GemColor, int] = dict.fromkeys(GEM_COLORS, 0)
|
||||||
|
self.message: str = ""
|
||||||
|
|
||||||
|
def compose(self) -> ComposeResult: # type: ignore[override]
|
||||||
|
"""Compose the discard app."""
|
||||||
|
yield Header(show_clock=False)
|
||||||
|
|
||||||
|
with Vertical(id="command_zone"):
|
||||||
|
yield Input(
|
||||||
|
placeholder="Enter color to discard, e.g. 'blue' or 'b'",
|
||||||
|
id="input_line",
|
||||||
|
)
|
||||||
|
yield Static("", id="prompt")
|
||||||
|
|
||||||
|
# Board directly under the command zone
|
||||||
|
yield Board(self.game, self.player, id="board")
|
||||||
|
|
||||||
|
yield Footer()
|
||||||
|
|
||||||
|
def on_mount(self) -> None: # type: ignore[override]
|
||||||
|
"""Mount the discard app."""
|
||||||
|
self._update_prompt()
|
||||||
|
self.query_one(Input).focus()
|
||||||
|
|
||||||
|
def _remaining_to_discard(self) -> int:
|
||||||
|
return self.player.total_tokens() - sum(self.discards.values()) - self.game.config.token_limit
|
||||||
|
|
||||||
|
def _update_prompt(self) -> None:
|
||||||
|
remaining = max(self._remaining_to_discard(), 0)
|
||||||
|
lines: list[str] = []
|
||||||
|
lines.append(
|
||||||
|
"You must discard "
|
||||||
|
f"{fmt_number(remaining)} token(s) "
|
||||||
|
f"to get down to {fmt_number(self.game.config.token_limit)}.",
|
||||||
|
)
|
||||||
|
disc_str = ", ".join(f"{fmt_gem(c)}={fmt_number(self.discards[c])}" for c in GEM_COLORS)
|
||||||
|
lines.append(f"Current planned discards: {{ {disc_str} }}")
|
||||||
|
lines.append(
|
||||||
|
"Type a color name or abbreviation (e.g. 'blue' or 'b') to discard one token.",
|
||||||
|
)
|
||||||
|
if self.message:
|
||||||
|
lines.append("")
|
||||||
|
lines.append(f"[bold red]Message:[/] {self.message}")
|
||||||
|
self.query_one("#prompt", Static).update("\n".join(lines))
|
||||||
|
|
||||||
|
def on_input_submitted(self, event: Input.Submitted) -> None: # type: ignore[override]
|
||||||
|
"""Handle user input."""
|
||||||
|
raw = (event.value or "").strip()
|
||||||
|
event.input.value = ""
|
||||||
|
if not raw:
|
||||||
|
return
|
||||||
|
|
||||||
|
try:
|
||||||
|
color = parse_color_token(raw)
|
||||||
|
except ValueError:
|
||||||
|
self.message = f"Unknown color: {raw}"
|
||||||
|
self._update_prompt()
|
||||||
|
return
|
||||||
|
|
||||||
|
available = self.player.tokens[color] - self.discards[color]
|
||||||
|
if available <= 0:
|
||||||
|
self.message = f"No more {color} tokens available to discard."
|
||||||
|
self._update_prompt()
|
||||||
|
return
|
||||||
|
|
||||||
|
self.discards[color] += 1
|
||||||
|
if self._remaining_to_discard() <= 0:
|
||||||
|
self.exit()
|
||||||
|
return
|
||||||
|
|
||||||
|
self.message = ""
|
||||||
|
self._update_prompt()
|
||||||
|
|
||||||
|
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# Noble choice app
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
class NobleChoiceApp(App[None]):
|
||||||
|
"""Textual app to choose one noble."""
|
||||||
|
|
||||||
|
CSS = """
|
||||||
|
Screen {
|
||||||
|
layout: vertical;
|
||||||
|
}
|
||||||
|
|
||||||
|
#command_zone {
|
||||||
|
padding: 1 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
#board {
|
||||||
|
padding: 0 1 1 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
Input {
|
||||||
|
border: round $accent;
|
||||||
|
}
|
||||||
|
"""
|
||||||
|
|
||||||
|
def __init__(
|
||||||
|
self,
|
||||||
|
game: GameState,
|
||||||
|
player: PlayerState,
|
||||||
|
nobles: list[Noble],
|
||||||
|
) -> None:
|
||||||
|
"""Initialize the noble choice app."""
|
||||||
|
super().__init__()
|
||||||
|
self.game = game
|
||||||
|
self.player = player
|
||||||
|
self.nobles = nobles
|
||||||
|
self.result: Noble | None = None
|
||||||
|
self.message: str = ""
|
||||||
|
|
||||||
|
def compose(self) -> ComposeResult: # type: ignore[override]
|
||||||
|
"""Compose the noble choice app."""
|
||||||
|
yield Header(show_clock=False)
|
||||||
|
|
||||||
|
with Vertical(id="command_zone"):
|
||||||
|
yield Input(
|
||||||
|
placeholder="Enter noble index, e.g. '0'",
|
||||||
|
id="input_line",
|
||||||
|
)
|
||||||
|
yield Static("", id="prompt")
|
||||||
|
|
||||||
|
# Board directly under the command zone
|
||||||
|
yield Board(self.game, self.player, id="board")
|
||||||
|
|
||||||
|
yield Footer()
|
||||||
|
|
||||||
|
def on_mount(self) -> None: # type: ignore[override]
|
||||||
|
"""Mount the noble choice app."""
|
||||||
|
self._update_prompt()
|
||||||
|
self.query_one(Input).focus()
|
||||||
|
|
||||||
|
def _update_prompt(self) -> None:
|
||||||
|
lines: list[str] = []
|
||||||
|
lines.append("[bold underline]You qualify for nobles:[/]")
|
||||||
|
for i, noble in enumerate(self.nobles):
|
||||||
|
lines.append(f" [bright_cyan]{i})[/] {format_noble(noble)}")
|
||||||
|
lines.append("Enter the index of the noble you want.")
|
||||||
|
if self.message:
|
||||||
|
lines.append("")
|
||||||
|
lines.append(f"[bold red]Message:[/] {self.message}")
|
||||||
|
self.query_one("#prompt", Static).update("\n".join(lines))
|
||||||
|
|
||||||
|
def on_input_submitted(self, event: Input.Submitted) -> None: # type: ignore[override]
|
||||||
|
"""Handle user input."""
|
||||||
|
raw = (event.value or "").strip()
|
||||||
|
event.input.value = ""
|
||||||
|
if not raw:
|
||||||
|
return
|
||||||
|
try:
|
||||||
|
idx = int(raw)
|
||||||
|
except ValueError:
|
||||||
|
self.message = "Please enter a valid integer index."
|
||||||
|
self._update_prompt()
|
||||||
|
return
|
||||||
|
if not (0 <= idx < len(self.nobles)):
|
||||||
|
self.message = "Index out of range."
|
||||||
|
self._update_prompt()
|
||||||
|
return
|
||||||
|
self.result = self.nobles[idx]
|
||||||
|
self.exit()
|
||||||
|
|
||||||
|
|
||||||
|
class TuiHuman(Strategy):
|
||||||
|
"""Textual-based human player Strategy with colorful board."""
|
||||||
|
|
||||||
|
def choose_action(
|
||||||
|
self,
|
||||||
|
game: GameState,
|
||||||
|
player: PlayerState,
|
||||||
|
) -> Action | None:
|
||||||
|
"""Choose an action for the player."""
|
||||||
|
if not sys.stdout.isatty():
|
||||||
|
return None
|
||||||
|
app = ActionApp(game, player)
|
||||||
|
app.run()
|
||||||
|
return app.result
|
||||||
|
|
||||||
|
def choose_discard(
|
||||||
|
self,
|
||||||
|
game: GameState,
|
||||||
|
player: PlayerState,
|
||||||
|
excess: int, # noqa: ARG002
|
||||||
|
) -> dict[GemColor, int]:
|
||||||
|
"""Choose tokens to discard."""
|
||||||
|
if not sys.stdout.isatty():
|
||||||
|
return dict.fromkeys(GEM_COLORS, 0)
|
||||||
|
app = DiscardApp(game, player)
|
||||||
|
app.run()
|
||||||
|
return app.discards
|
||||||
|
|
||||||
|
def choose_noble(
|
||||||
|
self,
|
||||||
|
game: GameState,
|
||||||
|
player: PlayerState,
|
||||||
|
nobles: list[Noble],
|
||||||
|
) -> Noble:
|
||||||
|
"""Choose a noble for the player."""
|
||||||
|
if not sys.stdout.isatty():
|
||||||
|
return nobles[0]
|
||||||
|
app = NobleChoiceApp(game, player, nobles)
|
||||||
|
app.run()
|
||||||
|
return app.result
|
||||||
19
python/splendor/main.py
Normal file
19
python/splendor/main.py
Normal file
@@ -0,0 +1,19 @@
|
|||||||
|
"""Main entry point for Splendor game."""
|
||||||
|
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
from .base import new_game, run_game
|
||||||
|
from .bot import RandomBot
|
||||||
|
from .human import TuiHuman
|
||||||
|
|
||||||
|
|
||||||
|
def main() -> None:
|
||||||
|
"""Main entry point."""
|
||||||
|
human = TuiHuman()
|
||||||
|
bot = RandomBot()
|
||||||
|
game_state = new_game(["You", "Bot A"])
|
||||||
|
run_game(game_state, [human, bot])
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
main()
|
||||||
111
python/splendor/public_state.py
Normal file
111
python/splendor/public_state.py
Normal file
@@ -0,0 +1,111 @@
|
|||||||
|
"""Public state for RL/search."""
|
||||||
|
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
from dataclasses import dataclass
|
||||||
|
|
||||||
|
from .base import (
|
||||||
|
BASE_COLORS,
|
||||||
|
BASE_INDEX,
|
||||||
|
GEM_ORDER,
|
||||||
|
Card,
|
||||||
|
GameState,
|
||||||
|
Noble,
|
||||||
|
PlayerState,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
@dataclass(frozen=True)
|
||||||
|
class ObsCard:
|
||||||
|
"""Numeric-ish card view for RL/search."""
|
||||||
|
|
||||||
|
tier: int
|
||||||
|
points: int
|
||||||
|
color_index: int
|
||||||
|
cost: list[int]
|
||||||
|
|
||||||
|
|
||||||
|
@dataclass(frozen=True)
|
||||||
|
class ObsNoble:
|
||||||
|
"""Numeric-ish noble view for RL/search."""
|
||||||
|
|
||||||
|
points: int
|
||||||
|
requirements: list[int]
|
||||||
|
|
||||||
|
|
||||||
|
@dataclass(frozen=True)
|
||||||
|
class ObsPlayer:
|
||||||
|
"""Numeric-ish player view for RL/search."""
|
||||||
|
|
||||||
|
tokens: list[int]
|
||||||
|
discounts: list[int]
|
||||||
|
score: int
|
||||||
|
cards: list[ObsCard]
|
||||||
|
reserved: list[ObsCard]
|
||||||
|
nobles: list[ObsNoble]
|
||||||
|
|
||||||
|
|
||||||
|
@dataclass(frozen=True)
|
||||||
|
class Observation:
|
||||||
|
"""Full public state for RL/search."""
|
||||||
|
|
||||||
|
current_player: int
|
||||||
|
bank: list[int]
|
||||||
|
players: list[ObsPlayer]
|
||||||
|
table_by_tier: dict[int, list[ObsCard]]
|
||||||
|
decks_remaining: dict[int, int]
|
||||||
|
available_nobles: list[ObsNoble]
|
||||||
|
|
||||||
|
|
||||||
|
def _encode_card(card: Card) -> ObsCard:
|
||||||
|
color_index = BASE_INDEX.get(card.color, -1)
|
||||||
|
cost_vec = [card.cost.get(c, 0) for c in BASE_COLORS]
|
||||||
|
return ObsCard(
|
||||||
|
tier=card.tier,
|
||||||
|
points=card.points,
|
||||||
|
color_index=color_index,
|
||||||
|
cost=cost_vec,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def _encode_noble(noble: Noble) -> ObsNoble:
|
||||||
|
req_vec = [noble.requirements.get(c, 0) for c in BASE_COLORS]
|
||||||
|
return ObsNoble(
|
||||||
|
points=noble.points,
|
||||||
|
requirements=req_vec,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def _encode_player(player: PlayerState) -> ObsPlayer:
|
||||||
|
tokens_vec = [player.tokens[c] for c in GEM_ORDER]
|
||||||
|
discounts_vec = [player.discounts[c] for c in GEM_ORDER]
|
||||||
|
cards_enc = [_encode_card(c) for c in player.cards]
|
||||||
|
reserved_enc = [_encode_card(c) for c in player.reserved]
|
||||||
|
nobles_enc = [_encode_noble(n) for n in player.nobles]
|
||||||
|
return ObsPlayer(
|
||||||
|
tokens=tokens_vec,
|
||||||
|
discounts=discounts_vec,
|
||||||
|
score=player.score,
|
||||||
|
cards=cards_enc,
|
||||||
|
reserved=reserved_enc,
|
||||||
|
nobles=nobles_enc,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def to_observation(game: GameState) -> Observation:
|
||||||
|
"""Create a structured observation of the full public state."""
|
||||||
|
bank_vec = [game.bank[c] for c in GEM_ORDER]
|
||||||
|
players_enc = [_encode_player(p) for p in game.players]
|
||||||
|
table_enc: dict[int, list[ObsCard]] = {
|
||||||
|
tier: [_encode_card(c) for c in row] for tier, row in game.table_by_tier.items()
|
||||||
|
}
|
||||||
|
decks_remaining = {tier: len(deck) for tier, deck in game.decks_by_tier.items()}
|
||||||
|
nobles_enc = [_encode_noble(n) for n in game.available_nobles]
|
||||||
|
return Observation(
|
||||||
|
current_player=game.current_player_index,
|
||||||
|
bank=bank_vec,
|
||||||
|
players=players_enc,
|
||||||
|
table_by_tier=table_enc,
|
||||||
|
decks_remaining=decks_remaining,
|
||||||
|
available_nobles=nobles_enc,
|
||||||
|
)
|
||||||
36
python/splendor/sim.py
Normal file
36
python/splendor/sim.py
Normal file
@@ -0,0 +1,36 @@
|
|||||||
|
"""Simulate a step in the game."""
|
||||||
|
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import copy
|
||||||
|
|
||||||
|
from .base import Action, GameState, PlayerState, apply_action, check_nobles_for_player
|
||||||
|
from .bot import RandomBot
|
||||||
|
|
||||||
|
|
||||||
|
class SimStrategy(RandomBot):
|
||||||
|
"""Strategy used in simulate_step.
|
||||||
|
|
||||||
|
We never call choose_action here (caller chooses actions),
|
||||||
|
but we reuse discard/noble-selection logic.
|
||||||
|
"""
|
||||||
|
|
||||||
|
def choose_action(self, game: GameState, player: PlayerState) -> Action | None: # noqa: ARG002
|
||||||
|
"""Choose an action for the current player."""
|
||||||
|
msg = "SimStrategy.choose_action should not be used in simulate_step"
|
||||||
|
raise RuntimeError(msg)
|
||||||
|
|
||||||
|
|
||||||
|
def simulate_step(game: GameState, action: Action) -> GameState:
|
||||||
|
"""Return a deep-copied next state after applying action for the current player.
|
||||||
|
|
||||||
|
Useful for tree search / MCTS:
|
||||||
|
|
||||||
|
next_state = simulate_step(state, action)
|
||||||
|
"""
|
||||||
|
next_state = copy.deepcopy(game)
|
||||||
|
sim_strategy = SimStrategy()
|
||||||
|
apply_action(next_state, sim_strategy, action)
|
||||||
|
check_nobles_for_player(next_state, sim_strategy, next_state.current_player)
|
||||||
|
next_state.next_player()
|
||||||
|
return next_state
|
||||||
50
python/splendor/simulat.py
Normal file
50
python/splendor/simulat.py
Normal file
@@ -0,0 +1,50 @@
|
|||||||
|
"""Simulator for Splendor game."""
|
||||||
|
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
from collections import defaultdict
|
||||||
|
from pathlib import Path
|
||||||
|
from statistics import mean
|
||||||
|
|
||||||
|
from .base import GameConfig, load_cards, load_nobles, new_game, run_game
|
||||||
|
from .bot import PersonalizedBot4, RandomBot
|
||||||
|
|
||||||
|
|
||||||
|
def main() -> None:
|
||||||
|
"""Main entry point."""
|
||||||
|
turn_limit = 1000
|
||||||
|
good_games = 0
|
||||||
|
games = 1
|
||||||
|
winners: dict[str, list] = defaultdict(list)
|
||||||
|
game_data = Path(__file__).parent / "game_data"
|
||||||
|
|
||||||
|
cards = load_cards(game_data / "cards/default.json")
|
||||||
|
nobles = load_nobles(game_data / "nobles/default.json")
|
||||||
|
|
||||||
|
for _ in range(games):
|
||||||
|
bot_a = RandomBot("bot_a")
|
||||||
|
bot_b = RandomBot("bot_b")
|
||||||
|
bot_c = RandomBot("bot_c")
|
||||||
|
bot_d = PersonalizedBot4("my_bot")
|
||||||
|
config = GameConfig(
|
||||||
|
cards=cards,
|
||||||
|
nobles=nobles,
|
||||||
|
turn_limit=turn_limit,
|
||||||
|
)
|
||||||
|
players = (bot_a, bot_b, bot_c, bot_d)
|
||||||
|
game_state = new_game(players, config)
|
||||||
|
winner, turns = run_game(game_state)
|
||||||
|
if turns < turn_limit:
|
||||||
|
good_games += 1
|
||||||
|
winners[winner.strategy.name].append(turns)
|
||||||
|
|
||||||
|
print(
|
||||||
|
f"out of {games} {turn_limit} turn games with {len(players)}"
|
||||||
|
f"random bots there where {good_games} games where a bot won"
|
||||||
|
)
|
||||||
|
for name, turns in winners.items():
|
||||||
|
print(f"{name} won {len(turns)} games in {mean(turns):.2f} turns")
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
main()
|
||||||
1
python/stuff/__init__.py
Normal file
1
python/stuff/__init__.py
Normal file
@@ -0,0 +1 @@
|
|||||||
|
"""init."""
|
||||||
@@ -85,7 +85,7 @@ def get_material_resistivity(
|
|||||||
) -> float:
|
) -> float:
|
||||||
"""Get the resistivity of a material."""
|
"""Get the resistivity of a material."""
|
||||||
if not temperature:
|
if not temperature:
|
||||||
Temperature(20.0)
|
temperature = Temperature(20.0)
|
||||||
material_info = {
|
material_info = {
|
||||||
MaterialType.COPPER: (1.724e-8, 0.00393),
|
MaterialType.COPPER: (1.724e-8, 0.00393),
|
||||||
MaterialType.ALUMINUM: (2.908e-8, 0.00403),
|
MaterialType.ALUMINUM: (2.908e-8, 0.00403),
|
||||||
@@ -180,7 +180,7 @@ def max_wire_length(
|
|||||||
float: Maximum wire length in meters that maintains the specified voltage drop
|
float: Maximum wire length in meters that maintains the specified voltage drop
|
||||||
"""
|
"""
|
||||||
if not temperature:
|
if not temperature:
|
||||||
Temperature(100.0, unit=TemperatureUnit.FAHRENHEIT)
|
temperature = Temperature(100.0, unit=TemperatureUnit.FAHRENHEIT)
|
||||||
|
|
||||||
resistivity = get_material_resistivity(material, temperature)
|
resistivity = get_material_resistivity(material, temperature)
|
||||||
resistance_per_meter = resistivity / calculate_wire_area_m2(gauge)
|
resistance_per_meter = resistivity / calculate_wire_area_m2(gauge)
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user