From f1c497fa46dc1b02f806ec3c1c4b40806a6e4316 Mon Sep 17 00:00:00 2001 From: haixuanTao Date: Sun, 13 Oct 2024 09:09:10 +0200 Subject: [PATCH 01/14] Bump dora to `0.3.7rc0` --- Cargo.lock | 72 +++++++++---------- Cargo.toml | 38 +++++----- node-hub/dora-argotranslate/pyproject.toml | 2 +- node-hub/dora-distil-whisper/pyproject.toml | 2 +- node-hub/dora-internvl/pyproject.toml | 2 +- node-hub/dora-keyboard/pyproject.toml | 2 +- node-hub/dora-microphone/pyproject.toml | 2 +- node-hub/dora-openai-server/pyproject.toml | 2 +- node-hub/dora-opus/pyproject.toml | 2 +- node-hub/dora-parler/pyproject.toml | 2 +- node-hub/dora-qwenvl/pyproject.toml | 2 +- node-hub/dora-vad/pyproject.toml | 2 +- node-hub/dora-yolo/pyproject.toml | 2 +- .../llama-factory-recorder/pyproject.toml | 2 +- node-hub/opencv-plot/pyproject.toml | 2 +- node-hub/opencv-video-capture/pyproject.toml | 2 +- node-hub/pyarrow-assert/pyproject.toml | 2 +- node-hub/pyarrow-sender/pyproject.toml | 2 +- node-hub/terminal-input/pyproject.toml | 2 +- 19 files changed, 72 insertions(+), 72 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ed113c4a7..001a5dcc7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1190,7 +1190,7 @@ dependencies = [ [[package]] name = "benchmark-example-node" -version = "0.3.6" +version = "0.3.7-rc0" dependencies = [ "dora-node-api", "eyre", @@ -1203,7 +1203,7 @@ dependencies = [ [[package]] name = "benchmark-example-sink" -version = "0.3.6" +version = "0.3.7-rc0" dependencies = [ "dora-node-api", "eyre", @@ -1811,7 +1811,7 @@ dependencies = [ [[package]] name = "communication-layer-pub-sub" -version = "0.3.6" +version = "0.3.7-rc0" dependencies = [ "flume 0.10.14", "zenoh", @@ -1819,7 +1819,7 @@ dependencies = [ [[package]] name = "communication-layer-request-reply" -version = "0.3.6" +version = "0.3.7-rc0" [[package]] name = "concurrent-queue" @@ -2335,7 +2335,7 @@ dependencies = [ [[package]] name = "dora-arrow-convert" -version = "0.3.6" +version = "0.3.7-rc0" dependencies = [ "arrow", "eyre", @@ -2343,7 +2343,7 @@ dependencies = [ [[package]] name = "dora-cli" -version = "0.3.6" +version = "0.3.7-rc0" dependencies = [ "bat", "clap 4.5.20", @@ -2381,7 +2381,7 @@ dependencies = [ [[package]] name = "dora-coordinator" -version = "0.3.6" +version = "0.3.7-rc0" dependencies = [ "ctrlc", "dora-core", @@ -2401,7 +2401,7 @@ dependencies = [ [[package]] name = "dora-core" -version = "0.3.6" +version = "0.3.7-rc0" dependencies = [ "dora-message", "eyre", @@ -2420,7 +2420,7 @@ dependencies = [ [[package]] name = "dora-daemon" -version = "0.3.6" +version = "0.3.7-rc0" dependencies = [ "aligned-vec", "async-trait", @@ -2452,7 +2452,7 @@ dependencies = [ [[package]] name = "dora-download" -version = "0.3.6" +version = "0.3.7-rc0" dependencies = [ "eyre", "reqwest", @@ -2501,7 +2501,7 @@ dependencies = [ [[package]] name = "dora-metrics" -version = "0.3.6" +version = "0.3.7-rc0" dependencies = [ "eyre", "opentelemetry 0.22.0", @@ -2512,7 +2512,7 @@ dependencies = [ [[package]] name = "dora-node-api" -version = "0.3.6" +version = "0.3.7-rc0" dependencies = [ "aligned-vec", "arrow", @@ -2536,7 +2536,7 @@ dependencies = [ [[package]] name = "dora-node-api-c" -version = "0.3.6" +version = "0.3.7-rc0" dependencies = [ "arrow-array", "dora-node-api", @@ -2546,7 +2546,7 @@ dependencies = [ [[package]] name = "dora-node-api-cxx" -version = "0.3.6" +version = "0.3.7-rc0" dependencies = [ "cxx", "cxx-build", @@ -2563,7 +2563,7 @@ dependencies = [ [[package]] name = "dora-node-api-python" -version = "0.3.6" +version = "0.3.7-rc0" dependencies = [ "arrow", "dora-node-api", @@ -2581,7 +2581,7 @@ dependencies = [ [[package]] name = "dora-openai-proxy-server" -version = "0.3.6" +version = "0.3.7-rc0" dependencies = [ "chrono", "dora-node-api", @@ -2602,7 +2602,7 @@ dependencies = [ [[package]] name = "dora-operator-api" -version = "0.3.6" +version = "0.3.7-rc0" dependencies = [ "dora-arrow-convert", "dora-operator-api-macros", @@ -2611,14 +2611,14 @@ dependencies = [ [[package]] name = "dora-operator-api-c" -version = "0.3.6" +version = "0.3.7-rc0" dependencies = [ "dora-operator-api-types", ] [[package]] name = "dora-operator-api-cxx" -version = "0.3.6" +version = "0.3.7-rc0" dependencies = [ "cxx", "cxx-build", @@ -2627,7 +2627,7 @@ dependencies = [ [[package]] name = "dora-operator-api-macros" -version = "0.3.6" +version = "0.3.7-rc0" dependencies = [ "proc-macro2", "quote", @@ -2636,7 +2636,7 @@ dependencies = [ [[package]] name = "dora-operator-api-python" -version = "0.3.6" +version = "0.3.7-rc0" dependencies = [ "aligned-vec", "arrow", @@ -2652,7 +2652,7 @@ dependencies = [ [[package]] name = "dora-operator-api-types" -version = "0.3.6" +version = "0.3.7-rc0" dependencies = [ "arrow", "dora-arrow-convert", @@ -2661,7 +2661,7 @@ dependencies = [ [[package]] name = "dora-record" -version = "0.3.6" +version = "0.3.7-rc0" dependencies = [ "chrono", "dora-node-api", @@ -2673,7 +2673,7 @@ dependencies = [ [[package]] name = "dora-rerun" -version = "0.3.6" +version = "0.3.7-rc0" dependencies = [ "dora-node-api", "eyre", @@ -2740,7 +2740,7 @@ dependencies = [ [[package]] name = "dora-runtime" -version = "0.3.6" +version = "0.3.7-rc0" dependencies = [ "aligned-vec", "arrow", @@ -2768,7 +2768,7 @@ dependencies = [ [[package]] name = "dora-tracing" -version = "0.3.6" +version = "0.3.7-rc0" dependencies = [ "eyre", "opentelemetry 0.18.0", @@ -5200,7 +5200,7 @@ dependencies = [ [[package]] name = "multiple-daemons-example-node" -version = "0.3.6" +version = "0.3.7-rc0" dependencies = [ "dora-node-api", "eyre", @@ -5211,14 +5211,14 @@ dependencies = [ [[package]] name = "multiple-daemons-example-operator" -version = "0.3.6" +version = "0.3.7-rc0" dependencies = [ "dora-operator-api", ] [[package]] name = "multiple-daemons-example-sink" -version = "0.3.6" +version = "0.3.7-rc0" dependencies = [ "dora-node-api", "eyre", @@ -8890,7 +8890,7 @@ dependencies = [ [[package]] name = "rust-dataflow-example-node" -version = "0.3.6" +version = "0.3.7-rc0" dependencies = [ "dora-node-api", "eyre", @@ -8901,7 +8901,7 @@ dependencies = [ [[package]] name = "rust-dataflow-example-sink" -version = "0.3.6" +version = "0.3.7-rc0" dependencies = [ "dora-node-api", "eyre", @@ -8909,7 +8909,7 @@ dependencies = [ [[package]] name = "rust-dataflow-example-sink-dynamic" -version = "0.3.6" +version = "0.3.7-rc0" dependencies = [ "dora-node-api", "eyre", @@ -8917,7 +8917,7 @@ dependencies = [ [[package]] name = "rust-dataflow-example-status-node" -version = "0.3.6" +version = "0.3.7-rc0" dependencies = [ "dora-node-api", "eyre", @@ -8936,7 +8936,7 @@ dependencies = [ [[package]] name = "rust-ros2-dataflow-example-node" -version = "0.3.6" +version = "0.3.7-rc0" dependencies = [ "dora-node-api", "dora-ros2-bridge", @@ -9490,7 +9490,7 @@ dependencies = [ [[package]] name = "shared-memory-server" -version = "0.3.6" +version = "0.3.7-rc0" dependencies = [ "bincode", "eyre", @@ -10057,7 +10057,7 @@ dependencies = [ [[package]] name = "terminal-print" -version = "0.3.6" +version = "0.3.7-rc0" dependencies = [ "dora-node-api", "eyre", diff --git a/Cargo.toml b/Cargo.toml index a986f0ced..16115599a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -41,31 +41,31 @@ members = [ [workspace.package] # Make sure to also bump `apis/node/python/__init__.py` version. -version = "0.3.6" +version = "0.3.7-rc0" description = "`dora` goal is to be a low latency, composable, and distributed data flow." documentation = "https://dora.carsmos.ai" license = "Apache-2.0" repository = "https://github.com/dora-rs/dora/" [workspace.dependencies] -dora-node-api = { version = "0.3.6", path = "apis/rust/node", default-features = false } -dora-node-api-python = { version = "0.3.6", path = "apis/python/node", default-features = false } -dora-operator-api = { version = "0.3.6", path = "apis/rust/operator", default-features = false } -dora-operator-api-macros = { version = "0.3.6", path = "apis/rust/operator/macros" } -dora-operator-api-types = { version = "0.3.6", path = "apis/rust/operator/types" } -dora-operator-api-python = { version = "0.3.6", path = "apis/python/operator" } -dora-operator-api-c = { version = "0.3.6", path = "apis/c/operator" } -dora-node-api-c = { version = "0.3.6", path = "apis/c/node" } -dora-core = { version = "0.3.6", path = "libraries/core" } -dora-arrow-convert = { version = "0.3.6", path = "libraries/arrow-convert" } -dora-tracing = { version = "0.3.6", path = "libraries/extensions/telemetry/tracing" } -dora-metrics = { version = "0.3.6", path = "libraries/extensions/telemetry/metrics" } -dora-download = { version = "0.3.6", path = "libraries/extensions/download" } -shared-memory-server = { version = "0.3.6", path = "libraries/shared-memory-server" } -communication-layer-request-reply = { version = "0.3.6", path = "libraries/communication-layer/request-reply" } -dora-runtime = { version = "0.3.6", path = "binaries/runtime" } -dora-daemon = { version = "0.3.6", path = "binaries/daemon" } -dora-coordinator = { version = "0.3.6", path = "binaries/coordinator" } +dora-node-api = { version = "0.3.7-rc0", path = "apis/rust/node", default-features = false } +dora-node-api-python = { version = "0.3.7-rc0", path = "apis/python/node", default-features = false } +dora-operator-api = { version = "0.3.7-rc0", path = "apis/rust/operator", default-features = false } +dora-operator-api-macros = { version = "0.3.7-rc0", path = "apis/rust/operator/macros" } +dora-operator-api-types = { version = "0.3.7-rc0", path = "apis/rust/operator/types" } +dora-operator-api-python = { version = "0.3.7-rc0", path = "apis/python/operator" } +dora-operator-api-c = { version = "0.3.7-rc0", path = "apis/c/operator" } +dora-node-api-c = { version = "0.3.7-rc0", path = "apis/c/node" } +dora-core = { version = "0.3.7-rc0", path = "libraries/core" } +dora-arrow-convert = { version = "0.3.7-rc0", path = "libraries/arrow-convert" } +dora-tracing = { version = "0.3.7-rc0", path = "libraries/extensions/telemetry/tracing" } +dora-metrics = { version = "0.3.7-rc0", path = "libraries/extensions/telemetry/metrics" } +dora-download = { version = "0.3.7-rc0", path = "libraries/extensions/download" } +shared-memory-server = { version = "0.3.7-rc0", path = "libraries/shared-memory-server" } +communication-layer-request-reply = { version = "0.3.7-rc0", path = "libraries/communication-layer/request-reply" } +dora-runtime = { version = "0.3.7-rc0", path = "binaries/runtime" } +dora-daemon = { version = "0.3.7-rc0", path = "binaries/daemon" } +dora-coordinator = { version = "0.3.7-rc0", path = "binaries/coordinator" } dora-ros2-bridge = { path = "libraries/extensions/ros2-bridge" } dora-ros2-bridge-msg-gen = { path = "libraries/extensions/ros2-bridge/msg-gen" } dora-ros2-bridge-python = { path = "libraries/extensions/ros2-bridge/python" } diff --git a/node-hub/dora-argotranslate/pyproject.toml b/node-hub/dora-argotranslate/pyproject.toml index d477020a7..045693463 100644 --- a/node-hub/dora-argotranslate/pyproject.toml +++ b/node-hub/dora-argotranslate/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "dora-argotranslate" -version = "0.3.6" +version = "0.3.7rc0" description = "Dora Node for Text translating using Argostranslate" readme = "README.md" authors = [ diff --git a/node-hub/dora-distil-whisper/pyproject.toml b/node-hub/dora-distil-whisper/pyproject.toml index a265bce1e..00ba84cf7 100644 --- a/node-hub/dora-distil-whisper/pyproject.toml +++ b/node-hub/dora-distil-whisper/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "dora-distil-whisper" -version = "0.3.6" +version = "0.3.7rc0" authors = [ "Haixuan Xavier Tao ", "Enzo Le Van ", diff --git a/node-hub/dora-internvl/pyproject.toml b/node-hub/dora-internvl/pyproject.toml index 8201d3fa8..4f2b6f5d2 100644 --- a/node-hub/dora-internvl/pyproject.toml +++ b/node-hub/dora-internvl/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "dora-internvl" -version = "0.3.6" +version = "0.3.7rc0" authors = [ "Haixuan Xavier Tao ", "Enzo Le Van ", diff --git a/node-hub/dora-keyboard/pyproject.toml b/node-hub/dora-keyboard/pyproject.toml index 83b7c615f..60ee1a562 100644 --- a/node-hub/dora-keyboard/pyproject.toml +++ b/node-hub/dora-keyboard/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "dora-keyboard" -version = "0.3.6" +version = "0.3.7rc0" authors = [ "Haixuan Xavier Tao ", "Enzo Le Van ", diff --git a/node-hub/dora-microphone/pyproject.toml b/node-hub/dora-microphone/pyproject.toml index a3ccf6f87..fa51374f6 100644 --- a/node-hub/dora-microphone/pyproject.toml +++ b/node-hub/dora-microphone/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "dora-microphone" -version = "0.3.6" +version = "0.3.7rc0" authors = [ "Haixuan Xavier Tao ", "Enzo Le Van ", diff --git a/node-hub/dora-openai-server/pyproject.toml b/node-hub/dora-openai-server/pyproject.toml index ba9bc605f..0a9dfde2a 100644 --- a/node-hub/dora-openai-server/pyproject.toml +++ b/node-hub/dora-openai-server/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "dora-openai-server" -version = "0.3.6" +version = "0.3.7rc0" authors = [ "Haixuan Xavier Tao ", "Enzo Le Van ", diff --git a/node-hub/dora-opus/pyproject.toml b/node-hub/dora-opus/pyproject.toml index c556b9597..ef0f7abd4 100644 --- a/node-hub/dora-opus/pyproject.toml +++ b/node-hub/dora-opus/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "dora-opus" -version = "0.3.6" +version = "0.3.7rc0" description = "Dora Node for Text translating using Opus" readme = "README.md" authors = [ diff --git a/node-hub/dora-parler/pyproject.toml b/node-hub/dora-parler/pyproject.toml index 9072bfa30..fa4fa7c88 100644 --- a/node-hub/dora-parler/pyproject.toml +++ b/node-hub/dora-parler/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "dora-parler" -version = "0.3.6" +version = "0.3.7rc0" authors = [ "Haixuan Xavier Tao ", "Enzo Le Van ", diff --git a/node-hub/dora-qwenvl/pyproject.toml b/node-hub/dora-qwenvl/pyproject.toml index f4f9f1bd6..836dc7673 100644 --- a/node-hub/dora-qwenvl/pyproject.toml +++ b/node-hub/dora-qwenvl/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "dora-qwenvl" -version = "0.3.6-rc0" +version = "0.3.7rc0" authors = [ "Haixuan Xavier Tao ", "Enzo Le Van ", diff --git a/node-hub/dora-vad/pyproject.toml b/node-hub/dora-vad/pyproject.toml index ee7778953..9a34479f9 100644 --- a/node-hub/dora-vad/pyproject.toml +++ b/node-hub/dora-vad/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "dora-vad" -version = "0.3.6" +version = "0.3.7rc0" description = "Dora Node for Text translating using Argostranslate" readme = "README.md" authors = [ diff --git a/node-hub/dora-yolo/pyproject.toml b/node-hub/dora-yolo/pyproject.toml index d6771cadb..594e00480 100644 --- a/node-hub/dora-yolo/pyproject.toml +++ b/node-hub/dora-yolo/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "dora-yolo" -version = "0.3.6" +version = "0.3.7rc0" authors = [ "Haixuan Xavier Tao ", "Enzo Le Van ", diff --git a/node-hub/llama-factory-recorder/pyproject.toml b/node-hub/llama-factory-recorder/pyproject.toml index 75f15bc08..b62706fcc 100644 --- a/node-hub/llama-factory-recorder/pyproject.toml +++ b/node-hub/llama-factory-recorder/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "llama-factory-recorder" -version = "0.3.6-rc0" +version = "0.3.7rc0" authors = [ "Haixuan Xavier Tao ", "Enzo Le Van ", diff --git a/node-hub/opencv-plot/pyproject.toml b/node-hub/opencv-plot/pyproject.toml index b0974246c..3eebf5eb9 100644 --- a/node-hub/opencv-plot/pyproject.toml +++ b/node-hub/opencv-plot/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "opencv-plot" -version = "0.3.6" +version = "0.3.7rc0" authors = [ "Haixuan Xavier Tao ", "Enzo Le Van ", diff --git a/node-hub/opencv-video-capture/pyproject.toml b/node-hub/opencv-video-capture/pyproject.toml index 3b376bc22..4c273d7d3 100644 --- a/node-hub/opencv-video-capture/pyproject.toml +++ b/node-hub/opencv-video-capture/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "opencv-video-capture" -version = "0.3.6" +version = "0.3.7rc0" authors = [ "Haixuan Xavier Tao ", "Enzo Le Van ", diff --git a/node-hub/pyarrow-assert/pyproject.toml b/node-hub/pyarrow-assert/pyproject.toml index df3ccb644..17ec727a3 100644 --- a/node-hub/pyarrow-assert/pyproject.toml +++ b/node-hub/pyarrow-assert/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "pyarrow-assert" -version = "0.3.6" +version = "0.3.7rc0" authors = [ "Haixuan Xavier Tao ", "Enzo Le Van ", diff --git a/node-hub/pyarrow-sender/pyproject.toml b/node-hub/pyarrow-sender/pyproject.toml index 1b451bbf1..68b8ee3b0 100644 --- a/node-hub/pyarrow-sender/pyproject.toml +++ b/node-hub/pyarrow-sender/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "pyarrow-sender" -version = "0.3.6" +version = "0.3.7rc0" authors = [ "Haixuan Xavier Tao ", "Enzo Le Van ", diff --git a/node-hub/terminal-input/pyproject.toml b/node-hub/terminal-input/pyproject.toml index 479ba4761..5c4a4689f 100644 --- a/node-hub/terminal-input/pyproject.toml +++ b/node-hub/terminal-input/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "terminal-input" -version = "0.3.6" +version = "0.3.7rc0" authors = [ "Haixuan Xavier Tao ", "Enzo Le Van ", From 376ebf81ecc6d82ca1a1203b9eae8095b0d0b486 Mon Sep 17 00:00:00 2001 From: haixuanTao Date: Tue, 15 Oct 2024 01:24:14 +0200 Subject: [PATCH 02/14] Add peft requirement for custom adapter Bump dora to 0.3.7-rc1 Minor dependency fix Fix typo --- Cargo.lock | 72 +++++++++---------- Cargo.toml | 38 +++++----- Changelog.md | 49 +++++++++++++ binaries/cli/src/attach.rs | 2 +- binaries/daemon/src/lib.rs | 2 +- .../extensions/telemetry/metrics/src/lib.rs | 2 +- node-hub/dora-argotranslate/pyproject.toml | 2 +- node-hub/dora-distil-whisper/pyproject.toml | 2 +- node-hub/dora-echo/pyproject.toml | 2 +- node-hub/dora-internvl/pyproject.toml | 2 +- node-hub/dora-keyboard/pyproject.toml | 4 +- node-hub/dora-microphone/pyproject.toml | 2 +- node-hub/dora-openai-server/pyproject.toml | 2 +- node-hub/dora-opus/pyproject.toml | 2 +- node-hub/dora-parler/pyproject.toml | 2 +- node-hub/dora-qwenvl/pyproject.toml | 3 +- node-hub/dora-vad/pyproject.toml | 2 +- node-hub/dora-yolo/pyproject.toml | 2 +- .../llama-factory-recorder/pyproject.toml | 2 +- node-hub/opencv-plot/pyproject.toml | 2 +- node-hub/opencv-video-capture/pyproject.toml | 2 +- node-hub/pyarrow-assert/pyproject.toml | 2 +- node-hub/pyarrow-sender/pyproject.toml | 2 +- node-hub/terminal-input/pyproject.toml | 2 +- 24 files changed, 127 insertions(+), 77 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 001a5dcc7..6d55bb3db 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1190,7 +1190,7 @@ dependencies = [ [[package]] name = "benchmark-example-node" -version = "0.3.7-rc0" +version = "0.3.7-rc1" dependencies = [ "dora-node-api", "eyre", @@ -1203,7 +1203,7 @@ dependencies = [ [[package]] name = "benchmark-example-sink" -version = "0.3.7-rc0" +version = "0.3.7-rc1" dependencies = [ "dora-node-api", "eyre", @@ -1811,7 +1811,7 @@ dependencies = [ [[package]] name = "communication-layer-pub-sub" -version = "0.3.7-rc0" +version = "0.3.7-rc1" dependencies = [ "flume 0.10.14", "zenoh", @@ -1819,7 +1819,7 @@ dependencies = [ [[package]] name = "communication-layer-request-reply" -version = "0.3.7-rc0" +version = "0.3.7-rc1" [[package]] name = "concurrent-queue" @@ -2335,7 +2335,7 @@ dependencies = [ [[package]] name = "dora-arrow-convert" -version = "0.3.7-rc0" +version = "0.3.7-rc1" dependencies = [ "arrow", "eyre", @@ -2343,7 +2343,7 @@ dependencies = [ [[package]] name = "dora-cli" -version = "0.3.7-rc0" +version = "0.3.7-rc1" dependencies = [ "bat", "clap 4.5.20", @@ -2381,7 +2381,7 @@ dependencies = [ [[package]] name = "dora-coordinator" -version = "0.3.7-rc0" +version = "0.3.7-rc1" dependencies = [ "ctrlc", "dora-core", @@ -2401,7 +2401,7 @@ dependencies = [ [[package]] name = "dora-core" -version = "0.3.7-rc0" +version = "0.3.7-rc1" dependencies = [ "dora-message", "eyre", @@ -2420,7 +2420,7 @@ dependencies = [ [[package]] name = "dora-daemon" -version = "0.3.7-rc0" +version = "0.3.7-rc1" dependencies = [ "aligned-vec", "async-trait", @@ -2452,7 +2452,7 @@ dependencies = [ [[package]] name = "dora-download" -version = "0.3.7-rc0" +version = "0.3.7-rc1" dependencies = [ "eyre", "reqwest", @@ -2501,7 +2501,7 @@ dependencies = [ [[package]] name = "dora-metrics" -version = "0.3.7-rc0" +version = "0.3.7-rc1" dependencies = [ "eyre", "opentelemetry 0.22.0", @@ -2512,7 +2512,7 @@ dependencies = [ [[package]] name = "dora-node-api" -version = "0.3.7-rc0" +version = "0.3.7-rc1" dependencies = [ "aligned-vec", "arrow", @@ -2536,7 +2536,7 @@ dependencies = [ [[package]] name = "dora-node-api-c" -version = "0.3.7-rc0" +version = "0.3.7-rc1" dependencies = [ "arrow-array", "dora-node-api", @@ -2546,7 +2546,7 @@ dependencies = [ [[package]] name = "dora-node-api-cxx" -version = "0.3.7-rc0" +version = "0.3.7-rc1" dependencies = [ "cxx", "cxx-build", @@ -2563,7 +2563,7 @@ dependencies = [ [[package]] name = "dora-node-api-python" -version = "0.3.7-rc0" +version = "0.3.7-rc1" dependencies = [ "arrow", "dora-node-api", @@ -2581,7 +2581,7 @@ dependencies = [ [[package]] name = "dora-openai-proxy-server" -version = "0.3.7-rc0" +version = "0.3.7-rc1" dependencies = [ "chrono", "dora-node-api", @@ -2602,7 +2602,7 @@ dependencies = [ [[package]] name = "dora-operator-api" -version = "0.3.7-rc0" +version = "0.3.7-rc1" dependencies = [ "dora-arrow-convert", "dora-operator-api-macros", @@ -2611,14 +2611,14 @@ dependencies = [ [[package]] name = "dora-operator-api-c" -version = "0.3.7-rc0" +version = "0.3.7-rc1" dependencies = [ "dora-operator-api-types", ] [[package]] name = "dora-operator-api-cxx" -version = "0.3.7-rc0" +version = "0.3.7-rc1" dependencies = [ "cxx", "cxx-build", @@ -2627,7 +2627,7 @@ dependencies = [ [[package]] name = "dora-operator-api-macros" -version = "0.3.7-rc0" +version = "0.3.7-rc1" dependencies = [ "proc-macro2", "quote", @@ -2636,7 +2636,7 @@ dependencies = [ [[package]] name = "dora-operator-api-python" -version = "0.3.7-rc0" +version = "0.3.7-rc1" dependencies = [ "aligned-vec", "arrow", @@ -2652,7 +2652,7 @@ dependencies = [ [[package]] name = "dora-operator-api-types" -version = "0.3.7-rc0" +version = "0.3.7-rc1" dependencies = [ "arrow", "dora-arrow-convert", @@ -2661,7 +2661,7 @@ dependencies = [ [[package]] name = "dora-record" -version = "0.3.7-rc0" +version = "0.3.7-rc1" dependencies = [ "chrono", "dora-node-api", @@ -2673,7 +2673,7 @@ dependencies = [ [[package]] name = "dora-rerun" -version = "0.3.7-rc0" +version = "0.3.7-rc1" dependencies = [ "dora-node-api", "eyre", @@ -2740,7 +2740,7 @@ dependencies = [ [[package]] name = "dora-runtime" -version = "0.3.7-rc0" +version = "0.3.7-rc1" dependencies = [ "aligned-vec", "arrow", @@ -2768,7 +2768,7 @@ dependencies = [ [[package]] name = "dora-tracing" -version = "0.3.7-rc0" +version = "0.3.7-rc1" dependencies = [ "eyre", "opentelemetry 0.18.0", @@ -5200,7 +5200,7 @@ dependencies = [ [[package]] name = "multiple-daemons-example-node" -version = "0.3.7-rc0" +version = "0.3.7-rc1" dependencies = [ "dora-node-api", "eyre", @@ -5211,14 +5211,14 @@ dependencies = [ [[package]] name = "multiple-daemons-example-operator" -version = "0.3.7-rc0" +version = "0.3.7-rc1" dependencies = [ "dora-operator-api", ] [[package]] name = "multiple-daemons-example-sink" -version = "0.3.7-rc0" +version = "0.3.7-rc1" dependencies = [ "dora-node-api", "eyre", @@ -8890,7 +8890,7 @@ dependencies = [ [[package]] name = "rust-dataflow-example-node" -version = "0.3.7-rc0" +version = "0.3.7-rc1" dependencies = [ "dora-node-api", "eyre", @@ -8901,7 +8901,7 @@ dependencies = [ [[package]] name = "rust-dataflow-example-sink" -version = "0.3.7-rc0" +version = "0.3.7-rc1" dependencies = [ "dora-node-api", "eyre", @@ -8909,7 +8909,7 @@ dependencies = [ [[package]] name = "rust-dataflow-example-sink-dynamic" -version = "0.3.7-rc0" +version = "0.3.7-rc1" dependencies = [ "dora-node-api", "eyre", @@ -8917,7 +8917,7 @@ dependencies = [ [[package]] name = "rust-dataflow-example-status-node" -version = "0.3.7-rc0" +version = "0.3.7-rc1" dependencies = [ "dora-node-api", "eyre", @@ -8936,7 +8936,7 @@ dependencies = [ [[package]] name = "rust-ros2-dataflow-example-node" -version = "0.3.7-rc0" +version = "0.3.7-rc1" dependencies = [ "dora-node-api", "dora-ros2-bridge", @@ -9490,7 +9490,7 @@ dependencies = [ [[package]] name = "shared-memory-server" -version = "0.3.7-rc0" +version = "0.3.7-rc1" dependencies = [ "bincode", "eyre", @@ -10057,7 +10057,7 @@ dependencies = [ [[package]] name = "terminal-print" -version = "0.3.7-rc0" +version = "0.3.7-rc1" dependencies = [ "dora-node-api", "eyre", diff --git a/Cargo.toml b/Cargo.toml index 16115599a..f8c1b8a52 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -41,31 +41,31 @@ members = [ [workspace.package] # Make sure to also bump `apis/node/python/__init__.py` version. -version = "0.3.7-rc0" +version = "0.3.7-rc1" description = "`dora` goal is to be a low latency, composable, and distributed data flow." documentation = "https://dora.carsmos.ai" license = "Apache-2.0" repository = "https://github.com/dora-rs/dora/" [workspace.dependencies] -dora-node-api = { version = "0.3.7-rc0", path = "apis/rust/node", default-features = false } -dora-node-api-python = { version = "0.3.7-rc0", path = "apis/python/node", default-features = false } -dora-operator-api = { version = "0.3.7-rc0", path = "apis/rust/operator", default-features = false } -dora-operator-api-macros = { version = "0.3.7-rc0", path = "apis/rust/operator/macros" } -dora-operator-api-types = { version = "0.3.7-rc0", path = "apis/rust/operator/types" } -dora-operator-api-python = { version = "0.3.7-rc0", path = "apis/python/operator" } -dora-operator-api-c = { version = "0.3.7-rc0", path = "apis/c/operator" } -dora-node-api-c = { version = "0.3.7-rc0", path = "apis/c/node" } -dora-core = { version = "0.3.7-rc0", path = "libraries/core" } -dora-arrow-convert = { version = "0.3.7-rc0", path = "libraries/arrow-convert" } -dora-tracing = { version = "0.3.7-rc0", path = "libraries/extensions/telemetry/tracing" } -dora-metrics = { version = "0.3.7-rc0", path = "libraries/extensions/telemetry/metrics" } -dora-download = { version = "0.3.7-rc0", path = "libraries/extensions/download" } -shared-memory-server = { version = "0.3.7-rc0", path = "libraries/shared-memory-server" } -communication-layer-request-reply = { version = "0.3.7-rc0", path = "libraries/communication-layer/request-reply" } -dora-runtime = { version = "0.3.7-rc0", path = "binaries/runtime" } -dora-daemon = { version = "0.3.7-rc0", path = "binaries/daemon" } -dora-coordinator = { version = "0.3.7-rc0", path = "binaries/coordinator" } +dora-node-api = { version = "0.3.7-rc1", path = "apis/rust/node", default-features = false } +dora-node-api-python = { version = "0.3.7-rc1", path = "apis/python/node", default-features = false } +dora-operator-api = { version = "0.3.7-rc1", path = "apis/rust/operator", default-features = false } +dora-operator-api-macros = { version = "0.3.7-rc1", path = "apis/rust/operator/macros" } +dora-operator-api-types = { version = "0.3.7-rc1", path = "apis/rust/operator/types" } +dora-operator-api-python = { version = "0.3.7-rc1", path = "apis/python/operator" } +dora-operator-api-c = { version = "0.3.7-rc1", path = "apis/c/operator" } +dora-node-api-c = { version = "0.3.7-rc1", path = "apis/c/node" } +dora-core = { version = "0.3.7-rc1", path = "libraries/core" } +dora-arrow-convert = { version = "0.3.7-rc1", path = "libraries/arrow-convert" } +dora-tracing = { version = "0.3.7-rc1", path = "libraries/extensions/telemetry/tracing" } +dora-metrics = { version = "0.3.7-rc1", path = "libraries/extensions/telemetry/metrics" } +dora-download = { version = "0.3.7-rc1", path = "libraries/extensions/download" } +shared-memory-server = { version = "0.3.7-rc1", path = "libraries/shared-memory-server" } +communication-layer-request-reply = { version = "0.3.7-rc1", path = "libraries/communication-layer/request-reply" } +dora-runtime = { version = "0.3.7-rc1", path = "binaries/runtime" } +dora-daemon = { version = "0.3.7-rc1", path = "binaries/daemon" } +dora-coordinator = { version = "0.3.7-rc1", path = "binaries/coordinator" } dora-ros2-bridge = { path = "libraries/extensions/ros2-bridge" } dora-ros2-bridge-msg-gen = { path = "libraries/extensions/ros2-bridge/msg-gen" } dora-ros2-bridge-python = { path = "libraries/extensions/ros2-bridge/python" } diff --git a/Changelog.md b/Changelog.md index 2d72e1993..2274b6103 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,5 +1,54 @@ # Changelog +## v0.3.7 (2024-11-04) + +## What's Changed + +- Post release `0.3.6` small fix by @haixuanTao in https://github.com/dora-rs/dora/pull/638 +- Changes to template by @XxChang in https://github.com/dora-rs/dora/pull/639 +- Add appending to PATH instruction inside installation script by @Hennzau in https://github.com/dora-rs/dora/pull/641 +- Make the benchmark run in release and at full speed by @Hennzau in https://github.com/dora-rs/dora/pull/644 +- Use the new node syntax for examples dataflow by @Hennzau in https://github.com/dora-rs/dora/pull/643 +- Improve beginner experience by @Hennzau in https://github.com/dora-rs/dora/pull/645 +- improve node-hub pytest by @haixuanTao in https://github.com/dora-rs/dora/pull/640 +- Fix not-null terminated string print within C template by @haixuanTao in https://github.com/dora-rs/dora/pull/654 +- Raise error if dora-coordinator is not connected when calling `dora destroy` by @haixuanTao in https://github.com/dora-rs/dora/pull/655 +- Coordinator stopped on bad control command by @Hennzau in https://github.com/dora-rs/dora/pull/650 +- Add support for Qwenvl2 by @haixuanTao in https://github.com/dora-rs/dora/pull/646 +- Fix distributed node by @haixuanTao in https://github.com/dora-rs/dora/pull/658 +- Small install script update for bash by @haixuanTao in https://github.com/dora-rs/dora/pull/657 +- Add additional image encoding by @haixuanTao in https://github.com/dora-rs/dora/pull/661 +- `dora-echo` replicate the topic received with the topic send by @haixuanTao in https://github.com/dora-rs/dora/pull/663 +- Update dependencies by @renovate in https://github.com/dora-rs/dora/pull/656 +- Bump pyo3 and arrow versions by @haixuanTao in https://github.com/dora-rs/dora/pull/667 +- Fix ros2 bridge incompatibility with CI Ubuntu 24 and with pyo3 22 by @haixuanTao in https://github.com/dora-rs/dora/pull/670 +- Add transformers version pinning for qwenvl2 by @haixuanTao in https://github.com/dora-rs/dora/pull/665 +- Remove cli dataflow path check by @haixuanTao in https://github.com/dora-rs/dora/pull/662 +- Better error handling for unknown output by @haixuanTao in https://github.com/dora-rs/dora/pull/675 +- Fix llama recorder multi image recorder by @haixuanTao in https://github.com/dora-rs/dora/pull/677 +- Dora openai server example by @haixuanTao in https://github.com/dora-rs/dora/pull/676 +- Update dependencies by @renovate in https://github.com/dora-rs/dora/pull/674 +- Create Rust-based openai api proxy server in node hub by @phil-opp in https://github.com/dora-rs/dora/pull/678 +- Update dependencies by @renovate in https://github.com/dora-rs/dora/pull/679 +- Update Rust crate hyper to v0.14.30 by @renovate in https://github.com/dora-rs/dora/pull/680 +- Fix hanged coordinator when failing to connect to the daemon on destroy command by @haixuanTao in https://github.com/dora-rs/dora/pull/664 +- Small example improvement using pyarrow assertion by @haixuanTao in https://github.com/dora-rs/dora/pull/669 +- Fix dora list listing twice a stopping dataflow when using multiple daemon. by @haixuanTao in https://github.com/dora-rs/dora/pull/668 +- Add package flake by @Ben-PH in https://github.com/dora-rs/dora/pull/685 +- Add jpeg format to qwenvl2 by @haixuanTao in https://github.com/dora-rs/dora/pull/684 +- Enable downloading remote dataflow by @haixuanTao in https://github.com/dora-rs/dora/pull/682 +- Enable multiline build for better packaging of dora node. by @haixuanTao in https://github.com/dora-rs/dora/pull/683 +- Bump rerun version to 0.18 by @haixuanTao in https://github.com/dora-rs/dora/pull/686 +- Temporary fix qwenvl2 queue error by @haixuanTao in https://github.com/dora-rs/dora/pull/688 +- Make daemon loop over coordinator connection to make it possible to create a system service awaiting coordinator connection by @haixuanTao in https://github.com/dora-rs/dora/pull/689 +- Add translation example from chinese, french to english by @haixuanTao in https://github.com/dora-rs/dora/pull/681 + +## New Contributors + +- @Ben-PH made their first contribution in https://github.com/dora-rs/dora/pull/685 + +**Full Changelog**: https://github.com/dora-rs/dora/compare/v0.3.6...v0.3.7rc0 + ## v0.3.6 (2024-08-17) ## What's Changed diff --git a/binaries/cli/src/attach.rs b/binaries/cli/src/attach.rs index f2e5eebab..599715262 100644 --- a/binaries/cli/src/attach.rs +++ b/binaries/cli/src/attach.rs @@ -35,7 +35,7 @@ pub fn attach_dataflow( let working_dir = dataflow_path .canonicalize() - .context("failed to canoncialize dataflow path")? + .context("failed to canonicalize dataflow path")? .parent() .ok_or_else(|| eyre::eyre!("canonicalized dataflow path has no parent"))? .to_owned(); diff --git a/binaries/daemon/src/lib.rs b/binaries/daemon/src/lib.rs index ceddf3f92..1d1274f82 100644 --- a/binaries/daemon/src/lib.rs +++ b/binaries/daemon/src/lib.rs @@ -160,7 +160,7 @@ impl Daemon { pub async fn run_dataflow(dataflow_path: &Path) -> eyre::Result { let working_dir = dataflow_path .canonicalize() - .context("failed to canoncialize dataflow path")? + .context("failed to canonicalize dataflow path")? .parent() .ok_or_else(|| eyre::eyre!("canonicalized dataflow path has no parent"))? .to_owned(); diff --git a/libraries/extensions/telemetry/metrics/src/lib.rs b/libraries/extensions/telemetry/metrics/src/lib.rs index 7d24632d3..4ada426fe 100644 --- a/libraries/extensions/telemetry/metrics/src/lib.rs +++ b/libraries/extensions/telemetry/metrics/src/lib.rs @@ -44,6 +44,6 @@ pub fn init_metrics() -> metrics::Result { pub fn init_meter_provider(meter_id: String) -> Result { let meter_provider = init_metrics().context("Could not create opentelemetry meter")?; let meter = meter_provider.meter(meter_id); - init_process_observer(meter).context("could not initiale system metrics observer")?; + init_process_observer(meter).context("could not initiat system metrics observer")?; Ok(meter_provider) } diff --git a/node-hub/dora-argotranslate/pyproject.toml b/node-hub/dora-argotranslate/pyproject.toml index 045693463..4d508ae76 100644 --- a/node-hub/dora-argotranslate/pyproject.toml +++ b/node-hub/dora-argotranslate/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "dora-argotranslate" -version = "0.3.7rc0" +version = "0.3.7rc1" description = "Dora Node for Text translating using Argostranslate" readme = "README.md" authors = [ diff --git a/node-hub/dora-distil-whisper/pyproject.toml b/node-hub/dora-distil-whisper/pyproject.toml index 00ba84cf7..d1a039ac6 100644 --- a/node-hub/dora-distil-whisper/pyproject.toml +++ b/node-hub/dora-distil-whisper/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "dora-distil-whisper" -version = "0.3.7rc0" +version = "0.3.7rc1" authors = [ "Haixuan Xavier Tao ", "Enzo Le Van ", diff --git a/node-hub/dora-echo/pyproject.toml b/node-hub/dora-echo/pyproject.toml index 8b2a292ba..b0a2c319d 100644 --- a/node-hub/dora-echo/pyproject.toml +++ b/node-hub/dora-echo/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "dora-echo" -version = "0.3.6" +version = "0.3.7-rc1" authors = [ "Haixuan Xavier Tao ", "Enzo Le Van ", diff --git a/node-hub/dora-internvl/pyproject.toml b/node-hub/dora-internvl/pyproject.toml index 4f2b6f5d2..46897f559 100644 --- a/node-hub/dora-internvl/pyproject.toml +++ b/node-hub/dora-internvl/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "dora-internvl" -version = "0.3.7rc0" +version = "0.3.7rc1" authors = [ "Haixuan Xavier Tao ", "Enzo Le Van ", diff --git a/node-hub/dora-keyboard/pyproject.toml b/node-hub/dora-keyboard/pyproject.toml index 60ee1a562..796f8b300 100644 --- a/node-hub/dora-keyboard/pyproject.toml +++ b/node-hub/dora-keyboard/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "dora-keyboard" -version = "0.3.7rc0" +version = "0.3.7rc1" authors = [ "Haixuan Xavier Tao ", "Enzo Le Van ", @@ -16,7 +16,7 @@ packages = [{ include = "dora_keyboard" }] dora-rs = "^0.3.6" numpy = "< 2.0.0" pyarrow = ">= 5.0.0" -pynput = "^1.7.6" +pynput = "^1.6.0" python = "^3.7" [tool.poetry.scripts] diff --git a/node-hub/dora-microphone/pyproject.toml b/node-hub/dora-microphone/pyproject.toml index fa51374f6..36052e2a8 100644 --- a/node-hub/dora-microphone/pyproject.toml +++ b/node-hub/dora-microphone/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "dora-microphone" -version = "0.3.7rc0" +version = "0.3.7rc1" authors = [ "Haixuan Xavier Tao ", "Enzo Le Van ", diff --git a/node-hub/dora-openai-server/pyproject.toml b/node-hub/dora-openai-server/pyproject.toml index 0a9dfde2a..c4b7f4be5 100644 --- a/node-hub/dora-openai-server/pyproject.toml +++ b/node-hub/dora-openai-server/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "dora-openai-server" -version = "0.3.7rc0" +version = "0.3.7rc1" authors = [ "Haixuan Xavier Tao ", "Enzo Le Van ", diff --git a/node-hub/dora-opus/pyproject.toml b/node-hub/dora-opus/pyproject.toml index ef0f7abd4..fe37ec6aa 100644 --- a/node-hub/dora-opus/pyproject.toml +++ b/node-hub/dora-opus/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "dora-opus" -version = "0.3.7rc0" +version = "0.3.7rc1" description = "Dora Node for Text translating using Opus" readme = "README.md" authors = [ diff --git a/node-hub/dora-parler/pyproject.toml b/node-hub/dora-parler/pyproject.toml index fa4fa7c88..851693c95 100644 --- a/node-hub/dora-parler/pyproject.toml +++ b/node-hub/dora-parler/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "dora-parler" -version = "0.3.7rc0" +version = "0.3.7rc1" authors = [ "Haixuan Xavier Tao ", "Enzo Le Van ", diff --git a/node-hub/dora-qwenvl/pyproject.toml b/node-hub/dora-qwenvl/pyproject.toml index 836dc7673..d117b6c16 100644 --- a/node-hub/dora-qwenvl/pyproject.toml +++ b/node-hub/dora-qwenvl/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "dora-qwenvl" -version = "0.3.7rc0" +version = "0.3.7rc1" authors = [ "Haixuan Xavier Tao ", "Enzo Le Van ", @@ -21,6 +21,7 @@ qwen-vl-utils = "^0.0.2" accelerate = "^0.33" opencv-python = ">= 4.1.1" modelscope = "^1.18.1" +peft = "0.13.2" # flash_attn = "^2.6.1" # Install using: pip install -U flash-attn --no-build-isolation diff --git a/node-hub/dora-vad/pyproject.toml b/node-hub/dora-vad/pyproject.toml index 9a34479f9..116b4656f 100644 --- a/node-hub/dora-vad/pyproject.toml +++ b/node-hub/dora-vad/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "dora-vad" -version = "0.3.7rc0" +version = "0.3.7rc1" description = "Dora Node for Text translating using Argostranslate" readme = "README.md" authors = [ diff --git a/node-hub/dora-yolo/pyproject.toml b/node-hub/dora-yolo/pyproject.toml index 594e00480..cc8b97d74 100644 --- a/node-hub/dora-yolo/pyproject.toml +++ b/node-hub/dora-yolo/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "dora-yolo" -version = "0.3.7rc0" +version = "0.3.7rc1" authors = [ "Haixuan Xavier Tao ", "Enzo Le Van ", diff --git a/node-hub/llama-factory-recorder/pyproject.toml b/node-hub/llama-factory-recorder/pyproject.toml index b62706fcc..4151970b6 100644 --- a/node-hub/llama-factory-recorder/pyproject.toml +++ b/node-hub/llama-factory-recorder/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "llama-factory-recorder" -version = "0.3.7rc0" +version = "0.3.7rc1" authors = [ "Haixuan Xavier Tao ", "Enzo Le Van ", diff --git a/node-hub/opencv-plot/pyproject.toml b/node-hub/opencv-plot/pyproject.toml index 3eebf5eb9..c50367ecf 100644 --- a/node-hub/opencv-plot/pyproject.toml +++ b/node-hub/opencv-plot/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "opencv-plot" -version = "0.3.7rc0" +version = "0.3.7rc1" authors = [ "Haixuan Xavier Tao ", "Enzo Le Van ", diff --git a/node-hub/opencv-video-capture/pyproject.toml b/node-hub/opencv-video-capture/pyproject.toml index 4c273d7d3..36acadf0a 100644 --- a/node-hub/opencv-video-capture/pyproject.toml +++ b/node-hub/opencv-video-capture/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "opencv-video-capture" -version = "0.3.7rc0" +version = "0.3.7rc1" authors = [ "Haixuan Xavier Tao ", "Enzo Le Van ", diff --git a/node-hub/pyarrow-assert/pyproject.toml b/node-hub/pyarrow-assert/pyproject.toml index 17ec727a3..ec3c67d76 100644 --- a/node-hub/pyarrow-assert/pyproject.toml +++ b/node-hub/pyarrow-assert/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "pyarrow-assert" -version = "0.3.7rc0" +version = "0.3.7rc1" authors = [ "Haixuan Xavier Tao ", "Enzo Le Van ", diff --git a/node-hub/pyarrow-sender/pyproject.toml b/node-hub/pyarrow-sender/pyproject.toml index 68b8ee3b0..e1154104f 100644 --- a/node-hub/pyarrow-sender/pyproject.toml +++ b/node-hub/pyarrow-sender/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "pyarrow-sender" -version = "0.3.7rc0" +version = "0.3.7rc1" authors = [ "Haixuan Xavier Tao ", "Enzo Le Van ", diff --git a/node-hub/terminal-input/pyproject.toml b/node-hub/terminal-input/pyproject.toml index 5c4a4689f..a1fd57959 100644 --- a/node-hub/terminal-input/pyproject.toml +++ b/node-hub/terminal-input/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "terminal-input" -version = "0.3.7rc0" +version = "0.3.7rc1" authors = [ "Haixuan Xavier Tao ", "Enzo Le Van ", From 7a93f726e35ea47f697b8586d1d8c822e8107632 Mon Sep 17 00:00:00 2001 From: haixuanTao Date: Mon, 4 Nov 2024 12:45:37 +0100 Subject: [PATCH 03/14] Allow wheel to be present on pip --- .github/workflows/node-hub-ci-cd.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/node-hub-ci-cd.yml b/.github/workflows/node-hub-ci-cd.yml index ce7c63c0e..078d897e0 100644 --- a/.github/workflows/node-hub-ci-cd.yml +++ b/.github/workflows/node-hub-ci-cd.yml @@ -133,13 +133,11 @@ jobs: if [[ -f "Cargo.toml" && -f "pyproject.toml" ]]; then echo "Publishing $dir using maturin..." - poetry publish + maturin publish --skip-existing else if [ -f "pyproject.toml" ]; then echo "Publishing $dir using Poetry..." - poetry publish --build - fi - fi + poetry publish --build --skip-existing if [ -f "Cargo.toml" ]; then echo "Publishing $dir using Cargo..." From 19ab8a90d2155d3c0e2571d4dd0ec8aa1c94776a Mon Sep 17 00:00:00 2001 From: haixuanTao Date: Mon, 4 Nov 2024 13:39:25 +0100 Subject: [PATCH 04/14] Fix CD pypi publish name conflict for cli and node Fix CI/CD for pip release --- .github/workflows/node-hub-ci-cd.yml | 25 ++++++---- .github/workflows/pip-release.yml | 71 ++++++++++------------------ 2 files changed, 40 insertions(+), 56 deletions(-) diff --git a/.github/workflows/node-hub-ci-cd.yml b/.github/workflows/node-hub-ci-cd.yml index 078d897e0..1cc1808f3 100644 --- a/.github/workflows/node-hub-ci-cd.yml +++ b/.github/workflows/node-hub-ci-cd.yml @@ -130,16 +130,21 @@ jobs: run: | dir=$(pwd) base_dir=$(basename "$dir") + ignored_folders=("dora-parler") - if [[ -f "Cargo.toml" && -f "pyproject.toml" ]]; then - echo "Publishing $dir using maturin..." - maturin publish --skip-existing + if [[ " ${ignored_folders[@]} " =~ " ${base_dir} " ]]; then + echo "Skipping $base_dir as there is a hf model fetching issue..." else - if [ -f "pyproject.toml" ]; then - echo "Publishing $dir using Poetry..." - poetry publish --build --skip-existing - - if [ -f "Cargo.toml" ]; then - echo "Publishing $dir using Cargo..." - cargo publish + if [[ -f "Cargo.toml" && -f "pyproject.toml" ]]; then + echo "Publishing $dir using maturin..." + maturin publish --skip-existing + else + if [ -f "pyproject.toml" ]; then + echo "Publishing $dir using Poetry..." + poetry publish --build --skip-existing + + if [ -f "Cargo.toml" ]; then + echo "Publishing $dir using Cargo..." + cargo publish + fi fi diff --git a/.github/workflows/pip-release.yml b/.github/workflows/pip-release.yml index 72c17fa20..e8bea26e4 100644 --- a/.github/workflows/pip-release.yml +++ b/.github/workflows/pip-release.yml @@ -41,7 +41,9 @@ jobs: # target: ppc64le repository: - path: apis/python/node + name: dora-node-api - path: binaries/cli + name: dora-rs-cli steps: - uses: actions/checkout@v4 - uses: actions/setup-python@v5 @@ -63,16 +65,8 @@ jobs: if: github.event_name == 'release' uses: actions/upload-artifact@v4 with: - name: wheels-linux-${{ matrix.platform.target }} + name: ${{ matrix.repository.name }}-linux-${{ matrix.platform.target }} path: ${{ matrix.repository.path }}/dist - - name: Upload to release - if: github.event_name == 'release' - uses: svenstaro/upload-release-action@v2 - with: - repo_token: ${{ secrets.GITHUB_TOKEN }} - file: ${{ matrix.repository.path }}/dist/* - tag: ${{ github.ref }} - file_glob: true musllinux: runs-on: ${{ matrix.platform.runner }} @@ -87,7 +81,9 @@ jobs: target: aarch64 repository: - path: apis/python/node + name: dora-node-api - path: binaries/cli + name: dora-rs-cli steps: - uses: actions/checkout@v4 - uses: actions/setup-python@v5 @@ -105,16 +101,8 @@ jobs: if: github.event_name == 'release' uses: actions/upload-artifact@v4 with: - name: wheels-musllinux-${{ matrix.platform.target }} + name: ${{ matrix.repository.name }}-musllinux-${{ matrix.platform.target }} path: ${{ matrix.repository.path }}/dist - - name: Upload to release - if: github.event_name == 'release' - uses: svenstaro/upload-release-action@v2 - with: - repo_token: ${{ secrets.GITHUB_TOKEN }} - file: ${{ matrix.repository.path }}/dist/* - tag: ${{ github.ref }} - file_glob: true musleabi: runs-on: ubuntu-22.04 @@ -129,7 +117,9 @@ jobs: ] repository: - path: apis/python/node + name: dora-node-api - path: binaries/cli + name: dora-rs-cli container: image: docker://messense/rust-musl-cross:${{ matrix.platform.image_tag }} env: @@ -151,16 +141,8 @@ jobs: if: github.event_name == 'release' uses: actions/upload-artifact@v3 with: - name: wheels-musllinux-${{ matrix.platform.target }} + name: ${{ matrix.repository.name }}-musllinux-${{ matrix.platform.target }} path: ${{ matrix.repository.path }}/dist - - name: Upload to release - if: github.event_name == 'release' - uses: svenstaro/upload-release-action@v2 - with: - repo_token: ${{ secrets.GITHUB_TOKEN }} - file: ${{ matrix.repository.path }}/dist/* - tag: ${{ github.ref }} - file_glob: true windows: runs-on: ${{ matrix.platform.runner }} @@ -171,7 +153,9 @@ jobs: target: x64 repository: - path: apis/python/node + name: dora-node-api - path: binaries/cli + name: dora-rs-cli steps: - uses: actions/checkout@v4 - uses: actions/setup-python@v5 @@ -189,16 +173,8 @@ jobs: if: github.event_name == 'release' uses: actions/upload-artifact@v4 with: - name: wheels-windows-${{ matrix.platform.target }} + name: ${{ matrix.repository.name }}-windows-${{ matrix.platform.target }} path: ${{ matrix.repository.path }}/dist - - name: Upload to release - if: github.event_name == 'release' - uses: svenstaro/upload-release-action@v2 - with: - repo_token: ${{ secrets.GITHUB_TOKEN }} - file: ${{ matrix.repository.path }}/dist/* - tag: ${{ github.ref }} - file_glob: true macos: runs-on: ${{ matrix.platform.runner }} @@ -211,7 +187,9 @@ jobs: target: aarch64 repository: - path: apis/python/node + name: dora-node-api - path: binaries/cli + name: dora-rs-cli steps: - uses: actions/checkout@v4 - uses: actions/setup-python@v5 @@ -228,16 +206,8 @@ jobs: if: github.event_name == 'release' uses: actions/upload-artifact@v4 with: - name: wheels-macos-${{ matrix.platform.target }} + name: ${{ matrix.repository.name }}-macos-${{ matrix.platform.target }} path: ${{ matrix.repository.path }}/dist - - name: Upload to release - if: github.event_name == 'release' - uses: svenstaro/upload-release-action@v2 - with: - repo_token: ${{ secrets.GITHUB_TOKEN }} - file: ${{ matrix.repository.path }}/dist/* - tag: ${{ github.ref }} - file_glob: true sdist: runs-on: ubuntu-22.04 @@ -245,7 +215,9 @@ jobs: matrix: repository: - path: apis/python/node + name: dora-node-api - path: binaries/cli + name: dora-rs-cli steps: - uses: actions/checkout@v3 - name: Build sdist @@ -266,6 +238,13 @@ jobs: runs-on: ubuntu-22.04 if: github.event_name == 'release' && startsWith(github.ref, 'refs/tags/') needs: [linux, musllinux, musleabi, windows, macos, sdist] + strategy: + matrix: + repository: + - path: apis/python/node + name: dora-node-api + - path: binaries/cli + name: dora-rs-cli steps: - uses: actions/download-artifact@v4 - name: Publish to PyPI @@ -274,4 +253,4 @@ jobs: MATURIN_PYPI_TOKEN: ${{ secrets.PYPI_PASS }} with: command: upload - args: --non-interactive --skip-existing wheels-*/* + args: --non-interactive --skip-existing ${{ matrix.repository.name }}-*/* From d51f8ccb714616e0c787a1510b81cc0d03ecd1e4 Mon Sep 17 00:00:00 2001 From: Haixuan Xavier Tao Date: Mon, 11 Nov 2024 11:49:03 +0100 Subject: [PATCH 05/14] Update libraries/extensions/telemetry/metrics/src/lib.rs Co-authored-by: Philipp Oppermann bump dora to `0.3.7` --- Cargo.lock | 72 +++++++++---------- Cargo.toml | 38 +++++----- .../extensions/telemetry/metrics/src/lib.rs | 2 +- node-hub/dora-argotranslate/pyproject.toml | 2 +- node-hub/dora-distil-whisper/pyproject.toml | 2 +- node-hub/dora-echo/pyproject.toml | 2 +- node-hub/dora-internvl/pyproject.toml | 2 +- node-hub/dora-keyboard/pyproject.toml | 2 +- node-hub/dora-microphone/pyproject.toml | 2 +- node-hub/dora-openai-server/pyproject.toml | 2 +- node-hub/dora-opus/pyproject.toml | 2 +- node-hub/dora-parler/pyproject.toml | 2 +- node-hub/dora-qwenvl/pyproject.toml | 2 +- node-hub/dora-vad/pyproject.toml | 2 +- node-hub/dora-yolo/pyproject.toml | 2 +- .../llama-factory-recorder/pyproject.toml | 2 +- node-hub/opencv-plot/pyproject.toml | 2 +- node-hub/opencv-video-capture/pyproject.toml | 2 +- node-hub/pyarrow-assert/pyproject.toml | 2 +- node-hub/pyarrow-sender/pyproject.toml | 2 +- node-hub/terminal-input/pyproject.toml | 2 +- 21 files changed, 74 insertions(+), 74 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6d55bb3db..20d5d4fed 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1190,7 +1190,7 @@ dependencies = [ [[package]] name = "benchmark-example-node" -version = "0.3.7-rc1" +version = "0.3.7" dependencies = [ "dora-node-api", "eyre", @@ -1203,7 +1203,7 @@ dependencies = [ [[package]] name = "benchmark-example-sink" -version = "0.3.7-rc1" +version = "0.3.7" dependencies = [ "dora-node-api", "eyre", @@ -1811,7 +1811,7 @@ dependencies = [ [[package]] name = "communication-layer-pub-sub" -version = "0.3.7-rc1" +version = "0.3.7" dependencies = [ "flume 0.10.14", "zenoh", @@ -1819,7 +1819,7 @@ dependencies = [ [[package]] name = "communication-layer-request-reply" -version = "0.3.7-rc1" +version = "0.3.7" [[package]] name = "concurrent-queue" @@ -2335,7 +2335,7 @@ dependencies = [ [[package]] name = "dora-arrow-convert" -version = "0.3.7-rc1" +version = "0.3.7" dependencies = [ "arrow", "eyre", @@ -2343,7 +2343,7 @@ dependencies = [ [[package]] name = "dora-cli" -version = "0.3.7-rc1" +version = "0.3.7" dependencies = [ "bat", "clap 4.5.20", @@ -2381,7 +2381,7 @@ dependencies = [ [[package]] name = "dora-coordinator" -version = "0.3.7-rc1" +version = "0.3.7" dependencies = [ "ctrlc", "dora-core", @@ -2401,7 +2401,7 @@ dependencies = [ [[package]] name = "dora-core" -version = "0.3.7-rc1" +version = "0.3.7" dependencies = [ "dora-message", "eyre", @@ -2420,7 +2420,7 @@ dependencies = [ [[package]] name = "dora-daemon" -version = "0.3.7-rc1" +version = "0.3.7" dependencies = [ "aligned-vec", "async-trait", @@ -2452,7 +2452,7 @@ dependencies = [ [[package]] name = "dora-download" -version = "0.3.7-rc1" +version = "0.3.7" dependencies = [ "eyre", "reqwest", @@ -2501,7 +2501,7 @@ dependencies = [ [[package]] name = "dora-metrics" -version = "0.3.7-rc1" +version = "0.3.7" dependencies = [ "eyre", "opentelemetry 0.22.0", @@ -2512,7 +2512,7 @@ dependencies = [ [[package]] name = "dora-node-api" -version = "0.3.7-rc1" +version = "0.3.7" dependencies = [ "aligned-vec", "arrow", @@ -2536,7 +2536,7 @@ dependencies = [ [[package]] name = "dora-node-api-c" -version = "0.3.7-rc1" +version = "0.3.7" dependencies = [ "arrow-array", "dora-node-api", @@ -2546,7 +2546,7 @@ dependencies = [ [[package]] name = "dora-node-api-cxx" -version = "0.3.7-rc1" +version = "0.3.7" dependencies = [ "cxx", "cxx-build", @@ -2563,7 +2563,7 @@ dependencies = [ [[package]] name = "dora-node-api-python" -version = "0.3.7-rc1" +version = "0.3.7" dependencies = [ "arrow", "dora-node-api", @@ -2581,7 +2581,7 @@ dependencies = [ [[package]] name = "dora-openai-proxy-server" -version = "0.3.7-rc1" +version = "0.3.7" dependencies = [ "chrono", "dora-node-api", @@ -2602,7 +2602,7 @@ dependencies = [ [[package]] name = "dora-operator-api" -version = "0.3.7-rc1" +version = "0.3.7" dependencies = [ "dora-arrow-convert", "dora-operator-api-macros", @@ -2611,14 +2611,14 @@ dependencies = [ [[package]] name = "dora-operator-api-c" -version = "0.3.7-rc1" +version = "0.3.7" dependencies = [ "dora-operator-api-types", ] [[package]] name = "dora-operator-api-cxx" -version = "0.3.7-rc1" +version = "0.3.7" dependencies = [ "cxx", "cxx-build", @@ -2627,7 +2627,7 @@ dependencies = [ [[package]] name = "dora-operator-api-macros" -version = "0.3.7-rc1" +version = "0.3.7" dependencies = [ "proc-macro2", "quote", @@ -2636,7 +2636,7 @@ dependencies = [ [[package]] name = "dora-operator-api-python" -version = "0.3.7-rc1" +version = "0.3.7" dependencies = [ "aligned-vec", "arrow", @@ -2652,7 +2652,7 @@ dependencies = [ [[package]] name = "dora-operator-api-types" -version = "0.3.7-rc1" +version = "0.3.7" dependencies = [ "arrow", "dora-arrow-convert", @@ -2661,7 +2661,7 @@ dependencies = [ [[package]] name = "dora-record" -version = "0.3.7-rc1" +version = "0.3.7" dependencies = [ "chrono", "dora-node-api", @@ -2673,7 +2673,7 @@ dependencies = [ [[package]] name = "dora-rerun" -version = "0.3.7-rc1" +version = "0.3.7" dependencies = [ "dora-node-api", "eyre", @@ -2740,7 +2740,7 @@ dependencies = [ [[package]] name = "dora-runtime" -version = "0.3.7-rc1" +version = "0.3.7" dependencies = [ "aligned-vec", "arrow", @@ -2768,7 +2768,7 @@ dependencies = [ [[package]] name = "dora-tracing" -version = "0.3.7-rc1" +version = "0.3.7" dependencies = [ "eyre", "opentelemetry 0.18.0", @@ -5200,7 +5200,7 @@ dependencies = [ [[package]] name = "multiple-daemons-example-node" -version = "0.3.7-rc1" +version = "0.3.7" dependencies = [ "dora-node-api", "eyre", @@ -5211,14 +5211,14 @@ dependencies = [ [[package]] name = "multiple-daemons-example-operator" -version = "0.3.7-rc1" +version = "0.3.7" dependencies = [ "dora-operator-api", ] [[package]] name = "multiple-daemons-example-sink" -version = "0.3.7-rc1" +version = "0.3.7" dependencies = [ "dora-node-api", "eyre", @@ -8890,7 +8890,7 @@ dependencies = [ [[package]] name = "rust-dataflow-example-node" -version = "0.3.7-rc1" +version = "0.3.7" dependencies = [ "dora-node-api", "eyre", @@ -8901,7 +8901,7 @@ dependencies = [ [[package]] name = "rust-dataflow-example-sink" -version = "0.3.7-rc1" +version = "0.3.7" dependencies = [ "dora-node-api", "eyre", @@ -8909,7 +8909,7 @@ dependencies = [ [[package]] name = "rust-dataflow-example-sink-dynamic" -version = "0.3.7-rc1" +version = "0.3.7" dependencies = [ "dora-node-api", "eyre", @@ -8917,7 +8917,7 @@ dependencies = [ [[package]] name = "rust-dataflow-example-status-node" -version = "0.3.7-rc1" +version = "0.3.7" dependencies = [ "dora-node-api", "eyre", @@ -8936,7 +8936,7 @@ dependencies = [ [[package]] name = "rust-ros2-dataflow-example-node" -version = "0.3.7-rc1" +version = "0.3.7" dependencies = [ "dora-node-api", "dora-ros2-bridge", @@ -9490,7 +9490,7 @@ dependencies = [ [[package]] name = "shared-memory-server" -version = "0.3.7-rc1" +version = "0.3.7" dependencies = [ "bincode", "eyre", @@ -10057,7 +10057,7 @@ dependencies = [ [[package]] name = "terminal-print" -version = "0.3.7-rc1" +version = "0.3.7" dependencies = [ "dora-node-api", "eyre", diff --git a/Cargo.toml b/Cargo.toml index f8c1b8a52..047146d74 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -41,31 +41,31 @@ members = [ [workspace.package] # Make sure to also bump `apis/node/python/__init__.py` version. -version = "0.3.7-rc1" +version = "0.3.7" description = "`dora` goal is to be a low latency, composable, and distributed data flow." documentation = "https://dora.carsmos.ai" license = "Apache-2.0" repository = "https://github.com/dora-rs/dora/" [workspace.dependencies] -dora-node-api = { version = "0.3.7-rc1", path = "apis/rust/node", default-features = false } -dora-node-api-python = { version = "0.3.7-rc1", path = "apis/python/node", default-features = false } -dora-operator-api = { version = "0.3.7-rc1", path = "apis/rust/operator", default-features = false } -dora-operator-api-macros = { version = "0.3.7-rc1", path = "apis/rust/operator/macros" } -dora-operator-api-types = { version = "0.3.7-rc1", path = "apis/rust/operator/types" } -dora-operator-api-python = { version = "0.3.7-rc1", path = "apis/python/operator" } -dora-operator-api-c = { version = "0.3.7-rc1", path = "apis/c/operator" } -dora-node-api-c = { version = "0.3.7-rc1", path = "apis/c/node" } -dora-core = { version = "0.3.7-rc1", path = "libraries/core" } -dora-arrow-convert = { version = "0.3.7-rc1", path = "libraries/arrow-convert" } -dora-tracing = { version = "0.3.7-rc1", path = "libraries/extensions/telemetry/tracing" } -dora-metrics = { version = "0.3.7-rc1", path = "libraries/extensions/telemetry/metrics" } -dora-download = { version = "0.3.7-rc1", path = "libraries/extensions/download" } -shared-memory-server = { version = "0.3.7-rc1", path = "libraries/shared-memory-server" } -communication-layer-request-reply = { version = "0.3.7-rc1", path = "libraries/communication-layer/request-reply" } -dora-runtime = { version = "0.3.7-rc1", path = "binaries/runtime" } -dora-daemon = { version = "0.3.7-rc1", path = "binaries/daemon" } -dora-coordinator = { version = "0.3.7-rc1", path = "binaries/coordinator" } +dora-node-api = { version = "0.3.7", path = "apis/rust/node", default-features = false } +dora-node-api-python = { version = "0.3.7", path = "apis/python/node", default-features = false } +dora-operator-api = { version = "0.3.7", path = "apis/rust/operator", default-features = false } +dora-operator-api-macros = { version = "0.3.7", path = "apis/rust/operator/macros" } +dora-operator-api-types = { version = "0.3.7", path = "apis/rust/operator/types" } +dora-operator-api-python = { version = "0.3.7", path = "apis/python/operator" } +dora-operator-api-c = { version = "0.3.7", path = "apis/c/operator" } +dora-node-api-c = { version = "0.3.7", path = "apis/c/node" } +dora-core = { version = "0.3.7", path = "libraries/core" } +dora-arrow-convert = { version = "0.3.7", path = "libraries/arrow-convert" } +dora-tracing = { version = "0.3.7", path = "libraries/extensions/telemetry/tracing" } +dora-metrics = { version = "0.3.7", path = "libraries/extensions/telemetry/metrics" } +dora-download = { version = "0.3.7", path = "libraries/extensions/download" } +shared-memory-server = { version = "0.3.7", path = "libraries/shared-memory-server" } +communication-layer-request-reply = { version = "0.3.7", path = "libraries/communication-layer/request-reply" } +dora-runtime = { version = "0.3.7", path = "binaries/runtime" } +dora-daemon = { version = "0.3.7", path = "binaries/daemon" } +dora-coordinator = { version = "0.3.7", path = "binaries/coordinator" } dora-ros2-bridge = { path = "libraries/extensions/ros2-bridge" } dora-ros2-bridge-msg-gen = { path = "libraries/extensions/ros2-bridge/msg-gen" } dora-ros2-bridge-python = { path = "libraries/extensions/ros2-bridge/python" } diff --git a/libraries/extensions/telemetry/metrics/src/lib.rs b/libraries/extensions/telemetry/metrics/src/lib.rs index 4ada426fe..dc6b19818 100644 --- a/libraries/extensions/telemetry/metrics/src/lib.rs +++ b/libraries/extensions/telemetry/metrics/src/lib.rs @@ -44,6 +44,6 @@ pub fn init_metrics() -> metrics::Result { pub fn init_meter_provider(meter_id: String) -> Result { let meter_provider = init_metrics().context("Could not create opentelemetry meter")?; let meter = meter_provider.meter(meter_id); - init_process_observer(meter).context("could not initiat system metrics observer")?; + init_process_observer(meter).context("could not initiate system metrics observer")?; Ok(meter_provider) } diff --git a/node-hub/dora-argotranslate/pyproject.toml b/node-hub/dora-argotranslate/pyproject.toml index 4d508ae76..eaf5cb602 100644 --- a/node-hub/dora-argotranslate/pyproject.toml +++ b/node-hub/dora-argotranslate/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "dora-argotranslate" -version = "0.3.7rc1" +version = "0.3.7" description = "Dora Node for Text translating using Argostranslate" readme = "README.md" authors = [ diff --git a/node-hub/dora-distil-whisper/pyproject.toml b/node-hub/dora-distil-whisper/pyproject.toml index d1a039ac6..760682d95 100644 --- a/node-hub/dora-distil-whisper/pyproject.toml +++ b/node-hub/dora-distil-whisper/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "dora-distil-whisper" -version = "0.3.7rc1" +version = "0.3.7" authors = [ "Haixuan Xavier Tao ", "Enzo Le Van ", diff --git a/node-hub/dora-echo/pyproject.toml b/node-hub/dora-echo/pyproject.toml index b0a2c319d..93754efd6 100644 --- a/node-hub/dora-echo/pyproject.toml +++ b/node-hub/dora-echo/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "dora-echo" -version = "0.3.7-rc1" +version = "0.3.7" authors = [ "Haixuan Xavier Tao ", "Enzo Le Van ", diff --git a/node-hub/dora-internvl/pyproject.toml b/node-hub/dora-internvl/pyproject.toml index 46897f559..47fcf69f6 100644 --- a/node-hub/dora-internvl/pyproject.toml +++ b/node-hub/dora-internvl/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "dora-internvl" -version = "0.3.7rc1" +version = "0.3.7" authors = [ "Haixuan Xavier Tao ", "Enzo Le Van ", diff --git a/node-hub/dora-keyboard/pyproject.toml b/node-hub/dora-keyboard/pyproject.toml index 796f8b300..952d2c043 100644 --- a/node-hub/dora-keyboard/pyproject.toml +++ b/node-hub/dora-keyboard/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "dora-keyboard" -version = "0.3.7rc1" +version = "0.3.7" authors = [ "Haixuan Xavier Tao ", "Enzo Le Van ", diff --git a/node-hub/dora-microphone/pyproject.toml b/node-hub/dora-microphone/pyproject.toml index 36052e2a8..5d5d135ad 100644 --- a/node-hub/dora-microphone/pyproject.toml +++ b/node-hub/dora-microphone/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "dora-microphone" -version = "0.3.7rc1" +version = "0.3.7" authors = [ "Haixuan Xavier Tao ", "Enzo Le Van ", diff --git a/node-hub/dora-openai-server/pyproject.toml b/node-hub/dora-openai-server/pyproject.toml index c4b7f4be5..3cbe0ef62 100644 --- a/node-hub/dora-openai-server/pyproject.toml +++ b/node-hub/dora-openai-server/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "dora-openai-server" -version = "0.3.7rc1" +version = "0.3.7" authors = [ "Haixuan Xavier Tao ", "Enzo Le Van ", diff --git a/node-hub/dora-opus/pyproject.toml b/node-hub/dora-opus/pyproject.toml index fe37ec6aa..a0ba1b8a0 100644 --- a/node-hub/dora-opus/pyproject.toml +++ b/node-hub/dora-opus/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "dora-opus" -version = "0.3.7rc1" +version = "0.3.7" description = "Dora Node for Text translating using Opus" readme = "README.md" authors = [ diff --git a/node-hub/dora-parler/pyproject.toml b/node-hub/dora-parler/pyproject.toml index 851693c95..a94b21b59 100644 --- a/node-hub/dora-parler/pyproject.toml +++ b/node-hub/dora-parler/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "dora-parler" -version = "0.3.7rc1" +version = "0.3.7" authors = [ "Haixuan Xavier Tao ", "Enzo Le Van ", diff --git a/node-hub/dora-qwenvl/pyproject.toml b/node-hub/dora-qwenvl/pyproject.toml index d117b6c16..060562eea 100644 --- a/node-hub/dora-qwenvl/pyproject.toml +++ b/node-hub/dora-qwenvl/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "dora-qwenvl" -version = "0.3.7rc1" +version = "0.3.7" authors = [ "Haixuan Xavier Tao ", "Enzo Le Van ", diff --git a/node-hub/dora-vad/pyproject.toml b/node-hub/dora-vad/pyproject.toml index 116b4656f..3c0254b9d 100644 --- a/node-hub/dora-vad/pyproject.toml +++ b/node-hub/dora-vad/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "dora-vad" -version = "0.3.7rc1" +version = "0.3.7" description = "Dora Node for Text translating using Argostranslate" readme = "README.md" authors = [ diff --git a/node-hub/dora-yolo/pyproject.toml b/node-hub/dora-yolo/pyproject.toml index cc8b97d74..fc8f530ce 100644 --- a/node-hub/dora-yolo/pyproject.toml +++ b/node-hub/dora-yolo/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "dora-yolo" -version = "0.3.7rc1" +version = "0.3.7" authors = [ "Haixuan Xavier Tao ", "Enzo Le Van ", diff --git a/node-hub/llama-factory-recorder/pyproject.toml b/node-hub/llama-factory-recorder/pyproject.toml index 4151970b6..1b22c7985 100644 --- a/node-hub/llama-factory-recorder/pyproject.toml +++ b/node-hub/llama-factory-recorder/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "llama-factory-recorder" -version = "0.3.7rc1" +version = "0.3.7" authors = [ "Haixuan Xavier Tao ", "Enzo Le Van ", diff --git a/node-hub/opencv-plot/pyproject.toml b/node-hub/opencv-plot/pyproject.toml index c50367ecf..4bc2005cf 100644 --- a/node-hub/opencv-plot/pyproject.toml +++ b/node-hub/opencv-plot/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "opencv-plot" -version = "0.3.7rc1" +version = "0.3.7" authors = [ "Haixuan Xavier Tao ", "Enzo Le Van ", diff --git a/node-hub/opencv-video-capture/pyproject.toml b/node-hub/opencv-video-capture/pyproject.toml index 36acadf0a..1e84f538d 100644 --- a/node-hub/opencv-video-capture/pyproject.toml +++ b/node-hub/opencv-video-capture/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "opencv-video-capture" -version = "0.3.7rc1" +version = "0.3.7" authors = [ "Haixuan Xavier Tao ", "Enzo Le Van ", diff --git a/node-hub/pyarrow-assert/pyproject.toml b/node-hub/pyarrow-assert/pyproject.toml index ec3c67d76..96bfe639c 100644 --- a/node-hub/pyarrow-assert/pyproject.toml +++ b/node-hub/pyarrow-assert/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "pyarrow-assert" -version = "0.3.7rc1" +version = "0.3.7" authors = [ "Haixuan Xavier Tao ", "Enzo Le Van ", diff --git a/node-hub/pyarrow-sender/pyproject.toml b/node-hub/pyarrow-sender/pyproject.toml index e1154104f..d91be6f25 100644 --- a/node-hub/pyarrow-sender/pyproject.toml +++ b/node-hub/pyarrow-sender/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "pyarrow-sender" -version = "0.3.7rc1" +version = "0.3.7" authors = [ "Haixuan Xavier Tao ", "Enzo Le Van ", diff --git a/node-hub/terminal-input/pyproject.toml b/node-hub/terminal-input/pyproject.toml index a1fd57959..4db343312 100644 --- a/node-hub/terminal-input/pyproject.toml +++ b/node-hub/terminal-input/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "terminal-input" -version = "0.3.7rc1" +version = "0.3.7" authors = [ "Haixuan Xavier Tao ", "Enzo Le Van ", From 42a3817a9edd9e82aea7a62c2f9a16e83e6d42e4 Mon Sep 17 00:00:00 2001 From: haixuanTao Date: Fri, 15 Nov 2024 04:53:05 +0100 Subject: [PATCH 06/14] Bump version to v0.3.7-rc2 --- .gitignore | 4 + Cargo.lock | 74 +++++++++---------- Cargo.toml | 40 +++++----- libraries/message/Cargo.toml | 2 +- node-hub/dora-argotranslate/pyproject.toml | 2 +- node-hub/dora-distil-whisper/pyproject.toml | 2 +- node-hub/dora-echo/pyproject.toml | 2 +- node-hub/dora-internvl/pyproject.toml | 2 +- node-hub/dora-keyboard/pyproject.toml | 2 +- node-hub/dora-microphone/pyproject.toml | 2 +- node-hub/dora-openai-server/pyproject.toml | 2 +- node-hub/dora-opus/pyproject.toml | 2 +- node-hub/dora-parler/pyproject.toml | 2 +- node-hub/dora-qwenvl/pyproject.toml | 2 +- node-hub/dora-vad/pyproject.toml | 2 +- node-hub/dora-yolo/pyproject.toml | 2 +- .../llama-factory-recorder/pyproject.toml | 2 +- node-hub/opencv-plot/pyproject.toml | 2 +- node-hub/opencv-video-capture/pyproject.toml | 2 +- node-hub/pyarrow-assert/pyproject.toml | 2 +- node-hub/pyarrow-sender/pyproject.toml | 2 +- node-hub/terminal-input/pyproject.toml | 2 +- 22 files changed, 80 insertions(+), 76 deletions(-) diff --git a/.gitignore b/.gitignore index 9895e349d..93d3608af 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,10 @@ examples/**/*.txt **/*.arrow *.pt +# Remove hdf and stl files +*.stl +*.hdf5 + # Removing images. *.jpg *.mp3 diff --git a/Cargo.lock b/Cargo.lock index 20d5d4fed..053077aa0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1190,7 +1190,7 @@ dependencies = [ [[package]] name = "benchmark-example-node" -version = "0.3.7" +version = "0.3.7-rc2" dependencies = [ "dora-node-api", "eyre", @@ -1203,7 +1203,7 @@ dependencies = [ [[package]] name = "benchmark-example-sink" -version = "0.3.7" +version = "0.3.7-rc2" dependencies = [ "dora-node-api", "eyre", @@ -1811,7 +1811,7 @@ dependencies = [ [[package]] name = "communication-layer-pub-sub" -version = "0.3.7" +version = "0.3.7-rc2" dependencies = [ "flume 0.10.14", "zenoh", @@ -1819,7 +1819,7 @@ dependencies = [ [[package]] name = "communication-layer-request-reply" -version = "0.3.7" +version = "0.3.7-rc2" [[package]] name = "concurrent-queue" @@ -2335,7 +2335,7 @@ dependencies = [ [[package]] name = "dora-arrow-convert" -version = "0.3.7" +version = "0.3.7-rc2" dependencies = [ "arrow", "eyre", @@ -2343,7 +2343,7 @@ dependencies = [ [[package]] name = "dora-cli" -version = "0.3.7" +version = "0.3.7-rc2" dependencies = [ "bat", "clap 4.5.20", @@ -2381,7 +2381,7 @@ dependencies = [ [[package]] name = "dora-coordinator" -version = "0.3.7" +version = "0.3.7-rc2" dependencies = [ "ctrlc", "dora-core", @@ -2401,7 +2401,7 @@ dependencies = [ [[package]] name = "dora-core" -version = "0.3.7" +version = "0.3.7-rc2" dependencies = [ "dora-message", "eyre", @@ -2420,7 +2420,7 @@ dependencies = [ [[package]] name = "dora-daemon" -version = "0.3.7" +version = "0.3.7-rc2" dependencies = [ "aligned-vec", "async-trait", @@ -2452,7 +2452,7 @@ dependencies = [ [[package]] name = "dora-download" -version = "0.3.7" +version = "0.3.7-rc2" dependencies = [ "eyre", "reqwest", @@ -2481,7 +2481,7 @@ dependencies = [ [[package]] name = "dora-message" -version = "0.4.0" +version = "0.4.1-rc2" dependencies = [ "aligned-vec", "arrow-data", @@ -2501,7 +2501,7 @@ dependencies = [ [[package]] name = "dora-metrics" -version = "0.3.7" +version = "0.3.7-rc2" dependencies = [ "eyre", "opentelemetry 0.22.0", @@ -2512,7 +2512,7 @@ dependencies = [ [[package]] name = "dora-node-api" -version = "0.3.7" +version = "0.3.7-rc2" dependencies = [ "aligned-vec", "arrow", @@ -2536,7 +2536,7 @@ dependencies = [ [[package]] name = "dora-node-api-c" -version = "0.3.7" +version = "0.3.7-rc2" dependencies = [ "arrow-array", "dora-node-api", @@ -2546,7 +2546,7 @@ dependencies = [ [[package]] name = "dora-node-api-cxx" -version = "0.3.7" +version = "0.3.7-rc2" dependencies = [ "cxx", "cxx-build", @@ -2563,7 +2563,7 @@ dependencies = [ [[package]] name = "dora-node-api-python" -version = "0.3.7" +version = "0.3.7-rc2" dependencies = [ "arrow", "dora-node-api", @@ -2581,7 +2581,7 @@ dependencies = [ [[package]] name = "dora-openai-proxy-server" -version = "0.3.7" +version = "0.3.7-rc2" dependencies = [ "chrono", "dora-node-api", @@ -2602,7 +2602,7 @@ dependencies = [ [[package]] name = "dora-operator-api" -version = "0.3.7" +version = "0.3.7-rc2" dependencies = [ "dora-arrow-convert", "dora-operator-api-macros", @@ -2611,14 +2611,14 @@ dependencies = [ [[package]] name = "dora-operator-api-c" -version = "0.3.7" +version = "0.3.7-rc2" dependencies = [ "dora-operator-api-types", ] [[package]] name = "dora-operator-api-cxx" -version = "0.3.7" +version = "0.3.7-rc2" dependencies = [ "cxx", "cxx-build", @@ -2627,7 +2627,7 @@ dependencies = [ [[package]] name = "dora-operator-api-macros" -version = "0.3.7" +version = "0.3.7-rc2" dependencies = [ "proc-macro2", "quote", @@ -2636,7 +2636,7 @@ dependencies = [ [[package]] name = "dora-operator-api-python" -version = "0.3.7" +version = "0.3.7-rc2" dependencies = [ "aligned-vec", "arrow", @@ -2652,7 +2652,7 @@ dependencies = [ [[package]] name = "dora-operator-api-types" -version = "0.3.7" +version = "0.3.7-rc2" dependencies = [ "arrow", "dora-arrow-convert", @@ -2661,7 +2661,7 @@ dependencies = [ [[package]] name = "dora-record" -version = "0.3.7" +version = "0.3.7-rc2" dependencies = [ "chrono", "dora-node-api", @@ -2673,7 +2673,7 @@ dependencies = [ [[package]] name = "dora-rerun" -version = "0.3.7" +version = "0.3.7-rc2" dependencies = [ "dora-node-api", "eyre", @@ -2740,7 +2740,7 @@ dependencies = [ [[package]] name = "dora-runtime" -version = "0.3.7" +version = "0.3.7-rc2" dependencies = [ "aligned-vec", "arrow", @@ -2768,7 +2768,7 @@ dependencies = [ [[package]] name = "dora-tracing" -version = "0.3.7" +version = "0.3.7-rc2" dependencies = [ "eyre", "opentelemetry 0.18.0", @@ -5200,7 +5200,7 @@ dependencies = [ [[package]] name = "multiple-daemons-example-node" -version = "0.3.7" +version = "0.3.7-rc2" dependencies = [ "dora-node-api", "eyre", @@ -5211,14 +5211,14 @@ dependencies = [ [[package]] name = "multiple-daemons-example-operator" -version = "0.3.7" +version = "0.3.7-rc2" dependencies = [ "dora-operator-api", ] [[package]] name = "multiple-daemons-example-sink" -version = "0.3.7" +version = "0.3.7-rc2" dependencies = [ "dora-node-api", "eyre", @@ -8890,7 +8890,7 @@ dependencies = [ [[package]] name = "rust-dataflow-example-node" -version = "0.3.7" +version = "0.3.7-rc2" dependencies = [ "dora-node-api", "eyre", @@ -8901,7 +8901,7 @@ dependencies = [ [[package]] name = "rust-dataflow-example-sink" -version = "0.3.7" +version = "0.3.7-rc2" dependencies = [ "dora-node-api", "eyre", @@ -8909,7 +8909,7 @@ dependencies = [ [[package]] name = "rust-dataflow-example-sink-dynamic" -version = "0.3.7" +version = "0.3.7-rc2" dependencies = [ "dora-node-api", "eyre", @@ -8917,7 +8917,7 @@ dependencies = [ [[package]] name = "rust-dataflow-example-status-node" -version = "0.3.7" +version = "0.3.7-rc2" dependencies = [ "dora-node-api", "eyre", @@ -8936,7 +8936,7 @@ dependencies = [ [[package]] name = "rust-ros2-dataflow-example-node" -version = "0.3.7" +version = "0.3.7-rc2" dependencies = [ "dora-node-api", "dora-ros2-bridge", @@ -9490,7 +9490,7 @@ dependencies = [ [[package]] name = "shared-memory-server" -version = "0.3.7" +version = "0.3.7-rc2" dependencies = [ "bincode", "eyre", @@ -10057,7 +10057,7 @@ dependencies = [ [[package]] name = "terminal-print" -version = "0.3.7" +version = "0.3.7-rc2" dependencies = [ "dora-node-api", "eyre", diff --git a/Cargo.toml b/Cargo.toml index 047146d74..7633430f8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -41,36 +41,36 @@ members = [ [workspace.package] # Make sure to also bump `apis/node/python/__init__.py` version. -version = "0.3.7" +version = "0.3.7-rc2" description = "`dora` goal is to be a low latency, composable, and distributed data flow." documentation = "https://dora.carsmos.ai" license = "Apache-2.0" repository = "https://github.com/dora-rs/dora/" [workspace.dependencies] -dora-node-api = { version = "0.3.7", path = "apis/rust/node", default-features = false } -dora-node-api-python = { version = "0.3.7", path = "apis/python/node", default-features = false } -dora-operator-api = { version = "0.3.7", path = "apis/rust/operator", default-features = false } -dora-operator-api-macros = { version = "0.3.7", path = "apis/rust/operator/macros" } -dora-operator-api-types = { version = "0.3.7", path = "apis/rust/operator/types" } -dora-operator-api-python = { version = "0.3.7", path = "apis/python/operator" } -dora-operator-api-c = { version = "0.3.7", path = "apis/c/operator" } -dora-node-api-c = { version = "0.3.7", path = "apis/c/node" } -dora-core = { version = "0.3.7", path = "libraries/core" } -dora-arrow-convert = { version = "0.3.7", path = "libraries/arrow-convert" } -dora-tracing = { version = "0.3.7", path = "libraries/extensions/telemetry/tracing" } -dora-metrics = { version = "0.3.7", path = "libraries/extensions/telemetry/metrics" } -dora-download = { version = "0.3.7", path = "libraries/extensions/download" } -shared-memory-server = { version = "0.3.7", path = "libraries/shared-memory-server" } -communication-layer-request-reply = { version = "0.3.7", path = "libraries/communication-layer/request-reply" } -dora-runtime = { version = "0.3.7", path = "binaries/runtime" } -dora-daemon = { version = "0.3.7", path = "binaries/daemon" } -dora-coordinator = { version = "0.3.7", path = "binaries/coordinator" } +dora-node-api = { version = "0.3.7-rc2", path = "apis/rust/node", default-features = false } +dora-node-api-python = { version = "0.3.7-rc2", path = "apis/python/node", default-features = false } +dora-operator-api = { version = "0.3.7-rc2", path = "apis/rust/operator", default-features = false } +dora-operator-api-macros = { version = "0.3.7-rc2", path = "apis/rust/operator/macros" } +dora-operator-api-types = { version = "0.3.7-rc2", path = "apis/rust/operator/types" } +dora-operator-api-python = { version = "0.3.7-rc2", path = "apis/python/operator" } +dora-operator-api-c = { version = "0.3.7-rc2", path = "apis/c/operator" } +dora-node-api-c = { version = "0.3.7-rc2", path = "apis/c/node" } +dora-core = { version = "0.3.7-rc2", path = "libraries/core" } +dora-arrow-convert = { version = "0.3.7-rc2", path = "libraries/arrow-convert" } +dora-tracing = { version = "0.3.7-rc2", path = "libraries/extensions/telemetry/tracing" } +dora-metrics = { version = "0.3.7-rc2", path = "libraries/extensions/telemetry/metrics" } +dora-download = { version = "0.3.7-rc2", path = "libraries/extensions/download" } +shared-memory-server = { version = "0.3.7-rc2", path = "libraries/shared-memory-server" } +communication-layer-request-reply = { version = "0.3.7-rc2", path = "libraries/communication-layer/request-reply" } +dora-runtime = { version = "0.3.7-rc2", path = "binaries/runtime" } +dora-daemon = { version = "0.3.7-rc2", path = "binaries/daemon" } +dora-coordinator = { version = "0.3.7-rc2", path = "binaries/coordinator" } dora-ros2-bridge = { path = "libraries/extensions/ros2-bridge" } dora-ros2-bridge-msg-gen = { path = "libraries/extensions/ros2-bridge/msg-gen" } dora-ros2-bridge-python = { path = "libraries/extensions/ros2-bridge/python" } # versioned independently from the other dora crates -dora-message = { version = "0.4.0", path = "libraries/message" } +dora-message = { version = "0.4.1-rc2", path = "libraries/message" } arrow = { version = "53" } arrow-schema = { version = "53" } arrow-data = { version = "53" } diff --git a/libraries/message/Cargo.toml b/libraries/message/Cargo.toml index c0ee45fdf..0cfc581b4 100644 --- a/libraries/message/Cargo.toml +++ b/libraries/message/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "dora-message" # versioned separately from the other dora crates -version = "0.4.0" +version = "0.4.1-rc2" edition = "2021" documentation.workspace = true description.workspace = true diff --git a/node-hub/dora-argotranslate/pyproject.toml b/node-hub/dora-argotranslate/pyproject.toml index eaf5cb602..1c0460abc 100644 --- a/node-hub/dora-argotranslate/pyproject.toml +++ b/node-hub/dora-argotranslate/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "dora-argotranslate" -version = "0.3.7" +version = "0.3.7-rc2" description = "Dora Node for Text translating using Argostranslate" readme = "README.md" authors = [ diff --git a/node-hub/dora-distil-whisper/pyproject.toml b/node-hub/dora-distil-whisper/pyproject.toml index 760682d95..523a9fca4 100644 --- a/node-hub/dora-distil-whisper/pyproject.toml +++ b/node-hub/dora-distil-whisper/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "dora-distil-whisper" -version = "0.3.7" +version = "0.3.7-rc2" authors = [ "Haixuan Xavier Tao ", "Enzo Le Van ", diff --git a/node-hub/dora-echo/pyproject.toml b/node-hub/dora-echo/pyproject.toml index 93754efd6..e0bcd6230 100644 --- a/node-hub/dora-echo/pyproject.toml +++ b/node-hub/dora-echo/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "dora-echo" -version = "0.3.7" +version = "0.3.7-rc2" authors = [ "Haixuan Xavier Tao ", "Enzo Le Van ", diff --git a/node-hub/dora-internvl/pyproject.toml b/node-hub/dora-internvl/pyproject.toml index 47fcf69f6..a01672f2e 100644 --- a/node-hub/dora-internvl/pyproject.toml +++ b/node-hub/dora-internvl/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "dora-internvl" -version = "0.3.7" +version = "0.3.7-rc2" authors = [ "Haixuan Xavier Tao ", "Enzo Le Van ", diff --git a/node-hub/dora-keyboard/pyproject.toml b/node-hub/dora-keyboard/pyproject.toml index 952d2c043..67c2a4bfe 100644 --- a/node-hub/dora-keyboard/pyproject.toml +++ b/node-hub/dora-keyboard/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "dora-keyboard" -version = "0.3.7" +version = "0.3.7-rc2" authors = [ "Haixuan Xavier Tao ", "Enzo Le Van ", diff --git a/node-hub/dora-microphone/pyproject.toml b/node-hub/dora-microphone/pyproject.toml index 5d5d135ad..04ea3eec1 100644 --- a/node-hub/dora-microphone/pyproject.toml +++ b/node-hub/dora-microphone/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "dora-microphone" -version = "0.3.7" +version = "0.3.7-rc2" authors = [ "Haixuan Xavier Tao ", "Enzo Le Van ", diff --git a/node-hub/dora-openai-server/pyproject.toml b/node-hub/dora-openai-server/pyproject.toml index 3cbe0ef62..c2f7f7dc5 100644 --- a/node-hub/dora-openai-server/pyproject.toml +++ b/node-hub/dora-openai-server/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "dora-openai-server" -version = "0.3.7" +version = "0.3.7-rc2" authors = [ "Haixuan Xavier Tao ", "Enzo Le Van ", diff --git a/node-hub/dora-opus/pyproject.toml b/node-hub/dora-opus/pyproject.toml index a0ba1b8a0..9064fb7e0 100644 --- a/node-hub/dora-opus/pyproject.toml +++ b/node-hub/dora-opus/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "dora-opus" -version = "0.3.7" +version = "0.3.7-rc2" description = "Dora Node for Text translating using Opus" readme = "README.md" authors = [ diff --git a/node-hub/dora-parler/pyproject.toml b/node-hub/dora-parler/pyproject.toml index a94b21b59..5e3763d09 100644 --- a/node-hub/dora-parler/pyproject.toml +++ b/node-hub/dora-parler/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "dora-parler" -version = "0.3.7" +version = "0.3.7-rc2" authors = [ "Haixuan Xavier Tao ", "Enzo Le Van ", diff --git a/node-hub/dora-qwenvl/pyproject.toml b/node-hub/dora-qwenvl/pyproject.toml index 060562eea..52b33946e 100644 --- a/node-hub/dora-qwenvl/pyproject.toml +++ b/node-hub/dora-qwenvl/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "dora-qwenvl" -version = "0.3.7" +version = "0.3.7-rc2" authors = [ "Haixuan Xavier Tao ", "Enzo Le Van ", diff --git a/node-hub/dora-vad/pyproject.toml b/node-hub/dora-vad/pyproject.toml index 3c0254b9d..3ff13cf76 100644 --- a/node-hub/dora-vad/pyproject.toml +++ b/node-hub/dora-vad/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "dora-vad" -version = "0.3.7" +version = "0.3.7-rc2" description = "Dora Node for Text translating using Argostranslate" readme = "README.md" authors = [ diff --git a/node-hub/dora-yolo/pyproject.toml b/node-hub/dora-yolo/pyproject.toml index fc8f530ce..99a82e4cc 100644 --- a/node-hub/dora-yolo/pyproject.toml +++ b/node-hub/dora-yolo/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "dora-yolo" -version = "0.3.7" +version = "0.3.7-rc2" authors = [ "Haixuan Xavier Tao ", "Enzo Le Van ", diff --git a/node-hub/llama-factory-recorder/pyproject.toml b/node-hub/llama-factory-recorder/pyproject.toml index 1b22c7985..688d1aec1 100644 --- a/node-hub/llama-factory-recorder/pyproject.toml +++ b/node-hub/llama-factory-recorder/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "llama-factory-recorder" -version = "0.3.7" +version = "0.3.7-rc2" authors = [ "Haixuan Xavier Tao ", "Enzo Le Van ", diff --git a/node-hub/opencv-plot/pyproject.toml b/node-hub/opencv-plot/pyproject.toml index 4bc2005cf..b2e95f417 100644 --- a/node-hub/opencv-plot/pyproject.toml +++ b/node-hub/opencv-plot/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "opencv-plot" -version = "0.3.7" +version = "0.3.7-rc2" authors = [ "Haixuan Xavier Tao ", "Enzo Le Van ", diff --git a/node-hub/opencv-video-capture/pyproject.toml b/node-hub/opencv-video-capture/pyproject.toml index 1e84f538d..64b0de8c0 100644 --- a/node-hub/opencv-video-capture/pyproject.toml +++ b/node-hub/opencv-video-capture/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "opencv-video-capture" -version = "0.3.7" +version = "0.3.7-rc2" authors = [ "Haixuan Xavier Tao ", "Enzo Le Van ", diff --git a/node-hub/pyarrow-assert/pyproject.toml b/node-hub/pyarrow-assert/pyproject.toml index 96bfe639c..b386063ae 100644 --- a/node-hub/pyarrow-assert/pyproject.toml +++ b/node-hub/pyarrow-assert/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "pyarrow-assert" -version = "0.3.7" +version = "0.3.7-rc2" authors = [ "Haixuan Xavier Tao ", "Enzo Le Van ", diff --git a/node-hub/pyarrow-sender/pyproject.toml b/node-hub/pyarrow-sender/pyproject.toml index d91be6f25..bcf3a0365 100644 --- a/node-hub/pyarrow-sender/pyproject.toml +++ b/node-hub/pyarrow-sender/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "pyarrow-sender" -version = "0.3.7" +version = "0.3.7-rc2" authors = [ "Haixuan Xavier Tao ", "Enzo Le Van ", diff --git a/node-hub/terminal-input/pyproject.toml b/node-hub/terminal-input/pyproject.toml index 4db343312..e8518c5f3 100644 --- a/node-hub/terminal-input/pyproject.toml +++ b/node-hub/terminal-input/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "terminal-input" -version = "0.3.7" +version = "0.3.7-rc2" authors = [ "Haixuan Xavier Tao ", "Enzo Le Van ", From 29f1bcfa5928a0db80158da21ea91a0ad90ec661 Mon Sep 17 00:00:00 2001 From: haixuanTao Date: Fri, 15 Nov 2024 06:48:49 +0100 Subject: [PATCH 07/14] Making cargo skip already published package --- .github/workflows/node-hub-ci-cd.yml | 18 ++++++-- .github/workflows/release.yml | 61 ++++++++++++++++++---------- 2 files changed, 54 insertions(+), 25 deletions(-) diff --git a/.github/workflows/node-hub-ci-cd.yml b/.github/workflows/node-hub-ci-cd.yml index 1cc1808f3..79f774453 100644 --- a/.github/workflows/node-hub-ci-cd.yml +++ b/.github/workflows/node-hub-ci-cd.yml @@ -137,14 +137,24 @@ jobs: else if [[ -f "Cargo.toml" && -f "pyproject.toml" ]]; then echo "Publishing $dir using maturin..." + pip3 install "maturin[patchelf]" maturin publish --skip-existing else if [ -f "pyproject.toml" ]; then echo "Publishing $dir using Poetry..." poetry publish --build --skip-existing - - if [ -f "Cargo.toml" ]; then - echo "Publishing $dir using Cargo..." - cargo publish + fi + + if [ -f "Cargo.toml" ]; then + echo "Publishing $dir using Cargo..." + package_name=$(cargo metadata --no-deps --format-version=1 | jq -r '.packages[0].name') + version=$(cargo metadata --no-deps --format-version=1 | jq -r '.packages[0].version') + if cargo search "$package_name" | grep -q "^$package_name = \"$version\""; then + echo "Package '$package_name' version '$version' already exists on crates.io. Skipping publish." + else + echo "Publishing package '$package_name' version '$version'..." + cargo publish + fi + fi fi fi diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e09c3b0de..580e2f55b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -42,6 +42,8 @@ jobs: - name: "Publish packages on `crates.io`" if: runner.os == 'Linux' + env: + CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }} run: | # Publishing those crates from outer crates with no dependency to inner crates @@ -52,33 +54,50 @@ jobs: # We should preferably test pre-releases before testing releases as # cargo publish might catch release issues that the workspace manages to fix using # workspace crates. + publish_if_not_exists() { + local package_name=$1 + local version=$(cargo metadata --no-deps --format-version=1 | jq -r '.packages[] | select(.name=="'"$package_name"'") | .version') + + if [[ -z $version ]]; then + echo "error: package '$package_name' not found in the workspace." + return 1 + fi + + if cargo search "$package_name" | grep -q "^$package_name = \"$version\""; then + echo "package '$package_name' version '$version' already exists on crates.io. skipping publish." + else + echo "publishing package '$package_name' version '$version'..." + cargo publish --package "$package_name" + fi + } - # Publish libraries crates - cargo publish -p dora-tracing --token ${{ secrets.CARGO_REGISTRY_TOKEN }} - cargo publish -p dora-metrics --token ${{ secrets.CARGO_REGISTRY_TOKEN }} - cargo publish -p dora-download --token ${{ secrets.CARGO_REGISTRY_TOKEN }} - cargo publish -p dora-core --token ${{ secrets.CARGO_REGISTRY_TOKEN }} # the dora-message package is versioned separately, so this publish command might fail if the version is already published - cargo publish -p dora-message --token ${{ secrets.CARGO_REGISTRY_TOKEN }} || true - cargo publish -p communication-layer-pub-sub --token ${{ secrets.CARGO_REGISTRY_TOKEN }} - cargo publish -p communication-layer-request-reply --token ${{ secrets.CARGO_REGISTRY_TOKEN }} - cargo publish -p shared-memory-server --token ${{ secrets.CARGO_REGISTRY_TOKEN }} - cargo publish -p dora-arrow-convert --token ${{ secrets.CARGO_REGISTRY_TOKEN }} + publish_if_not_exists dora-message + + # Publish libraries crates + publish_if_not_exists dora-tracing + publish_if_not_exists dora-metrics + publish_if_not_exists dora-download + publish_if_not_exists dora-core + publish_if_not_exists communication-layer-pub-sub + publish_if_not_exists communication-layer-request-reply + publish_if_not_exists shared-memory-server + publish_if_not_exists dora-arrow-convert # Publish rust API - cargo publish -p dora-operator-api-macros --token ${{ secrets.CARGO_REGISTRY_TOKEN }} - cargo publish -p dora-operator-api-types --token ${{ secrets.CARGO_REGISTRY_TOKEN }} - cargo publish -p dora-operator-api --token ${{ secrets.CARGO_REGISTRY_TOKEN }} - cargo publish -p dora-node-api --token ${{ secrets.CARGO_REGISTRY_TOKEN }} - cargo publish -p dora-operator-api-python --token ${{ secrets.CARGO_REGISTRY_TOKEN }} - cargo publish -p dora-operator-api-c --token ${{ secrets.CARGO_REGISTRY_TOKEN }} - cargo publish -p dora-node-api-c --token ${{ secrets.CARGO_REGISTRY_TOKEN }} + publish_if_not_exists dora-operator-api-macros + publish_if_not_exists dora-operator-api-types + publish_if_not_exists dora-operator-api + publish_if_not_exists dora-node-api + publish_if_not_exists dora-operator-api-python + publish_if_not_exists dora-operator-api-c + publish_if_not_exists dora-node-api-c # Publish binaries crates - cargo publish -p dora-coordinator --token ${{ secrets.CARGO_REGISTRY_TOKEN }} - cargo publish -p dora-runtime --token ${{ secrets.CARGO_REGISTRY_TOKEN }} - cargo publish -p dora-daemon --token ${{ secrets.CARGO_REGISTRY_TOKEN }} - cargo publish -p dora-cli --token ${{ secrets.CARGO_REGISTRY_TOKEN }} + publish_if_not_exists dora-coordinator + publish_if_not_exists dora-runtime + publish_if_not_exists dora-daemon + publish_if_not_exists dora-cli unix: runs-on: ${{ matrix.platform.runner }} From 95f09e050c4dc221668514a100dda0d946e4f26a Mon Sep 17 00:00:00 2001 From: haixuanTao Date: Fri, 15 Nov 2024 07:50:39 +0100 Subject: [PATCH 08/14] Fix piper version --- node-hub/dora-piper/pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/node-hub/dora-piper/pyproject.toml b/node-hub/dora-piper/pyproject.toml index cde150b79..530874193 100644 --- a/node-hub/dora-piper/pyproject.toml +++ b/node-hub/dora-piper/pyproject.toml @@ -10,7 +10,7 @@ packages = [{ include = "dora_piper" }] [tool.poetry.dependencies] dora-rs = "^0.3.6" python = "^3.7" -piper_sdk = "^0.0.7" +piper_sdk = "^0.0.8" [tool.poetry.scripts] From cd9c9ee8af697a24b2ba980f4296f9e199dee40e Mon Sep 17 00:00:00 2001 From: haixuanTao Date: Fri, 15 Nov 2024 11:10:55 +0100 Subject: [PATCH 09/14] Bump to v0.3.7 --- Cargo.lock | 74 +++++++++---------- Cargo.toml | 40 +++++----- libraries/message/Cargo.toml | 2 +- node-hub/dora-argotranslate/pyproject.toml | 2 +- node-hub/dora-echo/pyproject.toml | 2 +- node-hub/dora-internvl/pyproject.toml | 2 +- node-hub/dora-keyboard/pyproject.toml | 2 +- node-hub/dora-microphone/pyproject.toml | 2 +- node-hub/dora-openai-server/pyproject.toml | 2 +- node-hub/dora-opus/pyproject.toml | 2 +- node-hub/dora-parler/pyproject.toml | 2 +- node-hub/dora-qwenvl/pyproject.toml | 2 +- node-hub/dora-vad/pyproject.toml | 2 +- node-hub/dora-yolo/pyproject.toml | 2 +- .../llama-factory-recorder/pyproject.toml | 2 +- node-hub/opencv-plot/pyproject.toml | 2 +- node-hub/opencv-video-capture/pyproject.toml | 2 +- node-hub/pyarrow-assert/pyproject.toml | 2 +- node-hub/pyarrow-sender/pyproject.toml | 2 +- 19 files changed, 74 insertions(+), 74 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 053077aa0..ced71c737 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1190,7 +1190,7 @@ dependencies = [ [[package]] name = "benchmark-example-node" -version = "0.3.7-rc2" +version = "0.3.7" dependencies = [ "dora-node-api", "eyre", @@ -1203,7 +1203,7 @@ dependencies = [ [[package]] name = "benchmark-example-sink" -version = "0.3.7-rc2" +version = "0.3.7" dependencies = [ "dora-node-api", "eyre", @@ -1811,7 +1811,7 @@ dependencies = [ [[package]] name = "communication-layer-pub-sub" -version = "0.3.7-rc2" +version = "0.3.7" dependencies = [ "flume 0.10.14", "zenoh", @@ -1819,7 +1819,7 @@ dependencies = [ [[package]] name = "communication-layer-request-reply" -version = "0.3.7-rc2" +version = "0.3.7" [[package]] name = "concurrent-queue" @@ -2335,7 +2335,7 @@ dependencies = [ [[package]] name = "dora-arrow-convert" -version = "0.3.7-rc2" +version = "0.3.7" dependencies = [ "arrow", "eyre", @@ -2343,7 +2343,7 @@ dependencies = [ [[package]] name = "dora-cli" -version = "0.3.7-rc2" +version = "0.3.7" dependencies = [ "bat", "clap 4.5.20", @@ -2381,7 +2381,7 @@ dependencies = [ [[package]] name = "dora-coordinator" -version = "0.3.7-rc2" +version = "0.3.7" dependencies = [ "ctrlc", "dora-core", @@ -2401,7 +2401,7 @@ dependencies = [ [[package]] name = "dora-core" -version = "0.3.7-rc2" +version = "0.3.7" dependencies = [ "dora-message", "eyre", @@ -2420,7 +2420,7 @@ dependencies = [ [[package]] name = "dora-daemon" -version = "0.3.7-rc2" +version = "0.3.7" dependencies = [ "aligned-vec", "async-trait", @@ -2452,7 +2452,7 @@ dependencies = [ [[package]] name = "dora-download" -version = "0.3.7-rc2" +version = "0.3.7" dependencies = [ "eyre", "reqwest", @@ -2481,7 +2481,7 @@ dependencies = [ [[package]] name = "dora-message" -version = "0.4.1-rc2" +version = "0.4.1" dependencies = [ "aligned-vec", "arrow-data", @@ -2501,7 +2501,7 @@ dependencies = [ [[package]] name = "dora-metrics" -version = "0.3.7-rc2" +version = "0.3.7" dependencies = [ "eyre", "opentelemetry 0.22.0", @@ -2512,7 +2512,7 @@ dependencies = [ [[package]] name = "dora-node-api" -version = "0.3.7-rc2" +version = "0.3.7" dependencies = [ "aligned-vec", "arrow", @@ -2536,7 +2536,7 @@ dependencies = [ [[package]] name = "dora-node-api-c" -version = "0.3.7-rc2" +version = "0.3.7" dependencies = [ "arrow-array", "dora-node-api", @@ -2546,7 +2546,7 @@ dependencies = [ [[package]] name = "dora-node-api-cxx" -version = "0.3.7-rc2" +version = "0.3.7" dependencies = [ "cxx", "cxx-build", @@ -2563,7 +2563,7 @@ dependencies = [ [[package]] name = "dora-node-api-python" -version = "0.3.7-rc2" +version = "0.3.7" dependencies = [ "arrow", "dora-node-api", @@ -2581,7 +2581,7 @@ dependencies = [ [[package]] name = "dora-openai-proxy-server" -version = "0.3.7-rc2" +version = "0.3.7" dependencies = [ "chrono", "dora-node-api", @@ -2602,7 +2602,7 @@ dependencies = [ [[package]] name = "dora-operator-api" -version = "0.3.7-rc2" +version = "0.3.7" dependencies = [ "dora-arrow-convert", "dora-operator-api-macros", @@ -2611,14 +2611,14 @@ dependencies = [ [[package]] name = "dora-operator-api-c" -version = "0.3.7-rc2" +version = "0.3.7" dependencies = [ "dora-operator-api-types", ] [[package]] name = "dora-operator-api-cxx" -version = "0.3.7-rc2" +version = "0.3.7" dependencies = [ "cxx", "cxx-build", @@ -2627,7 +2627,7 @@ dependencies = [ [[package]] name = "dora-operator-api-macros" -version = "0.3.7-rc2" +version = "0.3.7" dependencies = [ "proc-macro2", "quote", @@ -2636,7 +2636,7 @@ dependencies = [ [[package]] name = "dora-operator-api-python" -version = "0.3.7-rc2" +version = "0.3.7" dependencies = [ "aligned-vec", "arrow", @@ -2652,7 +2652,7 @@ dependencies = [ [[package]] name = "dora-operator-api-types" -version = "0.3.7-rc2" +version = "0.3.7" dependencies = [ "arrow", "dora-arrow-convert", @@ -2661,7 +2661,7 @@ dependencies = [ [[package]] name = "dora-record" -version = "0.3.7-rc2" +version = "0.3.7" dependencies = [ "chrono", "dora-node-api", @@ -2673,7 +2673,7 @@ dependencies = [ [[package]] name = "dora-rerun" -version = "0.3.7-rc2" +version = "0.3.7" dependencies = [ "dora-node-api", "eyre", @@ -2740,7 +2740,7 @@ dependencies = [ [[package]] name = "dora-runtime" -version = "0.3.7-rc2" +version = "0.3.7" dependencies = [ "aligned-vec", "arrow", @@ -2768,7 +2768,7 @@ dependencies = [ [[package]] name = "dora-tracing" -version = "0.3.7-rc2" +version = "0.3.7" dependencies = [ "eyre", "opentelemetry 0.18.0", @@ -5200,7 +5200,7 @@ dependencies = [ [[package]] name = "multiple-daemons-example-node" -version = "0.3.7-rc2" +version = "0.3.7" dependencies = [ "dora-node-api", "eyre", @@ -5211,14 +5211,14 @@ dependencies = [ [[package]] name = "multiple-daemons-example-operator" -version = "0.3.7-rc2" +version = "0.3.7" dependencies = [ "dora-operator-api", ] [[package]] name = "multiple-daemons-example-sink" -version = "0.3.7-rc2" +version = "0.3.7" dependencies = [ "dora-node-api", "eyre", @@ -8890,7 +8890,7 @@ dependencies = [ [[package]] name = "rust-dataflow-example-node" -version = "0.3.7-rc2" +version = "0.3.7" dependencies = [ "dora-node-api", "eyre", @@ -8901,7 +8901,7 @@ dependencies = [ [[package]] name = "rust-dataflow-example-sink" -version = "0.3.7-rc2" +version = "0.3.7" dependencies = [ "dora-node-api", "eyre", @@ -8909,7 +8909,7 @@ dependencies = [ [[package]] name = "rust-dataflow-example-sink-dynamic" -version = "0.3.7-rc2" +version = "0.3.7" dependencies = [ "dora-node-api", "eyre", @@ -8917,7 +8917,7 @@ dependencies = [ [[package]] name = "rust-dataflow-example-status-node" -version = "0.3.7-rc2" +version = "0.3.7" dependencies = [ "dora-node-api", "eyre", @@ -8936,7 +8936,7 @@ dependencies = [ [[package]] name = "rust-ros2-dataflow-example-node" -version = "0.3.7-rc2" +version = "0.3.7" dependencies = [ "dora-node-api", "dora-ros2-bridge", @@ -9490,7 +9490,7 @@ dependencies = [ [[package]] name = "shared-memory-server" -version = "0.3.7-rc2" +version = "0.3.7" dependencies = [ "bincode", "eyre", @@ -10057,7 +10057,7 @@ dependencies = [ [[package]] name = "terminal-print" -version = "0.3.7-rc2" +version = "0.3.7" dependencies = [ "dora-node-api", "eyre", diff --git a/Cargo.toml b/Cargo.toml index 7633430f8..e6d406e01 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -41,36 +41,36 @@ members = [ [workspace.package] # Make sure to also bump `apis/node/python/__init__.py` version. -version = "0.3.7-rc2" +version = "0.3.7" description = "`dora` goal is to be a low latency, composable, and distributed data flow." documentation = "https://dora.carsmos.ai" license = "Apache-2.0" repository = "https://github.com/dora-rs/dora/" [workspace.dependencies] -dora-node-api = { version = "0.3.7-rc2", path = "apis/rust/node", default-features = false } -dora-node-api-python = { version = "0.3.7-rc2", path = "apis/python/node", default-features = false } -dora-operator-api = { version = "0.3.7-rc2", path = "apis/rust/operator", default-features = false } -dora-operator-api-macros = { version = "0.3.7-rc2", path = "apis/rust/operator/macros" } -dora-operator-api-types = { version = "0.3.7-rc2", path = "apis/rust/operator/types" } -dora-operator-api-python = { version = "0.3.7-rc2", path = "apis/python/operator" } -dora-operator-api-c = { version = "0.3.7-rc2", path = "apis/c/operator" } -dora-node-api-c = { version = "0.3.7-rc2", path = "apis/c/node" } -dora-core = { version = "0.3.7-rc2", path = "libraries/core" } -dora-arrow-convert = { version = "0.3.7-rc2", path = "libraries/arrow-convert" } -dora-tracing = { version = "0.3.7-rc2", path = "libraries/extensions/telemetry/tracing" } -dora-metrics = { version = "0.3.7-rc2", path = "libraries/extensions/telemetry/metrics" } -dora-download = { version = "0.3.7-rc2", path = "libraries/extensions/download" } -shared-memory-server = { version = "0.3.7-rc2", path = "libraries/shared-memory-server" } -communication-layer-request-reply = { version = "0.3.7-rc2", path = "libraries/communication-layer/request-reply" } -dora-runtime = { version = "0.3.7-rc2", path = "binaries/runtime" } -dora-daemon = { version = "0.3.7-rc2", path = "binaries/daemon" } -dora-coordinator = { version = "0.3.7-rc2", path = "binaries/coordinator" } +dora-node-api = { version = "0.3.7", path = "apis/rust/node", default-features = false } +dora-node-api-python = { version = "0.3.7", path = "apis/python/node", default-features = false } +dora-operator-api = { version = "0.3.7", path = "apis/rust/operator", default-features = false } +dora-operator-api-macros = { version = "0.3.7", path = "apis/rust/operator/macros" } +dora-operator-api-types = { version = "0.3.7", path = "apis/rust/operator/types" } +dora-operator-api-python = { version = "0.3.7", path = "apis/python/operator" } +dora-operator-api-c = { version = "0.3.7", path = "apis/c/operator" } +dora-node-api-c = { version = "0.3.7", path = "apis/c/node" } +dora-core = { version = "0.3.7", path = "libraries/core" } +dora-arrow-convert = { version = "0.3.7", path = "libraries/arrow-convert" } +dora-tracing = { version = "0.3.7", path = "libraries/extensions/telemetry/tracing" } +dora-metrics = { version = "0.3.7", path = "libraries/extensions/telemetry/metrics" } +dora-download = { version = "0.3.7", path = "libraries/extensions/download" } +shared-memory-server = { version = "0.3.7", path = "libraries/shared-memory-server" } +communication-layer-request-reply = { version = "0.3.7", path = "libraries/communication-layer/request-reply" } +dora-runtime = { version = "0.3.7", path = "binaries/runtime" } +dora-daemon = { version = "0.3.7", path = "binaries/daemon" } +dora-coordinator = { version = "0.3.7", path = "binaries/coordinator" } dora-ros2-bridge = { path = "libraries/extensions/ros2-bridge" } dora-ros2-bridge-msg-gen = { path = "libraries/extensions/ros2-bridge/msg-gen" } dora-ros2-bridge-python = { path = "libraries/extensions/ros2-bridge/python" } # versioned independently from the other dora crates -dora-message = { version = "0.4.1-rc2", path = "libraries/message" } +dora-message = { version = "0.4.1", path = "libraries/message" } arrow = { version = "53" } arrow-schema = { version = "53" } arrow-data = { version = "53" } diff --git a/libraries/message/Cargo.toml b/libraries/message/Cargo.toml index 0cfc581b4..f58b9fef4 100644 --- a/libraries/message/Cargo.toml +++ b/libraries/message/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "dora-message" # versioned separately from the other dora crates -version = "0.4.1-rc2" +version = "0.4.1" edition = "2021" documentation.workspace = true description.workspace = true diff --git a/node-hub/dora-argotranslate/pyproject.toml b/node-hub/dora-argotranslate/pyproject.toml index 1c0460abc..eaf5cb602 100644 --- a/node-hub/dora-argotranslate/pyproject.toml +++ b/node-hub/dora-argotranslate/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "dora-argotranslate" -version = "0.3.7-rc2" +version = "0.3.7" description = "Dora Node for Text translating using Argostranslate" readme = "README.md" authors = [ diff --git a/node-hub/dora-echo/pyproject.toml b/node-hub/dora-echo/pyproject.toml index e0bcd6230..93754efd6 100644 --- a/node-hub/dora-echo/pyproject.toml +++ b/node-hub/dora-echo/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "dora-echo" -version = "0.3.7-rc2" +version = "0.3.7" authors = [ "Haixuan Xavier Tao ", "Enzo Le Van ", diff --git a/node-hub/dora-internvl/pyproject.toml b/node-hub/dora-internvl/pyproject.toml index a01672f2e..47fcf69f6 100644 --- a/node-hub/dora-internvl/pyproject.toml +++ b/node-hub/dora-internvl/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "dora-internvl" -version = "0.3.7-rc2" +version = "0.3.7" authors = [ "Haixuan Xavier Tao ", "Enzo Le Van ", diff --git a/node-hub/dora-keyboard/pyproject.toml b/node-hub/dora-keyboard/pyproject.toml index 67c2a4bfe..952d2c043 100644 --- a/node-hub/dora-keyboard/pyproject.toml +++ b/node-hub/dora-keyboard/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "dora-keyboard" -version = "0.3.7-rc2" +version = "0.3.7" authors = [ "Haixuan Xavier Tao ", "Enzo Le Van ", diff --git a/node-hub/dora-microphone/pyproject.toml b/node-hub/dora-microphone/pyproject.toml index 04ea3eec1..5d5d135ad 100644 --- a/node-hub/dora-microphone/pyproject.toml +++ b/node-hub/dora-microphone/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "dora-microphone" -version = "0.3.7-rc2" +version = "0.3.7" authors = [ "Haixuan Xavier Tao ", "Enzo Le Van ", diff --git a/node-hub/dora-openai-server/pyproject.toml b/node-hub/dora-openai-server/pyproject.toml index c2f7f7dc5..3cbe0ef62 100644 --- a/node-hub/dora-openai-server/pyproject.toml +++ b/node-hub/dora-openai-server/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "dora-openai-server" -version = "0.3.7-rc2" +version = "0.3.7" authors = [ "Haixuan Xavier Tao ", "Enzo Le Van ", diff --git a/node-hub/dora-opus/pyproject.toml b/node-hub/dora-opus/pyproject.toml index 9064fb7e0..a0ba1b8a0 100644 --- a/node-hub/dora-opus/pyproject.toml +++ b/node-hub/dora-opus/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "dora-opus" -version = "0.3.7-rc2" +version = "0.3.7" description = "Dora Node for Text translating using Opus" readme = "README.md" authors = [ diff --git a/node-hub/dora-parler/pyproject.toml b/node-hub/dora-parler/pyproject.toml index 5e3763d09..a94b21b59 100644 --- a/node-hub/dora-parler/pyproject.toml +++ b/node-hub/dora-parler/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "dora-parler" -version = "0.3.7-rc2" +version = "0.3.7" authors = [ "Haixuan Xavier Tao ", "Enzo Le Van ", diff --git a/node-hub/dora-qwenvl/pyproject.toml b/node-hub/dora-qwenvl/pyproject.toml index 52b33946e..060562eea 100644 --- a/node-hub/dora-qwenvl/pyproject.toml +++ b/node-hub/dora-qwenvl/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "dora-qwenvl" -version = "0.3.7-rc2" +version = "0.3.7" authors = [ "Haixuan Xavier Tao ", "Enzo Le Van ", diff --git a/node-hub/dora-vad/pyproject.toml b/node-hub/dora-vad/pyproject.toml index 3ff13cf76..3c0254b9d 100644 --- a/node-hub/dora-vad/pyproject.toml +++ b/node-hub/dora-vad/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "dora-vad" -version = "0.3.7-rc2" +version = "0.3.7" description = "Dora Node for Text translating using Argostranslate" readme = "README.md" authors = [ diff --git a/node-hub/dora-yolo/pyproject.toml b/node-hub/dora-yolo/pyproject.toml index 99a82e4cc..fc8f530ce 100644 --- a/node-hub/dora-yolo/pyproject.toml +++ b/node-hub/dora-yolo/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "dora-yolo" -version = "0.3.7-rc2" +version = "0.3.7" authors = [ "Haixuan Xavier Tao ", "Enzo Le Van ", diff --git a/node-hub/llama-factory-recorder/pyproject.toml b/node-hub/llama-factory-recorder/pyproject.toml index 688d1aec1..1b22c7985 100644 --- a/node-hub/llama-factory-recorder/pyproject.toml +++ b/node-hub/llama-factory-recorder/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "llama-factory-recorder" -version = "0.3.7-rc2" +version = "0.3.7" authors = [ "Haixuan Xavier Tao ", "Enzo Le Van ", diff --git a/node-hub/opencv-plot/pyproject.toml b/node-hub/opencv-plot/pyproject.toml index b2e95f417..4bc2005cf 100644 --- a/node-hub/opencv-plot/pyproject.toml +++ b/node-hub/opencv-plot/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "opencv-plot" -version = "0.3.7-rc2" +version = "0.3.7" authors = [ "Haixuan Xavier Tao ", "Enzo Le Van ", diff --git a/node-hub/opencv-video-capture/pyproject.toml b/node-hub/opencv-video-capture/pyproject.toml index 64b0de8c0..1e84f538d 100644 --- a/node-hub/opencv-video-capture/pyproject.toml +++ b/node-hub/opencv-video-capture/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "opencv-video-capture" -version = "0.3.7-rc2" +version = "0.3.7" authors = [ "Haixuan Xavier Tao ", "Enzo Le Van ", diff --git a/node-hub/pyarrow-assert/pyproject.toml b/node-hub/pyarrow-assert/pyproject.toml index b386063ae..96bfe639c 100644 --- a/node-hub/pyarrow-assert/pyproject.toml +++ b/node-hub/pyarrow-assert/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "pyarrow-assert" -version = "0.3.7-rc2" +version = "0.3.7" authors = [ "Haixuan Xavier Tao ", "Enzo Le Van ", diff --git a/node-hub/pyarrow-sender/pyproject.toml b/node-hub/pyarrow-sender/pyproject.toml index bcf3a0365..d91be6f25 100644 --- a/node-hub/pyarrow-sender/pyproject.toml +++ b/node-hub/pyarrow-sender/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "pyarrow-sender" -version = "0.3.7-rc2" +version = "0.3.7" authors = [ "Haixuan Xavier Tao ", "Enzo Le Van ", From 4206dd1937ce9b64ad0ba114cb2c9ac74d7f0f20 Mon Sep 17 00:00:00 2001 From: haixuanTao Date: Fri, 15 Nov 2024 11:25:30 +0100 Subject: [PATCH 10/14] Update changelog --- Changelog.md | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/Changelog.md b/Changelog.md index 2274b6103..0602e98af 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,6 +1,6 @@ # Changelog -## v0.3.7 (2024-11-04) +## v0.3.7 (2024-11-15) ## What's Changed @@ -42,12 +42,27 @@ - Temporary fix qwenvl2 queue error by @haixuanTao in https://github.com/dora-rs/dora/pull/688 - Make daemon loop over coordinator connection to make it possible to create a system service awaiting coordinator connection by @haixuanTao in https://github.com/dora-rs/dora/pull/689 - Add translation example from chinese, french to english by @haixuanTao in https://github.com/dora-rs/dora/pull/681 +- Update dependencies by @renovate in https://github.com/dora-rs/dora/pull/690 +- Fix macos 14 yolo error by @haixuanTao in https://github.com/dora-rs/dora/pull/696 +- Update dependencies by @renovate in https://github.com/dora-rs/dora/pull/692 +- Publish rust project on pip to make it simpler to deploy dora node on different machine without requiring installing cargo by @haixuanTao in https://github.com/dora-rs/dora/pull/695 +- Docs: README by @Radovenchyk in https://github.com/dora-rs/dora/pull/697 +- Update README.md by @pucedoteth in https://github.com/dora-rs/dora/pull/705 +- Bump rust toolchains 1.81 by @haixuanTao in https://github.com/dora-rs/dora/pull/707 +- Make dora cli pip installable by @haixuanTao in https://github.com/dora-rs/dora/pull/706 +- Add urdf visualization in rerun by @haixuanTao in https://github.com/dora-rs/dora/pull/704 +- Fix child process receiving ctrl-c by setting own process group by @haixuanTao in https://github.com/dora-rs/dora/pull/712 +- Move more types from `dora-core` to `dora-message` to avoid dependency by @phil-opp in https://github.com/dora-rs/dora/pull/711 +- Implement `dora run` command by @phil-opp in https://github.com/dora-rs/dora/pull/703 +- Adding Agilex Piper node, PyOrbbeckSDK node, Agilex UGV node by @haixuanTao in https://github.com/dora-rs/dora/pull/709 +- Make the node hub CI/CD parallel for faster testing as well as having more granular integration control by @haixuanTao in https://github.com/dora-rs/dora/pull/710 +- Add time series to dora rerun by @haixuanTao in https://github.com/dora-rs/dora/pull/713 ## New Contributors - @Ben-PH made their first contribution in https://github.com/dora-rs/dora/pull/685 - -**Full Changelog**: https://github.com/dora-rs/dora/compare/v0.3.6...v0.3.7rc0 +- @Radovenchyk made their first contribution in https://github.com/dora-rs/dora/pull/697 +- @pucedoteth made their first contribution in https://github.com/dora-rs/dora/pull/705 ## v0.3.6 (2024-08-17) From 7b7277fc43ab7f12690827aa9597009838466c11 Mon Sep 17 00:00:00 2001 From: haixuanTao Date: Mon, 18 Nov 2024 02:59:15 +0100 Subject: [PATCH 11/14] Add github dispatch on node hub --- .github/workflows/node-hub-ci-cd.yml | 1 + node-hub/dora-distil-whisper/pyproject.toml | 2 +- node-hub/terminal-input/pyproject.toml | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/node-hub-ci-cd.yml b/.github/workflows/node-hub-ci-cd.yml index 79f774453..93620aeb8 100644 --- a/.github/workflows/node-hub-ci-cd.yml +++ b/.github/workflows/node-hub-ci-cd.yml @@ -1,6 +1,7 @@ name: node-hub on: + workflow_dispatch: push: branches: - main diff --git a/node-hub/dora-distil-whisper/pyproject.toml b/node-hub/dora-distil-whisper/pyproject.toml index 523a9fca4..760682d95 100644 --- a/node-hub/dora-distil-whisper/pyproject.toml +++ b/node-hub/dora-distil-whisper/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "dora-distil-whisper" -version = "0.3.7-rc2" +version = "0.3.7" authors = [ "Haixuan Xavier Tao ", "Enzo Le Van ", diff --git a/node-hub/terminal-input/pyproject.toml b/node-hub/terminal-input/pyproject.toml index e8518c5f3..4db343312 100644 --- a/node-hub/terminal-input/pyproject.toml +++ b/node-hub/terminal-input/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "terminal-input" -version = "0.3.7-rc2" +version = "0.3.7" authors = [ "Haixuan Xavier Tao ", "Enzo Le Van ", From bd35c832259e2673efdee4a2f694cf375ea44211 Mon Sep 17 00:00:00 2001 From: haixuanTao Date: Mon, 18 Nov 2024 03:31:15 +0100 Subject: [PATCH 12/14] Improve speech to text example with VAD and dora-rerun --- examples/speech-to-text/dataflow.yml | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/examples/speech-to-text/dataflow.yml b/examples/speech-to-text/dataflow.yml index 18fa271b9..3176bd22b 100644 --- a/examples/speech-to-text/dataflow.yml +++ b/examples/speech-to-text/dataflow.yml @@ -5,16 +5,27 @@ nodes: outputs: - audio + - id: dora-vad + build: pip install -e ../../node-hub/dora-vad + path: dora-vad + inputs: + audio: dora-microphone/audio + outputs: + - audio + - id: dora-distil-whisper build: pip install -e ../../node-hub/dora-distil-whisper path: dora-distil-whisper inputs: - input: dora-microphone/audio + input: dora-vad/audio outputs: - text + env: + TARGET_LANGUAGE: english + # USE_MODELSCOPE_HUB: true - - id: terminal-print - build: cargo build -p terminal-print - path: dynamic + - id: dora-rerun + build: cargo build -p dora-rerun --release + path: dora-rerun inputs: - text: dora-distil-whisper/text + original_text: dora-distil-whisper/text From c08fe0f3aa86afaf7ed4c56641b2cf86d3a0b34d Mon Sep 17 00:00:00 2001 From: haixuanTao Date: Mon, 18 Nov 2024 04:25:59 +0100 Subject: [PATCH 13/14] Fix small example issues --- .gitignore | 1 + examples/piper/{assets => }/piper_left.urdf | 40 +++++++-------- .../piper/{assets => }/piper_left_pred.urdf | 40 +++++++-------- examples/piper/{assets => }/piper_right.urdf | 40 +++++++-------- .../piper/{assets => }/piper_right_pred.urdf | 40 +++++++-------- examples/piper/play_dummy_inference.yml | 17 +++++-- examples/speech-to-text/dataflow.yml | 1 + examples/translation/dataflow_en_fr.yml | 49 +++++++++++++++++++ examples/vlm/dataflow.yml | 12 +++-- examples/vlm/dataflow_rerun.yml | 12 ++--- .../dora_distil_whisper/main.py | 5 +- node-hub/dora-opus/dora_opus/main.py | 3 +- node-hub/dora-parler/dora_parler/main.py | 2 +- node-hub/dora-qwenvl/dora_qwenvl/main.py | 11 +---- node-hub/dora-rerun/pyproject.toml | 2 +- 15 files changed, 164 insertions(+), 111 deletions(-) rename examples/piper/{assets => }/piper_left.urdf (93%) rename examples/piper/{assets => }/piper_left_pred.urdf (93%) rename examples/piper/{assets => }/piper_right.urdf (93%) rename examples/piper/{assets => }/piper_right_pred.urdf (93%) create mode 100644 examples/translation/dataflow_en_fr.yml diff --git a/.gitignore b/.gitignore index 93d3608af..a1bb9947e 100644 --- a/.gitignore +++ b/.gitignore @@ -11,6 +11,7 @@ examples/**/*.txt # Remove hdf and stl files *.stl +*.STL *.hdf5 # Removing images. diff --git a/examples/piper/assets/piper_left.urdf b/examples/piper/piper_left.urdf similarity index 93% rename from examples/piper/assets/piper_left.urdf rename to examples/piper/piper_left.urdf index 99fde57d9..4e1166094 100644 --- a/examples/piper/assets/piper_left.urdf +++ b/examples/piper/piper_left.urdf @@ -23,7 +23,7 @@ rpy="0 0 0" /> + filename="base_link.STL" /> @@ -37,7 +37,7 @@ rpy="0 0 0" /> + filename="base_link.STL" /> @@ -63,7 +63,7 @@ rpy="0 0 0" /> + filename="link1.STL" /> @@ -77,7 +77,7 @@ rpy="0 0 0" /> + filename="link1.STL" /> @@ -121,7 +121,7 @@ rpy="0 0 0" /> + filename="link2.STL" /> @@ -135,7 +135,7 @@ rpy="0 0 0" /> + filename="link2.STL" /> @@ -179,7 +179,7 @@ rpy="0 0 0" /> + filename="link3.STL" /> @@ -193,7 +193,7 @@ rpy="0 0 0" /> + filename="link3.STL" /> @@ -237,7 +237,7 @@ rpy="0 0 0" /> + filename="link4.STL" /> @@ -251,7 +251,7 @@ rpy="0 0 0" /> + filename="link4.STL" /> @@ -295,7 +295,7 @@ rpy="0 0 0" /> + filename="link5.STL" /> @@ -309,7 +309,7 @@ rpy="0 0 0" /> + filename="link5.STL" /> @@ -353,7 +353,7 @@ rpy="0 0 0" /> + filename="link6.STL" /> @@ -367,7 +367,7 @@ rpy="0 0 0" /> + filename="link6.STL" /> @@ -412,7 +412,7 @@ rpy="0 0 0" /> + filename="link7.STL" /> @@ -426,7 +426,7 @@ rpy="0 0 0" /> + filename="link7.STL" /> @@ -471,7 +471,7 @@ rpy="0 0 0" /> + filename="link8.STL" /> @@ -485,7 +485,7 @@ rpy="0 0 0" /> + filename="link8.STL" /> @@ -529,7 +529,7 @@ rpy="0 0 0" /> + filename="link8.STL" /> @@ -543,7 +543,7 @@ rpy="0 0 0" /> + filename="link8.STL" /> diff --git a/examples/piper/assets/piper_left_pred.urdf b/examples/piper/piper_left_pred.urdf similarity index 93% rename from examples/piper/assets/piper_left_pred.urdf rename to examples/piper/piper_left_pred.urdf index a74ed6c3c..6eaa246f9 100644 --- a/examples/piper/assets/piper_left_pred.urdf +++ b/examples/piper/piper_left_pred.urdf @@ -23,7 +23,7 @@ rpy="0 0 0" /> + filename="base_link.STL" /> @@ -37,7 +37,7 @@ rpy="0 0 0" /> + filename="base_link.STL" /> @@ -63,7 +63,7 @@ rpy="0 0 0" /> + filename="link1.STL" /> @@ -77,7 +77,7 @@ rpy="0 0 0" /> + filename="link1.STL" /> @@ -121,7 +121,7 @@ rpy="0 0 0" /> + filename="link2.STL" /> @@ -135,7 +135,7 @@ rpy="0 0 0" /> + filename="link2.STL" /> @@ -179,7 +179,7 @@ rpy="0 0 0" /> + filename="link3.STL" /> @@ -193,7 +193,7 @@ rpy="0 0 0" /> + filename="link3.STL" /> @@ -237,7 +237,7 @@ rpy="0 0 0" /> + filename="link4.STL" /> @@ -251,7 +251,7 @@ rpy="0 0 0" /> + filename="link4.STL" /> @@ -295,7 +295,7 @@ rpy="0 0 0" /> + filename="link5.STL" /> @@ -309,7 +309,7 @@ rpy="0 0 0" /> + filename="link5.STL" /> @@ -353,7 +353,7 @@ rpy="0 0 0" /> + filename="link6.STL" /> @@ -367,7 +367,7 @@ rpy="0 0 0" /> + filename="link6.STL" /> @@ -412,7 +412,7 @@ rpy="0 0 0" /> + filename="link7.STL" /> @@ -426,7 +426,7 @@ rpy="0 0 0" /> + filename="link7.STL" /> @@ -471,7 +471,7 @@ rpy="0 0 0" /> + filename="link8.STL" /> @@ -485,7 +485,7 @@ rpy="0 0 0" /> + filename="link8.STL" /> @@ -529,7 +529,7 @@ rpy="0 0 0" /> + filename="link8.STL" /> @@ -543,7 +543,7 @@ rpy="0 0 0" /> + filename="link8.STL" /> diff --git a/examples/piper/assets/piper_right.urdf b/examples/piper/piper_right.urdf similarity index 93% rename from examples/piper/assets/piper_right.urdf rename to examples/piper/piper_right.urdf index 99fde57d9..4e1166094 100644 --- a/examples/piper/assets/piper_right.urdf +++ b/examples/piper/piper_right.urdf @@ -23,7 +23,7 @@ rpy="0 0 0" /> + filename="base_link.STL" /> @@ -37,7 +37,7 @@ rpy="0 0 0" /> + filename="base_link.STL" /> @@ -63,7 +63,7 @@ rpy="0 0 0" /> + filename="link1.STL" /> @@ -77,7 +77,7 @@ rpy="0 0 0" /> + filename="link1.STL" /> @@ -121,7 +121,7 @@ rpy="0 0 0" /> + filename="link2.STL" /> @@ -135,7 +135,7 @@ rpy="0 0 0" /> + filename="link2.STL" /> @@ -179,7 +179,7 @@ rpy="0 0 0" /> + filename="link3.STL" /> @@ -193,7 +193,7 @@ rpy="0 0 0" /> + filename="link3.STL" /> @@ -237,7 +237,7 @@ rpy="0 0 0" /> + filename="link4.STL" /> @@ -251,7 +251,7 @@ rpy="0 0 0" /> + filename="link4.STL" /> @@ -295,7 +295,7 @@ rpy="0 0 0" /> + filename="link5.STL" /> @@ -309,7 +309,7 @@ rpy="0 0 0" /> + filename="link5.STL" /> @@ -353,7 +353,7 @@ rpy="0 0 0" /> + filename="link6.STL" /> @@ -367,7 +367,7 @@ rpy="0 0 0" /> + filename="link6.STL" /> @@ -412,7 +412,7 @@ rpy="0 0 0" /> + filename="link7.STL" /> @@ -426,7 +426,7 @@ rpy="0 0 0" /> + filename="link7.STL" /> @@ -471,7 +471,7 @@ rpy="0 0 0" /> + filename="link8.STL" /> @@ -485,7 +485,7 @@ rpy="0 0 0" /> + filename="link8.STL" /> @@ -529,7 +529,7 @@ rpy="0 0 0" /> + filename="link8.STL" /> @@ -543,7 +543,7 @@ rpy="0 0 0" /> + filename="link8.STL" /> diff --git a/examples/piper/assets/piper_right_pred.urdf b/examples/piper/piper_right_pred.urdf similarity index 93% rename from examples/piper/assets/piper_right_pred.urdf rename to examples/piper/piper_right_pred.urdf index 2541f63f1..6adf3d491 100644 --- a/examples/piper/assets/piper_right_pred.urdf +++ b/examples/piper/piper_right_pred.urdf @@ -23,7 +23,7 @@ rpy="0 0 0" /> + filename="base_link.STL" /> @@ -37,7 +37,7 @@ rpy="0 0 0" /> + filename="base_link.STL" /> @@ -63,7 +63,7 @@ rpy="0 0 0" /> + filename="link1.STL" /> @@ -77,7 +77,7 @@ rpy="0 0 0" /> + filename="link1.STL" /> @@ -121,7 +121,7 @@ rpy="0 0 0" /> + filename="link2.STL" /> @@ -135,7 +135,7 @@ rpy="0 0 0" /> + filename="link2.STL" /> @@ -179,7 +179,7 @@ rpy="0 0 0" /> + filename="link3.STL" /> @@ -193,7 +193,7 @@ rpy="0 0 0" /> + filename="link3.STL" /> @@ -237,7 +237,7 @@ rpy="0 0 0" /> + filename="link4.STL" /> @@ -251,7 +251,7 @@ rpy="0 0 0" /> + filename="link4.STL" /> @@ -295,7 +295,7 @@ rpy="0 0 0" /> + filename="link5.STL" /> @@ -309,7 +309,7 @@ rpy="0 0 0" /> + filename="link5.STL" /> @@ -353,7 +353,7 @@ rpy="0 0 0" /> + filename="link6.STL" /> @@ -367,7 +367,7 @@ rpy="0 0 0" /> + filename="link6.STL" /> @@ -412,7 +412,7 @@ rpy="0 0 0" /> + filename="link7.STL" /> @@ -426,7 +426,7 @@ rpy="0 0 0" /> + filename="link7.STL" /> @@ -471,7 +471,7 @@ rpy="0 0 0" /> + filename="link8.STL" /> @@ -485,7 +485,7 @@ rpy="0 0 0" /> + filename="link8.STL" /> @@ -529,7 +529,7 @@ rpy="0 0 0" /> + filename="link8.STL" /> @@ -543,7 +543,7 @@ rpy="0 0 0" /> + filename="link8.STL" /> diff --git a/examples/piper/play_dummy_inference.yml b/examples/piper/play_dummy_inference.yml index 6169f51d5..d821837c3 100644 --- a/examples/piper/play_dummy_inference.yml +++ b/examples/piper/play_dummy_inference.yml @@ -10,13 +10,24 @@ nodes: CAN_BUS: can_left - id: rerun - build: wget + build: | + proxychains wget -nc https://raw.githubusercontent.com/agilexrobotics/Piper_ros/4f22c61f96b8fb3ef3f937b99b63edb697caadf0/src/piper_description/meshes/base_link.STL + proxychains wget -nc https://raw.githubusercontent.com/agilexrobotics/Piper_ros/4f22c61f96b8fb3ef3f937b99b63edb697caadf0/src/piper_description/meshes/link1.STL + proxychains wget -nc https://raw.githubusercontent.com/agilexrobotics/Piper_ros/4f22c61f96b8fb3ef3f937b99b63edb697caadf0/src/piper_description/meshes/link2.STL + proxychains wget -nc https://raw.githubusercontent.com/agilexrobotics/Piper_ros/4f22c61f96b8fb3ef3f937b99b63edb697caadf0/src/piper_description/meshes/link3.STL + proxychains wget -nc https://raw.githubusercontent.com/agilexrobotics/Piper_ros/4f22c61f96b8fb3ef3f937b99b63edb697caadf0/src/piper_description/meshes/link4.STL + proxychains wget -nc https://raw.githubusercontent.com/agilexrobotics/Piper_ros/4f22c61f96b8fb3ef3f937b99b63edb697caadf0/src/piper_description/meshes/link5.STL + proxychains wget -nc https://raw.githubusercontent.com/agilexrobotics/Piper_ros/4f22c61f96b8fb3ef3f937b99b63edb697caadf0/src/piper_description/meshes/link6.STL + proxychains wget -nc https://raw.githubusercontent.com/agilexrobotics/Piper_ros/4f22c61f96b8fb3ef3f937b99b63edb697caadf0/src/piper_description/meshes/link7.STL + proxychains wget -nc https://raw.githubusercontent.com/agilexrobotics/Piper_ros/4f22c61f96b8fb3ef3f937b99b63edb697caadf0/src/piper_description/meshes/link8.STL + pip install -e ../../node-hub/dora-rerun + pip install git+https://github.com/rerun-io/rerun-loader-python-example-urdf.git path: dora-rerun inputs: jointstate_piper_left: piper/jointstate_left jointstate_piper_right: piper/jointstate_right env: - piper_left_urdf: assets/piper_left.urdf # Make sure to download assets/meshes from https://github.com/agilexrobotics/Piper_ros/tree/4f22c61f96b8fb3ef3f937b99b63edb697caadf0/src/piper_description/meshes and put them in the assets folder - piper_right_urdf: assets/piper_right.urdf # Make sure to download assets/meshes from https://github.com/agilexrobotics/Piper_ros/tree/4f22c61f96b8fb3ef3f937b99b63edb697caadf0/src/piper_description/meshes and put them in the assets folder + piper_left_urdf: piper_left.urdf # Make sure to download meshes from https://github.com/agilexrobotics/Piper_ros/tree/4f22c61f96b8fb3ef3f937b99b63edb697caadf0/src/piper_description/meshes and put them in the assets folder + piper_right_urdf: piper_right.urdf # Make sure to download meshes from https://github.com/agilexrobotics/Piper_ros/tree/4f22c61f96b8fb3ef3f937b99b63edb697caadf0/src/piper_description/meshes and put them in the assets folder piper_left_transform: 0 0.2 0 piper_right_transform: 0 -0.2 0 diff --git a/examples/speech-to-text/dataflow.yml b/examples/speech-to-text/dataflow.yml index 3176bd22b..bad75e7ea 100644 --- a/examples/speech-to-text/dataflow.yml +++ b/examples/speech-to-text/dataflow.yml @@ -22,6 +22,7 @@ nodes: - text env: TARGET_LANGUAGE: english + # For China # USE_MODELSCOPE_HUB: true - id: dora-rerun diff --git a/examples/translation/dataflow_en_fr.yml b/examples/translation/dataflow_en_fr.yml new file mode 100644 index 000000000..b20f0a5b0 --- /dev/null +++ b/examples/translation/dataflow_en_fr.yml @@ -0,0 +1,49 @@ +nodes: + - id: dora-microphone + build: pip install -e ../../node-hub/dora-microphone + path: dora-microphone + outputs: + - audio + + - id: dora-vad + build: pip install -e ../../node-hub/dora-vad + path: dora-vad + inputs: + audio: dora-microphone/audio + outputs: + - audio + + - id: dora-distil-whisper + build: pip install -e ../../node-hub/dora-distil-whisper + path: dora-distil-whisper + inputs: + input: dora-vad/audio + outputs: + - text + env: + TARGET_LANGUAGE: english + # For China + # HF_ENDPOINT: https://hf-mirror.com + + - id: dora-opus + build: pip install -e ../../node-hub/dora-opus + path: dora-opus + inputs: + text: dora-distil-whisper/text + outputs: + - text + env: + SOURCE_LANGUAGE: en + TARGET_LANGUAGE: fr + # For China + # HF_ENDPOINT: https://hf-mirror.com + + - id: dora-rerun + build: cargo build -p dora-rerun --release + path: dora-rerun + inputs: + translated_text: dora-opus/text + original_text: dora-distil-whisper/text + env: + IMAGE_WIDTH: 640 + IMAGE_HEIGHT: 480 diff --git a/examples/vlm/dataflow.yml b/examples/vlm/dataflow.yml index bfb61821b..51908b378 100644 --- a/examples/vlm/dataflow.yml +++ b/examples/vlm/dataflow.yml @@ -1,9 +1,9 @@ nodes: - id: camera - build: pip install ../../node-hub/opencv-video-capture + build: pip install -e ../../node-hub/opencv-video-capture path: opencv-video-capture inputs: - tick: dora/timer/millis/20 + tick: dora/timer/millis/50 outputs: - image env: @@ -18,15 +18,17 @@ nodes: image: source: camera/image queue_size: 1 - tick: dora/timer/millis/100 + tick: dora/timer/millis/400 outputs: - text - tick env: - DEFAULT_QUESTION: Describe the image. + DEFAULT_QUESTION: Describe the image in a very short sentence. + # For China + # USE_MODELSCOPE_HUB: true - id: plot - build: pip install ../../node-hub/opencv-plot + build: pip install -e ../../node-hub/opencv-plot path: opencv-plot inputs: image: diff --git a/examples/vlm/dataflow_rerun.yml b/examples/vlm/dataflow_rerun.yml index 785779e23..6c933a2f3 100644 --- a/examples/vlm/dataflow_rerun.yml +++ b/examples/vlm/dataflow_rerun.yml @@ -3,7 +3,7 @@ nodes: build: pip install -e ../../node-hub/opencv-video-capture path: opencv-video-capture inputs: - tick: dora/timer/millis/20 + tick: dora/timer/millis/50 outputs: - image env: @@ -18,12 +18,13 @@ nodes: image: source: camera/image queue_size: 1 - tick: dora/timer/millis/200 + tick: dora/timer/millis/400 outputs: - text - tick env: - DEFAULT_QUESTION: Describe the image. + DEFAULT_QUESTION: Describe the image in a very short sentence. + # USE_MODELSCOPE_HUB: true - id: plot build: cargo build -p dora-rerun --release @@ -37,7 +38,4 @@ nodes: IMAGE_WIDTH: 640 IMAGE_HEIGHT: 480 README: | - # Visualization of your webcam - - - You can increase or decrease the frequency within the dataflow with: `tick: dora/timer/millis/20` in the webcam node. - - You can change the model prompt within the dataflow with: `DEFAULT_QUESTION: Describe the image.` + # Visualization of QwenVL2 diff --git a/node-hub/dora-distil-whisper/dora_distil_whisper/main.py b/node-hub/dora-distil-whisper/dora_distil_whisper/main.py index 7f058ad3c..2bc27861d 100644 --- a/node-hub/dora-distil-whisper/dora_distil_whisper/main.py +++ b/node-hub/dora-distil-whisper/dora_distil_whisper/main.py @@ -7,12 +7,12 @@ DEFAULT_PATH = "openai/whisper-large-v3-turbo" TARGET_LANGUAGE = os.getenv("TARGET_LANGUAGE", "chinese") -TRANSLATE = bool(os.getenv("TRANSLATE", "False")) +TRANSLATE = bool(os.getenv("TRANSLATE", "False") in ["True", "true"]) MODEL_NAME_OR_PATH = os.getenv("MODEL_NAME_OR_PATH", DEFAULT_PATH) -if bool(os.getenv("USE_MODELSCOPE_HUB")) is True: +if bool(os.getenv("USE_MODELSCOPE_HUB") in ["True", "true"]): from modelscope import snapshot_download if not Path(MODEL_NAME_OR_PATH).exists(): @@ -107,5 +107,4 @@ def main(): if result["text"] in BAD_SENTENCES: continue text = cut_repetition(result["text"]) - print(text, flush=True) node.send_output("text", pa.array([text]), {"language": TARGET_LANGUAGE}) diff --git a/node-hub/dora-opus/dora_opus/main.py b/node-hub/dora-opus/dora_opus/main.py index e73d4ebbd..b0c6305a5 100644 --- a/node-hub/dora-opus/dora_opus/main.py +++ b/node-hub/dora-opus/dora_opus/main.py @@ -5,6 +5,7 @@ import numpy as np from transformers import AutoTokenizer, AutoModelForSeq2SeqLM + from_code = os.getenv("SOURCE_LANGUAGE", "zh") to_code = os.getenv("TARGET_LANGUAGE", "en") DEFAULT_PATH = f"Helsinki-NLP/opus-mt-{from_code}-{to_code}" @@ -12,7 +13,7 @@ MODEL_NAME_OR_PATH = os.getenv("MODEL_NAME_OR_PATH", DEFAULT_PATH) -if bool(os.getenv("USE_MODELSCOPE_HUB")) is True: +if bool(os.getenv("USE_MODELSCOPE_HUB") in ["True", "true"]): from modelscope import snapshot_download if not Path(MODEL_NAME_OR_PATH).exists(): diff --git a/node-hub/dora-parler/dora_parler/main.py b/node-hub/dora-parler/dora_parler/main.py index 6547ac421..80ee72815 100644 --- a/node-hub/dora-parler/dora_parler/main.py +++ b/node-hub/dora-parler/dora_parler/main.py @@ -24,7 +24,7 @@ MODEL_NAME_OR_PATH = os.getenv("MODEL_NAME_OR_PATH", DEFAULT_PATH) -if bool(os.getenv("USE_MODELSCOPE_HUB")) is True: +if bool(os.getenv("USE_MODELSCOPE_HUB") in ["True", "true"]): from modelscope import snapshot_download if not Path(MODEL_NAME_OR_PATH).exists(): diff --git a/node-hub/dora-qwenvl/dora_qwenvl/main.py b/node-hub/dora-qwenvl/dora_qwenvl/main.py index a9eb26974..5dbec5cfb 100644 --- a/node-hub/dora-qwenvl/dora_qwenvl/main.py +++ b/node-hub/dora-qwenvl/dora_qwenvl/main.py @@ -12,7 +12,7 @@ MODEL_NAME_OR_PATH = os.getenv("MODEL_NAME_OR_PATH", DEFAULT_PATH) -if bool(os.getenv("USE_MODELSCOPE_HUB")) is True: +if bool(os.getenv("USE_MODELSCOPE_HUB") in ["True", "true"]): from modelscope import snapshot_download if not Path(MODEL_NAME_OR_PATH).exists(): @@ -111,15 +111,6 @@ def main(): if event_type == "INPUT": - # pylint: disable=fixme - # TODO: Remove this after https://github.com/dora-rs/dora/pull/652 - while True: - next_event = node.next(timeout=0.001) - if next_event is not None and next_event["type"] == "INPUT": - event = next_event - else: - break - event_id = event["id"] if "image" in event_id: diff --git a/node-hub/dora-rerun/pyproject.toml b/node-hub/dora-rerun/pyproject.toml index 432362263..8e5aa0fb1 100644 --- a/node-hub/dora-rerun/pyproject.toml +++ b/node-hub/dora-rerun/pyproject.toml @@ -12,4 +12,4 @@ dependencies = [ scripts = { "dora-rerun" = "dora_rerun:py_main" } [tool.maturin] -features = ["pyo3/extension-module"] +features = ["python", "pyo3/extension-module"] From 76e9c60b4c2d1079e890ba7282b67b5bcbccb003 Mon Sep 17 00:00:00 2001 From: haixuanTao Date: Mon, 18 Nov 2024 05:42:10 +0100 Subject: [PATCH 14/14] Make piper more resilient to errors --- node-hub/dora-piper/dora_piper/main.py | 31 +++++++++++++------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/node-hub/dora-piper/dora_piper/main.py b/node-hub/dora-piper/dora_piper/main.py index 7dd77da0b..0a7e99676 100644 --- a/node-hub/dora-piper/dora_piper/main.py +++ b/node-hub/dora-piper/dora_piper/main.py @@ -4,10 +4,7 @@ import os import time -TEACH_MODE = ( - os.getenv("TEACH_MODE", "False") == "True" - or os.getenv("TEACH_MODE", "False") == "true" -) +TEACH_MODE = os.getenv("TEACH_MODE", "False") in ["True", "true"] def enable_fun(piper: C_PiperInterface): @@ -32,8 +29,6 @@ def enable_fun(piper: C_PiperInterface): and piper.GetArmLowSpdInfoMsgs().motor_6.foc_status.driver_enable_status ) print("使能状态:", enable_flag) - piper.EnableArm(7) - piper.GripperCtrl(0, 1000, 0x01, 0) print("--------------------") # 检查是否超过超时时间 if elapsed_time > timeout: @@ -44,8 +39,7 @@ def enable_fun(piper: C_PiperInterface): time.sleep(1) if elapsed_time_flag: print("程序自动使能超时,退出程序") - print("If you have this issue, you should probably restart your computer") - exit(0) + raise ConnectionError("程序自动使能超时,退出程序") def main(): @@ -54,13 +48,17 @@ def main(): piper = C_PiperInterface(CAN_BUS) piper.ConnectPort() - if TEACH_MODE is False: + if not TEACH_MODE: # piper.MotionCtrl_3(0, 0, 0, 0x00)#位置速度模式 piper.EnableArm(7) enable_fun(piper=piper) - piper.GripperCtrl(0, 1000, 0x01, 0) + piper.MotionCtrl_2(0x01, 0x01, 50, 0x00) + piper.JointCtrl(0, 0, 0, 0, 0, 0) + piper.GripperCtrl(abs(0), 1000, 0x01, 0) + piper.MotionCtrl_2(0x01, 0x01, 50, 0x00) + time.sleep(5) + factor = 57324.840764 # 1000*180/3.14 - time.sleep(2) node = Node() for event in node: @@ -76,13 +74,12 @@ def main(): joint_value += [joint.joint_state.joint_4.real / factor] joint_value += [joint.joint_state.joint_5.real / factor] joint_value += [joint.joint_state.joint_6.real / factor] - joint_value += [gripper.gripper_state.grippers_angle / 1000 / 1000 / 4] + joint_value += [gripper.gripper_state.grippers_angle / 1000 / 100] node.send_output("jointstate", pa.array(joint_value, type=pa.float32())) else: # Do not push to many commands to fast. Limiting it to 20Hz - # This is due to writing on a moving arm might fail the can bus. if time.time() - elapsed_time > 0.05: elapsed_time = time.time() else: @@ -95,7 +92,7 @@ def main(): joint_3 = round(position[3] * factor) joint_4 = round(position[4] * factor) joint_5 = round(position[5] * factor) - joint_6 = round(position[6] * 1000 * 1000 * 12) + joint_6 = round(position[6] * 1000 * 100) piper.MotionCtrl_2(0x01, 0x01, 50, 0x00) piper.JointCtrl(joint_0, joint_1, joint_2, joint_3, joint_4, joint_5) @@ -103,7 +100,11 @@ def main(): piper.MotionCtrl_2(0x01, 0x01, 50, 0x00) elif event["type"] == "STOP": - # Waiting for the arm to stop moving before stopping the node + if not TEACH_MODE: + piper.MotionCtrl_2(0x01, 0x01, 50, 0x00) + piper.JointCtrl(0, 0, 0, 0, 0, 0) + piper.GripperCtrl(abs(0), 1000, 0x01, 0) + piper.MotionCtrl_2(0x01, 0x01, 50, 0x00) time.sleep(5) break