added clearSearchOnSelect, added redundant transcoding check

David Linko · David Linko · commit 5cc3037259a0 · 2025-06-25T15:09:15.000-04:00
diff --git a/anms-core/anms/routes/ARIs/reports.py b/anms-core/anms/routes/ARIs/reports.py
@@ -30,6 +30,7 @@
 from sqlalchemy import select, and_
 from sqlalchemy.engine import Result
 from io import StringIO
+from urllib.parse import unquote
 
 from anms.components.schemas import ARIs
 from anms.models.relational import get_async_session, get_session
@@ -133,9 +134,9 @@ async def report_ac(agent_id: str, correlator_nonce: int):
             if match:
                 # report entries 
                 rpt_entr = match.group(1)
-                addition.extend(rpt_entr.split(";"))
+                addition.extend(unquote(rpt_entr).split(";"))
             else:
-                addition.append(rpt_set)
+                addition.append(unquote(rpt_set))
             
             if addition not in final_res:
                 final_res.append(addition)
diff --git a/anms-core/anms/routes/transcoder.py b/anms-core/anms/routes/transcoder.py
@@ -73,16 +73,16 @@ async def transcoder_put_input_cbor(input_cbor: str):
     with get_session() as session:
         curr_uri = TranscoderLog.query.filter(or_(TranscoderLog.input_string==input_cbor, TranscoderLog.cbor==input_cbor)).first()
         if curr_uri is None:
-            c1 = TranscoderLog(TranscoderLog.input_string==input_cbor, parsed_as='pending')
+            c1 = TranscoderLog(input_string=input_cbor, parsed_as='pending')
             session.add(c1)
             session.flush()
             session.refresh(c1)
             transcoder_log_id = c1.transcoder_log_id
             session.commit()
-            status = "submitted ari"
+            status = "Submitted ARI to transcoder"
         else:
             # the input_ari has already been submitted
-            status = "already submitted"
+            status = "ARI previously submitted, check log"
             transcoder_log_id = curr_uri.transcoder_log_id
 
     logger.info('PUBLISH to transcode/CoreFacing/Outgoing, msg = %s' % msg)
@@ -91,16 +91,15 @@ async def transcoder_put_input_cbor(input_cbor: str):
     return {"id": transcoder_log_id, "status": status}
 
 
-# get 	/ui/incoming/{cbor}/hex
-@router.get("/ui/incoming/await/{input_cbor}/hex", status_code=status.HTTP_200_OK)
-async def transcoder_put_cbor_await(input_cbor: str):
+@router.get("/ui/incoming/await/{cbor}/hex", status_code=status.HTTP_200_OK)
+async def transcoder_put_cbor_await(cbor: str):
     curr_uri = ""
-    msg = json.dumps({'uri': input_cbor})
+    msg = json.dumps({'uri': cbor})
     transcoder_log_id = None
     with get_session() as session:
-        curr_uri = TranscoderLog.query.filter_by(or_(input_string=input_cbor, cbor=input_cbor)).first()
+        curr_uri = TranscoderLog.query.filter(or_(TranscoderLog.input_string==cbor, TranscoderLog.cbor==cbor)).first()
         if curr_uri is None:
-            c1 = TranscoderLog(input_string=input_cbor, parsed_as='pending')
+            c1 = TranscoderLog(input_string=cbor, parsed_as='pending')
             session.add(c1)
             session.flush()
             session.refresh(c1)
@@ -110,10 +109,17 @@ async def transcoder_put_cbor_await(input_cbor: str):
             MQTT_CLIENT.publish("transcode/CoreFacing/Outgoing", msg)
         else:
             transcoder_log_id = curr_uri.transcoder_log_id
+            if curr_uri.parsed_as != "pending":
+                if curr_uri.parsed_as == "ERROR":
+                    curr_uri = "ARI://BADARI"
+                else:
+                    curr_uri = curr_uri.uri
+                return  {"data": curr_uri}
+
     
     while True:
         with get_session() as session:
-            curr_uri = TranscoderLog.query.filter_by(transcoder_log_id=transcoder_log_id).first()
+            curr_uri = TranscoderLog.query.filter_by(TranscoderLog.transcoder_log_id==transcoder_log_id).first()
         if curr_uri.parsed_as == "CBOR":
             curr_uri = curr_uri.uri
             break
@@ -132,7 +138,7 @@ def transcoder_put_await_str(input_ari: str):
     msg = json.dumps({"uri": input_ari})
     transcoder_log_id = None
     with get_session() as session:
-        curr_uri = TranscoderLog.query.filter(or_(TranscoderLog.input_string==input_ari,TranscoderLog.ari==input_ari)).first()
+        curr_uri = TranscoderLog.query.filter(or_(TranscoderLog.input_string==input_ari,TranscoderLog.ari==input_ari, TranscoderLog.cbor==input_ari)).first()
 
         if curr_uri is None:
             c1 = TranscoderLog(input_string=input_ari, parsed_as='pending')
