cpee 2.1.63 → 2.1.66

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a5ad9138a6f01a5ba60605774e91f89ec66bbfdd2532a5a238fce58c51fc5c9
-  data.tar.gz: 9d860c0c30b9842f2d4944273ac3114e8ba5652ccf2451382a843fec1036a132
+  metadata.gz: 052d8f4e613153998b5712cadd2204756c242376b4b037e2cb9b8a3a1542116c
+  data.tar.gz: 538940981be635be63e6d0790a5f3bac6bbd855a47b2acfc0fc96ddc26dde6d6
 SHA512:
-  metadata.gz: 49532083471afbc1a14f19da6ffeadd54e7034fa42ef34de67ba2af4dc7dc2e6d619dc3045600fdfba098c2b4ce7c51c13460a12e771353ad042b568ee1088f8
-  data.tar.gz: f3098595f22d252ecc793da1a0b68d8a5facc69baddb2a01e14b0ba678c5b53e7e95be5a9b01e6f9bea00b741866be44407eab8d491855785fb5d2b1c30a5500
+  metadata.gz: 2dcba10b6275f5cf5f6a7a2fa32fee4439c807cd248e3d22e65ed1a28a9fe6f5c5a1d7f318742ea3154421cbf4dfafe3fd0d96973599339425c7ef1cae4c8d94
+  data.tar.gz: 961f0578ee2657dd785494c3a9d61a289a3a29302f2373ef592ab1f1109cd07704737b9035990820de5c042bed72384055c8a08d7facf95430755f5b7825febc

data/cpee.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "2.1.63"
+  s.version          = "2.1.66"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0-or-later"
   s.summary          = "The cloud process execution engine (cpee.org). If you just need workflow execution, without a rest service exposing it, then use WEEL."
@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   s.homepage         = 'http://cpee.org/'
 
   s.add_runtime_dependency 'riddl', '~> 1.0'
-  s.add_runtime_dependency 'weel', '~> 1.99', '>= 1.99.121'
+  s.add_runtime_dependency 'weel', '~> 1.99', '>= 1.99.124'
   s.add_runtime_dependency 'highline', '~> 2.0'
   s.add_runtime_dependency 'redis', '~> 5.0'
   s.add_runtime_dependency 'rubyzip', '~>2'

data/server/executionhandlers/ruby/connection.rb

@@ -68,24 +68,6 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
     @guard_items = []
   end # }}}
 
