cpee 2.1.84 → 2.1.86

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85f1d2cbf39ac8585ef05774578606c35b1323e31c3d4cc1b0b3de5774c916b1
-  data.tar.gz: b3d88e28a6346b9a66333242ab42c8a4f06542223847d27c434afea16a830081
+  metadata.gz: 8c00da803ffced9cf1afdfc7a81d41e88573b5c33e4d78e5abe6fac61892fc2e
+  data.tar.gz: d83c71efdf5b6ebf088af77bf07d0b32d2e0270bdd82441b0c5d86cb48df35f8
 SHA512:
-  metadata.gz: a5f78409b8d6b06a1d7d7d77792f3dc7b8d0a09d55acd36e07c4098c4ca7aed9eb73f8048b503a488c98bafcb1b21adf82077e4d306a99048126ba5d728718cc
-  data.tar.gz: 8d7caeb62b53372f3358c053293fad18fd733ce22dc6172e9011bad084b228fdbc6773fcbdfe6a1ee7dd4f24ff4aa59f3ebb23bc39ae5f6fc698935762d859d5
+  metadata.gz: ab4f6f4553e230706b94c1bbc7aa377d6982d70e35172f19d751087ac04af410988baa9078a31ebef3762de6d5c3322f9a06c3db6028da3a4b270654a3608a8d
+  data.tar.gz: 680ea935445d3f2d4a3526f1bf438433769e79398328926ec00766706c4491de953e7555147e7a8f0023234a26090b25c164472ce1799caa6f4febbed97d8826

data/cockpit/css/llm.css

@@ -0,0 +1,76 @@
+#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;
+  padding: 0.2em 0em 0.2em 0.5em;
+  outline: none;
+  min-height: 2.66em;
+}
+
+.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,58 @@
+function clean_llm_ui(status_id) {
+  status_div = $(`#${status_id}`);
+  status_div.empty();
+  status_div.removeClass('error').removeClass('success');
+  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();
+}
+
+$(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');
+  });
+});

data/cockpit/js/llm_alternative.js

@@ -0,0 +1,107 @@
+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') {
+    alert('FileReader not yet supportet');
+    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('input',function(e) {
+    console.log("beforeinput");
+    console.log(e);
+    if(e.originalEvent.inputType === "insertFromDrop") {
+      e.preventDefault();
+      e.stopPropagation();
+      load_file_content(e.originalEvent.dataTransfer.files);
+    }
+  });*/
+  /*$('#prompt').on('dragover',function(e) {
+    e.preventDefault();
+    e.stopPropagation();
+  });
+  $('#prompt').on('dragenter',function(e) {
+    e.preventDefault();
+    e.stopPropagation();
+  });*/
+  $('#prompt').on('drop',function(e) {
+    e.preventDefault();
+    e.stopPropagation();
+    load_file_content(e.originalEvent.dataTransfer.files);
+  });
+});

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;