diff --git a/Cargo.lock b/Cargo.lock index 6741fed..fdf7731 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3,10 +3,10 @@ version = 3 [[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 = "ahash" @@ -39,27 +39,21 @@ dependencies = [ [[package]] name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "bitflags" -version = "1.3.2" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "bitflags" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" [[package]] name = "bumpalo" -version = "3.13.0" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "byteorder" @@ -69,15 +63,18 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.6.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" +checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" [[package]] name = "cc" -version = "1.0.79" +version = "1.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "72db2f7947ecee9b03b510377e8bb9077afa27176fdbff55c51027e976fdcc48" +dependencies = [ + "shlex", +] [[package]] name = "cfg-if" @@ -102,7 +99,7 @@ dependencies = [ "js-sys", "num-traits", "wasm-bindgen", - "windows-targets 0.52.0", + "windows-targets", ] [[package]] @@ -137,15 +134,15 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.4" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "crc32fast" -version = "1.4.0" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" dependencies = [ "cfg-if 1.0.0", ] @@ -200,9 +197,9 @@ dependencies = [ [[package]] name = "dyn-clone" -version = "1.0.11" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68b0cf012f1230e43cd00ebb729c6bb58707ecfa8ad08b52ef3a4ccd2697fc30" +checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125" [[package]] name = "encode_unicode" @@ -212,9 +209,9 @@ checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0" [[package]] name = "field_access" -version = "0.1.4" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8964d92be54024fcd6a5ad8c204e85499249acc126a86ea5cabe7686c01af595" +checksum = "7e623ab785a56a622537034c7109d47898c41cb9219803155759dcca1f19655c" dependencies = [ "field_access_derive", "paste", @@ -222,9 +219,9 @@ dependencies = [ [[package]] name = "field_access_derive" -version = "0.1.4" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e474d58478b562f802cf6097e46965bbadbbf4b134d3299aa7c45b91d5e40756" +checksum = "917d5dcdd27ef8b8bd66913702385e92fa2a2a9fd6f7b94ffa03e884d847a8d9" dependencies = [ "proc-macro2", "quote", @@ -233,9 +230,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.30" +version = "1.0.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" +checksum = "9c0596c1eac1f9e04ed902702e9878208b336edc9d6fddc8a48387349bab3666" dependencies = [ "crc32fast", "miniz_oxide", @@ -243,9 +240,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -292,22 +289,22 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" -version = "0.3.9" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" +checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" [[package]] name = "iana-time-zone" -version = "0.1.57" +version = "0.1.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows", + "windows-core", ] [[package]] @@ -333,9 +330,9 @@ checksum = "8bb03732005da905c88227371639bf1ad885cc712789c011c31c5fb3ab3ccf02" [[package]] name = "is-terminal" -version = "0.4.12" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" +checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b" dependencies = [ "hermit-abi", "libc", @@ -344,24 +341,24 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.8" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b02a5381cc465bd3041d84623d0fa3b66738b52b8e2fc3bab8ad63ab032f4a" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "js-sys" -version = "0.3.64" +version = "0.3.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" +checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" dependencies = [ "wasm-bindgen", ] [[package]] name = "lazy_static" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "lcax" @@ -439,9 +436,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.153" +version = "0.2.158" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" [[package]] name = "libm" @@ -455,15 +452,15 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.5.0", + "bitflags", "libc", ] [[package]] name = "lock_api" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ "autocfg", "scopeguard", @@ -471,21 +468,21 @@ dependencies = [ [[package]] name = "log" -version = "0.4.19" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "memchr" -version = "2.7.2" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memoffset" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" dependencies = [ "autocfg", ] @@ -498,18 +495,18 @@ checksum = "8452105ba047068f40ff7093dd1d9da90898e63dd61736462e9cdda6a90ad3c3" [[package]] name = "miniz_oxide" -version = "0.7.2" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" dependencies = [ - "adler", + "adler2", ] [[package]] name = "num" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3135b08af27d103b0a51f2ae0f8632117b7b185ccf931445affa8df530576a41" +checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23" dependencies = [ "num-complex", "num-integer", @@ -520,20 +517,19 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.4" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" dependencies = [ - "autocfg", "num-integer", "num-traits", ] [[package]] name = "num-complex" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23c6602fda94a57c990fe0df199a035d83576b496aa29f4e634a8ac6004e68a6" +checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495" dependencies = [ "num-traits", ] @@ -549,9 +545,9 @@ dependencies = [ [[package]] name = "num-iter" -version = "0.1.44" +version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d869c01cc0c455284163fd0092f1f93835385ccab5a98a0dcc497b2f8bf055a9" +checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" dependencies = [ "autocfg", "num-integer", @@ -560,20 +556,19 @@ dependencies = [ [[package]] name = "num-rational" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" +checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824" dependencies = [ - "autocfg", "num-integer", "num-traits", ] [[package]] name = "num-traits" -version = "0.2.18" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", "libm", @@ -581,9 +576,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "ordered-float" @@ -596,9 +591,9 @@ dependencies = [ [[package]] name = "parking_lot" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", "parking_lot_core", @@ -606,15 +601,15 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.9" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if 1.0.0", "libc", "redox_syscall", "smallvec", - "windows-targets 0.48.1", + "windows-targets", ] [[package]] @@ -640,9 +635,9 @@ dependencies = [ [[package]] name = "paste" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "phf" @@ -707,9 +702,9 @@ dependencies = [ [[package]] name = "portable-atomic" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" +checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265" [[package]] name = "prettytable-rs" @@ -733,9 +728,9 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[package]] name = "proc-macro2" -version = "1.0.78" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] @@ -805,9 +800,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.35" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] @@ -829,18 +824,18 @@ checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" [[package]] name = "redox_syscall" -version = "0.4.1" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" dependencies = [ - "bitflags 1.3.2", + "bitflags", ] [[package]] name = "redox_users" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" +checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ "getrandom", "libredox", @@ -849,9 +844,9 @@ dependencies = [ [[package]] name = "rust_iso3166" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e676677b94480848a8d88c74553bad50aed2ee77d8c0985aa50d8c4e26f3054b" +checksum = "dd3126eab517ef8ca4761a366cb0d55e1bf5ab9c7b7f18301d712a57de000a90" dependencies = [ "js-sys", "phf", @@ -861,21 +856,21 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.15" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80af6f9131f277a45a3fba6ce8e2258037bb0477a67e610d3c1fe046ab31de47" +checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" [[package]] name = "ryu" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "schemars" -version = "0.8.19" +version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc6e7ed6919cb46507fb01ff1654309219f62b4d603822501b0b80d42f6f21ef" +checksum = "09c024468a378b7e36765cd36702b7a90cc3cba11654f6685c8f233408e89e92" dependencies = [ "chrono", "dyn-clone", @@ -886,13 +881,13 @@ dependencies = [ [[package]] name = "schemars_derive" -version = "0.8.19" +version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "185f2b7aa7e02d418e453790dde16890256bbd2bcd04b7dc5348811052b53f49" +checksum = "b1eee588578aff73f856ab961cd2f79e36bc45d7ded33a7562adba4667aecc0e" dependencies = [ "proc-macro2", "quote", - "serde_derive_internals 0.29.0", + "serde_derive_internals 0.29.1", "syn", ] @@ -910,9 +905,9 @@ checksum = "a3f0bf26fd526d2a95683cd0f87bf103b8539e2ca1ef48ce002d67aad59aa0b4" [[package]] name = "serde" -version = "1.0.200" +version = "1.0.208" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddc6f9cc94d67c0e21aaf7eda3a010fd3af78ebf6e096aa6e2e13c79749cce4f" +checksum = "cff085d2cb684faa248efb494c39b68e522822ac0de72ccf08109abde717cfb2" dependencies = [ "serde_derive", ] @@ -930,9 +925,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.200" +version = "1.0.208" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "856f046b9400cee3c8c94ed572ecdb752444c24528c035cd35882aad6f492bcb" +checksum = "24008e81ff7613ed8e5ba0cfaf24e2c2f1e5b8a0495711e44fcd4882fca62bcf" dependencies = [ "proc-macro2", "quote", @@ -952,9 +947,9 @@ dependencies = [ [[package]] name = "serde_derive_internals" -version = "0.29.0" +version = "0.29.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "330f01ce65a3a5fe59a60c82f3c9a024b573b8a6e875bd233fe5f934e71d54e3" +checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" dependencies = [ "proc-macro2", "quote", @@ -963,20 +958,27 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.116" +version = "1.0.125" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813" +checksum = "83c8e735a073ccf5be70aa8066aa984eaf2fa000db6c8d0100ae605b366d31ed" dependencies = [ "itoa", + "memchr", "ryu", "serde", ] [[package]] name = "sha1_smol" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012" +checksum = "bbfa15b3dddfee50a0fff136974b3e1bde555604ba463834a7eb7deb6417705d" + +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" [[package]] name = "siphasher" @@ -1004,9 +1006,9 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "syn" -version = "2.0.48" +version = "2.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" +checksum = "f6af063034fc1935ede7be0122941bafa9bacb949334d090b77ca98b5817c7d9" dependencies = [ "proc-macro2", "quote", @@ -1015,9 +1017,9 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.14" +version = "0.12.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" +checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] name = "term" @@ -1032,18 +1034,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.59" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0126ad08bff79f29fc3ae6a55cc72352056dfff61e3ff8bb7129476d44b23aa" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.59" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1cd413b5d558b4c5bf3680e324a6fa5014e7b7c067a51e69dbdf47eb7148b66" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", @@ -1107,15 +1109,15 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.10" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22049a19f4a68748a168c0fc439f9516686aa045927ff767eca0a85101fb6e73" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-width" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68f5e5f3158ecfd4b8ff6fe086db7c8467a2dfdac97fe420f2b7c4aa97af66d6" +checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" [[package]] name = "unindent" @@ -1125,9 +1127,9 @@ checksum = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce" [[package]] name = "uuid" -version = "1.8.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" +checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" dependencies = [ "getrandom", "sha1_smol", @@ -1135,9 +1137,9 @@ dependencies = [ [[package]] name = "version_check" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "wasi" @@ -1147,19 +1149,20 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" dependencies = [ "cfg-if 1.0.0", + "once_cell", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" dependencies = [ "bumpalo", "log", @@ -1172,9 +1175,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -1182,9 +1185,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" dependencies = [ "proc-macro2", "quote", @@ -1195,15 +1198,15 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" +checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" [[package]] name = "web-sys" -version = "0.3.64" +version = "0.3.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" +checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" dependencies = [ "js-sys", "wasm-bindgen", @@ -1244,12 +1247,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] -name = "windows" -version = "0.48.0" +name = "windows-core" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.48.1", + "windows-targets", ] [[package]] @@ -1258,137 +1261,87 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.0", + "windows-targets", ] [[package]] name = "windows-targets" -version = "0.48.1" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.48.0", - "windows_aarch64_msvc 0.48.0", - "windows_i686_gnu 0.48.0", - "windows_i686_msvc 0.48.0", - "windows_x86_64_gnu 0.48.0", - "windows_x86_64_gnullvm 0.48.0", - "windows_x86_64_msvc 0.48.0", -] - -[[package]] -name = "windows-targets" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" -dependencies = [ - "windows_aarch64_gnullvm 0.52.0", - "windows_aarch64_msvc 0.52.0", - "windows_i686_gnu 0.52.0", - "windows_i686_msvc 0.52.0", - "windows_x86_64_gnu 0.52.0", - "windows_x86_64_gnullvm 0.52.0", - "windows_x86_64_msvc 0.52.0", + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_gnullvm", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", ] [[package]] name = "windows_aarch64_gnullvm" -version = "0.48.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" - -[[package]] -name = "windows_i686_gnu" -version = "0.48.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" [[package]] -name = "windows_i686_msvc" -version = "0.48.0" +name = "windows_i686_gnullvm" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "zerocopy" -version = "0.7.32" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.32" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", diff --git a/lcax.schema.json b/lcax.schema.json index 46da91f..96a4f2a 100644 --- a/lcax.schema.json +++ b/lcax.schema.json @@ -183,7 +183,6 @@ "industrial", "infrastructure", "agricultural", - "mixeduse", "other" ] }, @@ -765,7 +764,10 @@ "$ref": "#/definitions/BuildingType" }, "buildingTypology": { - "$ref": "#/definitions/BuildingTypology" + "type": "array", + "items": { + "$ref": "#/definitions/BuildingTypology" + } }, "buildingUsers": { "type": [ diff --git a/packages/python/src/lcax/pydantic.py b/packages/python/src/lcax/pydantic.py index 4b6f5ee..1f667a4 100644 --- a/packages/python/src/lcax/pydantic.py +++ b/packages/python/src/lcax/pydantic.py @@ -11,40 +11,40 @@ class BuildingModelScope(Enum): - FACILITATING_WORKS = 'facilitating_works' - SUBSTRUCTURE = 'substructure' - SUPERSTRUCTURE_FRAME = 'superstructure_frame' - SUPERSTRUCTURE_ENVELOPE = 'superstructure_envelope' - SUPERSTRUCTURE_INTERNAL_ELEMENTS = 'superstructure_internal_elements' - FINISHES = 'finishes' - BUILDING_SERVICES = 'building_services' - EXTERNAL_WORKS = 'external_works' - FF_E = 'ff_e' + facilitating_works = 'facilitating_works' + substructure = 'substructure' + superstructure_frame = 'superstructure_frame' + superstructure_envelope = 'superstructure_envelope' + superstructure_internal_elements = 'superstructure_internal_elements' + finishes = 'finishes' + building_services = 'building_services' + external_works = 'external_works' + ff_e = 'ff_e' class BuildingType(Enum): - NEW_CONSTRUCTION_WORKS = 'new_construction_works' - DEMOLITION = 'demolition' - DECONSTRUCTION_AND_NEW_CONSTRUCTION_WORKS = ( + new_construction_works = 'new_construction_works' + demolition = 'demolition' + deconstruction_and_new_construction_works = ( 'deconstruction_and_new_construction_works' ) - RETROFIT_WORKS = 'retrofit_works' - EXTENSION_WORKS = 'extension_works' - RETROFIT_AND_EXTENSION_WORKS = 'retrofit_and_extension_works' - FIT_OUT_WORKS = 'fit_out_works' - OPERATIONS = 'operations' - OTHER = 'other' + retrofit_works = 'retrofit_works' + extension_works = 'extension_works' + retrofit_and_extension_works = 'retrofit_and_extension_works' + fit_out_works = 'fit_out_works' + operations = 'operations' + other = 'other' class BuildingTypology(Enum): - OFFICE = 'office' - RESIDENTIAL = 'residential' - PUBLIC = 'public' - COMMERCIAL = 'commercial' - INDUSTRIAL = 'industrial' - INFRASTRUCTURE = 'infrastructure' - AGRICULTURAL = 'agricultural' - OTHER = 'other' + office = 'office' + residential = 'residential' + public = 'public' + commercial = 'commercial' + industrial = 'industrial' + infrastructure = 'infrastructure' + agricultural = 'agricultural' + other = 'other' class Classification(BaseModel): @@ -57,324 +57,324 @@ class Classification(BaseModel): class Country(Enum): - UNKNOWN = 'unknown' - AFG = 'afg' - ALA = 'ala' - ALB = 'alb' - DZA = 'dza' - ASM = 'asm' - AND_ = 'and' - AGO = 'ago' - AIA = 'aia' - ATA = 'ata' - ATG = 'atg' - ARG = 'arg' - ARM = 'arm' - ABW = 'abw' - AUS = 'aus' - AUT = 'aut' - AZE = 'aze' - BHS = 'bhs' - BHR = 'bhr' - BGD = 'bgd' - BRB = 'brb' - BLR = 'blr' - BEL = 'bel' - BLZ = 'blz' - BEN = 'ben' - BMU = 'bmu' - BTN = 'btn' - BOL = 'bol' - BES = 'bes' - BIH = 'bih' - BWA = 'bwa' - BVT = 'bvt' - BRA = 'bra' - IOT = 'iot' - BRN = 'brn' - BGR = 'bgr' - BFA = 'bfa' - BDI = 'bdi' - CPV = 'cpv' - KHM = 'khm' - CMR = 'cmr' - CAN = 'can' - CYM = 'cym' - CAF = 'caf' - TCD = 'tcd' - CHL = 'chl' - CHN = 'chn' - CXR = 'cxr' - CCK = 'cck' - COL = 'col' - COM = 'com' - COG = 'cog' - COD = 'cod' - COK = 'cok' - CRI = 'cri' - CIV = 'civ' - HRV = 'hrv' - CUB = 'cub' - CUW = 'cuw' - CYP = 'cyp' - CZE = 'cze' - DNK = 'dnk' - DJI = 'dji' - DMA = 'dma' - DOM = 'dom' - ECU = 'ecu' - EGY = 'egy' - SLV = 'slv' - GNQ = 'gnq' - ERI = 'eri' - EST = 'est' - SWZ = 'swz' - ETH = 'eth' - FLK = 'flk' - FRO = 'fro' - FJI = 'fji' - FIN = 'fin' - FRA = 'fra' - GUF = 'guf' - PYF = 'pyf' - ATF = 'atf' - GAB = 'gab' - GMB = 'gmb' - GEO = 'geo' - DEU = 'deu' - GHA = 'gha' - GIB = 'gib' - GRC = 'grc' - GRL = 'grl' - GRD = 'grd' - GLP = 'glp' - GUM = 'gum' - GTM = 'gtm' - GGY = 'ggy' - GIN = 'gin' - GNB = 'gnb' - GUY = 'guy' - HTI = 'hti' - HMD = 'hmd' - VAT = 'vat' - HND = 'hnd' - HKG = 'hkg' - HUN = 'hun' - ISL = 'isl' - IND = 'ind' - IDN = 'idn' - IRN = 'irn' - IRQ = 'irq' - IRL = 'irl' - IMN = 'imn' - ISR = 'isr' - ITA = 'ita' - JAM = 'jam' - JPN = 'jpn' - JEY = 'jey' - JOR = 'jor' - KAZ = 'kaz' - KEN = 'ken' - KIR = 'kir' - PRK = 'prk' - KOR = 'kor' - KWT = 'kwt' - KGZ = 'kgz' - LAO = 'lao' - LVA = 'lva' - LBN = 'lbn' - LSO = 'lso' - LBR = 'lbr' - LBY = 'lby' - LIE = 'lie' - LTU = 'ltu' - LUX = 'lux' - MAC = 'mac' - MDG = 'mdg' - MWI = 'mwi' - MYS = 'mys' - MDV = 'mdv' - MLI = 'mli' - MLT = 'mlt' - MHL = 'mhl' - MTQ = 'mtq' - MRT = 'mrt' - MUS = 'mus' - MYT = 'myt' - MEX = 'mex' - FSM = 'fsm' - MDA = 'mda' - MCO = 'mco' - MNG = 'mng' - MNE = 'mne' - MSR = 'msr' - MAR = 'mar' - MOZ = 'moz' - MMR = 'mmr' - NAM = 'nam' - NRU = 'nru' - NPL = 'npl' - NLD = 'nld' - NCL = 'ncl' - NZL = 'nzl' - NIC = 'nic' - NER = 'ner' - NGA = 'nga' - NIU = 'niu' - NFK = 'nfk' - MKD = 'mkd' - MNP = 'mnp' - NOR = 'nor' - OMN = 'omn' - PAK = 'pak' - PLW = 'plw' - PSE = 'pse' - PAN = 'pan' - PNG = 'png' - PRY = 'pry' - PER = 'per' - PHL = 'phl' - PCN = 'pcn' - POL = 'pol' - PRT = 'prt' - PRI = 'pri' - QAT = 'qat' - REU = 'reu' - ROU = 'rou' - RUS = 'rus' - RWA = 'rwa' - BLM = 'blm' - SHN = 'shn' - KNA = 'kna' - LCA = 'lca' - MAF = 'maf' - SPM = 'spm' - VCT = 'vct' - WSM = 'wsm' - SMR = 'smr' - STP = 'stp' - SAU = 'sau' - SEN = 'sen' - SRB = 'srb' - SYC = 'syc' - SLE = 'sle' - SGP = 'sgp' - SXM = 'sxm' - SVK = 'svk' - SVN = 'svn' - SLB = 'slb' - SOM = 'som' - ZAF = 'zaf' - SGS = 'sgs' - SSD = 'ssd' - ESP = 'esp' - LKA = 'lka' - SDN = 'sdn' - SUR = 'sur' - SJM = 'sjm' - SWE = 'swe' - CHE = 'che' - SYR = 'syr' - TWN = 'twn' - TJK = 'tjk' - TZA = 'tza' - THA = 'tha' - TLS = 'tls' - TGO = 'tgo' - TKL = 'tkl' - TON = 'ton' - TTO = 'tto' - TUN = 'tun' - TUR = 'tur' - TKM = 'tkm' - TCA = 'tca' - TUV = 'tuv' - UGA = 'uga' - UKR = 'ukr' - ARE = 'are' - GBR = 'gbr' - USA = 'usa' - UMI = 'umi' - URY = 'ury' - UZB = 'uzb' - VUT = 'vut' - VEN = 'ven' - VNM = 'vnm' - VGB = 'vgb' - VIR = 'vir' - WLF = 'wlf' - ESH = 'esh' - YEM = 'yem' - ZMB = 'zmb' - ZWE = 'zwe' + unknown = 'unknown' + afg = 'afg' + ala = 'ala' + alb = 'alb' + dza = 'dza' + asm = 'asm' + and_ = 'and' + ago = 'ago' + aia = 'aia' + ata = 'ata' + atg = 'atg' + arg = 'arg' + arm = 'arm' + abw = 'abw' + aus = 'aus' + aut = 'aut' + aze = 'aze' + bhs = 'bhs' + bhr = 'bhr' + bgd = 'bgd' + brb = 'brb' + blr = 'blr' + bel = 'bel' + blz = 'blz' + ben = 'ben' + bmu = 'bmu' + btn = 'btn' + bol = 'bol' + bes = 'bes' + bih = 'bih' + bwa = 'bwa' + bvt = 'bvt' + bra = 'bra' + iot = 'iot' + brn = 'brn' + bgr = 'bgr' + bfa = 'bfa' + bdi = 'bdi' + cpv = 'cpv' + khm = 'khm' + cmr = 'cmr' + can = 'can' + cym = 'cym' + caf = 'caf' + tcd = 'tcd' + chl = 'chl' + chn = 'chn' + cxr = 'cxr' + cck = 'cck' + col = 'col' + com = 'com' + cog = 'cog' + cod = 'cod' + cok = 'cok' + cri = 'cri' + civ = 'civ' + hrv = 'hrv' + cub = 'cub' + cuw = 'cuw' + cyp = 'cyp' + cze = 'cze' + dnk = 'dnk' + dji = 'dji' + dma = 'dma' + dom = 'dom' + ecu = 'ecu' + egy = 'egy' + slv = 'slv' + gnq = 'gnq' + eri = 'eri' + est = 'est' + swz = 'swz' + eth = 'eth' + flk = 'flk' + fro = 'fro' + fji = 'fji' + fin = 'fin' + fra = 'fra' + guf = 'guf' + pyf = 'pyf' + atf = 'atf' + gab = 'gab' + gmb = 'gmb' + geo = 'geo' + deu = 'deu' + gha = 'gha' + gib = 'gib' + grc = 'grc' + grl = 'grl' + grd = 'grd' + glp = 'glp' + gum = 'gum' + gtm = 'gtm' + ggy = 'ggy' + gin = 'gin' + gnb = 'gnb' + guy = 'guy' + hti = 'hti' + hmd = 'hmd' + vat = 'vat' + hnd = 'hnd' + hkg = 'hkg' + hun = 'hun' + isl = 'isl' + ind = 'ind' + idn = 'idn' + irn = 'irn' + irq = 'irq' + irl = 'irl' + imn = 'imn' + isr = 'isr' + ita = 'ita' + jam = 'jam' + jpn = 'jpn' + jey = 'jey' + jor = 'jor' + kaz = 'kaz' + ken = 'ken' + kir = 'kir' + prk = 'prk' + kor = 'kor' + kwt = 'kwt' + kgz = 'kgz' + lao = 'lao' + lva = 'lva' + lbn = 'lbn' + lso = 'lso' + lbr = 'lbr' + lby = 'lby' + lie = 'lie' + ltu = 'ltu' + lux = 'lux' + mac = 'mac' + mdg = 'mdg' + mwi = 'mwi' + mys = 'mys' + mdv = 'mdv' + mli = 'mli' + mlt = 'mlt' + mhl = 'mhl' + mtq = 'mtq' + mrt = 'mrt' + mus = 'mus' + myt = 'myt' + mex = 'mex' + fsm = 'fsm' + mda = 'mda' + mco = 'mco' + mng = 'mng' + mne = 'mne' + msr = 'msr' + mar = 'mar' + moz = 'moz' + mmr = 'mmr' + nam = 'nam' + nru = 'nru' + npl = 'npl' + nld = 'nld' + ncl = 'ncl' + nzl = 'nzl' + nic = 'nic' + ner = 'ner' + nga = 'nga' + niu = 'niu' + nfk = 'nfk' + mkd = 'mkd' + mnp = 'mnp' + nor = 'nor' + omn = 'omn' + pak = 'pak' + plw = 'plw' + pse = 'pse' + pan = 'pan' + png = 'png' + pry = 'pry' + per = 'per' + phl = 'phl' + pcn = 'pcn' + pol = 'pol' + prt = 'prt' + pri = 'pri' + qat = 'qat' + reu = 'reu' + rou = 'rou' + rus = 'rus' + rwa = 'rwa' + blm = 'blm' + shn = 'shn' + kna = 'kna' + lca = 'lca' + maf = 'maf' + spm = 'spm' + vct = 'vct' + wsm = 'wsm' + smr = 'smr' + stp = 'stp' + sau = 'sau' + sen = 'sen' + srb = 'srb' + syc = 'syc' + sle = 'sle' + sgp = 'sgp' + sxm = 'sxm' + svk = 'svk' + svn = 'svn' + slb = 'slb' + som = 'som' + zaf = 'zaf' + sgs = 'sgs' + ssd = 'ssd' + esp = 'esp' + lka = 'lka' + sdn = 'sdn' + sur = 'sur' + sjm = 'sjm' + swe = 'swe' + che = 'che' + syr = 'syr' + twn = 'twn' + tjk = 'tjk' + tza = 'tza' + tha = 'tha' + tls = 'tls' + tgo = 'tgo' + tkl = 'tkl' + ton = 'ton' + tto = 'tto' + tun = 'tun' + tur = 'tur' + tkm = 'tkm' + tca = 'tca' + tuv = 'tuv' + uga = 'uga' + ukr = 'ukr' + are = 'are' + gbr = 'gbr' + usa = 'usa' + umi = 'umi' + ury = 'ury' + uzb = 'uzb' + vut = 'vut' + ven = 'ven' + vnm = 'vnm' + vgb = 'vgb' + vir = 'vir' + wlf = 'wlf' + esh = 'esh' + yem = 'yem' + zmb = 'zmb' + zwe = 'zwe' class GeneralEnergyClass(Enum): - EXISTING = 'existing' - STANDARD = 'standard' - ADVANCED = 'advanced' - UNKNOWN = 'unknown' + existing = 'existing' + standard = 'standard' + advanced = 'advanced' + unknown = 'unknown' class ImpactCategoryKey(Enum): - GWP = 'gwp' - GWP_FOS = 'gwp_fos' - GWP_BIO = 'gwp_bio' - GWP_LUL = 'gwp_lul' - ODP = 'odp' - AP = 'ap' - EP = 'ep' - EP_FW = 'ep_fw' - EP_MAR = 'ep_mar' - EP_TER = 'ep_ter' - POCP = 'pocp' - ADPE = 'adpe' - ADPF = 'adpf' - PENRE = 'penre' - PERE = 'pere' - PERM = 'perm' - PERT = 'pert' - PENRT = 'penrt' - PENRM = 'penrm' - SM = 'sm' - PM = 'pm' - WDP = 'wdp' - IRP = 'irp' - ETP_FW = 'etp_fw' - HTP_C = 'htp_c' - HTP_NC = 'htp_nc' - SQP = 'sqp' - RSF = 'rsf' - NRSF = 'nrsf' - FW = 'fw' - HWD = 'hwd' - NHWD = 'nhwd' - RWD = 'rwd' - CRU = 'cru' - MRF = 'mrf' - MER = 'mer' - EEE = 'eee' - EET = 'eet' + gwp = 'gwp' + gwp_fos = 'gwp_fos' + gwp_bio = 'gwp_bio' + gwp_lul = 'gwp_lul' + odp = 'odp' + ap = 'ap' + ep = 'ep' + ep_fw = 'ep_fw' + ep_mar = 'ep_mar' + ep_ter = 'ep_ter' + pocp = 'pocp' + adpe = 'adpe' + adpf = 'adpf' + penre = 'penre' + pere = 'pere' + perm = 'perm' + pert = 'pert' + penrt = 'penrt' + penrm = 'penrm' + sm = 'sm' + pm = 'pm' + wdp = 'wdp' + irp = 'irp' + etp_fw = 'etp_fw' + htp_c = 'htp_c' + htp_nc = 'htp_nc' + sqp = 'sqp' + rsf = 'rsf' + nrsf = 'nrsf' + fw = 'fw' + hwd = 'hwd' + nhwd = 'nhwd' + rwd = 'rwd' + cru = 'cru' + mrf = 'mrf' + mer = 'mer' + eee = 'eee' + eet = 'eet' class LifeCycleStage(Enum): - A0 = 'a0' - A1A3 = 'a1a3' - A4 = 'a4' - A5 = 'a5' - B1 = 'b1' - B2 = 'b2' - B3 = 'b3' - B4 = 'b4' - B5 = 'b5' - B6 = 'b6' - B7 = 'b7' - B8 = 'b8' - C1 = 'c1' - C2 = 'c2' - C3 = 'c3' - C4 = 'c4' - D = 'd' + a0 = 'a0' + a1a3 = 'a1a3' + a4 = 'a4' + a5 = 'a5' + b1 = 'b1' + b2 = 'b2' + b3 = 'b3' + b4 = 'b4' + b5 = 'b5' + b6 = 'b6' + b7 = 'b7' + b8 = 'b8' + c1 = 'c1' + c2 = 'c2' + c3 = 'c3' + c4 = 'c4' + d = 'd' class Location(BaseModel): @@ -387,11 +387,11 @@ class Location(BaseModel): class Type(Enum): - BUILDING_INFO = 'buildingInfo' + building_info = 'buildingInfo' class Type1(Enum): - INFRASTRUCTURE_INFO = 'infrastructureInfo' + infrastructure_info = 'infrastructureInfo' class ProjectInfo2(BaseModel): @@ -402,21 +402,21 @@ class ProjectInfo2(BaseModel): class ProjectPhase(Enum): - STRATEGIC_DESIGN = 'strategic_design' - CONCEPT_DESIGN = 'concept_design' - TECHNICAL_DESIGN = 'technical_design' - CONSTRUCTION = 'construction' - POST_COMPLETION = 'post_completion' - IN_USE = 'in_use' - OTHER = 'other' + strategic_design = 'strategic_design' + concept_design = 'concept_design' + technical_design = 'technical_design' + construction = 'construction' + post_completion = 'post_completion' + in_use = 'in_use' + other = 'other' class Type2(Enum): - ACTUAL = 'actual' + actual = 'actual' class Type3(Enum): - REFERENCE = 'reference' + reference = 'reference' class ReferenceSourceForAssembly2(BaseModel): @@ -431,11 +431,11 @@ class ReferenceSourceForAssembly2(BaseModel): class Type4(Enum): - ACTUAL = 'actual' + actual = 'actual' class Type6(Enum): - REFERENCE = 'reference' + reference = 'reference' class ReferenceSourceForImpactDataSource3(BaseModel): @@ -450,11 +450,11 @@ class ReferenceSourceForImpactDataSource3(BaseModel): class Type7(Enum): - ACTUAL = 'actual' + actual = 'actual' class Type8(Enum): - REFERENCE = 'reference' + reference = 'reference' class ReferenceSourceForProduct2(BaseModel): @@ -469,11 +469,11 @@ class ReferenceSourceForProduct2(BaseModel): class RoofType(Enum): - FLAT = 'flat' - PITCHED = 'pitched' - SADDLE = 'saddle' - PYRAMID = 'pyramid' - OTHER = 'other' + flat = 'flat' + pitched = 'pitched' + saddle = 'saddle' + pyramid = 'pyramid' + other = 'other' class SoftwareInfo(BaseModel): @@ -496,32 +496,32 @@ class Source(BaseModel): class Standard(Enum): - EN15804A1 = 'en15804a1' - EN15804A2 = 'en15804a2' - UNKNOWN = 'unknown' + en15804a1 = 'en15804a1' + en15804a2 = 'en15804a2' + unknown = 'unknown' class SubType(Enum): - GENERIC = 'generic' - SPECIFIC = 'specific' - INDUSTRY = 'industry' - REPRESENTATIVE = 'representative' + generic = 'generic' + specific = 'specific' + industry = 'industry' + representative = 'representative' class Unit(Enum): - M = 'm' - M2 = 'm2' - M3 = 'm3' - KG = 'kg' - TONES = 'tones' - PCS = 'pcs' - KWH = 'kwh' - L = 'l' - M2R1 = 'm2r1' - KM = 'km' - TONES_KM = 'tones_km' - KGM3 = 'kgm3' - UNKNOWN = 'unknown' + m = 'm' + m2 = 'm2' + m3 = 'm3' + kg = 'kg' + tones = 'tones' + pcs = 'pcs' + kwh = 'kwh' + l = 'l' + m2r1 = 'm2r1' + km = 'km' + tones_km = 'tones_km' + kgm3 = 'kgm3' + unknown = 'unknown' class ValueUnit(BaseModel): diff --git a/pyproject.toml b/pyproject.toml index ff654c6..0149de0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -52,7 +52,7 @@ strip-default-none = false target-python-version = "3.10" collapse-root-models = true disable-timestamp = true -capitalise-enum-members = true +capitalise-enum-members = false input-file-type = "jsonschema" output-model-type = "pydantic_v2.BaseModel" allow_population_by_field_name = true \ No newline at end of file