From 31b61a159217eab5d8549c16c4d878412c27b09f Mon Sep 17 00:00:00 2001 From: Raphael Date: Tue, 27 May 2025 22:19:53 +0200 Subject: [PATCH 1/2] fix: adjusted datatypes to match pictor --- proto/shared/shared.data_type.proto | 13 +++++-------- proto/shared/shared.flow_definition.proto | 1 + proto/shared/shared.runtime_function.proto | 9 +++------ 3 files changed, 9 insertions(+), 14 deletions(-) diff --git a/proto/shared/shared.data_type.proto b/proto/shared/shared.data_type.proto index d6f76ee..bfb2692 100644 --- a/proto/shared/shared.data_type.proto +++ b/proto/shared/shared.data_type.proto @@ -19,8 +19,8 @@ message DataType { OBJECT = 3; DATATYPE = 4; ARRAY = 5; - GENERIC = 6; - FUNCTION = 7; + ERROR = 6; + NODE = 7; } // Variant of the data type @@ -101,16 +101,13 @@ message DataTypeIdentifier { } message GenericType { - DataTypeIdentifier data_type_identifier = 1; + string data_type_identifier = 1; repeated GenericMapper generic_mappers = 2; } message GenericMapper { // can point to another generic or to a resolved data type - oneof source { - DataTypeIdentifier data_type_identifier = 1; - string generic_key = 2; - } + DataTypeIdentifier source = 1; // can only be a generic key - string target = 3; + string target = 2; } diff --git a/proto/shared/shared.flow_definition.proto b/proto/shared/shared.flow_definition.proto index 864a461..ed521b7 100644 --- a/proto/shared/shared.flow_definition.proto +++ b/proto/shared/shared.flow_definition.proto @@ -15,6 +15,7 @@ message FlowType { bool editable = 5; repeated shared.Translation name = 6; repeated shared.Translation description = 7; + repeated shared.Translation documentation = 8; } message FlowTypeSetting { diff --git a/proto/shared/shared.runtime_function.proto b/proto/shared/shared.runtime_function.proto index 1bf4417..5bf712d 100644 --- a/proto/shared/shared.runtime_function.proto +++ b/proto/shared/shared.runtime_function.proto @@ -10,13 +10,10 @@ import "shared.struct.proto"; message FunctionGenericMapper { // can point to another generic or to a resolved data type - oneof source { - DataTypeIdentifier data_type_identifier = 1; - string generic_key = 2; - } + DataTypeIdentifier source = 1; // can only be a generic key - string target = 3; - optional string parameter_id = 4; + string target = 2; + optional string parameter_id = 3; } // Definition of a function used for execution From aff416da6677a5c61efd8a4dc64422c4c8f200b1 Mon Sep 17 00:00:00 2001 From: Raphael Date: Tue, 27 May 2025 22:34:21 +0200 Subject: [PATCH 2/2] fix: inlined runtime_function & parameter definition --- proto/shared/shared.flow.proto | 28 ++++++++++------------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/proto/shared/shared.flow.proto b/proto/shared/shared.flow.proto index 308b308..4609662 100644 --- a/proto/shared/shared.flow.proto +++ b/proto/shared/shared.flow.proto @@ -30,17 +30,19 @@ message FlowSettingDefinition { } message NodeFunction { - NodeFunctionDefinition definition = 1; - repeated NodeParameter parameters = 2; - optional NodeFunction next_node = 3; + int64 database_id = 1; + string runtime_function_id = 2; + repeated NodeParameter parameters = 3; + optional NodeFunction next_node = 4 ; } message NodeParameter { - NodeParameterDefinition definition = 1; + int64 database_id = 1; + string runtime_parameter_id = 2; oneof value { - shared.Value literal_value = 2; - ReferenceValue reference_value = 3; - NodeFunction function_value = 4; + shared.Value literal_value = 3; + ReferenceValue reference_value = 4; + NodeFunction function_value = 5; } } @@ -54,17 +56,7 @@ message ReferenceValue { message ReferencePath { optional string path = 1; - optional string array_index = 2; -} - -message NodeParameterDefinition { - string parameter_id = 1; - string runtime_parameter_id = 2; -} - -message NodeFunctionDefinition { - string function_id = 1; - string runtime_function_id = 2; + optional int64 array_index = 2; } message Flows {