feat: added definition source to sub flow

Author: raphael-goetz

app/models/sub_flow.rb

@@ -14,12 +14,20 @@ def function_identifier
   end
 
   def to_grpc
-    Tucana::Shared::SubFlow.new(
+    grpc_sub_flow = Tucana::Shared::SubFlow.new(
       starting_node_id: starting_node_id,
-      function_identifier: function_identifier,
       signature: signature,
       settings: sub_flow_settings.map(&:to_grpc)
     )
+    if function_definition.present?
+      function_args = { function_identifier: function_identifier }
+      definition_source = function_definition.runtime_function_definition.definition_source
+      function_args[:definition_source] = definition_source if definition_source.present?
+
+      grpc_sub_flow.function = Tucana::Shared::SubFlow::SubFlowFunction.new(**function_args)
+    end
+
+    grpc_sub_flow
   end
 
   private

app/services/velorum/generation_flow_serializer.rb

@@ -75,7 +75,12 @@ def prepare_definition_ids
         runtime_name = if definition.respond_to?(:runtime_function_definition)
                          definition.runtime_function_definition&.runtime_name
                        end
+        definition_source = definition.runtime_function_definition&.definition_source
         function_definitions_by_runtime_id[runtime_name] ||= definition if runtime_name.present?
+        if definition_source.present?
+          function_definitions_by_runtime_id[[definition.identifier, definition_source]] ||= definition
+          function_definitions_by_runtime_id[[runtime_name, definition_source]] ||= definition if runtime_name.present?
+        end
       end
     end
 
@@ -176,11 +181,15 @@ def reference_path_to_h(path)
     end
 
     def sub_flow_to_h(sub_flow)
-      function_definition = function_definition_for_identifier(sub_flow.function_identifier)
-      if runtime.present? && sub_flow.function_identifier.present? && function_definition.nil?
+      sub_flow_function = sub_flow.function if sub_flow.execution_reference == :function
+      function_identifier = sub_flow_function&.function_identifier
+      definition_source = sub_flow_function.definition_source if sub_flow_function&.has_definition_source?
+      function_definition = function_definition_for_identifier(function_identifier, definition_source)
+      if runtime.present? && function_identifier.present? && function_definition.nil?
         raise_unresolved_definition(
           'Generated sub-flow function definition is unknown',
-          function_identifier: sub_flow.function_identifier
+          function_identifier: function_identifier,
+          definition_source: definition_source
         )
       end
 
@@ -251,7 +260,11 @@ def function_definition_for(node)
       function_definition_for_identifier(node.runtime_function_id)
     end
 
-    def function_definition_for_identifier(identifier)
+    def function_definition_for_identifier(identifier, definition_source = nil)
+      return if identifier.blank?
+
+      return function_definitions_by_runtime_id[[identifier, definition_source]] if definition_source.present?
+
       function_definitions_by_runtime_id[identifier]
     end
 

spec/models/sub_flow_spec.rb

@@ -20,4 +20,24 @@
       expect(sub_flow.errors[:base]).to include('Exactly one of starting_node or function_definition must be present')
     end
   end
+
+  describe '#to_grpc' do
+    it 'serializes a function reference with its definition source' do
+      runtime_function_definition = create(:runtime_function_definition, definition_source: 'taurus')
+      function_definition = create(
+        :function_definition,
+        runtime: runtime_function_definition.runtime,
+        runtime_function_definition: runtime_function_definition
+      )
+      sub_flow = create(:sub_flow, starting_node: nil, function_definition: function_definition)
+
+      grpc_sub_flow = sub_flow.to_grpc
+
+      expect(grpc_sub_flow.function).to have_attributes(
+        function_identifier: function_definition.identifier,
+        definition_source: 'taurus'
+      )
+      expect(grpc_sub_flow.function.has_definition_source?).to be(true)
+    end
+  end
 end

spec/services/velorum/generate_flow_service_spec.rb

@@ -36,7 +36,9 @@
       parameter_definitions: [parameter_definition]
     )
   end
-  let(:runtime_function_definition) { instance_double(RuntimeFunctionDefinition, runtime_name: 'sum') }
+  let(:runtime_function_definition) do
+    instance_double(RuntimeFunctionDefinition, runtime_name: 'sum', definition_source: 'taurus')
+  end
   let(:parameter_definition) do
     instance_double(ParameterDefinition, runtime_parameter_definition: runtime_parameter_definition)
   end

spec/services/velorum/generation_flow_serializer_spec.rb

@@ -150,8 +150,7 @@
     )
   end
 
-  it 'maps gRPC reference variants and sub-flow values to flow-shaped objects',
-     skip: 'Temporarily disabled until the Tucana 0.0.76 SubFlow schema is supported' do
+  it 'maps gRPC reference variants and sub-flow values to flow-shaped objects' do
     flow = Tucana::Shared::GenerationFlow.new(
       node_functions: [
         Tucana::Shared::NodeFunction.new(
@@ -184,7 +183,7 @@
               runtime_parameter_id: 'sub-flow',
               value: Tucana::Shared::NodeValue.new(
                 sub_flow: Tucana::Shared::SubFlow.new(
-                  function_identifier: 'helper',
+                  function: Tucana::Shared::SubFlow::SubFlowFunction.new(function_identifier: 'helper'),
                   signature: '(): undefined'
                 )
               )
@@ -223,9 +222,13 @@
     )
   end
 
-  it 'resolves generated sub-flow function identifiers to function definitions',
-     skip: 'Temporarily disabled until the Tucana 0.0.76 SubFlow schema is supported' do
-    runtime_function_definition = create(:runtime_function_definition, runtime: runtime, runtime_name: 'helper')
+  it 'resolves generated sub-flow functions by identifier and definition source' do
+    runtime_function_definition = create(
+      :runtime_function_definition,
+      runtime: runtime,
+      runtime_name: 'helper',
+      definition_source: 'taurus'
+    )
     function_definition = create(
       :function_definition,
       runtime: runtime,
@@ -250,7 +253,12 @@
           parameters: [
             Tucana::Shared::NodeParameter.new(
               value: Tucana::Shared::NodeValue.new(
-                sub_flow: Tucana::Shared::SubFlow.new(function_identifier: 'helper')
+                sub_flow: Tucana::Shared::SubFlow.new(
+                  function: Tucana::Shared::SubFlow::SubFlowFunction.new(
+                    function_identifier: 'helper',
+                    definition_source: 'taurus'
+                  )
+                )
               )
             )
           ]