Merge pull request #1037 from code0-tech/#1036-drop-execution-result-restriction

raphael-goetz · web-flow · commit 2e858edec24e · 2026-06-12T17:18:00.000+02:00
changed restrictions on execution node results
diff --git a/app/graphql/types/execution_parameter_result_type.rb b/app/graphql/types/execution_parameter_result_type.rb
@@ -9,7 +9,7 @@ class ExecutionParameterResultType < Types::BaseObject
           null: false,
           description: 'Position of this parameter result in the node result'
     field :value, GraphQL::Types::JSON,
-          null: false,
+          null: true,
           description: 'Value returned for this parameter'
 
     id_field ExecutionParameterResult
diff --git a/app/grpc/concerns/grpc_stream_handler.rb b/app/grpc/concerns/grpc_stream_handler.rb
@@ -64,7 +64,7 @@ def self.listen!
           queues&.each do |queue|
             queue << decoded_data
           rescue StandardError => e
-            logger.error(message: 'Error while yielding data', error: e.message)
+            logger.error(message: 'Error while yielding data', error: e.message, backtrace: e.backtrace)
           end
         end
       end
diff --git a/app/grpc/execution_handler.rb b/app/grpc/execution_handler.rb
@@ -25,17 +25,18 @@ def test(requests, call)
         ApplicationRecord.connection_pool.with_connection do
           case request.data
           when :logon
-            logger.info(message: 'Execution runtime sent logon', runtime_id: current_runtime_id)
+            logger.info(message: 'Execution runtime sent logon')
           when :response
             handle_execution_result(request.response, current_runtime_id)
           end
         end
       end
     rescue StandardError => e
-      logger.error(message: 'Error reading execution stream', error: e.message, runtime_id: current_runtime_id)
+      logger.error(message: 'Error reading execution stream', error: e.message,
+                   backtrace: e.backtrace)
       outbound_queue << :end if outbound_queue
     ensure
-      logger.info(message: 'Execution runtime request stream closed', runtime_id: current_runtime_id)
+      logger.info(message: 'Execution runtime request stream closed')
     end
 
     enumerator
@@ -81,7 +82,7 @@ def handle_execution_result(execution_result, runtime_id)
       runtime_id: runtime_id,
       execution_identifier: execution_result.execution_identifier,
       error: response.message,
-      details: response.payload
+      details: response.payload.errors.full_messages
     )
   end
 end
diff --git a/app/models/execution_node_result.rb b/app/models/execution_node_result.rb
@@ -23,8 +23,8 @@ def only_one_execution_target_present
   end
 
   def only_one_result_present
-    return if [!success.nil?, !error.nil?].count(true) == 1
+    return if [!success.nil?, !error.nil?].count(true) <= 1
 
-    errors.add(:base, 'Only one of success or error must be present')
+    errors.add(:base, 'Only one of success or error can be present')
   end
 end
diff --git a/app/models/execution_parameter_result.rb b/app/models/execution_parameter_result.rb
@@ -4,11 +4,4 @@ class ExecutionParameterResult < ApplicationRecord
   belongs_to :execution_node_result, inverse_of: :parameter_results
 
   validates :position, presence: true, numericality: { only_integer: true }
-  validate :value_must_be_present
-
-  private
-
-  def value_must_be_present
-    errors.add(:value, "can't be blank") if value.nil?
-  end
 end
diff --git a/app/models/execution_result.rb b/app/models/execution_result.rb
@@ -18,8 +18,8 @@ class ExecutionResult < ApplicationRecord
   private
 
   def only_one_result_present
-    return if [!success.nil?, !error.nil?].count(true) == 1
+    return if [!success.nil?, !error.nil?].count(true) <= 1
 
-    errors.add(:base, 'Only one of success or error must be present')
+    errors.add(:base, 'Only one of success or error can be present')
   end
 end
diff --git a/app/services/namespaces/projects/flows/persist_execution_result_service.rb b/app/services/namespaces/projects/flows/persist_execution_result_service.rb
@@ -68,7 +68,7 @@ def build_parameter_results(node_record, node_result)
           node_result.parameter_results.each_with_index do |parameter_result, index|
             node_record.parameter_results.build(
               position: index,
-              value: parameter_result.value.to_ruby(true)
+              value: parameter_result.value&.to_ruby(true)
             )
           end
         end
diff --git a/db/migrate/20260531180000_create_execution_results.rb b/db/migrate/20260531180000_create_execution_results.rb
@@ -11,7 +11,7 @@ def change
       t.jsonb :success
       t.jsonb :error
 
-      t.check_constraint 'num_nonnulls(success, error) = 1',
+      t.check_constraint 'num_nonnulls(success, error) <= 1',
                          name: check_constraint_name(:execution_results, :result, :at_most_one)
 
       t.index '"flow_id", LOWER("execution_identifier")',
@@ -33,7 +33,7 @@ def change
       t.jsonb :success
       t.jsonb :error
 
-      t.check_constraint 'num_nonnulls(success, error) = 1',
+      t.check_constraint 'num_nonnulls(success, error) <= 1',
                          name: check_constraint_name(:execution_node_results, :result, :at_most_one)
 
       t.index %i[execution_result_id position],
@@ -49,7 +49,7 @@ def change
                    foreign_key: { on_delete: :cascade },
                    index: false
       t.integer :position, null: false