@@ -153,6 +159,9 @@ def transcoder_put_await_str(input_ari: str):
         if curr_uri.parsed_as == "URI":
             curr_uri = curr_uri.uri
             break
+        if curr_uri.parsed_as == "CBOR":
+            curr_uri = curr_uri.uri
+            break
         if curr_uri.parsed_as == "ERROR":
             curr_uri = "ARI://BADARI"
             break
@@ -169,18 +178,18 @@ def transcoder_put_str(input_ari: str):
     msg = json.dumps({"uri": input_ari})
     transcoder_log_id = None
     with get_session() as session:
-        curr_uri = TranscoderLog.query.filter(or_(input_string=input_ari,ari=input_ari)).first()
+        curr_uri = TranscoderLog.query.filter(or_(TranscoderLog.input_string==input_ari,TranscoderLog.ari==input_ari, TranscoderLog.cbor==input_ari)).first()
         if curr_uri is None:
             c1 = TranscoderLog(input_string=input_ari, parsed_as='pending')
             session.add(c1)
             session.flush()
             session.refresh(c1)
             transcoder_log_id = c1.transcoder_log_id
             session.commit()
-            status = "submitted ari"
+            status = "Submitted ARI to transcoder"
         else:
             # the input_ari has already been submitted
-            status = "already submitted"
+            status = "ARI previously submitted, check log"
             transcoder_log_id = curr_uri.transcoder_log_id
 
     logger.info('PUBLISH to transcode/CoreFacing/Outgoing, msg = %s' % msg)
