Skip to content

fix: adjusted datatypes to match pictor #95

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 27, 2025
Merged

fix: adjusted datatypes to match pictor #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
31b61a1
fix: adjusted datatypes to match pictor
raphael-goetz May 27, 2025
aff416d
fix: inlined runtime_function & parameter definition
raphael-goetz May 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 5 additions & 8 deletions proto/shared/shared.data_type.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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;
}
28 changes: 10 additions & 18 deletions proto/shared/shared.flow.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}

Expand All @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions proto/shared/shared.flow_definition.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
9 changes: 3 additions & 6 deletions proto/shared/shared.runtime_function.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down