From 469814831fead348292137670a3386ce7878b991 Mon Sep 17 00:00:00 2001 From: raphael-goetz Date: Thu, 21 Nov 2024 21:33:45 +0100 Subject: [PATCH 1/5] feat: added missing execution and adapter rpc services --- proto/aquila/action.proto | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 proto/aquila/action.proto diff --git a/proto/aquila/action.proto b/proto/aquila/action.proto new file mode 100644 index 0000000..899dcad --- /dev/null +++ b/proto/aquila/action.proto @@ -0,0 +1,35 @@ +syntax = "proto3"; + +option ruby_package = "Tucana::Aquila"; + +package aquila; + +message ActionCallRequest { + repeated string parameters = 1; +} + +message ActionCallResponse { + string execution_identifier = 1; +} + +message ActionResult { + repeated string result = 1; +} + + +message ActionResultRequest { + string execution_identifier = 1; + optional ActionResult action_result = 2; +} + +message ActionResultResponse { + bool successful = 1; +} + +service ActionCallService { + rpc Call (ActionCallRequest) returns (ActionCallResponse); +} + +service ActionResultService { + rpc GetResult (ActionResultRequest) returns (ActionResultResponse); +} \ No newline at end of file From d41ea24c669fbbbfdb1d8a516b1fa431de5736f3 Mon Sep 17 00:00:00 2001 From: raphael-goetz Date: Thu, 21 Nov 2024 21:34:57 +0100 Subject: [PATCH 2/5] feat: added missing action service --- proto/aquila/transfer.proto | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/proto/aquila/transfer.proto b/proto/aquila/transfer.proto index 0c8a899..8e7eb1a 100644 --- a/proto/aquila/transfer.proto +++ b/proto/aquila/transfer.proto @@ -16,6 +16,17 @@ message InformationResponse { bool success = 1; } +message ActionExecuteRequest { + string execution_identifier = 1; + repeated string parameters = 2; +} + +message ActionExecuteResponse { + string execution_identifier = 1; + repeated string result = 2; +} + service ActionTransferService { rpc Transfer (stream InformationRequest) returns (InformationResponse); + rpc Execute (stream ActionExecuteRequest) returns (stream ActionExecuteResponse); } \ No newline at end of file From 9f4743318bd3e77c04b2baadde762ee3ce601244 Mon Sep 17 00:00:00 2001 From: raphael-goetz Date: Thu, 21 Nov 2024 21:36:27 +0100 Subject: [PATCH 3/5] feat: adjusted rust build configuration --- build/rust/Cargo.lock | 2 +- build/rust/build.rs | 3 ++- proto/aquila/{action.proto => action_execute.proto} | 0 3 files changed, 3 insertions(+), 2 deletions(-) rename proto/aquila/{action.proto => action_execute.proto} (100%) diff --git a/build/rust/Cargo.lock b/build/rust/Cargo.lock index baa9c6a..627d455 100644 --- a/build/rust/Cargo.lock +++ b/build/rust/Cargo.lock @@ -1054,7 +1054,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] -name = "tucana-internal" +name = "tucana" version = "0.0.0" dependencies = [ "prost", diff --git a/build/rust/build.rs b/build/rust/build.rs index d2ca984..25567a2 100644 --- a/build/rust/build.rs +++ b/build/rust/build.rs @@ -10,7 +10,8 @@ fn main() -> Result<()> { "flow.proto", "action.proto", "transfer.proto", - "ping.proto" + "ping.proto", + "action_execute.proto" ]; let inclusions = &[ diff --git a/proto/aquila/action.proto b/proto/aquila/action_execute.proto similarity index 100% rename from proto/aquila/action.proto rename to proto/aquila/action_execute.proto From 9d184e480b322dc0de25767603d4614755acc4dd Mon Sep 17 00:00:00 2001 From: raphael-goetz Date: Thu, 21 Nov 2024 21:46:53 +0100 Subject: [PATCH 4/5] fix: adjusted communication to execution --- proto/aquila/action_execute.proto | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/proto/aquila/action_execute.proto b/proto/aquila/action_execute.proto index 899dcad..d3148d4 100644 --- a/proto/aquila/action_execute.proto +++ b/proto/aquila/action_execute.proto @@ -16,16 +16,13 @@ message ActionResult { repeated string result = 1; } +message ActionResultRequest {} -message ActionResultRequest { +message ActionResultResponse { string execution_identifier = 1; optional ActionResult action_result = 2; } -message ActionResultResponse { - bool successful = 1; -} - service ActionCallService { rpc Call (ActionCallRequest) returns (ActionCallResponse); } From 8631773759741cbd9b69eb9b10f52888109fd046 Mon Sep 17 00:00:00 2001 From: raphael-goetz Date: Sun, 24 Nov 2024 15:43:02 +0100 Subject: [PATCH 5/5] fix: adjusted messages after required changes --- proto/aquila/action_execute.proto | 10 ++++++---- proto/aquila/transfer.proto | 3 ++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/proto/aquila/action_execute.proto b/proto/aquila/action_execute.proto index d3148d4..d70bb1a 100644 --- a/proto/aquila/action_execute.proto +++ b/proto/aquila/action_execute.proto @@ -5,7 +5,8 @@ option ruby_package = "Tucana::Aquila"; package aquila; message ActionCallRequest { - repeated string parameters = 1; + string identifier = 1; + repeated string parameters = 2; } message ActionCallResponse { @@ -16,11 +17,12 @@ message ActionResult { repeated string result = 1; } -message ActionResultRequest {} +message ActionResultRequest { + string execution_identifier = 1; +} message ActionResultResponse { - string execution_identifier = 1; - optional ActionResult action_result = 2; + optional ActionResult action_result = 1; } service ActionCallService { diff --git a/proto/aquila/transfer.proto b/proto/aquila/transfer.proto index 8e7eb1a..afd8a94 100644 --- a/proto/aquila/transfer.proto +++ b/proto/aquila/transfer.proto @@ -18,7 +18,8 @@ message InformationResponse { message ActionExecuteRequest { string execution_identifier = 1; - repeated string parameters = 2; + string function_identifier = 2; + repeated string parameters = 3; } message ActionExecuteResponse {