maplib 0.19.11__tar.gz → 0.19.14__tar.gz

{maplib-0.19.11 → maplib-0.19.14}/Cargo.lock

@@ -315,9 +315,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "bytes"
-version = "1.10.1"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a"
+checksum = "1e748733b7cbc798e1434b6ac524f0c1ff2ab456fe201501e6497c8417a4fc33"
 dependencies = [
  "serde",
 ]
@@ -380,7 +380,7 @@ dependencies = [
 ]
 
 [[package]]
-name = "cimxml"
+name = "cimxml_export"
 version = "0.1.0"
 dependencies = [
  "oxrdf",
@@ -390,6 +390,14 @@ dependencies = [
  "triplestore",
 ]
 
+[[package]]
+name = "cimxml_import"
+version = "0.1.0"
+dependencies = [
+ "oxrdf",
+ "representation",
+]
+
 [[package]]
 name = "comfy-table"
 version = "7.2.1"
@@ -738,24 +746,6 @@ dependencies = [
  "thiserror",
 ]
 
-[[package]]
-name = "fundu"
-version = "2.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ce12752fc64f35be3d53e0a57017cd30970f0cffd73f62c791837d8845badbd"
-dependencies = [
- "fundu-core",
-]
-
-[[package]]
-name = "fundu-core"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e463452e2d8b7600d38dcea1ed819773a57f0d710691bfc78db3961bd3f4c3ba"
-dependencies = [
- "chrono",
-]
-
 [[package]]
 name = "futures"
 version = "0.3.31"
@@ -827,12 +817,6 @@ version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
 
-[[package]]
-name = "futures-timer"
-version = "3.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24"
-
 [[package]]
 name = "futures-util"
 version = "0.3.31"
@@ -1407,7 +1391,7 @@ version = "0.6.0"
 dependencies = [
  "chrono",
  "chrono-tz",
- "cimxml",
+ "cimxml_export",
  "datalog",
  "oxiri",
  "oxrdf",
@@ -1417,14 +1401,11 @@ dependencies = [
  "query_processing",
  "rayon",
  "representation",
- "rstest",
- "serial_test",
  "shacl",
  "templates",
  "thiserror",
  "tracing",
  "triplestore",
- "uuid",
 ]
 
 [[package]]
@@ -1616,7 +1597,7 @@ dependencies = [
  "parking_lot",
  "percent-encoding",
  "quick-xml 0.38.3",
- "rand 0.9.2",
+ "rand",
  "reqwest",
  "ring",
  "serde",
@@ -1660,9 +1641,9 @@ checksum = "54b4ed3a7192fa19f5f48f99871f2755047fabefd7f222f12a1df1773796a102"
 
 [[package]]
 name = "oxjsonld"
-version = "0.1.0"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13a1a66dc569350f3f4e5eff8a8e1a72b0c9e6ad395bb5805493cb7a2fda185f"
+checksum = "b1a98ed4bc15e5b34e62de88c514cd91bcecd8003bc8f15e8036edccb2f3ed85"
 dependencies = [
  "json-event-parser",
  "oxiri",
@@ -1672,22 +1653,22 @@ dependencies = [
 
 [[package]]
 name = "oxrdf"
-version = "0.2.4"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a04761319ef84de1f59782f189d072cbfc3a9a40c4e8bded8667202fbd35b02a"
+checksum = "647ec1bce9b009b5ef00d678587ff263d53ac793cfa0652d0f1e85bc9f9699d3"
 dependencies = [
  "oxilangtag",
  "oxiri",
  "oxsdatatypes",
- "rand 0.8.5",
+ "rand",
  "thiserror",
 ]
 
 [[package]]
 name = "oxrdfio"
-version = "0.1.8"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14d33dd87769786a0bb7de342865e33bf0c6e9872fa76f1ede23e944fdc77898"
+checksum = "b7d7fe02334223d57b3ade38c06532e3d63a2d9e4995f8ff7d5a8cfe0cbb7720"
 dependencies = [
  "oxjsonld",
  "oxrdf",
@@ -1698,9 +1679,9 @@ dependencies = [
 
 [[package]]
 name = "oxrdfxml"
-version = "0.1.7"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8d4bf9c5331127f01efbd1245d90fd75b7c546a97cb3e95461121ce1ad5b1c8"
+checksum = "c6b0befe85eeba41a2dc4507742486d287a9fca366add4626778697189c5e648"
 dependencies = [
  "oxilangtag",
  "oxiri",
@@ -1720,9 +1701,9 @@ dependencies = [
 
 [[package]]
 name = "oxttl"
-version = "0.1.8"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d385f1776d7cace455ef6b7c54407838eff902ca897303d06eb12a26f4cf8a0"
+checksum = "ee1a35ad74d990aa6be2f3f62cd895fb4e91d64167cb81885ae304628f970f8d"
 dependencies = [
  "memchr",
  "oxilangtag",
@@ -1928,7 +1909,7 @@ dependencies = [
  "polars-arrow",
  "polars-error",
  "polars-utils",
- "rand 0.9.2",
+ "rand",
  "ryu",
  "serde",
  "strength_reduce",
@@ -1960,7 +1941,7 @@ dependencies = [
  "polars-row",
  "polars-schema",
  "polars-utils",
- "rand 0.9.2",
+ "rand",
  "rand_distr",
  "rayon",
  "regex",
@@ -2019,7 +2000,7 @@ dependencies = [
  "polars-row",
  "polars-time",
  "polars-utils",
- "rand 0.9.2",
+ "rand",
  "rayon",
  "recursive",
  "regex",
@@ -2162,7 +2143,7 @@ dependencies = [
  "polars-error",
  "polars-schema",
  "polars-utils",
- "rand 0.9.2",
+ "rand",
  "rayon",
  "regex",
  "regex-syntax",
@@ -2288,7 +2269,7 @@ dependencies = [
  "polars-plan",
  "polars-time",
  "polars-utils",
- "rand 0.9.2",
+ "rand",
  "regex",
  "serde",
  "sqlparser",
@@ -2326,7 +2307,7 @@ dependencies = [
  "polars-plan",
  "polars-time",
  "polars-utils",
- "rand 0.9.2",
+ "rand",
  "rayon",
  "recursive",
  "slotmap",
@@ -2376,7 +2357,7 @@ dependencies = [
  "memmap2",
  "num-traits",
  "polars-error",
- "rand 0.9.2",
+ "rand",
  "raw-cpuid",
  "rayon",
  "regex",
@@ -2423,15 +2404,6 @@ dependencies = [
  "zerocopy",
 ]
 
-[[package]]
-name = "proc-macro-crate"
-version = "3.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "219cb19e96be00ab2e37d6e299658a0cfa83e52429179969b0f0121b4ac46983"
-dependencies = [
- "toml_edit",
-]
-
 [[package]]
 name = "proc-macro2"
 version = "1.0.101"
@@ -2452,10 +2424,10 @@ dependencies = [
 
 [[package]]
 name = "py_maplib"
-version = "0.19.11"
+version = "0.19.14"
 dependencies = [
  "chrono",
- "cimxml",
+ "cimxml_export",
  "datalog",
  "maplib",
  "mimalloc",
@@ -2559,7 +2531,6 @@ dependencies = [
  "polars",
  "rayon",
  "representation",
- "rstest",
  "spargebra",
  "thiserror",
  "tracing",
@@ -2614,7 +2585,7 @@ dependencies = [
  "bytes",
  "getrandom 0.3.3",
  "lru-slab",
- "rand 0.9.2",
+ "rand",
  "ring",
  "rustc-hash",
  "rustls",
@@ -2655,35 +2626,14 @@ version = "5.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
 
-[[package]]
-name = "rand"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
-dependencies = [
- "libc",
- "rand_chacha 0.3.1",
- "rand_core 0.6.4",
-]
-
 [[package]]
 name = "rand"
 version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1"
 dependencies = [
- "rand_chacha 0.9.0",
- "rand_core 0.9.3",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
-dependencies = [
- "ppv-lite86",
- "rand_core 0.6.4",
+ "rand_chacha",
+ "rand_core",
 ]
 
 [[package]]
@@ -2693,16 +2643,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb"
 dependencies = [
  "ppv-lite86",
- "rand_core 0.9.3",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
-dependencies = [
- "getrandom 0.2.16",
+ "rand_core",
 ]
 
 [[package]]
@@ -2721,7 +2662,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a8615d50dcf34fa31f7ab52692afec947c4dd0ab803cc87cb3b0b4570ff7463"
 dependencies = [
  "num-traits",
- "rand 0.9.2",
+ "rand",
 ]
 
 [[package]]
@@ -2837,12 +2778,6 @@ version = "0.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c3160422bbd54dd5ecfdca71e5fd59b7b8fe2b1697ab2baf64f6d05dcc66d298"
 
-[[package]]
-name = "relative-path"
-version = "1.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba39f3699c378cd8970968dcbff9c43159ea4cfbd88d43c00b22f2ef10a435d2"
-
 [[package]]
 name = "report_mapping"
 version = "0.1.0"
@@ -2949,36 +2884,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "rstest"
-version = "0.25.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fc39292f8613e913f7df8fa892b8944ceb47c247b78e1b1ae2f09e019be789d"
-dependencies = [
- "futures-timer",
- "futures-util",
- "rstest_macros",
- "rustc_version",
-]
-
-[[package]]
-name = "rstest_macros"
-version = "0.25.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f168d99749d307be9de54d23fd226628d99768225ef08f6ffb52e0182a27746"
-dependencies = [
- "cfg-if",
- "glob",
- "proc-macro-crate",
- "proc-macro2",
- "quote",
- "regex",
- "relative-path",
- "rustc_version",
- "syn",
- "unicode-ident",
-]
-
 [[package]]
 name = "rustc-demangle"
 version = "0.1.26"
@@ -2991,15 +2896,6 @@ version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
 
-[[package]]
-name = "rustc_version"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92"
-dependencies = [
- "semver",
-]
-
 [[package]]
 name = "rustix"
 version = "1.1.2"
@@ -3081,15 +2977,6 @@ dependencies = [
  "winapi-util",
 ]
 
-[[package]]
-name = "scc"
-version = "2.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46e6f046b7fef48e2660c57ed794263155d713de679057f2d0c169bfc6e756cc"
-dependencies = [
- "sdd",
-]
-
 [[package]]
 name = "schannel"
 version = "0.1.28"
@@ -3105,12 +2992,6 @@ version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
-[[package]]
-name = "sdd"
-version = "3.0.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "490dcfcbfef26be6800d11870ff2df8774fa6e86d047e3e8c8a76b25655e41ca"
-
 [[package]]
 name = "security-framework"
 version = "3.5.1"
@@ -3134,12 +3015,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "semver"
-version = "1.0.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d767eb0aabc880b29956c35734170f26ed551a859dbd361d140cdbeca61ab1e2"
-
 [[package]]
 name = "serde"
 version = "1.0.228"
@@ -3206,31 +3081,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "serial_test"
-version = "3.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b258109f244e1d6891bf1053a55d63a5cd4f8f4c30cf9a1280989f80e7a1fa9"
-dependencies = [
- "futures",
- "log",
- "once_cell",
- "parking_lot",
- "scc",
- "serial_test_derive",
-]
-
-[[package]]
-name = "serial_test_derive"
-version = "3.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d69265a08751de7844521fd15003ae0a888e035773ba05695c5c759a6f89eef"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "sha2"
 version = "0.10.9"
@@ -3361,9 +3211,9 @@ dependencies = [
 
 [[package]]
 name = "sparesults"
-version = "0.2.5"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f478f5ead16b6136bccee7a52ea43a615f8512086708f515e26ce33e0b184036"
+checksum = "c093f91918540c91b4dd447bf1179ff66b4bd5c5816138a00057e0d156969dd0"
 dependencies = [
  "json-event-parser",
  "memchr",
@@ -3374,15 +3224,13 @@ dependencies = [
 
 [[package]]
 name = "spargebra"
-version = "0.3.0-alpha.5-parparse"
+version = "0.4.4"
 dependencies = [
- "chrono",
- "fundu",
  "oxilangtag",
  "oxiri",
  "oxrdf",
  "peg",
- "rand 0.9.2",
+ "rand",
  "thiserror",
 ]
 
@@ -3653,36 +3501,6 @@ dependencies = [
  "tokio",
 ]
 
-[[package]]
-name = "toml_datetime"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2cdb639ebbc97961c51720f858597f7f24c4fc295327923af55b74c3c724533"
-dependencies = [
- "serde_core",
-]
-
-[[package]]
-name = "toml_edit"
-version = "0.23.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6485ef6d0d9b5d0ec17244ff7eb05310113c3f316f2d14200d4de56b3cb98f8d"
-dependencies = [
- "indexmap",
- "toml_datetime",
- "toml_parser",
- "winnow",
-]
-
-[[package]]
-name = "toml_parser"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0cbe268d35bdb4bb5a56a2de88d0ad0eb70af5384a99d648cd4b3d04039800e"
-dependencies = [
- "winnow",
-]
-
 [[package]]
 name = "tower"
 version = "0.5.2"
@@ -3795,10 +3613,12 @@ name = "triplestore"
 version = "0.5.0"
 dependencies = [
  "aho-corasick",
+ "cimxml_import",
  "file_io",
  "fts",
  "itoa",
  "memmap2",
+ "oxjsonld",
  "oxrdf",
  "oxrdfio",
  "oxttl",
@@ -3922,7 +3742,7 @@ checksum = "2f87b8aa10b915a06587d0dec516c282ff295b475d94abf425d62b57710070a2"
 dependencies = [
  "getrandom 0.3.3",
  "js-sys",
- "rand 0.9.2",
+ "rand",
  "serde",
  "wasm-bindgen",
 ]
@@ -4360,15 +4180,6 @@ version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650"
 
-[[package]]
-name = "winnow"
-version = "0.7.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21a0236b59786fed61e2a80582dd500fe61f18b5dca67a4a067d0bc9039339cf"
-dependencies = [
- "memchr",
-]
-
 [[package]]
 name = "wit-bindgen"
 version = "0.46.0"

{maplib-0.19.11 → maplib-0.19.14}/Cargo.toml

@@ -4,6 +4,7 @@ members = ["py_maplib"]
 
 [workspace.package]
 rust-version = "1.88.0"
+edition = "2021"
 
 [workspace.dependencies]
 pyo3 = {version = "0.25", features = ["py-clone"] }
@@ -12,11 +13,12 @@ polars = { version = "0.52.0", features = ["simd", "nightly", "new_streaming", "
 polars-core = { version = "0.52.0" }
 rayon = "1.10.0"
 regex = "1.11.1"
-oxrdf = { version = "0.2.4" }
-oxrdfio = { version = "0.1.7" }
-oxttl = { version="0.1.7" }
+oxrdf = { version = "0.3.2" }
+oxrdfio = { version = "0.2.2" }
+oxttl = { version= "0.2.2" }
+oxjsonld = {version = "0.2.2"}
 oxiri = "0.2.11"
-sparesults = "0.2.4"
+sparesults = "0.3.2"
 oxsdatatypes = "0.2.2"
 chrono = "0.4.41"
 chrono-tz = "0.10.3"
@@ -43,8 +45,6 @@ tracing-log = "0.2"
 itoa = "1.0.15"
 ryu = "1.0.20"
 #dev-dependencies
-rstest = "0.25.0"
-serial_test = "3.2.0"
 nohash-hasher = "0.2.0"
 
 [patch.crates-io]

{maplib-0.19.11 → maplib-0.19.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: maplib
-Version: 0.19.11
+Version: 0.19.14
 Classifier: Development Status :: 4 - Beta
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Programming Language :: Python :: 3 :: Only

{maplib-0.19.11/lib/cimxml → maplib-0.19.14/lib/cimxml_export}/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "cimxml"
+name = "cimxml_export"
 version = "0.1.0"
 edition = "2021"
 rust-version.workspace = true

maplib-0.19.14/lib/cimxml_import/Cargo.toml

@@ -0,0 +1,10 @@
+[package]
+name = "cimxml_import"
+version = "0.1.0"
+edition = "2024"
+rust-version.workspace = true
+
+[dependencies]
+representation = {path = "../representation"}
+
+oxrdf.workspace = true

maplib-0.19.14/lib/cimxml_import/src/lib.rs

@@ -0,0 +1,10 @@
+
+use oxrdf::{GraphName, Subject, Term};
+use std::collections::HashMap;
+type MapType = HashMap<String, HashMap<String, (Vec<Subject>, Vec<Term>)>>;
+
+pub fn remap_predicate_datatype(
+    _predicate_map: HashMap<GraphName, HashMap<String, MapType>>,
+) -> HashMap<GraphName, HashMap<String, MapType>> {
+    unimplemented!("Contact Data Treehouse to try!")
+}

{maplib-0.19.11 → maplib-0.19.14}/lib/file_io/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "file_io"
 version = "0.5.0"
-edition = "2021"
+edition.workspace = true
 rust-version.workspace = true
 
 [dependencies]

{maplib-0.19.11 → maplib-0.19.14}/lib/maplib/Cargo.toml

@@ -1,11 +1,11 @@
 [package]
 name = "maplib"
 version = "0.6.0"
-edition = "2021"
+edition.workspace = true
 rust-version.workspace = true
 
 [features]
-pyo3 = [ "dep:pyo3", "triplestore/pyo3", "shacl/pyo3", "datalog/pyo3", "cimxml/pyo3" ]
+pyo3 = [ "dep:pyo3", "triplestore/pyo3", "shacl/pyo3", "datalog/pyo3", "cimxml_export/pyo3" ]
 
 [dependencies]
 templates = {path = "../templates"}
@@ -13,7 +13,7 @@ triplestore = { path = "../triplestore" }
 shacl = { path = "../shacl" }
 representation = { path = "../representation" }
 datalog = {path = "../datalog"}
-cimxml = {path = "../cimxml"}
+cimxml_export = {path = "../cimxml_export"}
 query_processing = {path ="../query_processing"}
 
 rayon = { workspace = true }
@@ -25,14 +25,9 @@ polars = { workspace = true,  features = [
 ] }
 chrono = { workspace = true }
 chrono-tz = { workspace = true }
-uuid = { workspace = true }
 thiserror = { workspace = true }
 oxrdfio = { workspace = true }
 tracing = { workspace = true }
 
 pyo3 = { workspace = true, optional = true }
 
-
-[dev-dependencies]
-rstest.workspace=true
-serial_test.workspace = true