-  def prepare(readonly, endpoints, parameters) #{{{
-    @handler_endpoint = endpoints.is_a?(Array) ? endpoints.map{ |ep| readonly.endpoints[ep] }.compact : readonly.endpoints[endpoints]
-    if @controller.attributes['twin_engine']
-      @handler_endpoint_orig = @handler_endpoint
-      @handler_endpoint = @controller.attributes['twin_engine'].to_s + '?original_endpoint=' + Riddl::Protocols::Utils::escape(@handler_endpoint)
-    end
-    params = parameters.dup
-    params[:arguments] = params[:arguments].dup if params[:arguments]
-    params[:arguments]&.map! do |ele|
-      t = ele.dup
-      if t.value.is_a?(Proc)
-        t.value = readonly.instance_exec &t.value
-      end
-      t
-    end
-    params
-  end #}}}
-
   def additional #{{{
     {
       :attributes => @controller.attributes,
@@ -256,9 +238,9 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
     true
   end # }}}
 
-  def activity_uuid
+  def activity_uuid #{{{
     @handler_activity_uuid
-  end
+  end #}}}
 
   def inform_activity_done # {{{
     @controller.notify("activity/done", :'activity-uuid' => @handler_activity_uuid, :endpoint => @handler_endpoint, :label => @label, :activity => @handler_position)
@@ -292,7 +274,7 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
     @controller.vote("activity/syncing_before", :'activity-uuid' => @handler_activity_uuid, :endpoint => @handler_endpoint, :activity => @handler_position, :label => @label, :parameters => parameters)
   end # }}}
 
-  def callback(result=nil,options={})
+  def callback(result=nil,options={}) #{{{
     recv = CPEE::EvalRuby::Translation::structurize_result(result)
     @controller.notify("activity/receiving", :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :endpoint => @handler_endpoint, :received => recv, :annotations => @anno)
 
@@ -323,7 +305,7 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
         @handler_continue.continue
       end
     end
-  end
+  end #}}}
 
   def mem_guard() #{{{
     @guard_files.delete_if do |p|
@@ -337,29 +319,48 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
     GC.start
   end #}}}
 
-  def test_condition(dataelements,endpoints,local,additional,code,args={})
-    res = WEEL::ReadStructure.new(dataelements,endpoints,local,additional).instance_eval(code,'Condition',1)
-    @controller.notify("gateway/decide", :instance_uuid => @controller.uuid, :code => code, :condition => (res ? "true" : "false"))
-    res
-  end
-  def eval_expression(dataelements,endpoints,local,additional,code)
-    WEEL::ReadStructure.new(dataelements,endpoints,local,additional).instance_eval(code)
-  end
-  def manipulate(readonly,lock,dataelements,endpoints,status,local,additional,code,where,result=nil,options=nil)
-    result = CPEE::EvalRuby::Translation::simplify_structurized_result(result)
-    struct = if readonly
-      WEEL::ReadStructure.new(dataelements,endpoints,local,additional)
+  def prepare(__lock,__dataelements,__endpoints,__status,__local,__additional,__code,__exec_endpoints,__exec_parameters) #{{{
+    __struct = if __code
+      manipulate(true,__lock,__dataelements,__endpoints,__status,__local,__additional,__code,'Parameter')
     else
-      WEEL::ManipulateStructure.new(dataelements,endpoints,status,local,additional)
+      WEEL::ReadStructure.new(__dataelements,__endpoints,__local,__additional)
     end
-    struct.instance_eval(code,where,1)
-    struct
-  end
+    @handler_endpoint = __exec_endpoints.is_a?(Array) ? __exec_endpoints.map{ |ep| __struct.endpoints[ep] }.compact : __struct.endpoints[__exec_endpoints]
+    if @controller.attributes['twin_engine']
+      @handler_endpoint_orig = @handler_endpoint
+      @handler_endpoint = @controller.attributes['twin_engine'].to_s + '?original_endpoint=' + Riddl::Protocols::Utils::escape(@handler_endpoint)
+    end
+    __params = __exec_parameters.dup
+    __params[:arguments] = __params[:arguments].dup if __params[:arguments]
+    __params[:arguments]&.map! do |__ele|
+      __tmp = __ele.dup
+      if __tmp.value.is_a?(WEEL::ProcString)
+        __tmp.value = __struct.instance_eval __tmp.value.code, 'Parameter', 1
+      end
+      __tmp
+    end
+    __params
+  end #}}}
+  def test_condition(__dataelements,__endpoints,__local,__additional,__code,__args={}) #{{{
+    __struct = WEEL::ReadStructure.new(__dataelements,__endpoints,__local,__additional).instance_eval(__code,'Condition',1)
+    @controller.notify("gateway/decide", :instance_uuid => @controller.uuid, :code => __code, :condition => (__struct ? "true" : "false"))
+    __struct
+  end #}}}
+  def manipulate(__readonly,__lock,__dataelements,__endpoints,__status,__local,__additional,__code,__where,__result=nil,__options=nil) #{{{
+    result = CPEE::EvalRuby::Translation::simplify_structurized_result(__result)
+    __struct = if __readonly
+      WEEL::ReadStructure.new(__dataelements,__endpoints,__local,__additional)
+    else
+      WEEL::ManipulateStructure.new(__dataelements,__endpoints,__status,__local,__additional)
+    end
+    __struct.instance_eval(__code,__where,1)
+    __struct
+  end #}}}
 
-  def split_branches(branches) # factual, so for inclusive or [[a],[b],[c,d,e]]
+  def split_branches(branches) # factual, so for inclusive or [[a],[b],[c,d,e]]{{{
     @controller.notify("gateway/split", :instance_uuid => @controller.uuid, :branches => branches)
-  end
-  def join_branches(branches) # factual, so for inclusive or [[a],[b],[c,d,e]]
+  end #}}}
+  def join_branches(branches) # factual, so for inclusive or [[a],[b],[c,d,e]]{{{
     @controller.notify("gateway/join", :instance_uuid => @controller.uuid, :branches => branches)
-  end
+  end #}}}
 end

data/server/executionhandlers/rubyext/connection.rb

@@ -68,24 +68,6 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
     @guard_items = []
   end # }}}
 
-  def prepare(readonly, endpoints, parameters) #{{{
-    @handler_endpoint = endpoints.is_a?(Array) ? endpoints.map{ |ep| readonly.endpoints[ep] }.compact : readonly.endpoints[endpoints]
-    if @controller.attributes['twin_engine']
-      @handler_endpoint_orig = @handler_endpoint
-      @handler_endpoint = @controller.attributes['twin_engine'].to_s + '?original_endpoint=' + Riddl::Protocols::Utils::escape(@handler_endpoint)
-    end
-    params = parameters.dup
-    params[:arguments] = params[:arguments].dup if params[:arguments]
-    params[:arguments]&.map! do |ele|
-      t = ele.dup
-      if t.value.is_a?(Proc)
-        t.value = readonly.instance_exec &t.value
-      end
-      t
-    end
-    params
-  end #}}}
-
   def additional #{{{
     {
       :attributes => @controller.attributes,
@@ -256,9 +238,9 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
     true
   end # }}}
 
-  def activity_uuid
+  def activity_uuid #{{{
     @handler_activity_uuid
-  end
+  end #}}}
 
   def inform_activity_done # {{{
     @controller.notify("activity/done", :'activity-uuid' => @handler_activity_uuid, :endpoint => @handler_endpoint, :label => @label, :activity => @handler_position)
@@ -292,7 +274,7 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
     @controller.vote("activity/syncing_before", :'activity-uuid' => @handler_activity_uuid, :endpoint => @handler_endpoint, :activity => @handler_position, :label => @label, :parameters => parameters)
   end # }}}
 
-  def callback(result=nil,options={})
+  def callback(result=nil,options={}) #{{{
     status, ret, headers = Riddl::Client.new(@controller.url_result_transformation).request 'put' => result
     recv = if status >= 200 && status < 300
       JSON::parse(ret[0].value.read)
@@ -330,7 +312,7 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
         @handler_continue.continue
       end
     end
-  end
+  end #}}}
 
   def mem_guard() #{{{
     @guard_files.delete_if do |p|
@@ -344,26 +326,42 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
     GC.start
   end #}}}
 
-  def test_condition(dataelements,endpoints,local,additional,code,args={})
-    send = []
-    send.push Riddl::Parameter::Simple::new('code',code)
-    send.push Riddl::Parameter::Complex::new('dataelements','application/json', JSON::generate(dataelements))
-    send.push Riddl::Parameter::Complex::new('local','application/json', JSON::generate(local)) if local
-    send.push Riddl::Parameter::Complex::new('endpoints','application/json', JSON::generate(endpoints))
-    send.push Riddl::Parameter::Complex::new('additional','application/json', JSON::generate(additional))
-
-    status, ret, headers = Riddl::Client.new(@controller.url_code).request 'put' => send
-    recv = if status >= 200 && status < 300
-      ret[0].value
+  def prepare(lock,dataelements,endpoints,status,local,additional,code,exec_endpoints,exec_parameters)
+    struct = if code
+      manipulate(true,lock,dataelements,endpoints,status,local,additional,code,'Parameter')
     else
-      nil
+      WEEL::ReadStructure.new(data,endpoints,local,additional)
     end
-    recv = 'false' unless receive
-    recv = (recv == 'false' || recv == 'null' || recv == 'nil' ? false : true)
-    @controller.notify("gateway/decide", :instance_uuid => @controller.uuid, :code => code, :condition => recv)
-    recv
-  end
-  def eval_expression(dataelements,endpoints,local,additional,code)
+    @handler_endpoint = exec_endpoints.is_a?(Array) ? exec_endpoints.map{ |ep| struct.endpoints[ep] }.compact : struct.endpoints[exec_endpoints]
+    if @controller.attributes['twin_engine']
+      @handler_endpoint_orig = @handler_endpoint
+      @handler_endpoint = @controller.attributes['twin_engine'].to_s + '?original_endpoint=' + Riddl::Protocols::Utils::escape(@handler_endpoint)
+    end
+    params = exec_parameters.dup
+    params[:arguments] = params[:arguments].dup if params[:arguments]
+    params[:arguments]&.map! do |ele|
+      t = ele.dup
+      if t.value.is_a?(WEEL::ProcString)
+        send = []
+        send.push Riddl::Parameter::Simple::new('code',t.value.code)
+        send.push Riddl::Parameter::Complex::new('dataelements','application/json', JSON::generate(struct.data))
+        send.push Riddl::Parameter::Complex::new('local','application/json', JSON::generate(struct.local)) if struct.local
+        send.push Riddl::Parameter::Complex::new('endpoints','application/json', JSON::generate(struct.endpoints))
+        send.push Riddl::Parameter::Complex::new('additional','application/json', JSON::generate(struct.additional))
+
+        status, ret, headers = Riddl::Client.new(@controller.url_code).request 'put' => send
+        recv = if status >= 200 && status < 300
+          ret[0].value
+        else
+          nil
+        end
+        t.value = recv
+      end
+      t
+    end
+    params
+  end #}}}
+  def test_condition(dataelements,endpoints,local,additional,code,args={}) #{{{
     send = []
     send.push Riddl::Parameter::Simple::new('code',code)
     send.push Riddl::Parameter::Complex::new('dataelements','application/json', JSON::generate(dataelements))
@@ -377,9 +375,12 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
     else
       nil
     end
+    recv = 'false' unless recv
+    recv = (recv == 'false' || recv == 'null' || recv == 'nil' ? false : true)
+    @controller.notify("gateway/decide", :instance_uuid => @controller.uuid, :code => code, :condition => recv)
     recv
-  end
-  def manipulate(readonly,lock,dataelements,endpoints,status,local,additional,code,where,result=nil,options=nil)
+  end #}}}
+  def manipulate(readonly,lock,dataelements,endpoints,status,local,additional,code,where,result=nil,options=nil) #{{{
     lock.synchronize do
       send = []
       send.push  Riddl::Parameter::Simple::new('code',code)
@@ -413,12 +414,12 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
         nil
       end
     end
-  end
+  end #}}}
 
-  def split_branches(branches) # factual, so for inclusive or [[a],[b],[c,d,e]]
+  def split_branches(branches) # factual, so for inclusive or [[a],[b],[c,d,e]]{{{
     @controller.notify("gateway/split", :instance_uuid => @controller.uuid, :branches => branches)
-  end
-  def join_branches(branches) # factual, so for inclusive or [[a],[b],[c,d,e]]
+  end #}}}
+  def join_branches(branches) # factual, so for inclusive or [[a],[b],[c,d,e]]{{{
     @controller.notify("gateway/join", :instance_uuid => @controller.uuid, :branches => branches)
-  end
+  end #}}}
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 2.1.63
+  version: 2.1.66
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: tools
 cert_chain: []
-date: 2024-09-17 00:00:00.000000000 Z
+date: 2024-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl
@@ -35,7 +35,7 @@ dependencies:
         version: '1.99'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.99.121
+        version: 1.99.124
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -45,7 +45,7 @@ dependencies:
         version: '1.99'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.99.121
+        version: 1.99.124
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement