From 67ef3ad1e89d006d4e1f9e624705b9390eb4587e Mon Sep 17 00:00:00 2001 From: Ingrid Date: Fri, 22 Nov 2024 12:52:33 +0100 Subject: [PATCH 01/14] stub implementation of DataConnector --- Cargo.lock | 1961 ++++++++++++++++++++++++++++++++----- Cargo.toml | 5 +- rove_connector/Cargo.toml | 10 + rove_connector/src/lib.rs | 27 + 4 files changed, 1755 insertions(+), 248 deletions(-) create mode 100644 rove_connector/Cargo.toml create mode 100644 rove_connector/src/lib.rs diff --git a/Cargo.lock b/Cargo.lock index 36576095..8fb59817 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,18 +4,18 @@ version = 3 [[package]] name = "addr2line" -version = "0.22.0" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" +checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" dependencies = [ "gimli", ] [[package]] -name = "adler" -version = "1.0.2" +name = "adler2" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" [[package]] name = "aho-corasick" @@ -41,15 +41,43 @@ dependencies = [ "libc", ] +[[package]] +name = "anyhow" +version = "1.0.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c95c10ba0b00a02636238b814946408b1322d5ac4760326e6fb8ec956d85775" + +[[package]] +name = "async-stream" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b5a71a6f37880a80d1d7f19efd781e4b5de42c88f0722cc13bcb6cc2cfe8476" +dependencies = [ + "async-stream-impl", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-stream-impl" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.90", +] + [[package]] name = "async-trait" -version = "0.1.80" +version = "0.1.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" +checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.90", ] [[package]] @@ -60,9 +88,38 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "autocfg" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" + +[[package]] +name = "axum" +version = "0.5.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acee9fd5073ab6b045a275b3e709c163dd36c90685219cb21804a147b58dba43" +dependencies = [ + "async-trait", + "axum-core 0.2.9", + "bitflags 1.3.2", + "bytes", + "futures-util", + "http 0.2.12", + "http-body 0.4.6", + "hyper 0.14.31", + "itoa", + "matchit 0.5.0", + "memchr", + "mime", + "percent-encoding", + "pin-project-lite", + "serde", + "sync_wrapper 0.1.2", + "tokio", + "tower 0.4.13", + "tower-http", + "tower-layer", + "tower-service", +] [[package]] name = "axum" @@ -71,16 +128,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "edca88bc138befd0323b20752846e6587272d3b03b0343c8ea28a6f819e6e71f" dependencies = [ "async-trait", - "axum-core", + "axum-core 0.4.5", "bytes", "futures-util", - "http", - "http-body", + "http 1.1.0", + "http-body 1.0.1", "http-body-util", - "hyper", + "hyper 1.5.1", "hyper-util", "itoa", - "matchit", + "matchit 0.7.3", "memchr", "mime", "percent-encoding", @@ -90,7 +147,7 @@ dependencies = [ "serde_json", "serde_path_to_error", "serde_urlencoded", - "sync_wrapper 1.0.1", + "sync_wrapper 1.0.2", "tokio", "tower 0.5.1", "tower-layer", @@ -98,6 +155,22 @@ dependencies = [ "tracing", ] +[[package]] +name = "axum-core" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37e5939e02c56fecd5c017c37df4238c0a839fa76b7f97acdd7efb804fd181cc" +dependencies = [ + "async-trait", + "bytes", + "futures-util", + "http 0.2.12", + "http-body 0.4.6", + "mime", + "tower-layer", + "tower-service", +] + [[package]] name = "axum-core" version = "0.4.5" @@ -107,13 +180,13 @@ dependencies = [ "async-trait", "bytes", "futures-util", - "http", - "http-body", + "http 1.1.0", + "http-body 1.0.1", "http-body-util", "mime", "pin-project-lite", "rustversion", - "sync_wrapper 1.0.1", + "sync_wrapper 1.0.2", "tower-layer", "tower-service", "tracing", @@ -121,19 +194,25 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.73" +version = "0.3.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" +checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" dependencies = [ "addr2line", - "cc", "cfg-if", "libc", "miniz_oxide", "object", "rustc-demangle", + "windows-targets", ] +[[package]] +name = "base64" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + [[package]] name = "base64" version = "0.22.1" @@ -191,6 +270,26 @@ version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" +[[package]] +name = "bytemuck" +version = "1.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b37c88a63ffd85d15b406896cc343916d7cf57838a847b3a6f2ca5d39a5695a" +dependencies = [ + "bytemuck_derive", +] + +[[package]] +name = "bytemuck_derive" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bcfcc3cd946cb52f0bbfdbbcfa2f4e24f75ebb6c0e1002f7c25904fada18b9ec" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.90", +] + [[package]] name = "byteorder" version = "1.5.0" @@ -205,9 +304,12 @@ checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b" [[package]] name = "cc" -version = "1.0.104" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74b6a57f98764a267ff415d50a25e6e166f3831a5071af4995296ea97d210490" +checksum = "f34d93e62b03caf570cccc334cbc6c2fceca82f39211051345108adcba3eebdc" +dependencies = [ + "shlex", +] [[package]] name = "cfg-if" @@ -230,6 +332,30 @@ dependencies = [ "windows-targets", ] +[[package]] +name = "chronoutil" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9b58b07a67cadda9502b270eca5e0f1cd3afd08445e0ab1d52d909db01b4543" +dependencies = [ + "chrono", +] + +[[package]] +name = "cmake" +version = "0.1.52" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c682c223677e0e5b6b7f63a64b9351844c3f1b1678a68b7ee617e30fb082620e" +dependencies = [ + "cc", +] + +[[package]] +name = "coe-rs" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e8f1e641542c07631228b1e0dc04b69ae3c1d58ef65d5691a439711d805c698" + [[package]] name = "core-foundation" version = "0.9.4" @@ -242,15 +368,15 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.6" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "cpufeatures" -version = "0.2.12" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +checksum = "16b80225097f2e5ae4e7179dd2266824648f3e2f49d9134d584b76389d31c4c3" dependencies = [ "libc", ] @@ -279,6 +405,37 @@ dependencies = [ "cfg-if", ] +[[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-utils" +version = "0.8.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" + +[[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + [[package]] name = "crypto-common" version = "0.1.6" @@ -310,6 +467,12 @@ dependencies = [ "memchr", ] +[[package]] +name = "dbgf" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6ca96b45ca70b8045e0462f191bd209fcb3c3bfe8dbfb1257ada54c4dd59169" + [[package]] name = "digest" version = "0.10.7" @@ -321,15 +484,94 @@ dependencies = [ "subtle", ] +[[package]] +name = "displaydoc" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.90", +] + +[[package]] +name = "dyn-stack" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56e53799688f5632f364f8fb387488dd05db9fe45db7011be066fc20e7027f8b" +dependencies = [ + "bytemuck", + "reborrow", +] + +[[package]] +name = "either" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" + [[package]] name = "encoding_rs" -version = "0.8.34" +version = "0.8.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" +checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3" dependencies = [ "cfg-if", ] +[[package]] +name = "enum-as-inner" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1e6a265c649f3f5979b601d26f1d05ada116434c87741c9493cb56218f76cbc" +dependencies = [ + "heck 0.5.0", + "proc-macro2", + "quote", + "syn 2.0.90", +] + +[[package]] +name = "equator" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c35da53b5a021d2484a7cc49b2ac7f2d840f8236a286f84202369bd338d761ea" +dependencies = [ + "equator-macro 0.2.1", +] + +[[package]] +name = "equator" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5099e7b6f0b7431c7a1c49f75929e2777693da192784f167066977a2965767af" +dependencies = [ + "equator-macro 0.4.1", +] + +[[package]] +name = "equator-macro" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3bf679796c0322556351f287a51b49e48f7c4986e727b5dd78c972d30e2e16cc" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.90", +] + +[[package]] +name = "equator-macro" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5322a90066ddae2b705096eb9e10c465c0498ae93bf9bdd6437415327c88e3bb" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.90", +] + [[package]] name = "equivalent" version = "1.0.1" @@ -338,12 +580,55 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.9" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" +checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d" dependencies = [ "libc", - "windows-sys", + "windows-sys 0.59.0", +] + +[[package]] +name = "faer" +version = "0.19.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64bc4855cb2792ae3520e8af22051a47a6d6dc8300ebc0ddf51ad73f65bd0dc9" +dependencies = [ + "bytemuck", + "coe-rs", + "dbgf", + "dyn-stack", + "equator 0.4.1", + "faer-entity", + "gemm", + "libm", + "matrixcompare", + "matrixcompare-core", + "nano-gemm", + "npyz", + "num-complex", + "num-traits", + "paste", + "rand", + "rand_distr", + "rayon", + "reborrow", + "serde", +] + +[[package]] +name = "faer-entity" +version = "0.19.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9c752ab2bff6f0b9597c6a1adc0112f7fd41fb343bc5a009a6274ae9d32fd03" +dependencies = [ + "bytemuck", + "coe-rs", + "libm", + "num-complex", + "num-traits", + "pulp", + "reborrow", ] [[package]] @@ -368,15 +653,21 @@ checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" [[package]] name = "fastrand" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" +checksum = "486f806e73c5707928240ddc295403b1b93c96a02038563881c4a2fd84b81ac4" + +[[package]] +name = "fixedbitset" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.0.30" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" +checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c" dependencies = [ "crc32fast", "miniz_oxide", @@ -414,9 +705,9 @@ dependencies = [ [[package]] name = "futures" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876" dependencies = [ "futures-channel", "futures-core", @@ -429,9 +720,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" dependencies = [ "futures-core", "futures-sink", @@ -439,15 +730,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" +checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" [[package]] name = "futures-executor" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f" dependencies = [ "futures-core", "futures-task", @@ -456,38 +747,38 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" +checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" [[package]] name = "futures-macro" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.90", ] [[package]] name = "futures-sink" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" +checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" [[package]] name = "futures-task" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" +checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" [[package]] name = "futures-util" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" dependencies = [ "futures-channel", "futures-core", @@ -501,6 +792,124 @@ dependencies = [ "slab", ] +[[package]] +name = "gemm" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e400f2ffd14e7548356236c35dc39cad6666d833a852cb8a8f3f28029359bb03" +dependencies = [ + "dyn-stack", + "gemm-c32", + "gemm-c64", + "gemm-common", + "gemm-f16", + "gemm-f32", + "gemm-f64", + "num-complex", + "num-traits", + "paste", + "raw-cpuid", + "seq-macro", +] + +[[package]] +name = "gemm-c32" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10dc4a6176c8452d60eac1a155b454c91c668f794151a303bf3c75ea2874812d" +dependencies = [ + "dyn-stack", + "gemm-common", + "num-complex", + "num-traits", + "paste", + "raw-cpuid", + "seq-macro", +] + +[[package]] +name = "gemm-c64" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc2032ce2c0bb150da0256338759a6fb01ca056f6dfe28c4d14af32d7f878f6f" +dependencies = [ + "dyn-stack", + "gemm-common", + "num-complex", + "num-traits", + "paste", + "raw-cpuid", + "seq-macro", +] + +[[package]] +name = "gemm-common" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90fd234fc525939654f47b39325fd5f55e552ceceea9135f3aa8bdba61eabef6" +dependencies = [ + "bytemuck", + "dyn-stack", + "half", + "num-complex", + "num-traits", + "once_cell", + "paste", + "pulp", + "raw-cpuid", + "rayon", + "seq-macro", + "sysctl", +] + +[[package]] +name = "gemm-f16" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fc3652651f96a711d46b8833e1fac27a864be4bdfa81a374055f33ddd25c0c6" +dependencies = [ + "dyn-stack", + "gemm-common", + "gemm-f32", + "half", + "num-complex", + "num-traits", + "paste", + "raw-cpuid", + "rayon", + "seq-macro", +] + +[[package]] +name = "gemm-f32" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acbc51c44ae3defd207e6d9416afccb3c4af1e7cef5e4960e4c720ac4d6f998e" +dependencies = [ + "dyn-stack", + "gemm-common", + "num-complex", + "num-traits", + "paste", + "raw-cpuid", + "seq-macro", +] + +[[package]] +name = "gemm-f64" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f37fc86e325c2415a4d0cab8324a0c5371ec06fc7d2f9cb1636fcfc9536a8d8" +dependencies = [ + "dyn-stack", + "gemm-common", + "num-complex", + "num-traits", + "paste", + "raw-cpuid", + "seq-macro", +] + [[package]] name = "generic-array" version = "0.14.7" @@ -524,46 +933,102 @@ dependencies = [ [[package]] name = "gimli" -version = "0.29.0" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" +checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" [[package]] name = "h2" -version = "0.4.5" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab" +checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http 0.2.12", + "indexmap 2.7.0", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "h2" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccae279728d634d083c00f6099cb58f01cc99c145b84b8be2f6c74618d79922e" dependencies = [ "atomic-waker", "bytes", "fnv", "futures-core", "futures-sink", - "http", - "indexmap", + "http 1.1.0", + "indexmap 2.7.0", "slab", "tokio", "tokio-util", "tracing", ] +[[package]] +name = "half" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" +dependencies = [ + "bytemuck", + "cfg-if", + "crunchy", + "num-traits", +] + +[[package]] +name = "hash32" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47d60b12902ba28e2730cd37e95b8c9223af2808df9e902d4df49588d1470606" +dependencies = [ + "byteorder", +] + [[package]] name = "hashbrown" -version = "0.14.5" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "hashbrown" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" + +[[package]] +name = "heapless" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bfb9eb618601c89945a70e254898da93b13be0388091d42117462b265bb3fad" +dependencies = [ + "hash32", + "stable_deref_trait", +] [[package]] name = "heck" -version = "0.5.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] -name = "hermit-abi" -version = "0.3.9" +name = "heck" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "hmac" @@ -574,6 +1039,26 @@ 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.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + [[package]] name = "http" version = "1.1.0" @@ -587,12 +1072,23 @@ dependencies = [ [[package]] name = "http-body" -version = "1.0.0" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" +checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ "bytes", - "http", + "http 0.2.12", + "pin-project-lite", +] + +[[package]] +name = "http-body" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" +dependencies = [ + "bytes", + "http 1.1.0", ] [[package]] @@ -603,16 +1099,22 @@ checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" dependencies = [ "bytes", "futures-util", - "http", - "http-body", + "http 1.1.0", + "http-body 1.0.1", "pin-project-lite", ] +[[package]] +name = "http-range-header" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "add0ab9360ddbd88cfeb3bd9574a1d85cfdfa14db10b3e21d3700dbc4328758f" + [[package]] name = "httparse" -version = "1.9.4" +version = "1.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" +checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946" [[package]] name = "httpdate" @@ -622,16 +1124,40 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "hyper" -version = "1.4.0" +version = "0.14.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4fe55fb7a772d59a5ff1dfbff4fe0258d19b89fec4b233e75d35d5d2316badc" +checksum = "8c08302e8fa335b151b788c775ff56e7a03ae64ff85c548ee820fecb70356e85" dependencies = [ "bytes", "futures-channel", + "futures-core", "futures-util", - "h2", - "http", - "http-body", + "h2 0.3.26", + "http 0.2.12", + "http-body 0.4.6", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "socket2", + "tokio", + "tower-service", + "tracing", + "want", +] + +[[package]] +name = "hyper" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97818827ef4f364230e16705d4706e2897df2bb60617d6ca15d598025a3c481f" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "h2 0.4.7", + "http 1.1.0", + "http-body 1.0.1", "httparse", "httpdate", "itoa", @@ -643,13 +1169,13 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.27.2" +version = "0.27.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155" +checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333" dependencies = [ "futures-util", - "http", - "hyper", + "http 1.1.0", + "hyper 1.5.1", "hyper-util", "rustls", "rustls-pki-types", @@ -658,6 +1184,18 @@ dependencies = [ "tower-service", ] +[[package]] +name = "hyper-timeout" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" +dependencies = [ + "hyper 0.14.31", + "pin-project-lite", + "tokio", + "tokio-io-timeout", +] + [[package]] name = "hyper-tls" version = "0.6.0" @@ -666,7 +1204,7 @@ checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" dependencies = [ "bytes", "http-body-util", - "hyper", + "hyper 1.5.1", "hyper-util", "native-tls", "tokio", @@ -676,29 +1214,28 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.6" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ab92f4f49ee4fb4f997c784b7a2e0fa70050211e0b6a287f898c3c9785ca956" +checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4" dependencies = [ "bytes", "futures-channel", "futures-util", - "http", - "http-body", - "hyper", + "http 1.1.0", + "http-body 1.0.1", + "hyper 1.5.1", "pin-project-lite", "socket2", "tokio", - "tower 0.4.13", "tower-service", "tracing", ] [[package]] name = "iana-time-zone" -version = "0.1.60" +version = "0.1.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" +checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -709,52 +1246,201 @@ dependencies = [ ] [[package]] -name = "iana-time-zone-haiku" -version = "0.1.2" +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 = "icu_collections" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526" +dependencies = [ + "displaydoc", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_locid" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637" +dependencies = [ + "displaydoc", + "litemap", + "tinystr", + "writeable", + "zerovec", +] + +[[package]] +name = "icu_locid_transform" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_locid_transform_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_locid_transform_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e" + +[[package]] +name = "icu_normalizer" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_normalizer_data", + "icu_properties", + "icu_provider", + "smallvec", + "utf16_iter", + "utf8_iter", + "write16", + "zerovec", +] + +[[package]] +name = "icu_normalizer_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516" + +[[package]] +name = "icu_properties" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_locid_transform", + "icu_properties_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_properties_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569" + +[[package]] +name = "icu_provider" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_provider_macros", + "stable_deref_trait", + "tinystr", + "writeable", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_provider_macros" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.90", +] + +[[package]] +name = "idna" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e" +dependencies = [ + "idna_adapter", + "smallvec", + "utf8_iter", +] + +[[package]] +name = "idna_adapter" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71" dependencies = [ - "cc", + "icu_normalizer", + "icu_properties", ] [[package]] -name = "idna" -version = "0.5.0" +name = "indexmap" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ - "unicode-bidi", - "unicode-normalization", + "autocfg", + "hashbrown 0.12.3", ] [[package]] name = "indexmap" -version = "2.2.6" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f" dependencies = [ "equivalent", - "hashbrown", + "hashbrown 0.15.2", ] [[package]] name = "ipnet" -version = "2.9.0" +version = "2.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708" + +[[package]] +name = "itertools" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +dependencies = [ + "either", +] [[package]] name = "itoa" -version = "1.0.11" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" +checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674" [[package]] name = "js-sys" -version = "0.3.69" +version = "0.3.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" +checksum = "a865e038f7f6ed956f788f0d7d60c541fff74c7bd74272c5d4cf15c63743e705" dependencies = [ + "once_cell", "wasm-bindgen", ] @@ -781,7 +1467,7 @@ dependencies = [ name = "lard_api" version = "0.1.0" dependencies = [ - "axum", + "axum 0.7.9", "bb8", "bb8-postgres", "chrono", @@ -795,7 +1481,7 @@ dependencies = [ name = "lard_ingestion" version = "0.1.0" dependencies = [ - "axum", + "axum 0.7.9", "bb8", "bb8-postgres", "bytes", @@ -830,17 +1516,23 @@ dependencies = [ "tokio-postgres", ] +[[package]] +name = "lazy_static" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" + [[package]] name = "libc" -version = "0.2.155" +version = "0.2.167" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" +checksum = "09d6582e104315a817dff97f75133544b2e094ee22447d2acf4a74e189ba06fc" [[package]] name = "libm" -version = "0.2.8" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" +checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa" [[package]] name = "linux-raw-sys" @@ -848,6 +1540,12 @@ version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" +[[package]] +name = "litemap" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104" + [[package]] name = "lock_api" version = "0.4.12" @@ -864,12 +1562,34 @@ version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" +[[package]] +name = "matchit" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73cbba799671b762df5a175adf59ce145165747bb891505c43d09aefbbf38beb" + [[package]] name = "matchit" version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" +[[package]] +name = "matrixcompare" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37832ba820e47c93d66b4360198dccb004b43c74abc3ac1ce1fed54e65a80445" +dependencies = [ + "matrixcompare-core", + "num-traits", +] + +[[package]] +name = "matrixcompare-core" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0bdabb30db18805d5290b3da7ceaccbddba795620b86c02145d688e04900a73" + [[package]] name = "md-5" version = "0.10.6" @@ -894,23 +1614,98 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "miniz_oxide" -version = "0.7.4" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" dependencies = [ - "adler", + "adler2", ] [[package]] name = "mio" -version = "1.0.1" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4569e456d394deccd22ce1c1913e6ea0e54519f577285001215d33557431afe4" +checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd" dependencies = [ - "hermit-abi", "libc", "wasi", - "windows-sys", + "windows-sys 0.52.0", +] + +[[package]] +name = "multimap" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" + +[[package]] +name = "nano-gemm" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f563548d38f390ef9893e4883ec38c1fb312f569e98d76bededdd91a3b41a043" +dependencies = [ + "equator 0.2.2", + "nano-gemm-c32", + "nano-gemm-c64", + "nano-gemm-codegen", + "nano-gemm-core", + "nano-gemm-f32", + "nano-gemm-f64", + "num-complex", +] + +[[package]] +name = "nano-gemm-c32" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a40449e57a5713464c3a1208c4c3301c8d29ee1344711822cf022bc91373a91b" +dependencies = [ + "nano-gemm-codegen", + "nano-gemm-core", + "num-complex", +] + +[[package]] +name = "nano-gemm-c64" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "743a6e6211358fba85d1009616751e4107da86f4c95b24e684ce85f25c25b3bf" +dependencies = [ + "nano-gemm-codegen", + "nano-gemm-core", + "num-complex", +] + +[[package]] +name = "nano-gemm-codegen" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "963bf7c7110d55430169dc74c67096375491ed580cd2ef84842550ac72e781fa" + +[[package]] +name = "nano-gemm-core" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe3fc4f83ae8861bad79dc3c016bd6b0220da5f9de302e07d3112d16efc24aa6" + +[[package]] +name = "nano-gemm-f32" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e3681b7ce35658f79da94b7f62c60a005e29c373c7111ed070e3bf64546a8bb" +dependencies = [ + "nano-gemm-codegen", + "nano-gemm-core", +] + +[[package]] +name = "nano-gemm-f64" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc1e619ed04d801809e1f63e61b669d380c4119e8b0cdd6ed184c6b111f046d8" +dependencies = [ + "nano-gemm-codegen", + "nano-gemm-core", ] [[package]] @@ -930,6 +1725,47 @@ dependencies = [ "tempfile", ] +[[package]] +name = "npyz" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13f27ea175875c472b3df61ece89a6d6ef4e0627f43704e400c782f174681ebd" +dependencies = [ + "byteorder", + "num-bigint", + "py_literal", +] + +[[package]] +name = "num-bigint" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" +dependencies = [ + "num-integer", + "num-traits", +] + +[[package]] +name = "num-complex" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495" +dependencies = [ + "bytemuck", + "num-traits", + "rand", +] + +[[package]] +name = "num-integer" +version = "0.1.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" +dependencies = [ + "num-traits", +] + [[package]] name = "num-traits" version = "0.2.19" @@ -942,24 +1778,36 @@ dependencies = [ [[package]] name = "object" -version = "0.36.1" +version = "0.36.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "081b846d1d56ddfc18fdf1a922e4f6e07a11768ea1b92dec44e42b72712ccfce" +checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e" dependencies = [ "memchr", ] +[[package]] +name = "olympian" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd25aaba52e6ed10b87a0e19f3161157b78bebdb85b9e1538252c37b6073fb29" +dependencies = [ + "chronoutil", + "faer", + "rstar", + "thiserror", +] + [[package]] name = "once_cell" -version = "1.19.0" +version = "1.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" [[package]] name = "openssl" -version = "0.10.64" +version = "0.10.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" +checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5" dependencies = [ "bitflags 2.6.0", "cfg-if", @@ -978,7 +1826,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.90", ] [[package]] @@ -989,9 +1837,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.102" +version = "0.9.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" +checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741" dependencies = [ "cc", "libc", @@ -1017,17 +1865,78 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.5.2", + "redox_syscall", "smallvec", "windows-targets", ] +[[package]] +name = "paste" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" + [[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.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "879952a81a83930934cbf1786752d6dedc3b1f29e8f8fb2ad1d0a36f377cf442" +dependencies = [ + "memchr", + "thiserror", + "ucd-trie", +] + +[[package]] +name = "pest_derive" +version = "2.7.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d214365f632b123a47fd913301e14c946c61d1c183ee245fa76eb752e59a02dd" +dependencies = [ + "pest", + "pest_generator", +] + +[[package]] +name = "pest_generator" +version = "2.7.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb55586734301717aea2ac313f50b2eb8f60d2fc3dc01d190eefa2e625f60c4e" +dependencies = [ + "pest", + "pest_meta", + "proc-macro2", + "quote", + "syn 2.0.90", +] + +[[package]] +name = "pest_meta" +version = "2.7.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b75da2a70cf4d9cb76833c990ac9cd3923c9a8905a8929789ce347c84564d03d" +dependencies = [ + "once_cell", + "pest", + "sha2", +] + +[[package]] +name = "petgraph" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" +dependencies = [ + "fixedbitset", + "indexmap 2.7.0", +] + [[package]] name = "phf" version = "0.11.2" @@ -1048,29 +1957,29 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.1.5" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" +checksum = "be57f64e946e500c8ee36ef6331845d40a93055567ec57e8fae13efd33759b95" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.5" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" +checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.90", ] [[package]] name = "pin-project-lite" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" +checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff" [[package]] name = "pin-utils" @@ -1080,9 +1989,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" +checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" [[package]] name = "postgres-derive" @@ -1090,10 +1999,10 @@ version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "69700ea4603c5ef32d447708e6a19cd3e8ac197a000842e97f527daea5e4175f" dependencies = [ - "heck", + "heck 0.5.0", "proc-macro2", "quote", - "syn", + "syn 2.0.90", ] [[package]] @@ -1102,7 +2011,7 @@ version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "acda0ebdebc28befa84bee35e651e4c5f09073d668c7aed4cf7e23c3cda84b23" dependencies = [ - "base64", + "base64 0.22.1", "byteorder", "bytes", "fallible-iterator", @@ -1129,9 +2038,22 @@ dependencies = [ [[package]] name = "ppv-lite86" -version = "0.2.17" +version = "0.2.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy", +] + +[[package]] +name = "prettyplease" +version = "0.1.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86" +dependencies = [ + "proc-macro2", + "syn 1.0.109", +] [[package]] name = "proc-macro2" @@ -1142,6 +2064,86 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "prost" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71adf41db68aa0daaefc69bb30bcd68ded9b9abaad5d1fbb6304c4fb390e083e" +dependencies = [ + "bytes", + "prost-derive", +] + +[[package]] +name = "prost-build" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ae5a4388762d5815a9fc0dea33c56b021cdc8dde0c55e0c9ca57197254b0cab" +dependencies = [ + "bytes", + "cfg-if", + "cmake", + "heck 0.4.1", + "itertools", + "lazy_static", + "log", + "multimap", + "petgraph", + "prost", + "prost-types", + "regex", + "tempfile", + "which", +] + +[[package]] +name = "prost-derive" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b670f45da57fb8542ebdbb6105a925fe571b67f9e7ed9f47a06a84e72b4e7cc" +dependencies = [ + "anyhow", + "itertools", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "prost-types" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d0a014229361011dc8e69c8a1ec6c2e8d0f2af7c91e3ea3f5b2170298461e68" +dependencies = [ + "bytes", + "prost", +] + +[[package]] +name = "pulp" +version = "0.18.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0a01a0dc67cf4558d279f0c25b0962bd08fc6dec0137699eae304103e882fe6" +dependencies = [ + "bytemuck", + "libm", + "num-complex", + "reborrow", +] + +[[package]] +name = "py_literal" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "102df7a3d46db9d3891f178dcc826dc270a6746277a9ae6436f8d29fd490a8e1" +dependencies = [ + "num-bigint", + "num-complex", + "num-traits", + "pest", + "pest_derive", +] + [[package]] name = "quick-xml" version = "0.35.0" @@ -1154,9 +2156,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.36" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ "proc-macro2", ] @@ -1202,19 +2204,45 @@ dependencies = [ ] [[package]] -name = "redox_syscall" -version = "0.4.1" +name = "raw-cpuid" +version = "10.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +checksum = "6c297679cb867470fa8c9f67dbba74a78d78e3e98d7cf2b08d6d71540f797332" dependencies = [ "bitflags 1.3.2", ] +[[package]] +name = "rayon" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" +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 = "reborrow" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03251193000f4bd3b042892be858ee50e8b3719f2b08e5833ac4353724632430" + [[package]] name = "redox_syscall" -version = "0.5.2" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd" +checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f" dependencies = [ "bitflags 2.6.0", ] @@ -1239,9 +2267,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" +checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" dependencies = [ "aho-corasick", "memchr", @@ -1260,16 +2288,16 @@ version = "0.12.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a77c62af46e79de0a562e1a9849205ffcb7fc1238876e9bd743357570e04046f" dependencies = [ - "base64", + "base64 0.22.1", "bytes", "encoding_rs", "futures-core", "futures-util", - "h2", - "http", - "http-body", + "h2 0.4.7", + "http 1.1.0", + "http-body 1.0.1", "http-body-util", - "hyper", + "hyper 1.5.1", "hyper-rustls", "hyper-tls", "hyper-util", @@ -1285,7 +2313,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", - "sync_wrapper 1.0.1", + "sync_wrapper 1.0.2", "system-configuration", "tokio", "tokio-native-tls", @@ -1309,7 +2337,50 @@ dependencies = [ "libc", "spin", "untrusted", - "windows-sys", + "windows-sys 0.52.0", +] + +[[package]] +name = "rove" +version = "0.1.1" +source = "git+https://github.com/metno/rove.git#95a7770f473a30ea6646a0b9254e8f974b673055" +dependencies = [ + "async-trait", + "chrono", + "chronoutil", + "futures", + "olympian", + "prost", + "prost-types", + "serde", + "thiserror", + "tokio", + "tokio-stream", + "toml", + "tonic", + "tonic-build", + "tower 0.4.13", + "tracing", +] + +[[package]] +name = "rove_connector" +version = "0.1.0" +dependencies = [ + "async-trait", + "rove", + "thiserror", +] + +[[package]] +name = "rstar" +version = "0.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "421400d13ccfd26dfa5858199c30a5d76f9c54e0dba7575273025b43c5175dbb" +dependencies = [ + "heapless", + "num-traits", + "smallvec", ] [[package]] @@ -1320,22 +2391,22 @@ checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustix" -version = "0.38.34" +version = "0.38.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +checksum = "d7f649912bc1495e167a6edee79151c84b1bad49748cb4f1f1167f459f6224f6" dependencies = [ "bitflags 2.6.0", "errno", "libc", "linux-raw-sys", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] name = "rustls" -version = "0.23.10" +version = "0.23.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05cff451f60db80f490f3c182b77c35260baace73209e9cdbbe526bfe3a4d402" +checksum = "934b404430bb06b3fae2cba809eb45a1ab1aecd64491213d7c3301b88393f8d1" dependencies = [ "once_cell", "rustls-pki-types", @@ -1346,25 +2417,24 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "2.1.2" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" +checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50" dependencies = [ - "base64", "rustls-pki-types", ] [[package]] name = "rustls-pki-types" -version = "1.7.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" +checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b" [[package]] name = "rustls-webpki" -version = "0.102.5" +version = "0.102.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a6fccd794a42c2c105b513a2f62bc3fd8f3ba57a4593677ceb0bd035164d78" +checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" dependencies = [ "ring", "rustls-pki-types", @@ -1373,23 +2443,32 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" +checksum = "0e819f2bc632f285be6d7cd36e25940d45b2391dd6d9b939e79de557f7014248" [[package]] name = "ryu" version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" + +[[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" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" +checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d" dependencies = [ - "windows-sys", + "windows-sys 0.59.0", ] [[package]] @@ -1400,9 +2479,9 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "security-framework" -version = "2.11.0" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0" +checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ "bitflags 2.6.0", "core-foundation", @@ -1413,14 +2492,20 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.11.0" +version = "2.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7" +checksum = "fa39c7303dc58b5543c94d22c1766b0d31f2ee58306363ea622b10bbc075eaa2" dependencies = [ "core-foundation-sys", "libc", ] +[[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.215" @@ -1438,16 +2523,17 @@ checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.90", ] [[package]] name = "serde_json" -version = "1.0.120" +version = "1.0.133" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" +checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377" dependencies = [ "itoa", + "memchr", "ryu", "serde", ] @@ -1462,6 +2548,15 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_spanned" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1" +dependencies = [ + "serde", +] + [[package]] name = "serde_urlencoded" version = "0.7.1" @@ -1485,6 +2580,21 @@ dependencies = [ "digest", ] +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + +[[package]] +name = "signal-hook-registry" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" +dependencies = [ + "libc", +] + [[package]] name = "siphasher" version = "0.3.11" @@ -1514,12 +2624,12 @@ checksum = "1b6b67fb9a61334225b5b790716f609cd58395f895b3fe8b328786812a40bc3b" [[package]] name = "socket2" -version = "0.5.7" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" +checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8" dependencies = [ "libc", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] @@ -1528,6 +2638,12 @@ version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + [[package]] name = "static_assertions" version = "1.1.0" @@ -1551,6 +2667,17 @@ version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" +[[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.90" @@ -1570,13 +2697,38 @@ checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" [[package]] name = "sync_wrapper" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" +checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263" dependencies = [ "futures-core", ] +[[package]] +name = "synstructure" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.90", +] + +[[package]] +name = "sysctl" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec7dddc5f0fee506baf8b9fdb989e242f17e4b11c61dfbb0635b705217199eea" +dependencies = [ + "bitflags 2.6.0", + "byteorder", + "enum-as-inner", + "libc", + "thiserror", + "walkdir", +] + [[package]] name = "system-configuration" version = "0.6.1" @@ -1600,14 +2752,15 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.10.1" +version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +checksum = "28cce251fcbc87fac86a866eeb0d6c2d536fc16d06f184bb61aeae11aa4cee0c" dependencies = [ "cfg-if", "fastrand", + "once_cell", "rustix", - "windows-sys", + "windows-sys 0.59.0", ] [[package]] @@ -1628,7 +2781,7 @@ dependencies = [ "cfg-if", "proc-macro2", "quote", - "syn", + "syn 2.0.90", ] [[package]] @@ -1639,7 +2792,7 @@ checksum = "5c89e72a01ed4c579669add59014b9a524d609c0c88c6a585ce37485879f6ffb" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.90", "test-case-core", ] @@ -1660,14 +2813,24 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.90", +] + +[[package]] +name = "tinystr" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" +dependencies = [ + "displaydoc", + "zerovec", ] [[package]] name = "tinyvec" -version = "1.6.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c55115c6fbe2d2bef26eb09ad74bde02d8255476fc0c7b515ef09fbb35742d82" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" dependencies = [ "tinyvec_macros", ] @@ -1680,9 +2843,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.41.1" +version = "1.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22cfb5bee7a6a52939ca9224d6ac897bb669134078daa8735560897f69de4d33" +checksum = "5cec9b21b0450273377fc97bd4c33a8acffc8c996c987a7c5b319a0083707551" dependencies = [ "backtrace", "bytes", @@ -1690,9 +2853,20 @@ dependencies = [ "mio", "parking_lot", "pin-project-lite", + "signal-hook-registry", "socket2", "tokio-macros", - "windows-sys", + "windows-sys 0.52.0", +] + +[[package]] +name = "tokio-io-timeout" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf" +dependencies = [ + "pin-project-lite", + "tokio", ] [[package]] @@ -1703,7 +2877,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.90", ] [[package]] @@ -1753,11 +2927,22 @@ dependencies = [ "tokio", ] +[[package]] +name = "tokio-stream" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1" +dependencies = [ + "futures-core", + "pin-project-lite", + "tokio", +] + [[package]] name = "tokio-util" -version = "0.7.11" +version = "0.7.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" +checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a" dependencies = [ "bytes", "futures-core", @@ -1766,6 +2951,85 @@ dependencies = [ "tokio", ] +[[package]] +name = "toml" +version = "0.8.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", +] + +[[package]] +name = "toml_datetime" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.22.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" +dependencies = [ + "indexmap 2.7.0", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + +[[package]] +name = "tonic" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5be9d60db39854b30b835107500cf0aca0b0d14d6e1c3de124217c23a29c2ddb" +dependencies = [ + "async-stream", + "async-trait", + "axum 0.5.17", + "base64 0.13.1", + "bytes", + "futures-core", + "futures-util", + "h2 0.3.26", + "http 0.2.12", + "http-body 0.4.6", + "hyper 0.14.31", + "hyper-timeout", + "percent-encoding", + "pin-project", + "prost", + "prost-derive", + "tokio", + "tokio-stream", + "tokio-util", + "tower 0.4.13", + "tower-layer", + "tower-service", + "tracing", + "tracing-futures", +] + +[[package]] +name = "tonic-build" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9263bf4c9bfaae7317c1c2faf7f18491d2fe476f70c414b73bf5d445b00ffa1" +dependencies = [ + "prettyplease", + "proc-macro2", + "prost-build", + "quote", + "syn 1.0.109", +] + [[package]] name = "tower" version = "0.4.13" @@ -1774,11 +3038,16 @@ checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" dependencies = [ "futures-core", "futures-util", + "indexmap 1.9.3", "pin-project", "pin-project-lite", + "rand", + "slab", "tokio", + "tokio-util", "tower-layer", "tower-service", + "tracing", ] [[package]] @@ -1797,6 +3066,25 @@ dependencies = [ "tracing", ] +[[package]] +name = "tower-http" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f873044bf02dd1e8239e9c1293ea39dad76dc594ec16185d0a1bf31d8dc8d858" +dependencies = [ + "bitflags 1.3.2", + "bytes", + "futures-core", + "futures-util", + "http 0.2.12", + "http-body 0.4.6", + "http-range-header", + "pin-project-lite", + "tower 0.4.13", + "tower-layer", + "tower-service", +] + [[package]] name = "tower-layer" version = "0.3.3" @@ -1811,9 +3099,9 @@ checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" -version = "0.1.40" +version = "0.1.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0" dependencies = [ "log", "pin-project-lite", @@ -1823,24 +3111,34 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.27" +version = "0.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.90", ] [[package]] name = "tracing-core" -version = "0.1.32" +version = "0.1.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c" dependencies = [ "once_cell", ] +[[package]] +name = "tracing-futures" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" +dependencies = [ + "pin-project", + "tracing", +] + [[package]] name = "try-lock" version = "0.2.5" @@ -1864,32 +3162,38 @@ version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" +[[package]] +name = "ucd-trie" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2896d95c02a80c6d6a5d6e953d479f5ddf2dfdb6a244441010e373ac0fb88971" + [[package]] name = "unicode-bidi" -version = "0.3.15" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" +checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893" [[package]] name = "unicode-ident" -version = "1.0.12" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unicode-normalization" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" +checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" dependencies = [ "tinyvec", ] [[package]] name = "unicode-properties" -version = "0.1.1" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4259d9d4425d9f0661581b804cb85fe66a4c631cadd8f490d1c13a35d5d9291" +checksum = "e70f2a8b45122e719eb623c01822704c4e0907e7e426a05927e1a1cfff5b75d0" [[package]] name = "untrusted" @@ -1899,15 +3203,27 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" -version = "2.5.2" +version = "2.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" +checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60" dependencies = [ "form_urlencoded", "idna", "percent-encoding", ] +[[package]] +name = "utf16_iter" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246" + +[[package]] +name = "utf8_iter" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" + [[package]] name = "vcpkg" version = "0.2.15" @@ -1916,9 +3232,19 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" [[package]] name = "version_check" -version = "0.9.4" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" + +[[package]] +name = "walkdir" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" +dependencies = [ + "same-file", + "winapi-util", +] [[package]] name = "want" @@ -1943,46 +3269,48 @@ checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b" [[package]] name = "wasm-bindgen" -version = "0.2.92" +version = "0.2.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +checksum = "d15e63b4482863c109d70a7b8706c1e364eb6ea449b201a76c5b89cedcec2d5c" dependencies = [ "cfg-if", + "once_cell", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.92" +version = "0.2.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +checksum = "8d36ef12e3aaca16ddd3f67922bc63e48e953f126de60bd33ccc0101ef9998cd" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn", + "syn 2.0.90", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.42" +version = "0.4.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" +checksum = "9dfaf8f50e5f293737ee323940c7d8b08a66a95a419223d9f41610ca08b0833d" dependencies = [ "cfg-if", "js-sys", + "once_cell", "wasm-bindgen", "web-sys", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.92" +version = "0.2.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +checksum = "705440e08b42d3e4b36de7d66c944be628d579796b8090bfa3471478a2260051" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -1990,44 +3318,65 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.92" +version = "0.2.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +checksum = "98c9ae5a76e46f4deecd0f0255cc223cfa18dc9b261213b8aa0c7b36f61b3f1d" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.90", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.92" +version = "0.2.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" +checksum = "6ee99da9c5ba11bd675621338ef6fa52296b76b83305e9b6e5c77d4c286d6d49" [[package]] name = "web-sys" -version = "0.3.69" +version = "0.3.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" +checksum = "a98bc3c33f0fe7e59ad7cd041b89034fa82a7c2d4365ca538dda6cdaf513863c" dependencies = [ "js-sys", "wasm-bindgen", ] +[[package]] +name = "which" +version = "4.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" +dependencies = [ + "either", + "home", + "once_cell", + "rustix", +] + [[package]] name = "whoami" -version = "1.5.1" +version = "1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44ab49fad634e88f55bf8f9bb3abd2f27d7204172a112c7c9987e01c1c94ea9" +checksum = "372d5b87f58ec45c384ba03563b03544dc5fadc3983e434b286913f5b4a9bb6d" dependencies = [ - "redox_syscall 0.4.1", + "redox_syscall", "wasite", "web-sys", ] +[[package]] +name = "winapi-util" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" +dependencies = [ + "windows-sys 0.59.0", +] + [[package]] name = "windows-core" version = "0.52.0" @@ -2076,6 +3425,15 @@ dependencies = [ "windows-targets", ] +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets", +] + [[package]] name = "windows-targets" version = "0.52.6" @@ -2140,8 +3498,117 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" +[[package]] +name = "winnow" +version = "0.6.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b" +dependencies = [ + "memchr", +] + +[[package]] +name = "write16" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" + +[[package]] +name = "writeable" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" + +[[package]] +name = "yoke" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40" +dependencies = [ + "serde", + "stable_deref_trait", + "yoke-derive", + "zerofrom", +] + +[[package]] +name = "yoke-derive" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.90", + "synstructure", +] + +[[package]] +name = "zerocopy" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +dependencies = [ + "byteorder", + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.90", +] + +[[package]] +name = "zerofrom" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e" +dependencies = [ + "zerofrom-derive", +] + +[[package]] +name = "zerofrom-derive" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.90", + "synstructure", +] + [[package]] name = "zeroize" version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" + +[[package]] +name = "zerovec" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079" +dependencies = [ + "yoke", + "zerofrom", + "zerovec-derive", +] + +[[package]] +name = "zerovec-derive" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.90", +] diff --git a/Cargo.toml b/Cargo.toml index 09659ea6..252b529e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,6 +4,7 @@ members = [ "api", "ingestion", "integration_tests", + "rove_connector", ] resolver = "2" @@ -11,6 +12,7 @@ resolver = "2" edition = "2021" [workspace.dependencies] +async-trait = "0.1.83" axum = "0.7.9" bb8 = "0.8.6" bb8-postgres = "0.8.1" @@ -24,8 +26,9 @@ quick-xml = { version = "0.35.0", features = [ "serialize", "overlapped-lists" ] rand = "0.8.5" rand_distr = "0.4.3" regex = "1.11.1" +rove = { git = "https://github.com/metno/rove.git" } serde = { version = "1.0.215", features = ["derive"] } +test-case = "3.3.1" thiserror = "1.0.69" tokio = { version = "1.41.1", features = ["rt-multi-thread", "macros"] } tokio-postgres = { version = "0.7.12", features = ["with-chrono-0_4"] } -test-case = "3.3.1" diff --git a/rove_connector/Cargo.toml b/rove_connector/Cargo.toml new file mode 100644 index 00000000..4031d1ce --- /dev/null +++ b/rove_connector/Cargo.toml @@ -0,0 +1,10 @@ +[package] +name = "rove_connector" +version = "0.1.0" +edition.workspace = true + +[dependencies] +async-trait.workspace = true +rove.workspace = true +thiserror.workspace = true + diff --git a/rove_connector/src/lib.rs b/rove_connector/src/lib.rs new file mode 100644 index 00000000..18adfbb7 --- /dev/null +++ b/rove_connector/src/lib.rs @@ -0,0 +1,27 @@ +use async_trait::async_trait; +use rove::{ + data_switch, + data_switch::{DataCache, DataConnector, SpaceSpec, TimeSpec}, +}; +use thiserror::Error; + +#[derive(Error, Debug)] +#[non_exhaustive] +pub enum Error {} + +#[derive(Debug)] +pub struct Connector; + +#[async_trait] +impl DataConnector for Connector { + async fn fetch_data( + &self, + _space_spec: &SpaceSpec, + _time_spec: &TimeSpec, + _num_leading_points: u8, + _num_trailing_points: u8, + _extra_spec: Option<&str>, + ) -> Result { + todo!(); + } +} From 511ad97ae6457bac427878bcac2facd76692e721 Mon Sep 17 00:00:00 2001 From: Ingrid Date: Tue, 3 Dec 2024 15:37:23 +0100 Subject: [PATCH 02/14] working impl of rove_connector for the single timeseries case --- .gitignore | 3 +- Cargo.lock | 5 ++ Cargo.toml | 1 + rove_connector/Cargo.toml | 5 ++ rove_connector/src/lib.rs | 102 ++++++++++++++++++++++++++++++++++---- 5 files changed, 104 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index c8b241f2..89a3216c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -target/* \ No newline at end of file +target/* +.DS_Store diff --git a/Cargo.lock b/Cargo.lock index 8fb59817..ea7682e4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2368,8 +2368,13 @@ name = "rove_connector" version = "0.1.0" dependencies = [ "async-trait", + "bb8", + "bb8-postgres", + "chrono", + "chronoutil", "rove", "thiserror", + "tokio-postgres", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 252b529e..2744d5df 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -18,6 +18,7 @@ bb8 = "0.8.6" bb8-postgres = "0.8.1" bytes = "1.9.0" chrono = { version = "0.4.31", features = ["serde"] } +chronoutil = "0.2.7" csv = "1.3.1" futures = "0.3.28" kafka = "0.10.0" diff --git a/rove_connector/Cargo.toml b/rove_connector/Cargo.toml index 4031d1ce..3ef0bd29 100644 --- a/rove_connector/Cargo.toml +++ b/rove_connector/Cargo.toml @@ -5,6 +5,11 @@ edition.workspace = true [dependencies] async-trait.workspace = true +bb8.workspace = true +bb8-postgres.workspace = true +chrono.workspace = true +chronoutil.workspace = true rove.workspace = true thiserror.workspace = true +tokio-postgres.workspace = true diff --git a/rove_connector/src/lib.rs b/rove_connector/src/lib.rs index 18adfbb7..4ab3e5ac 100644 --- a/rove_connector/src/lib.rs +++ b/rove_connector/src/lib.rs @@ -1,27 +1,107 @@ use async_trait::async_trait; -use rove::{ - data_switch, - data_switch::{DataCache, DataConnector, SpaceSpec, TimeSpec}, -}; +use bb8_postgres::PostgresConnectionManager; +use chrono::{TimeZone, Utc}; +use chronoutil::RelativeDuration; +use rove::data_switch::{self, DataCache, DataConnector, SpaceSpec, TimeSpec, Timeseries}; use thiserror::Error; +use tokio_postgres::NoTls; #[derive(Error, Debug)] #[non_exhaustive] -pub enum Error {} +pub enum Error { + #[error("the connector does not know how to handle this time resolution: {0:?}")] + UnhandledTimeResolution(RelativeDuration), +} + +type PgConnectionPool = bb8::Pool>; #[derive(Debug)] -pub struct Connector; +pub struct Connector { + pool: PgConnectionPool, +} #[async_trait] impl DataConnector for Connector { async fn fetch_data( &self, - _space_spec: &SpaceSpec, - _time_spec: &TimeSpec, - _num_leading_points: u8, - _num_trailing_points: u8, + space_spec: &SpaceSpec, + time_spec: &TimeSpec, + num_leading_points: u8, + num_trailing_points: u8, _extra_spec: Option<&str>, ) -> Result { - todo!(); + // TODO: matching intervals like this is a hack, but currently necessary to avoid + // SQL injection. Ideally we could pass an interval type as a query param, which would + // also save us the query_string allocation, but no ToSql implementations for intervals + // currently exist in tokio_postgres, so we need to implement it ourselves. + let interval = match time_spec.time_resolution { + x if x == RelativeDuration::minutes(1) => "1 minute", + x if x == RelativeDuration::hours(1) => "1 hour", + x if x == RelativeDuration::days(1) => "1 day", + _ => { + return Err(data_switch::Error::Other(Box::new( + Error::UnhandledTimeResolution(time_spec.time_resolution), + ))) + } + }; + + let ts_id = match space_spec { + SpaceSpec::One(ts_id) => ts_id, + // TODO: We should handle at least the All case, Polygon can be left unimplemented for + // now + _ => todo!(), + }; + + // TODO: should time_spec just use chrono timestamps instead of unix? + // IIRC the reason for unix timestamps was easy compatibility with protobuf, but that's + // less of a priority now + let start_time = Utc.timestamp_opt(time_spec.timerange.start.0, 0).unwrap() + - (time_spec.time_resolution * num_leading_points.into()); + // TODO: figure out whether the range in postgres is inclusive on the range here or + // we need to add 1 second + let end_time = Utc.timestamp_opt(time_spec.timerange.start.0, 0).unwrap() + + (time_spec.time_resolution * num_trailing_points.into()); + + let query_string = format!("SELECT data.obsvalue, ts_rule.timestamp \ + FROM (SELECT data.obsvalue, data.obstime FROM data WHERE data.timeseries = $1) as data + RIGHT JOIN generate_series($2::timestamptz, $3::timestamptz, interval '{}') AS ts_rule(timestamp) \ + ON data.obstime = ts_rule.timestamp", interval); + + let conn = self + .pool + .get() + .await + .map_err(|e| data_switch::Error::Other(Box::new(e)))?; + + let data_results = conn + .query(query_string.as_str(), &[&ts_id, &start_time, &end_time]) + .await + .map_err(|e| data_switch::Error::Other(Box::new(e)))?; + + let cache = { + let mut values = Vec::with_capacity(data_results.len()); + + for row in data_results { + values.push(row.get(0)); + } + + DataCache::new( + vec![Timeseries { + tag: ts_id.to_string(), + values, + }], + // TODO: we need to either query to get the lat, lon, elev, or change olympian to + // accept not having them + vec![], + vec![], + vec![], + time_spec.timerange.start, + time_spec.time_resolution, + num_leading_points, + num_trailing_points, + ) + }; + + Ok(cache) } } From 1e202d6712fca772a2ba03411b49c804e6b90c66 Mon Sep 17 00:00:00 2001 From: Ingrid Date: Mon, 2 Dec 2024 18:37:30 +0100 Subject: [PATCH 03/14] rove_connector: extract SpaceSpec::One specific logic into own function --- rove_connector/src/lib.rs | 104 ++++++++++++++++++++++++-------------- 1 file changed, 67 insertions(+), 37 deletions(-) diff --git a/rove_connector/src/lib.rs b/rove_connector/src/lib.rs index 4ab3e5ac..5ff3b83c 100644 --- a/rove_connector/src/lib.rs +++ b/rove_connector/src/lib.rs @@ -1,6 +1,6 @@ use async_trait::async_trait; use bb8_postgres::PostgresConnectionManager; -use chrono::{TimeZone, Utc}; +use chrono::{DateTime, TimeZone, Utc}; use chronoutil::RelativeDuration; use rove::data_switch::{self, DataCache, DataConnector, SpaceSpec, TimeSpec, Timeseries}; use thiserror::Error; @@ -20,47 +20,49 @@ pub struct Connector { pool: PgConnectionPool, } -#[async_trait] -impl DataConnector for Connector { - async fn fetch_data( +fn extract_time_spec( + time_spec: &TimeSpec, + num_leading_points: u8, + num_trailing_points: u8, +) -> Result<(DateTime, DateTime, &str), data_switch::Error> { + // TODO: matching intervals like this is a hack, but currently necessary to avoid + // SQL injection. Ideally we could pass an interval type as a query param, which would + // also save us the query_string allocation, but no ToSql implementations for intervals + // currently exist in tokio_postgres, so we need to implement it ourselves. + let interval = match time_spec.time_resolution { + x if x == RelativeDuration::minutes(1) => "1 minute", + x if x == RelativeDuration::hours(1) => "1 hour", + x if x == RelativeDuration::days(1) => "1 day", + _ => { + return Err(data_switch::Error::Other(Box::new( + Error::UnhandledTimeResolution(time_spec.time_resolution), + ))) + } + }; + + // TODO: should time_spec just use chrono timestamps instead of unix? + // IIRC the reason for unix timestamps was easy compatibility with protobuf, but that's + // less of a priority now + let start_time = Utc.timestamp_opt(time_spec.timerange.start.0, 0).unwrap() + - (time_spec.time_resolution * num_leading_points.into()); + // TODO: figure out whether the range in postgres is inclusive on the range here or + // we need to add 1 second + let end_time = Utc.timestamp_opt(time_spec.timerange.start.0, 0).unwrap() + + (time_spec.time_resolution * num_trailing_points.into()); + + Ok((start_time, end_time, interval)) +} + +impl Connector { + async fn fetch_one( &self, - space_spec: &SpaceSpec, + ts_id: i32, time_spec: &TimeSpec, num_leading_points: u8, num_trailing_points: u8, - _extra_spec: Option<&str>, ) -> Result { - // TODO: matching intervals like this is a hack, but currently necessary to avoid - // SQL injection. Ideally we could pass an interval type as a query param, which would - // also save us the query_string allocation, but no ToSql implementations for intervals - // currently exist in tokio_postgres, so we need to implement it ourselves. - let interval = match time_spec.time_resolution { - x if x == RelativeDuration::minutes(1) => "1 minute", - x if x == RelativeDuration::hours(1) => "1 hour", - x if x == RelativeDuration::days(1) => "1 day", - _ => { - return Err(data_switch::Error::Other(Box::new( - Error::UnhandledTimeResolution(time_spec.time_resolution), - ))) - } - }; - - let ts_id = match space_spec { - SpaceSpec::One(ts_id) => ts_id, - // TODO: We should handle at least the All case, Polygon can be left unimplemented for - // now - _ => todo!(), - }; - - // TODO: should time_spec just use chrono timestamps instead of unix? - // IIRC the reason for unix timestamps was easy compatibility with protobuf, but that's - // less of a priority now - let start_time = Utc.timestamp_opt(time_spec.timerange.start.0, 0).unwrap() - - (time_spec.time_resolution * num_leading_points.into()); - // TODO: figure out whether the range in postgres is inclusive on the range here or - // we need to add 1 second - let end_time = Utc.timestamp_opt(time_spec.timerange.start.0, 0).unwrap() - + (time_spec.time_resolution * num_trailing_points.into()); + let (start_time, end_time, interval) = + extract_time_spec(time_spec, num_leading_points, num_trailing_points)?; let query_string = format!("SELECT data.obsvalue, ts_rule.timestamp \ FROM (SELECT data.obsvalue, data.obstime FROM data WHERE data.timeseries = $1) as data @@ -105,3 +107,31 @@ impl DataConnector for Connector { Ok(cache) } } + +#[async_trait] +impl DataConnector for Connector { + async fn fetch_data( + &self, + space_spec: &SpaceSpec, + time_spec: &TimeSpec, + num_leading_points: u8, + num_trailing_points: u8, + _extra_spec: Option<&str>, + ) -> Result { + match space_spec { + SpaceSpec::One(ts_id) => { + self.fetch_one( + // TODO: deal with this unwrap + ts_id.parse().unwrap(), + time_spec, + num_leading_points, + num_trailing_points, + ) + .await + } + // TODO: We should handle at least the All case, Polygon can be left unimplemented for + // now + _ => todo!(), + } + } +} From ff195f805b10a69728c44933f6d71559d8acd36b Mon Sep 17 00:00:00 2001 From: Ingrid Date: Mon, 2 Dec 2024 21:18:09 +0100 Subject: [PATCH 04/14] rove_connector: return error for invalid ts_id --- rove_connector/src/lib.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/rove_connector/src/lib.rs b/rove_connector/src/lib.rs index 5ff3b83c..04307bb2 100644 --- a/rove_connector/src/lib.rs +++ b/rove_connector/src/lib.rs @@ -121,8 +121,9 @@ impl DataConnector for Connector { match space_spec { SpaceSpec::One(ts_id) => { self.fetch_one( - // TODO: deal with this unwrap - ts_id.parse().unwrap(), + ts_id + .parse() + .map_err(|_| data_switch::Error::InvalidSeriesId(ts_id.to_string()))?, time_spec, num_leading_points, num_trailing_points, From dddfc5a20a9b23548425b4c9bc327db7175da626 Mon Sep 17 00:00:00 2001 From: Ingrid Date: Mon, 2 Dec 2024 21:18:34 +0100 Subject: [PATCH 05/14] rove_connector: handle SpaceSpec::All case --- Cargo.lock | 1 + rove_connector/Cargo.toml | 1 + rove_connector/src/lib.rs | 193 +++++++++++++++++++++++++++++++++----- 3 files changed, 173 insertions(+), 22 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ea7682e4..cece7d38 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2372,6 +2372,7 @@ dependencies = [ "bb8-postgres", "chrono", "chronoutil", + "postgres-types", "rove", "thiserror", "tokio-postgres", diff --git a/rove_connector/Cargo.toml b/rove_connector/Cargo.toml index 3ef0bd29..e22187e9 100644 --- a/rove_connector/Cargo.toml +++ b/rove_connector/Cargo.toml @@ -9,6 +9,7 @@ bb8.workspace = true bb8-postgres.workspace = true chrono.workspace = true chronoutil.workspace = true +postgres-types.workspace = true rove.workspace = true thiserror.workspace = true tokio-postgres.workspace = true diff --git a/rove_connector/src/lib.rs b/rove_connector/src/lib.rs index 04307bb2..23f28377 100644 --- a/rove_connector/src/lib.rs +++ b/rove_connector/src/lib.rs @@ -4,7 +4,7 @@ use chrono::{DateTime, TimeZone, Utc}; use chronoutil::RelativeDuration; use rove::data_switch::{self, DataCache, DataConnector, SpaceSpec, TimeSpec, Timeseries}; use thiserror::Error; -use tokio_postgres::NoTls; +use tokio_postgres::{types::FromSql, NoTls}; #[derive(Error, Debug)] #[non_exhaustive] @@ -20,26 +20,27 @@ pub struct Connector { pool: PgConnectionPool, } +#[derive(Debug, FromSql)] +struct Obs { + value: f32, + time: DateTime, +} + +// TODO: this should probably live somewhere else +#[derive(Debug, FromSql)] +#[postgres(name = "location")] +pub struct Location { + lat: Option, + lon: Option, + hamsl: Option, + _hag: Option, +} + fn extract_time_spec( time_spec: &TimeSpec, num_leading_points: u8, num_trailing_points: u8, -) -> Result<(DateTime, DateTime, &str), data_switch::Error> { - // TODO: matching intervals like this is a hack, but currently necessary to avoid - // SQL injection. Ideally we could pass an interval type as a query param, which would - // also save us the query_string allocation, but no ToSql implementations for intervals - // currently exist in tokio_postgres, so we need to implement it ourselves. - let interval = match time_spec.time_resolution { - x if x == RelativeDuration::minutes(1) => "1 minute", - x if x == RelativeDuration::hours(1) => "1 hour", - x if x == RelativeDuration::days(1) => "1 day", - _ => { - return Err(data_switch::Error::Other(Box::new( - Error::UnhandledTimeResolution(time_spec.time_resolution), - ))) - } - }; - +) -> Result<(DateTime, DateTime), data_switch::Error> { // TODO: should time_spec just use chrono timestamps instead of unix? // IIRC the reason for unix timestamps was easy compatibility with protobuf, but that's // less of a priority now @@ -50,7 +51,41 @@ fn extract_time_spec( let end_time = Utc.timestamp_opt(time_spec.timerange.start.0, 0).unwrap() + (time_spec.time_resolution * num_trailing_points.into()); - Ok((start_time, end_time, interval)) + Ok((start_time, end_time)) +} + +// TODO: does the input type match postgres-types? +fn regularize( + obses: Vec, + start_time: DateTime, + end_time: DateTime, + time_resolution: RelativeDuration, + expected_len: usize, +) -> Vec> { + let mut out = Vec::with_capacity(expected_len); + let mut curr_obs_time = start_time; + + for obs in obses { + while curr_obs_time < obs.time { + out.push(None); + curr_obs_time = curr_obs_time + time_resolution; + } + if curr_obs_time == obs.time { + out.push(Some(obs.value)); + curr_obs_time = curr_obs_time + time_resolution; + } else { + // In this case the observation is misaligned, so we should skip it. There's a case + // to be made for returning an error, but I think we ought to be more robust. + continue; + } + } + + while curr_obs_time <= end_time { + out.push(None); + curr_obs_time = curr_obs_time + time_resolution; + } + + out } impl Connector { @@ -61,9 +96,29 @@ impl Connector { num_leading_points: u8, num_trailing_points: u8, ) -> Result { - let (start_time, end_time, interval) = + // TODO: matching intervals like this is a hack, but currently necessary to avoid + // SQL injection. Ideally we could pass an interval type as a query param, which would + // also save us the query_string allocation, but no ToSql implementations for intervals + // currently exist in tokio_postgres, so we need to implement it ourselves. + let interval = match time_spec.time_resolution { + x if x == RelativeDuration::minutes(1) => "1 minute", + x if x == RelativeDuration::hours(1) => "1 hour", + x if x == RelativeDuration::days(1) => "1 day", + _ => { + return Err(data_switch::Error::Other(Box::new( + Error::UnhandledTimeResolution(time_spec.time_resolution), + ))) + } + }; + + let (start_time, end_time) = extract_time_spec(time_spec, num_leading_points, num_trailing_points)?; + // TODO: should this contain an ORDER BY? + // TODO: should we drop ts_rule.timestamp from the SELECT? we don't seem to use it + // TODO: should we make this like the fetch_all query and regularize outside the query? + // I think this query might perform badly because the join against the generated series + // doesn't use the index optimally. Doing this would also save us the "interval" mess let query_string = format!("SELECT data.obsvalue, ts_rule.timestamp \ FROM (SELECT data.obsvalue, data.obstime FROM data WHERE data.timeseries = $1) as data RIGHT JOIN generate_series($2::timestamptz, $3::timestamptz, interval '{}') AS ts_rule(timestamp) \ @@ -106,6 +161,98 @@ impl Connector { Ok(cache) } + + async fn fetch_all( + &self, + time_spec: &TimeSpec, + num_leading_points: u8, + num_trailing_points: u8, + ) -> Result { + let (start_time, end_time) = + extract_time_spec(time_spec, num_leading_points, num_trailing_points)?; + + let conn = self + .pool + .get() + .await + .map_err(|e| data_switch::Error::Other(Box::new(e)))?; + + let data_results = conn + .query( + " + SELECT timeseries.id, data.values, timeseries.loc \ + FROM ( \ + SELECT timeseries, ARRAY_AGG ((value, timestamp) ORDER BY timestamp ASC) as values \ + FROM data \ + WHERE obstime BETWEEN $1 AND $2 \ + GROUP BY timeseries \ + ) as data \ + JOIN timeseries \ + ON data.timeseries = timeseries.id \ + ", + &[&start_time, &end_time], + ) + .await + .map_err(|e| data_switch::Error::Other(Box::new(e)))?; + + let cache = { + let mut data = Vec::with_capacity(data_results.len()); + let mut lats = Vec::with_capacity(data_results.len()); + let mut lons = Vec::with_capacity(data_results.len()); + let mut elevs = Vec::with_capacity(data_results.len()); + + let ts_length = { + let mut ts_length = 0; + let mut curr_time = start_time; + while curr_time <= end_time { + ts_length += 1; + curr_time = curr_time + time_spec.time_resolution; + } + ts_length + }; + + for row in data_results { + let ts_id: i32 = row.get(0); + let raw_values: Vec = row.get(1); + let loc: Location = row.get(2); + + // TODO: is there a better way to handle this? If we insert with default latlon we + // risk corrupting spatial checks, if not we miss QCing data we probably should be + // QCing... Perhaps we can change the definition of DataCache to accommodate this + // better? + if loc.lat.is_none() || loc.lon.is_none() || loc.hamsl.is_none() { + continue; + } + + data.push(Timeseries { + tag: ts_id.to_string(), + values: regularize( + raw_values, + start_time, + end_time, + time_spec.time_resolution, + ts_length, + ), + }); + lats.push(loc.lat.unwrap()); + lons.push(loc.lon.unwrap()); + elevs.push(loc.hamsl.unwrap()); + } + + DataCache::new( + data, + lats, + lons, + elevs, + time_spec.timerange.start, + time_spec.time_resolution, + num_leading_points, + num_trailing_points, + ) + }; + + Ok(cache) + } } #[async_trait] @@ -130,9 +277,11 @@ impl DataConnector for Connector { ) .await } - // TODO: We should handle at least the All case, Polygon can be left unimplemented for - // now - _ => todo!(), + SpaceSpec::Polygon(_) => unimplemented!(), + SpaceSpec::All => { + self.fetch_all(time_spec, num_leading_points, num_trailing_points) + .await + } } } } From b2a51f50e33b7a3c793a8fb4f08edd3e15662908 Mon Sep 17 00:00:00 2001 From: Ingrid Date: Wed, 4 Dec 2024 21:33:36 +0100 Subject: [PATCH 06/14] rove_connector: integration test SpaceSpec::Single case --- Cargo.lock | 3 ++ api/src/timeseries.rs | 2 +- integration_tests/Cargo.toml | 3 ++ integration_tests/tests/end_to_end.rs | 71 +++++++++++++++++++++++++++ rove_connector/src/lib.rs | 2 +- 5 files changed, 79 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index cece7d38..2e0478df 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1505,11 +1505,14 @@ dependencies = [ "bb8", "bb8-postgres", "chrono", + "chronoutil", "csv", "futures", "lard_api", "lard_ingestion", "reqwest", + "rove", + "rove_connector", "serde", "test-case", "tokio", diff --git a/api/src/timeseries.rs b/api/src/timeseries.rs index d491a3d9..acb74fda 100644 --- a/api/src/timeseries.rs +++ b/api/src/timeseries.rs @@ -25,7 +25,7 @@ pub struct TimeseriesIrregular { #[derive(Debug, Serialize, Deserialize)] pub struct TimeseriesRegular { pub data: Vec>, - header: TimeseriesInfo, + pub header: TimeseriesInfo, start_time: DateTime, time_resolution: String, } diff --git a/integration_tests/Cargo.toml b/integration_tests/Cargo.toml index 9f171439..d2d96ab4 100644 --- a/integration_tests/Cargo.toml +++ b/integration_tests/Cargo.toml @@ -10,10 +10,13 @@ debug = [] lard_api = { path = "../api" } lard_ingestion = { path = "../ingestion", features = ["integration_tests", "kafka"] } chrono.workspace = true +chronoutil.workspace = true tokio.workspace = true tokio-postgres.workspace = true bb8.workspace = true bb8-postgres.workspace = true +rove.workspace = true +rove_connector = { path = "../rove_connector" } serde.workspace = true test-case.workspace = true futures.workspace = true diff --git a/integration_tests/tests/end_to_end.rs b/integration_tests/tests/end_to_end.rs index 451fddbc..7c85ccd8 100644 --- a/integration_tests/tests/end_to_end.rs +++ b/integration_tests/tests/end_to_end.rs @@ -7,7 +7,9 @@ use std::{ use bb8_postgres::PostgresConnectionManager; use chrono::{DateTime, Duration, DurationRound, TimeDelta, TimeZone, Utc}; +use chronoutil::RelativeDuration; use futures::{Future, FutureExt}; +use rove::data_switch::{DataConnector, SpaceSpec, TimeSpec, Timestamp}; use test_case::test_case; use tokio::sync::mpsc; use tokio_postgres::NoTls; @@ -532,3 +534,72 @@ async fn test_kafka() { }) .await } + +#[test_case( + TestData { + station_id: 20001, + params: &[Param::new("TA"), Param::new("TGX")], + start_time: Utc::now().duration_trunc(TimeDelta::hours(1)).unwrap() + - Duration::hours(11), + period: Duration::hours(1), + type_id: 501, + len: 12, + }; "Scalar params") +] +#[tokio::test] +async fn test_rove_connector(ts: TestData<'_>) { + e2e_test_wrapper(async { + let client = reqwest::Client::new(); + + let manager = + PostgresConnectionManager::new_from_stringlike(CONNECT_STRING, NoTls).unwrap(); + let pool = bb8::Pool::builder().build(manager).await.unwrap(); + let connector = rove_connector::Connector { pool }; + + let ingestor_resp = ingest_data(&client, ts.obsinn_message()).await; + assert_eq!(ingestor_resp.res, 0); + + let resolution = "PT1H"; + for param in ts.params { + let url = format!( + "http://localhost:3000/stations/{}/params/{}?time_resolution={}", + ts.station_id, param.id, resolution + ); + let resp = reqwest::get(url).await.unwrap(); + + let json: TimeseriesResp = resp.json().await.unwrap(); + + let Timeseries::Regular(series) = &json.tseries[0] else { + panic!("Expected regular timeseries") + }; + + let ts_id = series.header.ts_id.to_string(); + + let data_cache = connector + .fetch_data( + &SpaceSpec::One(ts_id.clone()), + &TimeSpec::new( + Timestamp(ts.start_time.timestamp()), + Timestamp((ts.start_time + Duration::hours(2)).timestamp()), + RelativeDuration::hours(1), + ), + 1, + 1, + None, + ) + .await + .unwrap(); + + assert_eq!(data_cache.num_leading_points, 1); + assert_eq!(data_cache.num_leading_points, 1); + assert_eq!( + data_cache.data, + vec![rove::data_switch::Timeseries { + tag: ts_id, + values: vec![None, Some(0.), Some(0.), Some(0.), Some(0.)] + }], + ); + } + }) + .await +} diff --git a/rove_connector/src/lib.rs b/rove_connector/src/lib.rs index 23f28377..f8040a73 100644 --- a/rove_connector/src/lib.rs +++ b/rove_connector/src/lib.rs @@ -17,7 +17,7 @@ type PgConnectionPool = bb8::Pool>; #[derive(Debug)] pub struct Connector { - pool: PgConnectionPool, + pub pool: PgConnectionPool, } #[derive(Debug, FromSql)] From eb121235e5570b3d1872c6c11ce8dbba7b0d2c92 Mon Sep 17 00:00:00 2001 From: Ingrid Date: Wed, 4 Dec 2024 21:46:09 +0100 Subject: [PATCH 07/14] rove_connector: fix bug in end_time_calculation --- rove_connector/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rove_connector/src/lib.rs b/rove_connector/src/lib.rs index f8040a73..5deb07d6 100644 --- a/rove_connector/src/lib.rs +++ b/rove_connector/src/lib.rs @@ -48,7 +48,7 @@ fn extract_time_spec( - (time_spec.time_resolution * num_leading_points.into()); // TODO: figure out whether the range in postgres is inclusive on the range here or // we need to add 1 second - let end_time = Utc.timestamp_opt(time_spec.timerange.start.0, 0).unwrap() + let end_time = Utc.timestamp_opt(time_spec.timerange.end.0, 0).unwrap() + (time_spec.time_resolution * num_trailing_points.into()); Ok((start_time, end_time)) From abb658030936b1b80a393cb7ef7d4d352a050e4a Mon Sep 17 00:00:00 2001 From: Ingrid Date: Wed, 4 Dec 2024 22:09:19 +0100 Subject: [PATCH 08/14] rove_connector: use param_id in SpaceSpec::All case --- rove_connector/src/lib.rs | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/rove_connector/src/lib.rs b/rove_connector/src/lib.rs index 5deb07d6..e77dd4f2 100644 --- a/rove_connector/src/lib.rs +++ b/rove_connector/src/lib.rs @@ -11,6 +11,8 @@ use tokio_postgres::{types::FromSql, NoTls}; pub enum Error { #[error("the connector does not know how to handle this time resolution: {0:?}")] UnhandledTimeResolution(RelativeDuration), + #[error("could not parse param_id as i32")] + InvalidParamId, } type PgConnectionPool = bb8::Pool>; @@ -164,6 +166,7 @@ impl Connector { async fn fetch_all( &self, + param_id: i32, time_spec: &TimeSpec, num_leading_points: u8, num_trailing_points: u8, @@ -189,8 +192,11 @@ impl Connector { ) as data \ JOIN timeseries \ ON data.timeseries = timeseries.id \ + JOIN labels.met \ + ON met.timeseries = timeseries.id \ + WHERE met.param_id == $3 ", - &[&start_time, &end_time], + &[&start_time, &end_time, ¶m_id], ) .await .map_err(|e| data_switch::Error::Other(Box::new(e)))?; @@ -263,7 +269,7 @@ impl DataConnector for Connector { time_spec: &TimeSpec, num_leading_points: u8, num_trailing_points: u8, - _extra_spec: Option<&str>, + extra_spec: Option<&str>, ) -> Result { match space_spec { SpaceSpec::One(ts_id) => { @@ -279,7 +285,24 @@ impl DataConnector for Connector { } SpaceSpec::Polygon(_) => unimplemented!(), SpaceSpec::All => { - self.fetch_all(time_spec, num_leading_points, num_trailing_points) + // TODO: this should probably be in SpaceSpec not ExtraSpec + let param_id = match extra_spec { + Some(param_id_string) => param_id_string.parse().map_err(|_| { + data_switch::Error::InvalidExtraSpec { + data_source: "rove", + extra_spec: extra_spec.map(String::from), + source: Box::new(Error::InvalidParamId), + } + })?, + None => { + return Err(data_switch::Error::InvalidExtraSpec { + data_source: "rove", + extra_spec: extra_spec.map(String::from), + source: Box::new(Error::InvalidParamId), + }) + } + }; + self.fetch_all(param_id, time_spec, num_leading_points, num_trailing_points) .await } } From 9ae3d2d2b9b123ac41aab169c51adb983d885542 Mon Sep 17 00:00:00 2001 From: Ingrid Date: Thu, 5 Dec 2024 10:21:58 +0100 Subject: [PATCH 09/14] rove_connector: integration test SpaceSpec::All case --- integration_tests/tests/end_to_end.rs | 49 ++++++++++++++++++++++++--- 1 file changed, 44 insertions(+), 5 deletions(-) diff --git a/integration_tests/tests/end_to_end.rs b/integration_tests/tests/end_to_end.rs index 7c85ccd8..430366fa 100644 --- a/integration_tests/tests/end_to_end.rs +++ b/integration_tests/tests/end_to_end.rs @@ -573,9 +573,10 @@ async fn test_rove_connector(ts: TestData<'_>) { panic!("Expected regular timeseries") }; + // feels kinda silly we had to use the API just to get the ts_id, but what can you do? let ts_id = series.header.ts_id.to_string(); - let data_cache = connector + let data_cache_single = connector .fetch_data( &SpaceSpec::One(ts_id.clone()), &TimeSpec::new( @@ -590,15 +591,53 @@ async fn test_rove_connector(ts: TestData<'_>) { .await .unwrap(); - assert_eq!(data_cache.num_leading_points, 1); - assert_eq!(data_cache.num_leading_points, 1); assert_eq!( - data_cache.data, + data_cache_single.data, vec![rove::data_switch::Timeseries { - tag: ts_id, + tag: ts_id.clone(), values: vec![None, Some(0.), Some(0.), Some(0.), Some(0.)] }], ); + assert_eq!( + data_cache_single.start_time, + Timestamp(ts.start_time.timestamp()) + ); + assert_eq!(data_cache_single.period, RelativeDuration::hours(1)); + assert_eq!(data_cache_single.num_leading_points, 1); + assert_eq!(data_cache_single.num_trailing_points, 1); + + let data_cache_all = connector + .fetch_data( + &SpaceSpec::All, + &TimeSpec::new( + Timestamp(ts.start_time.timestamp()), + Timestamp((ts.start_time + Duration::hours(2)).timestamp()), + RelativeDuration::hours(1), + ), + 1, + 1, + // TODO: this should probably go in SpaceSpec::All? + Some(¶m.id.to_string()), + ) + .await + .unwrap(); + + assert_eq!( + data_cache_all.data, + // vec![rove::data_switch::Timeseries { + // tag: ts_id, + // values: vec![None, Some(0.), Some(0.), Some(0.), Some(0.)] + // }], + // TODO: replace below with above when we fix the location situation + vec![], + ); + assert_eq!( + data_cache_all.start_time, + Timestamp(ts.start_time.timestamp()) + ); + assert_eq!(data_cache_all.period, RelativeDuration::hours(1)); + assert_eq!(data_cache_all.num_leading_points, 1); + assert_eq!(data_cache_all.num_trailing_points, 1); } }) .await From ea92f7e066c90cad08159b6162951645dd8e929e Mon Sep 17 00:00:00 2001 From: Ingrid Date: Thu, 5 Dec 2024 10:22:32 +0100 Subject: [PATCH 10/14] rove_connector: fix SpaceSpec::All case to pass integration tests --- db/public.sql | 10 ++++++++++ rove_connector/src/lib.rs | 27 +++++++++++++++++++-------- 2 files changed, 29 insertions(+), 8 deletions(-) diff --git a/db/public.sql b/db/public.sql index 10ab7e6a..90db0864 100644 --- a/db/public.sql +++ b/db/public.sql @@ -10,6 +10,16 @@ BEGIN END IF; END $$; +DO $$ +BEGIN + IF (SELECT NOT EXISTS (select from pg_type where typname = 'obs')) THEN + CREATE TYPE obs AS ( + obstime TIMESTAMPTZ, + obsvalue REAL + ); +END IF; +END $$; + CREATE TABLE IF NOT EXISTS public.timeseries ( id SERIAL PRIMARY KEY, fromtime TIMESTAMPTZ NULL, diff --git a/rove_connector/src/lib.rs b/rove_connector/src/lib.rs index e77dd4f2..ba9370ef 100644 --- a/rove_connector/src/lib.rs +++ b/rove_connector/src/lib.rs @@ -23,9 +23,10 @@ pub struct Connector { } #[derive(Debug, FromSql)] +#[postgres(name = "obs")] struct Obs { - value: f32, - time: DateTime, + obstime: DateTime, + obsvalue: f32, } // TODO: this should probably live somewhere else @@ -35,6 +36,7 @@ pub struct Location { lat: Option, lon: Option, hamsl: Option, + #[postgres(name = "hag")] _hag: Option, } @@ -68,12 +70,12 @@ fn regularize( let mut curr_obs_time = start_time; for obs in obses { - while curr_obs_time < obs.time { + while curr_obs_time < obs.obstime { out.push(None); curr_obs_time = curr_obs_time + time_resolution; } - if curr_obs_time == obs.time { - out.push(Some(obs.value)); + if curr_obs_time == obs.obstime { + out.push(Some(obs.obsvalue)); curr_obs_time = curr_obs_time + time_resolution; } else { // In this case the observation is misaligned, so we should skip it. There's a case @@ -185,7 +187,7 @@ impl Connector { " SELECT timeseries.id, data.values, timeseries.loc \ FROM ( \ - SELECT timeseries, ARRAY_AGG ((value, timestamp) ORDER BY timestamp ASC) as values \ + SELECT timeseries, ARRAY_AGG ((obstime, obsvalue)::obs ORDER BY obstime ASC) as values \ FROM data \ WHERE obstime BETWEEN $1 AND $2 \ GROUP BY timeseries \ @@ -194,7 +196,7 @@ impl Connector { ON data.timeseries = timeseries.id \ JOIN labels.met \ ON met.timeseries = timeseries.id \ - WHERE met.param_id == $3 + WHERE met.param_id = $3 ", &[&start_time, &end_time, ¶m_id], ) @@ -220,12 +222,16 @@ impl Connector { for row in data_results { let ts_id: i32 = row.get(0); let raw_values: Vec = row.get(1); - let loc: Location = row.get(2); + let loc: Option = row.get(2); // TODO: is there a better way to handle this? If we insert with default latlon we // risk corrupting spatial checks, if not we miss QCing data we probably should be // QCing... Perhaps we can change the definition of DataCache to accommodate this // better? + if loc.is_none() { + continue; + } + let loc = loc.unwrap(); if loc.lat.is_none() || loc.lon.is_none() || loc.hamsl.is_none() { continue; } @@ -243,6 +249,11 @@ impl Connector { lats.push(loc.lat.unwrap()); lons.push(loc.lon.unwrap()); elevs.push(loc.hamsl.unwrap()); + // to get a sane result out of the integration test (for now) comment the loc + // Option checks, and uncomment these: + // lats.push(0.); + // lons.push(0.); + // elevs.push(0.); } DataCache::new( From 0d017ac9181d5ded80fa942c7d492b5df56f269c Mon Sep 17 00:00:00 2001 From: Ingrid Date: Thu, 5 Dec 2024 10:50:52 +0100 Subject: [PATCH 11/14] rove_connector: respond to ORDER BY TODO --- rove_connector/src/lib.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rove_connector/src/lib.rs b/rove_connector/src/lib.rs index ba9370ef..8ecf13dd 100644 --- a/rove_connector/src/lib.rs +++ b/rove_connector/src/lib.rs @@ -118,7 +118,8 @@ impl Connector { let (start_time, end_time) = extract_time_spec(time_spec, num_leading_points, num_trailing_points)?; - // TODO: should this contain an ORDER BY? + // TODO: should this contain an ORDER BY? Actually I think it's not necessary since the + // order is dictated by the generated sequence // TODO: should we drop ts_rule.timestamp from the SELECT? we don't seem to use it // TODO: should we make this like the fetch_all query and regularize outside the query? // I think this query might perform badly because the join against the generated series From d81b76b3e26e1436208ca43084720769fb0c76e8 Mon Sep 17 00:00:00 2001 From: Ingrid Date: Fri, 6 Dec 2024 10:31:30 +0100 Subject: [PATCH 12/14] remove unnecessary comment --- rove_connector/src/lib.rs | 2 -- 1 file changed, 2 deletions(-) diff --git a/rove_connector/src/lib.rs b/rove_connector/src/lib.rs index 8ecf13dd..e9099f29 100644 --- a/rove_connector/src/lib.rs +++ b/rove_connector/src/lib.rs @@ -50,8 +50,6 @@ fn extract_time_spec( // less of a priority now let start_time = Utc.timestamp_opt(time_spec.timerange.start.0, 0).unwrap() - (time_spec.time_resolution * num_leading_points.into()); - // TODO: figure out whether the range in postgres is inclusive on the range here or - // we need to add 1 second let end_time = Utc.timestamp_opt(time_spec.timerange.end.0, 0).unwrap() + (time_spec.time_resolution * num_trailing_points.into()); From 7262f49021f34012066a1b46c8e2325f63fdb278 Mon Sep 17 00:00:00 2001 From: Ingrid Date: Fri, 6 Dec 2024 10:52:18 +0100 Subject: [PATCH 13/14] rove_connector: fix incorrect data_source name in errors --- rove_connector/src/lib.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rove_connector/src/lib.rs b/rove_connector/src/lib.rs index e9099f29..4056dc1b 100644 --- a/rove_connector/src/lib.rs +++ b/rove_connector/src/lib.rs @@ -299,14 +299,14 @@ impl DataConnector for Connector { let param_id = match extra_spec { Some(param_id_string) => param_id_string.parse().map_err(|_| { data_switch::Error::InvalidExtraSpec { - data_source: "rove", + data_source: "lard", extra_spec: extra_spec.map(String::from), source: Box::new(Error::InvalidParamId), } })?, None => { return Err(data_switch::Error::InvalidExtraSpec { - data_source: "rove", + data_source: "lard", extra_spec: extra_spec.map(String::from), source: Box::new(Error::InvalidParamId), }) From f06a00e8cec94a40aa0f700ebc63898061792cb6 Mon Sep 17 00:00:00 2001 From: Ingrid Date: Fri, 6 Dec 2024 11:14:36 +0100 Subject: [PATCH 14/14] rove_connector: handle interval in fetch_one as a query param --- rove_connector/src/lib.rs | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/rove_connector/src/lib.rs b/rove_connector/src/lib.rs index 4056dc1b..fe3b6f9a 100644 --- a/rove_connector/src/lib.rs +++ b/rove_connector/src/lib.rs @@ -116,25 +116,30 @@ impl Connector { let (start_time, end_time) = extract_time_spec(time_spec, num_leading_points, num_trailing_points)?; - // TODO: should this contain an ORDER BY? Actually I think it's not necessary since the - // order is dictated by the generated sequence - // TODO: should we drop ts_rule.timestamp from the SELECT? we don't seem to use it - // TODO: should we make this like the fetch_all query and regularize outside the query? - // I think this query might perform badly because the join against the generated series - // doesn't use the index optimally. Doing this would also save us the "interval" mess - let query_string = format!("SELECT data.obsvalue, ts_rule.timestamp \ - FROM (SELECT data.obsvalue, data.obstime FROM data WHERE data.timeseries = $1) as data - RIGHT JOIN generate_series($2::timestamptz, $3::timestamptz, interval '{}') AS ts_rule(timestamp) \ - ON data.obstime = ts_rule.timestamp", interval); - let conn = self .pool .get() .await .map_err(|e| data_switch::Error::Other(Box::new(e)))?; + // TODO: should this contain an ORDER BY? Actually I think it's not necessary since the + // order is dictated by the generated sequence + // TODO: should we drop ts_rule.timestamp from the SELECT? we don't seem to use it + // TODO: should we make this like the fetch_all query and regularize outside the query? + // I think this query might perform badly because the join against the generated series + // doesn't use the index optimally. Doing this would also save us the "interval" mess let data_results = conn - .query(query_string.as_str(), &[&ts_id, &start_time, &end_time]) + .query( + " + SELECT data.obsvalue, ts_rule.timestamp \ + FROM ( \ + SELECT data.obsvalue, data.obstime \ + FROM data \ + WHERE data.timeseries = $1 \ + ) as data \ + RIGHT JOIN generate_series($2::timestamptz, $3::timestamptz, ($4::text)::interval) AS ts_rule(timestamp) \ + ON data.obstime = ts_rule.timestamp + ", &[&ts_id, &start_time, &end_time, &interval]) .await .map_err(|e| data_switch::Error::Other(Box::new(e)))?;