cpee 2.1.85 → 2.1.87

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ed5e322f7215ce979f5e27ce9c492cc8d4be58cf4b5f2e3330c5d9b7c25558d
-  data.tar.gz: 5cb932fee50111406ea268aa40b1b1009aa61e85996e38c403b657bee6596a83
+  metadata.gz: 2daaf617d59eef8d41794e44b8b4488db897422baaee84ad06d9fd936923c896
+  data.tar.gz: 075d29fb38465e916b869a0d4602f143e0e31590535d1ec38eac6ffae7eb8b01
 SHA512:
-  metadata.gz: 83fa3cec95a8f939a0e06e99f8585dbe72492500e08a6ddd42cb95b05eeca2e93304a8138876fcca11e76fab724d76f34211e30fe5cef32686676dab221f04cc
-  data.tar.gz: acd24417fa7fd281daddd97dddc69dd7df84bef25f9a9f36362d4ea0ded9563daaa748439c57b32b457bee44e4c9443be9ca0658907b87d246c3a15a6dcea547
+  metadata.gz: 7d1d375b2bf0f363d97fa77c2e09dbd3f6d66130d328c77f9b02037b8b0951c93faa36f703a764cb85360af9220095af2836cb618baf0e4d23cd26b40d554eb8
+  data.tar.gz: '019b357616c43dd596200536e46226d0ee4960ada5d34e8a3d185398f9b835e451643182861b0b4cb55c54b828e1a7b69370afb6beb9f577b57631f18505979b'

data/cockpit/css/llm.css

@@ -0,0 +1,79 @@
+#loadtxt {
+  display: none;
+}
+
+#status {
+  padding: 0.2em 0.5em;
+  border-top: 0.1em solid var(--x-ui-border-color);
+  background-color: var(--x-tab-inactive-color);
+  min-height: 1.4em;
+  overflow:hidden;
+}
+#status.error {
+  background-color: var(--wfadaptor-selected);
+}
+#status.success {
+  background-color: var(--wfadaptor-exec-vote);
+}
+
+#prompt_container {
+  padding: 0.2em 0.5em;
+  outline: none;
+  min-height: 2.66em;
+  display: flex;
+  flex-wrap: nowrap;
+}
+
+.max {
+  max-height: 2.66em;
+}
+
+.stand_alone {
+  height: 100%;
+}
+#prompt {
+  flex: 1 1 auto;
+  outline: none;
+  min-height: 2.66em;
+  overflow-y: scroll;
+}
+#prompt:empty:before {
+  font-family: sans-serif;
+  white-space: normal;
+  content: attr(placeholder);
+  display: block;
+}
+
+#llm_params {
+  flex: 0 0 auto;
+  box-sizing: border-box;
+  outline: none;
+  min-height: 2.66em;
+}
+
+#llmlabel {
+  width: 20%;
+}
+
+.single {
+  width: 2.3em;
+  height: 2.3em;
+}
+
+.multi {
+  border-top: 0.1em solid var(--x-ui-border-color);
+  display: flex;
+  justify-content: space-evenly;
+  flex-direction: row;
+  padding: 15px;
+  gap: 5px;
+}
+
+.llm_button {
+  width: 100%;
+  height: 100%;
+}
+
+.llm_button:hover {
+  background-color: var(--wfadaptor-selected);
+}

data/cockpit/css/ui.css

@@ -27,7 +27,6 @@ body {
   display: flex;
   flex-direction: row;
 }
-
 #graphgrid.striped .graphlast.even {
   background-color: #e9e9e9;
 }
@@ -66,7 +65,9 @@ ui-tabbed ui-tabbar ui-behind button {
 #current-graph[href]:before {
   content: "|";
 }
-
+#current-index[href]:after {
+  content: "|";
+}
 #parameters ui-content { height: 8.5em; min-height: 2.7em; }
 
 #areadataelements, #areaendpoints, #areaattributes {
@@ -183,11 +184,19 @@ span.vote {
   color: #73d216;
 }
 
+#modelling {
+  flex: 1 1 auto;
+  overflow: scroll;
+}
+
 #graphcolumn {
   margin: 0;
   padding: 0;
   border-right: 1px solid var(--x-ui-border-color);
   min-width: 9em;
+  display: flex;
+  flex-direction: column;
+  overflow: hidden;
 }
 #detailcolumn {
   padding-left: 1.5em;

data/cockpit/edit.html

@@ -226,7 +226,7 @@
     <ui-tabbed class="hidden" id='parameters'>
       <ui-tabbar>
         <ui-tab class="switch"                                               ></ui-tab>
