cpee 2.1.85 → 2.1.87

data/lib/cpee/implementation_properties.rb

@@ -84,10 +84,11 @@ module CPEE
           end
           on resource 'dslx' do
             run CPEE::Properties::GetComplex, 'dslx', 'text/xml', id, opts if get
+            run CPEE::Properties::PutDescription, id, opts, true if put 'dslx'
           end
           on resource 'description' do
             run CPEE::Properties::GetComplex, 'description', 'text/xml', id, opts if get
-            run CPEE::Properties::PutDescription, id, opts if put 'description'
+            run CPEE::Properties::PutDescription, id, opts, false if put 'description'
           end
           on resource 'transformation' do
             run CPEE::Properties::GetTransformation, id, opts if get
@@ -147,7 +148,9 @@ module CPEE
         id = @a[0]
         opts = @a[1]
         if opts[:statemachine].readonly? id
-          @status = 400
+          @status = 423
+        elsif opts[:statemachine].final? id
+          @status = 410
         else
           doc = XML::Smart::string(@p[0].value.read)
           doc.register_namespace 'p', 'http://cpee.org/ns/properties/2.0'
@@ -224,7 +227,9 @@ module CPEE
         id = @a[0]
         opts = @a[1]
         if opts[:statemachine].readonly? id
-          @status = 400
+          @status = 423
+        elsif opts[:statemachine].final? id
+          @status = 410
         else
           doc = XML::Smart::string(@p[0].value.read)
           doc.register_namespace 'p', 'http://cpee.org/ns/properties/2.0'
@@ -310,7 +315,9 @@ module CPEE
         id = @a[0]
         opts = @a[1]
         if opts[:statemachine].readonly? id
-          @status = 422 # semantic error
+          @status = 423
+        elsif opts[:statemachine].final? id
+          @status = 410
         else
           PutStatus::set id, opts, @p[0].value.read
         end
@@ -360,6 +367,8 @@ module CPEE
         opts = @a[1]
         if opts[:statemachine].readonly? id
           @status = 423
+        elsif opts[:statemachine].final? id
+          @status = 410
         else
           PutExecutionHandler::set(id,opts,@p[0].value)
         end
@@ -396,6 +405,8 @@ module CPEE
         opts = @a[2]
         if opts[:statemachine].readonly? id
           @status = 423
+        elsif opts[:statemachine].final? id
+          @status = 410
         else
           begin
             PatchItems::set(item,id,opts,@p[0].value.read)
@@ -425,6 +436,8 @@ module CPEE
         opts = @a[2]
         if opts[:statemachine].readonly? id
           @status = 423
+        elsif opts[:statemachine].final? id
+          @status = 410
         else
           begin
             PutItems::set(item,id,opts,@p[0].value.read)
@@ -442,6 +455,8 @@ module CPEE
         opts = @a[2]
         if opts[:statemachine].readonly? id
           @status = 423
+        elsif opts[:statemachine].final? id
+          @status = 410
         else
           begin
             doc = XML::Smart::string(@p[0].value.read)
@@ -495,6 +510,8 @@ module CPEE
         val = { @r.last => nil }
         if opts[:statemachine].readonly? id
           @status = 423
+        elsif opts[:statemachine].final? id
+          @status = 410
         else
           if CPEE::Persistence::extract_item(id,opts,@r.join('/'))
             CPEE::Persistence::set_list(id,opts,item,val,val.keys)
@@ -554,6 +571,8 @@ module CPEE
         opts = @a[1]
         if opts[:statemachine].readonly? id
           @status = 423
+        elsif opts[:statemachine].final? id
+          @status = 410
         else
           begin
             PatchPositions::set(id,opts,@p[0].value.read)
@@ -591,6 +610,8 @@ module CPEE
         opts = @a[1]
         if opts[:statemachine].readonly? id
           @status = 423
+        elsif opts[:statemachine].final? id
+          @status = 410
         else
           begin
             PutPositions::set(id,opts,@p[0].value.read)
@@ -607,6 +628,8 @@ module CPEE
         opts = @a[1]
         if opts[:statemachine].readonly? id
           @status = 423
+        elsif opts[:statemachine].final? id
+          @status = 410
         else
           begin
             doc = XML::Smart::string(@p[0].value.read)
@@ -694,10 +717,10 @@ module CPEE
         ep = {}
 
         ### endpoints extraction
