cpee 2.1.130 → 2.1.132

data/lib/properties/set-properties.rng

@@ -4,6 +4,7 @@
   <include href="executionhandler.rng"/>
   <include href="positions.rng"/>
   <include href="dataelements.rng"/>
+  <include href="documents.rng"/>
   <include href="endpoints.rng"/>
   <include href="attributes.rng"/>
   <include href="description.rng"/>
@@ -16,6 +17,7 @@
       <ref name="executionhandler"/>
       <ref name="positions"/>
       <ref name="dataelements"/>
+      <ref name="documents"/>
       <ref name="endpoints"/>
       <ref name="attributes"/>
       <ref name="description"/>

data/lib/properties/set-some-properties.rng

@@ -4,6 +4,7 @@
   <include href="executionhandler.rng"/>
   <include href="positions.rng"/>
   <include href="dataelements.rng"/>
+  <include href="documents.rng"/>
   <include href="endpoints.rng"/>
   <include href="attributes.rng"/>
   <include href="description.rng"/>
@@ -27,6 +28,9 @@
         <optional>
           <ref name="dataelements"/>
         </optional>
+        <optional>
+          <ref name="documents"/>
+        </optional>
         <optional>
           <ref name="endpoints"/>
         </optional>

data/lib/properties/set-testset.rng

@@ -31,6 +31,9 @@
         <optional>
           <ref name="dataelements"/>
         </optional>
+        <optional>
+          <ref name="documents"/>
+        </optional>
         <optional>
           <ref name="endpoints"/>
         </optional>

data/lib/properties/t_documents.rng

@@ -0,0 +1,7 @@
+<grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+  <include href="documents.rng"/>
+
+  <start>
+    <ref name="documents"/>
+  </start>
+</grammar>

data/lib/properties.xml

@@ -103,6 +103,17 @@
     </parameter>
   </message> <!--}}}-->
 
+  <message name="document"> <!--{{{-->
+    <parameter name="document" mimetype="*/xml" handler="http://riddl.org/ns/handlers/relaxng">
+      <xi:include href="properties/t_simple.rng"/>
+    </parameter>
+  </message> <!--}}}-->
+  <message name="documents"> <!--{{{-->
+    <parameter name="documents" mimetype="*/xml" handler="http://riddl.org/ns/handlers/relaxng">
+      <xi:include href="properties/t_documents.rng"/>
+    </parameter>
+  </message> <!--}}}-->
+
   <message name="endpoint"> <!--{{{-->
     <parameter name="endpoint" mimetype="*/xml" handler="http://riddl.org/ns/handlers/relaxng">
       <xi:include href="properties/t_simple.rng"/>
@@ -199,6 +210,17 @@
         <delete/>
       </resource>
     </resource> <!--}}}-->
