fix issues

ocr_api.py

@@ -72,13 +72,13 @@ async def create_items(items: Union[Item, List[Item]]):
     except Exception as e:
         global total_error
         total_error += 1
-        logger.info(f"Time:{get_bd_time()}, Execution Failed and Total Failed Execution : {total_error}, Payload:{items}")
+        logger.info(f"Time:{get_bd_time()}, Execution Failed and Total Failed Execution : {total_error}, Payload:{items}, Error:{str(e)}")
         logger.error(str(e))
         return {"AI": f"Error: {str(e)}"}
     finally:
         global total_done
         total_done +=1
-        logger.info(f"Time:{get_bd_time()}, Execution Done and Total Successfull Execution : {total_done}, Payload:{items}")
+        logger.info(f"Time:{get_bd_time()}, Execution Done and Total Successfull Execution : {total_done}, Payload:{items}, Result:{results}")
         torch.cuda.empty_cache()
         pass
 

ocr_main.py

@@ -8,7 +8,6 @@ from io import BytesIO
 from data.model import OCR_model
 from data.data import name_distribute
 
-
 async def getImage(img_url):
     async with ClientSession() as session:
         try:
@@ -19,8 +18,6 @@ async def getImage(img_url):
             print({"Error in getImage":str(e)})
 
 
-
-
 async def detection(model,img_content):
     try:
         img = Image.open(img_content)
@@ -30,10 +27,10 @@ async def detection(model,img_content):
         detection = {}
         data = json.loads(result[0].tojson())
         rect_data = []
-        rec_rect = []
         for items in data:
             rect_data.append(items["box"])
-        await create_rectangle(img_content,rect_data)
+            print(items["box"])
+        img = await create_rectangle(Image.open(img_content),rect_data)
         if len(data) == 0:
             res = {"AI": "No Detection"}
             detection.update(res)
@@ -44,20 +41,24 @@ async def detection(model,img_content):
             for name, count in name_counts.items():
                 res = {name: count}
                 detection.update(res)
-        return detection
+        return detection, img
     except Exception as e:
         print({"Error in detection":str(e)})
 
 
 async def share_iamge(img):
     try:
+        # img = Image.open(imgs)
         buffer = BytesIO()
         img.save(buffer, format="JPEG")
         base64_image = base64.b64encode(buffer.getvalue()).decode("utf-8")
-        return base64_image
+        data = {"Arabic Detected": base64_image}
+        return data
     except Exception as e:
         print({"Error in share_iamge":str(e)})
 
+
+
 async def create_rectangle(image_data,cords):
     try:
         drawing = ImageDraw.Draw(image_data)
@@ -67,8 +68,8 @@ async def create_rectangle(image_data,cords):
             x2 = item["x2"]
             y1 = item["y1"]
             y2 = item["y2"]
-            drawing.rectangle([x1,y1,x2,y2],outline="red",width=5)
-        return drawing
+            drawing.rectangle([x1,y1,x2,y2],outline="red",width=1)
+        return image_data
     except Exception as e:
         print({"Error in create_rectangle":str(e)})
 
@@ -96,13 +97,12 @@ async def format_result(res,conv):
 async def mainDet(url):
     try:
         image = await asyncio.create_task(getImage(url))
-        detect_data = await asyncio.create_task(detection(OCR_model, image))
+        detect_data,img = await asyncio.create_task(detection(OCR_model, image))
         tab_data = await asyncio.create_task(format_result(detect_data,name_distribute))
-        img_data = await asyncio.create_task(share_iamge(image))
-
+        img_data = await asyncio.create_task(share_iamge(img))
         result = {
-                    "tabularData":tab_data,
-                    "imageData":img_data,
+                    "tabularData":{} if len(tab_data)==0 else tab_data,
+                    "imageData":{} if img_data == None else img_data,
                     }
         return json.dumps(result)