Skip to content

Commit

Permalink
chore(engine): bump external crates for engine
Browse files Browse the repository at this point in the history
  • Loading branch information
miseyu committed Sep 23, 2024
1 parent a3dec79 commit ecc1475
Show file tree
Hide file tree
Showing 45 changed files with 73 additions and 226 deletions.
177 changes: 40 additions & 137 deletions engine/Cargo.lock

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions engine/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,9 @@ async-trait = "0.1.82"
async_zip = { version = "0.0.17", features = ["full"] }
base64 = "0.22.1"
byteorder = "1.5.0"
bytes = { version = "1.7.1", features = ["serde"] }
bytes = { version = "1.7.2", features = ["serde"] }
chrono = { version = "0.4.38", features = ["serde"] }
clap = { version = "4.5.17", features = ["env", "string"] }
clap = { version = "4.5.18", features = ["env", "string"] }
clipper-sys = "0.7.2"
color-eyre = "0.6.3"
colored = "2.1.0"
Expand All @@ -108,7 +108,7 @@ num-traits = "0.2.19"
nutype = { version = "0.5.0", features = ["schemars08", "serde"] }
object_store = "0.11.0"
once_cell = "1.20.0"
opendal = { version = "0.49.2", features = ["layers-metrics", "services-fs", "services-gcs", "services-http"] }
opendal = { version = "0.50.0", features = ["layers-metrics", "services-fs", "services-gcs", "services-http"] }
opentelemetry = { version = "0.25.0", default-features = false, features = ["metrics", "trace"] }
opentelemetry-otlp = { version = "0.25.0", default-features = false, features = ["grpc-tonic", "metrics", "trace"] }
opentelemetry-semantic-conventions = "0.25.0"
Expand All @@ -117,7 +117,7 @@ opentelemetry_sdk = { version = "0.25.0", default-features = false, features = [
parking_lot = "0.12.3"
petgraph = "0.6.5"
pretty_assertions = "1.4.1"
quick-xml = "0.36.1"
quick-xml = "0.36.2"
rand = "0.8.5"
rayon = "1.10.0"
regex = "1.10.6"
Expand All @@ -127,7 +127,7 @@ rmp-serde = "1.3.0"
robust = "1.1.0"
rstar = "0.12.0"
rstest = "0.22.0"
rust_xlsxwriter = "0.76.0"
rust_xlsxwriter = "0.77.0"
schemars = { version = "0.8.21", features = ["uuid1"] }
serde = { version = "1.0.210", features = ["derive"] }
serde_derive = "1.0.210"
Expand All @@ -142,7 +142,7 @@ sloggers = { version = "2.2.0", default-features = false }
strum = "0.26.3"
strum_macros = "0.26.4"
tempfile = "3.12.0"
thiserror = "1.0.63"
thiserror = "1.0.64"
time = { version = "0.3.36", features = ["formatting"] }
tokio = { version = "1.38.1", features = ["full", "time"] }
tokio-stream = { version = "0.1.16", features = ["sync"] }
Expand Down
2 changes: 1 addition & 1 deletion engine/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ C:\> vcpkg integrate install
## Input Variables
### Declaring an Input Variable
``` yaml
# yaml-language-server: $schema=https://raw.githubusercontent.com/reearth/reearth-flow/main/schema/workflow.json
# yaml-language-server: $schema=https://raw.githubusercontent.com/reearth/reearth-flow/main/engine/schema/workflow.json
id: 00caad2a-9f7d-4189-b479-153fa9ea36dc
name: "SimpleWorkflow"
entryGraphId: 3e3450c8-2344-4728-afa9-5fdb81eec33a
Expand Down
1 change: 0 additions & 1 deletion engine/runtime/action-log/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,5 @@ sloggers.workspace = true
thiserror.workspace = true
time.workspace = true
tokio.workspace = true
tokio-stream.workspace = true
tracing.workspace = true
uuid.workspace = true
5 changes: 0 additions & 5 deletions engine/runtime/action-plateau-processor/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,12 @@ nusamai-citygml.workspace = true
nusamai-plateau.workspace = true
nusamai-projection.workspace = true

Inflector.workspace = true
approx.workspace = true
async-trait.workspace = true
chrono.workspace = true
csv.workspace = true
itertools.workspace = true
num-traits.workspace = true
once_cell.workspace = true
opentelemetry.workspace = true
parking_lot.workspace = true
petgraph.workspace = true
quick-xml.workspace = true
Expand All @@ -44,10 +41,8 @@ serde_json.workspace = true
thiserror.workspace = true
tokio.workspace = true
tracing.workspace = true
tracing-subscriber.workspace = true
url.workspace = true
uuid.workspace = true

[dev-dependencies]
bytes.workspace = true
pretty_assertions.workspace = true
3 changes: 0 additions & 3 deletions engine/runtime/action-processor/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ csv.workspace = true
itertools.workspace = true
num-traits.workspace = true
once_cell.workspace = true
opentelemetry.workspace = true
parking_lot.workspace = true
petgraph.workspace = true
quick-xml.workspace = true
Expand All @@ -45,10 +44,8 @@ serde_json.workspace = true
thiserror.workspace = true
tokio.workspace = true
tracing.workspace = true
tracing-subscriber.workspace = true
url.workspace = true
uuid.workspace = true

[dev-dependencies]
bytes.workspace = true
pretty_assertions.workspace = true
5 changes: 0 additions & 5 deletions engine/runtime/action-sink/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ image.workspace = true
indexmap.workspace = true
itertools.workspace = true
once_cell.workspace = true
opentelemetry.workspace = true
petgraph.workspace = true
rayon.workspace = true
regex.workspace = true
Expand All @@ -51,15 +50,11 @@ serde_json.workspace = true
thiserror.workspace = true
tokio.workspace = true
tracing.workspace = true
tracing-subscriber.workspace = true
url.workspace = true
uuid.workspace = true

bincode = { version = "2.0.0-rc.3", default-features = false, features = ["serde", "std"] }
flate2 = "1.0.28"
hashbrown = { version = "0.14.3", features = ["serde"] }
prost = "0.12.3"

[dev-dependencies]
bytes.workspace = true
pretty_assertions.workspace = true
3 changes: 0 additions & 3 deletions engine/runtime/action-source/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ bytes.workspace = true
csv.workspace = true
futures.workspace = true
once_cell.workspace = true
opentelemetry.workspace = true
petgraph.workspace = true
quick-xml.workspace = true
regex.workspace = true
Expand All @@ -40,10 +39,8 @@ serde_json.workspace = true
thiserror.workspace = true
tokio.workspace = true
tracing.workspace = true
tracing-subscriber.workspace = true
url.workspace = true
uuid.workspace = true

[dev-dependencies]
bytes.workspace = true
pretty_assertions.workspace = true
8 changes: 0 additions & 8 deletions engine/runtime/common/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,23 +22,15 @@ home.workspace = true
image.workspace = true
jsonpath_lib.workspace = true
libxml.workspace = true
nusamai-mvt.workspace = true
nusamai-projection.workspace = true
parking_lot.workspace = true
petgraph.workspace = true
rayon.workspace = true
serde.workspace = true
serde_json.workspace = true
serde_yaml.workspace = true
sha2.workspace = true
strum.workspace = true
strum_macros.workspace = true
tempfile.workspace = true
thiserror.workspace = true
tokio.workspace = true
tokio-stream.workspace = true
tokio-util.workspace = true
tracing.workspace = true
tracing-subscriber.workspace = true
url.workspace = true
uuid.workspace = true
2 changes: 0 additions & 2 deletions engine/runtime/eval-expr/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,3 @@ rhai.workspace = true
serde.workspace = true
serde_json.workspace = true
thiserror.workspace = true
tracing.workspace = true
tracing-subscriber.workspace = true
1 change: 0 additions & 1 deletion engine/runtime/examples/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ reearth-flow-types.workspace = true
bytes.workspace = true
directories.workspace = true
once_cell.workspace = true
pretty_assertions.workspace = true
time.workspace = true
tokio.workspace = true
tracing.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion engine/runtime/examples/plateau/max_lod_extractor.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
mod helper;

fn main() {
helper::execute("max_lod_extract.yml");
helper::execute("simple_workflow.yml");
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# yaml-language-server: $schema=https://raw.githubusercontent.com/reearth/reearth-flow/main/schema/workflow.json
# yaml-language-server: $schema=https://raw.githubusercontent.com/reearth/reearth-flow/main/engine/schema/workflow.json
id: a7fc8f35-b84f-496b-a2cb-65be3bfec285
name: "PLATEAU.AttributeFlattener"
entryGraphId: 3e3450c8-2344-4728-afa9-5fdb81eec33a
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# yaml-language-server: $schema=https://raw.githubusercontent.com/reearth/reearth-flow/main/schema/workflow.json
# yaml-language-server: $schema=https://raw.githubusercontent.com/reearth/reearth-flow/main/engine/schema/workflow.json
id: 369bd41c-52f7-4aec-bc4a-8a62c8e41fcd
name: "PLATEAU.AttributeReader"
entryGraphId: 64931277-3a82-4a1c-88bc-9b54fe172518
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# yaml-language-server: $schema=https://raw.githubusercontent.com/reearth/reearth-flow/main/schema/workflow.json
# yaml-language-server: $schema=https://raw.githubusercontent.com/reearth/reearth-flow/main/engine/schema/workflow.json
id: a7fc8f35-b84f-496b-a2cb-65be3bfec285
name: "bounds_extractor"
entryGraphId: 3e3450c8-2344-4728-afa9-5fdb81eec33a
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# yaml-language-server: $schema=https://raw.githubusercontent.com/reearth/reearth-flow/main/schema/workflow.json
# yaml-language-server: $schema=https://raw.githubusercontent.com/reearth/reearth-flow/main/engine/schema/workflow.json
id: a7fc8f35-b84f-496b-a2cb-65be3bfec285
name: "building_proccessor"
entryGraphId: 3e3450c8-2344-4728-afa9-5fdb81eec33a
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# yaml-language-server: $schema=https://raw.githubusercontent.com/reearth/reearth-flow/main/schema/workflow.json
# yaml-language-server: $schema=https://raw.githubusercontent.com/reearth/reearth-flow/main/engine/schema/workflow.json
id: a7fc8f35-b84f-496b-a2cb-65be3bfec285
name: "cesium_3d_tiles"
entryGraphId: 3e3450c8-2344-4728-afa9-5fdb81eec33a
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# yaml-language-server: $schema=https://raw.githubusercontent.com/reearth/reearth-flow/main/schema/workflow.json
# yaml-language-server: $schema=https://raw.githubusercontent.com/reearth/reearth-flow/main/engine/schema/workflow.json
id: a7fc8f35-b84f-496b-a2cb-65be3bfec285
name: "PLATEAU.DomainOfDefinitionValidator"
entryGraphId: 3e3450c8-2344-4728-afa9-5fdb81eec33a
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# yaml-language-server: $schema=https://raw.githubusercontent.com/reearth/reearth-flow/main/schema/workflow.json
# yaml-language-server: $schema=https://raw.githubusercontent.com/reearth/reearth-flow/main/engine/schema/workflow.json
id: 00caad2a-9f7d-4189-b479-153fa9ea36dc
name: "CityGmlExample"
entryGraphId: 3e3450c8-2344-4728-afa9-5fdb81eec33a
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# yaml-language-server: $schema=https://raw.githubusercontent.com/reearth/reearth-flow/main/schema/workflow.json
# yaml-language-server: $schema=https://raw.githubusercontent.com/reearth/reearth-flow/main/engine/schema/workflow.json
id: 3da19dc4-1ebd-4762-8250-2a4bc8043409
name: "FeatureCreatorExample"
entryGraphId: 3e3450c8-2344-4728-afa9-5fdb81eec33a
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# yaml-language-server: $schema=https://raw.githubusercontent.com/reearth/reearth-flow/main/schema/workflow.json
# yaml-language-server: $schema=https://raw.githubusercontent.com/reearth/reearth-flow/main/engine/schema/workflow.json
id: 3da19dc4-1ebd-4762-8250-2a4bc8043409
name: "FeatureTransformerExample"
entryGraphId: 3e3450c8-2344-4728-afa9-5fdb81eec33a
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# yaml-language-server: $schema=https://raw.githubusercontent.com/reearth/reearth-flow/main/schema/workflow.json
# yaml-language-server: $schema=https://raw.githubusercontent.com/reearth/reearth-flow/main/engine/schema/workflow.json
id: a7fc8f35-b84f-496b-a2cb-65be3bfec285
name: "geometry_refiner"
entryGraphId: 3e3450c8-2344-4728-afa9-5fdb81eec33a
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# yaml-language-server: $schema=https://raw.githubusercontent.com/reearth/reearth-flow/main/schema/workflow.json
# yaml-language-server: $schema=https://raw.githubusercontent.com/reearth/reearth-flow/main/engine/schema/workflow.json
id: a7fc8f35-b84f-496b-a2cb-65be3bfec285
name: "gltf_tiles"
entryGraphId: 3e3450c8-2344-4728-afa9-5fdb81eec33a
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# yaml-language-server: $schema=https://raw.githubusercontent.com/reearth/reearth-flow/main/schema/workflow.json
# yaml-language-server: $schema=https://raw.githubusercontent.com/reearth/reearth-flow/main/engine/schema/workflow.json
id: a7fc8f35-b84f-496b-a2cb-65be3bfec285
name: "lod_splitter_with_dm"
entryGraphId: 3e3450c8-2344-4728-afa9-5fdb81eec33a
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# yaml-language-server: $schema=https://raw.githubusercontent.com/reearth/reearth-flow/main/schema/workflow.json
# yaml-language-server: $schema=https://raw.githubusercontent.com/reearth/reearth-flow/main/engine/schema/workflow.json
id: a7fc8f35-b84f-496b-a2cb-65be3bfec285
name: "PLATEAU.MaxLodExtractor"
entryGraphId: 3e3450c8-2344-4728-afa9-5fdb81eec33a
Expand Down
4 changes: 2 additions & 2 deletions engine/runtime/examples/plateau/testdata/workflow/mvt.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# yaml-language-server: $schema=https://raw.githubusercontent.com/reearth/reearth-flow/main/schema/workflow.json
# yaml-language-server: $schema=https://raw.githubusercontent.com/reearth/reearth-flow/main/engine/schema/workflow.json
id: a7fc8f35-b84f-496b-a2cb-65be3bfec285
name: "mvt"
entryGraphId: 3e3450c8-2344-4728-afa9-5fdb81eec33a
Expand All @@ -12,7 +12,7 @@ with:
- bldg
addNsprefixToFeatureTypes: true
extractDmGeometryAsXmlFragment: false
outputPath:
outputPath:
graphs:
- !include ../graphs/attribute_reader.yml
- !include ../graphs/folder_and_file_path_reader.yml
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# yaml-language-server: $schema=https://raw.githubusercontent.com/reearth/reearth-flow/main/schema/workflow.json
# yaml-language-server: $schema=https://raw.githubusercontent.com/reearth/reearth-flow/main/engine/schema/workflow.json
id: f01ce0bb-e982-4dfa-94de-7a766156b4b3
name: "QualityCheck-01-common-workflow"
entryGraphId: 7f86c5d5-b375-4190-ab93-001e9a099d1e
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# yaml-language-server: $schema=https://raw.githubusercontent.com/reearth/reearth-flow/main/schema/workflow.json
# yaml-language-server: $schema=https://raw.githubusercontent.com/reearth/reearth-flow/main/engine/schema/workflow.json
id: baccc9b8-b4bd-4a62-a389-93f40e21af7d
name: "QualityCheck-02-bldg-l_7_8_9_11_13_lod0"
entryGraphId: 3e3450c8-2344-4728-afa9-5fdb81eec33a
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# yaml-language-server: $schema=https://raw.githubusercontent.com/reearth/reearth-flow/main/schema/workflow.json
# yaml-language-server: $schema=https://raw.githubusercontent.com/reearth/reearth-flow/main/engine/schema/workflow.json
id: cc5cd09e-d6e7-4bd4-b571-ee684302ee92
name: "QualityCheck-solid-phase-consistency-validation"
entryGraphId: 21d92bbc-b849-481d-af7a-4f255191557f
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# yaml-language-server: $schema=https://raw.githubusercontent.com/reearth/reearth-flow/main/schema/workflow.json
# yaml-language-server: $schema=https://raw.githubusercontent.com/reearth/reearth-flow/main/engine/schema/workflow.json
id: 8220e525-5f5d-4612-b6b0-462c059f15fe
name: "QualityCheck-02-bldg-workflow"
entryGraphId: 129b7659-ba08-4b3a-8f70-fac7e96d5ccf
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# yaml-language-server: $schema=https://raw.githubusercontent.com/reearth/reearth-flow/main/schema/workflow.json
# yaml-language-server: $schema=https://raw.githubusercontent.com/reearth/reearth-flow/main/engine/schema/workflow.json
id: e89620bc-5a16-4f21-a717-a974798a004c
name: "QualityCheck-03-tran-rwy-trk-squr-wwy-workflow"
entryGraphId: 43581967-2a15-450a-ba13-e450376c3d0e
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# yaml-language-server: $schema=https://raw.githubusercontent.com/reearth/reearth-flow/main/schema/workflow.json
# yaml-language-server: $schema=https://raw.githubusercontent.com/reearth/reearth-flow/main/engine/schema/workflow.json
id: e89620bc-5a16-4f21-a717-a974798a004c
name: "QualityCheck-03-tran-rwy-trk-squr-wwy-workflow"
entryGraphId: 43581967-2a15-450a-ba13-e450376c3d0e
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# yaml-language-server: $schema=https://raw.githubusercontent.com/reearth/reearth-flow/main/schema/workflow.json
# yaml-language-server: $schema=https://raw.githubusercontent.com/reearth/reearth-flow/main/engine/schema/workflow.json
id: 00caad2a-9f7d-4189-b479-153fa9ea36dc
name: "SimpleWorkflow"
entryGraphId: 3e3450c8-2344-4728-afa9-5fdb81eec33a
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# yaml-language-server: $schema=https://raw.githubusercontent.com/reearth/reearth-flow/main/schema/workflow.json
# yaml-language-server: $schema=https://raw.githubusercontent.com/reearth/reearth-flow/main/engine/schema/workflow.json
id: a7fc8f35-b84f-496b-a2cb-65be3bfec285
name: "PLATEAU.XMLValidator"
entryGraphId: 3e3450c8-2344-4728-afa9-5fdb81eec33a
Expand Down
5 changes: 0 additions & 5 deletions engine/runtime/geometry/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ rust-version.workspace = true
version.workspace = true

[dependencies]
nusamai-citygml.workspace = true
nusamai-geometry.workspace = true
nusamai-projection.workspace = true

Expand All @@ -21,16 +20,12 @@ clipper-sys.workspace = true
float_next_after.workspace = true
geojson.workspace = true
nalgebra.workspace = true
nalgebra-glm.workspace = true
num-traits.workspace = true
parking_lot.workspace = true
reearth-flow-common.workspace = true
robust.workspace = true
rstar.workspace = true
serde.workspace = true
serde_json.workspace = true
strum.workspace = true
strum_macros.workspace = true
thiserror.workspace = true
tracing.workspace = true
tracing-subscriber.workspace = true
1 change: 0 additions & 1 deletion engine/runtime/macros/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ version.workspace = true
proc-macro = true

[dependencies]
heck = "0.5.0"
proc-macro2 = "1.0.86"
quote = "1.0.36"
syn = { version = "2.0.68", features = ["extra-traits", "parsing"] }
3 changes: 0 additions & 3 deletions engine/runtime/runner/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ directories.workspace = true
futures.workspace = true
futures-util.workspace = true
once_cell.workspace = true
opentelemetry.workspace = true
petgraph.workspace = true
regex.workspace = true
serde.workspace = true
Expand All @@ -33,9 +32,7 @@ thiserror.workspace = true
time.workspace = true
tokio.workspace = true
tracing.workspace = true
tracing-subscriber.workspace = true
uuid.workspace = true

[dev-dependencies]
bytes.workspace = true
pretty_assertions.workspace = true
Loading

0 comments on commit ecc1475

Please sign in to comment.