-        <ui-tab class=""         data-tab="dataelements" id="tabdataelements">Data Elements</ui-tab>
+        <ui-tab class=""         data-tab="dataelements" id="tabdataelements">Data Objects</ui-tab>
         <ui-tab class="inactive" data-tab="endpoints"    id="tabendpoints"   >Endpoints</ui-tab>
         <ui-tab class="inactive" data-tab="attributes"   id="tabattributes"  >Attributes</ui-tab>
         <ui-behind                                                           ></ui-behind>
@@ -259,9 +259,11 @@
       </ui-tabbar>
       <ui-content>
         <ui-area data-belongs-to-tab="details" id='graphcolumn' oncontextmenu='return false'>
-          <div id='graphgrid'>
-            <div class="resource-label" style="display: none"></div>
-            <svg xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:x="http://www.w3.org/1999/xlink" id='graphcanvas' width='1' height='1'></svg>
+          <div id="modelling">
+            <div id='graphgrid'>
+              <div class="resource-label" style="display: none"></div>
+              <svg xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:x="http://www.w3.org/1999/xlink" id='graphcanvas' width='1' height='1'></svg>
+            </div>
           </div>
         </ui-area>
         <ui-resizehandle data-belongs-to-tab="details" data-label="drag to resize"></ui-resizehandle>

data/cockpit/graph.html

@@ -76,9 +76,11 @@
     </template>
     <div id="trackfull">
       <div id='graphcolumn'>
-        <div id='graphgrid'>
-          <div class="resource-label" style="display: none"></div>
-          <svg xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:x="http://www.w3.org/1999/xlink" id='graphcanvas' width='1' height='1'></svg>
+        <div id="modelling">
+          <div id='graphgrid'>
+            <div class="resource-label" style="display: none"></div>
+            <svg xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:x="http://www.w3.org/1999/xlink" id='graphcanvas' width='1' height='1'></svg>
+          </div>
         </div>
       </div>
     </div>

data/cockpit/index.html

@@ -227,7 +227,7 @@
     <ui-tabbed class="hidden" id='parameters'>
       <ui-tabbar>
         <ui-tab class="switch"                                               ></ui-tab>
-        <ui-tab class=""         data-tab="dataelements" id="tabdataelements">Data Elements</ui-tab>
+        <ui-tab class=""         data-tab="dataelements" id="tabdataelements">Data Objects</ui-tab>
         <ui-tab class="inactive" data-tab="endpoints"    id="tabendpoints"   >Endpoints</ui-tab>
         <ui-tab class="inactive" data-tab="attributes"   id="tabattributes"  >Attributes</ui-tab>
         <ui-behind                                                           ></ui-behind>
@@ -260,9 +260,11 @@
       </ui-tabbar>
       <ui-content>
         <ui-area data-belongs-to-tab="details" id='graphcolumn' oncontextmenu='return false'>
-          <div id='graphgrid'>
-            <div class="resource-label" style="display: none"></div>
-            <svg xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:x="http://www.w3.org/1999/xlink" id='graphcanvas' width='1' height='1'></svg>
+          <div id="modelling">
+            <div id='graphgrid'>
+              <div class="resource-label" style="display: none"></div>
+              <svg xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:x="http://www.w3.org/1999/xlink" id='graphcanvas' width='1' height='1'></svg>
+            </div>
           </div>
         </ui-area>
         <ui-resizehandle data-belongs-to-tab="details" data-label="drag to resize"></ui-resizehandle>

data/cockpit/js/instance.js

@@ -17,6 +17,7 @@ var save = {};
     save['endpoints'] = undefined;
     save['dataelements'] = undefined;
     save['attributes'] = undefined;