+    <resource relative="documents"> <!--{{{-->
+      <get out="documents"/>
+      <post in="document" out="id"/>
+      <patch in="documents"/>
+      <put in="documents"/>
+      <resource>
+        <get out="string"/>
+        <put in="string"/>
+        <delete/>
+      </resource>
+    </resource> <!--}}}-->
     <resource relative="endpoints"> <!--{{{-->
       <get out="endpoints"/>
       <post in="endpoint" out="id"/>

data/server/executionhandlers/eval/connection.rb

@@ -85,6 +85,7 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
   def additional #{{{
     {
       :attributes => @controller.attributes,
+      :documents => @controller.documents,
       :cpee => {
         'base' => @controller.base_url,
         'instance' => @controller.instance_id,

data/server/executionhandlers/eval/execution.rb

@@ -40,6 +40,7 @@ module CPEE
         endpoints = CPEE::Persistence::extract_list(id,opts,'endpoints')
         dataelements = CPEE::Persistence::extract_list(id,opts,'dataelements')
         attributes = CPEE::Persistence::extract_list(id,opts,'attributes').to_h
+        documents = CPEE::Persistence::extract_list(id,opts,'documents').to_h
         positions = CPEE::Persistence::extract_set(id,opts,'positions')
         positions.map! do |k, v|
           [ k, v, CPEE::Persistence::extract_item(id,opts,File.join('positions',k,'@passthrough')) ]
@@ -60,6 +61,7 @@ module CPEE
           iopts[:global_executionhandlers] = opts[:global_executionhandlers]
         end
         iopts[:attributes] = attributes
+        iopts[:documents] = documents
         iopts[:votes] = {}
         CPEE::Persistence::extract_handlers(id,opts).each do |de|
           if de[1] && de[1]&.empty?.!

data/server/executionhandlers/ruby/connection.rb

@@ -85,6 +85,7 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
   def additional #{{{
     {
       :attributes => @controller.attributes,
+      :documents => @controller.documents,
       :cpee => {
         'base' => @controller.base_url,
         'instance' => @controller.instance_id,

data/server/executionhandlers/ruby/controller.rb

@@ -18,7 +18,6 @@ require 'redis'
 require 'securerandom'
 require 'riddl/client'
 require 'cpee/value_helper'
-require 'cpee/attributes_helper'
 require 'cpee/message'
 require 'cpee/redis'
 require 'get_process_mem'
@@ -42,7 +41,7 @@ class Controller
     @id = id
 
     @attributes = opts[:attributes]
-    @attributes_helper = AttributesHelper.new
+    @documents = opts[:documents]
 
     @thread = nil
     @opts = opts
@@ -94,12 +93,9 @@ class Controller
 
   attr_reader :id
   attr_reader :attributes
+  attr_reader :documents
   attr_reader :loop_guard
 
-  def attributes_translated
-    @attributes_translated || @attributes_translated = @attributes_helper.translate(attributes,dataelements,endpoints)
-  end
-
   def uuid
     @attributes['uuid']
   end
@@ -170,7 +166,7 @@ class Controller
   end
 
   def notify(what,content={})
-    content[:attributes] = attributes_translated
+    content[:attributes] = attributes
     CPEE::Message::send(:event,what,base,@id,uuid,info,content,@redis)
   end
 
@@ -182,7 +178,7 @@ class Controller
     @opts[:votes][handler]&.each do |client|
       voteid = SecureRandom.hex(16)
       content[:key] = voteid
-      content[:attributes] = attributes_translated
+      content[:attributes] = attributes
       content[:subscription] = client
       votes << voteid
       CPEE::Message::send(:vote,what,base,@id,uuid,info,content,@redis)

data/server/executionhandlers/ruby/execution.rb

@@ -40,6 +40,7 @@ module CPEE
         endpoints = CPEE::Persistence::extract_list(id,opts,'endpoints')
         dataelements = CPEE::Persistence::extract_list(id,opts,'dataelements')
         attributes = CPEE::Persistence::extract_list(id,opts,'attributes').to_h
+        documents = CPEE::Persistence::extract_list(id,opts,'documents').to_h
         positions = CPEE::Persistence::extract_set(id,opts,'positions')
         positions.map! do |k, v|
           [ k, v, CPEE::Persistence::extract_item(id,opts,File.join('positions',k,'@passthrough')) ]
@@ -60,6 +61,7 @@ module CPEE
           iopts[:global_executionhandlers] = opts[:global_executionhandlers]
         end
         iopts[:attributes] = attributes
+        iopts[:documents] = documents
         iopts[:votes] = {}
         CPEE::Persistence::extract_handlers(id,opts).each do |de|
           if de[1] && de[1]&.empty?.!

data/server/resources/properties.empty

@@ -25,6 +25,7 @@
   <executionhandler>ruby</executionhandler>
   <positions/>
   <dataelements/>
+  <documents/>
   <endpoints/>
   <attributes/>
   <dsl/>

data/server/resources/properties.init

@@ -25,6 +25,7 @@
   <executionhandler>ruby</executionhandler>
   <positions/>
   <dataelements/>
+  <documents/>
   <endpoints>
     <user>https-post://cpee.org/services/timeout-user.php</user>
     <auto>https-post://cpee.org/services/timeout-auto.php</auto>

data/server/routing/end.pid

@@ -1 +1 @@
-2691960
+1227262

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

@@ -1 +1 @@
-2691978
+1227280

data/server/routing/forward-votes.pid

@@ -1 +1 @@
-2691972
+1227274

data/server/routing/persist.pid

@@ -1 +1 @@
-2691966
+1227268

data/server/routing/persist.rb

@@ -39,6 +39,7 @@ Daemonite.new do |opts|
         'event:' + ('%02i' % w) + ':executionhandler/change',
         'event:' + ('%02i' % w) + ':description/change',
         'event:' + ('%02i' % w) + ':dataelements/change',
+        'event:' + ('%02i' % w) + ':documents/change',
         'event:' + ('%02i' % w) + ':endpoints/change',
         'event:' + ('%02i' % w) + ':attributes/change',
         'event:' + ('%02i' % w) + ':transformation/change',
@@ -86,7 +87,7 @@ Daemonite.new do |opts|
               multi.set("instance:#{instance}/dslx",mess.dig('content','dslx'))
               multi.set("instance:#{instance}/dsl",mess.dig('content','dsl'))
             end
-          when /event:\d+:dataelements\/change/, /event:\d+:endpoints\/change/, /event:\d+:attributes\/change/
+          when /event:\d+:dataelements\/change/, /event:\d+:documents\/change/, /event:\d+:endpoints\/change/, /event:\d+:attributes\/change/
             topic = mess.dig('topic')
             max = opts[:redis].zrange("instance:#{instance}/#{topic}", -1, -1, :withscores => true)&.dig(0,1).to_i
             if (eles = mess.dig('content','sort'))&.any?

data/tools/cpee

@@ -91,7 +91,7 @@ def js_libs(cockpit)
     end
     true
   else
-    puts 'Internet access required to download javascript libs from "http://cpee.org/js_libs/js_libs.zip".'
+    puts 'Internet access required to download javascript libs from "https://cpee.org/js_libs/js_libs.zip".'
     false
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 2.1.130
+  version: 2.1.132
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -242,6 +242,7 @@ files:
 - cockpit/CPEE.xml
 - cockpit/README
 - cockpit/Signavio.xml
+- cockpit/compliance-view.html
 - cockpit/compliance.html
 - cockpit/config.json
 - cockpit/config.json.example
@@ -258,6 +259,7 @@ files:
 - cockpit/css/llm.css
 - cockpit/css/llm_active.svg
 - cockpit/css/llm_inactive.svg
+- cockpit/css/llmmodel.css
 - cockpit/css/mode_active.svg
 - cockpit/css/mode_inactive.svg
 - cockpit/css/model.css
@@ -285,6 +287,7 @@ files:
 - cockpit/only_llm.html
 - cockpit/rngs/attributes.rng
 - cockpit/rngs/dataelements.rng
+- cockpit/rngs/documents.rng
 - cockpit/rngs/endpoints.rng
 - cockpit/rngs/requirements.rng
 - cockpit/templates.legacy/Async.xml
@@ -354,6 +357,7 @@ files:
 - cockpit/templates/instantiate/Take_Perf.xml
 - cockpit/templates/instantiate/Take_Sub.xml
 - cockpit/templates/instantiate/Take_X.xml
+- cockpit/themes/THEMES.MD
 - cockpit/themes/base.js
 - cockpit/themes/control/rngs/alternative.rng
 - cockpit/themes/control/rngs/call.rng
@@ -1104,7 +1108,6 @@ files:
 - lib/callbacks.xml
 - lib/callbacks/callbacks.rng
 - lib/cpee.xml
-- lib/cpee/attributes_helper.rb
 - lib/cpee/constants.rb
 - lib/cpee/fail.rb
 - lib/cpee/implementation.rb
@@ -1125,6 +1128,7 @@ files:
 - lib/properties/attributes.rng
 - lib/properties/dataelements.rng
 - lib/properties/description.rng
+- lib/properties/documents.rng
 - lib/properties/dsl.rng
 - lib/properties/dslx.rng
 - lib/properties/endpoints.rng
@@ -1141,6 +1145,7 @@ files:
 - lib/properties/subscriptions.rng
 - lib/properties/t_attributes.rng
 - lib/properties/t_dataelements.rng
+- lib/properties/t_documents.rng
 - lib/properties/t_endpoints.rng
 - lib/properties/t_position.rng
 - lib/properties/t_positions.rng

data/lib/cpee/attributes_helper.rb

@@ -1,41 +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/>.
-
-require 'weel'
-
-class AttributesHelper
-  def translate(__attributes__,__dataelements__,__endpoints__)
-    @data       = WEEL::ReadHash.new(__dataelements__)
-    @endpoints  = WEEL::ReadHash.new(__endpoints__)
-    @attributes = WEEL::ReadHash.new(__attributes__)
-    __attributes__.transform_values do |v|
-      v.gsub(/(!(attributes|data|endpoints)\.[\w_]+)/) do |m|
-        eval(m[1..-1])
-      end
-    end
-  end
-
-  def data
-    @data
-  end
-
-  def endpoints
-    @endpoints
-  end
-
-  def attributes
-    @attributes
-  end
-end
-