added status msg to transcoder route

Author: David Linko

anms-core/anms/routes/network_manager.py

@@ -73,7 +73,7 @@ async def nm_register_agent(addr: Data):
     url = nm_url + "/agents"
     logger.info('POST to nm manager %s with addr %s' % (url, addr.data))
     try:
-        request = requests.post(url=url, data="'"+addr.data+"'", headers={'Content-Type: text/plain'} )
+        request = requests.post(url=url, data=addr.data, headers={'Content-Type: text/plain'} )
     except Exception:
         return status.HTTP_500_INTERNAL_SERVER_ERROR
     return request.status_code

anms-core/anms/routes/transcoder.py

@@ -66,35 +66,41 @@ async def transcoder_log_by_id(id: str):
         return TranscoderLog.query.filter_by(transcoder_log_id=id).first()
 
 # PUT 	/ui/incoming/{cbor}/hex
-@router.put("/ui/incoming/{cbor}/hex", status_code=status.HTTP_200_OK)
-async def transcoder_put_cbor(cbor: str):
-    msg = json.dumps({'uri': cbor})
+@router.put("/ui/incoming/{input_cbor}/hex", status_code=status.HTTP_200_OK)
+async def transcoder_put_input_cbor(input_cbor: str):
+    msg = json.dumps({'uri': input_cbor})
     transcoder_log_id = None
     with get_session() as session:
-        curr_uri = TranscoderLog.query.filter_by(input_string=cbor).first()
+        curr_uri = TranscoderLog.query.filter(or_(TranscoderLog.input_string==input_cbor, TranscoderLog.cbor==input_cbor)).first()
         if curr_uri is None:
-            c1 = TranscoderLog(input_string=cbor, parsed_as='pending')
+            c1 = TranscoderLog(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"
+        else:
+            # the input_ari has already been submitted
+            status = "already submitted"
+            transcoder_log_id = curr_uri.transcoder_log_id
 
     logger.info('PUBLISH to transcode/CoreFacing/Outgoing, msg = %s' % msg)
     MQTT_CLIENT.publish("transcode/CoreFacing/Outgoing", msg)
 
-    return  {"id": transcoder_log_id}
+    return {"id": transcoder_log_id, "status": status}
+
 
 # get 	/ui/incoming/{cbor}/hex
-@router.get("/ui/incoming/await/{cbor}/hex", status_code=status.HTTP_200_OK)
-async def transcoder_put_cbor_await(cbor: str):
+@router.get("/ui/incoming/await/{input_cbor}/hex", status_code=status.HTTP_200_OK)
+async def transcoder_put_cbor_await(input_cbor: str):
     curr_uri = ""
-    msg = json.dumps({'uri': cbor})
+    msg = json.dumps({'uri': input_cbor})
     transcoder_log_id = None
     with get_session() as session:
-        curr_uri = TranscoderLog.query.filter_by(input_string=cbor).first()
+        curr_uri = TranscoderLog.query.filter_by(or_(input_string=input_cbor, cbor=input_cbor)).first()
         if curr_uri is None:
-            c1 = TranscoderLog(input_string=cbor, parsed_as='pending')
+            c1 = TranscoderLog(input_string=input_cbor, parsed_as='pending')
             session.add(c1)
             session.flush()
             session.refresh(c1)
@@ -120,15 +126,16 @@ async def transcoder_put_cbor_await(cbor: str):
     return  {"data": curr_uri}
 
 # PUT 	/ui/incoming/str 	Body is str ARI to send to transcoder
-@router.get("/ui/incomin/await/str", status_code=status.HTTP_200_OK)
-def transcoder_put_await_str(ari: str):
-    ari = ari.strip()
-    msg = json.dumps({"uri": ari})
+@router.get("/ui/incoming/await/str", status_code=status.HTTP_200_OK)
+def transcoder_put_await_str(input_ari: str):
+    input_ari = input_ari.strip()
+    msg = json.dumps({"uri": input_ari})
     transcoder_log_id = None
     with get_session() as session:
-        curr_uri = TranscoderLog.query.filter_by(input_string=ari).first()
+        curr_uri = TranscoderLog.query.filter(or_(TranscoderLog.input_string==input_ari,TranscoderLog.ari==input_ari)).first()
+
         if curr_uri is None:
-            c1 = TranscoderLog(input_string=ari, parsed_as='pending')
+            c1 = TranscoderLog(input_string=input_ari, parsed_as='pending')
             session.add(c1)
             session.flush()
             session.refresh(c1)
@@ -157,26 +164,29 @@ def transcoder_put_await_str(ari: str):
 
 # PUT 	/ui/incoming/str 	Body is str ARI to send to transcoder
 @router.put("/ui/incoming/str", status_code=status.HTTP_200_OK)
-def transcoder_put_str(ari: str):
-    ari = ari.strip()
-    msg = json.dumps({"uri": ari})
+def transcoder_put_str(input_ari: str):
+    input_ari = input_ari.strip()
+    msg = json.dumps({"uri": input_ari})
     transcoder_log_id = None
     with get_session() as session:
-        curr_uri = TranscoderLog.query.filter_by(input_string=ari).first()
+        curr_uri = TranscoderLog.query.filter(or_(input_string=input_ari,ari=input_ari)).first()
         if curr_uri is None:
-            c1 = TranscoderLog(input_string=ari, parsed_as='pending')
+            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"
         else:
+            # the input_ari has already been submitted
+            status = "already submitted"
             transcoder_log_id = curr_uri.transcoder_log_id
 
     logger.info('PUBLISH to transcode/CoreFacing/Outgoing, msg = %s' % msg)
     MQTT_CLIENT.publish("transcode/CoreFacing/Outgoing", msg)
 
-    return {"id": transcoder_log_id}
+    return {"id": transcoder_log_id, "status": status}
 
 
 

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

@@ -106,6 +106,7 @@ import { mapGetters, mapActions } from "vuex";
 import api from "../../../shared/api.js";
 import AgentModal from "./AgentModal.vue";
 import AgentsManageModal from "./AgentsManageModal.vue";
+import toastr from "toastr";
 
 export default {
   name: "Agents",
@@ -215,9 +216,15 @@ export default {
       nodeList.forEach((node) => {
         api.methods
           .apiPostAgent(node.trim())
-          .then((response) => (this.results = response.status + " " + response.statusText))
+          .then((response) => {
+            this.results = response.status + " " + response.statusText;
+            toastr.success(this.results);
+            
+          })
           .catch((error) => {
             console.error(error);
+            toastr.error(error);
+
           });
       });
     },

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

@@ -68,7 +68,9 @@ import vSelect from "vue-select";
 import { mapGetters, mapActions } from "vuex";
 import api from "../../../shared/api.js";
 import Transcoder from "./transcoder.vue";
-import { ToggleButton } from 'vue-js-toggle-button'
+import { ToggleButton } from 'vue-js-toggle-button';
+import toastr from "toastr";
+
 
 Vue.component('ToggleButton', ToggleButton)
 
@@ -149,11 +151,15 @@ export default {
         .apiPutTranscodedString(inputString)
         .then((response) => {
           this.finResultCbor = response.data
+          this.results = response.status
+          toastr.success(`${response.status}, 'Transcoder Log Id: ${response.data}`);
+
         })
         .catch((error) => {
           console.error(error);
           this.errored = true;
           this.results = "error translating " + error;
+          toastr.error(`${this.results}`);
         })
         .finally(() => (this.loading = false));
       this.finResultStr = inputString;