added default values for error handling

Author: David Linko

anms-core/anms/routes/transcoder.py

@@ -44,30 +44,42 @@
 @router.get("/db/all", status_code=status.HTTP_200_OK, response_model=Page[TL])
 async def paged_transcoder_log(params: Params = Depends()):
     async with get_async_session() as session:
-        return await paginate(session, select(TranscoderLog).order_by(desc(TranscoderLog.transcoder_log_id)), params)
+        return await paginate(
+            session,
+            select(TranscoderLog).order_by(desc(TranscoderLog.transcoder_log_id)),
+            params,
+        )
 
 
-@router.get("/db/search/{query:path}", status_code=status.HTTP_200_OK, response_model=Page[TL])
-async def paged_transcoder_log(query: str, params: Params = Depends()):
+@router.get(
+    "/db/search/{query:path}", status_code=status.HTTP_200_OK, response_model=Page[TL]
+)
+async def paged_transcoder_log_query(query: str, params: Params = Depends()):
     async with get_async_session() as session:
         filters = []
-        filters.append(TranscoderLog.input_string.ilike(f'%{query}%'))
-        filters.append(TranscoderLog.uri.ilike(f'%{query}%'))
-        filters.append(TranscoderLog.cbor.ilike(f'%{query}%'))
+        filters.append(TranscoderLog.input_string.ilike(f"%{query}%"))
+        filters.append(TranscoderLog.uri.ilike(f"%{query}%"))
+        filters.append(TranscoderLog.cbor.ilike(f"%{query}%"))
         if query.isdigit():
             filters.append(TranscoderLog.transcoder_log_id == int(query))
 
-        return await paginate(session, select(TranscoderLog)
-                              .where(or_(*filters))
-                              .order_by(desc(TranscoderLog.transcoder_log_id)), params)
+        return await paginate(
+            session,
+            select(TranscoderLog)
+            .where(or_(*filters))
+            .order_by(desc(TranscoderLog.transcoder_log_id)),
+            params,
+        )
+
 
 @router.get("/db/id/{id}", status_code=status.HTTP_200_OK, response_model=TL)
 def transcoder_log_by_id(id: str):
     return _do_transcoder_log_by_id(id)
-        
+
+
 def _do_transcoder_log_by_id(id: str):
-    with get_session() as session:
-        return TranscoderLog.query.filter_by(transcoder_log_id=id).first()
+    return TranscoderLog.query.filter_by(transcoder_log_id=id).first()
+
 
 # PUT 	/ui/incoming/{cbor}/hex
 @router.put("/ui/incoming/{input_cbor}/hex", status_code=status.HTTP_200_OK)
@@ -80,27 +92,34 @@ async def transcoder_put_cbor_await(cbor: str):
     curr_entry = _transcoder_put_cbor(cbor)
     transcoder_log_id = curr_entry["id"]
     while True:
-        with get_session() as session:
-            curr_uri = TranscoderLog.query.filter(TranscoderLog.transcoder_log_id==transcoder_log_id).first()
-            if curr_uri.parsed_as != "pending":
-                if curr_uri.parsed_as == "ERROR":
-                    curr_uri = "ARI://BADARI"
-                else:
-                    curr_uri = curr_uri.uri
-                break
+        curr_uri = TranscoderLog.query.filter(
+            TranscoderLog.transcoder_log_id == transcoder_log_id
+        ).first()
+        if curr_uri.parsed_as != "pending":
+            if curr_uri.parsed_as == "ERROR":
+                curr_uri = "ARI://BADARI"
+            else:
+                curr_uri = curr_uri.uri
+            break
         time.sleep(1)
 
+    return {"data": curr_uri}
 
-    return  {"data": curr_uri}
 
 def _transcoder_put_cbor(input_cbor):
     transcoder_log_id = None
     send_to_transcode = False
+    status = "pending"
     with get_session() as session:
