Update log_struct method to add severity

Author: praveshkumar1988

backend/score.py

@@ -115,7 +115,7 @@ async def create_source_knowledge_graph_url(
 
         message = f"Source Node created successfully for source type: {source_type} and source: {source}"
         json_obj = {'api_name':'url_scan','db_url':uri,'url_scanned_file':lst_file_name, 'source_url':source_url, 'wiki_query':wiki_query, 'logging_time': formatted_time(datetime.now(timezone.utc))}
-        logger.log_struct(json_obj)
+        logger.log_struct(json_obj, "INFO")
         return create_api_response("Success",message=message,success_count=success_count,failed_count=failed_count,file_name=lst_file_name)    
     except Exception as e:
         error_message = str(e)
@@ -203,7 +203,7 @@ async def extract_knowledge_graph_from_file(
             result['wiki_query'] = wiki_query
             result['source_type'] = source_type
             result['logging_time'] = formatted_time(datetime.now(timezone.utc))
-        logger.log_struct({"severity":"INFO","jsonPayload":result})
+        logger.log_struct(result, "INFO")
         extract_api_time = time.time() - start_time
         logging.info(f"extraction completed in {extract_api_time:.2f} seconds for file name {file_name}")
         return create_api_response('Success', data=result, file_source= source_type)
@@ -222,7 +222,7 @@ async def extract_knowledge_graph_from_file(
                 logging.info(f'Deleted File Path: {merged_file_path} and Deleted File Name : {file_name}')
                 delete_uploaded_local_file(merged_file_path,file_name)
         json_obj = {'message':message,'error_message':error_message, 'file_name': file_name,'status':'Failed','db_url':uri,'failed_count':1, 'source_type': source_type, 'source_url':source_url, 'wiki_query':wiki_query, 'logging_time': formatted_time(datetime.now(timezone.utc))}
-        logger.log_struct({"severity":"ERROR","jsonPayload":json_obj})
+        logger.log_struct(json_obj, "ERROR")
         logging.exception(f'File Failed in extraction: {json_obj}')
         return create_api_response('Failed', message=message + error_message[:100], error=error_message, file_name = file_name)
     finally:
@@ -239,7 +239,7 @@ async def get_source_list(uri:str, userName:str, password:str, database:str=None
             uri = uri.replace(" ","+")
         result = await asyncio.to_thread(get_source_list_from_graph,uri,userName,decoded_password,database)
         json_obj = {'api_name':'sources_list','db_url':uri, 'logging_time': formatted_time(datetime.now(timezone.utc))}
-        logger.log_struct({"severity":"INFO","jsonPayload":json_obj})
+        logger.log_struct(json_obj, "INFO")
         return create_api_response("Success",data=result)
     except Exception as e:
         job_status = "Failed"
@@ -269,7 +269,7 @@ async def post_processing(uri=Form(), userName=Form(), password=Form(), database
             json_obj = {'api_name': 'post_processing/create_entity_embedding', 'db_url': uri, 'logging_time': formatted_time(datetime.now(timezone.utc))}
             logging.info(f'Entity Embeddings created')
 
-        logger.log_struct({"severity":"INFO","jsonPayload":json_obj})
+        logger.log_struct(json_obj, "INFO")
         return create_api_response('Success', message='All tasks completed successfully')
 
     except Exception as e:
@@ -298,7 +298,7 @@ async def chat_bot(uri=Form(),model=Form(None),userName=Form(), password=Form(),
         result["info"]["response_time"] = round(total_call_time, 2)
 
         json_obj = {'api_name':'chat_bot','db_url':uri,'session_id':session_id, 'logging_time': formatted_time(datetime.now(timezone.utc))}
-        logger.log_struct({"severity":"INFO","jsonPayload":json_obj})
+        logger.log_struct(json_obj, "INFO")
 
         return create_api_response('Success',data=result)
     except Exception as e:
@@ -316,7 +316,7 @@ async def chunk_entities(uri=Form(),userName=Form(), password=Form(), chunk_ids=
         logging.info(f"URI: {uri}, Username: {userName}, chunk_ids: {chunk_ids}")
         result = await asyncio.to_thread(get_entities_from_chunkids,uri=uri, username=userName, password=password, chunk_ids=chunk_ids)
         json_obj = {'api_name':'chunk_entities','db_url':uri, 'logging_time': formatted_time(datetime.now(timezone.utc))}
-        logger.log_struct({"severity":"INFO","jsonPayload":json_obj})
+        logger.log_struct(json_obj, "INFO")
         return create_api_response('Success',data=result)
     except Exception as e:
         job_status = "Failed"
@@ -344,7 +344,7 @@ async def graph_query(
             document_names=document_names
         )
         json_obj = {'api_name':'graph_query','db_url':uri,'document_names':document_names, 'logging_time': formatted_time(datetime.now(timezone.utc))}
-        logger.log_struct({"severity":"INFO","jsonPayload":json_obj})
+        logger.log_struct(json_obj, "INFO")
         return create_api_response('Success', data=result)
     except Exception as e:
         job_status = "Failed"
@@ -377,7 +377,7 @@ async def connect(uri=Form(), userName=Form(), password=Form(), database=Form())
         graph = create_graph_database_connection(uri, userName, password, database)
         result = await asyncio.to_thread(connection_check_and_get_vector_dimensions, graph)
         json_obj = {'api_name':'connect','db_url':uri,'status':result, 'count':1, 'logging_time': formatted_time(datetime.now(timezone.utc))}
-        logger.log_struct({"severity":"INFO","jsonPayload":json_obj})
+        logger.log_struct(json_obj, "INFO")
         return create_api_response('Success',data=result)
     except Exception as e:
         job_status = "Failed"
@@ -394,7 +394,7 @@ async def upload_large_file_into_chunks(file:UploadFile = File(...), chunkNumber
         graph = create_graph_database_connection(uri, userName, password, database)
         result = await asyncio.to_thread(upload_file, graph, model, file, chunkNumber, totalChunks, originalname, uri, CHUNK_DIR, MERGED_DIR)
         json_obj = {'api_name':'upload','db_url':uri, 'logging_time': formatted_time(datetime.now(timezone.utc))}
-        logger.log_struct({"severity":"INFO","jsonPayload":json_obj})
+        logger.log_struct(json_obj, "INFO")
         if int(chunkNumber) == int(totalChunks):
             return create_api_response('Success',data=result, message='Source Node Created Successfully')
         else:
@@ -416,7 +416,7 @@ async def get_structured_schema(uri=Form(), userName=Form(), password=Form(), da
         result = await asyncio.to_thread(get_labels_and_relationtypes, graph)
         logging.info(f'Schema result from DB: {result}')
         json_obj = {'api_name':'schema','db_url':uri, 'logging_time': formatted_time(datetime.now(timezone.utc))}
-        logger.log_struct({"severity":"INFO","jsonPayload":json_obj})
+        logger.log_struct(json_obj, "INFO")
         return create_api_response('Success', data=result)
     except Exception as e:
         message="Unable to get the labels and relationtypes from neo4j database"
@@ -485,7 +485,7 @@ async def delete_document_and_entities(uri=Form(),
         # entities_count = result[0]['deletedEntities'] if 'deletedEntities' in result[0] else 0
         message = f"Deleted {files_list_size} documents with entities from database"
         json_obj = {'api_name':'delete_document_and_entities','db_url':uri, 'logging_time': formatted_time(datetime.now(timezone.utc))}
-        logger.log_struct({"severity":"INFO","jsonPayload":json_obj})
+        logger.log_struct(json_obj, "INFO")
         return create_api_response('Success',message=message)
     except Exception as e:
         job_status = "Failed"

backend/src/logger.py

@@ -11,8 +11,8 @@ def __init__(self):
         else:
             self.logger = None
 
-    def log_struct(self, message):
+    def log_struct(self, message, severity="DEFAULT"):
         if self.is_gcp_log_enabled and message is not None:
-            self.logger.log_struct(message)
+            self.logger.log_struct({"message": message, "severity": severity})
         else:
-            print(message)
+            print(f"[{severity}]{message}")