-      t.jsonb :value, null: false
+      t.jsonb :value
 
       t.index %i[execution_node_result_id position],
               unique: true,
diff --git a/db/structure.sql b/db/structure.sql
@@ -194,7 +194,7 @@ CREATE TABLE execution_node_results (
     created_at timestamp with time zone NOT NULL,
     updated_at timestamp with time zone NOT NULL,
     function_definition_id bigint,
-    CONSTRAINT check_26548a5903 CHECK ((num_nonnulls(success, error) = 1))
+    CONSTRAINT check_26548a5903 CHECK ((num_nonnulls(success, error) <= 1))
 );
 
 CREATE SEQUENCE execution_node_results_id_seq
@@ -210,7 +210,7 @@ CREATE TABLE execution_parameter_results (
     id bigint NOT NULL,
     execution_node_result_id bigint NOT NULL,
     "position" integer NOT NULL,
-    value jsonb NOT NULL,
+    value jsonb,
     created_at timestamp with time zone NOT NULL,
     updated_at timestamp with time zone NOT NULL
 );
@@ -236,7 +236,7 @@ CREATE TABLE execution_results (
     created_at timestamp with time zone NOT NULL,
     updated_at timestamp with time zone NOT NULL,
     CONSTRAINT check_1e7a71dfb7 CHECK ((char_length(execution_identifier) <= 200)),
-    CONSTRAINT check_5bf29caaec CHECK ((num_nonnulls(success, error) = 1))
+    CONSTRAINT check_5bf29caaec CHECK ((num_nonnulls(success, error) <= 1))
 );
 
 CREATE SEQUENCE execution_results_id_seq
diff --git a/docs/graphql/object/executionparameterresult.md b/docs/graphql/object/executionparameterresult.md
@@ -12,4 +12,4 @@ Represents a parameter result of an execution node result
 | `id` | [`ExecutionParameterResultID!`](../scalar/executionparameterresultid.md) | Global ID of this ExecutionParameterResult |
 | `position` | [`Int!`](../scalar/int.md) | Position of this parameter result in the node result |
 | `updatedAt` | [`Time!`](../scalar/time.md) | Time when this ExecutionParameterResult was last updated |
-| `value` | [`JSON!`](../scalar/json.md) | Value returned for this parameter |
+| `value` | [`JSON`](../scalar/json.md) | Value returned for this parameter |
diff --git a/spec/services/namespaces/projects/flows/persist_execution_result_service_spec.rb b/spec/services/namespaces/projects/flows/persist_execution_result_service_spec.rb
@@ -108,6 +108,64 @@
     end
   end
 
+  context 'when a parameter result value is JSON null' do
+    let(:grpc_result) do
+      Tucana::Shared::ExecutionResult.new(
+        execution_identifier: 'execution-identifier',
+        flow_id: flow.id,
+        started_at: started_at,
+        finished_at: finished_at,
+        input: Tucana::Shared::Value.from_ruby('input' => 'value'),
+        success: Tucana::Shared::Value.from_ruby('result' => true),
+        node_execution_results: [
+          Tucana::Shared::NodeExecutionResult.new(
+            node_id: node_function.id,
+            started_at: started_at,
+            finished_at: finished_at,
+            success: Tucana::Shared::Value.from_ruby('node' => 'ok'),
+            parameter_results: [
+              Tucana::Shared::NodeParameterNodeExecutionResult.new(
+                value: Tucana::Shared::Value.from_ruby(nil)
+              )
+            ]
+          )
+        ]
+      )
+    end
+
+    it 'persists the null parameter result' do
+      expect(service_response).to be_success
+      expect(service_response.payload.node_results.sole.parameter_results.sole.value).to be_nil
+    end
+  end
+
+  context 'when the execution result success is JSON null' do
+    let(:grpc_result) do
+      Tucana::Shared::ExecutionResult.new(
+        execution_identifier: 'execution-identifier',
+        flow_id: flow.id,
+        started_at: started_at,
+        finished_at: finished_at,
+        input: Tucana::Shared::Value.from_ruby('input' => 'value'),
+        success: Tucana::Shared::Value.from_ruby(nil),
+        node_execution_results: [
+          Tucana::Shared::NodeExecutionResult.new(
+            node_id: node_function.id,
+            started_at: started_at,
+            finished_at: finished_at,
+            success: Tucana::Shared::Value.from_ruby(nil)
+          )
+        ]
+      )
+    end
+
+    it 'persists null success values' do
+      expect(service_response).to be_success
+      expect(service_response.payload.success).to be_nil
+      expect(service_response.payload.node_results.sole.success).to be_nil
+    end
+  end
+
   context 'when a node execution result targets a function definition' do
     let(:function_definition) { create(:function_definition) }
     let(:grpc_result) do

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ def build_parameter_results(node_record, node_result)`
`68`	`68`	`node_result.parameter_results.each_with_index do \|parameter_result, index\|`
`69`	`69`	`node_record.parameter_results.build(`
`70`	`70`	`position: index,`
`71`		`- value: parameter_result.value.to_ruby(true)`
	`71`	`+ value: parameter_result.value&.to_ruby(true)`
`72`	`72`	`)`
`73`	`73`	`end`
`74`	`74`	`end`