-        curr_uri = TranscoderLog.query.filter(or_(TranscoderLog.input_string==input_cbor, TranscoderLog.cbor==input_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=input_cbor, parsed_as='pending')
+            c1 = TranscoderLog(input_string=input_cbor, parsed_as="pending")
             session.add(c1)
             session.flush()
             session.refresh(c1)
@@ -111,8 +130,8 @@ def _transcoder_put_cbor(input_cbor):
             # the input_ari has already been submitted
             status = "ARI previously submitted, check log"
             transcoder_log_id = curr_uri.transcoder_log_id
-        
-    if(send_to_transcode):
+
+    if send_to_transcode:
         status = "Submitted ARI to transcoder"
         TRANSMORGIFIER.transcode(input_cbor)
 
@@ -124,33 +143,42 @@ def _transcoder_put_cbor(input_cbor):
 async def transcoder_put_await_str(input_ari: str):
     curr_entry = _transcoder_put_str(input_ari)
     transcoder_log_id = curr_entry["id"]
-    while(True):
-        with get_session() as session:
-            curr_uri = TranscoderLog.query.filter_by(transcoder_log_id=transcoder_log_id).first()
-            if curr_uri.parsed_as != "pending":
-                if curr_uri.parsed_as == "ERROR":
-                    curr_uri = "ARI://BADARI"
-                else:
-                    curr_uri = curr_uri.uri
-                break
-            time.sleep(1)
+    while True:
+        curr_uri = TranscoderLog.query.filter_by(
+            transcoder_log_id=transcoder_log_id
+        ).first()
+        if curr_uri.parsed_as != "pending":
+            if curr_uri.parsed_as == "ERROR":
+                curr_uri = "ARI://BADARI"
+            else:
+                curr_uri = curr_uri.uri
+            break
+        time.sleep(1)
+
+    return {"data": curr_uri}
 
-    return  {"data": curr_uri}
-    
 
 # 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_incoming_str(input_ari: str):
     return _transcoder_put_str(input_ari)
 
-def transcoder_put_str(input_ari: str):
+
+def _transcoder_put_str(input_ari: str):
     input_ari = input_ari.strip()
     transcoder_log_id = None
     send_to_transcode = False
+    state = "pending"
     with get_session() as session:
-        curr_uri = TranscoderLog.query.filter(or_(TranscoderLog.input_string==input_ari,TranscoderLog.ari==input_ari, TranscoderLog.cbor==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')
+            c1 = TranscoderLog(input_string=input_ari, parsed_as="pending")
             session.add(c1)
             session.flush()
             session.refresh(c1)
@@ -161,20 +189,25 @@ def transcoder_put_str(input_ari: str):
             # the input_ari has already been submitted
             state = "ARI previously submitted, check log"
             transcoder_log_id = curr_uri.transcoder_log_id
-    
-    if(send_to_transcode):
+
+    if send_to_transcode:
         state = "Submitted ARI to transcoder"
         TRANSMORGIFIER.transcode(input_ari)
 
     return {"id": transcoder_log_id, "status": state}
 
 
 # PUT 	/ui/incoming_send/str 	Body is str ARI to send to transcoder
-@router.put("/ui/incoming_send/str", status_code=status.HTTP_200_OK,
-            responses={
-                status.HTTP_500_INTERNAL_SERVER_ERROR: {"description" : "Error response from NM"},
-                status.HTTP_504_GATEWAY_TIMEOUT: {"description" : "Manager response timed out"}
-                       })
+@router.put(
+    "/ui/incoming_send/str",
+    status_code=status.HTTP_200_OK,
+    responses={
+        status.HTTP_500_INTERNAL_SERVER_ERROR: {
+            "description": "Error response from NM"
+        },
+        status.HTTP_504_GATEWAY_TIMEOUT: {"description": "Manager response timed out"},
+    },
+)
 async def transcoder_send_ari_str(eid: str, ari: str):
     try:
         # Perform translation (API wrapper)
@@ -185,30 +218,34 @@ async def transcoder_send_ari_str(eid: str, ari: str):
         while True:
             # Wait for request to process before checking state
             await asyncio.sleep(1)
-            
             info = _do_transcoder_log_by_id(idinfo["id"])
 
             if info.parsed_as != "pending":
                 break
             if retries <= 0:
-                raise HTTPException(status_code=status.HTTP_504_GATEWAY_TIMEOUT,
-                                    detail={ "idinfo" : idinfo, "info" : info, "status" : "transcoder timeout" })
+                raise HTTPException(
+                    status_code=status.HTTP_504_GATEWAY_TIMEOUT,
+                    detail={
+                        "idinfo": idinfo,
+                        "info": info,
+                        "status": "transcoder timeout",
+                    },
+                )
 
             retries -= 1
 
         if info.parsed_as == "ERROR":
-            raise HTTPException(status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
-                                detail={ "idinfo" : idinfo, "info" : info, "status" : 500 })
+            raise HTTPException(
+                status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
+                detail={"idinfo": idinfo, "info": info, "status": 500},
+            )
 
         # Publish
-        state = do_nm_put_hex_eid( eid, info.cbor )
-        return { "idinfo" : idinfo, "info" : info, "status" : state }
+        state = do_nm_put_hex_eid(eid, info.cbor)
+        return {"idinfo": idinfo, "info": info, "status": state}
     except HTTPException as e:
-        e.detail = { "idinfo" : idinfo, "info" : info, "status" : e.status_code }
+        e.detail = {"idinfo": idinfo, "info": info, "status": e.status_code}
         raise e
     except Exception as e:
         logger.exception(e)
         raise HTTPException(status_code=status.HTTP_500_INTERNAL_SERVER_ERROR)
-
-
-

anms-core/anms/shared/transmogrifier.py

@@ -23,7 +23,6 @@
 
 from camp.generators import (create_sql)
 from anms.shared.config import ConfigBuilder
-import asyncio
 import anms.shared.mqtt_client
 from anms.shared.opensearch_logger import OpenSearchLogger
 from anms.models.relational import get_session
@@ -35,7 +34,6 @@
 import traceback
 import ace
 import io
-import io
 import json
 import sqlalchemy
 
@@ -48,10 +46,8 @@
 class Transmorgifier:
 
     ''' The Transmogifier that can be configured to use an external or internal translator. '''
-    # args = config 
     def __init__(self, args):
         # if the transcoding in internal to core
-        LOGGER.info(config.Transcoder)
         self.adm_data = adm_data.AdmData
         self.data_model = data_model_view.DataModel
         if config.Transcoder == "Internal":
@@ -168,7 +164,6 @@ def _transcode_internal(self, input):
         return ari
 
     def _ace_transcode_just_cbor(self, input):
-        adms = ace.AdmSet()
         dec = ace.ari_cbor.Decoder()
 
         in_text = input.strip()
@@ -211,6 +206,7 @@ def _ace_transcode(self, input):
                 res_obj['cbor'] = in_text
                 res_obj['ari'] = ari
 
+                
                 try:
                     enc = ace.ari_text.Encoder()
                     buf = io.StringIO()
@@ -221,6 +217,7 @@ def _ace_transcode(self, input):
                         out_text = 'ari:' + out_text
                     LOGGER.debug(f'encoded as text {out_text}')
                 except Exception as err:
+                    out_text = "ERROR"
                     LOGGER.error(f"Error encoding from {ari}: {err}")
 
                 res_obj['uri'] = out_text
@@ -249,6 +246,7 @@ def _ace_transcode(self, input):
                         out_text = 'ari:' + out_text
                     LOGGER.debug(f'encoded as text {out_text}')
                 except Exception as err:
+                    out_text = "ERROR"
                     LOGGER.error(f"Error encoding from {ari}: {err}")
 
 
@@ -263,6 +261,7 @@ def _ace_transcode(self, input):
                     hex_str = ace.cborutil.to_hexstr(buf.getvalue())
                     LOGGER.info(f'encoded as binary {hex_str}')
                 except Exception as err:
+                    hex_str = "ERROR"
                     LOGGER.error(f"Error encoding from {ari}: {err}")
 
                 res_obj['cbor'] = hex_str