Merge remote-tracking branch 'origin/main' into feature/177-ghcr_container_publishing

Author: DavidEdell

anms-core/anms/components/schemas/ARIs/rpt_entry.py

@@ -29,11 +29,13 @@
 
 # Shared properties
 class RptEntryBase(BaseModel):
-    reference_time: Optional[str] = None
-    agent_id: Optional[str] = None
-    correlator_nonce: Optional[str] = None
+    class Config:
+        arbitrary_types_allowed = True
+
+    ari_rptset_id: Optional[str] = None
+    reference_time: Optional[datetime] = None
     report_list: Optional[str] = None
-    ari_rptset_id: Optional[int] = None
+    agent_id: Optional[int] = None
 
 
 class RptEntryBaseInDBBase(RptEntryBase):

anms-core/anms/routes/ARIs/reports.py

@@ -22,6 +22,7 @@
 # subcontract 1658085.
 #
 from typing import List
+import ast 
 
 from fastapi import APIRouter, Depends
 from fastapi import status
@@ -83,19 +84,20 @@ async def report_def_by_id(agent_id: int):
         agent_id_str = agent_id_str.agent_endpoint_uri
         for res in result.all():   
             # select from exec_set 
-            nonce_cbor = res.nonce_cbor
             try:
+                nonce_cbor = res.nonce_cbor
                 stmt = select(ExecutionSet).where(and_(ExecutionSet.agent_id == agent_id_str, ExecutionSet.nonce_cbor == nonce_cbor) )
                 result: Result = await session.scalars(stmt)
                 exc_set = result.all()
                 for res in exc_set:
                     ari_val = ""
                     if(res):
-                        hex_str = "0x"+res.entries.hex()
-                        hex_str = hex_str.upper()
+                        hex_str = res.entries.hex()
+                        hex_str = "0x"+hex_str.upper()
                         ari_val = await transcoder.transcoder_put_cbor_await(hex_str)
                         ari_val =  ari_val['data']
-                        addition = {'exec_set': ari_val,'nonce_cbor':nonce_cbor}    
+                        logger.info(str(nonce_cbor))
+                        addition = {'exec_set': ari_val,'nonce_cbor':str(nonce_cbor)}    
                         if addition not in final_res:
                             final_res.append(addition)
             except Exception as e:
@@ -107,11 +109,16 @@ async def report_def_by_id(agent_id: int):
 # entries tabulated returns header and values in correct order
 @router.get("/entries/table/{agent_id}/{nonce_cbor}", status_code=status.HTTP_200_OK,
             response_model=list)
-async def report_ac(agent_id: int, nonce_cbor: bytes):
-    final_res = []
+async def report_ac(agent_id: int, nonce_cbor: str):
+    
     ari = None
     dec = ace.ari_cbor.Decoder()
-    buf = nonce_cbor
+    enc = ace.ari_text.Encoder()
+    try:
+        nonce_cbor = ast.literal_eval(nonce_cbor)
+    except Exception as e:
+        logger.error(f"{e} while processing nonce")
+        return []
 
     agent_id_str =""
     agent_id_stmt =  select(RegisteredAgent).where(RegisteredAgent.registered_agents_id == agent_id)
@@ -141,13 +148,13 @@ async def report_ac(agent_id: int, nonce_cbor: bytes):
                 ari = dec.decode(io.BytesIO(in_bytes))
 
             except Exception as err:
-                logger.info(err)
+                logger.error(err)
 
     # current ARI should be  an exection set 
     if ari:
         if type(ari.value) == ace.ari.ExecutionSet: 
             try:
-                enc = ace.ari_text.Encoder()
+                
                 # run through targets and their parameters to get all things parts translated 
                 for targ in ari.value.targets: 
                     buf = io.StringIO()
@@ -166,7 +173,7 @@ async def report_ac(agent_id: int, nonce_cbor: bytes):
                     exec_set_dir[out_text_targ] = [exec_set_entry]
 
             except Exception as err:
-                logger.info(err)
+                logger.error(err)
 
 
     # final_res.append(exec_set_entry)
@@ -205,9 +212,7 @@ async def report_ac(agent_id: int, nonce_cbor: bytes):
 
                             exec_set_dir[out_text].append(addition)  
                         except Exception as err:
-                            logger.error(err)
-                
-                
+                            logger.error(err)            
 
     return list(exec_set_dir.values())
-    
+    

anms-ui/public/app/components/management/agents/reports.vue

@@ -54,8 +54,7 @@ export default {
       this.loading = true;
       let nonce_cbor = this.rptts[this.selected].nonce_cbor;
       nonce_cbor = nonce_cbor;
-      // let rpt_adm = this.rptts[this.selected].adm;
-      await api.methods.apiEntriesForReport(this.registered_agents_id, nonce_cbor)
+      await api.methods.apiEntriesForReport(this.registered_agents_id,encodeURIComponent(nonce_cbor))
         .then(res => {
           this.processReport(res.data);
           this.reports[this.selected] = this.tableItems;

anms-ui/public/app/components/management/builder/ParameterView.vue

@@ -161,7 +161,7 @@ export default {
             let curr_str=  ""  
             currValue = [];
               value.forEach((ari) => {
-                currValue.push(ari.replaceAll('"', ""));
+                currValue.push(ari);
               });
               if(currValue.length = 1 ){
                 testResult.push(currValue[0])

anms-ui/server/components/reports.js

@@ -46,8 +46,7 @@
     try {
       // /entry/values/{agent_id}/{ADM}/{report_name}
       let obj_agent_id = req.params.obj_agent_id
-      let correlator_nonce = req.params.correlator_nonce
-  
+      let correlator_nonce = encodeURIComponent(req.params.correlator_nonce)
 
       const url = utils.generateAnmsCoreUrl(['report','entries','table', obj_agent_id, correlator_nonce]);
       const name_entries = await axios.get(url);
@@ -56,48 +55,6 @@
       return next(Boom.badGateway('Error Getting reports', err));
     }
   };
-
-  // exports.getReportsPaged = async function (req, res, next) {
-  //   try {
-  //     if (req.query.page === undefined) {
-  //       return next(Boom.badData('Invalid page=' + req.query.page));
-  //     }
-  //     if (req.query.size === undefined) {
-  //       return next(Boom.badData('Invalid size=' + req.query.size));
-  //     }
-  //     const params = {'page': req.query.page, 'size': req.query.size };
-  //     const url = utils.generateAnmsCoreUrl(['report','all'], params);
-      
-  //     const transcoderLog = await axios.get(url);
-  //     return res.status(200).json(transcoderLog.data);
-  //   } catch (err) {
-  //     return next(Boom.badGateway('Error Getting Paged Reports', err));
-  //   }
-  // };
-
-  /*
-  exports.getTranscoderPagedBySearch = async function (req, res, next) {
-    try {
-      const transcoderQuery = req.params.query;
-      if (!_.isString(transcoderQuery)) {
-        return next(Boom.badData('Invalid Agent Search'));
-      }
-      if (req.query.page === undefined) {
-        return next(Boom.badData('Invalid page=' + req.query.page));
-      }
-      if (req.query.size === undefined) {
-        return next(Boom.badData('Invalid size=' + req.query.size));
-      }
-      const params = {'page': req.query.page, 'size': req.query.size };
-      const url = utils.generateAnmsCoreUrl(['transcoder', 'db', 'search', transcoderQuery], params);
-      const transcoderLog = await axios.get(url);
-      return res.status(200).json(transcoderLog.data);
-    } catch (err) {
-      return next(Boom.badGateway('Error Getting transcoderLog with search', err));
-    }
-  };
-  */
-
 })();