-        addit = if tendptype == 'rest' && !tdata.empty?
-          srv = Riddl::Client.interface(tendp,opts[:transformation_service])
+        addit = if tendptype == 'rest' && !tendp.empty?
+          srv = Riddl::Client.new(tendp)
           status, res = srv.post [
-            Riddl::Parameter::Complex.new("description","text/xml",descxml),
+            desc.nil? ? Riddl::Parameter::Complex.new("description","text/plain",descxml) : Riddl::Parameter::Complex.new("description","text/xml",descxml),
             Riddl::Parameter::Simple.new("type","endpoints")
           ]
           if status >= 200 && status < 300
@@ -705,7 +728,7 @@ module CPEE
           else
             raise 'Could not extract endpoints'
           end
-        elsif tendptype == 'xslt' && !tdata.empty?
+        elsif tendptype == 'xslt' && !tendp.empty?
           trans = XML::Smart::open_unprotected(tendp.text)
           desc.transform_with(trans)
         elsif tendptype == 'clean'
@@ -723,9 +746,9 @@ module CPEE
         addit = if tdesctype == 'copy' || tdesc.empty?
           desc || ''
         elsif tdesctype == 'rest' && !tdesc.empty?
-          srv = Riddl::Client.interface(tdesc,opts[:transformation_service])
+          srv = Riddl::Client.new(tdesc)
           status, res = srv.post [
-            Riddl::Parameter::Complex.new("description","text/xml",descxml),
+            desc.nil? ? Riddl::Parameter::Complex.new("description","text/plain",descxml) : Riddl::Parameter::Complex.new("description","text/xml",descxml),
             Riddl::Parameter::Simple.new("type","description")
           ]
           if status >= 200 && status < 300
@@ -748,9 +771,9 @@ module CPEE
 
         ### dataelements extraction
         addit = if tdatatype == 'rest' && !tdata.empty?
-          srv = Riddl::Client.interface(tdata,opts[:transformation_service])
+          srv = Riddl::Client.new(tdata)
           status, res = srv.post [
-            Riddl::Parameter::Complex.new("description","text/xml",descxml),
+            desc.nil? ? Riddl::Parameter::Complex.new("description","text/plain",descxml) : Riddl::Parameter::Complex.new("description","text/xml",descxml),
             Riddl::Parameter::Simple.new("type","dataelements")
           ]
           if status >= 200 && status < 300
@@ -775,40 +798,69 @@ module CPEE
         [dslx, dsl, de, ep]
       end #}}}
 
-      def self::set(id,opts,xml)
-        dslx, dsl, de, ep = PutDescription::transform(
-          xml,
-          CPEE::Persistence::extract_item(id,opts,'transformation/description'),
-          CPEE::Persistence::extract_item(id,opts,'transformation/description/@type'),
-          CPEE::Persistence::extract_item(id,opts,'transformation/dataelements'),
-          CPEE::Persistence::extract_item(id,opts,'transformation/dataelements/@type'),
-          CPEE::Persistence::extract_item(id,opts,'transformation/endpoints'),
-          CPEE::Persistence::extract_item(id,opts,'transformation/endpoints/@type'),
-          CPEE::Persistence::extract_item(id,opts,'executionhandler'),
-          id,
-          opts
-        )
+      def self::set(id,opts,xml,exposition=[],copy=false)
+        dslx, dsl, de, ep = if copy
+          PutDescription::transform(
+            xml,
+            '',
+            'copy',
+            '',
+            'none',
+            '',
+            'none',
+            CPEE::Persistence::extract_item(id,opts,'executionhandler'),
+            id,
+            opts
+          )
+        else
+          PutDescription::transform(
+            xml,
+            CPEE::Persistence::extract_item(id,opts,'transformation/description'),
+            CPEE::Persistence::extract_item(id,opts,'transformation/description/@type'),
+            CPEE::Persistence::extract_item(id,opts,'transformation/dataelements'),
+            CPEE::Persistence::extract_item(id,opts,'transformation/dataelements/@type'),
+            CPEE::Persistence::extract_item(id,opts,'transformation/endpoints'),
+            CPEE::Persistence::extract_item(id,opts,'transformation/endpoints/@type'),
+            CPEE::Persistence::extract_item(id,opts,'executionhandler'),
+            id,
+            opts
+          )
+        end
+        attrs = CPEE::Persistence::extract_list(id,opts,'attributes').to_h
+        change_uuid = Digest::SHA1.hexdigest(dslx)
         CPEE::Persistence::set_item(id,opts,'description',
           :description => xml,
           :dslx => dslx,
+          :change_uuid => change_uuid,
           :dsl => dsl,
           :dataelements => CPEE::Persistence::extract_list(id,opts,'dataelements').to_h,
           :endpoints => CPEE::Persistence::extract_list(id,opts,'endpoints').to_h,
-          :attributes => CPEE::Persistence::extract_list(id,opts,'attributes').to_h
+          :attributes => attrs
         )
         PatchItems::set_hash('dataelements',id,opts,de) unless de.empty?
