diff --git a/.github/workflows/extension_ci.yml b/.github/workflows/extension_ci.yml index 3a24fda..18588b3 100644 --- a/.github/workflows/extension_ci.yml +++ b/.github/workflows/extension_ci.yml @@ -3,7 +3,7 @@ name: PG Vectorize Extension defaults: run: shell: bash - working-directory: ./ + working-directory: ./extension on: pull_request: @@ -73,7 +73,7 @@ jobs: cache-directories: /home/runner/.pgrx - uses: ./.github/actions/pgx-init with: - working-directory: ./ + working-directory: ./extension - name: Cargo format run: cargo fmt --all --check - name: Clippy @@ -103,7 +103,7 @@ jobs: cache-directories: /home/runner/.pgrx - uses: ./.github/actions/pgx-init with: - working-directory: ./ + working-directory: ./extension - name: Restore cached binaries uses: actions/cache@v2 with: @@ -160,10 +160,10 @@ jobs: sudo mv stoml /usr/local/bin/ cargo install pg-trunk - name: trunk build - working-directory: ./ + working-directory: ./extension run: ~/.cargo/bin/trunk build --pg-version ${{ matrix.pg-version }} - name: trunk publish - working-directory: ./ + working-directory: ./extension env: TRUNK_API_TOKEN: ${{ secrets.TRUNK_AUTH_TOKEN }} run: ~/.cargo/bin/trunk publish diff --git a/.github/workflows/extension_upgrade.yml b/.github/workflows/extension_upgrade.yml index b5a2ff4..5f420b8 100644 --- a/.github/workflows/extension_upgrade.yml +++ b/.github/workflows/extension_upgrade.yml @@ -3,7 +3,7 @@ name: Extension Upgrade defaults: run: shell: bash - working-directory: ./ + working-directory: ./extension on: pull_request: @@ -46,17 +46,17 @@ jobs: run: echo "CI_BRANCH=$(git name-rev --name-only HEAD)" >> $GITHUB_OUTPUT - uses: ./.github/actions/pgx-init with: - working-directory: ./ + working-directory: ./extension - name: Install sys dependencies run: | sudo apt-get update && sudo apt-get install -y postgresql-server-dev-14 make setup - - name: Test previous version (main)) - run: | - git fetch --tags - git checkout main - echo "\q" | make run - cargo test -- --ignored --test-threads=1 + # - name: Test previous version (main)) + # run: | + # git fetch --tags + # git checkout main + # echo "\q" | make run + # cargo test -- --ignored --test-threads=1 - name: Test branch's version env: CI_BRANCH: ${{ steps.current-version.outputs.CI_BRANCH }} diff --git a/.github/workflows/pgxn-release.yml b/.github/workflows/pgxn-release.yml index fc41114..5af8fe6 100644 --- a/.github/workflows/pgxn-release.yml +++ b/.github/workflows/pgxn-release.yml @@ -12,9 +12,11 @@ jobs: - name: Check out the repo uses: actions/checkout@v4 - name: Bundle the Release + working-directory: ./extension env: { GIT_BUNDLE_OPTS: --add-file META.json } run: make META.json && pgxn-bundle - name: Release on PGXN + working-directory: ./extension env: PGXN_USERNAME: ${{ secrets.PGXN_USERNAME }} PGXN_PASSWORD: ${{ secrets.PGXN_PASSWORD }} diff --git a/Cargo.lock b/Cargo.lock deleted file mode 100644 index a5c590b..0000000 --- a/Cargo.lock +++ /dev/null @@ -1,3379 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "addr2line" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" -dependencies = [ - "gimli", -] - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "ahash" -version = "0.8.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01" -dependencies = [ - "cfg-if", - "getrandom", - "once_cell", - "version_check", - "zerocopy", -] - -[[package]] -name = "aho-corasick" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" -dependencies = [ - "memchr", -] - -[[package]] -name = "allocator-api2" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" - -[[package]] -name = "android-tzdata" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" - -[[package]] -name = "android_system_properties" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" -dependencies = [ - "libc", -] - -[[package]] -name = "anstyle" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" - -[[package]] -name = "anyhow" -version = "1.0.79" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" - -[[package]] -name = "async-trait" -version = "0.1.77" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", -] - -[[package]] -name = "atoi" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28d99ec8bfea296261ca1af174f24225171fea9664ba9003cbebee704810528" -dependencies = [ - "num-traits", -] - -[[package]] -name = "atomic-polyfill" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cf2bce30dfe09ef0bfaef228b9d414faaf7e563035494d7fe092dba54b300f4" -dependencies = [ - "critical-section", -] - -[[package]] -name = "atomic-traits" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b29ec3788e96fb4fdb275ccb9d62811f2fa903d76c5eb4dd6fe7d09a7ed5871f" -dependencies = [ - "cfg-if", - "rustc_version 0.3.3", -] - -[[package]] -name = "atomic-write-file" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edcdbedc2236483ab103a53415653d6b4442ea6141baf1ffa85df29635e88436" -dependencies = [ - "nix", - "rand", -] - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "backtrace" -version = "0.3.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" -dependencies = [ - "addr2line", - "cc", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", -] - -[[package]] -name = "base64" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff" - -[[package]] -name = "base64" -version = "0.21.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" - -[[package]] -name = "base64ct" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" - -[[package]] -name = "bindgen" -version = "0.69.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4c69fae65a523209d34240b60abe0c42d33d1045d445c0839d8a4894a736e2d" -dependencies = [ - "bitflags 2.4.2", - "cexpr", - "clang-sys", - "lazy_static", - "lazycell", - "peeking_take_while", - "proc-macro2", - "quote", - "regex", - "rustc-hash", - "shlex", - "syn 2.0.48", -] - -[[package]] -name = "bit-set" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" -dependencies = [ - "bit-vec", -] - -[[package]] -name = "bit-vec" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bitflags" -version = "2.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" -dependencies = [ - "serde", -] - -[[package]] -name = "bitvec" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" -dependencies = [ - "funty", - "radium", - "tap", - "wyz", -] - -[[package]] -name = "block-buffer" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" -dependencies = [ - "generic-array", -] - -[[package]] -name = "bstr" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c48f0051a4b4c5e0b6d365cd04af53aeaa209e3cc15ec2cdb69e73cc87fbd0dc" -dependencies = [ - "memchr", - "regex-automata", - "serde", -] - -[[package]] -name = "bumpalo" -version = "3.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" - -[[package]] -name = "byteorder" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" - -[[package]] -name = "bytes" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" - -[[package]] -name = "cargo_toml" -version = "0.16.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3f9629bc6c4388ea699781dc988c2b99766d7679b151c81990b4fa1208fafd3" -dependencies = [ - "serde", - "toml", -] - -[[package]] -name = "cc" -version = "1.0.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" -dependencies = [ - "libc", -] - -[[package]] -name = "cexpr" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" -dependencies = [ - "nom", -] - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "chrono" -version = "0.4.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41daef31d7a747c5c847246f36de49ced6f7403b4cdabc807a97b5cc184cda7a" -dependencies = [ - "android-tzdata", - "iana-time-zone", - "js-sys", - "num-traits", - "serde", - "wasm-bindgen", - "windows-targets 0.52.0", -] - -[[package]] -name = "clang-sys" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67523a3b4be3ce1989d607a828d036249522dd9c1c8de7f4dd2dae43a37369d1" -dependencies = [ - "glob", - "libc", - "libloading", -] - -[[package]] -name = "clap" -version = "4.4.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e578d6ec4194633722ccf9544794b71b1385c3c027efe0c55db226fc880865c" -dependencies = [ - "clap_builder", - "clap_derive", -] - -[[package]] -name = "clap-cargo" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25122ca6ebad5f53578c26638afd9f0160426969970dc37ec6c363ff6b082ebd" -dependencies = [ - "clap", - "doc-comment", -] - -[[package]] -name = "clap_builder" -version = "4.4.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4df4df40ec50c46000231c914968278b1eb05098cf8f1b3a518a95030e71d1c7" -dependencies = [ - "anstyle", - "clap_lex", -] - -[[package]] -name = "clap_derive" -version = "4.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn 2.0.48", -] - -[[package]] -name = "clap_lex" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" - -[[package]] -name = "const-oid" -version = "0.9.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" - -[[package]] -name = "convert_case" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca" -dependencies = [ - "unicode-segmentation", -] - -[[package]] -name = "core-foundation" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "core-foundation-sys" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" - -[[package]] -name = "cpufeatures" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" -dependencies = [ - "libc", -] - -[[package]] -name = "crc" -version = "3.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86ec7a15cbe22e59248fc7eadb1907dab5ba09372595da4d73dd805ed4417dfe" -dependencies = [ - "crc-catalog", -] - -[[package]] -name = "crc-catalog" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" - -[[package]] -name = "critical-section" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7059fff8937831a9ae6f0fe4d658ffabf58f2ca96aa9dec1c889f936f705f216" - -[[package]] -name = "crossbeam-deque" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" -dependencies = [ - "crossbeam-epoch", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-queue" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" - -[[package]] -name = "crypto-common" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" -dependencies = [ - "generic-array", - "typenum", -] - -[[package]] -name = "der" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c" -dependencies = [ - "const-oid", - "pem-rfc7468", - "zeroize", -] - -[[package]] -name = "digest" -version = "0.10.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" -dependencies = [ - "block-buffer", - "const-oid", - "crypto-common", - "subtle", -] - -[[package]] -name = "dirs" -version = "5.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" -dependencies = [ - "dirs-sys", -] - -[[package]] -name = "dirs-sys" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" -dependencies = [ - "libc", - "option-ext", - "redox_users", - "windows-sys 0.48.0", -] - -[[package]] -name = "doc-comment" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" - -[[package]] -name = "dotenvy" -version = "0.15.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b" - -[[package]] -name = "either" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" -dependencies = [ - "serde", -] - -[[package]] -name = "encoding_rs" -version = "0.8.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "enum-map" -version = "2.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6866f3bfdf8207509a033af1a75a7b08abda06bbaaeae6669323fd5a097df2e9" -dependencies = [ - "enum-map-derive", -] - -[[package]] -name = "enum-map-derive" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f282cfdfe92516eb26c2af8589c274c7c17681f5ecc03c18255fe741c6aa64eb" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", -] - -[[package]] -name = "equivalent" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" - -[[package]] -name = "errno" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "etcetera" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "136d1b5283a1ab77bd9257427ffd09d8667ced0570b6f938942bc7568ed5b943" -dependencies = [ - "cfg-if", - "home", - "windows-sys 0.48.0", -] - -[[package]] -name = "event-listener" -version = "2.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" - -[[package]] -name = "eyre" -version = "0.6.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6267a1fa6f59179ea4afc8e50fd8612a3cc60bc858f786ff877a4a8cb042799" -dependencies = [ - "indenter", - "once_cell", -] - -[[package]] -name = "fallible-iterator" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" - -[[package]] -name = "fancy-regex" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7493d4c459da9f84325ad297371a6b2b8a162800873a22e3b6b6512e61d18c05" -dependencies = [ - "bit-set", - "regex", -] - -[[package]] -name = "fastrand" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" - -[[package]] -name = "finl_unicode" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fcfdc7a0362c9f4444381a9e697c79d435fe65b52a37466fc2c1184cee9edc6" - -[[package]] -name = "fixedbitset" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" - -[[package]] -name = "flume" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" -dependencies = [ - "futures-core", - "futures-sink", - "spin 0.9.8", -] - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared", -] - -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - -[[package]] -name = "form_urlencoded" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" -dependencies = [ - "percent-encoding", -] - -[[package]] -name = "funty" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" - -[[package]] -name = "futures-channel" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" -dependencies = [ - "futures-core", - "futures-sink", -] - -[[package]] -name = "futures-core" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" - -[[package]] -name = "futures-executor" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-intrusive" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d930c203dd0b6ff06e0201a4a2fe9149b43c684fd4420555b26d21b1a02956f" -dependencies = [ - "futures-core", - "lock_api", - "parking_lot", -] - -[[package]] -name = "futures-io" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" - -[[package]] -name = "futures-macro" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", -] - -[[package]] -name = "futures-sink" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" - -[[package]] -name = "futures-task" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" - -[[package]] -name = "futures-util" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" -dependencies = [ - "futures-core", - "futures-io", - "futures-macro", - "futures-sink", - "futures-task", - "memchr", - "pin-project-lite", - "pin-utils", - "slab", -] - -[[package]] -name = "generic-array" -version = "0.14.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" -dependencies = [ - "typenum", - "version_check", -] - -[[package]] -name = "getrandom" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" -dependencies = [ - "cfg-if", - "libc", - "wasi", -] - -[[package]] -name = "gimli" -version = "0.28.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" - -[[package]] -name = "glob" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" - -[[package]] -name = "h2" -version = "0.3.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9" -dependencies = [ - "bytes", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http", - "indexmap", - "slab", - "tokio", - "tokio-util", - "tracing", -] - -[[package]] -name = "half" -version = "1.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" - -[[package]] -name = "handlebars" -version = "5.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab283476b99e66691dee3f1640fea91487a8d81f50fb5ecc75538f8f8879a1e4" -dependencies = [ - "log", - "pest", - "pest_derive", - "serde", - "serde_json", - "thiserror", -] - -[[package]] -name = "hash32" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0c35f58762feb77d74ebe43bdbc3210f09be9fe6742234d573bacc26ed92b67" -dependencies = [ - "byteorder", -] - -[[package]] -name = "hashbrown" -version = "0.14.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" -dependencies = [ - "ahash", - "allocator-api2", -] - -[[package]] -name = "hashlink" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" -dependencies = [ - "hashbrown", -] - -[[package]] -name = "heapless" -version = "0.7.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdc6457c0eb62c71aac4bc17216026d8410337c4126773b9c5daba343f17964f" -dependencies = [ - "atomic-polyfill", - "hash32", - "rustc_version 0.4.0", - "spin 0.9.8", - "stable_deref_trait", -] - -[[package]] -name = "heck" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" -dependencies = [ - "unicode-segmentation", -] - -[[package]] -name = "hermit-abi" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d3d0e0f38255e7fa3cf31335b3a56f05febd18025f4db5ef7a0cfb4f8da651f" - -[[package]] -name = "hex" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" - -[[package]] -name = "hkdf" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7" -dependencies = [ - "hmac", -] - -[[package]] -name = "hmac" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" -dependencies = [ - "digest", -] - -[[package]] -name = "home" -version = "0.5.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" -dependencies = [ - "windows-sys 0.52.0", -] - -[[package]] -name = "http" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" -dependencies = [ - "bytes", - "fnv", - "itoa", -] - -[[package]] -name = "http-body" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" -dependencies = [ - "bytes", - "http", - "pin-project-lite", -] - -[[package]] -name = "httparse" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" - -[[package]] -name = "httpdate" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" - -[[package]] -name = "hyper" -version = "0.14.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" -dependencies = [ - "bytes", - "futures-channel", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "httparse", - "httpdate", - "itoa", - "pin-project-lite", - "socket2", - "tokio", - "tower-service", - "tracing", - "want", -] - -[[package]] -name = "hyper-tls" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" -dependencies = [ - "bytes", - "hyper", - "native-tls", - "tokio", - "tokio-native-tls", -] - -[[package]] -name = "iana-time-zone" -version = "0.1.59" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6a67363e2aa4443928ce15e57ebae94fd8949958fd1223c4cfc0cd473ad7539" -dependencies = [ - "android_system_properties", - "core-foundation-sys", - "iana-time-zone-haiku", - "js-sys", - "wasm-bindgen", - "windows-core", -] - -[[package]] -name = "iana-time-zone-haiku" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" -dependencies = [ - "cc", -] - -[[package]] -name = "idna" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "indenter" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683" - -[[package]] -name = "indexmap" -version = "2.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "233cf39063f058ea2caae4091bf4a3ef70a653afbc026f5c4a4135d114e3c177" -dependencies = [ - "equivalent", - "hashbrown", -] - -[[package]] -name = "ipnet" -version = "2.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" - -[[package]] -name = "itertools" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25db6b064527c5d482d0423354fcd07a89a2dfe07b67892e62411946db7f07b0" -dependencies = [ - "either", -] - -[[package]] -name = "itoa" -version = "1.0.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" - -[[package]] -name = "js-sys" -version = "0.3.67" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a1d36f1235bc969acba30b7f5990b864423a6068a10f7c90ae8f0112e3a59d1" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" -dependencies = [ - "spin 0.5.2", -] - -[[package]] -name = "lazycell" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" - -[[package]] -name = "libc" -version = "0.2.152" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7" - -[[package]] -name = "libloading" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161" -dependencies = [ - "cfg-if", - "windows-sys 0.48.0", -] - -[[package]] -name = "libm" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" - -[[package]] -name = "libredox" -version = "0.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" -dependencies = [ - "bitflags 2.4.2", - "libc", - "redox_syscall", -] - -[[package]] -name = "libsqlite3-sys" -version = "0.27.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4e226dcd58b4be396f7bd3c20da8fdee2911400705297ba7d2d7cc2c30f716" -dependencies = [ - "cc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "linux-raw-sys" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" - -[[package]] -name = "lock_api" -version = "0.4.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" - -[[package]] -name = "md-5" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" -dependencies = [ - "cfg-if", - "digest", -] - -[[package]] -name = "memchr" -version = "2.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" - -[[package]] -name = "memoffset" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" -dependencies = [ - "autocfg", -] - -[[package]] -name = "mime" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" - -[[package]] -name = "minimal-lexical" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" - -[[package]] -name = "miniz_oxide" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" -dependencies = [ - "adler", -] - -[[package]] -name = "minreq" -version = "2.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb3371dfc7b772c540da1380123674a8e20583aca99907087d990ca58cf44203" -dependencies = [ - "base64 0.12.3", - "log", - "once_cell", - "rustls", - "rustls-webpki", - "serde", - "serde_json", - "webpki-roots", -] - -[[package]] -name = "mio" -version = "0.8.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" -dependencies = [ - "libc", - "wasi", - "windows-sys 0.48.0", -] - -[[package]] -name = "native-tls" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" -dependencies = [ - "lazy_static", - "libc", - "log", - "openssl", - "openssl-probe", - "openssl-sys", - "schannel", - "security-framework", - "security-framework-sys", - "tempfile", -] - -[[package]] -name = "nix" -version = "0.27.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" -dependencies = [ - "bitflags 2.4.2", - "cfg-if", - "libc", -] - -[[package]] -name = "nom" -version = "7.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" -dependencies = [ - "memchr", - "minimal-lexical", -] - -[[package]] -name = "ntapi" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4" -dependencies = [ - "winapi", -] - -[[package]] -name = "num-bigint-dig" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151" -dependencies = [ - "byteorder", - "lazy_static", - "libm", - "num-integer", - "num-iter", - "num-traits", - "rand", - "smallvec", - "zeroize", -] - -[[package]] -name = "num-integer" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" -dependencies = [ - "autocfg", - "num-traits", -] - -[[package]] -name = "num-iter" -version = "0.1.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-traits" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" -dependencies = [ - "autocfg", - "libm", -] - -[[package]] -name = "num_cpus" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi", - "libc", -] - -[[package]] -name = "object" -version = "0.32.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" -dependencies = [ - "memchr", -] - -[[package]] -name = "once_cell" -version = "1.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" - -[[package]] -name = "openai-api-rs" -version = "4.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb194a888fce8f849ac66496994ee0d7d8370296604d7280ce016cbe4a2192f6" -dependencies = [ - "minreq", - "serde", - "serde_json", -] - -[[package]] -name = "openssl" -version = "0.10.63" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15c9d69dd87a29568d4d017cfe8ec518706046a05184e5aea92d0af890b803c8" -dependencies = [ - "bitflags 2.4.2", - "cfg-if", - "foreign-types", - "libc", - "once_cell", - "openssl-macros", - "openssl-sys", -] - -[[package]] -name = "openssl-macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", -] - -[[package]] -name = "openssl-probe" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" - -[[package]] -name = "openssl-sys" -version = "0.9.99" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22e1bf214306098e4832460f797824c05d25aacdf896f64a985fb0fd992454ae" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "option-ext" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" - -[[package]] -name = "owo-colors" -version = "3.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" - -[[package]] -name = "parking_lot" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" -dependencies = [ - "lock_api", - "parking_lot_core", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall", - "smallvec", - "windows-targets 0.48.5", -] - -[[package]] -name = "paste" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" - -[[package]] -name = "pathsearch" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da983bc5e582ab17179c190b4b66c7d76c5943a69c6d34df2a2b6bf8a2977b05" -dependencies = [ - "anyhow", - "libc", -] - -[[package]] -name = "peeking_take_while" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" - -[[package]] -name = "pem-rfc7468" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412" -dependencies = [ - "base64ct", -] - -[[package]] -name = "percent-encoding" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" - -[[package]] -name = "pest" -version = "2.7.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "219c0dcc30b6a27553f9cc242972b67f75b60eb0db71f0b5462f38b058c41546" -dependencies = [ - "memchr", - "thiserror", - "ucd-trie", -] - -[[package]] -name = "pest_derive" -version = "2.7.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22e1288dbd7786462961e69bfd4df7848c1e37e8b74303dbdab82c3a9cdd2809" -dependencies = [ - "pest", - "pest_generator", -] - -[[package]] -name = "pest_generator" -version = "2.7.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1381c29a877c6d34b8c176e734f35d7f7f5b3adaefe940cb4d1bb7af94678e2e" -dependencies = [ - "pest", - "pest_meta", - "proc-macro2", - "quote", - "syn 2.0.48", -] - -[[package]] -name = "pest_meta" -version = "2.7.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0934d6907f148c22a3acbda520c7eed243ad7487a30f51f6ce52b58b7077a8a" -dependencies = [ - "once_cell", - "pest", - "sha2", -] - -[[package]] -name = "petgraph" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" -dependencies = [ - "fixedbitset", - "indexmap", -] - -[[package]] -name = "pgmq" -version = "0.26.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff3ab5bc329e915320344453e927080b4b3550f3aa0c91091e9684e33ceb795b" -dependencies = [ - "chrono", - "log", - "pgmq-core", - "serde", - "serde_json", - "sqlx", - "thiserror", - "tokio", - "url", -] - -[[package]] -name = "pgmq-core" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65f1c261a1ee2cd46727c41a1e4257bb1d9aeea72a5c55cd91bc08805d4b0246" -dependencies = [ - "chrono", - "log", - "serde", - "serde_json", - "sqlx", - "thiserror", - "tokio", - "url", -] - -[[package]] -name = "pgrx" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2102faa5ef4a7bf096fefcf67692b293583efd18f9236340ad3169807dfc2b73" -dependencies = [ - "atomic-traits", - "bitflags 2.4.2", - "bitvec", - "enum-map", - "heapless", - "libc", - "once_cell", - "pgrx-macros", - "pgrx-pg-sys", - "pgrx-sql-entity-graph", - "seahash", - "seq-macro", - "serde", - "serde_cbor", - "serde_json", - "thiserror", - "uuid", -] - -[[package]] -name = "pgrx-macros" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c26810d09910ec987a6708d48d243efb5f879331e01c6fec0893714d0eb12bae" -dependencies = [ - "pgrx-sql-entity-graph", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "pgrx-pg-config" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b0099ba4b635dfe1e34afc8bca8be43e9577c5d726aaf1dc7dd23a78f6c8a60" -dependencies = [ - "cargo_toml", - "dirs", - "eyre", - "owo-colors", - "pathsearch", - "serde", - "serde_derive", - "serde_json", - "toml", - "url", -] - -[[package]] -name = "pgrx-pg-sys" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f40315259c41fede51eb23b791b48d0a112b0f47d0dcb6862b798d1fa1db6ea" -dependencies = [ - "bindgen", - "clang-sys", - "eyre", - "libc", - "memoffset", - "once_cell", - "pgrx-macros", - "pgrx-pg-config", - "pgrx-sql-entity-graph", - "proc-macro2", - "quote", - "serde", - "shlex", - "sptr", - "syn 1.0.109", - "walkdir", -] - -[[package]] -name = "pgrx-sql-entity-graph" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d47a4e991c8c66162c5d6b0fc2bd382e43a58fc893ce05a6a15ddcb1bf7eee4" -dependencies = [ - "convert_case", - "eyre", - "petgraph", - "proc-macro2", - "quote", - "syn 1.0.109", - "unescape", -] - -[[package]] -name = "pgrx-tests" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab3abc01e2bb930b072bd660d04c8eaa69a29d4727d5b2a641f946c603c1605e" -dependencies = [ - "clap-cargo", - "eyre", - "libc", - "once_cell", - "owo-colors", - "pgrx", - "pgrx-macros", - "pgrx-pg-config", - "postgres", - "proptest", - "rand", - "regex", - "serde", - "serde_json", - "sysinfo", - "thiserror", -] - -[[package]] -name = "phf" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" -dependencies = [ - "phf_shared", -] - -[[package]] -name = "phf_shared" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" -dependencies = [ - "siphasher", -] - -[[package]] -name = "pin-project-lite" -version = "0.2.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" - -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[package]] -name = "pkcs1" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f" -dependencies = [ - "der", - "pkcs8", - "spki", -] - -[[package]] -name = "pkcs8" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" -dependencies = [ - "der", - "spki", -] - -[[package]] -name = "pkg-config" -version = "0.3.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2900ede94e305130c13ddd391e0ab7cbaeb783945ae07a279c268cb05109c6cb" - -[[package]] -name = "postgres" -version = "0.19.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7915b33ed60abc46040cbcaa25ffa1c7ec240668e0477c4f3070786f5916d451" -dependencies = [ - "bytes", - "fallible-iterator", - "futures-util", - "log", - "tokio", - "tokio-postgres", -] - -[[package]] -name = "postgres-protocol" -version = "0.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49b6c5ef183cd3ab4ba005f1ca64c21e8bd97ce4699cfea9e8d9a2c4958ca520" -dependencies = [ - "base64 0.21.7", - "byteorder", - "bytes", - "fallible-iterator", - "hmac", - "md-5", - "memchr", - "rand", - "sha2", - "stringprep", -] - -[[package]] -name = "postgres-types" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d2234cdee9408b523530a9b6d2d6b373d1db34f6a8e51dc03ded1828d7fb67c" -dependencies = [ - "bytes", - "fallible-iterator", - "postgres-protocol", -] - -[[package]] -name = "ppv-lite86" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" - -[[package]] -name = "proc-macro2" -version = "1.0.78" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "proptest" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31b476131c3c86cb68032fdc5cb6d5a1045e3e42d96b69fa599fd77701e1f5bf" -dependencies = [ - "bit-set", - "bit-vec", - "bitflags 2.4.2", - "lazy_static", - "num-traits", - "rand", - "rand_chacha", - "rand_xorshift", - "regex-syntax", - "rusty-fork", - "tempfile", - "unarray", -] - -[[package]] -name = "quick-error" -version = "1.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" - -[[package]] -name = "quote" -version = "1.0.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "radium" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" - -[[package]] -name = "rand" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -dependencies = [ - "libc", - "rand_chacha", - "rand_core", -] - -[[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", - "rand_core", -] - -[[package]] -name = "rand_core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -dependencies = [ - "getrandom", -] - -[[package]] -name = "rand_xorshift" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f" -dependencies = [ - "rand_core", -] - -[[package]] -name = "rayon" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa7237101a77a10773db45d62004a272517633fbcc3df19d96455ede1122e051" -dependencies = [ - "either", - "rayon-core", -] - -[[package]] -name = "rayon-core" -version = "1.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" -dependencies = [ - "crossbeam-deque", - "crossbeam-utils", -] - -[[package]] -name = "redox_syscall" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_users" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" -dependencies = [ - "getrandom", - "libredox", - "thiserror", -] - -[[package]] -name = "regex" -version = "1.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata", - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b7fa1134405e2ec9353fd416b17f8dacd46c473d7d3fd1cf202706a14eb792a" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" - -[[package]] -name = "reqwest" -version = "0.11.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37b1ae8d9ac08420c66222fb9096fc5de435c3c48542bc5336c51892cffafb41" -dependencies = [ - "base64 0.21.7", - "bytes", - "encoding_rs", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "hyper", - "hyper-tls", - "ipnet", - "js-sys", - "log", - "mime", - "native-tls", - "once_cell", - "percent-encoding", - "pin-project-lite", - "serde", - "serde_json", - "serde_urlencoded", - "system-configuration", - "tokio", - "tokio-native-tls", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "winreg", -] - -[[package]] -name = "ring" -version = "0.17.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" -dependencies = [ - "cc", - "getrandom", - "libc", - "spin 0.9.8", - "untrusted", - "windows-sys 0.48.0", -] - -[[package]] -name = "rsa" -version = "0.9.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d0e5124fcb30e76a7e79bfee683a2746db83784b86289f6251b54b7950a0dfc" -dependencies = [ - "const-oid", - "digest", - "num-bigint-dig", - "num-integer", - "num-traits", - "pkcs1", - "pkcs8", - "rand_core", - "signature", - "spki", - "subtle", - "zeroize", -] - -[[package]] -name = "rustc-demangle" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" - -[[package]] -name = "rustc-hash" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" - -[[package]] -name = "rustc_version" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee" -dependencies = [ - "semver 0.11.0", -] - -[[package]] -name = "rustc_version" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" -dependencies = [ - "semver 1.0.21", -] - -[[package]] -name = "rustix" -version = "0.38.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "322394588aaf33c24007e8bb3238ee3e4c5c09c084ab32bc73890b99ff326bca" -dependencies = [ - "bitflags 2.4.2", - "errno", - "libc", - "linux-raw-sys", - "windows-sys 0.52.0", -] - -[[package]] -name = "rustls" -version = "0.21.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" -dependencies = [ - "log", - "ring", - "rustls-webpki", - "sct", -] - -[[package]] -name = "rustls-webpki" -version = "0.101.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "rusty-fork" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb3dcc6e454c328bb824492db107ab7c0ae8fcffe4ad210136ef014458c1bc4f" -dependencies = [ - "fnv", - "quick-error", - "tempfile", - "wait-timeout", -] - -[[package]] -name = "ryu" -version = "1.0.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" - -[[package]] -name = "same-file" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "schannel" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" -dependencies = [ - "windows-sys 0.52.0", -] - -[[package]] -name = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - -[[package]] -name = "sct" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "seahash" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" - -[[package]] -name = "security-framework" -version = "2.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "core-foundation-sys", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "2.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "semver" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6" -dependencies = [ - "semver-parser", -] - -[[package]] -name = "semver" -version = "1.0.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0" - -[[package]] -name = "semver-parser" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7" -dependencies = [ - "pest", -] - -[[package]] -name = "seq-macro" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3f0bf26fd526d2a95683cd0f87bf103b8539e2ca1ef48ce002d67aad59aa0b4" - -[[package]] -name = "serde" -version = "1.0.195" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63261df402c67811e9ac6def069e4786148c4563f4b50fd4bf30aa370d626b02" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_cbor" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5" -dependencies = [ - "half", - "serde", -] - -[[package]] -name = "serde_derive" -version = "1.0.195" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46fe8f8603d81ba86327b23a2e9cdf49e1255fb94a4c5f297f6ee0547178ea2c" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", -] - -[[package]] -name = "serde_json" -version = "1.0.111" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "176e46fa42316f18edd598015a5166857fc835ec732f5215eac6b7bdbf0a84f4" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "serde_spanned" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" -dependencies = [ - "serde", -] - -[[package]] -name = "serde_urlencoded" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" -dependencies = [ - "form_urlencoded", - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "sha1" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - -[[package]] -name = "sha2" -version = "0.10.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - -[[package]] -name = "shlex" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" - -[[package]] -name = "signature" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" -dependencies = [ - "digest", - "rand_core", -] - -[[package]] -name = "siphasher" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" - -[[package]] -name = "slab" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" -dependencies = [ - "autocfg", -] - -[[package]] -name = "smallvec" -version = "1.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" - -[[package]] -name = "socket2" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" -dependencies = [ - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "spin" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" - -[[package]] -name = "spin" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" -dependencies = [ - "lock_api", -] - -[[package]] -name = "spki" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" -dependencies = [ - "base64ct", - "der", -] - -[[package]] -name = "sptr" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9b39299b249ad65f3b7e96443bad61c02ca5cd3589f46cb6d610a0fd6c0d6a" - -[[package]] -name = "sqlformat" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce81b7bd7c4493975347ef60d8c7e8b742d4694f4c49f93e0a12ea263938176c" -dependencies = [ - "itertools", - "nom", - "unicode_categories", -] - -[[package]] -name = "sqlx" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dba03c279da73694ef99763320dea58b51095dfe87d001b1d4b5fe78ba8763cf" -dependencies = [ - "sqlx-core", - "sqlx-macros", - "sqlx-mysql", - "sqlx-postgres", - "sqlx-sqlite", -] - -[[package]] -name = "sqlx-core" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d84b0a3c3739e220d94b3239fd69fb1f74bc36e16643423bd99de3b43c21bfbd" -dependencies = [ - "ahash", - "atoi", - "byteorder", - "bytes", - "chrono", - "crc", - "crossbeam-queue", - "dotenvy", - "either", - "event-listener", - "futures-channel", - "futures-core", - "futures-intrusive", - "futures-io", - "futures-util", - "hashlink", - "hex", - "indexmap", - "log", - "memchr", - "native-tls", - "once_cell", - "paste", - "percent-encoding", - "serde", - "serde_json", - "sha2", - "smallvec", - "sqlformat", - "thiserror", - "tokio", - "tokio-stream", - "tracing", - "url", -] - -[[package]] -name = "sqlx-macros" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89961c00dc4d7dffb7aee214964b065072bff69e36ddb9e2c107541f75e4f2a5" -dependencies = [ - "proc-macro2", - "quote", - "sqlx-core", - "sqlx-macros-core", - "syn 1.0.109", -] - -[[package]] -name = "sqlx-macros-core" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0bd4519486723648186a08785143599760f7cc81c52334a55d6a83ea1e20841" -dependencies = [ - "atomic-write-file", - "dotenvy", - "either", - "heck", - "hex", - "once_cell", - "proc-macro2", - "quote", - "serde", - "serde_json", - "sha2", - "sqlx-core", - "sqlx-mysql", - "sqlx-postgres", - "sqlx-sqlite", - "syn 1.0.109", - "tempfile", - "tokio", - "url", -] - -[[package]] -name = "sqlx-mysql" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e37195395df71fd068f6e2082247891bc11e3289624bbc776a0cdfa1ca7f1ea4" -dependencies = [ - "atoi", - "base64 0.21.7", - "bitflags 2.4.2", - "byteorder", - "bytes", - "chrono", - "crc", - "digest", - "dotenvy", - "either", - "futures-channel", - "futures-core", - "futures-io", - "futures-util", - "generic-array", - "hex", - "hkdf", - "hmac", - "itoa", - "log", - "md-5", - "memchr", - "once_cell", - "percent-encoding", - "rand", - "rsa", - "serde", - "sha1", - "sha2", - "smallvec", - "sqlx-core", - "stringprep", - "thiserror", - "tracing", - "whoami", -] - -[[package]] -name = "sqlx-postgres" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6ac0ac3b7ccd10cc96c7ab29791a7dd236bd94021f31eec7ba3d46a74aa1c24" -dependencies = [ - "atoi", - "base64 0.21.7", - "bitflags 2.4.2", - "byteorder", - "chrono", - "crc", - "dotenvy", - "etcetera", - "futures-channel", - "futures-core", - "futures-io", - "futures-util", - "hex", - "hkdf", - "hmac", - "home", - "itoa", - "log", - "md-5", - "memchr", - "once_cell", - "rand", - "serde", - "serde_json", - "sha1", - "sha2", - "smallvec", - "sqlx-core", - "stringprep", - "thiserror", - "tracing", - "whoami", -] - -[[package]] -name = "sqlx-sqlite" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "210976b7d948c7ba9fced8ca835b11cbb2d677c59c79de41ac0d397e14547490" -dependencies = [ - "atoi", - "chrono", - "flume", - "futures-channel", - "futures-core", - "futures-executor", - "futures-intrusive", - "futures-util", - "libsqlite3-sys", - "log", - "percent-encoding", - "serde", - "sqlx-core", - "tracing", - "url", - "urlencoding", -] - -[[package]] -name = "stable_deref_trait" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" - -[[package]] -name = "stringprep" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb41d74e231a107a1b4ee36bd1214b11285b77768d2e3824aedafa988fd36ee6" -dependencies = [ - "finl_unicode", - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "subtle" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" - -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.48" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "sysinfo" -version = "0.29.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd727fc423c2060f6c92d9534cef765c65a6ed3f428a03d7def74a8c4348e666" -dependencies = [ - "cfg-if", - "core-foundation-sys", - "libc", - "ntapi", - "once_cell", - "rayon", - "winapi", -] - -[[package]] -name = "system-configuration" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "system-configuration-sys", -] - -[[package]] -name = "system-configuration-sys" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "tap" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" - -[[package]] -name = "tempfile" -version = "3.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01ce4141aa927a6d1bd34a041795abd0db1cccba5d5f24b009f694bdf3a1f3fa" -dependencies = [ - "cfg-if", - "fastrand", - "redox_syscall", - "rustix", - "windows-sys 0.52.0", -] - -[[package]] -name = "thiserror" -version = "1.0.56" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.56" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", -] - -[[package]] -name = "tiktoken-rs" -version = "0.5.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40894b788eb28bbb7e36bdc8b7b1b1488b9c93fa3730f315ab965330c94c0842" -dependencies = [ - "anyhow", - "base64 0.21.7", - "bstr", - "fancy-regex", - "lazy_static", - "parking_lot", - "rustc-hash", -] - -[[package]] -name = "tinyvec" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" - -[[package]] -name = "tokio" -version = "1.35.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104" -dependencies = [ - "backtrace", - "bytes", - "libc", - "mio", - "num_cpus", - "pin-project-lite", - "socket2", - "tokio-macros", - "windows-sys 0.48.0", -] - -[[package]] -name = "tokio-macros" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", -] - -[[package]] -name = "tokio-native-tls" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" -dependencies = [ - "native-tls", - "tokio", -] - -[[package]] -name = "tokio-postgres" -version = "0.7.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d340244b32d920260ae7448cb72b6e238bddc3d4f7603394e7dd46ed8e48f5b8" -dependencies = [ - "async-trait", - "byteorder", - "bytes", - "fallible-iterator", - "futures-channel", - "futures-util", - "log", - "parking_lot", - "percent-encoding", - "phf", - "pin-project-lite", - "postgres-protocol", - "postgres-types", - "rand", - "socket2", - "tokio", - "tokio-util", - "whoami", -] - -[[package]] -name = "tokio-stream" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" -dependencies = [ - "futures-core", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "tokio-util" -version = "0.7.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" -dependencies = [ - "bytes", - "futures-core", - "futures-sink", - "pin-project-lite", - "tokio", - "tracing", -] - -[[package]] -name = "toml" -version = "0.8.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit", -] - -[[package]] -name = "toml_datetime" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" -dependencies = [ - "serde", -] - -[[package]] -name = "toml_edit" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" -dependencies = [ - "indexmap", - "serde", - "serde_spanned", - "toml_datetime", - "winnow", -] - -[[package]] -name = "tower-service" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" - -[[package]] -name = "tracing" -version = "0.1.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" -dependencies = [ - "log", - "pin-project-lite", - "tracing-attributes", - "tracing-core", -] - -[[package]] -name = "tracing-attributes" -version = "0.1.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", -] - -[[package]] -name = "tracing-core" -version = "0.1.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" -dependencies = [ - "once_cell", -] - -[[package]] -name = "try-lock" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" - -[[package]] -name = "typenum" -version = "1.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" - -[[package]] -name = "ucd-trie" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" - -[[package]] -name = "unarray" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94" - -[[package]] -name = "unescape" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccb97dac3243214f8d8507998906ca3e2e0b900bf9bf4870477f125b82e68f6e" - -[[package]] -name = "unicode-bidi" -version = "0.3.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" - -[[package]] -name = "unicode-ident" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" - -[[package]] -name = "unicode-normalization" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "unicode-segmentation" -version = "1.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" - -[[package]] -name = "unicode_categories" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e" - -[[package]] -name = "untrusted" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" - -[[package]] -name = "url" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" -dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", -] - -[[package]] -name = "urlencoding" -version = "2.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" - -[[package]] -name = "uuid" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a" -dependencies = [ - "getrandom", -] - -[[package]] -name = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - -[[package]] -name = "vectorize" -version = "0.12.1" -dependencies = [ - "anyhow", - "chrono", - "handlebars", - "lazy_static", - "log", - "openai-api-rs", - "pgmq", - "pgrx", - "pgrx-tests", - "postgres-types", - "rand", - "regex", - "reqwest", - "serde", - "serde_json", - "sqlx", - "thiserror", - "tiktoken-rs", - "tokio", - "url", - "whoami", -] - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "wait-timeout" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6" -dependencies = [ - "libc", -] - -[[package]] -name = "walkdir" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" -dependencies = [ - "same-file", - "winapi-util", -] - -[[package]] -name = "want" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" -dependencies = [ - "try-lock", -] - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "wasm-bindgen" -version = "0.2.90" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1223296a201415c7fad14792dbefaace9bd52b62d33453ade1c5b5f07555406" -dependencies = [ - "cfg-if", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.90" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcdc935b63408d58a32f8cc9738a0bffd8f05cc7c002086c6ef20b7312ad9dcd" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn 2.0.48", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-futures" -version = "0.4.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bde2032aeb86bdfaecc8b261eef3cba735cc426c1f3a3416d1e0791be95fc461" -dependencies = [ - "cfg-if", - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.90" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e4c238561b2d428924c49815533a8b9121c664599558a5d9ec51f8a1740a999" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.90" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bae1abb6806dc1ad9e560ed242107c0f6c84335f1749dd4e8ddb012ebd5e25a7" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.90" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d91413b1c31d7539ba5ef2451af3f0b833a005eb27a631cec32bc0635a8602b" - -[[package]] -name = "web-sys" -version = "0.3.67" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58cd2333b6e0be7a39605f0e255892fd7418a682d8da8fe042fe25128794d2ed" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "webpki-roots" -version = "0.25.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" - -[[package]] -name = "whoami" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22fc3756b8a9133049b26c7f61ab35416c130e8c09b660f5b3958b446f52cc50" -dependencies = [ - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-util" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" -dependencies = [ - "winapi", -] - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "windows-core" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" -dependencies = [ - "windows-targets 0.52.0", -] - -[[package]] -name = "windows-sys" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -dependencies = [ - "windows-targets 0.48.5", -] - -[[package]] -name = "windows-sys" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" -dependencies = [ - "windows-targets 0.52.0", -] - -[[package]] -name = "windows-targets" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" -dependencies = [ - "windows_aarch64_gnullvm 0.48.5", - "windows_aarch64_msvc 0.48.5", - "windows_i686_gnu 0.48.5", - "windows_i686_msvc 0.48.5", - "windows_x86_64_gnu 0.48.5", - "windows_x86_64_gnullvm 0.48.5", - "windows_x86_64_msvc 0.48.5", -] - -[[package]] -name = "windows-targets" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" -dependencies = [ - "windows_aarch64_gnullvm 0.52.0", - "windows_aarch64_msvc 0.52.0", - "windows_i686_gnu 0.52.0", - "windows_i686_msvc 0.52.0", - "windows_x86_64_gnu 0.52.0", - "windows_x86_64_gnullvm 0.52.0", - "windows_x86_64_msvc 0.52.0", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" - -[[package]] -name = "windows_i686_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" - -[[package]] -name = "windows_i686_gnu" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" - -[[package]] -name = "windows_i686_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" - -[[package]] -name = "windows_i686_msvc" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" - -[[package]] -name = "winnow" -version = "0.5.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7cf47b659b318dccbd69cc4797a39ae128f533dce7902a1096044d1967b9c16" -dependencies = [ - "memchr", -] - -[[package]] -name = "winreg" -version = "0.50.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" -dependencies = [ - "cfg-if", - "windows-sys 0.48.0", -] - -[[package]] -name = "wyz" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" -dependencies = [ - "tap", -] - -[[package]] -name = "zerocopy" -version = "0.7.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" -dependencies = [ - "zerocopy-derive", -] - -[[package]] -name = "zerocopy-derive" -version = "0.7.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", -] - -[[package]] -name = "zeroize" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" diff --git a/core/.gitignore b/core/.gitignore new file mode 100644 index 0000000..9f97022 --- /dev/null +++ b/core/.gitignore @@ -0,0 +1 @@ +target/ \ No newline at end of file diff --git a/core/Cargo.toml b/core/Cargo.toml new file mode 100644 index 0000000..aed21cf --- /dev/null +++ b/core/Cargo.toml @@ -0,0 +1,34 @@ +[package] +name = "vectorize-core" +version = "0.1.0" +edition = "2021" +publish = false + +[lib] +crate-type = ["lib"] + +[[bin]] +name = "vectorize-worker" +path = "src/bin/worker.rs" + + +[dependencies] +anyhow = "1.0.81" +chrono = {version = "0.4.26", features = ["serde"] } +env_logger = "0.11.3" +lazy_static = "1.4.0" +log = "0.4.21" +pgmq = "0.26.1" +regex = "1.9.2" +reqwest = {version = "0.11.18", features = ["json"] } +serde = { version = "1.0.173", features = ["derive"] } +serde_json = "1.0.103" +sqlx = { version = "0.7.3", features = [ + "runtime-tokio-native-tls", + "postgres", + "chrono", + "json" +] } +thiserror = "1.0.44" +tiktoken-rs = "0.5.7" +tokio = {version = "1.29.1", features = ["rt-multi-thread"] } diff --git a/core/Makefile b/core/Makefile new file mode 100644 index 0000000..2db9272 --- /dev/null +++ b/core/Makefile @@ -0,0 +1,10 @@ +SQLX_OFFLINE:=true +DATABASE_URL:=postgres://${USER}:${USER}@localhost:28815/postgres +RUST_LOG:=debug + + +sqlx-cache: + cargo sqlx prepare + +run-worker: + cargo run --bin vectorize-worker \ No newline at end of file diff --git a/core/src/bin/worker.rs b/core/src/bin/worker.rs new file mode 100644 index 0000000..89fa55b --- /dev/null +++ b/core/src/bin/worker.rs @@ -0,0 +1,41 @@ +use log::{error, info}; + +use vectorize_core::worker::base::{poll_job, Config}; + +#[tokio::main] +async fn main() { + env_logger::init(); + info!("starting pg-vectorize remote-worker"); + + let conn = sqlx::postgres::PgPoolOptions::new() + .max_connections(5) + .connect("postgres://postgres:password@localhost:28815/postgres") + .await + .unwrap(); + let queue = pgmq::PGMQueueExt::new_with_pool(conn.clone()) + .await + .unwrap(); + + let cfg = Config::from_env(); + + loop { + match poll_job(&conn, &queue, &cfg).await { + Ok(Some(_)) => { + // continue processing + } + Ok(None) => { + // no messages, small wait + info!( + "No messages in queue, waiting for {} seconds", + cfg.poll_interval + ); + tokio::time::sleep(tokio::time::Duration::from_secs(cfg.poll_interval)).await; + } + Err(e) => { + // error, long wait + error!("Error processing job: {:?}", e); + tokio::time::sleep(tokio::time::Duration::from_secs(cfg.poll_interval)).await; + } + } + } +} diff --git a/core/src/lib.rs b/core/src/lib.rs new file mode 100644 index 0000000..b808094 --- /dev/null +++ b/core/src/lib.rs @@ -0,0 +1,3 @@ +pub mod transformers; +pub mod types; +pub mod worker; diff --git a/src/transformers/generic.rs b/core/src/transformers/generic.rs similarity index 83% rename from src/transformers/generic.rs rename to core/src/transformers/generic.rs index 3175b7c..159d940 100644 --- a/src/transformers/generic.rs +++ b/core/src/transformers/generic.rs @@ -1,24 +1,22 @@ use anyhow::{Context, Result}; use lazy_static::lazy_static; use regex::Regex; +use std::collections::HashSet; +use std::env; use crate::{ - executor::VectorizeMeta, - guc, transformers::types::{EmbeddingPayload, EmbeddingRequest, Inputs}, types, }; -use super::openai::trim_inputs; +use crate::transformers::openai::trim_inputs; lazy_static! { static ref REGEX: Regex = Regex::new(r"\$\{([^}]+)\}").expect("Invalid regex"); } -use std::collections::HashSet; -use std::env; // finds all placeholders in a string -fn find_placeholders(var: &str) -> Option> { +pub fn find_placeholders(var: &str) -> Option> { let placeholders: HashSet = REGEX .captures_iter(var) .filter_map(|cap| cap.get(1)) @@ -41,22 +39,10 @@ pub fn interpolate(base_str: &str, env_vars: Vec) -> Result { Ok(interpolated_str) } -pub fn get_generic_svc_url() -> Result { - if let Some(url) = guc::get_guc(guc::VectorizeGuc::EmbeddingServiceUrl) { - if let Some(phs) = find_placeholders(&url) { - let interpolated = interpolate(&url, phs)?; - Ok(interpolated) - } else { - Ok(url) - } - } else { - Err(anyhow::anyhow!("vectorize.embedding_service_url not set")) - } -} - pub fn prepare_generic_embedding_request( - job_meta: VectorizeMeta, + job_meta: types::VectorizeMeta, inputs: &[Inputs], + url: String, ) -> Result { let text_inputs = trim_inputs(inputs); let payload = EmbeddingPayload { @@ -66,10 +52,8 @@ pub fn prepare_generic_embedding_request( let job_params: types::JobParams = serde_json::from_value(job_meta.params)?; - let svc_host = get_generic_svc_url().context("failed to get embedding service url from GUC")?; - Ok(EmbeddingRequest { - url: svc_host, + url, payload, api_key: job_params.api_key, }) diff --git a/core/src/transformers/http_handler.rs b/core/src/transformers/http_handler.rs new file mode 100644 index 0000000..48a8d00 --- /dev/null +++ b/core/src/transformers/http_handler.rs @@ -0,0 +1,57 @@ +use anyhow::Result; + +use crate::transformers::types::{ + EmbeddingPayload, EmbeddingRequest, EmbeddingResponse, Inputs, PairedEmbeddings, +}; +pub async fn handle_response serde::Deserialize<'de>>( + resp: reqwest::Response, + method: &'static str, +) -> Result { + if !resp.status().is_success() { + let errmsg = format!( + "Failed to call method '{}', received response with status code:{} and body: {}", + method, + resp.status(), + resp.text().await? + ); + return Err(anyhow::anyhow!(errmsg)); + } + let value = resp.json::().await?; + Ok(value) +} + +// handle an OpenAI compatible embedding transform request +pub async fn openai_embedding_request( + request: EmbeddingRequest, + timeout: i32, +) -> Result>> { + let client = reqwest::Client::new(); + let mut req = client + .post(request.url) + .timeout(std::time::Duration::from_secs(timeout as u64)) + .json::(&request.payload) + .header("Content-Type", "application/json"); + if let Some(key) = request.api_key { + req = req.header("Authorization", format!("Bearer {}", key)); + } + let resp = req.send().await?; + let embedding_resp = handle_response::(resp, "embeddings").await?; + let embeddings = embedding_resp + .data + .iter() + .map(|d| d.embedding.clone()) + .collect(); + Ok(embeddings) +} + +// merges the vec of inputs with the embedding responses +pub fn merge_input_output(inputs: Vec, values: Vec>) -> Vec { + inputs + .into_iter() + .zip(values) + .map(|(input, value)| PairedEmbeddings { + primary_key: input.record_id, + embeddings: value, + }) + .collect() +} diff --git a/core/src/transformers/mod.rs b/core/src/transformers/mod.rs new file mode 100644 index 0000000..b80720a --- /dev/null +++ b/core/src/transformers/mod.rs @@ -0,0 +1,4 @@ +pub mod generic; +pub mod http_handler; +pub mod openai; +pub mod types; diff --git a/src/transformers/openai.rs b/core/src/transformers/openai.rs similarity index 70% rename from src/transformers/openai.rs rename to core/src/transformers/openai.rs index 83b59a3..4a41c30 100644 --- a/src/transformers/openai.rs +++ b/core/src/transformers/openai.rs @@ -1,16 +1,7 @@ -use pgrx::prelude::*; - use anyhow::Result; -use crate::{ - executor::VectorizeMeta, - guc::{EMBEDDING_REQ_TIMEOUT_SEC, OPENAI_KEY}, - transformers::{ - http_handler::handle_response, - types::{EmbeddingPayload, EmbeddingRequest, Inputs}, - }, - types::JobParams, -}; +use crate::transformers::types::{EmbeddingPayload, EmbeddingRequest, Inputs}; +use crate::types::{JobParams, VectorizeMeta}; // max token length is 8192 // however, depending on content of text, token count can be higher than @@ -21,6 +12,7 @@ pub const OPENAI_EMBEDDING_MODEL: &str = "text-embedding-ada-002"; pub fn prepare_openai_request( vect_meta: VectorizeMeta, inputs: &[Inputs], + api_key: Option, ) -> Result { let text_inputs = trim_inputs(inputs); let job_params: JobParams = serde_json::from_value(vect_meta.params.clone())?; @@ -31,16 +23,12 @@ pub fn prepare_openai_request( let apikey = match job_params.api_key { Some(k) => k, - None => { - let key = match OPENAI_KEY.get() { - Some(k) => k.to_str()?.to_owned(), - None => { - warning!("pg-vectorize: Error getting API key from GUC"); - return Err(anyhow::anyhow!("failed to get API key")); - } - }; - key - } + None => match api_key { + Some(k) => k.to_owned(), + None => { + return Err(anyhow::anyhow!("failed to get API key")); + } + }, }; Ok(EmbeddingRequest { url: OPENAI_EMBEDDING_URL.to_owned(), @@ -70,30 +58,6 @@ pub fn trim_inputs(inputs: &[Inputs]) -> Vec { .collect() } -pub fn validate_api_key(key: &str) -> Result<()> { - let client = reqwest::Client::new(); - let timeout = EMBEDDING_REQ_TIMEOUT_SEC.get(); - let runtime = tokio::runtime::Builder::new_current_thread() - .enable_io() - .enable_time() - .build() - .unwrap_or_else(|e| error!("failed to initialize tokio runtime: {}", e)); - runtime.block_on(async { - let resp = client - .get("https://api.openai.com/v1/models") - .header("Content-Type", "application/json") - .header("Authorization", format!("Bearer {}", key)) - .timeout(std::time::Duration::from_secs(timeout as u64)) - .send() - .await - .unwrap_or_else(|e| error!("failed to make Open AI key validation call: {}", e)); - let _ = handle_response::(resp, "models") - .await - .unwrap_or_else(|e| error!("failed validate API key: {}", e)); - }); - Ok(()) -} - #[cfg(test)] mod tests { use super::*; diff --git a/src/transformers/types.rs b/core/src/transformers/types.rs similarity index 95% rename from src/transformers/types.rs rename to core/src/transformers/types.rs index 41513c1..d53b182 100644 --- a/src/transformers/types.rs +++ b/core/src/transformers/types.rs @@ -33,6 +33,7 @@ pub struct Inputs { pub token_estimate: i32, // estimated token count } +#[derive(Clone, Debug, Deserialize, Serialize)] pub struct PairedEmbeddings { pub primary_key: String, pub embeddings: Vec, diff --git a/src/types.rs b/core/src/types.rs similarity index 73% rename from src/types.rs rename to core/src/types.rs index 3cbf666..84e99dd 100644 --- a/src/types.rs +++ b/core/src/types.rs @@ -1,5 +1,6 @@ -use pgrx::prelude::*; +use chrono::serde::ts_seconds_option::deserialize as from_tsopt; use serde::{Deserialize, Serialize}; +use sqlx::types::chrono::Utc; use sqlx::FromRow; use std::fmt::{Display, Formatter}; use std::str::FromStr; @@ -7,7 +8,7 @@ use std::str::FromStr; pub const VECTORIZE_SCHEMA: &str = "vectorize"; #[allow(non_camel_case_types)] -#[derive(Clone, Debug, Serialize, Deserialize, PostgresEnum)] +#[derive(Clone, Debug, Serialize, Deserialize)] pub enum SimilarityAlg { pgv_cosine_similarity, } @@ -40,7 +41,7 @@ impl From for SimilarityAlg { } } -#[derive(Clone, Debug, Serialize, Deserialize, PostgresEnum)] +#[derive(Clone, Debug, Serialize, Deserialize)] pub enum JobType { Columns, // row, @@ -76,7 +77,7 @@ impl Display for JobType { } #[allow(non_camel_case_types)] -#[derive(Clone, Debug, Default, Serialize, Deserialize, PostgresEnum, PartialEq, Eq)] +#[derive(Clone, Debug, Default, Serialize, Deserialize, PartialEq, Eq)] pub enum TableMethod { // append a new column to the existing table append, @@ -103,3 +104,25 @@ pub struct JobParams { fn default_schedule() -> String { "realtime".to_string() } + +// schema for all messages that hit pgmq +#[derive(Clone, Deserialize, Debug, Serialize)] +pub struct JobMessage { + pub job_name: String, + pub job_meta: VectorizeMeta, + pub inputs: Vec, +} + +// schema for every job +// also schema for the vectorize.vectorize_meta table +#[derive(Clone, Debug, Deserialize, FromRow, Serialize)] +pub struct VectorizeMeta { + pub job_id: i64, + pub name: String, + pub job_type: JobType, + pub transformer: String, + pub search_alg: SimilarityAlg, + pub params: serde_json::Value, + #[serde(deserialize_with = "from_tsopt")] + pub last_completion: Option>, +} diff --git a/core/src/worker/base.rs b/core/src/worker/base.rs new file mode 100644 index 0000000..d1ccee7 --- /dev/null +++ b/core/src/worker/base.rs @@ -0,0 +1,132 @@ +use crate::transformers::{generic, http_handler, openai}; +use crate::types::{JobMessage, JobParams}; +use crate::worker::ops; +use anyhow::Result; +use log::{error, info}; +use pgmq::{Message, PGMQueueExt}; +use sqlx::{Pool, Postgres}; +use std::env; + +pub async fn poll_job( + conn: &Pool, + queue: &PGMQueueExt, + config: &Config, +) -> Result> { + let msg: Message = match queue.read::(&config.queue_name, 1_i32).await { + Ok(Some(msg)) => msg, + Ok(None) => { + return Ok(None); + } + Err(e) => { + return Err(anyhow::anyhow!("failed reading message: {}", e)); + } + }; + + let read_ct: i32 = msg.read_ct; + let msg_id: i64 = msg.msg_id; + if read_ct <= config.max_retries { + execute_job(conn, msg, config).await?; + } else { + error!( + "message exceeds max retry of {}, archiving msg_id: {}", + config.max_retries, msg_id + ); + } + + queue.archive(&config.queue_name, msg_id).await?; + + Ok(Some(())) +} + +pub struct Config { + pub database_url: String, + pub queue_name: String, + pub embedding_svc_url: String, + pub openai_api_key: Option, + pub embedding_request_timeout: i32, + pub poll_interval: u64, + pub poll_interval_error: u64, + pub max_retries: i32, +} + +impl Config { + pub fn from_env() -> Config { + Config { + database_url: from_env_default( + "DATABASE_URL", + "postgres://postgres:postgres@localhost:5432/postgres", + ), + queue_name: from_env_default("VECTORIZE_QUEUE", "vectorize_jobs"), + embedding_svc_url: from_env_default( + "EMBEDDING_SVC_URL", + "http://localhost:3000/v1/embeddings", + ), + openai_api_key: env::var("OPENAI_API_KEY").ok(), + embedding_request_timeout: from_env_default("EMBEDDING_REQUEST_TIMEOUT", "6") + .parse() + .unwrap(), + // time to wait between polling for job when there are no messages in queue + poll_interval: from_env_default("POLL_INTERVAL", "2").parse().unwrap(), + // time to wait between polling for job when there has been an error in processing + poll_interval_error: from_env_default("POLL_INTERVAL_ERROR", "10") + .parse() + .unwrap(), + max_retries: from_env_default("MAX_RETRIES", "2").parse().unwrap(), + } + } +} + +/// source a variable from environment - use default if not exists +fn from_env_default(key: &str, default: &str) -> String { + env::var(key).unwrap_or_else(|_| default.to_owned()) +} + +/// processes a single job from the queue +async fn execute_job( + dbclient: &Pool, + msg: Message, + cfg: &Config, +) -> Result<()> { + let job_meta = msg.message.job_meta; + let job_params: JobParams = serde_json::from_value(job_meta.params.clone())?; + + let embedding_request = match job_meta.transformer.as_ref() { + "text-embedding-ada-002" => openai::prepare_openai_request( + job_meta.clone(), + &msg.message.inputs, + cfg.openai_api_key.clone(), + )?, + _ => generic::prepare_generic_embedding_request( + job_meta.clone(), + &msg.message.inputs, + cfg.embedding_svc_url.clone(), + )?, + }; + info!( + "pg-vectorize: embeddings request length: {}", + embedding_request.payload.input.len() + ); + let embeddings = + http_handler::openai_embedding_request(embedding_request, cfg.embedding_request_timeout) + .await?; + let paired_embeddings = http_handler::merge_input_output(msg.message.inputs, embeddings); + match job_params.clone().table_method { + crate::types::TableMethod::append => { + ops::update_embeddings( + dbclient, + &job_params.schema, + &job_params.table, + &job_meta.clone().name, + &job_params.primary_key, + &job_params.pkey_type, + paired_embeddings, + ) + .await?; + } + crate::types::TableMethod::join => { + ops::upsert_embedding_table(dbclient, &job_meta.name, &job_params, paired_embeddings) + .await? + } + } + Ok(()) +} diff --git a/core/src/worker/mod.rs b/core/src/worker/mod.rs new file mode 100644 index 0000000..17dc461 --- /dev/null +++ b/core/src/worker/mod.rs @@ -0,0 +1,2 @@ +pub mod base; +pub mod ops; diff --git a/core/src/worker/ops.rs b/core/src/worker/ops.rs new file mode 100644 index 0000000..e848304 --- /dev/null +++ b/core/src/worker/ops.rs @@ -0,0 +1,184 @@ +use crate::transformers::types::PairedEmbeddings; +use crate::types; +use anyhow::Result; +use serde_json::to_string; +use sqlx::{Pool, Postgres}; +use std::fmt::Write; + +pub async fn upsert_embedding_table( + conn: &Pool, + project: &str, + job_params: &types::JobParams, + embeddings: Vec, +) -> Result<()> { + let (query, bindings) = build_upsert_query(project, job_params, embeddings); + let mut q = sqlx::query(&query); + for (record_id, embeddings) in bindings { + q = q.bind(record_id).bind(embeddings); + } + match q.execute(conn).await { + Ok(_) => Ok(()), + Err(e) => Err(anyhow::anyhow!("failed to execute query: {}", e)), + } +} + +// returns query and bindings +// only compatible with pg-vector data types +fn build_upsert_query( + project: &str, + job_params: &types::JobParams, + embeddings: Vec, +) -> (String, Vec<(String, String)>) { + let join_key = &job_params.primary_key; + let schema = match &job_params.table_method { + types::TableMethod::append => job_params.schema.clone(), + types::TableMethod::join => "vectorize".to_string(), + }; + let mut query = format!( + " + INSERT INTO {schema}._embeddings_{project} ({join_key}, embeddings) VALUES", + schema = schema, + join_key = join_key, + ); + let mut bindings: Vec<(String, String)> = Vec::new(); + + for (index, pair) in embeddings.into_iter().enumerate() { + if index > 0 { + query.push(','); + } + query.push_str(&format!( + " (${}::{}, ${}::vector)", + 2 * index + 1, + job_params.pkey_type, + 2 * index + 2 + )); + + let embedding = + serde_json::to_string(&pair.embeddings).expect("failed to serialize embedding"); + bindings.push((pair.primary_key, embedding)); + } + let upsert = format!( + " ON CONFLICT ({join_key}) + DO UPDATE SET embeddings = EXCLUDED.embeddings, updated_at = NOW();", + join_key = join_key + ); + query.push_str(&upsert); + (query, bindings) +} + +pub async fn update_embeddings( + pool: &Pool, + schema: &str, + table: &str, + project: &str, + pkey: &str, + pkey_type: &str, + embeddings: Vec, +) -> anyhow::Result<()> { + if embeddings.len() > 10 { + bulk_update_embeddings(pool, schema, table, project, pkey, pkey_type, embeddings).await + } else { + update_append_table(pool, embeddings, schema, table, project, pkey, pkey_type).await + } +} + +// creates a temporary table, inserts all new values into the temporary table, and then performs an update by join +async fn bulk_update_embeddings( + pool: &Pool, + schema: &str, + table: &str, + project: &str, + pkey: &str, + pkey_type: &str, + embeddings: Vec, +) -> anyhow::Result<()> { + let mut tx = pool.begin().await?; + + let tmp_table = format!("temp_embeddings_{project}"); + + let temp_table_query = format!( + "CREATE TEMP TABLE IF NOT EXISTS {tmp_table} ( + pkey {pkey_type} PRIMARY KEY, + embeddings vector + ) ON COMMIT DROP;", // note, dropping on commit + ); + + sqlx::query(&temp_table_query).execute(&mut *tx).await?; + + // insert all new values into the temporary table + let mut insert_query = format!("INSERT INTO {tmp_table} (pkey, embeddings) VALUES "); + let mut params: Vec<(String, String)> = Vec::new(); + + for embed in &embeddings { + let embedding_json = to_string(&embed.embeddings).expect("failed to serialize embedding"); + params.push((embed.primary_key.to_string(), embedding_json)); + } + + // Constructing query values part and collecting bind parameters + for (i, (_pkey, _embedding)) in params.iter().enumerate() { + if i > 0 { + insert_query.push_str(", "); + } + write!( + &mut insert_query, + "(${}::{}, ${}::vector)", + i * 2 + 1, + pkey_type, + i * 2 + 2 + ) + .expect("Failed to write to query string"); + } + + let mut insert_statement = sqlx::query(&insert_query); + + for (pkey, embedding) in params { + insert_statement = insert_statement.bind(pkey).bind(embedding); + } + // insert to the temp table + insert_statement.execute(&mut *tx).await?; + + let update_query = format!( + "UPDATE {schema}.{table} SET + {project}_embeddings = temp.embeddings, + {project}_updated_at = (NOW()) + FROM {tmp_table} temp + WHERE {schema}.{table}.{pkey}::{pkey_type} = temp.pkey::{pkey_type};" + ); + + sqlx::query(&update_query).execute(&mut *tx).await?; + tx.commit().await?; + + Ok(()) +} + +async fn update_append_table( + pool: &Pool, + embeddings: Vec, + schema: &str, + table: &str, + project: &str, + pkey: &str, + pkey_type: &str, +) -> anyhow::Result<()> { + for embed in embeddings { + // Serialize the Vec to a JSON string + let embedding = to_string(&embed.embeddings).expect("failed to serialize embedding"); + + let update_query = format!( + " + UPDATE {schema}.{table} + SET + {project}_embeddings = $1::vector, + {project}_updated_at = (NOW()) + WHERE {pkey} = $2::{pkey_type} + " + ); + // Prepare and execute the update statement for this pair within the transaction + sqlx::query(&update_query) + .bind(embedding) + .bind(embed.primary_key) + .execute(pool) + .await?; + } + Ok(()) +} diff --git a/extension/.gitignore b/extension/.gitignore new file mode 100644 index 0000000..9f97022 --- /dev/null +++ b/extension/.gitignore @@ -0,0 +1 @@ +target/ \ No newline at end of file diff --git a/.sqlx/query-406fb387c8a2d04c3a5362ae2da0154ff0295f078171f59b904e97fdd2933989.json b/extension/.sqlx/query-406fb387c8a2d04c3a5362ae2da0154ff0295f078171f59b904e97fdd2933989.json similarity index 100% rename from .sqlx/query-406fb387c8a2d04c3a5362ae2da0154ff0295f078171f59b904e97fdd2933989.json rename to extension/.sqlx/query-406fb387c8a2d04c3a5362ae2da0154ff0295f078171f59b904e97fdd2933989.json diff --git a/Cargo.toml b/extension/Cargo.toml similarity index 92% rename from Cargo.toml rename to extension/Cargo.toml index 4470d98..a224588 100644 --- a/Cargo.toml +++ b/extension/Cargo.toml @@ -17,6 +17,7 @@ pg_test = [] [dependencies] anyhow = "1.0.72" chrono = {version = "0.4.26", features = ["serde"] } +env_logger = "0.11.3" handlebars = "5.1.0" lazy_static = "1.4.0" log = "0.4.19" @@ -38,6 +39,7 @@ thiserror = "1.0.44" tiktoken-rs = "0.5.7" tokio = {version = "1.29.1", features = ["rt-multi-thread"] } url = "2.4.0" +vectorize_core = { path = "../core", package = "vectorize-core" } [dev-dependencies] pgrx-tests = "0.11.3" diff --git a/META.json.in b/extension/META.json.in similarity index 100% rename from META.json.in rename to extension/META.json.in diff --git a/Makefile b/extension/Makefile similarity index 99% rename from Makefile rename to extension/Makefile index a91d8bc..4c39714 100644 --- a/Makefile +++ b/extension/Makefile @@ -6,6 +6,7 @@ PG_VERSION:=15 PGRX_PG_CONFIG =$(shell cargo pgrx info pg-config pg${PG_VERSION}) UPGRADE_FROM_VER:=0.9.0 BRANCH:=$(git rev-parse --abbrev-ref HEAD) +RUST_LOG:=debug .PHONY: install-pg_cron install-pg_vector install-pgmq run setup test-integration test-unit test-version test-branch test-upgrade cat-logs docs diff --git a/Trunk.toml b/extension/Trunk.toml similarity index 100% rename from Trunk.toml rename to extension/Trunk.toml diff --git a/sql/example.sql b/extension/sql/example.sql similarity index 100% rename from sql/example.sql rename to extension/sql/example.sql diff --git a/sql/meta.sql b/extension/sql/meta.sql similarity index 100% rename from sql/meta.sql rename to extension/sql/meta.sql diff --git a/sql/vectorize--0.10.0--0.10.1.sql b/extension/sql/vectorize--0.10.0--0.10.1.sql similarity index 100% rename from sql/vectorize--0.10.0--0.10.1.sql rename to extension/sql/vectorize--0.10.0--0.10.1.sql diff --git a/sql/vectorize--0.10.1--0.11.0.sql b/extension/sql/vectorize--0.10.1--0.11.0.sql similarity index 100% rename from sql/vectorize--0.10.1--0.11.0.sql rename to extension/sql/vectorize--0.10.1--0.11.0.sql diff --git a/sql/vectorize--0.11.0--0.11.1.sql b/extension/sql/vectorize--0.11.0--0.11.1.sql similarity index 100% rename from sql/vectorize--0.11.0--0.11.1.sql rename to extension/sql/vectorize--0.11.0--0.11.1.sql diff --git a/sql/vectorize--0.11.1--0.12.0.sql b/extension/sql/vectorize--0.11.1--0.12.0.sql similarity index 100% rename from sql/vectorize--0.11.1--0.12.0.sql rename to extension/sql/vectorize--0.11.1--0.12.0.sql diff --git a/sql/vectorize--0.12.0--0.12.1.sql b/extension/sql/vectorize--0.12.0--0.12.1.sql similarity index 100% rename from sql/vectorize--0.12.0--0.12.1.sql rename to extension/sql/vectorize--0.12.0--0.12.1.sql diff --git a/sql/vectorize--0.2.0--0.3.0.sql b/extension/sql/vectorize--0.2.0--0.3.0.sql similarity index 100% rename from sql/vectorize--0.2.0--0.3.0.sql rename to extension/sql/vectorize--0.2.0--0.3.0.sql diff --git a/sql/vectorize--0.3.0--0.4.0.sql b/extension/sql/vectorize--0.3.0--0.4.0.sql similarity index 100% rename from sql/vectorize--0.3.0--0.4.0.sql rename to extension/sql/vectorize--0.3.0--0.4.0.sql diff --git a/sql/vectorize--0.4.0--0.5.0.sql b/extension/sql/vectorize--0.4.0--0.5.0.sql similarity index 100% rename from sql/vectorize--0.4.0--0.5.0.sql rename to extension/sql/vectorize--0.4.0--0.5.0.sql diff --git a/sql/vectorize--0.5.0--0.6.0.sql b/extension/sql/vectorize--0.5.0--0.6.0.sql similarity index 100% rename from sql/vectorize--0.5.0--0.6.0.sql rename to extension/sql/vectorize--0.5.0--0.6.0.sql diff --git a/sql/vectorize--0.6.0--0.6.1.sql b/extension/sql/vectorize--0.6.0--0.6.1.sql similarity index 100% rename from sql/vectorize--0.6.0--0.6.1.sql rename to extension/sql/vectorize--0.6.0--0.6.1.sql diff --git a/sql/vectorize--0.7.0--0.8.0.sql b/extension/sql/vectorize--0.7.0--0.8.0.sql similarity index 100% rename from sql/vectorize--0.7.0--0.8.0.sql rename to extension/sql/vectorize--0.7.0--0.8.0.sql diff --git a/sql/vectorize--0.8.0--0.8.1.sql b/extension/sql/vectorize--0.8.0--0.8.1.sql similarity index 100% rename from sql/vectorize--0.8.0--0.8.1.sql rename to extension/sql/vectorize--0.8.0--0.8.1.sql diff --git a/sql/vectorize--0.8.1--0.9.0.sql b/extension/sql/vectorize--0.8.1--0.9.0.sql similarity index 100% rename from sql/vectorize--0.8.1--0.9.0.sql rename to extension/sql/vectorize--0.8.1--0.9.0.sql diff --git a/sql/vectorize--0.9.0--0.10.0.sql b/extension/sql/vectorize--0.9.0--0.10.0.sql similarity index 100% rename from sql/vectorize--0.9.0--0.10.0.sql rename to extension/sql/vectorize--0.9.0--0.10.0.sql diff --git a/src/api.rs b/extension/src/api.rs similarity index 96% rename from src/api.rs rename to extension/src/api.rs index f205896..fa21ed2 100644 --- a/src/api.rs +++ b/extension/src/api.rs @@ -1,8 +1,8 @@ -use crate::chat::call_chat; +use crate::chat::ops::call_chat; use crate::search::{self, init_table}; use crate::transformers::transform; -use crate::types; +use crate::types; use anyhow::Result; use pgrx::prelude::*; @@ -31,8 +31,8 @@ fn table( Some(serde_json::to_value(args).expect("failed to parse args")), Some(update_col), transformer, - search_alg, - table_method, + search_alg.into(), + table_method.into(), schedule, ) } @@ -85,8 +85,8 @@ fn init_rag( None, None, transformer, - search_alg, - table_method, + search_alg.into(), + table_method.into(), schedule, ) } diff --git a/extension/src/chat/mod.rs b/extension/src/chat/mod.rs new file mode 100644 index 0000000..414c60d --- /dev/null +++ b/extension/src/chat/mod.rs @@ -0,0 +1,2 @@ +pub mod ops; +pub mod types; diff --git a/src/chat.rs b/extension/src/chat/ops.rs similarity index 94% rename from src/chat.rs rename to extension/src/chat/ops.rs index a090e96..f070f33 100644 --- a/src/chat.rs +++ b/extension/src/chat/ops.rs @@ -1,7 +1,5 @@ -use crate::executor::VectorizeMeta; use crate::guc; use crate::search; -use crate::types; use crate::util::get_vectorize_meta_spi; use anyhow::{anyhow, Result}; @@ -9,31 +7,10 @@ use handlebars::Handlebars; use openai_api_rs::v1::api::Client; use openai_api_rs::v1::chat_completion::{self, ChatCompletionRequest}; use pgrx::prelude::*; -use serde::Serialize; -use tiktoken_rs::{get_bpe_from_model, model::get_context_size, CoreBPE}; - -struct PromptTemplate { - pub sys_prompt: String, - pub user_prompt: String, -} - -struct RenderedPrompt { - pub sys_rendered: String, - pub user_rendered: String, -} -#[derive(Clone, Debug, Serialize)] -pub struct ContextualSearch { - pub record_id: String, - pub content: String, - pub token_ct: i32, -} - -#[derive(Debug, Serialize)] -pub struct ChatResponse { - pub context: Vec, - pub chat_response: String, -} +use crate::chat::types::{ChatResponse, ContextualSearch, PromptTemplate, RenderedPrompt}; +use tiktoken_rs::{get_bpe_from_model, model::get_context_size, CoreBPE}; +use vectorize_core::types::{JobParams, VectorizeMeta}; pub fn call_chat( agent_name: &str, @@ -51,7 +28,7 @@ pub fn call_chat( error!("failed to get project metadata"); }; - let job_params = serde_json::from_value::(project_meta.params.clone()) + let job_params = serde_json::from_value::(project_meta.params.clone()) .unwrap_or_else(|e| error!("failed to deserialize job params: {}", e)); // for various token count estimations diff --git a/extension/src/chat/types.rs b/extension/src/chat/types.rs new file mode 100644 index 0000000..81b3d00 --- /dev/null +++ b/extension/src/chat/types.rs @@ -0,0 +1,24 @@ +use serde::Serialize; + +pub struct PromptTemplate { + pub sys_prompt: String, + pub user_prompt: String, +} + +pub struct RenderedPrompt { + pub sys_rendered: String, + pub user_rendered: String, +} + +#[derive(Clone, Debug, Serialize)] +pub struct ContextualSearch { + pub record_id: String, + pub content: String, + pub token_ct: i32, +} + +#[derive(Debug, Serialize)] +pub struct ChatResponse { + pub context: Vec, + pub chat_response: String, +} diff --git a/src/errors.rs b/extension/src/errors.rs similarity index 100% rename from src/errors.rs rename to extension/src/errors.rs diff --git a/src/executor.rs b/extension/src/executor.rs similarity index 87% rename from src/executor.rs rename to extension/src/executor.rs index e6ff80b..5bbc561 100644 --- a/src/executor.rs +++ b/extension/src/executor.rs @@ -4,31 +4,15 @@ use crate::errors::DatabaseError; use crate::guc::BATCH_SIZE; use crate::init::VECTORIZE_QUEUE; use crate::query::check_input; -use crate::transformers::types::Inputs; -use crate::types; use crate::util::get_pg_conn; -use chrono::serde::ts_seconds_option::deserialize as from_tsopt; use chrono::TimeZone; -use serde::{Deserialize, Serialize}; use sqlx::error::Error; use sqlx::postgres::PgRow; use sqlx::types::chrono::Utc; -use sqlx::{FromRow, Pool, Postgres, Row}; +use sqlx::{Pool, Postgres, Row}; use tiktoken_rs::cl100k_base; - -// schema for every job -// also schema for the vectorize.vectorize_meta table -#[derive(Clone, Debug, Deserialize, FromRow, Serialize)] -pub struct VectorizeMeta { - pub job_id: i64, - pub name: String, - pub job_type: types::JobType, - pub transformer: String, - pub search_alg: types::SimilarityAlg, - pub params: serde_json::Value, - #[serde(deserialize_with = "from_tsopt")] - pub last_completion: Option>, -} +use vectorize_core::transformers::types::Inputs; +use vectorize_core::types::{JobMessage, JobParams, TableMethod, VectorizeMeta}; // creates batches based on total token count // batch_size is the max token count per batch @@ -55,14 +39,6 @@ pub fn create_batches(data: Vec, batch_size: i32) -> Vec> { groups } -// schema for all messages that hit pgmq -#[derive(Clone, Deserialize, Debug, Serialize)] -pub struct JobMessage { - pub job_name: String, - pub job_meta: VectorizeMeta, - pub inputs: Vec, -} - // called by pg_cron on schedule // identifiers new inputs and enqueues them #[pg_extern] @@ -87,7 +63,7 @@ fn job_execute(job_name: String) { let meta = get_vectorize_meta(&job_name, &conn) .await .unwrap_or_else(|e| error!("failed to get job metadata: {}", e)); - let job_params = serde_json::from_value::(meta.params.clone()) + let job_params = serde_json::from_value::(meta.params.clone()) .unwrap_or_else(|e| error!("failed to deserialize job params: {}", e)); let _last_completion = match meta.last_completion { Some(t) => t, @@ -146,7 +122,7 @@ pub async fn get_vectorize_meta( Ok(row) } -pub fn new_rows_query_join(job_name: &str, job_params: &types::JobParams) -> String { +pub fn new_rows_query_join(job_name: &str, job_params: &JobParams) -> String { let cols = &job_params .columns .iter() @@ -189,7 +165,7 @@ pub fn new_rows_query_join(job_name: &str, job_params: &types::JobParams) -> Str } } -pub fn new_rows_query(job_name: &str, job_params: &types::JobParams) -> String { +pub fn new_rows_query(job_name: &str, job_params: &JobParams) -> String { let cols = collapse_to_csv(&job_params.columns); // query source and return any new rows that need transformation @@ -231,11 +207,11 @@ pub fn new_rows_query(job_name: &str, job_params: &types::JobParams) -> String { pub async fn get_new_updates( pool: &Pool, job_name: &str, - job_params: types::JobParams, + job_params: JobParams, ) -> Result>, DatabaseError> { let query = match job_params.table_method { - types::TableMethod::append => new_rows_query(job_name, &job_params), - types::TableMethod::join => new_rows_query_join(job_name, &job_params), + TableMethod::append => new_rows_query(job_name, &job_params), + TableMethod::join => new_rows_query_join(job_name, &job_params), }; let rows: Result, Error> = sqlx::query(&query).fetch_all(pool).await; match rows { diff --git a/src/guc.rs b/extension/src/guc.rs similarity index 100% rename from src/guc.rs rename to extension/src/guc.rs diff --git a/src/init.rs b/extension/src/init.rs similarity index 95% rename from src/init.rs rename to extension/src/init.rs index 9e223fc..26a1579 100644 --- a/src/init.rs +++ b/extension/src/init.rs @@ -1,11 +1,13 @@ use crate::{ query::check_input, - transformers::{http_handler::sync_get_model_info, types::TransformerMetadata}, - types::{self, TableMethod}, + transformers::http_handler::sync_get_model_info, + types::{self}, }; use pgrx::prelude::*; use anyhow::{Context, Result}; +use vectorize_core::transformers::types::TransformerMetadata; +use vectorize_core::types::{JobParams, TableMethod}; pub static VECTORIZE_QUEUE: &str = "vectorize_jobs"; @@ -64,7 +66,7 @@ pub fn init_job_query() -> String { } /// creates a project view over a source table and the embeddings table -fn create_project_view(job_name: &str, job_params: &types::JobParams) -> String { +fn create_project_view(job_name: &str, job_params: &JobParams) -> String { format!( "CREATE OR REPLACE VIEW vectorize.{job_name} as SELECT t0.*, t1.embeddings, t1.updated_at as embeddings_updated_at @@ -82,7 +84,7 @@ fn create_project_view(job_name: &str, job_params: &types::JobParams) -> String pub fn init_embedding_table_query( job_name: &str, transformer: &str, - job_params: &types::JobParams, + job_params: &JobParams, ) -> Vec { check_input(job_name).expect("invalid job name"); let schema = &job_params.schema; diff --git a/src/job.rs b/extension/src/job.rs similarity index 94% rename from src/job.rs rename to extension/src/job.rs index ca2dc1e..08ff6a4 100644 --- a/src/job.rs +++ b/extension/src/job.rs @@ -1,16 +1,16 @@ use anyhow::Result; -use crate::executor::{ - create_batches, new_rows_query, new_rows_query_join, JobMessage, VectorizeMeta, -}; +use crate::executor::{create_batches, new_rows_query, new_rows_query_join}; use crate::guc::BATCH_SIZE; use crate::init::VECTORIZE_QUEUE; -use crate::transformers::types::Inputs; -use crate::types::{self, JobParams, JobType}; use crate::util; use pgrx::prelude::*; use tiktoken_rs::cl100k_base; +use vectorize_core::transformers::types::Inputs; +use vectorize_core::types::{ + JobMessage, JobParams, JobType, SimilarityAlg, TableMethod, VectorizeMeta, +}; /// called by the trigger function when a table is updated /// handles enqueueing the embedding transform jobs @@ -118,12 +118,12 @@ pub fn initalize_table_job( job_params: &JobParams, job_type: &JobType, transformer: &str, - search_alg: types::SimilarityAlg, + search_alg: SimilarityAlg, ) -> Result<()> { // start with initial batch load let rows_need_update_query: String = match job_params.table_method { - types::TableMethod::append => new_rows_query(job_name, job_params), - types::TableMethod::join => new_rows_query_join(job_name, job_params), + TableMethod::append => new_rows_query(job_name, job_params), + TableMethod::join => new_rows_query_join(job_name, job_params), }; let mut inputs: Vec = Vec::new(); let bpe = cl100k_base().unwrap(); diff --git a/src/lib.rs b/extension/src/lib.rs similarity index 97% rename from src/lib.rs rename to extension/src/lib.rs index c92ff14..1e9812a 100644 --- a/src/lib.rs +++ b/extension/src/lib.rs @@ -12,11 +12,12 @@ mod search; mod transformers; mod types; mod util; -mod workers; +pub mod workers; pgrx::pg_module_magic!(); extension_sql_file!("../sql/meta.sql"); + // example dataset extension_sql_file!("../sql/example.sql"); diff --git a/src/query.rs b/extension/src/query.rs similarity index 100% rename from src/query.rs rename to extension/src/query.rs diff --git a/src/search.rs b/extension/src/search.rs similarity index 99% rename from src/search.rs rename to extension/src/search.rs index f9e1a0b..949d540 100644 --- a/src/search.rs +++ b/extension/src/search.rs @@ -1,16 +1,14 @@ -use crate::executor::VectorizeMeta; use crate::guc; use crate::init; use crate::job::{create_event_trigger, create_trigger_handler, initalize_table_job}; use crate::transformers::http_handler::sync_get_model_info; use crate::transformers::openai; use crate::transformers::transform; -use crate::types; -use crate::types::TableMethod; use crate::util; use anyhow::Result; use pgrx::prelude::*; +use vectorize_core::types::{self, TableMethod, VectorizeMeta}; #[allow(clippy::too_many_arguments)] pub fn init_table( diff --git a/extension/src/transformers/generic.rs b/extension/src/transformers/generic.rs new file mode 100644 index 0000000..fa6fd02 --- /dev/null +++ b/extension/src/transformers/generic.rs @@ -0,0 +1,17 @@ +use anyhow::Result; + +use crate::guc; +use vectorize_core::transformers::generic::{find_placeholders, interpolate}; + +pub fn get_generic_svc_url() -> Result { + if let Some(url) = guc::get_guc(guc::VectorizeGuc::EmbeddingServiceUrl) { + if let Some(phs) = find_placeholders(&url) { + let interpolated = interpolate(&url, phs)?; + Ok(interpolated) + } else { + Ok(url) + } + } else { + Err(anyhow::anyhow!("vectorize.embedding_service_url not set")) + } +} diff --git a/extension/src/transformers/http_handler.rs b/extension/src/transformers/http_handler.rs new file mode 100644 index 0000000..ab3dff5 --- /dev/null +++ b/extension/src/transformers/http_handler.rs @@ -0,0 +1,52 @@ +use super::generic::get_generic_svc_url; +use crate::guc::EMBEDDING_REQ_TIMEOUT_SEC; +use anyhow::Result; + +use pgrx::prelude::*; + +use vectorize_core::transformers::http_handler::handle_response; +use vectorize_core::transformers::types::TransformerMetadata; + +#[pg_extern] +pub fn mod_info(model_name: &str, api_key: default!(Option, "NULL")) -> pgrx::JsonB { + let meta = sync_get_model_info(model_name, api_key).unwrap(); + pgrx::JsonB(serde_json::to_value(meta).unwrap()) +} + +pub fn sync_get_model_info( + model_name: &str, + api_key: Option, +) -> Result { + let runtime = tokio::runtime::Builder::new_current_thread() + .enable_io() + .enable_time() + .build() + .unwrap_or_else(|e| error!("failed to initialize tokio runtime: {}", e)); + let meta = match runtime.block_on(async { get_model_info(model_name, api_key).await }) { + Ok(e) => e, + Err(e) => { + error!("error getting model info: {}", e); + } + }; + Ok(meta) +} + +pub async fn get_model_info( + model_name: &str, + api_key: Option, +) -> Result { + let svc_url = get_generic_svc_url()?; + let info_url = svc_url.replace("/embeddings", "/info"); + let timeout = EMBEDDING_REQ_TIMEOUT_SEC.get(); + let client = reqwest::Client::new(); + let mut req = client + .get(info_url) + .query(&[("model_name", model_name)]) + .timeout(std::time::Duration::from_secs(timeout as u64)); + if let Some(key) = api_key { + req = req.header("Authorization", format!("Bearer {}", key)); + } + let resp = req.send().await?; + let meta_response = handle_response::(resp, "info").await?; + Ok(meta_response) +} diff --git a/src/transformers/mod.rs b/extension/src/transformers/mod.rs similarity index 83% rename from src/transformers/mod.rs rename to extension/src/transformers/mod.rs index 8aac466..8912abd 100644 --- a/src/transformers/mod.rs +++ b/extension/src/transformers/mod.rs @@ -4,12 +4,13 @@ pub mod openai; pub mod tembo; pub mod types; -use crate::guc; +use crate::guc::{self, EMBEDDING_REQ_TIMEOUT_SEC}; use generic::get_generic_svc_url; -use http_handler::openai_embedding_request; -use openai::{OPENAI_EMBEDDING_MODEL, OPENAI_EMBEDDING_URL}; use pgrx::prelude::*; -use types::{EmbeddingPayload, EmbeddingRequest}; + +use vectorize_core::transformers::http_handler::openai_embedding_request; +use vectorize_core::transformers::openai::{OPENAI_EMBEDDING_MODEL, OPENAI_EMBEDDING_URL}; +use vectorize_core::transformers::types::{EmbeddingPayload, EmbeddingRequest}; pub fn transform(input: &str, transformer: &str, api_key: Option) -> Vec> { let runtime = tokio::runtime::Builder::new_current_thread() @@ -53,7 +54,9 @@ pub fn transform(input: &str, transformer: &str, api_key: Option) -> Vec } } }; - match runtime.block_on(async { openai_embedding_request(embedding_request).await }) { + let timeout = EMBEDDING_REQ_TIMEOUT_SEC.get(); + + match runtime.block_on(async { openai_embedding_request(embedding_request, timeout).await }) { Ok(e) => e, Err(e) => { error!("error getting embeddings: {}", e); diff --git a/extension/src/transformers/openai.rs b/extension/src/transformers/openai.rs new file mode 100644 index 0000000..026e6f1 --- /dev/null +++ b/extension/src/transformers/openai.rs @@ -0,0 +1,29 @@ +use anyhow::Result; +use pgrx::prelude::*; +use vectorize_core::transformers::http_handler::handle_response; + +use crate::guc::EMBEDDING_REQ_TIMEOUT_SEC; + +pub fn validate_api_key(key: &str) -> Result<()> { + let client = reqwest::Client::new(); + let timeout = EMBEDDING_REQ_TIMEOUT_SEC.get(); + let runtime = tokio::runtime::Builder::new_current_thread() + .enable_io() + .enable_time() + .build() + .unwrap_or_else(|e| error!("failed to initialize tokio runtime: {}", e)); + runtime.block_on(async { + let resp = client + .get("https://api.openai.com/v1/models") + .header("Content-Type", "application/json") + .header("Authorization", format!("Bearer {}", key)) + .timeout(std::time::Duration::from_secs(timeout as u64)) + .send() + .await + .unwrap_or_else(|e| error!("failed to make Open AI key validation call: {}", e)); + let _ = handle_response::(resp, "models") + .await + .unwrap_or_else(|e| error!("failed validate API key: {}", e)); + }); + Ok(()) +} diff --git a/src/transformers/tembo.rs b/extension/src/transformers/tembo.rs similarity index 100% rename from src/transformers/tembo.rs rename to extension/src/transformers/tembo.rs diff --git a/extension/src/transformers/types.rs b/extension/src/transformers/types.rs new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/extension/src/transformers/types.rs @@ -0,0 +1 @@ + diff --git a/extension/src/types.rs b/extension/src/types.rs new file mode 100644 index 0000000..30fd14a --- /dev/null +++ b/extension/src/types.rs @@ -0,0 +1,36 @@ +use pgrx::*; +use vectorize_core::types::{SimilarityAlg as CoreSimilarityAlg, TableMethod as CoreTableMethod}; + +use serde::{Deserialize, Serialize}; +pub const VECTORIZE_SCHEMA: &str = "vectorize"; + +#[allow(non_camel_case_types)] +#[derive(Clone, Debug, Default, Serialize, Deserialize, PostgresEnum, PartialEq, Eq)] +pub enum TableMethod { + append, + #[default] + join, +} + +impl From for CoreTableMethod { + fn from(my_method: TableMethod) -> Self { + match my_method { + TableMethod::append => CoreTableMethod::append, + TableMethod::join => CoreTableMethod::join, + } + } +} + +#[allow(non_camel_case_types)] +#[derive(Clone, Debug, Serialize, Deserialize, PostgresEnum)] +pub enum SimilarityAlg { + pgv_cosine_similarity, +} + +impl From for CoreSimilarityAlg { + fn from(mysim: SimilarityAlg) -> Self { + match mysim { + SimilarityAlg::pgv_cosine_similarity => CoreSimilarityAlg::pgv_cosine_similarity, + } + } +} diff --git a/src/util.rs b/extension/src/util.rs similarity index 96% rename from src/util.rs rename to extension/src/util.rs index 7698773..a3c695c 100644 --- a/src/util.rs +++ b/extension/src/util.rs @@ -1,4 +1,5 @@ -use crate::executor::VectorizeMeta; +use anyhow::Result; +use log::info; use pgrx::spi::SpiTupleTable; use pgrx::*; use sqlx::postgres::{PgConnectOptions, PgPoolOptions}; @@ -6,9 +7,8 @@ use sqlx::{Pool, Postgres}; use std::env; use url::{ParseError, Url}; -use anyhow::Result; - use crate::guc; +use vectorize_core::types; #[derive(Clone, Debug)] pub struct Config { @@ -62,7 +62,7 @@ pub fn from_env_default(key: &str, default: &str) -> String { env::var(key).unwrap_or_else(|_| default.to_owned()) } -pub fn get_vectorize_meta_spi(job_name: &str) -> Result> { +pub fn get_vectorize_meta_spi(job_name: &str) -> Result> { let query: &str = " SELECT job_id, @@ -74,7 +74,7 @@ pub fn get_vectorize_meta_spi(job_name: &str) -> Result> { FROM vectorize.job WHERE name = $1 "; - let result: Result> = Spi::connect(|client| { + let result: Result> = Spi::connect(|client| { let tup_table: SpiTupleTable = client.select( query, Some(1), @@ -89,7 +89,7 @@ pub fn get_vectorize_meta_spi(job_name: &str) -> Result> { let search_alg: String = result_row.get_by_name("search_alg").unwrap().unwrap(); let params: pgrx::JsonB = result_row.get_by_name("params").unwrap().unwrap(); - Ok(Some(VectorizeMeta { + Ok(Some(types::VectorizeMeta { job_id, name, job_type: job_type.into(), diff --git a/extension/src/workers/mod.rs b/extension/src/workers/mod.rs new file mode 100644 index 0000000..2e55f07 --- /dev/null +++ b/extension/src/workers/mod.rs @@ -0,0 +1,128 @@ +pub mod pg_bgw; + +use crate::guc::{EMBEDDING_REQ_TIMEOUT_SEC, OPENAI_KEY}; +use crate::transformers::generic::get_generic_svc_url; + +use vectorize_core::transformers::types::PairedEmbeddings; +use vectorize_core::transformers::{generic, http_handler, openai}; +use vectorize_core::types; +use vectorize_core::worker::ops; + +use anyhow::{Context, Result}; +use pgmq::{Message, PGMQueueExt}; +use pgrx::*; +use sqlx::{Pool, Postgres}; + +pub async fn run_worker( + queue: PGMQueueExt, + conn: &Pool, + queue_name: &str, +) -> Result> { + let msg: Message = + match queue.read::(queue_name, 180_i32).await { + Ok(Some(msg)) => msg, + Ok(None) => { + info!("pg-vectorize: No messages in queue"); + return Ok(None); + } + Err(e) => { + warning!("pg-vectorize: Error reading message: {e}"); + return Err(anyhow::anyhow!("failed to read message")); + } + }; + + let msg_id: i64 = msg.msg_id; + let read_ct: i32 = msg.read_ct; + info!( + "pg-vectorize: received message for job: {:?}", + msg.message.job_name + ); + let job_success = execute_job(conn.clone(), msg).await; + let delete_it = match job_success { + Ok(_) => { + info!("pg-vectorize: job success"); + true + } + Err(e) => { + warning!("pg-vectorize: job failed: {:?}", e); + read_ct > 2 + } + }; + + // delete message from queue + if delete_it { + match queue.archive(queue_name, msg_id).await { + Ok(_) => { + info!("pg-vectorize: deleted message: {}", msg_id); + } + Err(e) => { + warning!("pg-vectorize: Error deleting message: {}", e); + } + } + } + // return Some(), indicating that worker consumed some message + // any possibly more messages on queue + Ok(Some(())) +} + +async fn execute_job(dbclient: Pool, msg: Message) -> Result<()> { + let job_meta = msg.message.job_meta; + let job_params: types::JobParams = serde_json::from_value(job_meta.params.clone())?; + + let embedding_request = match job_meta.transformer.as_ref() { + "text-embedding-ada-002" => { + info!("pg-vectorize: OpenAI transformer"); + let apikey = match job_params.api_key.clone() { + Some(k) => k, + None => { + let key = match OPENAI_KEY.get() { + Some(k) => k.to_str()?.to_owned(), + None => { + warning!("pg-vectorize: Error getting API key from GUC"); + return Err(anyhow::anyhow!("failed to get API key")); + } + }; + key + } + }; + openai::prepare_openai_request(job_meta.clone(), &msg.message.inputs, Some(apikey)) + } + _ => { + let svc_host = + get_generic_svc_url().context("failed to get embedding service url from GUC")?; + generic::prepare_generic_embedding_request( + job_meta.clone(), + &msg.message.inputs, + svc_host, + ) + } + }?; + + let timeout = EMBEDDING_REQ_TIMEOUT_SEC.get(); + let embeddings = http_handler::openai_embedding_request(embedding_request, timeout).await?; + // TODO: validate returned embeddings order is same as the input order + let paired_embeddings: Vec = + http_handler::merge_input_output(msg.message.inputs, embeddings); + + log!("pg-vectorize: embeddings size: {}", paired_embeddings.len()); + // write embeddings to result table + match job_params.clone().table_method { + types::TableMethod::append => { + ops::update_embeddings( + &dbclient, + &job_params.schema, + &job_params.table, + &job_meta.clone().name, + &job_params.primary_key, + &job_params.pkey_type, + paired_embeddings, + ) + .await?; + } + types::TableMethod::join => { + ops::upsert_embedding_table(&dbclient, &job_meta.name, &job_params, paired_embeddings) + .await? + } + }; + Ok(()) +} diff --git a/src/workers/mod.rs b/extension/src/workers/ops.rs similarity index 61% rename from src/workers/mod.rs rename to extension/src/workers/ops.rs index 97419a0..37a5d1f 100644 --- a/src/workers/mod.rs +++ b/extension/src/workers/ops.rs @@ -1,68 +1,12 @@ -pub mod pg_bgw; - -use crate::executor::JobMessage; -use crate::transformers::{generic, http_handler, openai, types::PairedEmbeddings}; +use crate::transformers::types::PairedEmbeddings; use crate::types; use anyhow::Result; -use pgmq::{Message, PGMQueueExt}; -use pgrx::*; use serde_json::to_string; use sqlx::{Pool, Postgres}; use std::fmt::Write; -pub async fn run_worker( - queue: PGMQueueExt, - conn: &Pool, - queue_name: &str, -) -> Result> { - let msg: Message = match queue.read::(queue_name, 180_i32).await { - Ok(Some(msg)) => msg, - Ok(None) => { - info!("pg-vectorize: No messages in queue"); - return Ok(None); - } - Err(e) => { - warning!("pg-vectorize: Error reading message: {e}"); - return Err(anyhow::anyhow!("failed to read message")); - } - }; - - let msg_id: i64 = msg.msg_id; - let read_ct: i32 = msg.read_ct; - info!( - "pg-vectorize: received message for job: {:?}", - msg.message.job_name - ); - let job_success = execute_job(conn.clone(), msg).await; - let delete_it = match job_success { - Ok(_) => { - info!("pg-vectorize: job success"); - true - } - Err(e) => { - warning!("pg-vectorize: job failed: {:?}", e); - read_ct > 2 - } - }; - - // delete message from queue - if delete_it { - match queue.archive(queue_name, msg_id).await { - Ok(_) => { - info!("pg-vectorize: deleted message: {}", msg_id); - } - Err(e) => { - warning!("pg-vectorize: Error deleting message: {}", e); - } - } - } - // return Some(), indicating that worker consumed some message - // any possibly more messages on queue - Ok(Some(())) -} - -async fn upsert_embedding_table( +pub async fn upsert_embedding_table( conn: &Pool, project: &str, job_params: &types::JobParams, @@ -75,10 +19,7 @@ async fn upsert_embedding_table( } match q.execute(conn).await { Ok(_) => Ok(()), - Err(e) => { - log!("Error: {}", e); - Err(anyhow::anyhow!("failed to execute query")) - } + Err(e) => Err(anyhow::anyhow!("failed to execute query: {}", e)), } } @@ -126,7 +67,7 @@ fn build_upsert_query( (query, bindings) } -async fn update_embeddings( +pub async fn update_embeddings( pool: &Pool, schema: &str, table: &str, @@ -242,43 +183,3 @@ async fn update_append_table( } Ok(()) } - -async fn execute_job(dbclient: Pool, msg: Message) -> Result<()> { - let job_meta = msg.message.job_meta; - let job_params: types::JobParams = serde_json::from_value(job_meta.params.clone())?; - - let embedding_request = match job_meta.transformer.as_ref() { - "text-embedding-ada-002" => { - info!("pg-vectorize: OpenAI transformer"); - openai::prepare_openai_request(job_meta.clone(), &msg.message.inputs) - } - _ => generic::prepare_generic_embedding_request(job_meta.clone(), &msg.message.inputs), - }?; - - let embeddings = http_handler::openai_embedding_request(embedding_request).await?; - // TODO: validate returned embeddings order is same as the input order - let paired_embeddings: Vec = - http_handler::merge_input_output(msg.message.inputs, embeddings); - - log!("pg-vectorize: embeddings size: {}", paired_embeddings.len()); - // write embeddings to result table - match job_params.clone().table_method { - types::TableMethod::append => { - update_embeddings( - &dbclient, - &job_params.schema, - &job_params.table, - &job_meta.clone().name, - &job_params.primary_key, - &job_params.pkey_type, - paired_embeddings, - ) - .await?; - } - types::TableMethod::join => { - upsert_embedding_table(&dbclient, &job_meta.name, &job_params, paired_embeddings) - .await? - } - }; - Ok(()) -} diff --git a/src/workers/pg_bgw.rs b/extension/src/workers/pg_bgw.rs similarity index 100% rename from src/workers/pg_bgw.rs rename to extension/src/workers/pg_bgw.rs diff --git a/tests/integration_tests.rs b/extension/tests/integration_tests.rs similarity index 100% rename from tests/integration_tests.rs rename to extension/tests/integration_tests.rs diff --git a/tests/util.rs b/extension/tests/util.rs similarity index 100% rename from tests/util.rs rename to extension/tests/util.rs diff --git a/vectorize.control b/extension/vectorize.control similarity index 100% rename from vectorize.control rename to extension/vectorize.control diff --git a/src/transformers/http_handler.rs b/src/transformers/http_handler.rs deleted file mode 100644 index 2a90810..0000000 --- a/src/transformers/http_handler.rs +++ /dev/null @@ -1,109 +0,0 @@ -use super::generic::get_generic_svc_url; -use super::types::TransformerMetadata; -use anyhow::Result; - -use crate::guc::EMBEDDING_REQ_TIMEOUT_SEC; -use crate::transformers::types::{ - EmbeddingPayload, EmbeddingRequest, EmbeddingResponse, Inputs, PairedEmbeddings, -}; -use pgrx::prelude::*; - -pub async fn handle_response serde::Deserialize<'de>>( - resp: reqwest::Response, - method: &'static str, -) -> Result { - if !resp.status().is_success() { - let errmsg = format!( - "Failed to call method '{}', received response with status code:{} and body: {}", - method, - resp.status(), - resp.text().await? - ); - warning!("pg-vectorize: error handling response: {}", errmsg); - return Err(anyhow::anyhow!(errmsg)); - } - let value = resp.json::().await?; - Ok(value) -} - -// handle an OpenAI compatible embedding transform request -pub async fn openai_embedding_request(request: EmbeddingRequest) -> Result>> { - log!( - "pg-vectorize: embedding request size: {}", - request.payload.input.len() - ); - let client = reqwest::Client::new(); - let timeout = EMBEDDING_REQ_TIMEOUT_SEC.get(); - let mut req = client - .post(request.url) - .timeout(std::time::Duration::from_secs(timeout as u64)) - .json::(&request.payload) - .header("Content-Type", "application/json"); - if let Some(key) = request.api_key { - req = req.header("Authorization", format!("Bearer {}", key)); - } - let resp = req.send().await?; - let embedding_resp = handle_response::(resp, "embeddings").await?; - let embeddings = embedding_resp - .data - .iter() - .map(|d| d.embedding.clone()) - .collect(); - Ok(embeddings) -} - -// merges the vec of inputs with the embedding responses -pub fn merge_input_output(inputs: Vec, values: Vec>) -> Vec { - inputs - .into_iter() - .zip(values) - .map(|(input, value)| PairedEmbeddings { - primary_key: input.record_id, - embeddings: value, - }) - .collect() -} - -#[pg_extern] -pub fn mod_info(model_name: &str, api_key: default!(Option, "NULL")) -> pgrx::JsonB { - let meta = sync_get_model_info(model_name, api_key).unwrap(); - pgrx::JsonB(serde_json::to_value(meta).unwrap()) -} - -pub fn sync_get_model_info( - model_name: &str, - api_key: Option, -) -> Result { - let runtime = tokio::runtime::Builder::new_current_thread() - .enable_io() - .enable_time() - .build() - .unwrap_or_else(|e| error!("failed to initialize tokio runtime: {}", e)); - let meta = match runtime.block_on(async { get_model_info(model_name, api_key).await }) { - Ok(e) => e, - Err(e) => { - error!("error getting model info: {}", e); - } - }; - Ok(meta) -} - -pub async fn get_model_info( - model_name: &str, - api_key: Option, -) -> Result { - let svc_url = get_generic_svc_url()?; - let info_url = svc_url.replace("/embeddings", "/info"); - let timeout = EMBEDDING_REQ_TIMEOUT_SEC.get(); - let client = reqwest::Client::new(); - let mut req = client - .get(info_url) - .query(&[("model_name", model_name)]) - .timeout(std::time::Duration::from_secs(timeout as u64)); - if let Some(key) = api_key { - req = req.header("Authorization", format!("Bearer {}", key)); - } - let resp = req.send().await?; - let meta_response = handle_response::(resp, "info").await?; - Ok(meta_response) -}