Compare commits
36 Commits
bb75b70341
...
v0.7.5
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
bd204895d5 | ||
|
|
a05f1f2a1e | ||
|
|
f11c6060ea | ||
|
|
6d8fa0de63 | ||
|
|
dc273506b7 | ||
|
|
6a87750329 | ||
|
|
819058ad5c | ||
|
|
def75c00b4 | ||
|
|
17a13569d8 | ||
|
|
14f88e6a40 | ||
|
|
3373e00dfc | ||
|
|
f094346e1b | ||
|
|
3b0133640f | ||
|
|
0600d3deaa | ||
|
|
90f8aedc3b | ||
|
|
2a811b1f8c | ||
|
|
1f9c29411e | ||
|
|
b928004c76 | ||
|
|
fb4769301c | ||
|
|
036e12f345 | ||
|
|
1ceab57f3b | ||
|
|
5de1cd7623 | ||
|
|
1867de513d | ||
|
|
42181499fe | ||
|
|
36249739d3 | ||
|
|
bbd7c29681 | ||
|
|
2818a5f280 | ||
|
|
946ee9677c | ||
|
|
ec16930569 | ||
|
|
accfb4f346 | ||
|
|
e5ce96e210 | ||
|
|
a506cd8f08 | ||
|
|
1cedd58708 | ||
|
|
7f7ebd3ad6 | ||
|
|
9f6d480aee | ||
|
|
339d06ce7e |
4
.gitignore
vendored
4
.gitignore
vendored
@@ -6,3 +6,7 @@ steel_decimal/tests/property_tests.proptest-regressions
|
|||||||
.direnv/
|
.direnv/
|
||||||
canvas/*.toml
|
canvas/*.toml
|
||||||
.aider*
|
.aider*
|
||||||
|
.codex
|
||||||
|
TODO.md
|
||||||
|
tui-pages-cli/
|
||||||
|
tui-canvas-validation-core/
|
||||||
|
|||||||
5
.gitmodules
vendored
5
.gitmodules
vendored
@@ -2,8 +2,11 @@
|
|||||||
path = client
|
path = client
|
||||||
url = git@gitlab.com:filipriec/komp_ac_client.git
|
url = git@gitlab.com:filipriec/komp_ac_client.git
|
||||||
[submodule "canvas"]
|
[submodule "canvas"]
|
||||||
path = canvas
|
path = tui-canvas
|
||||||
url = git@gitlab.com:filipriec/tui-canvas.git
|
url = git@gitlab.com:filipriec/tui-canvas.git
|
||||||
[submodule "server"]
|
[submodule "server"]
|
||||||
path = server
|
path = server
|
||||||
url = git@gitlab.com:filipriec/komp_ac_server.git
|
url = git@gitlab.com:filipriec/komp_ac_server.git
|
||||||
|
[submodule "tui-pages"]
|
||||||
|
path = tui-pages
|
||||||
|
url = git@gitlab.com:filipriec/tui-pages.git
|
||||||
|
|||||||
495
Cargo.lock
generated
495
Cargo.lock
generated
@@ -124,6 +124,26 @@ version = "1.0.98"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487"
|
checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "arboard"
|
||||||
|
version = "3.6.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "0348a1c054491f4bfe6ab86a7b6ab1e44e45d899005de92f58b3df180b36ddaf"
|
||||||
|
dependencies = [
|
||||||
|
"clipboard-win",
|
||||||
|
"image",
|
||||||
|
"log",
|
||||||
|
"objc2",
|
||||||
|
"objc2-app-kit",
|
||||||
|
"objc2-core-foundation",
|
||||||
|
"objc2-core-graphics",
|
||||||
|
"objc2-foundation",
|
||||||
|
"parking_lot",
|
||||||
|
"percent-encoding",
|
||||||
|
"windows-sys 0.60.2",
|
||||||
|
"x11rb",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "arc-swap"
|
name = "arc-swap"
|
||||||
version = "1.7.1"
|
version = "1.7.1"
|
||||||
@@ -479,40 +499,30 @@ dependencies = [
|
|||||||
"syn 1.0.109",
|
"syn 1.0.109",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "bytemuck"
|
||||||
|
version = "1.25.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "c8efb64bd706a16a1bdde310ae86b351e4d21550d98d056f22f8a7f7a2183fec"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "byteorder"
|
name = "byteorder"
|
||||||
version = "1.5.0"
|
version = "1.5.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
|
checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "byteorder-lite"
|
||||||
|
version = "0.1.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "bytes"
|
name = "bytes"
|
||||||
version = "1.10.1"
|
version = "1.10.1"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a"
|
checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "canvas"
|
|
||||||
version = "0.5.0"
|
|
||||||
dependencies = [
|
|
||||||
"anyhow",
|
|
||||||
"async-trait",
|
|
||||||
"crossterm",
|
|
||||||
"once_cell",
|
|
||||||
"ratatui",
|
|
||||||
"regex",
|
|
||||||
"ropey",
|
|
||||||
"serde",
|
|
||||||
"syntect",
|
|
||||||
"thiserror 2.0.12",
|
|
||||||
"tokio",
|
|
||||||
"tokio-test",
|
|
||||||
"toml",
|
|
||||||
"tracing",
|
|
||||||
"tracing-subscriber",
|
|
||||||
"unicode-width 0.2.0",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "cassowary"
|
name = "cassowary"
|
||||||
version = "0.3.0"
|
version = "0.3.0"
|
||||||
@@ -569,7 +579,7 @@ dependencies = [
|
|||||||
"num-traits",
|
"num-traits",
|
||||||
"serde",
|
"serde",
|
||||||
"wasm-bindgen",
|
"wasm-bindgen",
|
||||||
"windows-link",
|
"windows-link 0.1.3",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -584,23 +594,28 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "client"
|
name = "client"
|
||||||
version = "0.5.0"
|
version = "0.7.5"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"async-trait",
|
"async-trait",
|
||||||
"canvas",
|
|
||||||
"common",
|
"common",
|
||||||
"crossterm",
|
"crossterm",
|
||||||
"dirs",
|
"dirs",
|
||||||
"dotenvy",
|
"dotenvy",
|
||||||
"futures",
|
"futures",
|
||||||
"lazy_static",
|
"lazy_static",
|
||||||
|
"nucleo",
|
||||||
"prost 0.13.5",
|
"prost 0.13.5",
|
||||||
"prost-types 0.13.5",
|
"prost-types 0.13.5",
|
||||||
"ratatui",
|
"ratatui",
|
||||||
|
"regex",
|
||||||
"rstest",
|
"rstest",
|
||||||
"serde",
|
"serde",
|
||||||
"serde_json",
|
"serde_json",
|
||||||
|
"steel-core",
|
||||||
|
"steel-decimal",
|
||||||
|
"strum 0.27.2",
|
||||||
|
"strum_macros 0.27.2",
|
||||||
"time",
|
"time",
|
||||||
"tokio",
|
"tokio",
|
||||||
"tokio-test",
|
"tokio-test",
|
||||||
@@ -608,12 +623,21 @@ dependencies = [
|
|||||||
"tonic",
|
"tonic",
|
||||||
"tracing",
|
"tracing",
|
||||||
"tracing-subscriber",
|
"tracing-subscriber",
|
||||||
"tui-textarea",
|
"tui-pages",
|
||||||
"unicode-segmentation",
|
"unicode-segmentation",
|
||||||
"unicode-width 0.2.0",
|
"unicode-width 0.2.0",
|
||||||
"uuid",
|
"uuid",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "clipboard-win"
|
||||||
|
version = "5.4.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "bde03770d3df201d4fb868f2c9c59e66a3e4e2bd06692a0fe701e7103c7e84d4"
|
||||||
|
dependencies = [
|
||||||
|
"error-code",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "codegen"
|
name = "codegen"
|
||||||
version = "0.2.0"
|
version = "0.2.0"
|
||||||
@@ -635,7 +659,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "common"
|
name = "common"
|
||||||
version = "0.5.0"
|
version = "0.7.5"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"prost 0.13.5",
|
"prost 0.13.5",
|
||||||
"prost-build 0.14.1",
|
"prost-build 0.14.1",
|
||||||
@@ -801,6 +825,7 @@ dependencies = [
|
|||||||
"mio",
|
"mio",
|
||||||
"parking_lot",
|
"parking_lot",
|
||||||
"rustix 0.38.44",
|
"rustix 0.38.44",
|
||||||
|
"serde",
|
||||||
"signal-hook",
|
"signal-hook",
|
||||||
"signal-hook-mio",
|
"signal-hook-mio",
|
||||||
"winapi",
|
"winapi",
|
||||||
@@ -936,6 +961,17 @@ dependencies = [
|
|||||||
"serde",
|
"serde",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "derivative"
|
||||||
|
version = "2.2.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
|
||||||
|
dependencies = [
|
||||||
|
"proc-macro2",
|
||||||
|
"quote",
|
||||||
|
"syn 1.0.109",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "digest"
|
name = "digest"
|
||||||
version = "0.10.7"
|
version = "0.10.7"
|
||||||
@@ -969,6 +1005,16 @@ dependencies = [
|
|||||||
"windows-sys 0.60.2",
|
"windows-sys 0.60.2",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "dispatch2"
|
||||||
|
version = "0.3.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "1e0e367e4e7da84520dedcac1901e4da967309406d1e51017ae1abfb97adbd38"
|
||||||
|
dependencies = [
|
||||||
|
"bitflags 2.9.1",
|
||||||
|
"objc2",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "displaydoc"
|
name = "displaydoc"
|
||||||
version = "0.2.5"
|
version = "0.2.5"
|
||||||
@@ -1023,6 +1069,12 @@ dependencies = [
|
|||||||
"windows-sys 0.60.2",
|
"windows-sys 0.60.2",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "error-code"
|
||||||
|
version = "3.3.2"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "dea2df4cf52843e0452895c455a1a2cfbb842a1e7329671acf418fdc53ed4c59"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "etcetera"
|
name = "etcetera"
|
||||||
version = "0.8.0"
|
version = "0.8.0"
|
||||||
@@ -1067,6 +1119,21 @@ version = "2.3.0"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
|
checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "fax"
|
||||||
|
version = "0.2.7"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "caf1079563223d5d59d83c85886a56e586cfd5c1a26292e971a0fa266531ac5a"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "fdeflate"
|
||||||
|
version = "0.3.7"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "1e6853b52649d4ac5c0bd02320cddc5ba956bdb407c4b75a2c6b75bf51500f8c"
|
||||||
|
dependencies = [
|
||||||
|
"simd-adler32",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "fixedbitset"
|
name = "fixedbitset"
|
||||||
version = "0.5.7"
|
version = "0.5.7"
|
||||||
@@ -1280,6 +1347,16 @@ dependencies = [
|
|||||||
"version_check",
|
"version_check",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "gethostname"
|
||||||
|
version = "1.1.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "1bd49230192a3797a9a4d6abe9b3eed6f7fa4c8a8a4947977c6f80025f92cbd8"
|
||||||
|
dependencies = [
|
||||||
|
"rustix 1.0.8",
|
||||||
|
"windows-link 0.2.1",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "getrandom"
|
name = "getrandom"
|
||||||
version = "0.2.16"
|
version = "0.2.16"
|
||||||
@@ -1338,6 +1415,17 @@ dependencies = [
|
|||||||
"tracing",
|
"tracing",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "half"
|
||||||
|
version = "2.7.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "6ea2d84b969582b4b1864a92dc5d27cd2b77b622a8d79306834f1be5ba20d84b"
|
||||||
|
dependencies = [
|
||||||
|
"cfg-if",
|
||||||
|
"crunchy",
|
||||||
|
"zerocopy",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "hashbrown"
|
name = "hashbrown"
|
||||||
version = "0.12.3"
|
version = "0.12.3"
|
||||||
@@ -1715,6 +1803,20 @@ dependencies = [
|
|||||||
"version_check",
|
"version_check",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "image"
|
||||||
|
version = "0.25.10"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "85ab80394333c02fe689eaf900ab500fbd0c2213da414687ebf995a65d5a6104"
|
||||||
|
dependencies = [
|
||||||
|
"bytemuck",
|
||||||
|
"byteorder-lite",
|
||||||
|
"moxcms",
|
||||||
|
"num-traits",
|
||||||
|
"png",
|
||||||
|
"tiff",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "indexmap"
|
name = "indexmap"
|
||||||
version = "1.9.3"
|
version = "1.9.3"
|
||||||
@@ -1959,11 +2061,11 @@ checksum = "08ab2867e3eeeca90e844d1940eab391c9dc5228783db2ed999acbc0a9ed375a"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "matchers"
|
name = "matchers"
|
||||||
version = "0.1.0"
|
version = "0.2.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
|
checksum = "d1525a2a28c7f4fa0fc98bb91ae755d1e2d1505079e05539e35bc876b5d65ae9"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"regex-automata 0.1.10",
|
"regex-automata",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -2025,6 +2127,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||||||
checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316"
|
checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"adler2",
|
"adler2",
|
||||||
|
"simd-adler32",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -2039,6 +2142,16 @@ dependencies = [
|
|||||||
"windows-sys 0.59.0",
|
"windows-sys 0.59.0",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "moxcms"
|
||||||
|
version = "0.8.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "bb85c154ba489f01b25c0d36ae69a87e4a1c73a72631fc6c0eb6dde34a73e44b"
|
||||||
|
dependencies = [
|
||||||
|
"num-traits",
|
||||||
|
"pxfm",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "multimap"
|
name = "multimap"
|
||||||
version = "0.10.1"
|
version = "0.10.1"
|
||||||
@@ -2080,12 +2193,32 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "nu-ansi-term"
|
name = "nu-ansi-term"
|
||||||
version = "0.46.0"
|
version = "0.50.3"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84"
|
checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"overload",
|
"windows-sys 0.60.2",
|
||||||
"winapi",
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "nucleo"
|
||||||
|
version = "0.5.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "5262af4c94921c2646c5ac6ff7900c2af9cbb08dc26a797e18130a7019c039d4"
|
||||||
|
dependencies = [
|
||||||
|
"nucleo-matcher",
|
||||||
|
"parking_lot",
|
||||||
|
"rayon",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "nucleo-matcher"
|
||||||
|
version = "0.3.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "bf33f538733d1a5a3494b836ba913207f14d9d4a1d3cd67030c5061bdd2cac85"
|
||||||
|
dependencies = [
|
||||||
|
"memchr",
|
||||||
|
"unicode-segmentation",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -2172,6 +2305,79 @@ dependencies = [
|
|||||||
"libc",
|
"libc",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "objc2"
|
||||||
|
version = "0.6.4"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "3a12a8ed07aefc768292f076dc3ac8c48f3781c8f2d5851dd3d98950e8c5a89f"
|
||||||
|
dependencies = [
|
||||||
|
"objc2-encode",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "objc2-app-kit"
|
||||||
|
version = "0.3.2"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "d49e936b501e5c5bf01fda3a9452ff86dc3ea98ad5f283e1455153142d97518c"
|
||||||
|
dependencies = [
|
||||||
|
"bitflags 2.9.1",
|
||||||
|
"objc2",
|
||||||
|
"objc2-core-graphics",
|
||||||
|
"objc2-foundation",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "objc2-core-foundation"
|
||||||
|
version = "0.3.2"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "2a180dd8642fa45cdb7dd721cd4c11b1cadd4929ce112ebd8b9f5803cc79d536"
|
||||||
|
dependencies = [
|
||||||
|
"bitflags 2.9.1",
|
||||||
|
"dispatch2",
|
||||||
|
"objc2",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "objc2-core-graphics"
|
||||||
|
version = "0.3.2"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "e022c9d066895efa1345f8e33e584b9f958da2fd4cd116792e15e07e4720a807"
|
||||||
|
dependencies = [
|
||||||
|
"bitflags 2.9.1",
|
||||||
|
"dispatch2",
|
||||||
|
"objc2",
|
||||||
|
"objc2-core-foundation",
|
||||||
|
"objc2-io-surface",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "objc2-encode"
|
||||||
|
version = "4.1.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "ef25abbcd74fb2609453eb695bd2f860d389e457f67dc17cafc8b8cbc89d0c33"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "objc2-foundation"
|
||||||
|
version = "0.3.2"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "e3e0adef53c21f888deb4fa59fc59f7eb17404926ee8a6f59f5df0fd7f9f3272"
|
||||||
|
dependencies = [
|
||||||
|
"bitflags 2.9.1",
|
||||||
|
"objc2",
|
||||||
|
"objc2-core-foundation",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "objc2-io-surface"
|
||||||
|
version = "0.3.2"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "180788110936d59bab6bd83b6060ffdfffb3b922ba1396b312ae795e1de9d81d"
|
||||||
|
dependencies = [
|
||||||
|
"bitflags 2.9.1",
|
||||||
|
"objc2",
|
||||||
|
"objc2-core-foundation",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "object"
|
name = "object"
|
||||||
version = "0.36.7"
|
version = "0.36.7"
|
||||||
@@ -2243,12 +2449,6 @@ version = "0.2.0"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
|
checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "overload"
|
|
||||||
version = "0.1.1"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "ownedbytes"
|
name = "ownedbytes"
|
||||||
version = "0.9.0"
|
version = "0.9.0"
|
||||||
@@ -2400,6 +2600,19 @@ dependencies = [
|
|||||||
"time",
|
"time",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "png"
|
||||||
|
version = "0.18.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "60769b8b31b2a9f263dae2776c37b1b28ae246943cf719eb6946a1db05128a61"
|
||||||
|
dependencies = [
|
||||||
|
"bitflags 2.9.1",
|
||||||
|
"crc32fast",
|
||||||
|
"fdeflate",
|
||||||
|
"flate2",
|
||||||
|
"miniz_oxide",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "polling"
|
name = "polling"
|
||||||
version = "3.9.0"
|
version = "3.9.0"
|
||||||
@@ -2623,6 +2836,18 @@ dependencies = [
|
|||||||
"syn 1.0.109",
|
"syn 1.0.109",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "pxfm"
|
||||||
|
version = "0.1.29"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "e0c5ccf5294c6ccd63a74f1565028353830a9c2f5eb0c682c355c471726a6e3f"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "quick-error"
|
||||||
|
version = "2.0.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "quick-xml"
|
name = "quick-xml"
|
||||||
version = "0.38.1"
|
version = "0.38.1"
|
||||||
@@ -2756,7 +2981,7 @@ dependencies = [
|
|||||||
"itertools 0.13.0",
|
"itertools 0.13.0",
|
||||||
"lru",
|
"lru",
|
||||||
"paste",
|
"paste",
|
||||||
"strum",
|
"strum 0.26.3",
|
||||||
"unicode-segmentation",
|
"unicode-segmentation",
|
||||||
"unicode-truncate",
|
"unicode-truncate",
|
||||||
"unicode-width 0.2.0",
|
"unicode-width 0.2.0",
|
||||||
@@ -2810,17 +3035,8 @@ checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
|
|||||||
dependencies = [
|
dependencies = [
|
||||||
"aho-corasick",
|
"aho-corasick",
|
||||||
"memchr",
|
"memchr",
|
||||||
"regex-automata 0.4.9",
|
"regex-automata",
|
||||||
"regex-syntax 0.8.5",
|
"regex-syntax",
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "regex-automata"
|
|
||||||
version = "0.1.10"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
|
|
||||||
dependencies = [
|
|
||||||
"regex-syntax 0.6.29",
|
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -2831,15 +3047,9 @@ checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
|
|||||||
dependencies = [
|
dependencies = [
|
||||||
"aho-corasick",
|
"aho-corasick",
|
||||||
"memchr",
|
"memchr",
|
||||||
"regex-syntax 0.8.5",
|
"regex-syntax",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "regex-syntax"
|
|
||||||
version = "0.6.29"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "regex-syntax"
|
name = "regex-syntax"
|
||||||
version = "0.8.5"
|
version = "0.8.5"
|
||||||
@@ -3100,7 +3310,7 @@ checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "search"
|
name = "search"
|
||||||
version = "0.5.0"
|
version = "0.7.5"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"common",
|
"common",
|
||||||
@@ -3199,7 +3409,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "server"
|
name = "server"
|
||||||
version = "0.5.0"
|
version = "0.7.5"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"bcrypt",
|
"bcrypt",
|
||||||
@@ -3210,6 +3420,7 @@ dependencies = [
|
|||||||
"futures",
|
"futures",
|
||||||
"jsonwebtoken",
|
"jsonwebtoken",
|
||||||
"lazy_static",
|
"lazy_static",
|
||||||
|
"once_cell",
|
||||||
"prost 0.13.5",
|
"prost 0.13.5",
|
||||||
"prost-build 0.14.1",
|
"prost-build 0.14.1",
|
||||||
"prost-types 0.13.5",
|
"prost-types 0.13.5",
|
||||||
@@ -3234,6 +3445,9 @@ dependencies = [
|
|||||||
"tonic",
|
"tonic",
|
||||||
"tonic-reflection",
|
"tonic-reflection",
|
||||||
"tracing",
|
"tracing",
|
||||||
|
"tracing-subscriber",
|
||||||
|
"tui-canvas-validation-core",
|
||||||
|
"unicode-width 0.2.0",
|
||||||
"uuid",
|
"uuid",
|
||||||
"validator",
|
"validator",
|
||||||
]
|
]
|
||||||
@@ -3315,6 +3529,12 @@ dependencies = [
|
|||||||
"rand_core 0.6.4",
|
"rand_core 0.6.4",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "simd-adler32"
|
||||||
|
version = "0.3.9"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "703d5c7ef118737c72f1af64ad2f6f8c5e1921f818cdcb97b8fe6fc69bf66214"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "simdutf8"
|
name = "simdutf8"
|
||||||
version = "0.1.5"
|
version = "0.1.5"
|
||||||
@@ -3756,9 +3976,15 @@ version = "0.26.3"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06"
|
checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"strum_macros",
|
"strum_macros 0.26.4",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "strum"
|
||||||
|
version = "0.27.2"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "af23d6f6c1a224baef9d3f61e287d2761385a5b88fdab4eb4c6f11aeb54c4bcf"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "strum_macros"
|
name = "strum_macros"
|
||||||
version = "0.26.4"
|
version = "0.26.4"
|
||||||
@@ -3772,6 +3998,18 @@ dependencies = [
|
|||||||
"syn 2.0.104",
|
"syn 2.0.104",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "strum_macros"
|
||||||
|
version = "0.27.2"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "7695ce3845ea4b33927c055a39dc438a45b059f7c1b3d91d38d10355fb8cbca7"
|
||||||
|
dependencies = [
|
||||||
|
"heck",
|
||||||
|
"proc-macro2",
|
||||||
|
"quote",
|
||||||
|
"syn 2.0.104",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "subtle"
|
name = "subtle"
|
||||||
version = "2.6.1"
|
version = "2.6.1"
|
||||||
@@ -3830,7 +4068,7 @@ dependencies = [
|
|||||||
"fnv",
|
"fnv",
|
||||||
"once_cell",
|
"once_cell",
|
||||||
"plist",
|
"plist",
|
||||||
"regex-syntax 0.8.5",
|
"regex-syntax",
|
||||||
"serde",
|
"serde",
|
||||||
"serde_derive",
|
"serde_derive",
|
||||||
"serde_json",
|
"serde_json",
|
||||||
@@ -3936,7 +4174,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||||||
checksum = "d60769b80ad7953d8a7b2c70cdfe722bbcdcac6bccc8ac934c40c034d866fc18"
|
checksum = "d60769b80ad7953d8a7b2c70cdfe722bbcdcac6bccc8ac934c40c034d866fc18"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"byteorder",
|
"byteorder",
|
||||||
"regex-syntax 0.8.5",
|
"regex-syntax",
|
||||||
"utf8-ranges",
|
"utf8-ranges",
|
||||||
]
|
]
|
||||||
|
|
||||||
@@ -4062,6 +4300,20 @@ dependencies = [
|
|||||||
"cfg-if",
|
"cfg-if",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "tiff"
|
||||||
|
version = "0.11.3"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "b63feaf3343d35b6ca4d50483f94843803b0f51634937cc2ec519fc32232bc52"
|
||||||
|
dependencies = [
|
||||||
|
"fax",
|
||||||
|
"flate2",
|
||||||
|
"half",
|
||||||
|
"quick-error",
|
||||||
|
"weezl",
|
||||||
|
"zune-jpeg",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "time"
|
name = "time"
|
||||||
version = "0.3.41"
|
version = "0.3.41"
|
||||||
@@ -4318,9 +4570,9 @@ checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tracing"
|
name = "tracing"
|
||||||
version = "0.1.41"
|
version = "0.1.44"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
|
checksum = "63e71662fa4b2a2c3a26f570f037eb95bb1f85397f3cd8076caed2f026a6d100"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"log",
|
"log",
|
||||||
"pin-project-lite",
|
"pin-project-lite",
|
||||||
@@ -4330,9 +4582,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tracing-attributes"
|
name = "tracing-attributes"
|
||||||
version = "0.1.30"
|
version = "0.1.31"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "81383ab64e72a7a8b8e13130c49e3dab29def6d0c7d76a03087b3cf71c5c6903"
|
checksum = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
"quote",
|
"quote",
|
||||||
@@ -4341,9 +4593,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tracing-core"
|
name = "tracing-core"
|
||||||
version = "0.1.34"
|
version = "0.1.36"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "b9d12581f227e93f094d3af2ae690a574abb8a2b9b7a96e7cfe9647b2b617678"
|
checksum = "db97caf9d906fbde555dd62fa95ddba9eecfd14cb388e4f491a66d74cd5fb79a"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"once_cell",
|
"once_cell",
|
||||||
"valuable",
|
"valuable",
|
||||||
@@ -4362,14 +4614,14 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tracing-subscriber"
|
name = "tracing-subscriber"
|
||||||
version = "0.3.19"
|
version = "0.3.22"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008"
|
checksum = "2f30143827ddab0d256fd843b7a66d164e9f271cfa0dde49142c5ca0ca291f1e"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"matchers",
|
"matchers",
|
||||||
"nu-ansi-term",
|
"nu-ansi-term",
|
||||||
"once_cell",
|
"once_cell",
|
||||||
"regex",
|
"regex-automata",
|
||||||
"sharded-slab",
|
"sharded-slab",
|
||||||
"smallvec",
|
"smallvec",
|
||||||
"thread_local",
|
"thread_local",
|
||||||
@@ -4400,15 +4652,50 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||||||
checksum = "e78122066b0cb818b8afd08f7ed22f7fdbc3e90815035726f0840d0d26c0747a"
|
checksum = "e78122066b0cb818b8afd08f7ed22f7fdbc3e90815035726f0840d0d26c0747a"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tui-textarea"
|
name = "tui-canvas"
|
||||||
version = "0.7.0"
|
version = "0.7.5"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
dependencies = [
|
||||||
checksum = "0a5318dd619ed73c52a9417ad19046724effc1287fb75cdcc4eca1d6ac1acbae"
|
"anyhow",
|
||||||
|
"arboard",
|
||||||
|
"async-trait",
|
||||||
|
"crossterm",
|
||||||
|
"derivative",
|
||||||
|
"once_cell",
|
||||||
|
"ratatui",
|
||||||
|
"regex",
|
||||||
|
"ropey",
|
||||||
|
"serde",
|
||||||
|
"syntect",
|
||||||
|
"thiserror 2.0.12",
|
||||||
|
"tokio",
|
||||||
|
"tokio-test",
|
||||||
|
"toml",
|
||||||
|
"tracing",
|
||||||
|
"tracing-subscriber",
|
||||||
|
"tui-canvas-validation-core",
|
||||||
|
"unicode-width 0.2.0",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "tui-canvas-validation-core"
|
||||||
|
version = "0.7.5"
|
||||||
|
dependencies = [
|
||||||
|
"regex",
|
||||||
|
"serde",
|
||||||
|
"thiserror 2.0.12",
|
||||||
|
"unicode-width 0.2.0",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "tui-pages"
|
||||||
|
version = "0.7.5"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"crossterm",
|
"crossterm",
|
||||||
"ratatui",
|
"ratatui",
|
||||||
"regex",
|
"serde",
|
||||||
"unicode-width 0.2.0",
|
"toml",
|
||||||
|
"tracing",
|
||||||
|
"tui-canvas",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -4672,6 +4959,12 @@ version = "0.3.2"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "323f4da9523e9a669e1eaf9c6e763892769b1d38c623913647bfdc1532fe4549"
|
checksum = "323f4da9523e9a669e1eaf9c6e763892769b1d38c623913647bfdc1532fe4549"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "weezl"
|
||||||
|
version = "0.1.12"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "a28ac98ddc8b9274cb41bb4d9d4d5c425b6020c50c46f25559911905610b4a88"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "which"
|
name = "which"
|
||||||
version = "7.0.3"
|
version = "7.0.3"
|
||||||
@@ -4733,7 +5026,7 @@ checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3"
|
|||||||
dependencies = [
|
dependencies = [
|
||||||
"windows-implement",
|
"windows-implement",
|
||||||
"windows-interface",
|
"windows-interface",
|
||||||
"windows-link",
|
"windows-link 0.1.3",
|
||||||
"windows-result",
|
"windows-result",
|
||||||
"windows-strings",
|
"windows-strings",
|
||||||
]
|
]
|
||||||
@@ -4766,13 +5059,19 @@ version = "0.1.3"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a"
|
checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "windows-link"
|
||||||
|
version = "0.2.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "windows-result"
|
name = "windows-result"
|
||||||
version = "0.3.4"
|
version = "0.3.4"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6"
|
checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"windows-link",
|
"windows-link 0.1.3",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -4781,7 +5080,7 @@ version = "0.4.2"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57"
|
checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"windows-link",
|
"windows-link 0.1.3",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -5044,6 +5343,23 @@ dependencies = [
|
|||||||
"tap",
|
"tap",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "x11rb"
|
||||||
|
version = "0.13.2"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "9993aa5be5a26815fe2c3eacfc1fde061fc1a1f094bf1ad2a18bf9c495dd7414"
|
||||||
|
dependencies = [
|
||||||
|
"gethostname",
|
||||||
|
"rustix 1.0.8",
|
||||||
|
"x11rb-protocol",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "x11rb-protocol"
|
||||||
|
version = "0.13.2"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "ea6fc2961e4ef194dcbfe56bb845534d0dc8098940c7e5c012a258bfec6701bd"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "xdg"
|
name = "xdg"
|
||||||
version = "3.0.0"
|
version = "3.0.0"
|
||||||
@@ -5190,3 +5506,18 @@ dependencies = [
|
|||||||
"cc",
|
"cc",
|
||||||
"pkg-config",
|
"pkg-config",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "zune-core"
|
||||||
|
version = "0.5.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "cb8a0807f7c01457d0379ba880ba6322660448ddebc890ce29bb64da71fb40f9"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "zune-jpeg"
|
||||||
|
version = "0.5.15"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "27bc9d5b815bc103f142aa054f561d9187d191692ec7c2d1e2b4737f8dbd7296"
|
||||||
|
dependencies = [
|
||||||
|
"zune-core",
|
||||||
|
]
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
[workspace]
|
[workspace]
|
||||||
members = ["client", "server", "common", "search", "canvas"]
|
members = ["client", "server", "common", "search", "tui-canvas", "tui-canvas/tui-canvas-validation-core", "tui-pages" ]
|
||||||
resolver = "2"
|
resolver = "2"
|
||||||
|
|
||||||
[workspace.package]
|
[workspace.package]
|
||||||
# TODO: idk how to do the name, fix later
|
# TODO: idk how to do the name, fix later
|
||||||
# name = "komp_ac"
|
# name = "komp_ac"
|
||||||
version = "0.5.0"
|
version = "0.7.5"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
license = "GPL-3.0-or-later"
|
license = "GPL-3.0-or-later"
|
||||||
authors = ["Filip Priečinský <filippriec@gmail.com>"]
|
authors = ["Filip Priečinský <filippriec@gmail.com>"]
|
||||||
|
|||||||
@@ -16,10 +16,5 @@ cargo watch -x 'run --package client -- client'
|
|||||||
|
|
||||||
Client with tracing:
|
Client with tracing:
|
||||||
```
|
```
|
||||||
ENABLE_TRACING=1 RUST_LOG=client=debug cargo watch -x 'run --package client -- client'
|
|
||||||
```
|
|
||||||
|
|
||||||
Client with debug that cant be traced
|
|
||||||
```
|
|
||||||
cargo run --package client --features ui-debug -- client
|
cargo run --package client --features ui-debug -- client
|
||||||
```
|
```
|
||||||
|
|||||||
1
canvas
1
canvas
Submodule canvas deleted from 29fdc5a6c7
2
client
2
client
Submodule client updated: c1839bd960...69dfbffd99
1
common/.gitignore
vendored
Normal file
1
common/.gitignore
vendored
Normal file
@@ -0,0 +1 @@
|
|||||||
|
docs/
|
||||||
11
common/Makefile
Normal file
11
common/Makefile
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
DOC_OUT := docs/grpc_reference.html
|
||||||
|
|
||||||
|
.PHONY: docs
|
||||||
|
|
||||||
|
docs:
|
||||||
|
@echo "Generating gRPC documentation..."
|
||||||
|
mkdir -p $(dir $(DOC_OUT))
|
||||||
|
protoc \
|
||||||
|
--doc_out=html,index.html:$(dir $(DOC_OUT)) \
|
||||||
|
--proto_path=proto proto/*.proto
|
||||||
|
@echo "✅ Docs written to $(DOC_OUT)"
|
||||||
144
common/build.rs
144
common/build.rs
@@ -8,6 +8,10 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
|
|||||||
".komp_ac.table_validation.FieldValidation",
|
".komp_ac.table_validation.FieldValidation",
|
||||||
"#[derive(serde::Serialize, serde::Deserialize)]",
|
"#[derive(serde::Serialize, serde::Deserialize)]",
|
||||||
)
|
)
|
||||||
|
.field_attribute(
|
||||||
|
".komp_ac.table_validation.FieldValidation.locked",
|
||||||
|
"#[serde(default)]",
|
||||||
|
)
|
||||||
.type_attribute(
|
.type_attribute(
|
||||||
".komp_ac.table_validation.CharacterLimits",
|
".komp_ac.table_validation.CharacterLimits",
|
||||||
"#[derive(serde::Serialize, serde::Deserialize)]",
|
"#[derive(serde::Serialize, serde::Deserialize)]",
|
||||||
@@ -20,6 +24,26 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
|
|||||||
".komp_ac.table_validation.TableValidationResponse",
|
".komp_ac.table_validation.TableValidationResponse",
|
||||||
"#[derive(serde::Serialize, serde::Deserialize)]",
|
"#[derive(serde::Serialize, serde::Deserialize)]",
|
||||||
)
|
)
|
||||||
|
.type_attribute(
|
||||||
|
".komp_ac.table_validation.PatternRule",
|
||||||
|
"#[derive(serde::Serialize, serde::Deserialize)]",
|
||||||
|
)
|
||||||
|
.type_attribute(
|
||||||
|
".komp_ac.table_validation.PatternPosition",
|
||||||
|
"#[derive(serde::Serialize, serde::Deserialize)]",
|
||||||
|
)
|
||||||
|
.type_attribute(
|
||||||
|
".komp_ac.table_validation.CharacterConstraint",
|
||||||
|
"#[derive(serde::Serialize, serde::Deserialize)]",
|
||||||
|
)
|
||||||
|
.type_attribute(
|
||||||
|
".komp_ac.table_validation.PatternRules",
|
||||||
|
"#[derive(serde::Serialize, serde::Deserialize)]",
|
||||||
|
)
|
||||||
|
.type_attribute(
|
||||||
|
".komp_ac.table_validation.AllowedValues",
|
||||||
|
"#[derive(serde::Serialize, serde::Deserialize)]",
|
||||||
|
)
|
||||||
.type_attribute(
|
.type_attribute(
|
||||||
".komp_ac.table_validation.UpdateFieldValidationRequest",
|
".komp_ac.table_validation.UpdateFieldValidationRequest",
|
||||||
"#[derive(serde::Serialize, serde::Deserialize)]",
|
"#[derive(serde::Serialize, serde::Deserialize)]",
|
||||||
@@ -28,11 +52,107 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
|
|||||||
".komp_ac.table_validation.UpdateFieldValidationResponse",
|
".komp_ac.table_validation.UpdateFieldValidationResponse",
|
||||||
"#[derive(serde::Serialize, serde::Deserialize)]",
|
"#[derive(serde::Serialize, serde::Deserialize)]",
|
||||||
)
|
)
|
||||||
|
.type_attribute(
|
||||||
|
".komp_ac.table_validation.ReplaceTableValidationRequest",
|
||||||
|
"#[derive(serde::Serialize, serde::Deserialize)]",
|
||||||
|
)
|
||||||
|
.type_attribute(
|
||||||
|
".komp_ac.table_validation.ReplaceTableValidationResponse",
|
||||||
|
"#[derive(serde::Serialize, serde::Deserialize)]",
|
||||||
|
)
|
||||||
|
.type_attribute(
|
||||||
|
".komp_ac.table_validation.ValidationRuleDefinition",
|
||||||
|
"#[derive(serde::Serialize, serde::Deserialize)]",
|
||||||
|
)
|
||||||
|
.type_attribute(
|
||||||
|
".komp_ac.table_validation.ValidationSetRuleItem",
|
||||||
|
"#[derive(serde::Serialize, serde::Deserialize)]",
|
||||||
|
)
|
||||||
|
.type_attribute(
|
||||||
|
".komp_ac.table_validation.ValidationSetRuleItem.Source",
|
||||||
|
"#[derive(serde::Serialize, serde::Deserialize)]",
|
||||||
|
)
|
||||||
|
.type_attribute(
|
||||||
|
".komp_ac.table_validation.ValidationSetDefinition",
|
||||||
|
"#[derive(serde::Serialize, serde::Deserialize)]",
|
||||||
|
)
|
||||||
|
.type_attribute(
|
||||||
|
".komp_ac.table_validation.UpsertValidationRuleRequest",
|
||||||
|
"#[derive(serde::Serialize, serde::Deserialize)]",
|
||||||
|
)
|
||||||
|
.type_attribute(
|
||||||
|
".komp_ac.table_validation.UpsertValidationRuleResponse",
|
||||||
|
"#[derive(serde::Serialize, serde::Deserialize)]",
|
||||||
|
)
|
||||||
|
.type_attribute(
|
||||||
|
".komp_ac.table_validation.ListValidationRulesRequest",
|
||||||
|
"#[derive(serde::Serialize, serde::Deserialize)]",
|
||||||
|
)
|
||||||
|
.type_attribute(
|
||||||
|
".komp_ac.table_validation.ListValidationRulesResponse",
|
||||||
|
"#[derive(serde::Serialize, serde::Deserialize)]",
|
||||||
|
)
|
||||||
|
.type_attribute(
|
||||||
|
".komp_ac.table_validation.DeleteValidationRuleRequest",
|
||||||
|
"#[derive(serde::Serialize, serde::Deserialize)]",
|
||||||
|
)
|
||||||
|
.type_attribute(
|
||||||
|
".komp_ac.table_validation.DeleteValidationRuleResponse",
|
||||||
|
"#[derive(serde::Serialize, serde::Deserialize)]",
|
||||||
|
)
|
||||||
|
.type_attribute(
|
||||||
|
".komp_ac.table_validation.UpsertValidationSetRequest",
|
||||||
|
"#[derive(serde::Serialize, serde::Deserialize)]",
|
||||||
|
)
|
||||||
|
.type_attribute(
|
||||||
|
".komp_ac.table_validation.UpsertValidationSetResponse",
|
||||||
|
"#[derive(serde::Serialize, serde::Deserialize)]",
|
||||||
|
)
|
||||||
|
.type_attribute(
|
||||||
|
".komp_ac.table_validation.ListValidationSetsRequest",
|
||||||
|
"#[derive(serde::Serialize, serde::Deserialize)]",
|
||||||
|
)
|
||||||
|
.type_attribute(
|
||||||
|
".komp_ac.table_validation.ListValidationSetsResponse",
|
||||||
|
"#[derive(serde::Serialize, serde::Deserialize)]",
|
||||||
|
)
|
||||||
|
.type_attribute(
|
||||||
|
".komp_ac.table_validation.DeleteValidationSetRequest",
|
||||||
|
"#[derive(serde::Serialize, serde::Deserialize)]",
|
||||||
|
)
|
||||||
|
.type_attribute(
|
||||||
|
".komp_ac.table_validation.DeleteValidationSetResponse",
|
||||||
|
"#[derive(serde::Serialize, serde::Deserialize)]",
|
||||||
|
)
|
||||||
|
.type_attribute(
|
||||||
|
".komp_ac.table_validation.ApplyValidationSetRequest",
|
||||||
|
"#[derive(serde::Serialize, serde::Deserialize)]",
|
||||||
|
)
|
||||||
|
.type_attribute(
|
||||||
|
".komp_ac.table_validation.ApplyValidationSetResponse",
|
||||||
|
"#[derive(serde::Serialize, serde::Deserialize)]",
|
||||||
|
)
|
||||||
|
.type_attribute(
|
||||||
|
".komp_ac.table_validation.LockFieldValidationRequest",
|
||||||
|
"#[derive(serde::Serialize, serde::Deserialize)]",
|
||||||
|
)
|
||||||
|
.type_attribute(
|
||||||
|
".komp_ac.table_validation.LockFieldValidationResponse",
|
||||||
|
"#[derive(serde::Serialize, serde::Deserialize)]",
|
||||||
|
)
|
||||||
// Enum -> readable strings in JSON ("BYTES", "DISPLAY_WIDTH")
|
// Enum -> readable strings in JSON ("BYTES", "DISPLAY_WIDTH")
|
||||||
.type_attribute(
|
.type_attribute(
|
||||||
".komp_ac.table_validation.CountMode",
|
".komp_ac.table_validation.CountMode",
|
||||||
"#[derive(serde::Serialize, serde::Deserialize)] #[serde(rename_all = \"SCREAMING_SNAKE_CASE\")]",
|
"#[derive(serde::Serialize, serde::Deserialize)] #[serde(rename_all = \"SCREAMING_SNAKE_CASE\")]",
|
||||||
)
|
)
|
||||||
|
.type_attribute(
|
||||||
|
".komp_ac.table_validation.PatternPositionKind",
|
||||||
|
"#[derive(serde::Serialize, serde::Deserialize)] #[serde(rename_all = \"SCREAMING_SNAKE_CASE\")]",
|
||||||
|
)
|
||||||
|
.type_attribute(
|
||||||
|
".komp_ac.table_validation.CharacterConstraintKind",
|
||||||
|
"#[derive(serde::Serialize, serde::Deserialize)] #[serde(rename_all = \"SCREAMING_SNAKE_CASE\")]",
|
||||||
|
)
|
||||||
.type_attribute(
|
.type_attribute(
|
||||||
".komp_ac.table_definition.ColumnDefinition",
|
".komp_ac.table_definition.ColumnDefinition",
|
||||||
"#[derive(serde::Serialize, serde::Deserialize)]",
|
"#[derive(serde::Serialize, serde::Deserialize)]",
|
||||||
@@ -45,10 +165,34 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
|
|||||||
".komp_ac.table_definition.PostTableDefinitionRequest",
|
".komp_ac.table_definition.PostTableDefinitionRequest",
|
||||||
"#[derive(serde::Serialize, serde::Deserialize)]",
|
"#[derive(serde::Serialize, serde::Deserialize)]",
|
||||||
)
|
)
|
||||||
|
.type_attribute(
|
||||||
|
".komp_ac.table_definition.AddTableColumnsRequest",
|
||||||
|
"#[derive(serde::Serialize, serde::Deserialize)]",
|
||||||
|
)
|
||||||
.type_attribute(
|
.type_attribute(
|
||||||
".komp_ac.table_definition.TableDefinitionResponse",
|
".komp_ac.table_definition.TableDefinitionResponse",
|
||||||
"#[derive(serde::Serialize, serde::Deserialize)]"
|
"#[derive(serde::Serialize, serde::Deserialize)]"
|
||||||
)
|
)
|
||||||
|
.type_attribute(
|
||||||
|
".komp_ac.table_definition.GetColumnAliasRenameHistoryRequest",
|
||||||
|
"#[derive(serde::Serialize, serde::Deserialize)]"
|
||||||
|
)
|
||||||
|
.type_attribute(
|
||||||
|
".komp_ac.table_definition.ColumnAliasRenameHistoryEntry",
|
||||||
|
"#[derive(serde::Serialize, serde::Deserialize)]"
|
||||||
|
)
|
||||||
|
.type_attribute(
|
||||||
|
".komp_ac.table_definition.GetColumnAliasRenameHistoryResponse",
|
||||||
|
"#[derive(serde::Serialize, serde::Deserialize)]"
|
||||||
|
)
|
||||||
|
.type_attribute(
|
||||||
|
".komp_ac.table_definition.RenameColumnAliasRequest",
|
||||||
|
"#[derive(serde::Serialize, serde::Deserialize)]"
|
||||||
|
)
|
||||||
|
.type_attribute(
|
||||||
|
".komp_ac.table_definition.RenameColumnAliasResponse",
|
||||||
|
"#[derive(serde::Serialize, serde::Deserialize)]"
|
||||||
|
)
|
||||||
.type_attribute(
|
.type_attribute(
|
||||||
".komp_ac.table_script.PostTableScriptRequest",
|
".komp_ac.table_script.PostTableScriptRequest",
|
||||||
"#[derive(serde::Serialize, serde::Deserialize)]",
|
"#[derive(serde::Serialize, serde::Deserialize)]",
|
||||||
|
|||||||
@@ -6,78 +6,78 @@ import "common.proto";
|
|||||||
// import "table_structure.proto";
|
// import "table_structure.proto";
|
||||||
|
|
||||||
service Adresar {
|
service Adresar {
|
||||||
rpc PostAdresar (PostAdresarRequest) returns (AdresarResponse);
|
rpc PostAdresar(PostAdresarRequest) returns (AdresarResponse);
|
||||||
rpc GetAdresar (GetAdresarRequest) returns (AdresarResponse);
|
rpc GetAdresar(GetAdresarRequest) returns (AdresarResponse);
|
||||||
rpc PutAdresar (PutAdresarRequest) returns (AdresarResponse);
|
rpc PutAdresar(PutAdresarRequest) returns (AdresarResponse);
|
||||||
rpc DeleteAdresar (DeleteAdresarRequest) returns (DeleteAdresarResponse);
|
rpc DeleteAdresar(DeleteAdresarRequest) returns (DeleteAdresarResponse);
|
||||||
rpc GetAdresarCount (common.Empty) returns (common.CountResponse);
|
rpc GetAdresarCount(common.Empty) returns (common.CountResponse);
|
||||||
rpc GetAdresarByPosition (common.PositionRequest) returns (AdresarResponse);
|
rpc GetAdresarByPosition(common.PositionRequest) returns (AdresarResponse);
|
||||||
}
|
}
|
||||||
|
|
||||||
message GetAdresarRequest {
|
message GetAdresarRequest {
|
||||||
int64 id = 1;
|
int64 id = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
message DeleteAdresarRequest {
|
message DeleteAdresarRequest {
|
||||||
int64 id = 1;
|
int64 id = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
message PostAdresarRequest {
|
message PostAdresarRequest {
|
||||||
string firma = 1;
|
string firma = 1;
|
||||||
string kz = 2;
|
string kz = 2;
|
||||||
string drc = 3;
|
string drc = 3;
|
||||||
string ulica = 4;
|
string ulica = 4;
|
||||||
string psc = 5;
|
string psc = 5;
|
||||||
string mesto = 6;
|
string mesto = 6;
|
||||||
string stat = 7;
|
string stat = 7;
|
||||||
string banka = 8;
|
string banka = 8;
|
||||||
string ucet = 9;
|
string ucet = 9;
|
||||||
string skladm = 10;
|
string skladm = 10;
|
||||||
string ico = 11;
|
string ico = 11;
|
||||||
string kontakt = 12;
|
string kontakt = 12;
|
||||||
string telefon = 13;
|
string telefon = 13;
|
||||||
string skladu = 14;
|
string skladu = 14;
|
||||||
string fax = 15;
|
string fax = 15;
|
||||||
}
|
}
|
||||||
|
|
||||||
message AdresarResponse {
|
message AdresarResponse {
|
||||||
int64 id = 1;
|
int64 id = 1;
|
||||||
string firma = 2;
|
string firma = 2;
|
||||||
string kz = 3;
|
string kz = 3;
|
||||||
string drc = 4;
|
string drc = 4;
|
||||||
string ulica = 5;
|
string ulica = 5;
|
||||||
string psc = 6;
|
string psc = 6;
|
||||||
string mesto = 7;
|
string mesto = 7;
|
||||||
string stat = 8;
|
string stat = 8;
|
||||||
string banka = 9;
|
string banka = 9;
|
||||||
string ucet = 10;
|
string ucet = 10;
|
||||||
string skladm = 11;
|
string skladm = 11;
|
||||||
string ico = 12;
|
string ico = 12;
|
||||||
string kontakt = 13;
|
string kontakt = 13;
|
||||||
string telefon = 14;
|
string telefon = 14;
|
||||||
string skladu = 15;
|
string skladu = 15;
|
||||||
string fax = 16;
|
string fax = 16;
|
||||||
}
|
}
|
||||||
|
|
||||||
message PutAdresarRequest {
|
message PutAdresarRequest {
|
||||||
int64 id = 1;
|
int64 id = 1;
|
||||||
string firma = 2;
|
string firma = 2;
|
||||||
string kz = 3;
|
string kz = 3;
|
||||||
string drc = 4;
|
string drc = 4;
|
||||||
string ulica = 5;
|
string ulica = 5;
|
||||||
string psc = 6;
|
string psc = 6;
|
||||||
string mesto = 7;
|
string mesto = 7;
|
||||||
string stat = 8;
|
string stat = 8;
|
||||||
string banka = 9;
|
string banka = 9;
|
||||||
string ucet = 10;
|
string ucet = 10;
|
||||||
string skladm = 11;
|
string skladm = 11;
|
||||||
string ico = 12;
|
string ico = 12;
|
||||||
string kontakt = 13;
|
string kontakt = 13;
|
||||||
string telefon = 14;
|
string telefon = 14;
|
||||||
string skladu = 15;
|
string skladu = 15;
|
||||||
string fax = 16;
|
string fax = 16;
|
||||||
}
|
}
|
||||||
|
|
||||||
message DeleteAdresarResponse {
|
message DeleteAdresarResponse {
|
||||||
bool success = 1;
|
bool success = 1;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,35 +5,35 @@ package komp_ac.auth;
|
|||||||
import "common.proto";
|
import "common.proto";
|
||||||
|
|
||||||
service AuthService {
|
service AuthService {
|
||||||
rpc Register(RegisterRequest) returns (AuthResponse);
|
rpc Register(RegisterRequest) returns (AuthResponse);
|
||||||
rpc Login(LoginRequest) returns (LoginResponse);
|
rpc Login(LoginRequest) returns (LoginResponse);
|
||||||
}
|
}
|
||||||
|
|
||||||
message RegisterRequest {
|
message RegisterRequest {
|
||||||
string username = 1;
|
string username = 1;
|
||||||
string email = 2;
|
string email = 2;
|
||||||
string password = 3;
|
string password = 3;
|
||||||
string password_confirmation = 4;
|
string password_confirmation = 4;
|
||||||
string role = 5;
|
string role = 5;
|
||||||
}
|
}
|
||||||
|
|
||||||
message AuthResponse {
|
message AuthResponse {
|
||||||
string id = 1; // UUID in string format
|
string id = 1; // UUID in string format
|
||||||
string username = 2; // Registered username
|
string username = 2; // Registered username
|
||||||
string email = 3; // Registered email (if provided)
|
string email = 3; // Registered email (if provided)
|
||||||
string role = 4; // Default role: 'accountant'
|
string role = 4; // Default role: 'accountant'
|
||||||
}
|
}
|
||||||
|
|
||||||
message LoginRequest {
|
message LoginRequest {
|
||||||
string identifier = 1; // Can be username or email
|
string identifier = 1; // Can be username or email
|
||||||
string password = 2;
|
string password = 2;
|
||||||
}
|
}
|
||||||
|
|
||||||
message LoginResponse {
|
message LoginResponse {
|
||||||
string access_token = 1; // JWT token
|
string access_token = 1; // JWT token
|
||||||
string token_type = 2; // Usually "Bearer"
|
string token_type = 2; // Usually "Bearer"
|
||||||
int32 expires_in = 3; // Expiration in seconds (86400 for 24 hours)
|
int32 expires_in = 3; // Expiration in seconds (86400 for 24 hours)
|
||||||
string user_id = 4; // User's UUID in string format
|
string user_id = 4; // User's UUID in string format
|
||||||
string role = 5; // User's role
|
string role = 5; // User's role
|
||||||
string username = 6;
|
string username = 6;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,5 +3,9 @@ syntax = "proto3";
|
|||||||
package komp_ac.common;
|
package komp_ac.common;
|
||||||
|
|
||||||
message Empty {}
|
message Empty {}
|
||||||
message CountResponse { int64 count = 1; }
|
message CountResponse {
|
||||||
message PositionRequest { int64 position = 1; }
|
int64 count = 1;
|
||||||
|
}
|
||||||
|
message PositionRequest {
|
||||||
|
int64 position = 1;
|
||||||
|
}
|
||||||
|
|||||||
@@ -3,18 +3,34 @@ syntax = "proto3";
|
|||||||
package komp_ac.search;
|
package komp_ac.search;
|
||||||
|
|
||||||
service Searcher {
|
service Searcher {
|
||||||
rpc SearchTable(SearchRequest) returns (SearchResponse);
|
rpc Search(SearchRequest) returns (SearchResponse);
|
||||||
|
}
|
||||||
|
|
||||||
|
enum MatchMode {
|
||||||
|
MATCH_MODE_UNSPECIFIED = 0;
|
||||||
|
MATCH_MODE_FUZZY = 1;
|
||||||
|
MATCH_MODE_EXACT = 2;
|
||||||
|
}
|
||||||
|
|
||||||
|
message ColumnConstraint {
|
||||||
|
string column = 1;
|
||||||
|
string query = 2;
|
||||||
|
MatchMode mode = 3;
|
||||||
}
|
}
|
||||||
|
|
||||||
message SearchRequest {
|
message SearchRequest {
|
||||||
string table_name = 1;
|
string profile_name = 1;
|
||||||
string query = 2;
|
optional string table_name = 2;
|
||||||
|
string free_query = 3;
|
||||||
|
repeated ColumnConstraint must = 4;
|
||||||
|
optional uint32 limit = 5;
|
||||||
}
|
}
|
||||||
message SearchResponse {
|
message SearchResponse {
|
||||||
message Hit {
|
message Hit {
|
||||||
int64 id = 1; // PostgreSQL row ID
|
int64 id = 1; // PostgreSQL row ID
|
||||||
float score = 2;
|
float score = 2;
|
||||||
string content_json = 3;
|
string content_json = 3;
|
||||||
}
|
string table_name = 4;
|
||||||
repeated Hit hits = 1;
|
}
|
||||||
|
repeated Hit hits = 1;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,44 +3,44 @@ syntax = "proto3";
|
|||||||
package komp_ac.search2;
|
package komp_ac.search2;
|
||||||
|
|
||||||
service Search2 {
|
service Search2 {
|
||||||
rpc SearchTable(Search2Request) returns (Search2Response);
|
rpc SearchTable(Search2Request) returns (Search2Response);
|
||||||
}
|
}
|
||||||
|
|
||||||
message Search2Request {
|
message Search2Request {
|
||||||
string profile_name = 1;
|
string profile_name = 1;
|
||||||
string table_name = 2;
|
string table_name = 2;
|
||||||
repeated ColumnFilter column_filters = 3;
|
repeated ColumnFilter column_filters = 3;
|
||||||
optional string text_query = 4; // Optional fallback text search
|
optional string text_query = 4; // Optional fallback text search
|
||||||
optional int32 limit = 5;
|
optional int32 limit = 5;
|
||||||
optional string order_by = 6;
|
optional string order_by = 6;
|
||||||
optional bool order_desc = 7;
|
optional bool order_desc = 7;
|
||||||
}
|
}
|
||||||
|
|
||||||
message ColumnFilter {
|
message ColumnFilter {
|
||||||
string column_name = 1;
|
string column_name = 1;
|
||||||
FilterType filter_type = 2;
|
FilterType filter_type = 2;
|
||||||
string value = 3;
|
string value = 3;
|
||||||
optional string value2 = 4; // For range queries
|
optional string value2 = 4; // For range queries
|
||||||
}
|
}
|
||||||
|
|
||||||
enum FilterType {
|
enum FilterType {
|
||||||
EQUALS = 0;
|
EQUALS = 0;
|
||||||
CONTAINS = 1;
|
CONTAINS = 1;
|
||||||
STARTS_WITH = 2;
|
STARTS_WITH = 2;
|
||||||
ENDS_WITH = 3;
|
ENDS_WITH = 3;
|
||||||
RANGE = 4;
|
RANGE = 4;
|
||||||
GREATER_THAN = 5;
|
GREATER_THAN = 5;
|
||||||
LESS_THAN = 6;
|
LESS_THAN = 6;
|
||||||
IS_NULL = 7;
|
IS_NULL = 7;
|
||||||
IS_NOT_NULL = 8;
|
IS_NOT_NULL = 8;
|
||||||
}
|
}
|
||||||
|
|
||||||
message Search2Response {
|
message Search2Response {
|
||||||
message Hit {
|
message Hit {
|
||||||
int64 id = 1;
|
int64 id = 1;
|
||||||
string content_json = 2; // No score - this is SQL-based
|
string content_json = 2; // No score - this is SQL-based
|
||||||
optional string match_info = 3; // Info about which columns matched
|
optional string match_info = 3; // Info about which columns matched
|
||||||
}
|
}
|
||||||
repeated Hit hits = 1;
|
repeated Hit hits = 1;
|
||||||
int32 total_count = 2; // Total matching records (for pagination)
|
int32 total_count = 2; // Total matching records (for pagination)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,56 +4,233 @@ package komp_ac.table_definition;
|
|||||||
|
|
||||||
import "common.proto";
|
import "common.proto";
|
||||||
|
|
||||||
|
// The TableDefinition service manages the entire lifecycle of user-defined
|
||||||
|
// tables (stored as both metadata and physical PostgreSQL tables) inside
|
||||||
|
// logical "profiles" (schemas). Each table has stored structure, links, and
|
||||||
|
// validation rules.
|
||||||
service TableDefinition {
|
service TableDefinition {
|
||||||
rpc PostTableDefinition (PostTableDefinitionRequest) returns (TableDefinitionResponse);
|
// Creates a new table (and schema if missing) with system columns,
|
||||||
rpc GetProfileTree (komp_ac.common.Empty) returns (ProfileTreeResponse);
|
// linked-table foreign keys, user-defined columns, and optional indexes.
|
||||||
rpc DeleteTable (DeleteTableRequest) returns (DeleteTableResponse);
|
// Also inserts metadata and default validation rules. Entirely transactional.
|
||||||
|
rpc PostTableDefinition(PostTableDefinitionRequest) returns (TableDefinitionResponse);
|
||||||
|
|
||||||
|
// Appends new user-defined columns to an existing table.
|
||||||
|
// Existing columns, links, and table logic are never changed by this call.
|
||||||
|
rpc AddTableColumns(AddTableColumnsRequest) returns (TableDefinitionResponse);
|
||||||
|
|
||||||
|
// Lists all profiles (schemas) and their tables with declared dependencies.
|
||||||
|
// This provides a tree-like overview of table relationships.
|
||||||
|
rpc GetProfileTree(komp_ac.common.Empty) returns (ProfileTreeResponse);
|
||||||
|
|
||||||
|
// Fetches all tables with their columns and scripts for a specific profile.
|
||||||
|
// Pure data retrieval - no business logic.
|
||||||
|
rpc GetProfileDetails(GetProfileDetailsRequest) returns (GetProfileDetailsResponse);
|
||||||
|
|
||||||
|
// Returns the stored rename history for column aliases in one profile.
|
||||||
|
rpc GetColumnAliasRenameHistory(GetColumnAliasRenameHistoryRequest) returns (GetColumnAliasRenameHistoryResponse);
|
||||||
|
|
||||||
|
// Renames a user-visible column alias while keeping the physical column unchanged.
|
||||||
|
rpc RenameColumnAlias(RenameColumnAliasRequest) returns (RenameColumnAliasResponse);
|
||||||
|
|
||||||
|
// Drops a table and its metadata, then deletes the profile if it becomes empty.
|
||||||
|
rpc DeleteTable(DeleteTableRequest) returns (DeleteTableResponse);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// A single link to another table within the same profile (schema).
|
||||||
message TableLink {
|
message TableLink {
|
||||||
string linked_table_name = 1;
|
// Name of an existing table within the same profile to link to.
|
||||||
bool required = 2;
|
// For each link, a "<linked>_id" column is created on the new table.
|
||||||
|
// That column references "<linked>"(id) and adds an index automatically.
|
||||||
|
string linked_table_name = 1;
|
||||||
|
|
||||||
|
// If true, the generated foreign key column is NOT NULL.
|
||||||
|
// Otherwise the column allows NULL.
|
||||||
|
// Duplicate links to the same target table in one request are rejected.
|
||||||
|
bool required = 2;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Defines the input for creating a new table definition.
|
||||||
message PostTableDefinitionRequest {
|
message PostTableDefinitionRequest {
|
||||||
string table_name = 1;
|
// Table name to create inside the target profile.
|
||||||
repeated TableLink links = 2;
|
// Must be lowercase, alphanumeric with underscores,
|
||||||
repeated ColumnDefinition columns = 3;
|
// start with a letter, and be <= 63 chars.
|
||||||
repeated string indexes = 4;
|
// Forbidden names: "id", "deleted", "created_at", or ending in "_id".
|
||||||
string profile_name = 5;
|
string table_name = 1;
|
||||||
|
|
||||||
|
// List of links (foreign keys) to existing tables in the same profile.
|
||||||
|
// Each will automatically get a "<linked>_id" column and an index.
|
||||||
|
repeated TableLink links = 2;
|
||||||
|
|
||||||
|
// List of user-defined columns (adds to system/id/fk columns).
|
||||||
|
repeated ColumnDefinition columns = 3;
|
||||||
|
|
||||||
|
// List of column names to be indexed (must match existing user-defined columns).
|
||||||
|
// Indexes can target only user-defined columns; system columns ("id", "deleted",
|
||||||
|
// "created_at") and automatically generated foreign key ("*_id") columns already
|
||||||
|
// have indexes. Requests trying to index those columns are rejected.
|
||||||
|
repeated string indexes = 4;
|
||||||
|
|
||||||
|
// Name of profile (Postgres schema) where the table will be created.
|
||||||
|
// Same naming rules as table_name; cannot collide with reserved schemas
|
||||||
|
// like "public", "information_schema", or ones starting with "pg_".
|
||||||
|
string profile_name = 5;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Defines append-only column additions for an existing table.
|
||||||
|
message AddTableColumnsRequest {
|
||||||
|
// Existing profile/schema name.
|
||||||
|
string profile_name = 1;
|
||||||
|
|
||||||
|
// Existing table name in the profile.
|
||||||
|
string table_name = 2;
|
||||||
|
|
||||||
|
// New user-defined columns only. Existing columns cannot be changed here.
|
||||||
|
repeated ColumnDefinition columns = 3;
|
||||||
|
|
||||||
|
// Optional indexes for the new columns only.
|
||||||
|
repeated string indexes = 4;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Describes one user-defined column for a table.
|
||||||
message ColumnDefinition {
|
message ColumnDefinition {
|
||||||
string name = 1;
|
// Column name that follows the same validation rules as table_name.
|
||||||
string field_type = 2;
|
// Must be lowercase, start with a letter, no uppercase characters,
|
||||||
|
// and cannot be "id", "deleted", "created_at", or end with "_id".
|
||||||
|
string name = 1;
|
||||||
|
|
||||||
|
// Logical column type. Supported values (case-insensitive):
|
||||||
|
// TEXT / STRING
|
||||||
|
// BOOLEAN
|
||||||
|
// TIMESTAMP / TIMESTAMPTZ / TIME
|
||||||
|
// MONEY (= NUMERIC(14,4))
|
||||||
|
// INTEGER / INT
|
||||||
|
// BIGINTEGER / BIGINT
|
||||||
|
// DATE
|
||||||
|
// DECIMAL(p,s) → NUMERIC(p,s)
|
||||||
|
// DECIMAL args must be integers (no sign, no dot, no leading zeros);
|
||||||
|
// s ≤ p and p ≥ 1.
|
||||||
|
string field_type = 2;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Response after table creation (success + DDL preview).
|
||||||
message TableDefinitionResponse {
|
message TableDefinitionResponse {
|
||||||
bool success = 1;
|
// True if all DB changes and metadata inserts succeeded.
|
||||||
string sql = 2;
|
bool success = 1;
|
||||||
|
|
||||||
|
// The actual SQL executed: CREATE TABLE + CREATE INDEX statements.
|
||||||
|
string sql = 2;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Describes the tree of all profiles and their tables.
|
||||||
message ProfileTreeResponse {
|
message ProfileTreeResponse {
|
||||||
message Table {
|
// Table entry in a profile.
|
||||||
int64 id = 1;
|
message Table {
|
||||||
string name = 2;
|
// Internal ID from table_definitions.id (metadata record).
|
||||||
repeated string depends_on = 3;
|
int64 id = 1;
|
||||||
}
|
|
||||||
|
|
||||||
message Profile {
|
// Table name within the profile (schema).
|
||||||
string name = 1;
|
string name = 2;
|
||||||
repeated Table tables = 2;
|
|
||||||
}
|
|
||||||
|
|
||||||
repeated Profile profiles = 1;
|
// Other tables this one references (based on link definitions only).
|
||||||
|
repeated string depends_on = 3;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Profile (schema) entry.
|
||||||
|
message Profile {
|
||||||
|
// Name of the schema/profile (as stored in `schemas.name`).
|
||||||
|
string name = 1;
|
||||||
|
|
||||||
|
// All tables in that schema and their dependencies.
|
||||||
|
repeated Table tables = 2;
|
||||||
|
}
|
||||||
|
|
||||||
|
// All profiles in the system.
|
||||||
|
repeated Profile profiles = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Request to fetch all tables, columns and scripts for a profile.
|
||||||
|
message GetProfileDetailsRequest {
|
||||||
|
// Profile (schema) name to fetch details for.
|
||||||
|
string profile_name = 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Response with all tables, columns and scripts for a profile.
|
||||||
|
message GetProfileDetailsResponse {
|
||||||
|
string profile_name = 1;
|
||||||
|
repeated TableDetail tables = 2;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Request to fetch recorded column alias rename history for one profile.
|
||||||
|
message GetColumnAliasRenameHistoryRequest {
|
||||||
|
string profile_name = 1;
|
||||||
|
|
||||||
|
// Optional filter. When omitted, returns all tables in the profile.
|
||||||
|
optional int64 table_definition_id = 2;
|
||||||
|
}
|
||||||
|
|
||||||
|
// One recorded column alias rename.
|
||||||
|
message ColumnAliasRenameHistoryEntry {
|
||||||
|
int64 id = 1;
|
||||||
|
string profile_name = 2;
|
||||||
|
int64 table_definition_id = 3;
|
||||||
|
string table_name = 4;
|
||||||
|
string old_column_name = 5;
|
||||||
|
string new_column_name = 6;
|
||||||
|
string created_at = 7;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Response with stored column alias rename history rows.
|
||||||
|
message GetColumnAliasRenameHistoryResponse {
|
||||||
|
string profile_name = 1;
|
||||||
|
repeated ColumnAliasRenameHistoryEntry entries = 2;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Describes a table with its columns and associated scripts.
|
||||||
|
message TableDetail {
|
||||||
|
string name = 1;
|
||||||
|
int64 id = 2;
|
||||||
|
repeated ColumnDefinition columns = 3;
|
||||||
|
repeated ScriptInfo scripts = 4;
|
||||||
|
}
|
||||||
|
|
||||||
|
// A script that targets a specific column in a table.
|
||||||
|
message ScriptInfo {
|
||||||
|
int64 script_id = 1;
|
||||||
|
string target_column = 2;
|
||||||
|
string target_column_type = 3;
|
||||||
|
string script = 4;
|
||||||
|
string description = 5;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Request to rename one user-visible column alias in a table.
|
||||||
|
message RenameColumnAliasRequest {
|
||||||
|
string profile_name = 1;
|
||||||
|
string table_name = 2;
|
||||||
|
string old_column_name = 3;
|
||||||
|
string new_column_name = 4;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Response after renaming one column alias.
|
||||||
|
message RenameColumnAliasResponse {
|
||||||
|
bool success = 1;
|
||||||
|
string message = 2;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Request to delete one table definition entirely.
|
||||||
message DeleteTableRequest {
|
message DeleteTableRequest {
|
||||||
string profile_name = 1;
|
// Profile (schema) name owning the table (must exist).
|
||||||
string table_name = 2;
|
string profile_name = 1;
|
||||||
|
|
||||||
|
// Table to drop (must exist in the profile).
|
||||||
|
// Executes DROP TABLE "profile"."table" CASCADE and then removes metadata.
|
||||||
|
string table_name = 2;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Response after table deletion.
|
||||||
message DeleteTableResponse {
|
message DeleteTableResponse {
|
||||||
bool success = 1;
|
// True if table and metadata were successfully deleted in one transaction.
|
||||||
string message = 2;
|
bool success = 1;
|
||||||
|
|
||||||
|
// Human-readable summary of what was removed.
|
||||||
|
string message = 2;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,18 +1,139 @@
|
|||||||
|
// common/proto/table_script.proto
|
||||||
syntax = "proto3";
|
syntax = "proto3";
|
||||||
package komp_ac.table_script;
|
package komp_ac.table_script;
|
||||||
|
|
||||||
|
// Manages column-computation scripts for user-defined tables.
|
||||||
|
// Each script belongs to a single table (table_definition_id) and populates
|
||||||
|
// exactly one target column in that table. The server:
|
||||||
|
// - Validates script syntax (non-empty, balanced parentheses, starts with '(')
|
||||||
|
// - Validates the target column (exists, not a system column, allowed type)
|
||||||
|
// - Validates column/type usage inside math expressions
|
||||||
|
// - Validates referenced tables/columns against the schema
|
||||||
|
// - Enforces link constraints for structured access (see notes below)
|
||||||
|
// - Analyzes dependencies and prevents cycles across the schema
|
||||||
|
// - Transforms the script to decimal-safe math (steel_decimal)
|
||||||
|
// - Upserts into table_scripts and records dependencies in script_dependencies
|
||||||
|
// The whole operation is transactional.
|
||||||
service TableScript {
|
service TableScript {
|
||||||
rpc PostTableScript(PostTableScriptRequest) returns (TableScriptResponse);
|
// Create or update a script for a specific table and target column.
|
||||||
|
//
|
||||||
|
// Behavior:
|
||||||
|
// - Fetches the table by table_definition_id (must exist)
|
||||||
|
// - Validates "script" (syntax), "target_column" (exists and type rules),
|
||||||
|
// and all referenced tables/columns (must exist in same schema)
|
||||||
|
// - Validates math operations: prohibits using certain data types in math
|
||||||
|
// - Enforces link constraints for structured table access:
|
||||||
|
// • Allowed always: self-references (same table)
|
||||||
|
// • Structured access via steel_get_column / steel_get_column_with_index
|
||||||
|
// requires an explicit link in table_definition_links
|
||||||
|
// • Raw SQL access via steel_query_sql is permitted (still validated)
|
||||||
|
// - Detects and rejects circular dependencies across all scripts in the schema
|
||||||
|
// (self-references are allowed and not treated as cycles)
|
||||||
|
// - Transforms the script to decimal-safe operations (steel_decimal)
|
||||||
|
// - UPSERTS into table_scripts on (table_definitions_id, target_column)
|
||||||
|
// and saves a normalized dependency list into script_dependencies
|
||||||
|
rpc PostTableScript(PostTableScriptRequest) returns (TableScriptResponse);
|
||||||
|
|
||||||
|
// Fetch all stored scripts for a specific table.
|
||||||
|
//
|
||||||
|
// Behavior:
|
||||||
|
// - Resolves the table from (profile_name, table_name)
|
||||||
|
// - Returns the stored, transformed script from table_scripts
|
||||||
|
// - Includes normalized dependency metadata from script_dependencies
|
||||||
|
// - Returns an empty scripts list when the table has no scripts
|
||||||
|
rpc GetTableScripts(GetTableScriptsRequest) returns (GetTableScriptsResponse);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Request to create or update a script bound to a specific table and column.
|
||||||
message PostTableScriptRequest {
|
message PostTableScriptRequest {
|
||||||
int64 table_definition_id = 1;
|
// Required. The metadata ID from table_definitions.id that identifies the
|
||||||
string target_column = 2;
|
// table this script belongs to. The table must exist; its schema determines
|
||||||
string script = 3;
|
// where referenced tables/columns are validated and where dependencies are stored.
|
||||||
string description = 4;
|
int64 table_definition_id = 1;
|
||||||
|
|
||||||
|
// Required. The target column in the target table that this script computes.
|
||||||
|
// Must be an existing user-defined column in that table (not a system column).
|
||||||
|
// System columns are reserved: "id", "deleted", "created_at".
|
||||||
|
// The column's data type must NOT be one of the prohibited target types:
|
||||||
|
// BIGINT, DATE, TIMESTAMPTZ
|
||||||
|
// Note: BOOLEAN targets are allowed (values are converted to Steel #true/#false).
|
||||||
|
string target_column = 2;
|
||||||
|
|
||||||
|
// Required. The script in the Steel DSL (S-expression style).
|
||||||
|
// Syntax requirements:
|
||||||
|
// - Non-empty, must start with '('
|
||||||
|
// - Balanced parentheses
|
||||||
|
//
|
||||||
|
// Referencing data:
|
||||||
|
// - Structured table/column access (enforces link constraints):
|
||||||
|
// (steel_get_column "table_name" "column_name")
|
||||||
|
// (steel_get_column_with_index "table_name" index "column_name")
|
||||||
|
// • index must be a non-negative integer literal
|
||||||
|
// • self-references are allowed without links
|
||||||
|
// • other tables require an explicit link from the source table
|
||||||
|
// (table_definition_links) or the request fails
|
||||||
|
// - Raw SQL access (no link required, but still validated):
|
||||||
|
// (steel_query_sql "SELECT ...")
|
||||||
|
// • Basic checks disallow operations that imply prohibited types,
|
||||||
|
// e.g., EXTRACT(…), DATE_PART(…), ::DATE, ::TIMESTAMPTZ, ::BIGINT, CAST(…)
|
||||||
|
// - Self variable access in transformed scripts:
|
||||||
|
// (get-var "column_name") is treated as referencing the current table
|
||||||
|
//
|
||||||
|
// Math operations:
|
||||||
|
// - The script is transformed by steel_decimal; supported math forms include:
|
||||||
|
// +, -, *, /, ^, **, pow, sqrt, >, <, =, >=, <=, min, max, abs, round,
|
||||||
|
// ln, log, log10, exp, sin, cos, tan
|
||||||
|
// - Columns of the following types CANNOT be used inside math expressions:
|
||||||
|
// BIGINT, TEXT, BOOLEAN, DATE, TIMESTAMPTZ
|
||||||
|
//
|
||||||
|
// Dependency tracking and cycles:
|
||||||
|
// - Dependencies are extracted from steel_get_column(_with_index), get-var,
|
||||||
|
// and steel_query_sql and stored in script_dependencies with context
|
||||||
|
// - Cycles across tables are rejected (self-dependency is allowed)
|
||||||
|
string script = 3;
|
||||||
|
|
||||||
|
// Optional. Free-text description stored alongside the script (no functional effect).
|
||||||
|
string description = 4;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Response after creating or updating a script.
|
||||||
message TableScriptResponse {
|
message TableScriptResponse {
|
||||||
int64 id = 1;
|
// The ID of the script record in table_scripts (new or existing on upsert).
|
||||||
string warnings = 2;
|
int64 id = 1;
|
||||||
|
|
||||||
|
// Human-readable warnings concatenated into a single string. Possible messages:
|
||||||
|
// - Warning if the script references itself (may affect first population)
|
||||||
|
// - Count of raw SQL queries present
|
||||||
|
// - Info about number of structured linked-table accesses
|
||||||
|
// - Warning if many dependencies may affect performance
|
||||||
|
string warnings = 2;
|
||||||
|
}
|
||||||
|
|
||||||
|
message GetTableScriptsRequest {
|
||||||
|
// Required. Profile (schema) name.
|
||||||
|
string profile_name = 1;
|
||||||
|
|
||||||
|
// Required. Table name within the profile.
|
||||||
|
string table_name = 2;
|
||||||
|
}
|
||||||
|
|
||||||
|
message GetTableScriptsResponse {
|
||||||
|
repeated StoredTableScript scripts = 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
message StoredTableScript {
|
||||||
|
int64 id = 1;
|
||||||
|
string target_column = 2;
|
||||||
|
string target_column_type = 3;
|
||||||
|
string script = 4;
|
||||||
|
string description = 5;
|
||||||
|
repeated ScriptDependency dependencies = 6;
|
||||||
|
}
|
||||||
|
|
||||||
|
message ScriptDependency {
|
||||||
|
string target_table = 1;
|
||||||
|
string dependency_type = 2;
|
||||||
|
string column = 3;
|
||||||
|
int64 index = 4;
|
||||||
|
string query_fragment = 5;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,25 +1,74 @@
|
|||||||
// proto/table_structure.proto
|
// common/proto/table_structure.proto
|
||||||
syntax = "proto3";
|
syntax = "proto3";
|
||||||
package komp_ac.table_structure;
|
package komp_ac.table_structure;
|
||||||
|
|
||||||
import "common.proto";
|
import "common.proto";
|
||||||
|
|
||||||
message GetTableStructureRequest {
|
// Introspects the physical PostgreSQL tables for one or more logical tables
|
||||||
string profile_name = 1; // e.g., "default"
|
// (defined in table_definitions) and returns their column structures.
|
||||||
string table_name = 2; // e.g., "2025_adresar6"
|
// The server validates that:
|
||||||
|
// - The profile (schema) exists in `schemas`
|
||||||
|
// - Every table is defined for that profile in `table_definitions`
|
||||||
|
// It then queries information_schema for the physical tables and returns
|
||||||
|
// normalized column metadata.
|
||||||
|
service TableStructureService {
|
||||||
|
// Return the physical column list (name, normalized data_type,
|
||||||
|
// nullability, primary key flag) for one or more tables in a profile.
|
||||||
|
//
|
||||||
|
// Behavior:
|
||||||
|
// - NOT_FOUND if profile doesn't exist in `schemas`
|
||||||
|
// - NOT_FOUND if any table is not defined for that profile in `table_definitions`
|
||||||
|
// - Queries information_schema.columns ordered by ordinal position
|
||||||
|
// - Normalizes data_type text (details under TableColumn.data_type)
|
||||||
|
// - Returns an error if any validated table has no visible columns in
|
||||||
|
// information_schema (e.g., physical table missing)
|
||||||
|
rpc GetTableStructure(GetTableStructureRequest) returns (GetTableStructureResponse);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Request identifying the profile (schema) and tables to inspect.
|
||||||
|
message GetTableStructureRequest {
|
||||||
|
// Required. Profile (PostgreSQL schema) name. Must exist in `schemas`.
|
||||||
|
string profile_name = 1;
|
||||||
|
|
||||||
|
// Required. Table names within the profile. Each must exist in
|
||||||
|
// `table_definitions` for the given profile. The physical tables are then
|
||||||
|
// introspected via information_schema.
|
||||||
|
repeated string table_names = 2;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Batched response keyed by table name.
|
||||||
|
message GetTableStructureResponse {
|
||||||
|
// Per-table physical column lists keyed by requested table name.
|
||||||
|
map<string, TableStructureResponse> table_structures = 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Response with the ordered list of columns (by ordinal position) for one table.
|
||||||
message TableStructureResponse {
|
message TableStructureResponse {
|
||||||
|
// Columns of the physical table, including system columns (id, deleted,
|
||||||
|
// created_at), user-defined columns, and any foreign-key columns such as
|
||||||
|
// "<linked_table>_id". May be empty if the physical table is missing.
|
||||||
repeated TableColumn columns = 1;
|
repeated TableColumn columns = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// One physical column entry as reported by information_schema.
|
||||||
message TableColumn {
|
message TableColumn {
|
||||||
|
// Column name exactly as defined in PostgreSQL.
|
||||||
string name = 1;
|
string name = 1;
|
||||||
string data_type = 2; // e.g., "TEXT", "BIGINT", "VARCHAR(255)", "TIMESTAMPTZ"
|
|
||||||
|
// Normalized data type string derived from information_schema:
|
||||||
|
// - VARCHAR(n) when udt_name='varchar' with character_maximum_length
|
||||||
|
// - CHAR(n) when udt_name='bpchar' with character_maximum_length
|
||||||
|
// - NUMERIC(p,s) when udt_name='numeric' with precision and scale
|
||||||
|
// - NUMERIC(p) when udt_name='numeric' with precision only
|
||||||
|
// - <TYPE>[] for array types (udt_name starting with '_', e.g., INT[] )
|
||||||
|
// - Otherwise UPPER(udt_name), e.g., TEXT, BIGINT, TIMESTAMPTZ
|
||||||
|
// Examples: "TEXT", "BIGINT", "VARCHAR(255)", "TIMESTAMPTZ", "NUMERIC(14,4)"
|
||||||
|
string data_type = 2;
|
||||||
|
|
||||||
|
// True if information_schema reports the column as nullable.
|
||||||
bool is_nullable = 3;
|
bool is_nullable = 3;
|
||||||
|
|
||||||
|
// True if the column is part of the table's PRIMARY KEY.
|
||||||
|
// Typically true for the "id" column created by the system.
|
||||||
bool is_primary_key = 4;
|
bool is_primary_key = 4;
|
||||||
}
|
}
|
||||||
|
|
||||||
service TableStructureService {
|
|
||||||
rpc GetTableStructure (GetTableStructureRequest) returns (TableStructureResponse);
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -2,31 +2,56 @@
|
|||||||
syntax = "proto3";
|
syntax = "proto3";
|
||||||
package komp_ac.table_validation;
|
package komp_ac.table_validation;
|
||||||
|
|
||||||
|
// This proto is the canonical server-side storage and distribution contract for
|
||||||
|
// client validation configuration.
|
||||||
|
//
|
||||||
|
// Design goals:
|
||||||
|
// - The server stores the entire field validation definition in one structured payload.
|
||||||
|
// - Clients fetch the validation rules for a table in one batch and map them to
|
||||||
|
// their local validation/runtime system (for example canvas).
|
||||||
|
// - Common validation must be represented as typed data, not as string mini-languages.
|
||||||
|
//
|
||||||
|
// Important split:
|
||||||
|
// - limits / pattern / allowed_values / required are validation rules.
|
||||||
|
// - mask is presentation and input-shaping metadata for clients.
|
||||||
|
|
||||||
// Request validation rules for a table
|
// Request validation rules for a table
|
||||||
message GetTableValidationRequest {
|
message GetTableValidationRequest {
|
||||||
string profileName = 1;
|
string profileName = 1;
|
||||||
string tableName = 2;
|
string tableName = 2;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Response with field-level validations; if a field is omitted,
|
// Response with field-level validations for the whole table.
|
||||||
// no validation is applied (default unspecified).
|
// If a field is omitted, no validation configuration exists for that field.
|
||||||
message TableValidationResponse {
|
message TableValidationResponse {
|
||||||
repeated FieldValidation fields = 1;
|
repeated FieldValidation fields = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Field-level validation (extensible for future kinds)
|
// Field-level validation definition stored on the server and distributed to clients.
|
||||||
message FieldValidation {
|
message FieldValidation {
|
||||||
// MUST match your frontend FormState.dataKey for the column
|
// MUST match your frontend FormState.dataKey for the column
|
||||||
string dataKey = 1;
|
string dataKey = 1;
|
||||||
|
|
||||||
// Current: only CharacterLimits. More rules can be added later.
|
// Validation 1: length and counting rules.
|
||||||
CharacterLimits limits = 10;
|
CharacterLimits limits = 10;
|
||||||
// Future expansion:
|
|
||||||
// PatternRules pattern = 11;
|
// Validation 2: position-based character constraints.
|
||||||
|
PatternRules pattern = 11;
|
||||||
|
|
||||||
|
// Exact-value whitelist.
|
||||||
|
AllowedValues allowed_values = 12;
|
||||||
|
|
||||||
|
// Client-side hint that this field participates in external/asynchronous validation UI.
|
||||||
|
bool external_validation_enabled = 13;
|
||||||
|
|
||||||
|
// Client-side display mask metadata. The server stores raw data without mask literals.
|
||||||
DisplayMask mask = 3;
|
DisplayMask mask = 3;
|
||||||
// ExternalValidation external = 13;
|
|
||||||
// CustomFormatter formatter = 14;
|
// Field must be provided / treated as required by clients and server enforcement layers.
|
||||||
bool required = 4;
|
bool required = 4;
|
||||||
|
|
||||||
|
// Once locked, this field's validation config cannot be changed.
|
||||||
|
bool locked = 15;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Character length counting mode
|
// Character length counting mode
|
||||||
@@ -37,7 +62,8 @@ enum CountMode {
|
|||||||
DISPLAY_WIDTH = 3;
|
DISPLAY_WIDTH = 3;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Character limit validation (Validation 1)
|
// Character limit validation (Validation 1).
|
||||||
|
// These rules map directly to canvas CharacterLimits.
|
||||||
message CharacterLimits {
|
message CharacterLimits {
|
||||||
// When zero, the field is considered "not set". If both min/max are zero,
|
// When zero, the field is considered "not set". If both min/max are zero,
|
||||||
// the server should avoid sending this FieldValidation (no validation).
|
// the server should avoid sending this FieldValidation (no validation).
|
||||||
@@ -50,20 +76,108 @@ message CharacterLimits {
|
|||||||
CountMode countMode = 4; // defaults to CHARS if unspecified
|
CountMode countMode = 4; // defaults to CHARS if unspecified
|
||||||
}
|
}
|
||||||
|
|
||||||
// Mask for pretty display
|
// Mask for pretty display only.
|
||||||
|
//
|
||||||
|
// This is not a validation rule by itself. It exists so clients can render and
|
||||||
|
// navigate masked input while still storing raw values server-side.
|
||||||
message DisplayMask {
|
message DisplayMask {
|
||||||
string pattern = 1; // e.g., "(###) ###-####" or "####-##-##"
|
string pattern = 1; // e.g., "(###) ###-####" or "####-##-##"
|
||||||
string input_char = 2; // e.g., "#"
|
string input_char = 2; // e.g., "#"
|
||||||
optional string template_char = 3; // e.g., "_"
|
optional string template_char = 3; // e.g., "_"
|
||||||
}
|
}
|
||||||
|
|
||||||
// Service to fetch validations for a table
|
// Which positions a pattern rule applies to.
|
||||||
service TableValidationService {
|
// This exists instead of a string syntax like "0-3" so the server can validate
|
||||||
rpc GetTableValidation(GetTableValidationRequest)
|
// the structure directly and clients do not need to parse a DSL.
|
||||||
returns (TableValidationResponse);
|
message PatternPosition {
|
||||||
|
PatternPositionKind kind = 1;
|
||||||
|
uint32 single = 2;
|
||||||
|
uint32 start = 3;
|
||||||
|
uint32 end = 4;
|
||||||
|
repeated uint32 positions = 5;
|
||||||
|
}
|
||||||
|
|
||||||
rpc UpdateFieldValidation(UpdateFieldValidationRequest)
|
enum PatternPositionKind {
|
||||||
returns (UpdateFieldValidationResponse);
|
PATTERN_POSITION_KIND_UNSPECIFIED = 0;
|
||||||
|
PATTERN_POSITION_SINGLE = 1;
|
||||||
|
PATTERN_POSITION_RANGE = 2;
|
||||||
|
PATTERN_POSITION_FROM = 3;
|
||||||
|
PATTERN_POSITION_MULTIPLE = 4;
|
||||||
|
}
|
||||||
|
|
||||||
|
// What type of character constraint a pattern rule applies.
|
||||||
|
// This mirrors the typed character filters used by canvas.
|
||||||
|
message CharacterConstraint {
|
||||||
|
CharacterConstraintKind kind = 1;
|
||||||
|
|
||||||
|
// Used when kind == CHARACTER_CONSTRAINT_EXACT.
|
||||||
|
optional string exact = 2;
|
||||||
|
|
||||||
|
// Used when kind == CHARACTER_CONSTRAINT_ONE_OF.
|
||||||
|
repeated string one_of = 3;
|
||||||
|
|
||||||
|
// Used when kind == CHARACTER_CONSTRAINT_REGEX.
|
||||||
|
optional string regex = 4;
|
||||||
|
}
|
||||||
|
|
||||||
|
enum CharacterConstraintKind {
|
||||||
|
CHARACTER_CONSTRAINT_KIND_UNSPECIFIED = 0;
|
||||||
|
CHARACTER_CONSTRAINT_ALPHABETIC = 1;
|
||||||
|
CHARACTER_CONSTRAINT_NUMERIC = 2;
|
||||||
|
CHARACTER_CONSTRAINT_ALPHANUMERIC = 3;
|
||||||
|
CHARACTER_CONSTRAINT_EXACT = 4;
|
||||||
|
CHARACTER_CONSTRAINT_ONE_OF = 5;
|
||||||
|
CHARACTER_CONSTRAINT_REGEX = 6;
|
||||||
|
}
|
||||||
|
|
||||||
|
// One position-based validation rule, similar to canvas PositionFilter.
|
||||||
|
message PatternRule {
|
||||||
|
PatternPosition position = 1;
|
||||||
|
CharacterConstraint constraint = 2;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Exact-value whitelist configuration.
|
||||||
|
// This maps to canvas AllowedValues semantics.
|
||||||
|
message AllowedValues {
|
||||||
|
repeated string values = 1;
|
||||||
|
bool allow_empty = 2;
|
||||||
|
bool case_insensitive = 3;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Collection of pattern rules for one field.
|
||||||
|
message PatternRules {
|
||||||
|
// All rules that make up the validation logic
|
||||||
|
repeated PatternRule rules = 1;
|
||||||
|
|
||||||
|
// Optional human‑readable description for UI/debug purposes
|
||||||
|
optional string description = 2;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Service for storing and fetching field-validation definitions.
|
||||||
|
service TableValidationService {
|
||||||
|
rpc GetTableValidation(GetTableValidationRequest) returns (TableValidationResponse);
|
||||||
|
|
||||||
|
// Upsert a single field validation definition.
|
||||||
|
rpc UpdateFieldValidation(UpdateFieldValidationRequest) returns (UpdateFieldValidationResponse);
|
||||||
|
|
||||||
|
// Replace the full validation definition set for a table in one transaction.
|
||||||
|
rpc ReplaceTableValidation(ReplaceTableValidationRequest) returns (ReplaceTableValidationResponse);
|
||||||
|
|
||||||
|
// Reusable named rule fragments.
|
||||||
|
rpc UpsertValidationRule(UpsertValidationRuleRequest) returns (UpsertValidationRuleResponse);
|
||||||
|
rpc ListValidationRules(ListValidationRulesRequest) returns (ListValidationRulesResponse);
|
||||||
|
rpc DeleteValidationRule(DeleteValidationRuleRequest) returns (DeleteValidationRuleResponse);
|
||||||
|
|
||||||
|
// Reusable named sets composed from rules.
|
||||||
|
rpc UpsertValidationSet(UpsertValidationSetRequest) returns (UpsertValidationSetResponse);
|
||||||
|
rpc ListValidationSets(ListValidationSetsRequest) returns (ListValidationSetsResponse);
|
||||||
|
rpc DeleteValidationSet(DeleteValidationSetRequest) returns (DeleteValidationSetResponse);
|
||||||
|
|
||||||
|
// Snapshot a reusable set onto a concrete table field.
|
||||||
|
rpc ApplyValidationSet(ApplyValidationSetRequest) returns (ApplyValidationSetResponse);
|
||||||
|
|
||||||
|
// Permanently lock one field's validation config.
|
||||||
|
rpc LockFieldValidation(LockFieldValidationRequest) returns (LockFieldValidationResponse);
|
||||||
}
|
}
|
||||||
|
|
||||||
message UpdateFieldValidationRequest {
|
message UpdateFieldValidationRequest {
|
||||||
@@ -77,3 +191,130 @@ message UpdateFieldValidationResponse {
|
|||||||
bool success = 1;
|
bool success = 1;
|
||||||
string message = 2;
|
string message = 2;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
message ReplaceTableValidationRequest {
|
||||||
|
string profileName = 1;
|
||||||
|
string tableName = 2;
|
||||||
|
|
||||||
|
// Full replacement set. Fields omitted here are removed from the stored config.
|
||||||
|
repeated FieldValidation fields = 3;
|
||||||
|
}
|
||||||
|
|
||||||
|
message ReplaceTableValidationResponse {
|
||||||
|
bool success = 1;
|
||||||
|
string message = 2;
|
||||||
|
}
|
||||||
|
|
||||||
|
message ValidationRuleDefinition {
|
||||||
|
optional int64 id = 4;
|
||||||
|
string name = 1;
|
||||||
|
optional string description = 2;
|
||||||
|
|
||||||
|
// Reusable rule fragment. dataKey is ignored by the server for reusable rules.
|
||||||
|
FieldValidation validation = 3;
|
||||||
|
}
|
||||||
|
|
||||||
|
message ValidationSetRuleItem {
|
||||||
|
int32 position = 1;
|
||||||
|
optional string name = 2;
|
||||||
|
optional string description = 3;
|
||||||
|
|
||||||
|
oneof source {
|
||||||
|
string global_rule_name = 10;
|
||||||
|
FieldValidation inline_validation = 11;
|
||||||
|
int64 global_rule_id = 12;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
message ValidationSetDefinition {
|
||||||
|
reserved 3;
|
||||||
|
|
||||||
|
string name = 1;
|
||||||
|
optional string description = 2;
|
||||||
|
|
||||||
|
// Ordered set items.
|
||||||
|
repeated ValidationSetRuleItem ruleItems = 5;
|
||||||
|
|
||||||
|
// Server-resolved snapshot of all set items in order.
|
||||||
|
FieldValidation resolvedValidation = 4;
|
||||||
|
}
|
||||||
|
|
||||||
|
message UpsertValidationRuleRequest {
|
||||||
|
string profileName = 1;
|
||||||
|
ValidationRuleDefinition rule = 2;
|
||||||
|
}
|
||||||
|
|
||||||
|
message UpsertValidationRuleResponse {
|
||||||
|
bool success = 1;
|
||||||
|
string message = 2;
|
||||||
|
}
|
||||||
|
|
||||||
|
message ListValidationRulesRequest {
|
||||||
|
string profileName = 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
message ListValidationRulesResponse {
|
||||||
|
repeated ValidationRuleDefinition rules = 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
message DeleteValidationRuleRequest {
|
||||||
|
string profileName = 1;
|
||||||
|
string name = 2;
|
||||||
|
}
|
||||||
|
|
||||||
|
message DeleteValidationRuleResponse {
|
||||||
|
bool success = 1;
|
||||||
|
string message = 2;
|
||||||
|
}
|
||||||
|
|
||||||
|
message UpsertValidationSetRequest {
|
||||||
|
string profileName = 1;
|
||||||
|
ValidationSetDefinition set = 2;
|
||||||
|
}
|
||||||
|
|
||||||
|
message UpsertValidationSetResponse {
|
||||||
|
bool success = 1;
|
||||||
|
string message = 2;
|
||||||
|
}
|
||||||
|
|
||||||
|
message ListValidationSetsRequest {
|
||||||
|
string profileName = 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
message ListValidationSetsResponse {
|
||||||
|
repeated ValidationSetDefinition sets = 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
message DeleteValidationSetRequest {
|
||||||
|
string profileName = 1;
|
||||||
|
string name = 2;
|
||||||
|
}
|
||||||
|
|
||||||
|
message DeleteValidationSetResponse {
|
||||||
|
bool success = 1;
|
||||||
|
string message = 2;
|
||||||
|
}
|
||||||
|
|
||||||
|
message ApplyValidationSetRequest {
|
||||||
|
string profileName = 1;
|
||||||
|
string tableName = 2;
|
||||||
|
string dataKey = 3;
|
||||||
|
string setName = 4;
|
||||||
|
}
|
||||||
|
|
||||||
|
message ApplyValidationSetResponse {
|
||||||
|
bool success = 1;
|
||||||
|
string message = 2;
|
||||||
|
FieldValidation validation = 3;
|
||||||
|
}
|
||||||
|
|
||||||
|
message LockFieldValidationRequest {
|
||||||
|
string profileName = 1;
|
||||||
|
string tableName = 2;
|
||||||
|
string dataKey = 3;
|
||||||
|
}
|
||||||
|
|
||||||
|
message LockFieldValidationResponse {
|
||||||
|
bool success = 1;
|
||||||
|
string message = 2;
|
||||||
|
}
|
||||||
|
|||||||
@@ -5,67 +5,261 @@ package komp_ac.tables_data;
|
|||||||
import "common.proto";
|
import "common.proto";
|
||||||
import "google/protobuf/struct.proto";
|
import "google/protobuf/struct.proto";
|
||||||
|
|
||||||
|
// Read and write row data for user-defined tables inside profiles (schemas).
|
||||||
|
// Operations are performed against the physical PostgreSQL table that
|
||||||
|
// corresponds to the logical table definition and are scoped by profile
|
||||||
|
// (schema). Deletions are soft (set deleted = true). Typed binding and
|
||||||
|
// script-based validation are enforced consistently.
|
||||||
service TablesData {
|
service TablesData {
|
||||||
rpc PostTableData (PostTableDataRequest) returns (PostTableDataResponse);
|
// Insert a new row into a table with strict type binding and script validation.
|
||||||
rpc PutTableData (PutTableDataRequest) returns (PutTableDataResponse);
|
//
|
||||||
rpc DeleteTableData (DeleteTableDataRequest) returns (DeleteTableDataResponse);
|
// Behavior:
|
||||||
|
// - Validates that profile (schema) exists and table is defined for it
|
||||||
|
// - Validates provided columns exist (user-defined or allowed system/FK columns)
|
||||||
|
// - For columns targeted by scripts in this table, the client MUST provide the
|
||||||
|
// value, and it MUST equal the script’s calculated value (compared type-safely)
|
||||||
|
// - Binds values with correct SQL types, rejects invalid formats/ranges
|
||||||
|
// - Inserts the row and returns the new id; queues search indexing (best effort)
|
||||||
|
// - If the physical table is missing but the definition exists, returns INTERNAL
|
||||||
|
rpc PostTableData(PostTableDataRequest) returns (PostTableDataResponse);
|
||||||
|
|
||||||
|
// Insert multiple rows by applying PostTableData behavior to each row.
|
||||||
|
//
|
||||||
|
// Behavior:
|
||||||
|
// - Accepts 1..10,000 rows in one gRPC request
|
||||||
|
// - Processes rows in request order
|
||||||
|
// - Each row is inserted through the same validation, script execution,
|
||||||
|
// typed binding, database insert, and indexing path as PostTableData
|
||||||
|
// - Stops at the first failing row and returns that row's gRPC error code
|
||||||
|
// with row index context; rows inserted before the failure remain inserted
|
||||||
|
rpc PostTableDataBulk(PostTableDataBulkRequest) returns (PostTableDataBulkResponse);
|
||||||
|
|
||||||
|
// Update existing row data with strict type binding and script validation.
|
||||||
|
//
|
||||||
|
// Behavior:
|
||||||
|
// - Validates profile and table, and that the record exists
|
||||||
|
// - If request data is empty, returns success without changing the row
|
||||||
|
// - For columns targeted by scripts:
|
||||||
|
// • If included in update, provided value must equal the script result
|
||||||
|
// • If not included, update must not cause the script result to differ
|
||||||
|
// from the current stored value; otherwise FAILED_PRECONDITION is returned
|
||||||
|
// - Binds values with correct SQL types; rejects invalid formats/ranges
|
||||||
|
// - Updates the row and returns the id; queues search indexing (best effort)
|
||||||
|
rpc PutTableData(PutTableDataRequest) returns (PutTableDataResponse);
|
||||||
|
|
||||||
|
// Soft-delete a single record (sets deleted = true) if it exists and is not already deleted.
|
||||||
|
//
|
||||||
|
// Behavior:
|
||||||
|
// - Validates profile and table definition
|
||||||
|
// - Updates only rows with deleted = false
|
||||||
|
// - success = true means a row was actually changed; false means nothing to delete
|
||||||
|
// - If the physical table is missing but the definition exists, returns INTERNAL
|
||||||
|
rpc DeleteTableData(DeleteTableDataRequest) returns (DeleteTableDataResponse);
|
||||||
|
|
||||||
|
// Fetch a single non-deleted row by id as textified values.
|
||||||
|
//
|
||||||
|
// Behavior:
|
||||||
|
// - Validates profile and table definition
|
||||||
|
// - Returns all columns as strings (COALESCE(col::TEXT, '') AS col)
|
||||||
|
// including: id, deleted, all user-defined columns, and FK columns
|
||||||
|
// named "<linked_table>_id" for each table link
|
||||||
|
// - Fails with NOT_FOUND if record does not exist or is soft-deleted
|
||||||
|
// - If the physical table is missing but the definition exists, returns INTERNAL
|
||||||
rpc GetTableData(GetTableDataRequest) returns (GetTableDataResponse);
|
rpc GetTableData(GetTableDataRequest) returns (GetTableDataResponse);
|
||||||
|
|
||||||
|
// Count non-deleted rows in a table.
|
||||||
|
//
|
||||||
|
// Behavior:
|
||||||
|
// - Validates profile and table definition
|
||||||
|
// - Returns komp_ac.common.CountResponse.count with rows where deleted = FALSE
|
||||||
|
// - If the physical table is missing but the definition exists, returns INTERNAL
|
||||||
rpc GetTableDataCount(GetTableDataCountRequest) returns (komp_ac.common.CountResponse);
|
rpc GetTableDataCount(GetTableDataCountRequest) returns (komp_ac.common.CountResponse);
|
||||||
|
|
||||||
|
// Fetch the N-th non-deleted row by id order (1-based), then return its full data.
|
||||||
|
//
|
||||||
|
// Behavior:
|
||||||
|
// - position is 1-based (position = 1 → first row by id ASC with deleted = FALSE)
|
||||||
|
// - Returns NOT_FOUND if position is out of bounds
|
||||||
|
// - Otherwise identical to GetTableData for the selected id
|
||||||
rpc GetTableDataByPosition(GetTableDataByPositionRequest) returns (GetTableDataResponse);
|
rpc GetTableDataByPosition(GetTableDataByPositionRequest) returns (GetTableDataResponse);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Insert a new row.
|
||||||
message PostTableDataRequest {
|
message PostTableDataRequest {
|
||||||
|
// Required. Profile (PostgreSQL schema) name that owns the table.
|
||||||
|
// Must exist in the schemas table.
|
||||||
string profile_name = 1;
|
string profile_name = 1;
|
||||||
|
|
||||||
|
// Required. Logical table (definition) name within the profile.
|
||||||
|
// Must exist in table_definitions for the given profile.
|
||||||
string table_name = 2;
|
string table_name = 2;
|
||||||
|
|
||||||
|
// Required. Key-value data for columns to insert.
|
||||||
|
//
|
||||||
|
// Allowed keys:
|
||||||
|
// - User-defined columns from the table definition
|
||||||
|
// - System/FK columns:
|
||||||
|
// • "deleted" (BOOLEAN), optional; default FALSE if not provided
|
||||||
|
// • "<linked_table>_id" (BIGINT) for each table link
|
||||||
|
//
|
||||||
|
// Type expectations by SQL type:
|
||||||
|
// - TEXT: string value; empty string is treated as NULL
|
||||||
|
// - BOOLEAN: bool value
|
||||||
|
// - TIMESTAMPTZ: ISO 8601/RFC 3339 string (parsed to TIMESTAMPTZ)
|
||||||
|
// - INTEGER: number with no fractional part and within i32 range
|
||||||
|
// - BIGINT: number with no fractional part and within i64 range
|
||||||
|
// - NUMERIC(p,s): string representation only; empty string becomes NULL
|
||||||
|
// (numbers for NUMERIC are rejected to avoid precision loss)
|
||||||
|
//
|
||||||
|
// Script validation rules:
|
||||||
|
// - If a script exists for a target column, that column MUST be present here,
|
||||||
|
// and its provided value MUST equal the script’s computed value (type-aware
|
||||||
|
// comparison, e.g., decimals are compared numerically).
|
||||||
|
//
|
||||||
|
// Notes:
|
||||||
|
// - Unknown/invalid column names are rejected
|
||||||
|
// - Some application-specific validations may apply (e.g., max length for
|
||||||
|
// certain fields like "telefon")
|
||||||
map<string, google.protobuf.Value> data = 3;
|
map<string, google.protobuf.Value> data = 3;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Insert response.
|
||||||
message PostTableDataResponse {
|
message PostTableDataResponse {
|
||||||
|
// True if the insert succeeded.
|
||||||
bool success = 1;
|
bool success = 1;
|
||||||
|
|
||||||
|
// Human-readable message.
|
||||||
string message = 2;
|
string message = 2;
|
||||||
|
|
||||||
|
// The id of the inserted row.
|
||||||
int64 inserted_id = 3;
|
int64 inserted_id = 3;
|
||||||
}
|
}
|
||||||
|
|
||||||
message PutTableDataRequest {
|
// One row in a bulk insert request.
|
||||||
|
message PostTableDataBulkRow {
|
||||||
|
// Required. Same data payload as PostTableDataRequest.data.
|
||||||
|
map<string, google.protobuf.Value> data = 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Bulk insert request.
|
||||||
|
message PostTableDataBulkRequest {
|
||||||
|
// Required. Profile (PostgreSQL schema) name that owns the table.
|
||||||
string profile_name = 1;
|
string profile_name = 1;
|
||||||
|
|
||||||
|
// Required. Logical table (definition) name within the profile.
|
||||||
string table_name = 2;
|
string table_name = 2;
|
||||||
|
|
||||||
|
// Required. Rows to insert. Must contain at least 1 and at most 10,000 rows.
|
||||||
|
repeated PostTableDataBulkRow rows = 3;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Bulk insert response.
|
||||||
|
message PostTableDataBulkResponse {
|
||||||
|
// True if all rows were inserted successfully.
|
||||||
|
bool success = 1;
|
||||||
|
|
||||||
|
// Human-readable message.
|
||||||
|
string message = 2;
|
||||||
|
|
||||||
|
// Per-row responses from the underlying PostTableData logic, in request order.
|
||||||
|
repeated PostTableDataResponse responses = 3;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Update an existing row.
|
||||||
|
message PutTableDataRequest {
|
||||||
|
// Required. Profile (schema) name.
|
||||||
|
string profile_name = 1;
|
||||||
|
|
||||||
|
// Required. Table name within the profile.
|
||||||
|
string table_name = 2;
|
||||||
|
|
||||||
|
// Required. Id of the row to update.
|
||||||
int64 id = 3;
|
int64 id = 3;
|
||||||
|
|
||||||
|
// Required. Columns to update (same typing rules as PostTableDataRequest.data).
|
||||||
|
//
|
||||||
|
// Special script rules:
|
||||||
|
// - If a script targets column X and X is included here, the value for X must
|
||||||
|
// equal the script’s result (type-aware).
|
||||||
|
// - If X is not included here but the update would cause the script’s result
|
||||||
|
// to change compared to the current stored value, the update is rejected with
|
||||||
|
// FAILED_PRECONDITION, instructing the caller to include X explicitly.
|
||||||
|
//
|
||||||
|
// Passing an empty map results in a no-op success response.
|
||||||
map<string, google.protobuf.Value> data = 4;
|
map<string, google.protobuf.Value> data = 4;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Update response.
|
||||||
message PutTableDataResponse {
|
message PutTableDataResponse {
|
||||||
|
// True if the update succeeded (or no-op on empty data).
|
||||||
bool success = 1;
|
bool success = 1;
|
||||||
|
|
||||||
|
// Human-readable message.
|
||||||
string message = 2;
|
string message = 2;
|
||||||
|
|
||||||
|
// The id of the updated row.
|
||||||
int64 updated_id = 3;
|
int64 updated_id = 3;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Soft-delete a single row.
|
||||||
message DeleteTableDataRequest {
|
message DeleteTableDataRequest {
|
||||||
|
// Required. Profile (schema) name.
|
||||||
string profile_name = 1;
|
string profile_name = 1;
|
||||||
|
|
||||||
|
// Required. Table name within the profile.
|
||||||
string table_name = 2;
|
string table_name = 2;
|
||||||
|
|
||||||
|
// Required. Row id to soft-delete.
|
||||||
int64 record_id = 3;
|
int64 record_id = 3;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Soft-delete response.
|
||||||
message DeleteTableDataResponse {
|
message DeleteTableDataResponse {
|
||||||
|
// True if a row was marked deleted (id existed and was not already deleted).
|
||||||
bool success = 1;
|
bool success = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Fetch a single non-deleted row by id.
|
||||||
message GetTableDataRequest {
|
message GetTableDataRequest {
|
||||||
|
// Required. Profile (schema) name.
|
||||||
string profile_name = 1;
|
string profile_name = 1;
|
||||||
|
|
||||||
|
// Required. Table name within the profile.
|
||||||
string table_name = 2;
|
string table_name = 2;
|
||||||
|
|
||||||
|
// Required. Id of the row to fetch.
|
||||||
int64 id = 3;
|
int64 id = 3;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Row payload: all columns returned as strings.
|
||||||
message GetTableDataResponse {
|
message GetTableDataResponse {
|
||||||
|
// Map of column_name → stringified value for:
|
||||||
|
// - id, deleted
|
||||||
|
// - all user-defined columns from the table definition
|
||||||
|
// - FK columns named "<linked_table>_id" for each table link
|
||||||
|
//
|
||||||
|
// All values are returned as TEXT via col::TEXT and COALESCEed to empty string
|
||||||
|
// (NULL becomes ""). The row is returned only if deleted = FALSE.
|
||||||
map<string, string> data = 1;
|
map<string, string> data = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Count non-deleted rows.
|
||||||
message GetTableDataCountRequest {
|
message GetTableDataCountRequest {
|
||||||
string profile_name = 1;
|
// Required. Profile (schema) name.
|
||||||
string table_name = 2;
|
string profile_name = 1;
|
||||||
|
|
||||||
|
// Required. Table name within the profile.
|
||||||
|
string table_name = 2;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Fetch by ordinal position among non-deleted rows (1-based).
|
||||||
message GetTableDataByPositionRequest {
|
message GetTableDataByPositionRequest {
|
||||||
|
// Required. Profile (schema) name.
|
||||||
string profile_name = 1;
|
string profile_name = 1;
|
||||||
|
|
||||||
|
// Required. Table name within the profile.
|
||||||
string table_name = 2;
|
string table_name = 2;
|
||||||
|
|
||||||
|
// Required. 1-based position by id ascending among rows with deleted = FALSE.
|
||||||
int32 position = 3;
|
int32 position = 3;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,57 +5,57 @@ package komp_ac.uctovnictvo;
|
|||||||
import "common.proto";
|
import "common.proto";
|
||||||
|
|
||||||
service Uctovnictvo {
|
service Uctovnictvo {
|
||||||
rpc PostUctovnictvo (PostUctovnictvoRequest) returns (UctovnictvoResponse);
|
rpc PostUctovnictvo(PostUctovnictvoRequest) returns (UctovnictvoResponse);
|
||||||
rpc GetUctovnictvo (GetUctovnictvoRequest) returns (UctovnictvoResponse);
|
rpc GetUctovnictvo(GetUctovnictvoRequest) returns (UctovnictvoResponse);
|
||||||
rpc GetUctovnictvoCount (common.Empty) returns (common.CountResponse);
|
rpc GetUctovnictvoCount(common.Empty) returns (common.CountResponse);
|
||||||
rpc GetUctovnictvoByPosition (common.PositionRequest) returns (UctovnictvoResponse);
|
rpc GetUctovnictvoByPosition(common.PositionRequest) returns (UctovnictvoResponse);
|
||||||
rpc PutUctovnictvo (PutUctovnictvoRequest) returns (UctovnictvoResponse);
|
rpc PutUctovnictvo(PutUctovnictvoRequest) returns (UctovnictvoResponse);
|
||||||
}
|
}
|
||||||
|
|
||||||
message PostUctovnictvoRequest {
|
message PostUctovnictvoRequest {
|
||||||
int64 adresar_id = 1;
|
int64 adresar_id = 1;
|
||||||
string c_dokladu = 2;
|
string c_dokladu = 2;
|
||||||
string datum = 3; // Use string for simplicity, or use google.protobuf.Timestamp for better date handling
|
string datum = 3; // Use string for simplicity, or use google.protobuf.Timestamp for better date handling
|
||||||
string c_faktury = 4;
|
string c_faktury = 4;
|
||||||
string obsah = 5;
|
string obsah = 5;
|
||||||
string stredisko = 6;
|
string stredisko = 6;
|
||||||
string c_uctu = 7;
|
string c_uctu = 7;
|
||||||
string md = 8;
|
string md = 8;
|
||||||
string identif = 9;
|
string identif = 9;
|
||||||
string poznanka = 10;
|
string poznanka = 10;
|
||||||
string firma = 11;
|
string firma = 11;
|
||||||
}
|
}
|
||||||
|
|
||||||
message UctovnictvoResponse {
|
message UctovnictvoResponse {
|
||||||
int64 id = 1;
|
int64 id = 1;
|
||||||
int64 adresar_id = 2;
|
int64 adresar_id = 2;
|
||||||
string c_dokladu = 3;
|
string c_dokladu = 3;
|
||||||
string datum = 4;
|
string datum = 4;
|
||||||
string c_faktury = 5;
|
string c_faktury = 5;
|
||||||
string obsah = 6;
|
string obsah = 6;
|
||||||
string stredisko = 7;
|
string stredisko = 7;
|
||||||
string c_uctu = 8;
|
string c_uctu = 8;
|
||||||
string md = 9;
|
string md = 9;
|
||||||
string identif = 10;
|
string identif = 10;
|
||||||
string poznanka = 11;
|
string poznanka = 11;
|
||||||
string firma = 12;
|
string firma = 12;
|
||||||
}
|
}
|
||||||
|
|
||||||
message PutUctovnictvoRequest {
|
message PutUctovnictvoRequest {
|
||||||
int64 id = 1;
|
int64 id = 1;
|
||||||
int64 adresar_id = 2;
|
int64 adresar_id = 2;
|
||||||
string c_dokladu = 3;
|
string c_dokladu = 3;
|
||||||
string datum = 4;
|
string datum = 4;
|
||||||
string c_faktury = 5;
|
string c_faktury = 5;
|
||||||
string obsah = 6;
|
string obsah = 6;
|
||||||
string stredisko = 7;
|
string stredisko = 7;
|
||||||
string c_uctu = 8;
|
string c_uctu = 8;
|
||||||
string md = 9;
|
string md = 9;
|
||||||
string identif = 10;
|
string identif = 10;
|
||||||
string poznanka = 11;
|
string poznanka = 11;
|
||||||
string firma = 12;
|
string firma = 12;
|
||||||
}
|
}
|
||||||
|
|
||||||
message GetUctovnictvoRequest {
|
message GetUctovnictvoRequest {
|
||||||
int64 id = 1;
|
int64 id = 1;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -37,7 +37,6 @@ pub mod proto {
|
|||||||
pub mod table_validation {
|
pub mod table_validation {
|
||||||
include!("proto/komp_ac.table_validation.rs");
|
include!("proto/komp_ac.table_validation.rs");
|
||||||
}
|
}
|
||||||
pub const FILE_DESCRIPTOR_SET: &[u8] =
|
pub const FILE_DESCRIPTOR_SET: &[u8] = include_bytes!("proto/descriptor.bin");
|
||||||
include_bytes!("proto/descriptor.bin");
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Binary file not shown.
@@ -1,10 +1,25 @@
|
|||||||
// This file is @generated by prost-build.
|
// This file is @generated by prost-build.
|
||||||
#[derive(Clone, PartialEq, ::prost::Message)]
|
#[derive(Clone, PartialEq, ::prost::Message)]
|
||||||
|
pub struct ColumnConstraint {
|
||||||
|
#[prost(string, tag = "1")]
|
||||||
|
pub column: ::prost::alloc::string::String,
|
||||||
|
#[prost(string, tag = "2")]
|
||||||
|
pub query: ::prost::alloc::string::String,
|
||||||
|
#[prost(enumeration = "MatchMode", tag = "3")]
|
||||||
|
pub mode: i32,
|
||||||
|
}
|
||||||
|
#[derive(Clone, PartialEq, ::prost::Message)]
|
||||||
pub struct SearchRequest {
|
pub struct SearchRequest {
|
||||||
#[prost(string, tag = "1")]
|
#[prost(string, tag = "1")]
|
||||||
pub table_name: ::prost::alloc::string::String,
|
pub profile_name: ::prost::alloc::string::String,
|
||||||
#[prost(string, tag = "2")]
|
#[prost(string, optional, tag = "2")]
|
||||||
pub query: ::prost::alloc::string::String,
|
pub table_name: ::core::option::Option<::prost::alloc::string::String>,
|
||||||
|
#[prost(string, tag = "3")]
|
||||||
|
pub free_query: ::prost::alloc::string::String,
|
||||||
|
#[prost(message, repeated, tag = "4")]
|
||||||
|
pub must: ::prost::alloc::vec::Vec<ColumnConstraint>,
|
||||||
|
#[prost(uint32, optional, tag = "5")]
|
||||||
|
pub limit: ::core::option::Option<u32>,
|
||||||
}
|
}
|
||||||
#[derive(Clone, PartialEq, ::prost::Message)]
|
#[derive(Clone, PartialEq, ::prost::Message)]
|
||||||
pub struct SearchResponse {
|
pub struct SearchResponse {
|
||||||
@@ -22,6 +37,37 @@ pub mod search_response {
|
|||||||
pub score: f32,
|
pub score: f32,
|
||||||
#[prost(string, tag = "3")]
|
#[prost(string, tag = "3")]
|
||||||
pub content_json: ::prost::alloc::string::String,
|
pub content_json: ::prost::alloc::string::String,
|
||||||
|
#[prost(string, tag = "4")]
|
||||||
|
pub table_name: ::prost::alloc::string::String,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)]
|
||||||
|
#[repr(i32)]
|
||||||
|
pub enum MatchMode {
|
||||||
|
Unspecified = 0,
|
||||||
|
Fuzzy = 1,
|
||||||
|
Exact = 2,
|
||||||
|
}
|
||||||
|
impl MatchMode {
|
||||||
|
/// String value of the enum field names used in the ProtoBuf definition.
|
||||||
|
///
|
||||||
|
/// The values are not transformed in any way and thus are considered stable
|
||||||
|
/// (if the ProtoBuf definition does not change) and safe for programmatic use.
|
||||||
|
pub fn as_str_name(&self) -> &'static str {
|
||||||
|
match self {
|
||||||
|
Self::Unspecified => "MATCH_MODE_UNSPECIFIED",
|
||||||
|
Self::Fuzzy => "MATCH_MODE_FUZZY",
|
||||||
|
Self::Exact => "MATCH_MODE_EXACT",
|
||||||
|
}
|
||||||
|
}
|
||||||
|
/// Creates an enum from field names used in the ProtoBuf definition.
|
||||||
|
pub fn from_str_name(value: &str) -> ::core::option::Option<Self> {
|
||||||
|
match value {
|
||||||
|
"MATCH_MODE_UNSPECIFIED" => Some(Self::Unspecified),
|
||||||
|
"MATCH_MODE_FUZZY" => Some(Self::Fuzzy),
|
||||||
|
"MATCH_MODE_EXACT" => Some(Self::Exact),
|
||||||
|
_ => None,
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
/// Generated client implementations.
|
/// Generated client implementations.
|
||||||
@@ -115,7 +161,7 @@ pub mod searcher_client {
|
|||||||
self.inner = self.inner.max_encoding_message_size(limit);
|
self.inner = self.inner.max_encoding_message_size(limit);
|
||||||
self
|
self
|
||||||
}
|
}
|
||||||
pub async fn search_table(
|
pub async fn search(
|
||||||
&mut self,
|
&mut self,
|
||||||
request: impl tonic::IntoRequest<super::SearchRequest>,
|
request: impl tonic::IntoRequest<super::SearchRequest>,
|
||||||
) -> std::result::Result<tonic::Response<super::SearchResponse>, tonic::Status> {
|
) -> std::result::Result<tonic::Response<super::SearchResponse>, tonic::Status> {
|
||||||
@@ -129,11 +175,11 @@ pub mod searcher_client {
|
|||||||
})?;
|
})?;
|
||||||
let codec = tonic::codec::ProstCodec::default();
|
let codec = tonic::codec::ProstCodec::default();
|
||||||
let path = http::uri::PathAndQuery::from_static(
|
let path = http::uri::PathAndQuery::from_static(
|
||||||
"/komp_ac.search.Searcher/SearchTable",
|
"/komp_ac.search.Searcher/Search",
|
||||||
);
|
);
|
||||||
let mut req = request.into_request();
|
let mut req = request.into_request();
|
||||||
req.extensions_mut()
|
req.extensions_mut()
|
||||||
.insert(GrpcMethod::new("komp_ac.search.Searcher", "SearchTable"));
|
.insert(GrpcMethod::new("komp_ac.search.Searcher", "Search"));
|
||||||
self.inner.unary(req, path, codec).await
|
self.inner.unary(req, path, codec).await
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -151,7 +197,7 @@ pub mod searcher_server {
|
|||||||
/// Generated trait containing gRPC methods that should be implemented for use with SearcherServer.
|
/// Generated trait containing gRPC methods that should be implemented for use with SearcherServer.
|
||||||
#[async_trait]
|
#[async_trait]
|
||||||
pub trait Searcher: std::marker::Send + std::marker::Sync + 'static {
|
pub trait Searcher: std::marker::Send + std::marker::Sync + 'static {
|
||||||
async fn search_table(
|
async fn search(
|
||||||
&self,
|
&self,
|
||||||
request: tonic::Request<super::SearchRequest>,
|
request: tonic::Request<super::SearchRequest>,
|
||||||
) -> std::result::Result<tonic::Response<super::SearchResponse>, tonic::Status>;
|
) -> std::result::Result<tonic::Response<super::SearchResponse>, tonic::Status>;
|
||||||
@@ -232,11 +278,11 @@ pub mod searcher_server {
|
|||||||
}
|
}
|
||||||
fn call(&mut self, req: http::Request<B>) -> Self::Future {
|
fn call(&mut self, req: http::Request<B>) -> Self::Future {
|
||||||
match req.uri().path() {
|
match req.uri().path() {
|
||||||
"/komp_ac.search.Searcher/SearchTable" => {
|
"/komp_ac.search.Searcher/Search" => {
|
||||||
#[allow(non_camel_case_types)]
|
#[allow(non_camel_case_types)]
|
||||||
struct SearchTableSvc<T: Searcher>(pub Arc<T>);
|
struct SearchSvc<T: Searcher>(pub Arc<T>);
|
||||||
impl<T: Searcher> tonic::server::UnaryService<super::SearchRequest>
|
impl<T: Searcher> tonic::server::UnaryService<super::SearchRequest>
|
||||||
for SearchTableSvc<T> {
|
for SearchSvc<T> {
|
||||||
type Response = super::SearchResponse;
|
type Response = super::SearchResponse;
|
||||||
type Future = BoxFuture<
|
type Future = BoxFuture<
|
||||||
tonic::Response<Self::Response>,
|
tonic::Response<Self::Response>,
|
||||||
@@ -248,7 +294,7 @@ pub mod searcher_server {
|
|||||||
) -> Self::Future {
|
) -> Self::Future {
|
||||||
let inner = Arc::clone(&self.0);
|
let inner = Arc::clone(&self.0);
|
||||||
let fut = async move {
|
let fut = async move {
|
||||||
<T as Searcher>::search_table(&inner, request).await
|
<T as Searcher>::search(&inner, request).await
|
||||||
};
|
};
|
||||||
Box::pin(fut)
|
Box::pin(fut)
|
||||||
}
|
}
|
||||||
@@ -259,7 +305,7 @@ pub mod searcher_server {
|
|||||||
let max_encoding_message_size = self.max_encoding_message_size;
|
let max_encoding_message_size = self.max_encoding_message_size;
|
||||||
let inner = self.inner.clone();
|
let inner = self.inner.clone();
|
||||||
let fut = async move {
|
let fut = async move {
|
||||||
let method = SearchTableSvc(inner);
|
let method = SearchSvc(inner);
|
||||||
let codec = tonic::codec::ProstCodec::default();
|
let codec = tonic::codec::ProstCodec::default();
|
||||||
let mut grpc = tonic::server::Grpc::new(codec)
|
let mut grpc = tonic::server::Grpc::new(codec)
|
||||||
.apply_compression_config(
|
.apply_compression_config(
|
||||||
|
|||||||
@@ -1,80 +1,254 @@
|
|||||||
// This file is @generated by prost-build.
|
// This file is @generated by prost-build.
|
||||||
|
/// A single link to another table within the same profile (schema).
|
||||||
#[derive(serde::Serialize, serde::Deserialize)]
|
#[derive(serde::Serialize, serde::Deserialize)]
|
||||||
#[derive(Clone, PartialEq, ::prost::Message)]
|
#[derive(Clone, PartialEq, ::prost::Message)]
|
||||||
pub struct TableLink {
|
pub struct TableLink {
|
||||||
|
/// Name of an existing table within the same profile to link to.
|
||||||
|
/// For each link, a "<linked>_id" column is created on the new table.
|
||||||
|
/// That column references "<linked>"(id) and adds an index automatically.
|
||||||
#[prost(string, tag = "1")]
|
#[prost(string, tag = "1")]
|
||||||
pub linked_table_name: ::prost::alloc::string::String,
|
pub linked_table_name: ::prost::alloc::string::String,
|
||||||
|
/// If true, the generated foreign key column is NOT NULL.
|
||||||
|
/// Otherwise the column allows NULL.
|
||||||
|
/// Duplicate links to the same target table in one request are rejected.
|
||||||
#[prost(bool, tag = "2")]
|
#[prost(bool, tag = "2")]
|
||||||
pub required: bool,
|
pub required: bool,
|
||||||
}
|
}
|
||||||
|
/// Defines the input for creating a new table definition.
|
||||||
#[derive(serde::Serialize, serde::Deserialize)]
|
#[derive(serde::Serialize, serde::Deserialize)]
|
||||||
#[derive(Clone, PartialEq, ::prost::Message)]
|
#[derive(Clone, PartialEq, ::prost::Message)]
|
||||||
pub struct PostTableDefinitionRequest {
|
pub struct PostTableDefinitionRequest {
|
||||||
|
/// Table name to create inside the target profile.
|
||||||
|
/// Must be lowercase, alphanumeric with underscores,
|
||||||
|
/// start with a letter, and be <= 63 chars.
|
||||||
|
/// Forbidden names: "id", "deleted", "created_at", or ending in "_id".
|
||||||
#[prost(string, tag = "1")]
|
#[prost(string, tag = "1")]
|
||||||
pub table_name: ::prost::alloc::string::String,
|
pub table_name: ::prost::alloc::string::String,
|
||||||
|
/// List of links (foreign keys) to existing tables in the same profile.
|
||||||
|
/// Each will automatically get a "<linked>_id" column and an index.
|
||||||
#[prost(message, repeated, tag = "2")]
|
#[prost(message, repeated, tag = "2")]
|
||||||
pub links: ::prost::alloc::vec::Vec<TableLink>,
|
pub links: ::prost::alloc::vec::Vec<TableLink>,
|
||||||
|
/// List of user-defined columns (adds to system/id/fk columns).
|
||||||
#[prost(message, repeated, tag = "3")]
|
#[prost(message, repeated, tag = "3")]
|
||||||
pub columns: ::prost::alloc::vec::Vec<ColumnDefinition>,
|
pub columns: ::prost::alloc::vec::Vec<ColumnDefinition>,
|
||||||
|
/// List of column names to be indexed (must match existing user-defined columns).
|
||||||
|
/// Indexes can target only user-defined columns; system columns ("id", "deleted",
|
||||||
|
/// "created_at") and automatically generated foreign key ("*_id") columns already
|
||||||
|
/// have indexes. Requests trying to index those columns are rejected.
|
||||||
#[prost(string, repeated, tag = "4")]
|
#[prost(string, repeated, tag = "4")]
|
||||||
pub indexes: ::prost::alloc::vec::Vec<::prost::alloc::string::String>,
|
pub indexes: ::prost::alloc::vec::Vec<::prost::alloc::string::String>,
|
||||||
|
/// Name of profile (Postgres schema) where the table will be created.
|
||||||
|
/// Same naming rules as table_name; cannot collide with reserved schemas
|
||||||
|
/// like "public", "information_schema", or ones starting with "pg_".
|
||||||
#[prost(string, tag = "5")]
|
#[prost(string, tag = "5")]
|
||||||
pub profile_name: ::prost::alloc::string::String,
|
pub profile_name: ::prost::alloc::string::String,
|
||||||
}
|
}
|
||||||
|
/// Defines append-only column additions for an existing table.
|
||||||
|
#[derive(serde::Serialize, serde::Deserialize)]
|
||||||
|
#[derive(Clone, PartialEq, ::prost::Message)]
|
||||||
|
pub struct AddTableColumnsRequest {
|
||||||
|
/// Existing profile/schema name.
|
||||||
|
#[prost(string, tag = "1")]
|
||||||
|
pub profile_name: ::prost::alloc::string::String,
|
||||||
|
/// Existing table name in the profile.
|
||||||
|
#[prost(string, tag = "2")]
|
||||||
|
pub table_name: ::prost::alloc::string::String,
|
||||||
|
/// New user-defined columns only. Existing columns cannot be changed here.
|
||||||
|
#[prost(message, repeated, tag = "3")]
|
||||||
|
pub columns: ::prost::alloc::vec::Vec<ColumnDefinition>,
|
||||||
|
/// Optional indexes for the new columns only.
|
||||||
|
#[prost(string, repeated, tag = "4")]
|
||||||
|
pub indexes: ::prost::alloc::vec::Vec<::prost::alloc::string::String>,
|
||||||
|
}
|
||||||
|
/// Describes one user-defined column for a table.
|
||||||
#[derive(serde::Serialize, serde::Deserialize)]
|
#[derive(serde::Serialize, serde::Deserialize)]
|
||||||
#[derive(Clone, PartialEq, ::prost::Message)]
|
#[derive(Clone, PartialEq, ::prost::Message)]
|
||||||
pub struct ColumnDefinition {
|
pub struct ColumnDefinition {
|
||||||
|
/// Column name that follows the same validation rules as table_name.
|
||||||
|
/// Must be lowercase, start with a letter, no uppercase characters,
|
||||||
|
/// and cannot be "id", "deleted", "created_at", or end with "_id".
|
||||||
#[prost(string, tag = "1")]
|
#[prost(string, tag = "1")]
|
||||||
pub name: ::prost::alloc::string::String,
|
pub name: ::prost::alloc::string::String,
|
||||||
|
/// Logical column type. Supported values (case-insensitive):
|
||||||
|
/// TEXT / STRING
|
||||||
|
/// BOOLEAN
|
||||||
|
/// TIMESTAMP / TIMESTAMPTZ / TIME
|
||||||
|
/// MONEY (= NUMERIC(14,4))
|
||||||
|
/// INTEGER / INT
|
||||||
|
/// BIGINTEGER / BIGINT
|
||||||
|
/// DATE
|
||||||
|
/// DECIMAL(p,s) → NUMERIC(p,s)
|
||||||
|
/// DECIMAL args must be integers (no sign, no dot, no leading zeros);
|
||||||
|
/// s ≤ p and p ≥ 1.
|
||||||
#[prost(string, tag = "2")]
|
#[prost(string, tag = "2")]
|
||||||
pub field_type: ::prost::alloc::string::String,
|
pub field_type: ::prost::alloc::string::String,
|
||||||
}
|
}
|
||||||
|
/// Response after table creation (success + DDL preview).
|
||||||
#[derive(serde::Serialize, serde::Deserialize)]
|
#[derive(serde::Serialize, serde::Deserialize)]
|
||||||
#[derive(Clone, PartialEq, ::prost::Message)]
|
#[derive(Clone, PartialEq, ::prost::Message)]
|
||||||
pub struct TableDefinitionResponse {
|
pub struct TableDefinitionResponse {
|
||||||
|
/// True if all DB changes and metadata inserts succeeded.
|
||||||
#[prost(bool, tag = "1")]
|
#[prost(bool, tag = "1")]
|
||||||
pub success: bool,
|
pub success: bool,
|
||||||
|
/// The actual SQL executed: CREATE TABLE + CREATE INDEX statements.
|
||||||
#[prost(string, tag = "2")]
|
#[prost(string, tag = "2")]
|
||||||
pub sql: ::prost::alloc::string::String,
|
pub sql: ::prost::alloc::string::String,
|
||||||
}
|
}
|
||||||
|
/// Describes the tree of all profiles and their tables.
|
||||||
#[derive(Clone, PartialEq, ::prost::Message)]
|
#[derive(Clone, PartialEq, ::prost::Message)]
|
||||||
pub struct ProfileTreeResponse {
|
pub struct ProfileTreeResponse {
|
||||||
|
/// All profiles in the system.
|
||||||
#[prost(message, repeated, tag = "1")]
|
#[prost(message, repeated, tag = "1")]
|
||||||
pub profiles: ::prost::alloc::vec::Vec<profile_tree_response::Profile>,
|
pub profiles: ::prost::alloc::vec::Vec<profile_tree_response::Profile>,
|
||||||
}
|
}
|
||||||
/// Nested message and enum types in `ProfileTreeResponse`.
|
/// Nested message and enum types in `ProfileTreeResponse`.
|
||||||
pub mod profile_tree_response {
|
pub mod profile_tree_response {
|
||||||
|
/// Table entry in a profile.
|
||||||
#[derive(Clone, PartialEq, ::prost::Message)]
|
#[derive(Clone, PartialEq, ::prost::Message)]
|
||||||
pub struct Table {
|
pub struct Table {
|
||||||
|
/// Internal ID from table_definitions.id (metadata record).
|
||||||
#[prost(int64, tag = "1")]
|
#[prost(int64, tag = "1")]
|
||||||
pub id: i64,
|
pub id: i64,
|
||||||
|
/// Table name within the profile (schema).
|
||||||
#[prost(string, tag = "2")]
|
#[prost(string, tag = "2")]
|
||||||
pub name: ::prost::alloc::string::String,
|
pub name: ::prost::alloc::string::String,
|
||||||
|
/// Other tables this one references (based on link definitions only).
|
||||||
#[prost(string, repeated, tag = "3")]
|
#[prost(string, repeated, tag = "3")]
|
||||||
pub depends_on: ::prost::alloc::vec::Vec<::prost::alloc::string::String>,
|
pub depends_on: ::prost::alloc::vec::Vec<::prost::alloc::string::String>,
|
||||||
}
|
}
|
||||||
|
/// Profile (schema) entry.
|
||||||
#[derive(Clone, PartialEq, ::prost::Message)]
|
#[derive(Clone, PartialEq, ::prost::Message)]
|
||||||
pub struct Profile {
|
pub struct Profile {
|
||||||
|
/// Name of the schema/profile (as stored in `schemas.name`).
|
||||||
#[prost(string, tag = "1")]
|
#[prost(string, tag = "1")]
|
||||||
pub name: ::prost::alloc::string::String,
|
pub name: ::prost::alloc::string::String,
|
||||||
|
/// All tables in that schema and their dependencies.
|
||||||
#[prost(message, repeated, tag = "2")]
|
#[prost(message, repeated, tag = "2")]
|
||||||
pub tables: ::prost::alloc::vec::Vec<Table>,
|
pub tables: ::prost::alloc::vec::Vec<Table>,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
/// Request to fetch all tables, columns and scripts for a profile.
|
||||||
#[derive(Clone, PartialEq, ::prost::Message)]
|
#[derive(Clone, PartialEq, ::prost::Message)]
|
||||||
pub struct DeleteTableRequest {
|
pub struct GetProfileDetailsRequest {
|
||||||
|
/// Profile (schema) name to fetch details for.
|
||||||
|
#[prost(string, tag = "1")]
|
||||||
|
pub profile_name: ::prost::alloc::string::String,
|
||||||
|
}
|
||||||
|
/// Response with all tables, columns and scripts for a profile.
|
||||||
|
#[derive(Clone, PartialEq, ::prost::Message)]
|
||||||
|
pub struct GetProfileDetailsResponse {
|
||||||
|
#[prost(string, tag = "1")]
|
||||||
|
pub profile_name: ::prost::alloc::string::String,
|
||||||
|
#[prost(message, repeated, tag = "2")]
|
||||||
|
pub tables: ::prost::alloc::vec::Vec<TableDetail>,
|
||||||
|
}
|
||||||
|
/// Request to fetch recorded column alias rename history for one profile.
|
||||||
|
#[derive(serde::Serialize, serde::Deserialize)]
|
||||||
|
#[derive(Clone, PartialEq, ::prost::Message)]
|
||||||
|
pub struct GetColumnAliasRenameHistoryRequest {
|
||||||
|
#[prost(string, tag = "1")]
|
||||||
|
pub profile_name: ::prost::alloc::string::String,
|
||||||
|
/// Optional filter. When omitted, returns all tables in the profile.
|
||||||
|
#[prost(int64, optional, tag = "2")]
|
||||||
|
pub table_definition_id: ::core::option::Option<i64>,
|
||||||
|
}
|
||||||
|
/// One recorded column alias rename.
|
||||||
|
#[derive(serde::Serialize, serde::Deserialize)]
|
||||||
|
#[derive(Clone, PartialEq, ::prost::Message)]
|
||||||
|
pub struct ColumnAliasRenameHistoryEntry {
|
||||||
|
#[prost(int64, tag = "1")]
|
||||||
|
pub id: i64,
|
||||||
|
#[prost(string, tag = "2")]
|
||||||
|
pub profile_name: ::prost::alloc::string::String,
|
||||||
|
#[prost(int64, tag = "3")]
|
||||||
|
pub table_definition_id: i64,
|
||||||
|
#[prost(string, tag = "4")]
|
||||||
|
pub table_name: ::prost::alloc::string::String,
|
||||||
|
#[prost(string, tag = "5")]
|
||||||
|
pub old_column_name: ::prost::alloc::string::String,
|
||||||
|
#[prost(string, tag = "6")]
|
||||||
|
pub new_column_name: ::prost::alloc::string::String,
|
||||||
|
#[prost(string, tag = "7")]
|
||||||
|
pub created_at: ::prost::alloc::string::String,
|
||||||
|
}
|
||||||
|
/// Response with stored column alias rename history rows.
|
||||||
|
#[derive(serde::Serialize, serde::Deserialize)]
|
||||||
|
#[derive(Clone, PartialEq, ::prost::Message)]
|
||||||
|
pub struct GetColumnAliasRenameHistoryResponse {
|
||||||
|
#[prost(string, tag = "1")]
|
||||||
|
pub profile_name: ::prost::alloc::string::String,
|
||||||
|
#[prost(message, repeated, tag = "2")]
|
||||||
|
pub entries: ::prost::alloc::vec::Vec<ColumnAliasRenameHistoryEntry>,
|
||||||
|
}
|
||||||
|
/// Describes a table with its columns and associated scripts.
|
||||||
|
#[derive(Clone, PartialEq, ::prost::Message)]
|
||||||
|
pub struct TableDetail {
|
||||||
|
#[prost(string, tag = "1")]
|
||||||
|
pub name: ::prost::alloc::string::String,
|
||||||
|
#[prost(int64, tag = "2")]
|
||||||
|
pub id: i64,
|
||||||
|
#[prost(message, repeated, tag = "3")]
|
||||||
|
pub columns: ::prost::alloc::vec::Vec<ColumnDefinition>,
|
||||||
|
#[prost(message, repeated, tag = "4")]
|
||||||
|
pub scripts: ::prost::alloc::vec::Vec<ScriptInfo>,
|
||||||
|
}
|
||||||
|
/// A script that targets a specific column in a table.
|
||||||
|
#[derive(Clone, PartialEq, ::prost::Message)]
|
||||||
|
pub struct ScriptInfo {
|
||||||
|
#[prost(int64, tag = "1")]
|
||||||
|
pub script_id: i64,
|
||||||
|
#[prost(string, tag = "2")]
|
||||||
|
pub target_column: ::prost::alloc::string::String,
|
||||||
|
#[prost(string, tag = "3")]
|
||||||
|
pub target_column_type: ::prost::alloc::string::String,
|
||||||
|
#[prost(string, tag = "4")]
|
||||||
|
pub script: ::prost::alloc::string::String,
|
||||||
|
#[prost(string, tag = "5")]
|
||||||
|
pub description: ::prost::alloc::string::String,
|
||||||
|
}
|
||||||
|
/// Request to rename one user-visible column alias in a table.
|
||||||
|
#[derive(serde::Serialize, serde::Deserialize)]
|
||||||
|
#[derive(Clone, PartialEq, ::prost::Message)]
|
||||||
|
pub struct RenameColumnAliasRequest {
|
||||||
#[prost(string, tag = "1")]
|
#[prost(string, tag = "1")]
|
||||||
pub profile_name: ::prost::alloc::string::String,
|
pub profile_name: ::prost::alloc::string::String,
|
||||||
#[prost(string, tag = "2")]
|
#[prost(string, tag = "2")]
|
||||||
pub table_name: ::prost::alloc::string::String,
|
pub table_name: ::prost::alloc::string::String,
|
||||||
|
#[prost(string, tag = "3")]
|
||||||
|
pub old_column_name: ::prost::alloc::string::String,
|
||||||
|
#[prost(string, tag = "4")]
|
||||||
|
pub new_column_name: ::prost::alloc::string::String,
|
||||||
}
|
}
|
||||||
|
/// Response after renaming one column alias.
|
||||||
|
#[derive(serde::Serialize, serde::Deserialize)]
|
||||||
#[derive(Clone, PartialEq, ::prost::Message)]
|
#[derive(Clone, PartialEq, ::prost::Message)]
|
||||||
pub struct DeleteTableResponse {
|
pub struct RenameColumnAliasResponse {
|
||||||
#[prost(bool, tag = "1")]
|
#[prost(bool, tag = "1")]
|
||||||
pub success: bool,
|
pub success: bool,
|
||||||
#[prost(string, tag = "2")]
|
#[prost(string, tag = "2")]
|
||||||
pub message: ::prost::alloc::string::String,
|
pub message: ::prost::alloc::string::String,
|
||||||
}
|
}
|
||||||
|
/// Request to delete one table definition entirely.
|
||||||
|
#[derive(Clone, PartialEq, ::prost::Message)]
|
||||||
|
pub struct DeleteTableRequest {
|
||||||
|
/// Profile (schema) name owning the table (must exist).
|
||||||
|
#[prost(string, tag = "1")]
|
||||||
|
pub profile_name: ::prost::alloc::string::String,
|
||||||
|
/// Table to drop (must exist in the profile).
|
||||||
|
/// Executes DROP TABLE "profile"."table" CASCADE and then removes metadata.
|
||||||
|
#[prost(string, tag = "2")]
|
||||||
|
pub table_name: ::prost::alloc::string::String,
|
||||||
|
}
|
||||||
|
/// Response after table deletion.
|
||||||
|
#[derive(Clone, PartialEq, ::prost::Message)]
|
||||||
|
pub struct DeleteTableResponse {
|
||||||
|
/// True if table and metadata were successfully deleted in one transaction.
|
||||||
|
#[prost(bool, tag = "1")]
|
||||||
|
pub success: bool,
|
||||||
|
/// Human-readable summary of what was removed.
|
||||||
|
#[prost(string, tag = "2")]
|
||||||
|
pub message: ::prost::alloc::string::String,
|
||||||
|
}
|
||||||
/// Generated client implementations.
|
/// Generated client implementations.
|
||||||
pub mod table_definition_client {
|
pub mod table_definition_client {
|
||||||
#![allow(
|
#![allow(
|
||||||
@@ -86,6 +260,10 @@ pub mod table_definition_client {
|
|||||||
)]
|
)]
|
||||||
use tonic::codegen::*;
|
use tonic::codegen::*;
|
||||||
use tonic::codegen::http::Uri;
|
use tonic::codegen::http::Uri;
|
||||||
|
/// The TableDefinition service manages the entire lifecycle of user-defined
|
||||||
|
/// tables (stored as both metadata and physical PostgreSQL tables) inside
|
||||||
|
/// logical "profiles" (schemas). Each table has stored structure, links, and
|
||||||
|
/// validation rules.
|
||||||
#[derive(Debug, Clone)]
|
#[derive(Debug, Clone)]
|
||||||
pub struct TableDefinitionClient<T> {
|
pub struct TableDefinitionClient<T> {
|
||||||
inner: tonic::client::Grpc<T>,
|
inner: tonic::client::Grpc<T>,
|
||||||
@@ -166,6 +344,9 @@ pub mod table_definition_client {
|
|||||||
self.inner = self.inner.max_encoding_message_size(limit);
|
self.inner = self.inner.max_encoding_message_size(limit);
|
||||||
self
|
self
|
||||||
}
|
}
|
||||||
|
/// Creates a new table (and schema if missing) with system columns,
|
||||||
|
/// linked-table foreign keys, user-defined columns, and optional indexes.
|
||||||
|
/// Also inserts metadata and default validation rules. Entirely transactional.
|
||||||
pub async fn post_table_definition(
|
pub async fn post_table_definition(
|
||||||
&mut self,
|
&mut self,
|
||||||
request: impl tonic::IntoRequest<super::PostTableDefinitionRequest>,
|
request: impl tonic::IntoRequest<super::PostTableDefinitionRequest>,
|
||||||
@@ -195,6 +376,39 @@ pub mod table_definition_client {
|
|||||||
);
|
);
|
||||||
self.inner.unary(req, path, codec).await
|
self.inner.unary(req, path, codec).await
|
||||||
}
|
}
|
||||||
|
/// Appends new user-defined columns to an existing table.
|
||||||
|
/// Existing columns, links, and table logic are never changed by this call.
|
||||||
|
pub async fn add_table_columns(
|
||||||
|
&mut self,
|
||||||
|
request: impl tonic::IntoRequest<super::AddTableColumnsRequest>,
|
||||||
|
) -> std::result::Result<
|
||||||
|
tonic::Response<super::TableDefinitionResponse>,
|
||||||
|
tonic::Status,
|
||||||
|
> {
|
||||||
|
self.inner
|
||||||
|
.ready()
|
||||||
|
.await
|
||||||
|
.map_err(|e| {
|
||||||
|
tonic::Status::unknown(
|
||||||
|
format!("Service was not ready: {}", e.into()),
|
||||||
|
)
|
||||||
|
})?;
|
||||||
|
let codec = tonic::codec::ProstCodec::default();
|
||||||
|
let path = http::uri::PathAndQuery::from_static(
|
||||||
|
"/komp_ac.table_definition.TableDefinition/AddTableColumns",
|
||||||
|
);
|
||||||
|
let mut req = request.into_request();
|
||||||
|
req.extensions_mut()
|
||||||
|
.insert(
|
||||||
|
GrpcMethod::new(
|
||||||
|
"komp_ac.table_definition.TableDefinition",
|
||||||
|
"AddTableColumns",
|
||||||
|
),
|
||||||
|
);
|
||||||
|
self.inner.unary(req, path, codec).await
|
||||||
|
}
|
||||||
|
/// Lists all profiles (schemas) and their tables with declared dependencies.
|
||||||
|
/// This provides a tree-like overview of table relationships.
|
||||||
pub async fn get_profile_tree(
|
pub async fn get_profile_tree(
|
||||||
&mut self,
|
&mut self,
|
||||||
request: impl tonic::IntoRequest<super::super::common::Empty>,
|
request: impl tonic::IntoRequest<super::super::common::Empty>,
|
||||||
@@ -224,6 +438,98 @@ pub mod table_definition_client {
|
|||||||
);
|
);
|
||||||
self.inner.unary(req, path, codec).await
|
self.inner.unary(req, path, codec).await
|
||||||
}
|
}
|
||||||
|
/// Fetches all tables with their columns and scripts for a specific profile.
|
||||||
|
/// Pure data retrieval - no business logic.
|
||||||
|
pub async fn get_profile_details(
|
||||||
|
&mut self,
|
||||||
|
request: impl tonic::IntoRequest<super::GetProfileDetailsRequest>,
|
||||||
|
) -> std::result::Result<
|
||||||
|
tonic::Response<super::GetProfileDetailsResponse>,
|
||||||
|
tonic::Status,
|
||||||
|
> {
|
||||||
|
self.inner
|
||||||
|
.ready()
|
||||||
|
.await
|
||||||
|
.map_err(|e| {
|
||||||
|
tonic::Status::unknown(
|
||||||
|
format!("Service was not ready: {}", e.into()),
|
||||||
|
)
|
||||||
|
})?;
|
||||||
|
let codec = tonic::codec::ProstCodec::default();
|
||||||
|
let path = http::uri::PathAndQuery::from_static(
|
||||||
|
"/komp_ac.table_definition.TableDefinition/GetProfileDetails",
|
||||||
|
);
|
||||||
|
let mut req = request.into_request();
|
||||||
|
req.extensions_mut()
|
||||||
|
.insert(
|
||||||
|
GrpcMethod::new(
|
||||||
|
"komp_ac.table_definition.TableDefinition",
|
||||||
|
"GetProfileDetails",
|
||||||
|
),
|
||||||
|
);
|
||||||
|
self.inner.unary(req, path, codec).await
|
||||||
|
}
|
||||||
|
/// Returns the stored rename history for column aliases in one profile.
|
||||||
|
pub async fn get_column_alias_rename_history(
|
||||||
|
&mut self,
|
||||||
|
request: impl tonic::IntoRequest<super::GetColumnAliasRenameHistoryRequest>,
|
||||||
|
) -> std::result::Result<
|
||||||
|
tonic::Response<super::GetColumnAliasRenameHistoryResponse>,
|
||||||
|
tonic::Status,
|
||||||
|
> {
|
||||||
|
self.inner
|
||||||
|
.ready()
|
||||||
|
.await
|
||||||
|
.map_err(|e| {
|
||||||
|
tonic::Status::unknown(
|
||||||
|
format!("Service was not ready: {}", e.into()),
|
||||||
|
)
|
||||||
|
})?;
|
||||||
|
let codec = tonic::codec::ProstCodec::default();
|
||||||
|
let path = http::uri::PathAndQuery::from_static(
|
||||||
|
"/komp_ac.table_definition.TableDefinition/GetColumnAliasRenameHistory",
|
||||||
|
);
|
||||||
|
let mut req = request.into_request();
|
||||||
|
req.extensions_mut()
|
||||||
|
.insert(
|
||||||
|
GrpcMethod::new(
|
||||||
|
"komp_ac.table_definition.TableDefinition",
|
||||||
|
"GetColumnAliasRenameHistory",
|
||||||
|
),
|
||||||
|
);
|
||||||
|
self.inner.unary(req, path, codec).await
|
||||||
|
}
|
||||||
|
/// Renames a user-visible column alias while keeping the physical column unchanged.
|
||||||
|
pub async fn rename_column_alias(
|
||||||
|
&mut self,
|
||||||
|
request: impl tonic::IntoRequest<super::RenameColumnAliasRequest>,
|
||||||
|
) -> std::result::Result<
|
||||||
|
tonic::Response<super::RenameColumnAliasResponse>,
|
||||||
|
tonic::Status,
|
||||||
|
> {
|
||||||
|
self.inner
|
||||||
|
.ready()
|
||||||
|
.await
|
||||||
|
.map_err(|e| {
|
||||||
|
tonic::Status::unknown(
|
||||||
|
format!("Service was not ready: {}", e.into()),
|
||||||
|
)
|
||||||
|
})?;
|
||||||
|
let codec = tonic::codec::ProstCodec::default();
|
||||||
|
let path = http::uri::PathAndQuery::from_static(
|
||||||
|
"/komp_ac.table_definition.TableDefinition/RenameColumnAlias",
|
||||||
|
);
|
||||||
|
let mut req = request.into_request();
|
||||||
|
req.extensions_mut()
|
||||||
|
.insert(
|
||||||
|
GrpcMethod::new(
|
||||||
|
"komp_ac.table_definition.TableDefinition",
|
||||||
|
"RenameColumnAlias",
|
||||||
|
),
|
||||||
|
);
|
||||||
|
self.inner.unary(req, path, codec).await
|
||||||
|
}
|
||||||
|
/// Drops a table and its metadata, then deletes the profile if it becomes empty.
|
||||||
pub async fn delete_table(
|
pub async fn delete_table(
|
||||||
&mut self,
|
&mut self,
|
||||||
request: impl tonic::IntoRequest<super::DeleteTableRequest>,
|
request: impl tonic::IntoRequest<super::DeleteTableRequest>,
|
||||||
@@ -268,6 +574,9 @@ pub mod table_definition_server {
|
|||||||
/// Generated trait containing gRPC methods that should be implemented for use with TableDefinitionServer.
|
/// Generated trait containing gRPC methods that should be implemented for use with TableDefinitionServer.
|
||||||
#[async_trait]
|
#[async_trait]
|
||||||
pub trait TableDefinition: std::marker::Send + std::marker::Sync + 'static {
|
pub trait TableDefinition: std::marker::Send + std::marker::Sync + 'static {
|
||||||
|
/// Creates a new table (and schema if missing) with system columns,
|
||||||
|
/// linked-table foreign keys, user-defined columns, and optional indexes.
|
||||||
|
/// Also inserts metadata and default validation rules. Entirely transactional.
|
||||||
async fn post_table_definition(
|
async fn post_table_definition(
|
||||||
&self,
|
&self,
|
||||||
request: tonic::Request<super::PostTableDefinitionRequest>,
|
request: tonic::Request<super::PostTableDefinitionRequest>,
|
||||||
@@ -275,6 +584,17 @@ pub mod table_definition_server {
|
|||||||
tonic::Response<super::TableDefinitionResponse>,
|
tonic::Response<super::TableDefinitionResponse>,
|
||||||
tonic::Status,
|
tonic::Status,
|
||||||
>;
|
>;
|
||||||
|
/// Appends new user-defined columns to an existing table.
|
||||||
|
/// Existing columns, links, and table logic are never changed by this call.
|
||||||
|
async fn add_table_columns(
|
||||||
|
&self,
|
||||||
|
request: tonic::Request<super::AddTableColumnsRequest>,
|
||||||
|
) -> std::result::Result<
|
||||||
|
tonic::Response<super::TableDefinitionResponse>,
|
||||||
|
tonic::Status,
|
||||||
|
>;
|
||||||
|
/// Lists all profiles (schemas) and their tables with declared dependencies.
|
||||||
|
/// This provides a tree-like overview of table relationships.
|
||||||
async fn get_profile_tree(
|
async fn get_profile_tree(
|
||||||
&self,
|
&self,
|
||||||
request: tonic::Request<super::super::common::Empty>,
|
request: tonic::Request<super::super::common::Empty>,
|
||||||
@@ -282,6 +602,32 @@ pub mod table_definition_server {
|
|||||||
tonic::Response<super::ProfileTreeResponse>,
|
tonic::Response<super::ProfileTreeResponse>,
|
||||||
tonic::Status,
|
tonic::Status,
|
||||||
>;
|
>;
|
||||||
|
/// Fetches all tables with their columns and scripts for a specific profile.
|
||||||
|
/// Pure data retrieval - no business logic.
|
||||||
|
async fn get_profile_details(
|
||||||
|
&self,
|
||||||
|
request: tonic::Request<super::GetProfileDetailsRequest>,
|
||||||
|
) -> std::result::Result<
|
||||||
|
tonic::Response<super::GetProfileDetailsResponse>,
|
||||||
|
tonic::Status,
|
||||||
|
>;
|
||||||
|
/// Returns the stored rename history for column aliases in one profile.
|
||||||
|
async fn get_column_alias_rename_history(
|
||||||
|
&self,
|
||||||
|
request: tonic::Request<super::GetColumnAliasRenameHistoryRequest>,
|
||||||
|
) -> std::result::Result<
|
||||||
|
tonic::Response<super::GetColumnAliasRenameHistoryResponse>,
|
||||||
|
tonic::Status,
|
||||||
|
>;
|
||||||
|
/// Renames a user-visible column alias while keeping the physical column unchanged.
|
||||||
|
async fn rename_column_alias(
|
||||||
|
&self,
|
||||||
|
request: tonic::Request<super::RenameColumnAliasRequest>,
|
||||||
|
) -> std::result::Result<
|
||||||
|
tonic::Response<super::RenameColumnAliasResponse>,
|
||||||
|
tonic::Status,
|
||||||
|
>;
|
||||||
|
/// Drops a table and its metadata, then deletes the profile if it becomes empty.
|
||||||
async fn delete_table(
|
async fn delete_table(
|
||||||
&self,
|
&self,
|
||||||
request: tonic::Request<super::DeleteTableRequest>,
|
request: tonic::Request<super::DeleteTableRequest>,
|
||||||
@@ -290,6 +636,10 @@ pub mod table_definition_server {
|
|||||||
tonic::Status,
|
tonic::Status,
|
||||||
>;
|
>;
|
||||||
}
|
}
|
||||||
|
/// The TableDefinition service manages the entire lifecycle of user-defined
|
||||||
|
/// tables (stored as both metadata and physical PostgreSQL tables) inside
|
||||||
|
/// logical "profiles" (schemas). Each table has stored structure, links, and
|
||||||
|
/// validation rules.
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
pub struct TableDefinitionServer<T> {
|
pub struct TableDefinitionServer<T> {
|
||||||
inner: Arc<T>,
|
inner: Arc<T>,
|
||||||
@@ -415,6 +765,52 @@ pub mod table_definition_server {
|
|||||||
};
|
};
|
||||||
Box::pin(fut)
|
Box::pin(fut)
|
||||||
}
|
}
|
||||||
|
"/komp_ac.table_definition.TableDefinition/AddTableColumns" => {
|
||||||
|
#[allow(non_camel_case_types)]
|
||||||
|
struct AddTableColumnsSvc<T: TableDefinition>(pub Arc<T>);
|
||||||
|
impl<
|
||||||
|
T: TableDefinition,
|
||||||
|
> tonic::server::UnaryService<super::AddTableColumnsRequest>
|
||||||
|
for AddTableColumnsSvc<T> {
|
||||||
|
type Response = super::TableDefinitionResponse;
|
||||||
|
type Future = BoxFuture<
|
||||||
|
tonic::Response<Self::Response>,
|
||||||
|
tonic::Status,
|
||||||
|
>;
|
||||||
|
fn call(
|
||||||
|
&mut self,
|
||||||
|
request: tonic::Request<super::AddTableColumnsRequest>,
|
||||||
|
) -> Self::Future {
|
||||||
|
let inner = Arc::clone(&self.0);
|
||||||
|
let fut = async move {
|
||||||
|
<T as TableDefinition>::add_table_columns(&inner, request)
|
||||||
|
.await
|
||||||
|
};
|
||||||
|
Box::pin(fut)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
let accept_compression_encodings = self.accept_compression_encodings;
|
||||||
|
let send_compression_encodings = self.send_compression_encodings;
|
||||||
|
let max_decoding_message_size = self.max_decoding_message_size;
|
||||||
|
let max_encoding_message_size = self.max_encoding_message_size;
|
||||||
|
let inner = self.inner.clone();
|
||||||
|
let fut = async move {
|
||||||
|
let method = AddTableColumnsSvc(inner);
|
||||||
|
let codec = tonic::codec::ProstCodec::default();
|
||||||
|
let mut grpc = tonic::server::Grpc::new(codec)
|
||||||
|
.apply_compression_config(
|
||||||
|
accept_compression_encodings,
|
||||||
|
send_compression_encodings,
|
||||||
|
)
|
||||||
|
.apply_max_message_size_config(
|
||||||
|
max_decoding_message_size,
|
||||||
|
max_encoding_message_size,
|
||||||
|
);
|
||||||
|
let res = grpc.unary(method, req).await;
|
||||||
|
Ok(res)
|
||||||
|
};
|
||||||
|
Box::pin(fut)
|
||||||
|
}
|
||||||
"/komp_ac.table_definition.TableDefinition/GetProfileTree" => {
|
"/komp_ac.table_definition.TableDefinition/GetProfileTree" => {
|
||||||
#[allow(non_camel_case_types)]
|
#[allow(non_camel_case_types)]
|
||||||
struct GetProfileTreeSvc<T: TableDefinition>(pub Arc<T>);
|
struct GetProfileTreeSvc<T: TableDefinition>(pub Arc<T>);
|
||||||
@@ -461,6 +857,152 @@ pub mod table_definition_server {
|
|||||||
};
|
};
|
||||||
Box::pin(fut)
|
Box::pin(fut)
|
||||||
}
|
}
|
||||||
|
"/komp_ac.table_definition.TableDefinition/GetProfileDetails" => {
|
||||||
|
#[allow(non_camel_case_types)]
|
||||||
|
struct GetProfileDetailsSvc<T: TableDefinition>(pub Arc<T>);
|
||||||
|
impl<
|
||||||
|
T: TableDefinition,
|
||||||
|
> tonic::server::UnaryService<super::GetProfileDetailsRequest>
|
||||||
|
for GetProfileDetailsSvc<T> {
|
||||||
|
type Response = super::GetProfileDetailsResponse;
|
||||||
|
type Future = BoxFuture<
|
||||||
|
tonic::Response<Self::Response>,
|
||||||
|
tonic::Status,
|
||||||
|
>;
|
||||||
|
fn call(
|
||||||
|
&mut self,
|
||||||
|
request: tonic::Request<super::GetProfileDetailsRequest>,
|
||||||
|
) -> Self::Future {
|
||||||
|
let inner = Arc::clone(&self.0);
|
||||||
|
let fut = async move {
|
||||||
|
<T as TableDefinition>::get_profile_details(&inner, request)
|
||||||
|
.await
|
||||||
|
};
|
||||||
|
Box::pin(fut)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
let accept_compression_encodings = self.accept_compression_encodings;
|
||||||
|
let send_compression_encodings = self.send_compression_encodings;
|
||||||
|
let max_decoding_message_size = self.max_decoding_message_size;
|
||||||
|
let max_encoding_message_size = self.max_encoding_message_size;
|
||||||
|
let inner = self.inner.clone();
|
||||||
|
let fut = async move {
|
||||||
|
let method = GetProfileDetailsSvc(inner);
|
||||||
|
let codec = tonic::codec::ProstCodec::default();
|
||||||
|
let mut grpc = tonic::server::Grpc::new(codec)
|
||||||
|
.apply_compression_config(
|
||||||
|
accept_compression_encodings,
|
||||||
|
send_compression_encodings,
|
||||||
|
)
|
||||||
|
.apply_max_message_size_config(
|
||||||
|
max_decoding_message_size,
|
||||||
|
max_encoding_message_size,
|
||||||
|
);
|
||||||
|
let res = grpc.unary(method, req).await;
|
||||||
|
Ok(res)
|
||||||
|
};
|
||||||
|
Box::pin(fut)
|
||||||
|
}
|
||||||
|
"/komp_ac.table_definition.TableDefinition/GetColumnAliasRenameHistory" => {
|
||||||
|
#[allow(non_camel_case_types)]
|
||||||
|
struct GetColumnAliasRenameHistorySvc<T: TableDefinition>(
|
||||||
|
pub Arc<T>,
|
||||||
|
);
|
||||||
|
impl<
|
||||||
|
T: TableDefinition,
|
||||||
|
> tonic::server::UnaryService<
|
||||||
|
super::GetColumnAliasRenameHistoryRequest,
|
||||||
|
> for GetColumnAliasRenameHistorySvc<T> {
|
||||||
|
type Response = super::GetColumnAliasRenameHistoryResponse;
|
||||||
|
type Future = BoxFuture<
|
||||||
|
tonic::Response<Self::Response>,
|
||||||
|
tonic::Status,
|
||||||
|
>;
|
||||||
|
fn call(
|
||||||
|
&mut self,
|
||||||
|
request: tonic::Request<
|
||||||
|
super::GetColumnAliasRenameHistoryRequest,
|
||||||
|
>,
|
||||||
|
) -> Self::Future {
|
||||||
|
let inner = Arc::clone(&self.0);
|
||||||
|
let fut = async move {
|
||||||
|
<T as TableDefinition>::get_column_alias_rename_history(
|
||||||
|
&inner,
|
||||||
|
request,
|
||||||
|
)
|
||||||
|
.await
|
||||||
|
};
|
||||||
|
Box::pin(fut)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
let accept_compression_encodings = self.accept_compression_encodings;
|
||||||
|
let send_compression_encodings = self.send_compression_encodings;
|
||||||
|
let max_decoding_message_size = self.max_decoding_message_size;
|
||||||
|
let max_encoding_message_size = self.max_encoding_message_size;
|
||||||
|
let inner = self.inner.clone();
|
||||||
|
let fut = async move {
|
||||||
|
let method = GetColumnAliasRenameHistorySvc(inner);
|
||||||
|
let codec = tonic::codec::ProstCodec::default();
|
||||||
|
let mut grpc = tonic::server::Grpc::new(codec)
|
||||||
|
.apply_compression_config(
|
||||||
|
accept_compression_encodings,
|
||||||
|
send_compression_encodings,
|
||||||
|
)
|
||||||
|
.apply_max_message_size_config(
|
||||||
|
max_decoding_message_size,
|
||||||
|
max_encoding_message_size,
|
||||||
|
);
|
||||||
|
let res = grpc.unary(method, req).await;
|
||||||
|
Ok(res)
|
||||||
|
};
|
||||||
|
Box::pin(fut)
|
||||||
|
}
|
||||||
|
"/komp_ac.table_definition.TableDefinition/RenameColumnAlias" => {
|
||||||
|
#[allow(non_camel_case_types)]
|
||||||
|
struct RenameColumnAliasSvc<T: TableDefinition>(pub Arc<T>);
|
||||||
|
impl<
|
||||||
|
T: TableDefinition,
|
||||||
|
> tonic::server::UnaryService<super::RenameColumnAliasRequest>
|
||||||
|
for RenameColumnAliasSvc<T> {
|
||||||
|
type Response = super::RenameColumnAliasResponse;
|
||||||
|
type Future = BoxFuture<
|
||||||
|
tonic::Response<Self::Response>,
|
||||||
|
tonic::Status,
|
||||||
|
>;
|
||||||
|
fn call(
|
||||||
|
&mut self,
|
||||||
|
request: tonic::Request<super::RenameColumnAliasRequest>,
|
||||||
|
) -> Self::Future {
|
||||||
|
let inner = Arc::clone(&self.0);
|
||||||
|
let fut = async move {
|
||||||
|
<T as TableDefinition>::rename_column_alias(&inner, request)
|
||||||
|
.await
|
||||||
|
};
|
||||||
|
Box::pin(fut)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
let accept_compression_encodings = self.accept_compression_encodings;
|
||||||
|
let send_compression_encodings = self.send_compression_encodings;
|
||||||
|
let max_decoding_message_size = self.max_decoding_message_size;
|
||||||
|
let max_encoding_message_size = self.max_encoding_message_size;
|
||||||
|
let inner = self.inner.clone();
|
||||||
|
let fut = async move {
|
||||||
|
let method = RenameColumnAliasSvc(inner);
|
||||||
|
let codec = tonic::codec::ProstCodec::default();
|
||||||
|
let mut grpc = tonic::server::Grpc::new(codec)
|
||||||
|
.apply_compression_config(
|
||||||
|
accept_compression_encodings,
|
||||||
|
send_compression_encodings,
|
||||||
|
)
|
||||||
|
.apply_max_message_size_config(
|
||||||
|
max_decoding_message_size,
|
||||||
|
max_encoding_message_size,
|
||||||
|
);
|
||||||
|
let res = grpc.unary(method, req).await;
|
||||||
|
Ok(res)
|
||||||
|
};
|
||||||
|
Box::pin(fut)
|
||||||
|
}
|
||||||
"/komp_ac.table_definition.TableDefinition/DeleteTable" => {
|
"/komp_ac.table_definition.TableDefinition/DeleteTable" => {
|
||||||
#[allow(non_camel_case_types)]
|
#[allow(non_camel_case_types)]
|
||||||
struct DeleteTableSvc<T: TableDefinition>(pub Arc<T>);
|
struct DeleteTableSvc<T: TableDefinition>(pub Arc<T>);
|
||||||
|
|||||||
@@ -1,23 +1,114 @@
|
|||||||
// This file is @generated by prost-build.
|
// This file is @generated by prost-build.
|
||||||
|
/// Request to create or update a script bound to a specific table and column.
|
||||||
#[derive(serde::Serialize, serde::Deserialize)]
|
#[derive(serde::Serialize, serde::Deserialize)]
|
||||||
#[derive(Clone, PartialEq, ::prost::Message)]
|
#[derive(Clone, PartialEq, ::prost::Message)]
|
||||||
pub struct PostTableScriptRequest {
|
pub struct PostTableScriptRequest {
|
||||||
|
/// Required. The metadata ID from table_definitions.id that identifies the
|
||||||
|
/// table this script belongs to. The table must exist; its schema determines
|
||||||
|
/// where referenced tables/columns are validated and where dependencies are stored.
|
||||||
#[prost(int64, tag = "1")]
|
#[prost(int64, tag = "1")]
|
||||||
pub table_definition_id: i64,
|
pub table_definition_id: i64,
|
||||||
|
/// Required. The target column in the target table that this script computes.
|
||||||
|
/// Must be an existing user-defined column in that table (not a system column).
|
||||||
|
/// System columns are reserved: "id", "deleted", "created_at".
|
||||||
|
/// The column's data type must NOT be one of the prohibited target types:
|
||||||
|
/// BIGINT, DATE, TIMESTAMPTZ
|
||||||
|
/// Note: BOOLEAN targets are allowed (values are converted to Steel #true/#false).
|
||||||
#[prost(string, tag = "2")]
|
#[prost(string, tag = "2")]
|
||||||
pub target_column: ::prost::alloc::string::String,
|
pub target_column: ::prost::alloc::string::String,
|
||||||
|
/// Required. The script in the Steel DSL (S-expression style).
|
||||||
|
/// Syntax requirements:
|
||||||
|
/// - Non-empty, must start with '('
|
||||||
|
/// - Balanced parentheses
|
||||||
|
///
|
||||||
|
/// Referencing data:
|
||||||
|
/// - Structured table/column access (enforces link constraints):
|
||||||
|
/// (steel_get_column "table_name" "column_name")
|
||||||
|
/// (steel_get_column_with_index "table_name" index "column_name")
|
||||||
|
/// • index must be a non-negative integer literal
|
||||||
|
/// • self-references are allowed without links
|
||||||
|
/// • other tables require an explicit link from the source table
|
||||||
|
/// (table_definition_links) or the request fails
|
||||||
|
/// - Raw SQL access (no link required, but still validated):
|
||||||
|
/// (steel_query_sql "SELECT ...")
|
||||||
|
/// • Basic checks disallow operations that imply prohibited types,
|
||||||
|
/// e.g., EXTRACT(…), DATE_PART(…), ::DATE, ::TIMESTAMPTZ, ::BIGINT, CAST(…)
|
||||||
|
/// - Self variable access in transformed scripts:
|
||||||
|
/// (get-var "column_name") is treated as referencing the current table
|
||||||
|
///
|
||||||
|
/// Math operations:
|
||||||
|
/// - The script is transformed by steel_decimal; supported math forms include:
|
||||||
|
/// +, -, *, /, ^, **, pow, sqrt, >, <, =, >=, <=, min, max, abs, round,
|
||||||
|
/// ln, log, log10, exp, sin, cos, tan
|
||||||
|
/// - Columns of the following types CANNOT be used inside math expressions:
|
||||||
|
/// BIGINT, TEXT, BOOLEAN, DATE, TIMESTAMPTZ
|
||||||
|
///
|
||||||
|
/// Dependency tracking and cycles:
|
||||||
|
/// - Dependencies are extracted from steel_get_column(_with_index), get-var,
|
||||||
|
/// and steel_query_sql and stored in script_dependencies with context
|
||||||
|
/// - Cycles across tables are rejected (self-dependency is allowed)
|
||||||
#[prost(string, tag = "3")]
|
#[prost(string, tag = "3")]
|
||||||
pub script: ::prost::alloc::string::String,
|
pub script: ::prost::alloc::string::String,
|
||||||
|
/// Optional. Free-text description stored alongside the script (no functional effect).
|
||||||
#[prost(string, tag = "4")]
|
#[prost(string, tag = "4")]
|
||||||
pub description: ::prost::alloc::string::String,
|
pub description: ::prost::alloc::string::String,
|
||||||
}
|
}
|
||||||
|
/// Response after creating or updating a script.
|
||||||
#[derive(serde::Serialize, serde::Deserialize)]
|
#[derive(serde::Serialize, serde::Deserialize)]
|
||||||
#[derive(Clone, PartialEq, ::prost::Message)]
|
#[derive(Clone, PartialEq, ::prost::Message)]
|
||||||
pub struct TableScriptResponse {
|
pub struct TableScriptResponse {
|
||||||
|
/// The ID of the script record in table_scripts (new or existing on upsert).
|
||||||
|
#[prost(int64, tag = "1")]
|
||||||
|
pub id: i64,
|
||||||
|
/// Human-readable warnings concatenated into a single string. Possible messages:
|
||||||
|
/// - Warning if the script references itself (may affect first population)
|
||||||
|
/// - Count of raw SQL queries present
|
||||||
|
/// - Info about number of structured linked-table accesses
|
||||||
|
/// - Warning if many dependencies may affect performance
|
||||||
|
#[prost(string, tag = "2")]
|
||||||
|
pub warnings: ::prost::alloc::string::String,
|
||||||
|
}
|
||||||
|
#[derive(Clone, PartialEq, ::prost::Message)]
|
||||||
|
pub struct GetTableScriptsRequest {
|
||||||
|
/// Required. Profile (schema) name.
|
||||||
|
#[prost(string, tag = "1")]
|
||||||
|
pub profile_name: ::prost::alloc::string::String,
|
||||||
|
/// Required. Table name within the profile.
|
||||||
|
#[prost(string, tag = "2")]
|
||||||
|
pub table_name: ::prost::alloc::string::String,
|
||||||
|
}
|
||||||
|
#[derive(Clone, PartialEq, ::prost::Message)]
|
||||||
|
pub struct GetTableScriptsResponse {
|
||||||
|
#[prost(message, repeated, tag = "1")]
|
||||||
|
pub scripts: ::prost::alloc::vec::Vec<StoredTableScript>,
|
||||||
|
}
|
||||||
|
#[derive(Clone, PartialEq, ::prost::Message)]
|
||||||
|
pub struct StoredTableScript {
|
||||||
#[prost(int64, tag = "1")]
|
#[prost(int64, tag = "1")]
|
||||||
pub id: i64,
|
pub id: i64,
|
||||||
#[prost(string, tag = "2")]
|
#[prost(string, tag = "2")]
|
||||||
pub warnings: ::prost::alloc::string::String,
|
pub target_column: ::prost::alloc::string::String,
|
||||||
|
#[prost(string, tag = "3")]
|
||||||
|
pub target_column_type: ::prost::alloc::string::String,
|
||||||
|
#[prost(string, tag = "4")]
|
||||||
|
pub script: ::prost::alloc::string::String,
|
||||||
|
#[prost(string, tag = "5")]
|
||||||
|
pub description: ::prost::alloc::string::String,
|
||||||
|
#[prost(message, repeated, tag = "6")]
|
||||||
|
pub dependencies: ::prost::alloc::vec::Vec<ScriptDependency>,
|
||||||
|
}
|
||||||
|
#[derive(Clone, PartialEq, ::prost::Message)]
|
||||||
|
pub struct ScriptDependency {
|
||||||
|
#[prost(string, tag = "1")]
|
||||||
|
pub target_table: ::prost::alloc::string::String,
|
||||||
|
#[prost(string, tag = "2")]
|
||||||
|
pub dependency_type: ::prost::alloc::string::String,
|
||||||
|
#[prost(string, tag = "3")]
|
||||||
|
pub column: ::prost::alloc::string::String,
|
||||||
|
#[prost(int64, tag = "4")]
|
||||||
|
pub index: i64,
|
||||||
|
#[prost(string, tag = "5")]
|
||||||
|
pub query_fragment: ::prost::alloc::string::String,
|
||||||
}
|
}
|
||||||
/// Generated client implementations.
|
/// Generated client implementations.
|
||||||
pub mod table_script_client {
|
pub mod table_script_client {
|
||||||
@@ -30,6 +121,18 @@ pub mod table_script_client {
|
|||||||
)]
|
)]
|
||||||
use tonic::codegen::*;
|
use tonic::codegen::*;
|
||||||
use tonic::codegen::http::Uri;
|
use tonic::codegen::http::Uri;
|
||||||
|
/// Manages column-computation scripts for user-defined tables.
|
||||||
|
/// Each script belongs to a single table (table_definition_id) and populates
|
||||||
|
/// exactly one target column in that table. The server:
|
||||||
|
/// - Validates script syntax (non-empty, balanced parentheses, starts with '(')
|
||||||
|
/// - Validates the target column (exists, not a system column, allowed type)
|
||||||
|
/// - Validates column/type usage inside math expressions
|
||||||
|
/// - Validates referenced tables/columns against the schema
|
||||||
|
/// - Enforces link constraints for structured access (see notes below)
|
||||||
|
/// - Analyzes dependencies and prevents cycles across the schema
|
||||||
|
/// - Transforms the script to decimal-safe math (steel_decimal)
|
||||||
|
/// - Upserts into table_scripts and records dependencies in script_dependencies
|
||||||
|
/// The whole operation is transactional.
|
||||||
#[derive(Debug, Clone)]
|
#[derive(Debug, Clone)]
|
||||||
pub struct TableScriptClient<T> {
|
pub struct TableScriptClient<T> {
|
||||||
inner: tonic::client::Grpc<T>,
|
inner: tonic::client::Grpc<T>,
|
||||||
@@ -110,6 +213,23 @@ pub mod table_script_client {
|
|||||||
self.inner = self.inner.max_encoding_message_size(limit);
|
self.inner = self.inner.max_encoding_message_size(limit);
|
||||||
self
|
self
|
||||||
}
|
}
|
||||||
|
/// Create or update a script for a specific table and target column.
|
||||||
|
///
|
||||||
|
/// Behavior:
|
||||||
|
/// - Fetches the table by table_definition_id (must exist)
|
||||||
|
/// - Validates "script" (syntax), "target_column" (exists and type rules),
|
||||||
|
/// and all referenced tables/columns (must exist in same schema)
|
||||||
|
/// - Validates math operations: prohibits using certain data types in math
|
||||||
|
/// - Enforces link constraints for structured table access:
|
||||||
|
/// • Allowed always: self-references (same table)
|
||||||
|
/// • Structured access via steel_get_column / steel_get_column_with_index
|
||||||
|
/// requires an explicit link in table_definition_links
|
||||||
|
/// • Raw SQL access via steel_query_sql is permitted (still validated)
|
||||||
|
/// - Detects and rejects circular dependencies across all scripts in the schema
|
||||||
|
/// (self-references are allowed and not treated as cycles)
|
||||||
|
/// - Transforms the script to decimal-safe operations (steel_decimal)
|
||||||
|
/// - UPSERTS into table_scripts on (table_definitions_id, target_column)
|
||||||
|
/// and saves a normalized dependency list into script_dependencies
|
||||||
pub async fn post_table_script(
|
pub async fn post_table_script(
|
||||||
&mut self,
|
&mut self,
|
||||||
request: impl tonic::IntoRequest<super::PostTableScriptRequest>,
|
request: impl tonic::IntoRequest<super::PostTableScriptRequest>,
|
||||||
@@ -139,6 +259,42 @@ pub mod table_script_client {
|
|||||||
);
|
);
|
||||||
self.inner.unary(req, path, codec).await
|
self.inner.unary(req, path, codec).await
|
||||||
}
|
}
|
||||||
|
/// Fetch all stored scripts for a specific table.
|
||||||
|
///
|
||||||
|
/// Behavior:
|
||||||
|
/// - Resolves the table from (profile_name, table_name)
|
||||||
|
/// - Returns the stored, transformed script from table_scripts
|
||||||
|
/// - Includes normalized dependency metadata from script_dependencies
|
||||||
|
/// - Returns an empty scripts list when the table has no scripts
|
||||||
|
pub async fn get_table_scripts(
|
||||||
|
&mut self,
|
||||||
|
request: impl tonic::IntoRequest<super::GetTableScriptsRequest>,
|
||||||
|
) -> std::result::Result<
|
||||||
|
tonic::Response<super::GetTableScriptsResponse>,
|
||||||
|
tonic::Status,
|
||||||
|
> {
|
||||||
|
self.inner
|
||||||
|
.ready()
|
||||||
|
.await
|
||||||
|
.map_err(|e| {
|
||||||
|
tonic::Status::unknown(
|
||||||
|
format!("Service was not ready: {}", e.into()),
|
||||||
|
)
|
||||||
|
})?;
|
||||||
|
let codec = tonic::codec::ProstCodec::default();
|
||||||
|
let path = http::uri::PathAndQuery::from_static(
|
||||||
|
"/komp_ac.table_script.TableScript/GetTableScripts",
|
||||||
|
);
|
||||||
|
let mut req = request.into_request();
|
||||||
|
req.extensions_mut()
|
||||||
|
.insert(
|
||||||
|
GrpcMethod::new(
|
||||||
|
"komp_ac.table_script.TableScript",
|
||||||
|
"GetTableScripts",
|
||||||
|
),
|
||||||
|
);
|
||||||
|
self.inner.unary(req, path, codec).await
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
/// Generated server implementations.
|
/// Generated server implementations.
|
||||||
@@ -154,6 +310,23 @@ pub mod table_script_server {
|
|||||||
/// Generated trait containing gRPC methods that should be implemented for use with TableScriptServer.
|
/// Generated trait containing gRPC methods that should be implemented for use with TableScriptServer.
|
||||||
#[async_trait]
|
#[async_trait]
|
||||||
pub trait TableScript: std::marker::Send + std::marker::Sync + 'static {
|
pub trait TableScript: std::marker::Send + std::marker::Sync + 'static {
|
||||||
|
/// Create or update a script for a specific table and target column.
|
||||||
|
///
|
||||||
|
/// Behavior:
|
||||||
|
/// - Fetches the table by table_definition_id (must exist)
|
||||||
|
/// - Validates "script" (syntax), "target_column" (exists and type rules),
|
||||||
|
/// and all referenced tables/columns (must exist in same schema)
|
||||||
|
/// - Validates math operations: prohibits using certain data types in math
|
||||||
|
/// - Enforces link constraints for structured table access:
|
||||||
|
/// • Allowed always: self-references (same table)
|
||||||
|
/// • Structured access via steel_get_column / steel_get_column_with_index
|
||||||
|
/// requires an explicit link in table_definition_links
|
||||||
|
/// • Raw SQL access via steel_query_sql is permitted (still validated)
|
||||||
|
/// - Detects and rejects circular dependencies across all scripts in the schema
|
||||||
|
/// (self-references are allowed and not treated as cycles)
|
||||||
|
/// - Transforms the script to decimal-safe operations (steel_decimal)
|
||||||
|
/// - UPSERTS into table_scripts on (table_definitions_id, target_column)
|
||||||
|
/// and saves a normalized dependency list into script_dependencies
|
||||||
async fn post_table_script(
|
async fn post_table_script(
|
||||||
&self,
|
&self,
|
||||||
request: tonic::Request<super::PostTableScriptRequest>,
|
request: tonic::Request<super::PostTableScriptRequest>,
|
||||||
@@ -161,7 +334,33 @@ pub mod table_script_server {
|
|||||||
tonic::Response<super::TableScriptResponse>,
|
tonic::Response<super::TableScriptResponse>,
|
||||||
tonic::Status,
|
tonic::Status,
|
||||||
>;
|
>;
|
||||||
|
/// Fetch all stored scripts for a specific table.
|
||||||
|
///
|
||||||
|
/// Behavior:
|
||||||
|
/// - Resolves the table from (profile_name, table_name)
|
||||||
|
/// - Returns the stored, transformed script from table_scripts
|
||||||
|
/// - Includes normalized dependency metadata from script_dependencies
|
||||||
|
/// - Returns an empty scripts list when the table has no scripts
|
||||||
|
async fn get_table_scripts(
|
||||||
|
&self,
|
||||||
|
request: tonic::Request<super::GetTableScriptsRequest>,
|
||||||
|
) -> std::result::Result<
|
||||||
|
tonic::Response<super::GetTableScriptsResponse>,
|
||||||
|
tonic::Status,
|
||||||
|
>;
|
||||||
}
|
}
|
||||||
|
/// Manages column-computation scripts for user-defined tables.
|
||||||
|
/// Each script belongs to a single table (table_definition_id) and populates
|
||||||
|
/// exactly one target column in that table. The server:
|
||||||
|
/// - Validates script syntax (non-empty, balanced parentheses, starts with '(')
|
||||||
|
/// - Validates the target column (exists, not a system column, allowed type)
|
||||||
|
/// - Validates column/type usage inside math expressions
|
||||||
|
/// - Validates referenced tables/columns against the schema
|
||||||
|
/// - Enforces link constraints for structured access (see notes below)
|
||||||
|
/// - Analyzes dependencies and prevents cycles across the schema
|
||||||
|
/// - Transforms the script to decimal-safe math (steel_decimal)
|
||||||
|
/// - Upserts into table_scripts and records dependencies in script_dependencies
|
||||||
|
/// The whole operation is transactional.
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
pub struct TableScriptServer<T> {
|
pub struct TableScriptServer<T> {
|
||||||
inner: Arc<T>,
|
inner: Arc<T>,
|
||||||
@@ -283,6 +482,51 @@ pub mod table_script_server {
|
|||||||
};
|
};
|
||||||
Box::pin(fut)
|
Box::pin(fut)
|
||||||
}
|
}
|
||||||
|
"/komp_ac.table_script.TableScript/GetTableScripts" => {
|
||||||
|
#[allow(non_camel_case_types)]
|
||||||
|
struct GetTableScriptsSvc<T: TableScript>(pub Arc<T>);
|
||||||
|
impl<
|
||||||
|
T: TableScript,
|
||||||
|
> tonic::server::UnaryService<super::GetTableScriptsRequest>
|
||||||
|
for GetTableScriptsSvc<T> {
|
||||||
|
type Response = super::GetTableScriptsResponse;
|
||||||
|
type Future = BoxFuture<
|
||||||
|
tonic::Response<Self::Response>,
|
||||||
|
tonic::Status,
|
||||||
|
>;
|
||||||
|
fn call(
|
||||||
|
&mut self,
|
||||||
|
request: tonic::Request<super::GetTableScriptsRequest>,
|
||||||
|
) -> Self::Future {
|
||||||
|
let inner = Arc::clone(&self.0);
|
||||||
|
let fut = async move {
|
||||||
|
<T as TableScript>::get_table_scripts(&inner, request).await
|
||||||
|
};
|
||||||
|
Box::pin(fut)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
let accept_compression_encodings = self.accept_compression_encodings;
|
||||||
|
let send_compression_encodings = self.send_compression_encodings;
|
||||||
|
let max_decoding_message_size = self.max_decoding_message_size;
|
||||||
|
let max_encoding_message_size = self.max_encoding_message_size;
|
||||||
|
let inner = self.inner.clone();
|
||||||
|
let fut = async move {
|
||||||
|
let method = GetTableScriptsSvc(inner);
|
||||||
|
let codec = tonic::codec::ProstCodec::default();
|
||||||
|
let mut grpc = tonic::server::Grpc::new(codec)
|
||||||
|
.apply_compression_config(
|
||||||
|
accept_compression_encodings,
|
||||||
|
send_compression_encodings,
|
||||||
|
)
|
||||||
|
.apply_max_message_size_config(
|
||||||
|
max_decoding_message_size,
|
||||||
|
max_encoding_message_size,
|
||||||
|
);
|
||||||
|
let res = grpc.unary(method, req).await;
|
||||||
|
Ok(res)
|
||||||
|
};
|
||||||
|
Box::pin(fut)
|
||||||
|
}
|
||||||
_ => {
|
_ => {
|
||||||
Box::pin(async move {
|
Box::pin(async move {
|
||||||
let mut response = http::Response::new(
|
let mut response = http::Response::new(
|
||||||
|
|||||||
@@ -1,27 +1,56 @@
|
|||||||
// This file is @generated by prost-build.
|
// This file is @generated by prost-build.
|
||||||
|
/// Request identifying the profile (schema) and tables to inspect.
|
||||||
#[derive(Clone, PartialEq, ::prost::Message)]
|
#[derive(Clone, PartialEq, ::prost::Message)]
|
||||||
pub struct GetTableStructureRequest {
|
pub struct GetTableStructureRequest {
|
||||||
/// e.g., "default"
|
/// Required. Profile (PostgreSQL schema) name. Must exist in `schemas`.
|
||||||
#[prost(string, tag = "1")]
|
#[prost(string, tag = "1")]
|
||||||
pub profile_name: ::prost::alloc::string::String,
|
pub profile_name: ::prost::alloc::string::String,
|
||||||
/// e.g., "2025_adresar6"
|
/// Required. Table names within the profile. Each must exist in
|
||||||
#[prost(string, tag = "2")]
|
/// `table_definitions` for the given profile. The physical tables are then
|
||||||
pub table_name: ::prost::alloc::string::String,
|
/// introspected via information_schema.
|
||||||
|
#[prost(string, repeated, tag = "2")]
|
||||||
|
pub table_names: ::prost::alloc::vec::Vec<::prost::alloc::string::String>,
|
||||||
}
|
}
|
||||||
|
/// Batched response keyed by table name.
|
||||||
|
#[derive(Clone, PartialEq, ::prost::Message)]
|
||||||
|
pub struct GetTableStructureResponse {
|
||||||
|
/// Per-table physical column lists keyed by requested table name.
|
||||||
|
#[prost(map = "string, message", tag = "1")]
|
||||||
|
pub table_structures: ::std::collections::HashMap<
|
||||||
|
::prost::alloc::string::String,
|
||||||
|
TableStructureResponse,
|
||||||
|
>,
|
||||||
|
}
|
||||||
|
/// Response with the ordered list of columns (by ordinal position) for one table.
|
||||||
#[derive(Clone, PartialEq, ::prost::Message)]
|
#[derive(Clone, PartialEq, ::prost::Message)]
|
||||||
pub struct TableStructureResponse {
|
pub struct TableStructureResponse {
|
||||||
|
/// Columns of the physical table, including system columns (id, deleted,
|
||||||
|
/// created_at), user-defined columns, and any foreign-key columns such as
|
||||||
|
/// "<linked_table>_id". May be empty if the physical table is missing.
|
||||||
#[prost(message, repeated, tag = "1")]
|
#[prost(message, repeated, tag = "1")]
|
||||||
pub columns: ::prost::alloc::vec::Vec<TableColumn>,
|
pub columns: ::prost::alloc::vec::Vec<TableColumn>,
|
||||||
}
|
}
|
||||||
|
/// One physical column entry as reported by information_schema.
|
||||||
#[derive(Clone, PartialEq, ::prost::Message)]
|
#[derive(Clone, PartialEq, ::prost::Message)]
|
||||||
pub struct TableColumn {
|
pub struct TableColumn {
|
||||||
|
/// Column name exactly as defined in PostgreSQL.
|
||||||
#[prost(string, tag = "1")]
|
#[prost(string, tag = "1")]
|
||||||
pub name: ::prost::alloc::string::String,
|
pub name: ::prost::alloc::string::String,
|
||||||
/// e.g., "TEXT", "BIGINT", "VARCHAR(255)", "TIMESTAMPTZ"
|
/// Normalized data type string derived from information_schema:
|
||||||
|
/// - VARCHAR(n) when udt_name='varchar' with character_maximum_length
|
||||||
|
/// - CHAR(n) when udt_name='bpchar' with character_maximum_length
|
||||||
|
/// - NUMERIC(p,s) when udt_name='numeric' with precision and scale
|
||||||
|
/// - NUMERIC(p) when udt_name='numeric' with precision only
|
||||||
|
/// - <TYPE>\[\] for array types (udt_name starting with '_', e.g., INT\[\] )
|
||||||
|
/// - Otherwise UPPER(udt_name), e.g., TEXT, BIGINT, TIMESTAMPTZ
|
||||||
|
/// Examples: "TEXT", "BIGINT", "VARCHAR(255)", "TIMESTAMPTZ", "NUMERIC(14,4)"
|
||||||
#[prost(string, tag = "2")]
|
#[prost(string, tag = "2")]
|
||||||
pub data_type: ::prost::alloc::string::String,
|
pub data_type: ::prost::alloc::string::String,
|
||||||
|
/// True if information_schema reports the column as nullable.
|
||||||
#[prost(bool, tag = "3")]
|
#[prost(bool, tag = "3")]
|
||||||
pub is_nullable: bool,
|
pub is_nullable: bool,
|
||||||
|
/// True if the column is part of the table's PRIMARY KEY.
|
||||||
|
/// Typically true for the "id" column created by the system.
|
||||||
#[prost(bool, tag = "4")]
|
#[prost(bool, tag = "4")]
|
||||||
pub is_primary_key: bool,
|
pub is_primary_key: bool,
|
||||||
}
|
}
|
||||||
@@ -36,6 +65,13 @@ pub mod table_structure_service_client {
|
|||||||
)]
|
)]
|
||||||
use tonic::codegen::*;
|
use tonic::codegen::*;
|
||||||
use tonic::codegen::http::Uri;
|
use tonic::codegen::http::Uri;
|
||||||
|
/// Introspects the physical PostgreSQL tables for one or more logical tables
|
||||||
|
/// (defined in table_definitions) and returns their column structures.
|
||||||
|
/// The server validates that:
|
||||||
|
/// - The profile (schema) exists in `schemas`
|
||||||
|
/// - Every table is defined for that profile in `table_definitions`
|
||||||
|
/// It then queries information_schema for the physical tables and returns
|
||||||
|
/// normalized column metadata.
|
||||||
#[derive(Debug, Clone)]
|
#[derive(Debug, Clone)]
|
||||||
pub struct TableStructureServiceClient<T> {
|
pub struct TableStructureServiceClient<T> {
|
||||||
inner: tonic::client::Grpc<T>,
|
inner: tonic::client::Grpc<T>,
|
||||||
@@ -116,11 +152,21 @@ pub mod table_structure_service_client {
|
|||||||
self.inner = self.inner.max_encoding_message_size(limit);
|
self.inner = self.inner.max_encoding_message_size(limit);
|
||||||
self
|
self
|
||||||
}
|
}
|
||||||
|
/// Return the physical column list (name, normalized data_type,
|
||||||
|
/// nullability, primary key flag) for one or more tables in a profile.
|
||||||
|
///
|
||||||
|
/// Behavior:
|
||||||
|
/// - NOT_FOUND if profile doesn't exist in `schemas`
|
||||||
|
/// - NOT_FOUND if any table is not defined for that profile in `table_definitions`
|
||||||
|
/// - Queries information_schema.columns ordered by ordinal position
|
||||||
|
/// - Normalizes data_type text (details under TableColumn.data_type)
|
||||||
|
/// - Returns an error if any validated table has no visible columns in
|
||||||
|
/// information_schema (e.g., physical table missing)
|
||||||
pub async fn get_table_structure(
|
pub async fn get_table_structure(
|
||||||
&mut self,
|
&mut self,
|
||||||
request: impl tonic::IntoRequest<super::GetTableStructureRequest>,
|
request: impl tonic::IntoRequest<super::GetTableStructureRequest>,
|
||||||
) -> std::result::Result<
|
) -> std::result::Result<
|
||||||
tonic::Response<super::TableStructureResponse>,
|
tonic::Response<super::GetTableStructureResponse>,
|
||||||
tonic::Status,
|
tonic::Status,
|
||||||
> {
|
> {
|
||||||
self.inner
|
self.inner
|
||||||
@@ -160,14 +206,31 @@ pub mod table_structure_service_server {
|
|||||||
/// Generated trait containing gRPC methods that should be implemented for use with TableStructureServiceServer.
|
/// Generated trait containing gRPC methods that should be implemented for use with TableStructureServiceServer.
|
||||||
#[async_trait]
|
#[async_trait]
|
||||||
pub trait TableStructureService: std::marker::Send + std::marker::Sync + 'static {
|
pub trait TableStructureService: std::marker::Send + std::marker::Sync + 'static {
|
||||||
|
/// Return the physical column list (name, normalized data_type,
|
||||||
|
/// nullability, primary key flag) for one or more tables in a profile.
|
||||||
|
///
|
||||||
|
/// Behavior:
|
||||||
|
/// - NOT_FOUND if profile doesn't exist in `schemas`
|
||||||
|
/// - NOT_FOUND if any table is not defined for that profile in `table_definitions`
|
||||||
|
/// - Queries information_schema.columns ordered by ordinal position
|
||||||
|
/// - Normalizes data_type text (details under TableColumn.data_type)
|
||||||
|
/// - Returns an error if any validated table has no visible columns in
|
||||||
|
/// information_schema (e.g., physical table missing)
|
||||||
async fn get_table_structure(
|
async fn get_table_structure(
|
||||||
&self,
|
&self,
|
||||||
request: tonic::Request<super::GetTableStructureRequest>,
|
request: tonic::Request<super::GetTableStructureRequest>,
|
||||||
) -> std::result::Result<
|
) -> std::result::Result<
|
||||||
tonic::Response<super::TableStructureResponse>,
|
tonic::Response<super::GetTableStructureResponse>,
|
||||||
tonic::Status,
|
tonic::Status,
|
||||||
>;
|
>;
|
||||||
}
|
}
|
||||||
|
/// Introspects the physical PostgreSQL tables for one or more logical tables
|
||||||
|
/// (defined in table_definitions) and returns their column structures.
|
||||||
|
/// The server validates that:
|
||||||
|
/// - The profile (schema) exists in `schemas`
|
||||||
|
/// - Every table is defined for that profile in `table_definitions`
|
||||||
|
/// It then queries information_schema for the physical tables and returns
|
||||||
|
/// normalized column metadata.
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
pub struct TableStructureServiceServer<T> {
|
pub struct TableStructureServiceServer<T> {
|
||||||
inner: Arc<T>,
|
inner: Arc<T>,
|
||||||
@@ -252,7 +315,7 @@ pub mod table_structure_service_server {
|
|||||||
T: TableStructureService,
|
T: TableStructureService,
|
||||||
> tonic::server::UnaryService<super::GetTableStructureRequest>
|
> tonic::server::UnaryService<super::GetTableStructureRequest>
|
||||||
for GetTableStructureSvc<T> {
|
for GetTableStructureSvc<T> {
|
||||||
type Response = super::TableStructureResponse;
|
type Response = super::GetTableStructureResponse;
|
||||||
type Future = BoxFuture<
|
type Future = BoxFuture<
|
||||||
tonic::Response<Self::Response>,
|
tonic::Response<Self::Response>,
|
||||||
tonic::Status,
|
tonic::Status,
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -1,92 +1,206 @@
|
|||||||
// This file is @generated by prost-build.
|
// This file is @generated by prost-build.
|
||||||
|
/// Insert a new row.
|
||||||
#[derive(Clone, PartialEq, ::prost::Message)]
|
#[derive(Clone, PartialEq, ::prost::Message)]
|
||||||
pub struct PostTableDataRequest {
|
pub struct PostTableDataRequest {
|
||||||
|
/// Required. Profile (PostgreSQL schema) name that owns the table.
|
||||||
|
/// Must exist in the schemas table.
|
||||||
#[prost(string, tag = "1")]
|
#[prost(string, tag = "1")]
|
||||||
pub profile_name: ::prost::alloc::string::String,
|
pub profile_name: ::prost::alloc::string::String,
|
||||||
|
/// Required. Logical table (definition) name within the profile.
|
||||||
|
/// Must exist in table_definitions for the given profile.
|
||||||
#[prost(string, tag = "2")]
|
#[prost(string, tag = "2")]
|
||||||
pub table_name: ::prost::alloc::string::String,
|
pub table_name: ::prost::alloc::string::String,
|
||||||
|
/// Required. Key-value data for columns to insert.
|
||||||
|
///
|
||||||
|
/// Allowed keys:
|
||||||
|
/// - User-defined columns from the table definition
|
||||||
|
/// - System/FK columns:
|
||||||
|
/// • "deleted" (BOOLEAN), optional; default FALSE if not provided
|
||||||
|
/// • "<linked_table>_id" (BIGINT) for each table link
|
||||||
|
///
|
||||||
|
/// Type expectations by SQL type:
|
||||||
|
/// - TEXT: string value; empty string is treated as NULL
|
||||||
|
/// - BOOLEAN: bool value
|
||||||
|
/// - TIMESTAMPTZ: ISO 8601/RFC 3339 string (parsed to TIMESTAMPTZ)
|
||||||
|
/// - INTEGER: number with no fractional part and within i32 range
|
||||||
|
/// - BIGINT: number with no fractional part and within i64 range
|
||||||
|
/// - NUMERIC(p,s): string representation only; empty string becomes NULL
|
||||||
|
/// (numbers for NUMERIC are rejected to avoid precision loss)
|
||||||
|
///
|
||||||
|
/// Script validation rules:
|
||||||
|
/// - If a script exists for a target column, that column MUST be present here,
|
||||||
|
/// and its provided value MUST equal the script’s computed value (type-aware
|
||||||
|
/// comparison, e.g., decimals are compared numerically).
|
||||||
|
///
|
||||||
|
/// Notes:
|
||||||
|
/// - Unknown/invalid column names are rejected
|
||||||
|
/// - Some application-specific validations may apply (e.g., max length for
|
||||||
|
/// certain fields like "telefon")
|
||||||
#[prost(map = "string, message", tag = "3")]
|
#[prost(map = "string, message", tag = "3")]
|
||||||
pub data: ::std::collections::HashMap<
|
pub data: ::std::collections::HashMap<
|
||||||
::prost::alloc::string::String,
|
::prost::alloc::string::String,
|
||||||
::prost_types::Value,
|
::prost_types::Value,
|
||||||
>,
|
>,
|
||||||
}
|
}
|
||||||
|
/// Insert response.
|
||||||
#[derive(Clone, PartialEq, ::prost::Message)]
|
#[derive(Clone, PartialEq, ::prost::Message)]
|
||||||
pub struct PostTableDataResponse {
|
pub struct PostTableDataResponse {
|
||||||
|
/// True if the insert succeeded.
|
||||||
#[prost(bool, tag = "1")]
|
#[prost(bool, tag = "1")]
|
||||||
pub success: bool,
|
pub success: bool,
|
||||||
|
/// Human-readable message.
|
||||||
#[prost(string, tag = "2")]
|
#[prost(string, tag = "2")]
|
||||||
pub message: ::prost::alloc::string::String,
|
pub message: ::prost::alloc::string::String,
|
||||||
|
/// The id of the inserted row.
|
||||||
#[prost(int64, tag = "3")]
|
#[prost(int64, tag = "3")]
|
||||||
pub inserted_id: i64,
|
pub inserted_id: i64,
|
||||||
}
|
}
|
||||||
|
/// One row in a bulk insert request.
|
||||||
#[derive(Clone, PartialEq, ::prost::Message)]
|
#[derive(Clone, PartialEq, ::prost::Message)]
|
||||||
pub struct PutTableDataRequest {
|
pub struct PostTableDataBulkRow {
|
||||||
|
/// Required. Same data payload as PostTableDataRequest.data.
|
||||||
|
#[prost(map = "string, message", tag = "1")]
|
||||||
|
pub data: ::std::collections::HashMap<
|
||||||
|
::prost::alloc::string::String,
|
||||||
|
::prost_types::Value,
|
||||||
|
>,
|
||||||
|
}
|
||||||
|
/// Bulk insert request.
|
||||||
|
#[derive(Clone, PartialEq, ::prost::Message)]
|
||||||
|
pub struct PostTableDataBulkRequest {
|
||||||
|
/// Required. Profile (PostgreSQL schema) name that owns the table.
|
||||||
#[prost(string, tag = "1")]
|
#[prost(string, tag = "1")]
|
||||||
pub profile_name: ::prost::alloc::string::String,
|
pub profile_name: ::prost::alloc::string::String,
|
||||||
|
/// Required. Logical table (definition) name within the profile.
|
||||||
#[prost(string, tag = "2")]
|
#[prost(string, tag = "2")]
|
||||||
pub table_name: ::prost::alloc::string::String,
|
pub table_name: ::prost::alloc::string::String,
|
||||||
|
/// Required. Rows to insert. Must contain at least 1 and at most 10,000 rows.
|
||||||
|
#[prost(message, repeated, tag = "3")]
|
||||||
|
pub rows: ::prost::alloc::vec::Vec<PostTableDataBulkRow>,
|
||||||
|
}
|
||||||
|
/// Bulk insert response.
|
||||||
|
#[derive(Clone, PartialEq, ::prost::Message)]
|
||||||
|
pub struct PostTableDataBulkResponse {
|
||||||
|
/// True if all rows were inserted successfully.
|
||||||
|
#[prost(bool, tag = "1")]
|
||||||
|
pub success: bool,
|
||||||
|
/// Human-readable message.
|
||||||
|
#[prost(string, tag = "2")]
|
||||||
|
pub message: ::prost::alloc::string::String,
|
||||||
|
/// Per-row responses from the underlying PostTableData logic, in request order.
|
||||||
|
#[prost(message, repeated, tag = "3")]
|
||||||
|
pub responses: ::prost::alloc::vec::Vec<PostTableDataResponse>,
|
||||||
|
}
|
||||||
|
/// Update an existing row.
|
||||||
|
#[derive(Clone, PartialEq, ::prost::Message)]
|
||||||
|
pub struct PutTableDataRequest {
|
||||||
|
/// Required. Profile (schema) name.
|
||||||
|
#[prost(string, tag = "1")]
|
||||||
|
pub profile_name: ::prost::alloc::string::String,
|
||||||
|
/// Required. Table name within the profile.
|
||||||
|
#[prost(string, tag = "2")]
|
||||||
|
pub table_name: ::prost::alloc::string::String,
|
||||||
|
/// Required. Id of the row to update.
|
||||||
#[prost(int64, tag = "3")]
|
#[prost(int64, tag = "3")]
|
||||||
pub id: i64,
|
pub id: i64,
|
||||||
|
/// Required. Columns to update (same typing rules as PostTableDataRequest.data).
|
||||||
|
///
|
||||||
|
/// Special script rules:
|
||||||
|
/// - If a script targets column X and X is included here, the value for X must
|
||||||
|
/// equal the script’s result (type-aware).
|
||||||
|
/// - If X is not included here but the update would cause the script’s result
|
||||||
|
/// to change compared to the current stored value, the update is rejected with
|
||||||
|
/// FAILED_PRECONDITION, instructing the caller to include X explicitly.
|
||||||
|
///
|
||||||
|
/// Passing an empty map results in a no-op success response.
|
||||||
#[prost(map = "string, message", tag = "4")]
|
#[prost(map = "string, message", tag = "4")]
|
||||||
pub data: ::std::collections::HashMap<
|
pub data: ::std::collections::HashMap<
|
||||||
::prost::alloc::string::String,
|
::prost::alloc::string::String,
|
||||||
::prost_types::Value,
|
::prost_types::Value,
|
||||||
>,
|
>,
|
||||||
}
|
}
|
||||||
|
/// Update response.
|
||||||
#[derive(Clone, PartialEq, ::prost::Message)]
|
#[derive(Clone, PartialEq, ::prost::Message)]
|
||||||
pub struct PutTableDataResponse {
|
pub struct PutTableDataResponse {
|
||||||
|
/// True if the update succeeded (or no-op on empty data).
|
||||||
#[prost(bool, tag = "1")]
|
#[prost(bool, tag = "1")]
|
||||||
pub success: bool,
|
pub success: bool,
|
||||||
|
/// Human-readable message.
|
||||||
#[prost(string, tag = "2")]
|
#[prost(string, tag = "2")]
|
||||||
pub message: ::prost::alloc::string::String,
|
pub message: ::prost::alloc::string::String,
|
||||||
|
/// The id of the updated row.
|
||||||
#[prost(int64, tag = "3")]
|
#[prost(int64, tag = "3")]
|
||||||
pub updated_id: i64,
|
pub updated_id: i64,
|
||||||
}
|
}
|
||||||
|
/// Soft-delete a single row.
|
||||||
#[derive(Clone, PartialEq, ::prost::Message)]
|
#[derive(Clone, PartialEq, ::prost::Message)]
|
||||||
pub struct DeleteTableDataRequest {
|
pub struct DeleteTableDataRequest {
|
||||||
|
/// Required. Profile (schema) name.
|
||||||
#[prost(string, tag = "1")]
|
#[prost(string, tag = "1")]
|
||||||
pub profile_name: ::prost::alloc::string::String,
|
pub profile_name: ::prost::alloc::string::String,
|
||||||
|
/// Required. Table name within the profile.
|
||||||
#[prost(string, tag = "2")]
|
#[prost(string, tag = "2")]
|
||||||
pub table_name: ::prost::alloc::string::String,
|
pub table_name: ::prost::alloc::string::String,
|
||||||
|
/// Required. Row id to soft-delete.
|
||||||
#[prost(int64, tag = "3")]
|
#[prost(int64, tag = "3")]
|
||||||
pub record_id: i64,
|
pub record_id: i64,
|
||||||
}
|
}
|
||||||
|
/// Soft-delete response.
|
||||||
#[derive(Clone, Copy, PartialEq, ::prost::Message)]
|
#[derive(Clone, Copy, PartialEq, ::prost::Message)]
|
||||||
pub struct DeleteTableDataResponse {
|
pub struct DeleteTableDataResponse {
|
||||||
|
/// True if a row was marked deleted (id existed and was not already deleted).
|
||||||
#[prost(bool, tag = "1")]
|
#[prost(bool, tag = "1")]
|
||||||
pub success: bool,
|
pub success: bool,
|
||||||
}
|
}
|
||||||
|
/// Fetch a single non-deleted row by id.
|
||||||
#[derive(Clone, PartialEq, ::prost::Message)]
|
#[derive(Clone, PartialEq, ::prost::Message)]
|
||||||
pub struct GetTableDataRequest {
|
pub struct GetTableDataRequest {
|
||||||
|
/// Required. Profile (schema) name.
|
||||||
#[prost(string, tag = "1")]
|
#[prost(string, tag = "1")]
|
||||||
pub profile_name: ::prost::alloc::string::String,
|
pub profile_name: ::prost::alloc::string::String,
|
||||||
|
/// Required. Table name within the profile.
|
||||||
#[prost(string, tag = "2")]
|
#[prost(string, tag = "2")]
|
||||||
pub table_name: ::prost::alloc::string::String,
|
pub table_name: ::prost::alloc::string::String,
|
||||||
|
/// Required. Id of the row to fetch.
|
||||||
#[prost(int64, tag = "3")]
|
#[prost(int64, tag = "3")]
|
||||||
pub id: i64,
|
pub id: i64,
|
||||||
}
|
}
|
||||||
|
/// Row payload: all columns returned as strings.
|
||||||
#[derive(Clone, PartialEq, ::prost::Message)]
|
#[derive(Clone, PartialEq, ::prost::Message)]
|
||||||
pub struct GetTableDataResponse {
|
pub struct GetTableDataResponse {
|
||||||
|
/// Map of column_name → stringified value for:
|
||||||
|
/// - id, deleted
|
||||||
|
/// - all user-defined columns from the table definition
|
||||||
|
/// - FK columns named "<linked_table>_id" for each table link
|
||||||
|
///
|
||||||
|
/// All values are returned as TEXT via col::TEXT and COALESCEed to empty string
|
||||||
|
/// (NULL becomes ""). The row is returned only if deleted = FALSE.
|
||||||
#[prost(map = "string, string", tag = "1")]
|
#[prost(map = "string, string", tag = "1")]
|
||||||
pub data: ::std::collections::HashMap<
|
pub data: ::std::collections::HashMap<
|
||||||
::prost::alloc::string::String,
|
::prost::alloc::string::String,
|
||||||
::prost::alloc::string::String,
|
::prost::alloc::string::String,
|
||||||
>,
|
>,
|
||||||
}
|
}
|
||||||
|
/// Count non-deleted rows.
|
||||||
#[derive(Clone, PartialEq, ::prost::Message)]
|
#[derive(Clone, PartialEq, ::prost::Message)]
|
||||||
pub struct GetTableDataCountRequest {
|
pub struct GetTableDataCountRequest {
|
||||||
|
/// Required. Profile (schema) name.
|
||||||
#[prost(string, tag = "1")]
|
#[prost(string, tag = "1")]
|
||||||
pub profile_name: ::prost::alloc::string::String,
|
pub profile_name: ::prost::alloc::string::String,
|
||||||
|
/// Required. Table name within the profile.
|
||||||
#[prost(string, tag = "2")]
|
#[prost(string, tag = "2")]
|
||||||
pub table_name: ::prost::alloc::string::String,
|
pub table_name: ::prost::alloc::string::String,
|
||||||
}
|
}
|
||||||
|
/// Fetch by ordinal position among non-deleted rows (1-based).
|
||||||
#[derive(Clone, PartialEq, ::prost::Message)]
|
#[derive(Clone, PartialEq, ::prost::Message)]
|
||||||
pub struct GetTableDataByPositionRequest {
|
pub struct GetTableDataByPositionRequest {
|
||||||
|
/// Required. Profile (schema) name.
|
||||||
#[prost(string, tag = "1")]
|
#[prost(string, tag = "1")]
|
||||||
pub profile_name: ::prost::alloc::string::String,
|
pub profile_name: ::prost::alloc::string::String,
|
||||||
|
/// Required. Table name within the profile.
|
||||||
#[prost(string, tag = "2")]
|
#[prost(string, tag = "2")]
|
||||||
pub table_name: ::prost::alloc::string::String,
|
pub table_name: ::prost::alloc::string::String,
|
||||||
|
/// Required. 1-based position by id ascending among rows with deleted = FALSE.
|
||||||
#[prost(int32, tag = "3")]
|
#[prost(int32, tag = "3")]
|
||||||
pub position: i32,
|
pub position: i32,
|
||||||
}
|
}
|
||||||
@@ -101,6 +215,11 @@ pub mod tables_data_client {
|
|||||||
)]
|
)]
|
||||||
use tonic::codegen::*;
|
use tonic::codegen::*;
|
||||||
use tonic::codegen::http::Uri;
|
use tonic::codegen::http::Uri;
|
||||||
|
/// Read and write row data for user-defined tables inside profiles (schemas).
|
||||||
|
/// Operations are performed against the physical PostgreSQL table that
|
||||||
|
/// corresponds to the logical table definition and are scoped by profile
|
||||||
|
/// (schema). Deletions are soft (set deleted = true). Typed binding and
|
||||||
|
/// script-based validation are enforced consistently.
|
||||||
#[derive(Debug, Clone)]
|
#[derive(Debug, Clone)]
|
||||||
pub struct TablesDataClient<T> {
|
pub struct TablesDataClient<T> {
|
||||||
inner: tonic::client::Grpc<T>,
|
inner: tonic::client::Grpc<T>,
|
||||||
@@ -181,6 +300,16 @@ pub mod tables_data_client {
|
|||||||
self.inner = self.inner.max_encoding_message_size(limit);
|
self.inner = self.inner.max_encoding_message_size(limit);
|
||||||
self
|
self
|
||||||
}
|
}
|
||||||
|
/// Insert a new row into a table with strict type binding and script validation.
|
||||||
|
///
|
||||||
|
/// Behavior:
|
||||||
|
/// - Validates that profile (schema) exists and table is defined for it
|
||||||
|
/// - Validates provided columns exist (user-defined or allowed system/FK columns)
|
||||||
|
/// - For columns targeted by scripts in this table, the client MUST provide the
|
||||||
|
/// value, and it MUST equal the script’s calculated value (compared type-safely)
|
||||||
|
/// - Binds values with correct SQL types, rejects invalid formats/ranges
|
||||||
|
/// - Inserts the row and returns the new id; queues search indexing (best effort)
|
||||||
|
/// - If the physical table is missing but the definition exists, returns INTERNAL
|
||||||
pub async fn post_table_data(
|
pub async fn post_table_data(
|
||||||
&mut self,
|
&mut self,
|
||||||
request: impl tonic::IntoRequest<super::PostTableDataRequest>,
|
request: impl tonic::IntoRequest<super::PostTableDataRequest>,
|
||||||
@@ -207,6 +336,55 @@ pub mod tables_data_client {
|
|||||||
);
|
);
|
||||||
self.inner.unary(req, path, codec).await
|
self.inner.unary(req, path, codec).await
|
||||||
}
|
}
|
||||||
|
/// Insert multiple rows by applying PostTableData behavior to each row.
|
||||||
|
///
|
||||||
|
/// Behavior:
|
||||||
|
/// - Accepts 1..10,000 rows in one gRPC request
|
||||||
|
/// - Processes rows in request order
|
||||||
|
/// - Each row is inserted through the same validation, script execution,
|
||||||
|
/// typed binding, database insert, and indexing path as PostTableData
|
||||||
|
/// - Stops at the first failing row and returns that row's gRPC error code
|
||||||
|
/// with row index context; rows inserted before the failure remain inserted
|
||||||
|
pub async fn post_table_data_bulk(
|
||||||
|
&mut self,
|
||||||
|
request: impl tonic::IntoRequest<super::PostTableDataBulkRequest>,
|
||||||
|
) -> std::result::Result<
|
||||||
|
tonic::Response<super::PostTableDataBulkResponse>,
|
||||||
|
tonic::Status,
|
||||||
|
> {
|
||||||
|
self.inner
|
||||||
|
.ready()
|
||||||
|
.await
|
||||||
|
.map_err(|e| {
|
||||||
|
tonic::Status::unknown(
|
||||||
|
format!("Service was not ready: {}", e.into()),
|
||||||
|
)
|
||||||
|
})?;
|
||||||
|
let codec = tonic::codec::ProstCodec::default();
|
||||||
|
let path = http::uri::PathAndQuery::from_static(
|
||||||
|
"/komp_ac.tables_data.TablesData/PostTableDataBulk",
|
||||||
|
);
|
||||||
|
let mut req = request.into_request();
|
||||||
|
req.extensions_mut()
|
||||||
|
.insert(
|
||||||
|
GrpcMethod::new(
|
||||||
|
"komp_ac.tables_data.TablesData",
|
||||||
|
"PostTableDataBulk",
|
||||||
|
),
|
||||||
|
);
|
||||||
|
self.inner.unary(req, path, codec).await
|
||||||
|
}
|
||||||
|
/// Update existing row data with strict type binding and script validation.
|
||||||
|
///
|
||||||
|
/// Behavior:
|
||||||
|
/// - Validates profile and table, and that the record exists
|
||||||
|
/// - If request data is empty, returns success without changing the row
|
||||||
|
/// - For columns targeted by scripts:
|
||||||
|
/// • If included in update, provided value must equal the script result
|
||||||
|
/// • If not included, update must not cause the script result to differ
|
||||||
|
/// from the current stored value; otherwise FAILED_PRECONDITION is returned
|
||||||
|
/// - Binds values with correct SQL types; rejects invalid formats/ranges
|
||||||
|
/// - Updates the row and returns the id; queues search indexing (best effort)
|
||||||
pub async fn put_table_data(
|
pub async fn put_table_data(
|
||||||
&mut self,
|
&mut self,
|
||||||
request: impl tonic::IntoRequest<super::PutTableDataRequest>,
|
request: impl tonic::IntoRequest<super::PutTableDataRequest>,
|
||||||
@@ -233,6 +411,13 @@ pub mod tables_data_client {
|
|||||||
);
|
);
|
||||||
self.inner.unary(req, path, codec).await
|
self.inner.unary(req, path, codec).await
|
||||||
}
|
}
|
||||||
|
/// Soft-delete a single record (sets deleted = true) if it exists and is not already deleted.
|
||||||
|
///
|
||||||
|
/// Behavior:
|
||||||
|
/// - Validates profile and table definition
|
||||||
|
/// - Updates only rows with deleted = false
|
||||||
|
/// - success = true means a row was actually changed; false means nothing to delete
|
||||||
|
/// - If the physical table is missing but the definition exists, returns INTERNAL
|
||||||
pub async fn delete_table_data(
|
pub async fn delete_table_data(
|
||||||
&mut self,
|
&mut self,
|
||||||
request: impl tonic::IntoRequest<super::DeleteTableDataRequest>,
|
request: impl tonic::IntoRequest<super::DeleteTableDataRequest>,
|
||||||
@@ -259,6 +444,15 @@ pub mod tables_data_client {
|
|||||||
);
|
);
|
||||||
self.inner.unary(req, path, codec).await
|
self.inner.unary(req, path, codec).await
|
||||||
}
|
}
|
||||||
|
/// Fetch a single non-deleted row by id as textified values.
|
||||||
|
///
|
||||||
|
/// Behavior:
|
||||||
|
/// - Validates profile and table definition
|
||||||
|
/// - Returns all columns as strings (COALESCE(col::TEXT, '') AS col)
|
||||||
|
/// including: id, deleted, all user-defined columns, and FK columns
|
||||||
|
/// named "<linked_table>_id" for each table link
|
||||||
|
/// - Fails with NOT_FOUND if record does not exist or is soft-deleted
|
||||||
|
/// - If the physical table is missing but the definition exists, returns INTERNAL
|
||||||
pub async fn get_table_data(
|
pub async fn get_table_data(
|
||||||
&mut self,
|
&mut self,
|
||||||
request: impl tonic::IntoRequest<super::GetTableDataRequest>,
|
request: impl tonic::IntoRequest<super::GetTableDataRequest>,
|
||||||
@@ -285,6 +479,12 @@ pub mod tables_data_client {
|
|||||||
);
|
);
|
||||||
self.inner.unary(req, path, codec).await
|
self.inner.unary(req, path, codec).await
|
||||||
}
|
}
|
||||||
|
/// Count non-deleted rows in a table.
|
||||||
|
///
|
||||||
|
/// Behavior:
|
||||||
|
/// - Validates profile and table definition
|
||||||
|
/// - Returns komp_ac.common.CountResponse.count with rows where deleted = FALSE
|
||||||
|
/// - If the physical table is missing but the definition exists, returns INTERNAL
|
||||||
pub async fn get_table_data_count(
|
pub async fn get_table_data_count(
|
||||||
&mut self,
|
&mut self,
|
||||||
request: impl tonic::IntoRequest<super::GetTableDataCountRequest>,
|
request: impl tonic::IntoRequest<super::GetTableDataCountRequest>,
|
||||||
@@ -314,6 +514,12 @@ pub mod tables_data_client {
|
|||||||
);
|
);
|
||||||
self.inner.unary(req, path, codec).await
|
self.inner.unary(req, path, codec).await
|
||||||
}
|
}
|
||||||
|
/// Fetch the N-th non-deleted row by id order (1-based), then return its full data.
|
||||||
|
///
|
||||||
|
/// Behavior:
|
||||||
|
/// - position is 1-based (position = 1 → first row by id ASC with deleted = FALSE)
|
||||||
|
/// - Returns NOT_FOUND if position is out of bounds
|
||||||
|
/// - Otherwise identical to GetTableData for the selected id
|
||||||
pub async fn get_table_data_by_position(
|
pub async fn get_table_data_by_position(
|
||||||
&mut self,
|
&mut self,
|
||||||
request: impl tonic::IntoRequest<super::GetTableDataByPositionRequest>,
|
request: impl tonic::IntoRequest<super::GetTableDataByPositionRequest>,
|
||||||
@@ -358,6 +564,16 @@ pub mod tables_data_server {
|
|||||||
/// Generated trait containing gRPC methods that should be implemented for use with TablesDataServer.
|
/// Generated trait containing gRPC methods that should be implemented for use with TablesDataServer.
|
||||||
#[async_trait]
|
#[async_trait]
|
||||||
pub trait TablesData: std::marker::Send + std::marker::Sync + 'static {
|
pub trait TablesData: std::marker::Send + std::marker::Sync + 'static {
|
||||||
|
/// Insert a new row into a table with strict type binding and script validation.
|
||||||
|
///
|
||||||
|
/// Behavior:
|
||||||
|
/// - Validates that profile (schema) exists and table is defined for it
|
||||||
|
/// - Validates provided columns exist (user-defined or allowed system/FK columns)
|
||||||
|
/// - For columns targeted by scripts in this table, the client MUST provide the
|
||||||
|
/// value, and it MUST equal the script’s calculated value (compared type-safely)
|
||||||
|
/// - Binds values with correct SQL types, rejects invalid formats/ranges
|
||||||
|
/// - Inserts the row and returns the new id; queues search indexing (best effort)
|
||||||
|
/// - If the physical table is missing but the definition exists, returns INTERNAL
|
||||||
async fn post_table_data(
|
async fn post_table_data(
|
||||||
&self,
|
&self,
|
||||||
request: tonic::Request<super::PostTableDataRequest>,
|
request: tonic::Request<super::PostTableDataRequest>,
|
||||||
@@ -365,6 +581,33 @@ pub mod tables_data_server {
|
|||||||
tonic::Response<super::PostTableDataResponse>,
|
tonic::Response<super::PostTableDataResponse>,
|
||||||
tonic::Status,
|
tonic::Status,
|
||||||
>;
|
>;
|
||||||
|
/// Insert multiple rows by applying PostTableData behavior to each row.
|
||||||
|
///
|
||||||
|
/// Behavior:
|
||||||
|
/// - Accepts 1..10,000 rows in one gRPC request
|
||||||
|
/// - Processes rows in request order
|
||||||
|
/// - Each row is inserted through the same validation, script execution,
|
||||||
|
/// typed binding, database insert, and indexing path as PostTableData
|
||||||
|
/// - Stops at the first failing row and returns that row's gRPC error code
|
||||||
|
/// with row index context; rows inserted before the failure remain inserted
|
||||||
|
async fn post_table_data_bulk(
|
||||||
|
&self,
|
||||||
|
request: tonic::Request<super::PostTableDataBulkRequest>,
|
||||||
|
) -> std::result::Result<
|
||||||
|
tonic::Response<super::PostTableDataBulkResponse>,
|
||||||
|
tonic::Status,
|
||||||
|
>;
|
||||||
|
/// Update existing row data with strict type binding and script validation.
|
||||||
|
///
|
||||||
|
/// Behavior:
|
||||||
|
/// - Validates profile and table, and that the record exists
|
||||||
|
/// - If request data is empty, returns success without changing the row
|
||||||
|
/// - For columns targeted by scripts:
|
||||||
|
/// • If included in update, provided value must equal the script result
|
||||||
|
/// • If not included, update must not cause the script result to differ
|
||||||
|
/// from the current stored value; otherwise FAILED_PRECONDITION is returned
|
||||||
|
/// - Binds values with correct SQL types; rejects invalid formats/ranges
|
||||||
|
/// - Updates the row and returns the id; queues search indexing (best effort)
|
||||||
async fn put_table_data(
|
async fn put_table_data(
|
||||||
&self,
|
&self,
|
||||||
request: tonic::Request<super::PutTableDataRequest>,
|
request: tonic::Request<super::PutTableDataRequest>,
|
||||||
@@ -372,6 +615,13 @@ pub mod tables_data_server {
|
|||||||
tonic::Response<super::PutTableDataResponse>,
|
tonic::Response<super::PutTableDataResponse>,
|
||||||
tonic::Status,
|
tonic::Status,
|
||||||
>;
|
>;
|
||||||
|
/// Soft-delete a single record (sets deleted = true) if it exists and is not already deleted.
|
||||||
|
///
|
||||||
|
/// Behavior:
|
||||||
|
/// - Validates profile and table definition
|
||||||
|
/// - Updates only rows with deleted = false
|
||||||
|
/// - success = true means a row was actually changed; false means nothing to delete
|
||||||
|
/// - If the physical table is missing but the definition exists, returns INTERNAL
|
||||||
async fn delete_table_data(
|
async fn delete_table_data(
|
||||||
&self,
|
&self,
|
||||||
request: tonic::Request<super::DeleteTableDataRequest>,
|
request: tonic::Request<super::DeleteTableDataRequest>,
|
||||||
@@ -379,6 +629,15 @@ pub mod tables_data_server {
|
|||||||
tonic::Response<super::DeleteTableDataResponse>,
|
tonic::Response<super::DeleteTableDataResponse>,
|
||||||
tonic::Status,
|
tonic::Status,
|
||||||
>;
|
>;
|
||||||
|
/// Fetch a single non-deleted row by id as textified values.
|
||||||
|
///
|
||||||
|
/// Behavior:
|
||||||
|
/// - Validates profile and table definition
|
||||||
|
/// - Returns all columns as strings (COALESCE(col::TEXT, '') AS col)
|
||||||
|
/// including: id, deleted, all user-defined columns, and FK columns
|
||||||
|
/// named "<linked_table>_id" for each table link
|
||||||
|
/// - Fails with NOT_FOUND if record does not exist or is soft-deleted
|
||||||
|
/// - If the physical table is missing but the definition exists, returns INTERNAL
|
||||||
async fn get_table_data(
|
async fn get_table_data(
|
||||||
&self,
|
&self,
|
||||||
request: tonic::Request<super::GetTableDataRequest>,
|
request: tonic::Request<super::GetTableDataRequest>,
|
||||||
@@ -386,6 +645,12 @@ pub mod tables_data_server {
|
|||||||
tonic::Response<super::GetTableDataResponse>,
|
tonic::Response<super::GetTableDataResponse>,
|
||||||
tonic::Status,
|
tonic::Status,
|
||||||
>;
|
>;
|
||||||
|
/// Count non-deleted rows in a table.
|
||||||
|
///
|
||||||
|
/// Behavior:
|
||||||
|
/// - Validates profile and table definition
|
||||||
|
/// - Returns komp_ac.common.CountResponse.count with rows where deleted = FALSE
|
||||||
|
/// - If the physical table is missing but the definition exists, returns INTERNAL
|
||||||
async fn get_table_data_count(
|
async fn get_table_data_count(
|
||||||
&self,
|
&self,
|
||||||
request: tonic::Request<super::GetTableDataCountRequest>,
|
request: tonic::Request<super::GetTableDataCountRequest>,
|
||||||
@@ -393,6 +658,12 @@ pub mod tables_data_server {
|
|||||||
tonic::Response<super::super::common::CountResponse>,
|
tonic::Response<super::super::common::CountResponse>,
|
||||||
tonic::Status,
|
tonic::Status,
|
||||||
>;
|
>;
|
||||||
|
/// Fetch the N-th non-deleted row by id order (1-based), then return its full data.
|
||||||
|
///
|
||||||
|
/// Behavior:
|
||||||
|
/// - position is 1-based (position = 1 → first row by id ASC with deleted = FALSE)
|
||||||
|
/// - Returns NOT_FOUND if position is out of bounds
|
||||||
|
/// - Otherwise identical to GetTableData for the selected id
|
||||||
async fn get_table_data_by_position(
|
async fn get_table_data_by_position(
|
||||||
&self,
|
&self,
|
||||||
request: tonic::Request<super::GetTableDataByPositionRequest>,
|
request: tonic::Request<super::GetTableDataByPositionRequest>,
|
||||||
@@ -401,6 +672,11 @@ pub mod tables_data_server {
|
|||||||
tonic::Status,
|
tonic::Status,
|
||||||
>;
|
>;
|
||||||
}
|
}
|
||||||
|
/// Read and write row data for user-defined tables inside profiles (schemas).
|
||||||
|
/// Operations are performed against the physical PostgreSQL table that
|
||||||
|
/// corresponds to the logical table definition and are scoped by profile
|
||||||
|
/// (schema). Deletions are soft (set deleted = true). Typed binding and
|
||||||
|
/// script-based validation are enforced consistently.
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
pub struct TablesDataServer<T> {
|
pub struct TablesDataServer<T> {
|
||||||
inner: Arc<T>,
|
inner: Arc<T>,
|
||||||
@@ -522,6 +798,52 @@ pub mod tables_data_server {
|
|||||||
};
|
};
|
||||||
Box::pin(fut)
|
Box::pin(fut)
|
||||||
}
|
}
|
||||||
|
"/komp_ac.tables_data.TablesData/PostTableDataBulk" => {
|
||||||
|
#[allow(non_camel_case_types)]
|
||||||
|
struct PostTableDataBulkSvc<T: TablesData>(pub Arc<T>);
|
||||||
|
impl<
|
||||||
|
T: TablesData,
|
||||||
|
> tonic::server::UnaryService<super::PostTableDataBulkRequest>
|
||||||
|
for PostTableDataBulkSvc<T> {
|
||||||
|
type Response = super::PostTableDataBulkResponse;
|
||||||
|
type Future = BoxFuture<
|
||||||
|
tonic::Response<Self::Response>,
|
||||||
|
tonic::Status,
|
||||||
|
>;
|
||||||
|
fn call(
|
||||||
|
&mut self,
|
||||||
|
request: tonic::Request<super::PostTableDataBulkRequest>,
|
||||||
|
) -> Self::Future {
|
||||||
|
let inner = Arc::clone(&self.0);
|
||||||
|
let fut = async move {
|
||||||
|
<T as TablesData>::post_table_data_bulk(&inner, request)
|
||||||
|
.await
|
||||||
|
};
|
||||||
|
Box::pin(fut)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
let accept_compression_encodings = self.accept_compression_encodings;
|
||||||
|
let send_compression_encodings = self.send_compression_encodings;
|
||||||
|
let max_decoding_message_size = self.max_decoding_message_size;
|
||||||
|
let max_encoding_message_size = self.max_encoding_message_size;
|
||||||
|
let inner = self.inner.clone();
|
||||||
|
let fut = async move {
|
||||||
|
let method = PostTableDataBulkSvc(inner);
|
||||||
|
let codec = tonic::codec::ProstCodec::default();
|
||||||
|
let mut grpc = tonic::server::Grpc::new(codec)
|
||||||
|
.apply_compression_config(
|
||||||
|
accept_compression_encodings,
|
||||||
|
send_compression_encodings,
|
||||||
|
)
|
||||||
|
.apply_max_message_size_config(
|
||||||
|
max_decoding_message_size,
|
||||||
|
max_encoding_message_size,
|
||||||
|
);
|
||||||
|
let res = grpc.unary(method, req).await;
|
||||||
|
Ok(res)
|
||||||
|
};
|
||||||
|
Box::pin(fut)
|
||||||
|
}
|
||||||
"/komp_ac.tables_data.TablesData/PutTableData" => {
|
"/komp_ac.tables_data.TablesData/PutTableData" => {
|
||||||
#[allow(non_camel_case_types)]
|
#[allow(non_camel_case_types)]
|
||||||
struct PutTableDataSvc<T: TablesData>(pub Arc<T>);
|
struct PutTableDataSvc<T: TablesData>(pub Arc<T>);
|
||||||
|
|||||||
@@ -1,78 +1,190 @@
|
|||||||
// common/src/search.rs
|
use std::path::{Path, PathBuf};
|
||||||
|
|
||||||
use tantivy::schema::*;
|
use tantivy::schema::{
|
||||||
use tantivy::tokenizer::*;
|
Field, IndexRecordOption, JsonObjectOptions, Schema, Term, TextFieldIndexing, TextOptions,
|
||||||
|
INDEXED, STORED, STRING,
|
||||||
|
};
|
||||||
|
use tantivy::tokenizer::{
|
||||||
|
AsciiFoldingFilter, LowerCaser, NgramTokenizer, RawTokenizer, RemoveLongFilter,
|
||||||
|
SimpleTokenizer, TextAnalyzer, TokenStream,
|
||||||
|
};
|
||||||
use tantivy::Index;
|
use tantivy::Index;
|
||||||
|
|
||||||
/// Creates a hybrid Slovak search schema with optimized prefix fields.
|
pub const F_PG_ID: &str = "pg_id";
|
||||||
|
pub const F_TABLE_NAME: &str = "table_name";
|
||||||
|
pub const F_ROW_KEY: &str = "row_key";
|
||||||
|
pub const F_ALL_TEXT: &str = "all_text";
|
||||||
|
pub const F_DATA_WORD: &str = "data_word";
|
||||||
|
pub const F_DATA_NGRAM: &str = "data_ngram";
|
||||||
|
pub const F_DATA_EXACT: &str = "data_exact";
|
||||||
|
|
||||||
|
pub const TOK_WORD: &str = "kw_word";
|
||||||
|
pub const TOK_NGRAM: &str = "kw_ngram";
|
||||||
|
pub const TOK_EXACT: &str = "kw_exact";
|
||||||
|
|
||||||
|
/// Returns the on-disk path for a profile search index.
|
||||||
|
pub fn search_index_path(root: &Path, profile_name: &str) -> PathBuf {
|
||||||
|
root.join(profile_name)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Returns the unique index key for one table row inside a profile index.
|
||||||
|
pub fn search_row_key(table_name: &str, row_id: i64) -> String {
|
||||||
|
format!("{}:{}", table_name, row_id)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Normalizes user-entered values for exact-mode terms.
|
||||||
|
pub fn normalize_exact(input: &str) -> String {
|
||||||
|
let trimmed = input.trim();
|
||||||
|
if trimmed.is_empty() {
|
||||||
|
return String::new();
|
||||||
|
}
|
||||||
|
|
||||||
|
let mut analyzer = exact_analyzer();
|
||||||
|
let mut stream = analyzer.token_stream(trimmed);
|
||||||
|
let mut out = String::with_capacity(trimmed.len());
|
||||||
|
while let Some(token) = stream.next() {
|
||||||
|
out.push_str(&token.text);
|
||||||
|
}
|
||||||
|
out
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Normalizes a column name to the JSON-key form used at index time.
|
||||||
|
pub fn normalize_column_name(column: &str) -> String {
|
||||||
|
column.to_ascii_lowercase()
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Creates the column-aware search schema.
|
||||||
pub fn create_search_schema() -> Schema {
|
pub fn create_search_schema() -> Schema {
|
||||||
let mut schema_builder = Schema::builder();
|
let mut schema_builder = Schema::builder();
|
||||||
|
|
||||||
schema_builder.add_u64_field("pg_id", INDEXED | STORED);
|
schema_builder.add_u64_field(F_PG_ID, INDEXED | STORED);
|
||||||
|
schema_builder.add_text_field(F_TABLE_NAME, STRING | STORED);
|
||||||
|
schema_builder.add_text_field(F_ROW_KEY, STRING | STORED);
|
||||||
|
schema_builder.add_text_field(F_ALL_TEXT, text_options(TOK_WORD));
|
||||||
|
|
||||||
// FIELD 1: For prefixes (1-4 chars).
|
schema_builder.add_json_field(F_DATA_WORD, json_options(TOK_WORD, true, false));
|
||||||
let short_prefix_indexing = TextFieldIndexing::default()
|
schema_builder.add_json_field(F_DATA_NGRAM, json_options(TOK_NGRAM, true, false));
|
||||||
.set_tokenizer("slovak_prefix_edge")
|
schema_builder.add_json_field(F_DATA_EXACT, json_options(TOK_EXACT, false, false));
|
||||||
.set_index_option(IndexRecordOption::WithFreqsAndPositions);
|
|
||||||
let short_prefix_options = TextOptions::default()
|
|
||||||
.set_indexing_options(short_prefix_indexing)
|
|
||||||
.set_stored();
|
|
||||||
schema_builder.add_text_field("prefix_edge", short_prefix_options);
|
|
||||||
|
|
||||||
// FIELD 2: For the full word.
|
|
||||||
let full_word_indexing = TextFieldIndexing::default()
|
|
||||||
.set_tokenizer("slovak_prefix_full")
|
|
||||||
.set_index_option(IndexRecordOption::WithFreqsAndPositions);
|
|
||||||
let full_word_options = TextOptions::default()
|
|
||||||
.set_indexing_options(full_word_indexing)
|
|
||||||
.set_stored();
|
|
||||||
schema_builder.add_text_field("prefix_full", full_word_options);
|
|
||||||
|
|
||||||
// NGRAM FIELD: For substring matching.
|
|
||||||
let ngram_field_indexing = TextFieldIndexing::default()
|
|
||||||
.set_tokenizer("slovak_ngram")
|
|
||||||
.set_index_option(IndexRecordOption::WithFreqsAndPositions);
|
|
||||||
let ngram_options = TextOptions::default()
|
|
||||||
.set_indexing_options(ngram_field_indexing)
|
|
||||||
.set_stored();
|
|
||||||
schema_builder.add_text_field("text_ngram", ngram_options);
|
|
||||||
|
|
||||||
schema_builder.build()
|
schema_builder.build()
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Registers all necessary Slovak tokenizers with the index.
|
fn text_options(tokenizer_name: &str) -> TextOptions {
|
||||||
///
|
let indexing = TextFieldIndexing::default()
|
||||||
/// This must be called by ANY process that opens the index
|
.set_tokenizer(tokenizer_name)
|
||||||
/// to ensure the tokenizers are loaded into memory.
|
.set_index_option(IndexRecordOption::WithFreqsAndPositions);
|
||||||
pub fn register_slovak_tokenizers(index: &Index) -> tantivy::Result<()> {
|
|
||||||
|
TextOptions::default().set_indexing_options(indexing)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn json_options(tokenizer_name: &str, with_positions: bool, stored: bool) -> JsonObjectOptions {
|
||||||
|
let index_option = if with_positions {
|
||||||
|
IndexRecordOption::WithFreqsAndPositions
|
||||||
|
} else {
|
||||||
|
IndexRecordOption::Basic
|
||||||
|
};
|
||||||
|
|
||||||
|
let indexing = TextFieldIndexing::default()
|
||||||
|
.set_tokenizer(tokenizer_name)
|
||||||
|
.set_index_option(index_option);
|
||||||
|
|
||||||
|
let mut options = JsonObjectOptions::default().set_indexing_options(indexing);
|
||||||
|
if stored {
|
||||||
|
options = options.set_stored();
|
||||||
|
}
|
||||||
|
options
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Registers all required tokenizers with the index.
|
||||||
|
pub fn register_tokenizers(index: &Index) -> tantivy::Result<()> {
|
||||||
let tokenizer_manager = index.tokenizers();
|
let tokenizer_manager = index.tokenizers();
|
||||||
|
|
||||||
// TOKENIZER for `prefix_edge`: Edge N-gram (1-4 chars)
|
tokenizer_manager.register(TOK_WORD, word_analyzer());
|
||||||
let edge_tokenizer =
|
tokenizer_manager.register(TOK_NGRAM, ngram_analyzer()?);
|
||||||
TextAnalyzer::builder(NgramTokenizer::new(1, 4, true)?)
|
tokenizer_manager.register(TOK_EXACT, exact_analyzer());
|
||||||
.filter(RemoveLongFilter::limit(40))
|
|
||||||
.filter(LowerCaser)
|
|
||||||
.filter(AsciiFoldingFilter)
|
|
||||||
.build();
|
|
||||||
tokenizer_manager.register("slovak_prefix_edge", edge_tokenizer);
|
|
||||||
|
|
||||||
// TOKENIZER for `prefix_full`: Simple word tokenizer
|
|
||||||
let full_tokenizer =
|
|
||||||
TextAnalyzer::builder(SimpleTokenizer::default())
|
|
||||||
.filter(RemoveLongFilter::limit(40))
|
|
||||||
.filter(LowerCaser)
|
|
||||||
.filter(AsciiFoldingFilter)
|
|
||||||
.build();
|
|
||||||
tokenizer_manager.register("slovak_prefix_full", full_tokenizer);
|
|
||||||
|
|
||||||
// NGRAM TOKENIZER: For substring matching.
|
|
||||||
let ngram_tokenizer =
|
|
||||||
TextAnalyzer::builder(NgramTokenizer::new(3, 3, false)?)
|
|
||||||
.filter(RemoveLongFilter::limit(40))
|
|
||||||
.filter(LowerCaser)
|
|
||||||
.filter(AsciiFoldingFilter)
|
|
||||||
.build();
|
|
||||||
tokenizer_manager.register("slovak_ngram", ngram_tokenizer);
|
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn word_analyzer() -> TextAnalyzer {
|
||||||
|
TextAnalyzer::builder(SimpleTokenizer::default())
|
||||||
|
.filter(RemoveLongFilter::limit(80))
|
||||||
|
.filter(LowerCaser)
|
||||||
|
.filter(AsciiFoldingFilter)
|
||||||
|
.build()
|
||||||
|
}
|
||||||
|
|
||||||
|
fn ngram_analyzer() -> tantivy::Result<TextAnalyzer> {
|
||||||
|
Ok(TextAnalyzer::builder(NgramTokenizer::new(3, 3, false)?)
|
||||||
|
.filter(RemoveLongFilter::limit(80))
|
||||||
|
.filter(LowerCaser)
|
||||||
|
.filter(AsciiFoldingFilter)
|
||||||
|
.build())
|
||||||
|
}
|
||||||
|
|
||||||
|
fn exact_analyzer() -> TextAnalyzer {
|
||||||
|
TextAnalyzer::builder(RawTokenizer::default())
|
||||||
|
.filter(LowerCaser)
|
||||||
|
.filter(AsciiFoldingFilter)
|
||||||
|
.build()
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Tokenizes text the same way `data_word` is indexed.
|
||||||
|
pub fn tokenize_word(text: &str) -> Vec<String> {
|
||||||
|
tokenize_with(word_analyzer(), text)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Tokenizes text the same way `data_ngram` is indexed.
|
||||||
|
pub fn tokenize_ngram(text: &str) -> Vec<String> {
|
||||||
|
match ngram_analyzer() {
|
||||||
|
Ok(analyzer) => tokenize_with(analyzer, text),
|
||||||
|
Err(_) => Vec::new(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn tokenize_with(mut analyzer: TextAnalyzer, text: &str) -> Vec<String> {
|
||||||
|
let mut stream = analyzer.token_stream(text);
|
||||||
|
let mut out = Vec::new();
|
||||||
|
while let Some(token) = stream.next() {
|
||||||
|
out.push(token.text.clone());
|
||||||
|
}
|
||||||
|
out
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Builds a term scoped to a specific JSON path within a JSON field.
|
||||||
|
pub fn json_path_term(field: Field, column: &str, text: &str) -> Term {
|
||||||
|
let mut term = Term::from_field_json_path(field, column, false);
|
||||||
|
term.append_type_and_str(text);
|
||||||
|
term
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Returns all required schema fields or fails loudly on mismatch.
|
||||||
|
pub struct SchemaFields {
|
||||||
|
pub pg_id: Field,
|
||||||
|
pub table_name: Field,
|
||||||
|
pub row_key: Field,
|
||||||
|
pub all_text: Field,
|
||||||
|
pub data_word: Field,
|
||||||
|
pub data_ngram: Field,
|
||||||
|
pub data_exact: Field,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl SchemaFields {
|
||||||
|
pub fn from(schema: &Schema) -> tantivy::Result<Self> {
|
||||||
|
Ok(Self {
|
||||||
|
pg_id: get_field(schema, F_PG_ID)?,
|
||||||
|
table_name: get_field(schema, F_TABLE_NAME)?,
|
||||||
|
row_key: get_field(schema, F_ROW_KEY)?,
|
||||||
|
all_text: get_field(schema, F_ALL_TEXT)?,
|
||||||
|
data_word: get_field(schema, F_DATA_WORD)?,
|
||||||
|
data_ngram: get_field(schema, F_DATA_NGRAM)?,
|
||||||
|
data_exact: get_field(schema, F_DATA_EXACT)?,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn get_field(schema: &Schema, name: &str) -> tantivy::Result<Field> {
|
||||||
|
schema.get_field(name).map_err(|e| {
|
||||||
|
tantivy::TantivyError::SchemaError(format!("schema is missing field '{name}': {e}"))
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|||||||
11
flake.nix
11
flake.nix
@@ -14,12 +14,17 @@
|
|||||||
{
|
{
|
||||||
devShells.default = pkgs.mkShell {
|
devShells.default = pkgs.mkShell {
|
||||||
buildInputs = with pkgs; [
|
buildInputs = with pkgs; [
|
||||||
|
mermaid-cli
|
||||||
# Rust toolchain
|
# Rust toolchain
|
||||||
rustc
|
rustc
|
||||||
cargo
|
cargo
|
||||||
rustfmt
|
rustfmt
|
||||||
clippy
|
clippy
|
||||||
cargo-watch
|
cargo-watch
|
||||||
|
rust-analyzer
|
||||||
|
cargo-tarpaulin
|
||||||
|
cargo-flamegraph
|
||||||
|
rust-code-analysis
|
||||||
|
|
||||||
# C build tools (for your linker issue)
|
# C build tools (for your linker issue)
|
||||||
gcc
|
gcc
|
||||||
@@ -32,10 +37,12 @@
|
|||||||
|
|
||||||
# PostgreSQL for sqlx
|
# PostgreSQL for sqlx
|
||||||
postgresql
|
postgresql
|
||||||
sqlx-cli
|
sqlx-cli
|
||||||
|
|
||||||
# Protocol Buffers compiler for gRPC
|
# Protocol Buffers compiler for gRPC
|
||||||
protobuf
|
protobuf
|
||||||
|
protoc-gen-doc
|
||||||
|
buf
|
||||||
];
|
];
|
||||||
|
|
||||||
shellHook = ''
|
shellHook = ''
|
||||||
|
|||||||
1
search/.gitignore
vendored
Normal file
1
search/.gitignore
vendored
Normal file
@@ -0,0 +1 @@
|
|||||||
|
.codex
|
||||||
@@ -1,302 +1,448 @@
|
|||||||
// src/lib.rs
|
mod query_builder;
|
||||||
|
|
||||||
use std::collections::HashMap;
|
use std::collections::HashMap;
|
||||||
use std::path::Path;
|
use std::path::Path;
|
||||||
use tantivy::collector::TopDocs;
|
use std::sync::{Arc, Mutex};
|
||||||
use tantivy::query::{
|
|
||||||
BooleanQuery, BoostQuery, FuzzyTermQuery, Occur, Query, QueryParser,
|
|
||||||
TermQuery,
|
|
||||||
};
|
|
||||||
use tantivy::schema::{IndexRecordOption, Value};
|
|
||||||
use tantivy::{Index, TantivyDocument, Term};
|
|
||||||
use tonic::{Request, Response, Status};
|
|
||||||
|
|
||||||
use common::proto::komp_ac::search::{
|
|
||||||
search_response::Hit, SearchRequest, SearchResponse,
|
|
||||||
};
|
|
||||||
pub use common::proto::komp_ac::search::searcher_server::SearcherServer;
|
|
||||||
use common::proto::komp_ac::search::searcher_server::Searcher;
|
use common::proto::komp_ac::search::searcher_server::Searcher;
|
||||||
use common::search::register_slovak_tokenizers;
|
pub use common::proto::komp_ac::search::searcher_server::SearcherServer;
|
||||||
|
use common::proto::komp_ac::search::{search_response::Hit, SearchRequest, SearchResponse};
|
||||||
|
use common::search::{register_tokenizers, search_index_path, SchemaFields};
|
||||||
|
use query_builder::{build_master_query, ConstraintMode, SearchConstraint};
|
||||||
use sqlx::{PgPool, Row};
|
use sqlx::{PgPool, Row};
|
||||||
|
use tantivy::collector::TopDocs;
|
||||||
|
use tantivy::schema::Value;
|
||||||
|
use tantivy::{Index, IndexReader, ReloadPolicy, TantivyDocument};
|
||||||
|
use tonic::{Request, Response, Status};
|
||||||
use tracing::info;
|
use tracing::info;
|
||||||
|
|
||||||
// We need to hold the database pool in our service struct.
|
const INDEX_ROOT: &str = "./tantivy_indexes";
|
||||||
|
const DEFAULT_RESULT_LIMIT: usize = 25;
|
||||||
|
const HARD_RESULT_LIMIT: usize = 200;
|
||||||
|
const DEFAULT_LIST_LIMIT: usize = 5;
|
||||||
|
|
||||||
pub struct SearcherService {
|
pub struct SearcherService {
|
||||||
pub pool: PgPool,
|
pub pool: PgPool,
|
||||||
|
profiles: Mutex<HashMap<String, Arc<ProfileIndex>>>,
|
||||||
}
|
}
|
||||||
|
|
||||||
// normalize_slovak_text function remains unchanged...
|
impl SearcherService {
|
||||||
fn normalize_slovak_text(text: &str) -> String {
|
pub fn new(pool: PgPool) -> Self {
|
||||||
// ... function content is unchanged ...
|
Self {
|
||||||
text.chars()
|
pool,
|
||||||
.map(|c| match c {
|
profiles: Mutex::new(HashMap::new()),
|
||||||
'á' | 'à' | 'â' | 'ä' | 'ă' | 'ā' => 'a',
|
}
|
||||||
'Á' | 'À' | 'Â' | 'Ä' | 'Ă' | 'Ā' => 'A',
|
}
|
||||||
'é' | 'è' | 'ê' | 'ë' | 'ě' | 'ē' => 'e',
|
|
||||||
'É' | 'È' | 'Ê' | 'Ë' | 'Ě' | 'Ē' => 'E',
|
|
||||||
'í' | 'ì' | 'î' | 'ï' | 'ī' => 'i',
|
|
||||||
'Í' | 'Ì' | 'Î' | 'Ï' | 'Ī' => 'I',
|
|
||||||
'ó' | 'ò' | 'ô' | 'ö' | 'ō' | 'ő' => 'o',
|
|
||||||
'Ó' | 'Ò' | 'Ô' | 'Ö' | 'Ō' | 'Ő' => 'O',
|
|
||||||
'ú' | 'ù' | 'û' | 'ü' | 'ū' | 'ű' => 'u',
|
|
||||||
'Ú' | 'Ù' | 'Û' | 'Ü' | 'Ū' | 'Ű' => 'U',
|
|
||||||
'ý' | 'ỳ' | 'ŷ' | 'ÿ' => 'y',
|
|
||||||
'Ý' | 'Ỳ' | 'Ŷ' | 'Ÿ' => 'Y',
|
|
||||||
'č' => 'c',
|
|
||||||
'Č' => 'C',
|
|
||||||
'ď' => 'd',
|
|
||||||
'Ď' => 'D',
|
|
||||||
'ľ' => 'l',
|
|
||||||
'Ľ' => 'L',
|
|
||||||
'ň' => 'n',
|
|
||||||
'Ň' => 'N',
|
|
||||||
'ř' => 'r',
|
|
||||||
'Ř' => 'R',
|
|
||||||
'š' => 's',
|
|
||||||
'Š' => 'S',
|
|
||||||
'ť' => 't',
|
|
||||||
'Ť' => 'T',
|
|
||||||
'ž' => 'z',
|
|
||||||
'Ž' => 'Z',
|
|
||||||
_ => c,
|
|
||||||
})
|
|
||||||
.collect()
|
|
||||||
}
|
|
||||||
|
|
||||||
#[tonic::async_trait]
|
async fn run_rpc(
|
||||||
impl Searcher for SearcherService {
|
|
||||||
async fn search_table(
|
|
||||||
&self,
|
&self,
|
||||||
request: Request<SearchRequest>,
|
request: Request<SearchRequest>,
|
||||||
) -> Result<Response<SearchResponse>, Status> {
|
) -> Result<Response<SearchResponse>, Status> {
|
||||||
let req = request.into_inner();
|
let req = request.into_inner();
|
||||||
let table_name = req.table_name;
|
let normalized = normalize_request(req)?;
|
||||||
let query_str = req.query;
|
|
||||||
|
|
||||||
// --- MODIFIED LOGIC ---
|
if !profile_exists(&self.pool, &normalized.profile_name).await? {
|
||||||
// If the query is empty, fetch the 5 most recent records.
|
|
||||||
if query_str.trim().is_empty() {
|
|
||||||
info!(
|
|
||||||
"Empty query for table '{}'. Fetching default results.",
|
|
||||||
table_name
|
|
||||||
);
|
|
||||||
let qualified_table = format!("gen.\"{}\"", table_name);
|
|
||||||
let sql = format!(
|
|
||||||
"SELECT id, to_jsonb(t) AS data FROM {} t ORDER BY id DESC LIMIT 5",
|
|
||||||
qualified_table
|
|
||||||
);
|
|
||||||
|
|
||||||
let rows = sqlx::query(&sql)
|
|
||||||
.fetch_all(&self.pool)
|
|
||||||
.await
|
|
||||||
.map_err(|e| {
|
|
||||||
Status::internal(format!(
|
|
||||||
"DB query for default results failed: {}",
|
|
||||||
e
|
|
||||||
))
|
|
||||||
})?;
|
|
||||||
|
|
||||||
let hits: Vec<Hit> = rows
|
|
||||||
.into_iter()
|
|
||||||
.map(|row| {
|
|
||||||
let id: i64 = row.try_get("id").unwrap_or_default();
|
|
||||||
let json_data: serde_json::Value =
|
|
||||||
row.try_get("data").unwrap_or_default();
|
|
||||||
Hit {
|
|
||||||
id,
|
|
||||||
// Score is 0.0 as this is not a relevance-ranked search
|
|
||||||
score: 0.0,
|
|
||||||
content_json: json_data.to_string(),
|
|
||||||
}
|
|
||||||
})
|
|
||||||
.collect();
|
|
||||||
|
|
||||||
info!("--- SERVER: Successfully processed empty query. Returning {} default hits. ---", hits.len());
|
|
||||||
return Ok(Response::new(SearchResponse { hits }));
|
|
||||||
}
|
|
||||||
// --- END OF MODIFIED LOGIC ---
|
|
||||||
|
|
||||||
let index_path = Path::new("./tantivy_indexes").join(&table_name);
|
|
||||||
if !index_path.exists() {
|
|
||||||
return Err(Status::not_found(format!(
|
return Err(Status::not_found(format!(
|
||||||
"No search index found for table '{}'",
|
"Profile '{}' was not found",
|
||||||
table_name
|
normalized.profile_name
|
||||||
)));
|
)));
|
||||||
}
|
}
|
||||||
|
|
||||||
let index = Index::open_in_dir(&index_path)
|
if let Some(table_name) = normalized.table_name.as_deref() {
|
||||||
.map_err(|e| Status::internal(format!("Failed to open index: {}", e)))?;
|
if !table_exists(&self.pool, &normalized.profile_name, table_name).await? {
|
||||||
|
return Err(Status::not_found(format!(
|
||||||
register_slovak_tokenizers(&index).map_err(|e| {
|
"Table '{}' was not found in profile '{}'",
|
||||||
Status::internal(format!("Failed to register Slovak tokenizers: {}", e))
|
table_name, normalized.profile_name
|
||||||
})?;
|
)));
|
||||||
|
|
||||||
let reader = index.reader().map_err(|e| {
|
|
||||||
Status::internal(format!("Failed to create index reader: {}", e))
|
|
||||||
})?;
|
|
||||||
let searcher = reader.searcher();
|
|
||||||
let schema = index.schema();
|
|
||||||
|
|
||||||
let pg_id_field = schema.get_field("pg_id").map_err(|_| {
|
|
||||||
Status::internal("Schema is missing the 'pg_id' field.")
|
|
||||||
})?;
|
|
||||||
|
|
||||||
// --- Query Building Logic (no changes here) ---
|
|
||||||
let prefix_edge_field = schema.get_field("prefix_edge").unwrap();
|
|
||||||
let prefix_full_field = schema.get_field("prefix_full").unwrap();
|
|
||||||
let text_ngram_field = schema.get_field("text_ngram").unwrap();
|
|
||||||
let normalized_query = normalize_slovak_text(&query_str);
|
|
||||||
let words: Vec<&str> = normalized_query.split_whitespace().collect();
|
|
||||||
if words.is_empty() {
|
|
||||||
return Ok(Response::new(SearchResponse { hits: vec![] }));
|
|
||||||
}
|
|
||||||
let mut query_layers: Vec<(Occur, Box<dyn Query>)> = Vec::new();
|
|
||||||
// ... all your query building layers remain exactly the same ...
|
|
||||||
// ===============================
|
|
||||||
// LAYER 1: PREFIX MATCHING (HIGHEST PRIORITY, Boost: 4.0)
|
|
||||||
// ===============================
|
|
||||||
{
|
|
||||||
let mut must_clauses: Vec<(Occur, Box<dyn Query>)> = Vec::new();
|
|
||||||
for word in &words {
|
|
||||||
let edge_term =
|
|
||||||
Term::from_field_text(prefix_edge_field, word);
|
|
||||||
let full_term =
|
|
||||||
Term::from_field_text(prefix_full_field, word);
|
|
||||||
|
|
||||||
let per_word_query = BooleanQuery::new(vec![
|
|
||||||
(
|
|
||||||
Occur::Should,
|
|
||||||
Box::new(TermQuery::new(
|
|
||||||
edge_term,
|
|
||||||
IndexRecordOption::Basic,
|
|
||||||
)),
|
|
||||||
),
|
|
||||||
(
|
|
||||||
Occur::Should,
|
|
||||||
Box::new(TermQuery::new(
|
|
||||||
full_term,
|
|
||||||
IndexRecordOption::Basic,
|
|
||||||
)),
|
|
||||||
),
|
|
||||||
]);
|
|
||||||
must_clauses.push((Occur::Must, Box::new(per_word_query) as Box<dyn Query>));
|
|
||||||
}
|
|
||||||
|
|
||||||
if !must_clauses.is_empty() {
|
|
||||||
let prefix_query = BooleanQuery::new(must_clauses);
|
|
||||||
let boosted_query =
|
|
||||||
BoostQuery::new(Box::new(prefix_query), 4.0);
|
|
||||||
query_layers.push((Occur::Should, Box::new(boosted_query)));
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// ===============================
|
if !normalized.has_input() {
|
||||||
// LAYER 2: FUZZY MATCHING (HIGH PRIORITY, Boost: 3.0)
|
let Some(table_name) = normalized.table_name.as_deref() else {
|
||||||
// ===============================
|
return Err(Status::invalid_argument(
|
||||||
{
|
"table_name is required when query is empty",
|
||||||
let last_word = words.last().unwrap();
|
));
|
||||||
let fuzzy_term =
|
};
|
||||||
Term::from_field_text(prefix_full_field, last_word);
|
|
||||||
let fuzzy_query = FuzzyTermQuery::new(fuzzy_term, 2, true);
|
let hits = fetch_latest_rows(
|
||||||
let boosted_query = BoostQuery::new(Box::new(fuzzy_query), 3.0);
|
&self.pool,
|
||||||
query_layers.push((Occur::Should, Box::new(boosted_query)));
|
&normalized.profile_name,
|
||||||
|
table_name,
|
||||||
|
normalized.limit.unwrap_or(DEFAULT_LIST_LIMIT),
|
||||||
|
)
|
||||||
|
.await?;
|
||||||
|
return Ok(Response::new(SearchResponse { hits }));
|
||||||
}
|
}
|
||||||
|
|
||||||
// ===============================
|
let index_path = search_index_path(Path::new(INDEX_ROOT), &normalized.profile_name);
|
||||||
// LAYER 3: PHRASE MATCHING WITH SLOP (MEDIUM PRIORITY, Boost: 2.0)
|
if !index_path.exists() {
|
||||||
// ===============================
|
return Err(Status::not_found(format!(
|
||||||
if words.len() > 1 {
|
"No search index found for profile '{}'",
|
||||||
let slop_parser =
|
normalized.profile_name
|
||||||
QueryParser::for_index(&index, vec![prefix_full_field]);
|
)));
|
||||||
let slop_query_str = format!("\"{}\"~3", normalized_query);
|
}
|
||||||
if let Ok(slop_query) = slop_parser.parse_query(&slop_query_str) {
|
|
||||||
let boosted_query = BoostQuery::new(slop_query, 2.0);
|
let profile = profile_index(&self.profiles, &normalized.profile_name, &index_path)?;
|
||||||
query_layers.push((Occur::Should, Box::new(boosted_query)));
|
let mut hits = run_search(
|
||||||
|
&self.pool,
|
||||||
|
&profile,
|
||||||
|
&normalized.profile_name,
|
||||||
|
normalized.table_name.as_deref(),
|
||||||
|
&normalized.free_query,
|
||||||
|
&normalized.must,
|
||||||
|
normalized.limit.unwrap_or(DEFAULT_RESULT_LIMIT),
|
||||||
|
)
|
||||||
|
.await?;
|
||||||
|
|
||||||
|
hits.sort_by(|left, right| right.score.total_cmp(&left.score));
|
||||||
|
if let Some(limit) = normalized.limit {
|
||||||
|
if hits.len() > limit {
|
||||||
|
hits.truncate(limit);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// ===============================
|
info!(
|
||||||
// LAYER 4: NGRAM SUBSTRING MATCHING (LOWEST PRIORITY, Boost: 1.0)
|
"search: profile={} table={:?} free='{}' constraints={} hits={}",
|
||||||
// ===============================
|
normalized.profile_name,
|
||||||
{
|
normalized.table_name,
|
||||||
let ngram_parser =
|
normalized.free_query,
|
||||||
QueryParser::for_index(&index, vec![text_ngram_field]);
|
normalized.must.len(),
|
||||||
if let Ok(ngram_query) =
|
hits.len()
|
||||||
ngram_parser.parse_query(&normalized_query)
|
|
||||||
{
|
|
||||||
let boosted_query = BoostQuery::new(ngram_query, 1.0);
|
|
||||||
query_layers.push((Occur::Should, Box::new(boosted_query)));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
let master_query = BooleanQuery::new(query_layers);
|
|
||||||
// --- End of Query Building Logic ---
|
|
||||||
|
|
||||||
let top_docs = searcher
|
|
||||||
.search(&master_query, &TopDocs::with_limit(100))
|
|
||||||
.map_err(|e| Status::internal(format!("Search failed: {}", e)))?;
|
|
||||||
|
|
||||||
if top_docs.is_empty() {
|
|
||||||
return Ok(Response::new(SearchResponse { hits: vec![] }));
|
|
||||||
}
|
|
||||||
|
|
||||||
// --- NEW LOGIC: Fetch from DB and combine results ---
|
|
||||||
|
|
||||||
// Step 1: Extract (score, pg_id) from Tantivy results.
|
|
||||||
let mut scored_ids: Vec<(f32, u64)> = Vec::new();
|
|
||||||
for (score, doc_address) in top_docs {
|
|
||||||
let doc: TantivyDocument = searcher.doc(doc_address).map_err(|e| {
|
|
||||||
Status::internal(format!("Failed to retrieve document: {}", e))
|
|
||||||
})?;
|
|
||||||
if let Some(pg_id_value) = doc.get_first(pg_id_field) {
|
|
||||||
if let Some(pg_id) = pg_id_value.as_u64() {
|
|
||||||
scored_ids.push((score, pg_id));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Step 2: Fetch all corresponding rows from Postgres in a single query.
|
|
||||||
let pg_ids: Vec<i64> =
|
|
||||||
scored_ids.iter().map(|(_, id)| *id as i64).collect();
|
|
||||||
let qualified_table = format!("gen.\"{}\"", table_name);
|
|
||||||
let query_str = format!(
|
|
||||||
"SELECT id, to_jsonb(t) AS data FROM {} t WHERE id = ANY($1)",
|
|
||||||
qualified_table
|
|
||||||
);
|
);
|
||||||
|
|
||||||
let rows = sqlx::query(&query_str)
|
Ok(Response::new(SearchResponse { hits }))
|
||||||
.bind(&pg_ids)
|
}
|
||||||
.fetch_all(&self.pool)
|
|
||||||
.await
|
|
||||||
.map_err(|e| {
|
|
||||||
Status::internal(format!("Database query failed: {}", e))
|
|
||||||
})?;
|
|
||||||
|
|
||||||
// Step 3: Map the database results by ID for quick lookup.
|
}
|
||||||
let mut content_map: HashMap<i64, String> = HashMap::new();
|
|
||||||
for row in rows {
|
|
||||||
let id: i64 = row.try_get("id").unwrap_or(0);
|
|
||||||
let json_data: serde_json::Value =
|
|
||||||
row.try_get("data").unwrap_or(serde_json::Value::Null);
|
|
||||||
content_map.insert(id, json_data.to_string());
|
|
||||||
}
|
|
||||||
|
|
||||||
// Step 4: Build the final response, combining Tantivy scores with PG content.
|
struct ProfileIndex {
|
||||||
let hits: Vec<Hit> = scored_ids
|
index: Index,
|
||||||
.into_iter()
|
reader: IndexReader,
|
||||||
.filter_map(|(score, pg_id)| {
|
fields: SchemaFields,
|
||||||
content_map
|
}
|
||||||
.get(&(pg_id as i64))
|
|
||||||
.map(|content_json| Hit {
|
|
||||||
id: pg_id as i64,
|
|
||||||
score,
|
|
||||||
content_json: content_json.clone(),
|
|
||||||
})
|
|
||||||
})
|
|
||||||
.collect();
|
|
||||||
|
|
||||||
info!("--- SERVER: Successfully processed search. Returning {} hits. ---", hits.len());
|
impl ProfileIndex {
|
||||||
|
fn open(path: &Path) -> Result<Self, Status> {
|
||||||
|
let index = Index::open_in_dir(path)
|
||||||
|
.map_err(|e| Status::internal(format!("Failed to open index: {}", e)))?;
|
||||||
|
register_tokenizers(&index)
|
||||||
|
.map_err(|e| Status::internal(format!("Failed to register tokenizers: {}", e)))?;
|
||||||
|
let reader = index
|
||||||
|
.reader_builder()
|
||||||
|
.reload_policy(ReloadPolicy::OnCommitWithDelay)
|
||||||
|
.try_into()
|
||||||
|
.map_err(|e| Status::internal(format!("Failed to build index reader: {}", e)))?;
|
||||||
|
let fields = SchemaFields::from(&index.schema()).map_err(|e| {
|
||||||
|
Status::internal(format!(
|
||||||
|
"Search index schema mismatch. Delete the stale index and create it again: {}",
|
||||||
|
e
|
||||||
|
))
|
||||||
|
})?;
|
||||||
|
|
||||||
let response = SearchResponse { hits };
|
Ok(Self {
|
||||||
Ok(Response::new(response))
|
index,
|
||||||
|
reader,
|
||||||
|
fields,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug)]
|
||||||
|
struct NormalizedSearchRequest {
|
||||||
|
profile_name: String,
|
||||||
|
table_name: Option<String>,
|
||||||
|
free_query: String,
|
||||||
|
must: Vec<SearchConstraint>,
|
||||||
|
limit: Option<usize>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl NormalizedSearchRequest {
|
||||||
|
fn has_input(&self) -> bool {
|
||||||
|
!self.free_query.is_empty() || !self.must.is_empty()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn profile_index(
|
||||||
|
cache: &Mutex<HashMap<String, Arc<ProfileIndex>>>,
|
||||||
|
profile_name: &str,
|
||||||
|
path: &Path,
|
||||||
|
) -> Result<Arc<ProfileIndex>, Status> {
|
||||||
|
{
|
||||||
|
let cache_guard = cache
|
||||||
|
.lock()
|
||||||
|
.map_err(|_| Status::internal("Profile index cache lock poisoned"))?;
|
||||||
|
if let Some(index) = cache_guard.get(profile_name) {
|
||||||
|
return Ok(index.clone());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
let opened = Arc::new(ProfileIndex::open(path)?);
|
||||||
|
let mut cache_guard = cache
|
||||||
|
.lock()
|
||||||
|
.map_err(|_| Status::internal("Profile index cache lock poisoned"))?;
|
||||||
|
if let Some(index) = cache_guard.get(profile_name) {
|
||||||
|
return Ok(index.clone());
|
||||||
|
}
|
||||||
|
cache_guard.insert(profile_name.to_string(), opened.clone());
|
||||||
|
Ok(opened)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn validate_identifier(value: &str, field_name: &str) -> Result<(), Status> {
|
||||||
|
let mut chars = value.chars();
|
||||||
|
let Some(first) = chars.next() else {
|
||||||
|
return Err(Status::invalid_argument(format!(
|
||||||
|
"{field_name} must not be empty"
|
||||||
|
)));
|
||||||
|
};
|
||||||
|
|
||||||
|
if !(first.is_ascii_alphabetic() || first == '_')
|
||||||
|
|| !chars.all(|ch| ch.is_ascii_alphanumeric() || ch == '_')
|
||||||
|
{
|
||||||
|
return Err(Status::invalid_argument(format!(
|
||||||
|
"{field_name} contains invalid characters"
|
||||||
|
)));
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
fn validate_search_column(value: &str) -> Result<(), Status> {
|
||||||
|
if value.is_empty() {
|
||||||
|
return Err(Status::invalid_argument(
|
||||||
|
"constraint.column must not be empty",
|
||||||
|
));
|
||||||
|
}
|
||||||
|
|
||||||
|
if value.chars().any(|ch| ch.is_control() || ch == '\0') {
|
||||||
|
return Err(Status::invalid_argument(
|
||||||
|
"constraint.column contains invalid characters",
|
||||||
|
));
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
fn qualify_profile_table(profile_name: &str, table_name: &str) -> String {
|
||||||
|
format!("\"{}\".\"{}\"", profile_name, table_name)
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn profile_exists(pool: &PgPool, profile_name: &str) -> Result<bool, Status> {
|
||||||
|
let exists =
|
||||||
|
sqlx::query_scalar::<_, bool>("SELECT EXISTS(SELECT 1 FROM schemas WHERE name = $1)")
|
||||||
|
.bind(profile_name)
|
||||||
|
.fetch_one(pool)
|
||||||
|
.await
|
||||||
|
.map_err(|e| Status::internal(format!("Profile lookup failed: {}", e)))?;
|
||||||
|
Ok(exists)
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn table_exists(pool: &PgPool, profile_name: &str, table_name: &str) -> Result<bool, Status> {
|
||||||
|
let exists = sqlx::query_scalar::<_, bool>(
|
||||||
|
r#"
|
||||||
|
SELECT EXISTS(
|
||||||
|
SELECT 1
|
||||||
|
FROM table_definitions td
|
||||||
|
JOIN schemas s ON td.schema_id = s.id
|
||||||
|
WHERE s.name = $1 AND td.table_name = $2
|
||||||
|
)
|
||||||
|
"#,
|
||||||
|
)
|
||||||
|
.bind(profile_name)
|
||||||
|
.bind(table_name)
|
||||||
|
.fetch_one(pool)
|
||||||
|
.await
|
||||||
|
.map_err(|e| Status::internal(format!("Table lookup failed: {}", e)))?;
|
||||||
|
Ok(exists)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn normalize_request(req: SearchRequest) -> Result<NormalizedSearchRequest, Status> {
|
||||||
|
let profile_name = req.profile_name.trim();
|
||||||
|
if profile_name.is_empty() {
|
||||||
|
return Err(Status::invalid_argument("profile_name is required"));
|
||||||
|
}
|
||||||
|
validate_identifier(profile_name, "profile_name")?;
|
||||||
|
|
||||||
|
let table_name = match req.table_name.as_deref().map(str::trim) {
|
||||||
|
Some(table_name) if !table_name.is_empty() => {
|
||||||
|
validate_identifier(table_name, "table_name")?;
|
||||||
|
Some(table_name.to_string())
|
||||||
|
}
|
||||||
|
_ => None,
|
||||||
|
};
|
||||||
|
|
||||||
|
let free_query = req.free_query.trim().to_string();
|
||||||
|
let mut must = Vec::new();
|
||||||
|
|
||||||
|
for constraint in req.must {
|
||||||
|
let column = constraint.column.trim();
|
||||||
|
validate_search_column(column)?;
|
||||||
|
|
||||||
|
let query = constraint.query.trim();
|
||||||
|
if query.is_empty() {
|
||||||
|
return Err(Status::invalid_argument(
|
||||||
|
"constraint.query must not be empty",
|
||||||
|
));
|
||||||
|
}
|
||||||
|
|
||||||
|
must.push(SearchConstraint {
|
||||||
|
column: column.to_string(),
|
||||||
|
query: query.to_string(),
|
||||||
|
mode: constraint_mode_from_proto(constraint.mode),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
let limit = req
|
||||||
|
.limit
|
||||||
|
.map(|value| (value as usize).min(HARD_RESULT_LIMIT));
|
||||||
|
|
||||||
|
Ok(NormalizedSearchRequest {
|
||||||
|
profile_name: profile_name.to_string(),
|
||||||
|
table_name,
|
||||||
|
free_query,
|
||||||
|
must,
|
||||||
|
limit,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
fn constraint_mode_from_proto(raw_mode: i32) -> ConstraintMode {
|
||||||
|
match raw_mode {
|
||||||
|
2 => ConstraintMode::Exact,
|
||||||
|
_ => ConstraintMode::Fuzzy,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn fetch_latest_rows(
|
||||||
|
pool: &PgPool,
|
||||||
|
profile_name: &str,
|
||||||
|
table_name: &str,
|
||||||
|
limit: usize,
|
||||||
|
) -> Result<Vec<Hit>, Status> {
|
||||||
|
let sql = format!(
|
||||||
|
"SELECT id, to_jsonb(t) AS data FROM {} t WHERE deleted = FALSE ORDER BY id DESC LIMIT $1",
|
||||||
|
qualify_profile_table(profile_name, table_name)
|
||||||
|
);
|
||||||
|
|
||||||
|
let rows = sqlx::query(&sql)
|
||||||
|
.bind(limit as i64)
|
||||||
|
.fetch_all(pool)
|
||||||
|
.await
|
||||||
|
.map_err(|e| Status::internal(format!("DB query for default results failed: {}", e)))?;
|
||||||
|
|
||||||
|
Ok(rows
|
||||||
|
.into_iter()
|
||||||
|
.map(|row| {
|
||||||
|
let id: i64 = row.try_get("id").unwrap_or_default();
|
||||||
|
let json_data: serde_json::Value = row.try_get("data").unwrap_or_default();
|
||||||
|
Hit {
|
||||||
|
id,
|
||||||
|
score: 0.0,
|
||||||
|
content_json: json_data.to_string(),
|
||||||
|
table_name: table_name.to_string(),
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.collect())
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn run_search(
|
||||||
|
pool: &PgPool,
|
||||||
|
profile: &ProfileIndex,
|
||||||
|
profile_name: &str,
|
||||||
|
table_filter: Option<&str>,
|
||||||
|
free_query: &str,
|
||||||
|
must: &[SearchConstraint],
|
||||||
|
limit: usize,
|
||||||
|
) -> Result<Vec<Hit>, Status> {
|
||||||
|
let master_query = build_master_query(
|
||||||
|
&profile.index,
|
||||||
|
&profile.fields,
|
||||||
|
free_query,
|
||||||
|
must,
|
||||||
|
table_filter,
|
||||||
|
)?;
|
||||||
|
|
||||||
|
let searcher = profile.reader.searcher();
|
||||||
|
let top_docs = searcher
|
||||||
|
.search(&*master_query, &TopDocs::with_limit(limit))
|
||||||
|
.map_err(|e| Status::internal(format!("Search failed: {}", e)))?;
|
||||||
|
|
||||||
|
if top_docs.is_empty() {
|
||||||
|
return Ok(vec![]);
|
||||||
|
}
|
||||||
|
|
||||||
|
let mut candidates: Vec<(f32, i64, String)> = Vec::with_capacity(top_docs.len());
|
||||||
|
for (score, doc_address) in top_docs {
|
||||||
|
let doc: TantivyDocument = searcher
|
||||||
|
.doc(doc_address)
|
||||||
|
.map_err(|e| Status::internal(format!("Failed to retrieve document: {}", e)))?;
|
||||||
|
let Some(pg_id) = doc
|
||||||
|
.get_first(profile.fields.pg_id)
|
||||||
|
.and_then(|value| value.as_u64())
|
||||||
|
else {
|
||||||
|
continue;
|
||||||
|
};
|
||||||
|
let Some(table_name) = doc
|
||||||
|
.get_first(profile.fields.table_name)
|
||||||
|
.and_then(|value| value.as_str())
|
||||||
|
else {
|
||||||
|
continue;
|
||||||
|
};
|
||||||
|
candidates.push((score, pg_id as i64, table_name.to_string()));
|
||||||
|
}
|
||||||
|
|
||||||
|
if candidates.is_empty() {
|
||||||
|
return Ok(vec![]);
|
||||||
|
}
|
||||||
|
|
||||||
|
let mut ids_by_table: HashMap<String, Vec<i64>> = HashMap::new();
|
||||||
|
for (_, pg_id, table_name) in &candidates {
|
||||||
|
ids_by_table
|
||||||
|
.entry(table_name.clone())
|
||||||
|
.or_default()
|
||||||
|
.push(*pg_id);
|
||||||
|
}
|
||||||
|
|
||||||
|
let mut content_map: HashMap<(String, i64), String> = HashMap::new();
|
||||||
|
for (table_name, pg_ids) in ids_by_table {
|
||||||
|
validate_identifier(&table_name, "table_name")?;
|
||||||
|
let sql = format!(
|
||||||
|
"SELECT id, to_jsonb(t) AS data FROM {} t WHERE deleted = FALSE AND id = ANY($1)",
|
||||||
|
qualify_profile_table(profile_name, &table_name)
|
||||||
|
);
|
||||||
|
|
||||||
|
let rows = sqlx::query(&sql)
|
||||||
|
.bind(&pg_ids)
|
||||||
|
.fetch_all(pool)
|
||||||
|
.await
|
||||||
|
.map_err(|e| Status::internal(format!("Database query failed: {}", e)))?;
|
||||||
|
|
||||||
|
for row in rows {
|
||||||
|
let id: i64 = row.try_get("id").unwrap_or_default();
|
||||||
|
let json_data: serde_json::Value = row.try_get("data").unwrap_or_default();
|
||||||
|
content_map.insert((table_name.clone(), id), json_data.to_string());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok(candidates
|
||||||
|
.into_iter()
|
||||||
|
.filter_map(|(score, pg_id, table_name)| {
|
||||||
|
content_map
|
||||||
|
.get(&(table_name.clone(), pg_id))
|
||||||
|
.map(|content_json| Hit {
|
||||||
|
id: pg_id,
|
||||||
|
score,
|
||||||
|
content_json: content_json.clone(),
|
||||||
|
table_name,
|
||||||
|
})
|
||||||
|
})
|
||||||
|
.collect())
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tonic::async_trait]
|
||||||
|
impl Searcher for SearcherService {
|
||||||
|
async fn search(
|
||||||
|
&self,
|
||||||
|
request: Request<SearchRequest>,
|
||||||
|
) -> Result<Response<SearchResponse>, Status> {
|
||||||
|
self.run_rpc(request).await
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
251
search/src/query_builder.rs
Normal file
251
search/src/query_builder.rs
Normal file
@@ -0,0 +1,251 @@
|
|||||||
|
use common::search::{
|
||||||
|
json_path_term, normalize_column_name, normalize_exact, tokenize_ngram, tokenize_word,
|
||||||
|
SchemaFields,
|
||||||
|
};
|
||||||
|
use tantivy::query::{
|
||||||
|
BooleanQuery, BoostQuery, EmptyQuery, FuzzyTermQuery, Occur, PhraseQuery, Query, QueryParser,
|
||||||
|
TermQuery,
|
||||||
|
};
|
||||||
|
use tantivy::schema::{IndexRecordOption, Term};
|
||||||
|
use tantivy::Index;
|
||||||
|
use tonic::Status;
|
||||||
|
|
||||||
|
#[derive(Clone, Copy, Debug, Eq, PartialEq)]
|
||||||
|
pub enum ConstraintMode {
|
||||||
|
Fuzzy,
|
||||||
|
Exact,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Clone, Debug)]
|
||||||
|
pub struct SearchConstraint {
|
||||||
|
pub column: String,
|
||||||
|
pub query: String,
|
||||||
|
pub mode: ConstraintMode,
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn build_master_query(
|
||||||
|
index: &Index,
|
||||||
|
fields: &SchemaFields,
|
||||||
|
free_query: &str,
|
||||||
|
must: &[SearchConstraint],
|
||||||
|
table_filter: Option<&str>,
|
||||||
|
) -> Result<Box<dyn Query>, Status> {
|
||||||
|
let mut clauses: Vec<(Occur, Box<dyn Query>)> = Vec::new();
|
||||||
|
let mut has_search_clause = false;
|
||||||
|
|
||||||
|
for constraint in must {
|
||||||
|
let predicate = match constraint.mode {
|
||||||
|
ConstraintMode::Exact => {
|
||||||
|
exact_predicate(fields, &constraint.column, &constraint.query)?
|
||||||
|
}
|
||||||
|
ConstraintMode::Fuzzy => {
|
||||||
|
fuzzy_predicate_scoped(fields, &constraint.column, &constraint.query)?
|
||||||
|
}
|
||||||
|
};
|
||||||
|
clauses.push((Occur::Must, predicate));
|
||||||
|
has_search_clause = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
let free_words = tokenize_word(free_query);
|
||||||
|
if !free_words.is_empty() {
|
||||||
|
let predicate = fuzzy_predicate_unscoped(index, fields, &free_words)?;
|
||||||
|
clauses.push((Occur::Must, predicate));
|
||||||
|
has_search_clause = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
if let Some(table_name) = table_filter {
|
||||||
|
let term = Term::from_field_text(fields.table_name, table_name);
|
||||||
|
clauses.push((
|
||||||
|
Occur::Must,
|
||||||
|
Box::new(TermQuery::new(term, IndexRecordOption::Basic)),
|
||||||
|
));
|
||||||
|
}
|
||||||
|
|
||||||
|
if !has_search_clause {
|
||||||
|
return Ok(Box::new(EmptyQuery));
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok(Box::new(BooleanQuery::new(clauses)))
|
||||||
|
}
|
||||||
|
|
||||||
|
fn exact_predicate(
|
||||||
|
fields: &SchemaFields,
|
||||||
|
column: &str,
|
||||||
|
query: &str,
|
||||||
|
) -> Result<Box<dyn Query>, Status> {
|
||||||
|
let normalized_value = normalize_exact(query);
|
||||||
|
if normalized_value.is_empty() {
|
||||||
|
return Err(Status::invalid_argument(
|
||||||
|
"exact query is empty after normalization",
|
||||||
|
));
|
||||||
|
}
|
||||||
|
|
||||||
|
let column = normalize_column_name(column);
|
||||||
|
let term = json_path_term(fields.data_exact, &column, &normalized_value);
|
||||||
|
Ok(Box::new(TermQuery::new(term, IndexRecordOption::Basic)))
|
||||||
|
}
|
||||||
|
|
||||||
|
fn fuzzy_predicate_scoped(
|
||||||
|
fields: &SchemaFields,
|
||||||
|
column: &str,
|
||||||
|
query: &str,
|
||||||
|
) -> Result<Box<dyn Query>, Status> {
|
||||||
|
let words = tokenize_word(query);
|
||||||
|
if words.is_empty() {
|
||||||
|
return Err(Status::invalid_argument(
|
||||||
|
"fuzzy query has no searchable tokens",
|
||||||
|
));
|
||||||
|
}
|
||||||
|
|
||||||
|
let column = normalize_column_name(column);
|
||||||
|
|
||||||
|
let mut layers: Vec<(Occur, Box<dyn Query>)> = Vec::new();
|
||||||
|
|
||||||
|
let mut per_word_clauses: Vec<(Occur, Box<dyn Query>)> = Vec::new();
|
||||||
|
for word in &words {
|
||||||
|
let term = json_path_term(fields.data_word, &column, word);
|
||||||
|
let mut alternates: Vec<(Occur, Box<dyn Query>)> = Vec::new();
|
||||||
|
|
||||||
|
alternates.push((
|
||||||
|
Occur::Should,
|
||||||
|
Box::new(BoostQuery::new(
|
||||||
|
Box::new(TermQuery::new(term.clone(), IndexRecordOption::WithFreqs)),
|
||||||
|
4.0,
|
||||||
|
)),
|
||||||
|
));
|
||||||
|
|
||||||
|
alternates.push((
|
||||||
|
Occur::Should,
|
||||||
|
Box::new(BoostQuery::new(
|
||||||
|
Box::new(FuzzyTermQuery::new_prefix(term.clone(), 0, false)),
|
||||||
|
3.0,
|
||||||
|
)),
|
||||||
|
));
|
||||||
|
|
||||||
|
if let Some(distance) = fuzzy_distance(word.chars().count()) {
|
||||||
|
alternates.push((
|
||||||
|
Occur::Should,
|
||||||
|
Box::new(BoostQuery::new(
|
||||||
|
Box::new(FuzzyTermQuery::new(term.clone(), distance, true)),
|
||||||
|
2.0,
|
||||||
|
)),
|
||||||
|
));
|
||||||
|
}
|
||||||
|
|
||||||
|
per_word_clauses.push((Occur::Must, Box::new(BooleanQuery::new(alternates))));
|
||||||
|
}
|
||||||
|
layers.push((Occur::Should, Box::new(BooleanQuery::new(per_word_clauses))));
|
||||||
|
|
||||||
|
if words.len() > 1 {
|
||||||
|
let phrase_terms: Vec<(usize, Term)> = words
|
||||||
|
.iter()
|
||||||
|
.enumerate()
|
||||||
|
.map(|(offset, word)| (offset, json_path_term(fields.data_word, &column, word)))
|
||||||
|
.collect();
|
||||||
|
let phrase = PhraseQuery::new_with_offset_and_slop(phrase_terms, 3);
|
||||||
|
layers.push((
|
||||||
|
Occur::Should,
|
||||||
|
Box::new(BoostQuery::new(Box::new(phrase), 2.0)),
|
||||||
|
));
|
||||||
|
}
|
||||||
|
|
||||||
|
let ngrams = tokenize_ngram(query);
|
||||||
|
if !ngrams.is_empty() {
|
||||||
|
let ngram_clauses: Vec<(Occur, Box<dyn Query>)> = ngrams
|
||||||
|
.into_iter()
|
||||||
|
.map(|gram| {
|
||||||
|
let term = json_path_term(fields.data_ngram, &column, &gram);
|
||||||
|
(
|
||||||
|
Occur::Must,
|
||||||
|
Box::new(TermQuery::new(term, IndexRecordOption::Basic)) as Box<dyn Query>,
|
||||||
|
)
|
||||||
|
})
|
||||||
|
.collect();
|
||||||
|
layers.push((
|
||||||
|
Occur::Should,
|
||||||
|
Box::new(BoostQuery::new(
|
||||||
|
Box::new(BooleanQuery::new(ngram_clauses)),
|
||||||
|
1.0,
|
||||||
|
)),
|
||||||
|
));
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok(Box::new(BooleanQuery::new(layers)))
|
||||||
|
}
|
||||||
|
|
||||||
|
fn fuzzy_predicate_unscoped(
|
||||||
|
index: &Index,
|
||||||
|
fields: &SchemaFields,
|
||||||
|
words: &[String],
|
||||||
|
) -> Result<Box<dyn Query>, Status> {
|
||||||
|
let mut layers: Vec<(Occur, Box<dyn Query>)> = Vec::new();
|
||||||
|
|
||||||
|
let mut per_word_clauses: Vec<(Occur, Box<dyn Query>)> = Vec::new();
|
||||||
|
for word in words {
|
||||||
|
let term = Term::from_field_text(fields.all_text, word);
|
||||||
|
let mut alternates: Vec<(Occur, Box<dyn Query>)> = Vec::new();
|
||||||
|
|
||||||
|
alternates.push((
|
||||||
|
Occur::Should,
|
||||||
|
Box::new(BoostQuery::new(
|
||||||
|
Box::new(TermQuery::new(term.clone(), IndexRecordOption::WithFreqs)),
|
||||||
|
4.0,
|
||||||
|
)),
|
||||||
|
));
|
||||||
|
|
||||||
|
alternates.push((
|
||||||
|
Occur::Should,
|
||||||
|
Box::new(BoostQuery::new(
|
||||||
|
Box::new(FuzzyTermQuery::new_prefix(term.clone(), 0, false)),
|
||||||
|
3.0,
|
||||||
|
)),
|
||||||
|
));
|
||||||
|
|
||||||
|
if let Some(distance) = fuzzy_distance(word.chars().count()) {
|
||||||
|
alternates.push((
|
||||||
|
Occur::Should,
|
||||||
|
Box::new(BoostQuery::new(
|
||||||
|
Box::new(FuzzyTermQuery::new(term, distance, true)),
|
||||||
|
2.0,
|
||||||
|
)),
|
||||||
|
));
|
||||||
|
}
|
||||||
|
|
||||||
|
per_word_clauses.push((Occur::Must, Box::new(BooleanQuery::new(alternates))));
|
||||||
|
}
|
||||||
|
layers.push((Occur::Should, Box::new(BooleanQuery::new(per_word_clauses))));
|
||||||
|
|
||||||
|
if words.len() > 1 {
|
||||||
|
let parser = QueryParser::for_index(index, vec![fields.all_text]);
|
||||||
|
let query_string = format!("\"{}\"~3", words.join(" "));
|
||||||
|
if let Ok(query) = parser.parse_query(&query_string) {
|
||||||
|
layers.push((Occur::Should, Box::new(BoostQuery::new(query, 2.0))));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
{
|
||||||
|
let parser = QueryParser::for_index(index, vec![fields.all_text]);
|
||||||
|
let query_string = words
|
||||||
|
.iter()
|
||||||
|
.map(|word| format!("+{}*", word))
|
||||||
|
.collect::<Vec<_>>()
|
||||||
|
.join(" ");
|
||||||
|
if let Ok(query) = parser.parse_query(&query_string) {
|
||||||
|
layers.push((Occur::Should, Box::new(BoostQuery::new(query, 1.0))));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if layers.is_empty() {
|
||||||
|
return Ok(Box::new(EmptyQuery));
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok(Box::new(BooleanQuery::new(layers)))
|
||||||
|
}
|
||||||
|
|
||||||
|
fn fuzzy_distance(word_len: usize) -> Option<u8> {
|
||||||
|
match word_len {
|
||||||
|
0..=3 => None,
|
||||||
|
4..=6 => Some(1),
|
||||||
|
_ => Some(2),
|
||||||
|
}
|
||||||
|
}
|
||||||
2
server
2
server
Submodule server updated: e497676789...271caf181d
34
tantivy_todo.md
Normal file
34
tantivy_todo.md
Normal file
@@ -0,0 +1,34 @@
|
|||||||
|
1. Add explicit reindex/backfill tooling.
|
||||||
|
Right now, only future PostTableData / PutTableData calls index rows. There should be an admin/dev command like:
|
||||||
|
|
||||||
|
ReindexProfile(profile_name)
|
||||||
|
ReindexTable(profile_name, table_name)
|
||||||
|
ReindexRow(profile_name, table_name, id)
|
||||||
|
|
||||||
|
This is the biggest missing piece.
|
||||||
|
|
||||||
|
2. Stop using relative ./tantivy_indexes.
|
||||||
|
Both writer and reader depend on the process working directory. Make it config/env-driven, e.g.
|
||||||
|
TANTIVY_INDEX_DIR.
|
||||||
|
3. Add index schema/version metadata.
|
||||||
|
If you change tokenizers/schema later, old indexes should fail with a clear “index version mismatch, reindex
|
||||||
|
required” instead of behaving strangely.
|
||||||
|
4. Batch index commits.
|
||||||
|
Current code opens a writer and commits per row. Fine for dev, not great for many inserts. A long-lived writer
|
||||||
|
task batching commits every N docs or every short interval would be more reliable and faster.
|
||||||
|
5. Make the indexing queue durable.
|
||||||
|
The current mpsc queue is in-memory. If the server crashes after DB insert but before indexing, search is stale.
|
||||||
|
For serious use, store pending index jobs in Postgres, process them, mark done.
|
||||||
|
6. Index only live rows intentionally.
|
||||||
|
handle_add_or_update currently fetches row by id without checking deleted = false, then search filters deleted
|
||||||
|
rows later. I’d either skip indexing deleted rows or make delete/update semantics explicit.
|
||||||
|
7. Add typed fields for numbers/dates if you need range queries.
|
||||||
|
Right now numbers are converted to strings. Good for text search, bad for real numeric filtering/sorting. Tantivy
|
||||||
|
can do numeric/date fields, but JSON text fields are not enough for robust range search.
|
||||||
|
8. Decide column-name strategy.
|
||||||
|
Indexing lowercases raw DB JSON keys. If UI uses display names/aliases, column constraints can miss unless the
|
||||||
|
frontend sends exactly what the index expects. I’d centralize display-name to physical-name mapping before
|
||||||
|
search.
|
||||||
|
9. Add delete hooks for table/profile deletion.
|
||||||
|
When a table or profile is deleted, the matching Tantivy docs/index directory should be cleaned by code, not
|
||||||
|
manually.
|
||||||
1
tui-canvas
Submodule
1
tui-canvas
Submodule
Submodule tui-canvas added at 533036667d
1
tui-pages
Submodule
1
tui-pages
Submodule
Submodule tui-pages added at dd827694b9
33
tui-pages_migration_for_client_guide.md
Normal file
33
tui-pages_migration_for_client_guide.md
Normal file
@@ -0,0 +1,33 @@
|
|||||||
|
|
||||||
|
1. Action System
|
||||||
|
tui-pages intentionally does not provide ActionResolution like client/src/action_engine/action_decider/
|
||||||
|
handler.rs:23. Replace it in the client adapter/handler, not in tui-pages.
|
||||||
|
|
||||||
|
Best path: keep the routing logic as app code inside TuiActionHandler::handle_action, or keep a private helper
|
||||||
|
equivalent to ActionDecider::resolve. ctx.current_view and ctx.focus from tui-pages/src/runtime/mod.rs:181 give
|
||||||
|
you enough data to route page/canvas/global actions. This is a client philosophy change: routing becomes part of
|
||||||
|
the app handler, while tui-pages only provides focus/view/input context.
|
||||||
|
2. Overlay Types
|
||||||
|
No tui-pages change needed. Your old OverlayKind maps naturally to the generic O parameter.
|
||||||
|
|
||||||
|
Define something like client-side enum ClientOverlay { CommandBar, SearchPalette, FindFilePalette, Sidebar,
|
||||||
|
Picker }, then use FocusTarget::Overlay(ClientOverlay::CommandBar) etc. DialogButton(usize) should probably
|
||||||
|
become FocusTarget::ModalItem(usize) if you use the modal path, because tui-pages separates simple named overlays
|
||||||
|
from modal item focus in tui-pages/src/focus/target.rs:19.
|
||||||
|
3. String vs Type-Based Modes
|
||||||
|
This is not a real incompatibility. ModeId is just a typed wrapper over strings and implements AsRef<str>/
|
||||||
|
From<String> in tui-pages/src/runtime/mod.rs:13. Your current KeyMode::as_str() values already match the tui-
|
||||||
|
pages::modes constants.
|
||||||
|
|
||||||
|
The actual migration is moving mode calculation from FocusTarget::mode_hint() in client/src/focus_manager/
|
||||||
|
target.rs:50 into PageSpec::modes(...). Since page_spec(view, state, focus) receives focus, you can preserve the
|
||||||
|
same behavior there. Watch one behavior: the old client converts plain insert-mode chars into
|
||||||
|
CanvasAction::InsertChar in client/src/input_pipeline/pipeline.rs:90; tui-pages returns PipelineResponse::Type
|
||||||
|
instead. Preserve that in TuiActionHandler::handle_text.
|
||||||
|
4. Page Identification
|
||||||
|
PageIdentifier should likely disappear. It duplicates AppView. tui-pages already gives ctx.current_view, so
|
||||||
|
checks like PageIdentifier::Form(_) become matches!(ctx.current_view, AppView::Form(_)).
|
||||||
|
|
||||||
|
This is a natural cleanup, not a tui-pages gap. The only case to keep a separate identifier is if you
|
||||||
|
intentionally want to collapse several AppView variants into one routing bucket. Even then, make it a client-
|
||||||
|
local helper derived from AppView, not a runtime concept.
|
||||||
Reference in New Issue
Block a user