-        PatchItems::set_hash('dataelements',id,opts,ep) unless ep.empty?
+        PatchItems::set_hash('endpoints',id,opts,ep) unless ep.empty?
+        exposition.each do |exp|
+          content = {
+            :change_uuid => change_uuid,
+            :exposition => exp.value.read,
+            :attributes => attrs
+          }
+          CPEE::Message::send(:event,'description/exposition',File.join(opts[:url],'/'),id,attrs['uuid'],attrs['info'],content,opts[:redis])
+        end
       end
 
       def response
         id = @a[0]
         opts = @a[1]
+        copy = @a[2]
         if opts[:statemachine].readonly? id
-          @status = 422 # semantic error
+          @status = 423
+        elsif opts[:statemachine].final? id
+          @status = 410
         else
           begin
             # force-encoding because johannes managed to sneak in ascii special characters. why the browser is not sanitizing it is beyond me.
-            PutDescription::set(id,opts,@p[0].value.read.force_encoding('UTF-8'))
+            PutDescription::set(id,opts,@p[0].value.read.force_encoding('UTF-8'),@p[1..-1],copy)
           rescue => e
             puts e.message
             puts e.backtrace
@@ -852,7 +904,9 @@ module CPEE
         id = @a[0]
         opts = @a[1]
         if opts[:statemachine].readonly? id
-          @status = 422 # semantic error
+          @status = 423
+        elsif opts[:statemachine].final? id
+          @status = 410
         else
           PutTransformation::set(id,opts,@p[0].value.read)
         end

data/lib/cpee/statemachine.rb

@@ -15,10 +15,11 @@
 module CPEE
 
   class StateMachine
-    def initialize(file,readonly,&state)
+    def initialize(file,&state)
       @states = XML::Smart.open_unprotected(file)
       @state = state
-      @readonly = readonly
+      @readonly = @states.find("/states/observable/*[*]").map { |e| e.qname.name }
+      @final = @states.find("/states/observable/*[not(*)]").map { |e| e.qname.name }
     end
 
     def setable?(id,nval)
@@ -29,6 +30,10 @@ module CPEE
     def readonly?(id)
       @readonly.include? @state.call(id)
     end
+
+    def final?(id)
+      @final.include? @state.call(id)
+    end
   end
 
 end

data/lib/properties.xml