+    save['attributes_raw'] = {};
 var node_state = {};
 
 function global_init() {
@@ -387,6 +388,8 @@ function monitor_instance(cin,rep,load,exec) {// {{{
       $("#current-graph").attr('href','graph.html?monitor=' + url);
       $("#current-track").show();
       $("#current-track").attr('href','track.html?monitor=' + url);
+      $("#current-index").show();
+      $("#current-index").attr('href','index.html?monitor=' + url);
       var q = $.parseQuerySimple();
       history.replaceState({}, '', '?' + (graph_position ? "position=" + graph_position + "&" : "") + (graph_highlight ? "highlight=" + graph_highlight + "&" : "") + (graph_theme ? "theme=" + graph_theme + "&" : "") + (q.min || q.min=="" ? "min&" : "") + 'monitor='+url);
 
@@ -513,6 +516,9 @@ function monitor_instance_values(type,vals) {// {{{
             }
           });
         } else if(type == "attributes") {
+          $(" > attributes > *",res).each((k,v)=>{
+            save['attributes_raw'][v.nodeName] = v.textContent;
+          });
           if ($(" > attributes > resources",res).length > 0) {
             save['resources'] = $(" > attributes > resources",res).text();
           } else {
@@ -836,6 +842,7 @@ function monitor_graph_change(force) { //{{{
     type: "GET",
     url: url + "/properties/dslx/",
     success: function(dslx){
+      save['dslx'] = $(dslx.documentElement).serializePrettyXML();
       if (force || !save['graph'] || (save['graph'] && save['graph'].serializePrettyXML() != $(dslx.documentElement).serializePrettyXML())) {
         $.ajax({
           type: "GET",

data/cockpit/js/llm.js

@@ -0,0 +1,185 @@
+var last_generated_model = undefined;
+var last_model_before_generation =undefined;
+
+function clean_llm_ui(status_id) {
+  status_div = $(`#${status_id}`);
+  status_div.empty();
+  status_div.removeClass('error').removeClass('success');
+  return
+}
+
+function add_prompt(prompt_id,content) {
+  let input = $(`#${prompt_id}`);
+  const range = document.createRange();
+  const selection = window.getSelection();
+  range.selectNodeContents(input[0]);
+  selection.removeAllRanges();
+  selection.addRange(range);
+  document.execCommand('insertText', false, content);
+  return ;
+}
+
+function call_llm_service(status_id,prompt_id,llm_id) {
+  let input = $(`#${prompt_id}`);
+  let text = input[0].innerText;
+  let myllm = $(`#${llm_id}`).find(":selected").val();
+  if (myllm === undefined){
+    myllm = "gemini-2.0-flash";
+  }
+  const formData = new FormData();
+  const blob1 = new Blob([save['dslx']], { type: "text/xml" });
+  formData.append("rpst_xml", blob1);
+  const blob2 = new Blob([text], { type: "text/plain" });
+  formData.append("user_input", blob2);
+  const blob3 = new Blob([myllm], { type: "text/plain" });
+  formData.append("llm", blob3);
+
+  jQuery.ajax({
+    url: '/llm/',
+    data: formData,
+    cache: false,
+    contentType: false,
+    processData: false,
+    method: 'POST',
+    success: function(data){
+      last_model_before_generation = save['dslx'];
+      last_generated_model = data.output_cpee;
+      set_cpee_model(data.output_cpee,["<!-- Input CPEE-Tree -->\n"+data.input_cpee,"# User Input:\n"+data.user_input,"# Used LLM:\n"+data.used_llm,"%% Input Intermediate\n"+data.input_intermediate,"%% Output Intermediate\n"+data.output_intermediate,"<!-- Output CPEE-Tree -->\n"+data.output_cpee]);
+      set_success(status_id,data.status);
+    },
+    error:  function(xhr, status, data) {
+      set_error(status_id,xhr.responseJSON.error);
+    }
+  });
+
+ input.empty();
+}
+
+function call_llm_text_service(status_id,prompt_id,llm_id,action) {
+  let myllm = $(`#${llm_id}`).find(":selected").val();
+  if (myllm === undefined){
+    myllm = "gemini-2.0-flash";
+  }
+  const info = save.attributes_raw.info;
+  const formData = new FormData();
+  const first = new Blob([save['dslx']], { type: "text/xml" });
+  formData.append("rpst_xml", first);
+  const second = myllm;
+  formData.append("llm", second);
+
+  jQuery.ajax({
+    url: '/llm/text/llm/',
+    data: formData,
+    cache: false,
+    contentType: false,
+    processData: false,
+    method: 'POST',
+    success: function(data){
+      if (action=="show"){
+        add_prompt(prompt_id,data["output_text"]);
+      } else if (action=="file") {
+        $('#savetext').attr('download', info + '.txt');
+        const encodedText = encodeURIComponent(data["output_text"]);
+        const dataUri = "data:text/plain;charset=utf-8," + encodedText;
+        const link = document.getElementById("savetext");
+        link.href = dataUri;
+        link.click();
+      };
+      last_model_before_generation = save['dslx'];
+      set_success(status_id,data.status);
+    },
+    error:  function(xhr, status, data) {
+      set_error(status_id,xhr.responseJSON.error);
+    }
+  });
+}
+
+function set_cpee_model(cpee_xml,expositions=[]) {
+
+  const form_data = new FormData();
+  const blob = new Blob([cpee_xml], { type: "text/xml" });
+  form_data.append("dslx", blob);
+
+  for (const x of expositions) {
+    const blobi = new Blob([x], { type: "text/plain" });
+    form_data.append("exposition", blobi);
+  }
+
+  $.ajax({
+    type: "PUT",
+    url: url + "/properties/dslx/",
+    contentType: false,
+    processData: false,
+    data: form_data
+  });
+}
+
+function set_success(status_id,success_text) {
+  $(`#${status_id}`).text(success_text);
+  $(`#${status_id}`).addClass('success');
+}
+
+function set_error(status_id,error_text) {
+   $(`#${status_id}`).text(error_text);
+   $(`#${status_id}`).addClass('error');
+}
+
+function load_last_generated_model() {
+  set_cpee_model(last_generated_model === undefined ? save['dslx'] : last_generated_model);
+}
+
+function load_last_model_before_generation() {
+  set_cpee_model(last_model_before_generation === undefined ? save['dslx'] : last_model_before_generation);
+}
+
+function load_file_content(files) {
+  if (typeof window.FileReader !== 'function') {
+    console.log('FileReader not yet supported');
+    return;
+  }
+  var reader = new FileReader();
+  reader.onload = function(){
+    clean_llm_ui('status');
+    add_prompt('prompt',reader.result);
+  }
+  reader.onerror = function(){ console.log("reader error"); }
+  reader.onabort = function(){ console.log("reader abort"); }
+  reader.readAsText(files[0]);
+}
+
+$(document).ready(function() {
+  $(document).on('keydown','#prompt',function(e){
+    clean_llm_ui('status');
+    if (e.key === "Enter" && (e.metaKey || e.ctrlKey)) {
+      call_llm_service('status',this.id,'llms');
+    }
+  });
+  $(document).on('click','#prompt_submit_button',function(e){
+    clean_llm_ui('status');
+    call_llm_service('status','prompt','llms');
+  });
+  $(document).on('click','#generate_itext_button',function(e){
+    clean_llm_ui('status');
+    call_llm_text_service('status','prompt','llms','file');
+  });
+  $(document).on('click','#generate_text_button',function(e){
+    clean_llm_ui('status');
+    call_llm_text_service('status','prompt','llms','show');
+  });
+  $(document).on('click','#prompt_undo_button',function(e){
+    clean_llm_ui('status');
+    load_last_model_before_generation();
+  });
+  $(document).on('click','#prompt_attach_button',function(e){
+    document.getElementById('loadtxt').click();
+  });
+  $("#loadtxt").change(function(e){
+    let files = document.getElementById('loadtxt').files;
+    load_file_content(files);
+  });
+  $(document).on('drop','#prompt',function(e){
+    e.preventDefault();
+    e.stopPropagation();
+    load_file_content(e.originalEvent.dataTransfer.files);
+  });
+});

data/cockpit/js/llm_alternative.js

@@ -0,0 +1,90 @@
+function clean_llm_ui(status_id) {
+  status_div = $(`#${status_id}`);
+  status_div.empty();
+  status_div.removeClass('error').removeClass('success');
+  return
+}
+
+function add_prompt(prompt_id,content) {
+  let input = $(`#${prompt_id}`);
+  const range = document.createRange();
+  const selection = window.getSelection();
+  range.selectNodeContents(input[0]);
+  selection.removeAllRanges();
+  selection.addRange(range);
+  document.execCommand('insertText', false, content);
+  return ;
+}
+
+function call_llm_service(status_id,prompt_id) {
+  let input = $(`#${prompt_id}`);
+  let text = input[0].innerText;
+
+  const formData = new FormData();
+  const blob1 = new Blob([save['dslx']], { type: "text/xml" });
+  formData.append("rpst_xml", blob1);
+  const blob2 = new Blob([text], { type: "text/plain" });
+  formData.append("user_input", blob2);
+  const blob3 = new Blob(['gemini-2.0-flash'], { type: "text/plain" });
+  formData.append("llm", blob3);
+
+  jQuery.ajax({
+    url: '/llm/',
+    data: formData,
+    cache: false,
+    contentType: false,
+    processData: false,
+    method: 'POST',
+    success: function(data){
+      $.ajax({
+        type: "PUT",
+        url: url + "/properties/description/",
+        contentType: 'text/xml',
+        headers: { 'Content-ID': 'description' },
+        data: data.output_cpee
+      });
+      $(`#${status_id}`).text(data.status);
+      $(`#${status_id}`).addClass('success');
+    },
+    error:  function(xhr, status, data) {
+      $(`#${status_id}`).text(xhr.responseJSON.error);
+      $(`#${status_id}`).addClass('error');
+    }
+  });
+
+ input.empty();
+}
+
+function load_file_content(files) {
+  if (typeof window.FileReader !== 'function') {
+    console.log('FileReader not yet supported');
+    return;
+  }
+  var reader = new FileReader();
+  reader.onload = function(){
+    clean_llm_ui('status');
+    add_prompt('prompt',reader.result);
+  }
+  reader.onerror = function(){ console.log("reader error"); }
+  reader.onabort = function(){ console.log("reader abort"); }
+  reader.readAsText(files[0]);
+}
+
+
+$(document).ready(function() {
+  $(document).on('keydown','#prompt',function(e){
+    clean_llm_ui('status');
+    if (e.key === "Enter" && (e.metaKey || e.ctrlKey)) {
+      call_llm_service('status',this.id);
+    }
+  });
+  $(document).on('click','#prompt_submit_button',function(e) {
+    clean_llm_ui('status');
+    call_llm_service('status','prompt');
+  });
+  $('#prompt').on('drop',function(e) {
+    e.preventDefault();
+    e.stopPropagation();
+    load_file_content(e.originalEvent.dataTransfer.files);
+  });
+});

data/cockpit/js/ui.js

@@ -36,38 +36,38 @@ $(document).ready(function() {
       success: function(res){
         var res_def = config_defaults();
         if (res['log-url']) { // just leave it out when it is not configured
-          $("body").attr('current-logs',res['log-url']);
+          $("body").attr('current-logs',res['log-url'].replace("%host",window.location.host));
         }
         if (res['res-url']) {
-          $("body").attr('current-resources',res['res-url']);
+          $("body").attr('current-resources',res['res-url'].replace("%host",window.location.host));
         } else {
-          $("body").attr('current-resources',res_def['res-url']);
+          $("body").attr('current-resources',res_def['res-url'].replace("%host",window.location.host));
         }
         if (res['base-url']) {
-          $("body").attr('current-base',res['base-url']);
+          $("body").attr('current-base',res['base-url'].replace("%host",window.location.host));
         } else {
-          $("body").attr('current-base',res_def['base-url']);
+          $("body").attr('current-base',res_def['base-url'].replace("%host",window.location.host));
         }
         if (res['save-url']) {
-          $("body").attr('current-save',res['save-url']);
+          $("body").attr('current-save',res['save-url'].replace("%host",window.location.host));
         } else {
-          $("body").attr('current-save',res_def['save-url']);
+          $("body").attr('current-save',res_def['save-url'].replace("%host",window.location.host));
         }
         if (res['templates-url']) {
-          $("body").attr('current-templates',res['templates-url']);
+          $("body").attr('current-templates',res['templates-url'].replace("%host",window.location.host));
         } else {
-          $("body").attr('current-templates',res_def['templates-url']);
+          $("body").attr('current-templates',res_def['templates-url'].replace("%host",window.location.host));
         }
-        $("input[name=res-url]").val($("body").attr('current-resources'));
-        $("input[name=base-url]").val($("body").attr('current-base'));
+        $("input[name=res-url]").val($("body").attr('current-resources').replace("%host",window.location.host));
+        $("input[name=base-url]").val($("body").attr('current-base').replace("%host",window.location.host));
         cockpit();
       },
       error: function(){
         var res = config_defaults();
-        $("body").attr('current-resources',res['res-url']);
-        $("body").attr('current-base',res['base-url']);
-        $("body").attr('current-save',res['save-url']);
-        $("body").attr('current-templates',res['templates-url']);
+        $("body").attr('current-resources',res['res-url'].replace("%host",window.location.host));
+        $("body").attr('current-base',res['base-url'].replace("%host",window.location.host));
+        $("body").attr('current-save',res['save-url'].replace("%host",window.location.host));
+        $("body").attr('current-templates',res['templates-url'].replace("%host",window.location.host));
         $("input[name=res-url]").val($("body").attr('current-resources'));
         $("input[name=base-url]").val($("body").attr('current-base'));
         cockpit();

data/cockpit/js/wfadaptor.js

@@ -233,7 +233,6 @@ function WfIllustrator(wf_adaptor) { // View  {{{
       '</g>');
     for(element in self.elements)
       if(self.elements[element].svg) {
-        console.log(self.elements[element].svg);
         var sym = $X('<g xmlns="http://www.w3.org/2000/svg"/>').append(self.elements[element].svg.clone().children()); // append all children to symbol
         $.each(self.elements[element].svg.attr('class').split(/\s+/), function(index, item) { sym.addClass(item); }); // copy all classes from the root node
         self.svg.defs[element] = sym;