diff --git a/anms-ui/public/app/components/management/agents/AgentsManageModal.vue b/anms-ui/public/app/components/management/agents/AgentsManageModal.vue
@@ -126,7 +126,15 @@ export default {
         .then((response) => {
           if (response.data.parsed_as == "pending") {
             setTimeout(() => this.queryTranscoderLog(), 8000);
-          } else {
+          } else if(response.data.parsed_as == "ERROR") {
+            console.log(`Error translating transcoder log ID: ${this.transcoderLogId}! See transcoder log table for details`);
+            toastr.error(`Error translating transcoder log ID: ${this.transcoderLogId}! See transcoder log table for details`);
+            this.loading = false;
+            this.closeModal();
+            this.ariCBOR = null;
+            this.ariString=null;
+           } 
+          else {
             this.ariCBOR = response.data.cbor;
             this.submitRawCommand2Agents();
           }
diff --git a/anms-ui/public/app/components/management/agents/reports.vue b/anms-ui/public/app/components/management/agents/reports.vue
@@ -16,7 +16,7 @@
         value="-1">-- Select Sent Reports --</b-form-select-option>
       <b-form-select-option v-for="rpt, index in rptts"
         :key="index"
-        :value="index">{{ decodeURI(rpt) }}</b-form-select-option>
+        :value="index">{{ rpt }}</b-form-select-option>
     </b-form-select>
     <b-table sticky-header
       hover
diff --git a/anms-ui/public/app/components/management/builder/ActionParameter.vue b/anms-ui/public/app/components/management/builder/ActionParameter.vue
@@ -7,7 +7,8 @@
         <v-select v-model="ariKey"
           label="display"
           :options="listComponents"
-          @input="addToList">
+          @input="addToList"
+          :clearSearchOnSelect="false">
           <template v-slot:no-options="{ search, searching }">
             <template v-if="searching">
               <b-button @click="addARI(search)">Add ARI</b-button>
@@ -66,24 +67,14 @@ export default {
       this.addToList();
     },
     addToList: function () {
-<<<<<<< HEAD
-=======
       if(this.ac.length >= this.count){
         this.ac.pop();
       }
->>>>>>> origin/main
 
       if (this.ariKey != null) {
         this.ac.push(this.ariKey)
       }
-<<<<<<< HEAD
-
-      if(this.ac.length > this.count){
-        this.ac.pop();
-      }
-=======
       
->>>>>>> origin/main
       this.ariKey = null;
       this.createAC();
     },
diff --git a/anms-ui/public/app/components/management/builder/Build.vue b/anms-ui/public/app/components/management/builder/Build.vue
@@ -33,11 +33,7 @@
           @change="updateResults"/>
           </div>
         <v-select v-model="ariKey" label="display" :options="ARIs" ></v-select>
-<<<<<<< HEAD
-        <ParameterView v-if="ariKey" :ariKey="ariKey" :ACs="ARIs" :agentModal="agentModal" @updateResult="updateResults($event)"></ParameterView>
-=======
         <ParameterView v-if="ariKey" :ariKey="ariKey" :ACs="ARIs" :nonce="correlator_nonce" @updateResult="updateResults($event)"></ParameterView>
->>>>>>> origin/main
       </template>
     </div>
   </div>
diff --git a/anms-ui/public/app/components/management/builder/ParameterView.vue b/anms-ui/public/app/components/management/builder/ParameterView.vue
@@ -20,17 +20,6 @@
         </div>
       </b-form-group>
       <b-form-group>
-        <div v-for="(parameter, index) in tnvcParameters">
-          <component v-bind:is="parameter.type"
-            :listComponents="parameter.parameter.listComponents"
-            :type="parameter.parameter.type"
-            :types="parameter.parameter.types"
-            :name="parameter.parameter.name"
-            :result="parameter.parameter.result"
-            :index="parameter.parameter.index"
-            :key="index"
-            @updateResult="updateResults($event)"></component>
-        </div>
         <div v-for="(parameter, index) in exprParameters">
           <component v-bind:is="parameter.type"
             :listComponents="ACs"
@@ -68,11 +57,7 @@ export default {
   components: {
     vSelect,
   },
-<<<<<<< HEAD
-  props: ["ariKey", "ACs", "agentModal"],
-=======
   props: ["ariKey", "ACs", "nonce"],
->>>>>>> origin/main
   data() {
     return {
       parameters: [],
@@ -82,7 +67,6 @@ export default {
       description: "",
       primParameters: [],
       actionParameters: [],
-      tnvcParameters: [],
       exprParameters: [],
     };
   },
@@ -101,7 +85,6 @@ export default {
         this.finResult = response[2];
         this.finResultBase = this.finResult;
         this.primParameters = this.getParametersByType("prim");
-        this.tnvcParameters = this.getParametersByType("TypeNameValueCollectionParameter");
         this.exprParameters = this.getParametersByType("ExpressionParameter");
         this.actionParameters = this.getParametersByType("ActionParameter");
       });
@@ -218,19 +201,11 @@ export default {
             testResult +
             ")";
              // if using in agentModal adding 	ari:/EXECSET/ portion 
-<<<<<<< HEAD
-          if(this.agentModal){
-            // correlator_nonce
-            // TODO currently random mayube make it increment or a choice
-            let nonce = Math.floor(Math.random() * 99999) + 1;
-            this.finResultStr = 	"ari:/EXECSET/n=" + nonce + ";(" + this.finResultStr +")";
-=======
           if(typeof this.nonce !== 'undefined'){
             // correlator_nonc
             // TODO currently random mayube make it increment or a choice
             // let nonce = Math.floor(Math.random() * 99999) + 1;
             this.finResultStr = 	"ari:/EXECSET/n=" + this.nonce + ";(" + this.finResultStr +")";
->>>>>>> origin/main
           }
           this.$emit("updateResult", [{ type: "ARI", value: this.finResultStr }]);
           this.finResult = this.finResultBase;
diff --git a/anms-ui/public/app/components/management/builder/TypeNameValueCollectionParameter.vue b/anms-ui/public/app/components/management/builder/TypeNameValueCollectionParameter.vue
diff --git a/anms-ui/public/app/components/management/builder/ariBuilder.js b/anms-ui/public/app/components/management/builder/ariBuilder.js
@@ -23,12 +23,10 @@ import collect from "collect.js";
 import api from "../../../shared/api";
 import ActionParameter from "./ActionParameter";
 import prim_parameter from "./primParameter.vue";
-import TypeNameValueCollectionParameter from "./TypeNameValueCollectionParameter.vue";
 import ExpressionParameter from "./ExprParameter.vue";
 
 export default {
     components: {
-        TypeNameValueCollectionParameter,
         prim_parameter,
         ActionParameter,
         ExpressionParameter,
diff --git a/anms-ui/public/app/components/management/builder/buildAri.vue b/anms-ui/public/app/components/management/builder/buildAri.vue
@@ -46,7 +46,8 @@
           </div>
           <v-select v-model="ariKey"
             label="display"
-            :options="ARIs"></v-select>
+            :options="ARIs" 
+            :clearSearchOnSelect="false"></v-select>
           <ParameterView v-if="ariKey"
             :ariKey="ariKey"
             :ACs="ARIs"
@@ -167,8 +168,9 @@ export default {
         .apiPutTranscodedString(inputString)
         .then((response) => {
           this.finResultCbor = response.data
-          this.results = response.status
-          toastr.success(`${response.status}, 'Transcoder Log Id: ${response.data}`);
+          console.log(response)
+          this.results = response.data.status
+          toastr.success(`${response.data.status}, 'Transcoder Log Id: ${response.data.id}`);
 
         })
         .catch((error) => {
diff --git a/anms-ui/server/components/adms.js b/anms-ui/server/components/adms.js
@@ -100,8 +100,6 @@
       }
       let requestUrl = utils.generateAnmsCoreUrl(["adms"]);
       console.info("Upload requestUrl: ", requestUrl);
-      // console.info("File originalname:", file.originalname);
-      // console.info("File buffer:", file.buffer);
      
       const formData = new FormData();
       //Reference: https://maximorlov.com/send-a-file-with-axios-in-nodejs/
diff --git a/anms-ui/server/components/transcoder.js b/anms-ui/server/components/transcoder.js
diff --git a/deps/anms_db_tables/10-grafana.sql b/deps/anms_db_tables/10-grafana.sql