@@ -130,9 +130,15 @@
   </message> <!--}}}-->
   <message name="dslx"> <!--{{{-->
     <parameter name="dslx" mimetype="*/xml"/>
+    <zeroOrMore>
+      <parameter name="exposition" mimetype="*"/>
+    </zeroOrMore>
   </message> <!--}}}-->
   <message name="description"> <!--{{{-->
     <parameter name="description" mimetype="*"/>
+    <zeroOrMore>
+      <parameter name="exposition" mimetype="*"/>
+    </zeroOrMore>
   </message> <!--}}}-->
 
   <message name="transformation"> <!--{{{-->
@@ -221,6 +227,7 @@
     </resource> <!--}}}-->
     <resource relative="dslx"> <!--{{{-->
       <get out="dslx"/>
+      <put in="dslx"/>
     </resource> <!--}}}-->
     <resource relative="description"> <!--{{{-->
       <get out="description"/>

data/server/executionhandlers/ruby/ShiftingTestSimple.xml

@@ -0,0 +1,100 @@
+    <description xmlns="http://cpee.org/ns/description/1.0">
+      <_generic/>
+      <_shifting>
+        <_shifting_factor>45 minutes</_shifting_factor>
+        <_shifting_start>!data.basedate + ", 12:00"</_shifting_start>
+        <_shifting_modifier>2</_shifting_modifier>
+      </_shifting>
+      <_context_data_analysis>
+        <probes/>
+        <ips/>
+      </_context_data_analysis>
+      <loop mode="pre_test" condition="true">
+        <_probability>
+          <_probability_min/>
+          <_probability_max/>
+          <_probability_avg/>
+        </_probability>
+        <parallel wait="-1" cancel="last">
+          <parallel_branch pass="" local="">
+            <call id="a1" endpoint="send">
+              <parameters>
+                <label>send message</label>
+                <arguments>
+                  <timeout>1</timeout>
+                  <ignore/>
+                </arguments>
+              </parameters>
+              <annotations>
+                <_generic/>
+                <_timing>
+                  <_timing_weight/>
+                  <_timing_avg/>
+                  <explanations/>
+                </_timing>
+                <_shifting>
+                  <_shifting_type>Duration</_shifting_type>
+                  <_shifting_expression>!rand(1.. 3) + " days"</_shifting_expression>
+                </_shifting>
+                <_context_data_analysis>
+                  <probes/>
+                  <ips/>
+                </_context_data_analysis>
+                <report>
+                  <url/>
+                </report>
+                <_notes>
+                  <_notes_general/>
+                </_notes>
+              </annotations>
+              <documentation>
+                <input/>
+                <output/>
+                <implementation>
+                  <description/>
+                </implementation>
+              </documentation>
+            </call>
+          </parallel_branch>
+          <parallel_branch pass="" local="">
+            <call id="a5" endpoint="timeout">
+              <parameters>
+                <label>Wait till 16:00</label>
+                <arguments>
+                  <timeout>2</timeout>
+                </arguments>
+              </parameters>
+              <annotations>
+                <_timing>
+                  <_timing_weight/>
+                  <_timing_avg/>
+                  <explanations/>
+                </_timing>
+                <_shifting>
+                  <_shifting_type>Ends</_shifting_type>
+                  <_shifting_expression>same day, 16:00</_shifting_expression>
+                </_shifting>
+                <_context_data_analysis>
+                  <probes/>
+                  <ips/>
+                </_context_data_analysis>
+                <report>
+                  <url/>
+                </report>
+                <_notes>
+                  <_notes_general/>
+                </_notes>
+              </annotations>
+              <documentation>
+                <input/>
+                <output/>
+                <implementation>
+                  <description/>
+                </implementation>
+              </documentation>
+            </call>
+          </parallel_branch>
+        </parallel>
+        <stop id="a4"/>
+      </loop>
+    </description>

data/server/executionhandlers/ruby/connection.rb

@@ -467,7 +467,8 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
   end #}}}
   def join_branches(id, branches = []) # factual, so for inclusive or [[a],[b],[c,d,e]] {{{
     payload = { :instance_uuid => @controller.uuid, :ecid => id.to_s }
-    payload[:branches] = branches.length if branches.length > 0
+    payload[:branches] = branches if branches.length > 0
+    payload[:branches_length] = branches.length if branches.length > 0
     @controller.notify("gateway/join", payload )
   end #}}}
 end

data/server/executionhandlers/ruby/dsl_to_dslx.xsl

@@ -519,7 +519,9 @@
       <xsl:otherwise>
         <xsl:choose>
           <xsl:when test="substring(text(),1,1) = '!'">
-            <xsl:value-of select="substring(text(),2)"/>
+            <xsl:text>🠊("</xsl:text>
+            <xsl:value-of select="str:replace(str:replace(substring(text(),2),'\','\\'),'&quot;','\&quot;')"/>
+            <xsl:text>")</xsl:text>
           </xsl:when>
           <xsl:otherwise>
             <xsl:text>"</xsl:text>
@@ -548,7 +550,9 @@
       <xsl:otherwise>
         <xsl:choose>
           <xsl:when test="substring(text(),1,1) = '!'">
-            <xsl:value-of select="substring(text(),2)"/>
+            <xsl:text>🠊("</xsl:text>
+            <xsl:value-of select="str:replace(str:replace(substring(text(),2),'\','\\'),'&quot;','\&quot;')"/>
+            <xsl:text>")</xsl:text>
           </xsl:when>
           <xsl:otherwise>
             <xsl:text>"</xsl:text>
@@ -577,7 +581,9 @@
       <xsl:otherwise>
         <xsl:choose>
           <xsl:when test="substring(text(),1,1) = '!'">
-            <xsl:value-of select="substring(text(),2)"/>
+            <xsl:text>🠊("</xsl:text>
+            <xsl:value-of select="str:replace(str:replace(substring(text(),2),'\','\\'),'&quot;','\&quot;')"/>
+            <xsl:text>")</xsl:text>
           </xsl:when>
           <xsl:otherwise>
             <xsl:text>"</xsl:text>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 2.1.85
+  version: 2.1.87
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -9,7 +9,7 @@ authors:
 - Gerhard Stuermer
 bindir: tools
 cert_chain: []
-date: 2025-05-13 00:00:00.000000000 Z
+date: 2025-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl
@@ -209,6 +209,7 @@ files:
 - cockpit/contrib/transformation2.xsl
 - cockpit/contrib/tree_example.svg
 - cockpit/css/graph.css
+- cockpit/css/llm.css
 - cockpit/css/model.css
 - cockpit/css/resources-label.css
 - cockpit/css/resources-svg.css
@@ -221,6 +222,8 @@ files:
 - cockpit/js/details.js
 - cockpit/js/edit.js
 - cockpit/js/instance.js
+- cockpit/js/llm.js
+- cockpit/js/llm_alternative.js
 - cockpit/js/model.js
 - cockpit/js/modifiers.js
 - cockpit/js/parameters.js
@@ -229,7 +232,10 @@ files:
 - cockpit/js/ui.js
 - cockpit/js/wfadaptor.js
 - cockpit/js_libs.zip
+- cockpit/llm.html
+- cockpit/llm_alternative.html
 - cockpit/model.html
+- cockpit/only_llm.html
 - cockpit/rngs/attributes.rng
 - cockpit/rngs/dataelements.rng
 - cockpit/rngs/endpoints.rng
@@ -907,6 +913,7 @@ files:
 - server/executionhandlers/eval/controller.rb
 - server/executionhandlers/eval/dsl_to_dslx.xsl
 - server/executionhandlers/eval/execution.rb
+- server/executionhandlers/ruby/ShiftingTestSimple.xml
 - server/executionhandlers/ruby/backend/README.md
 - server/executionhandlers/ruby/backend/instance.template
 - server/executionhandlers/ruby/backend/opts.yaml
@@ -922,14 +929,9 @@ files:
 - server/resources/states.dot
 - server/resources/states.xml
 - server/resources/topics.xml
-- server/resources/transformation.xml
-- server/routing/end.pid
 - server/routing/end.rb
-- server/routing/forward-events-00.pid
 - server/routing/forward-events.rb
-- server/routing/forward-votes.pid
 - server/routing/forward-votes.rb
-- server/routing/persist.pid
 - server/routing/persist.rb
 - server/server.pid
 - tools/cpee

data/server/resources/transformation.xml

@@ -1,53 +0,0 @@
-<!--
-  This file is part of CPEE.
-
-  CPEE is free software: you can redistribute it and/or modify it under the terms
-  of the GNU General Public License as published by the Free Software Foundation,
-  either version 3 of the License, or (at your option) any later version.
-
-  CPEE is distributed in the hope that it will be useful, but WITHOUT ANY
-  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-  PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License along with
-  CPEE (file COPYING in the main directory).  If not, see
-  <http://www.gnu.org/licenses/>.
--->
-
-<description datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" xmlns="http://riddl.org/ns/description/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-
-  <message name="description">
-    <parameter name="description" mimetype="text/xml"/>
-  </message>
-  <message name="dataelements">
-    <zeroOrMore>
-      <parameter name="name" type="string"/>
-      <parameter name="value" type="string"/>
-    </zeroOrMore>
-  </message>
-  <message name="endpoints">
-    <zeroOrMore>
-      <parameter name="name" type="string"/>
-      <parameter name="value" type="string"/>
-    </zeroOrMore>
-  </message>
-
-  <message name="dedesc">
-    <parameter name="description" mimetype="text/xml"/>
-    <parameter name="type" fixed="description"/>
-  </message>
-  <message name="dadesc">
-    <parameter name="description" mimetype="text/xml"/>
-    <parameter name="type" fixed="dataelements"/>
-  </message>
-  <message name="endesc">
-    <parameter name="description" mimetype="text/xml"/>
-    <parameter name="type" fixed="endpoints"/>
-  </message>
-
-  <resource>
-    <post in="dedesc" out="description"/>
-    <post in="dadesc" out="dataelements"/>
-    <post in="endesc" out="endpoints"/>
-  </resource>
-</description>

data/server/routing/end.pid

@@ -1 +0,0 @@
-88347

data/server/routing/forward-events-00.pid

@@ -1 +0,0 @@
-88365

data/server/routing/forward-votes.pid

@@ -1 +0,0 @@
-88359

data/server/routing/persist.pid

@@ -1 +0,0 @@
-88353