Update app.py

app.py

@@ -1,80 +1,71 @@
-import logging
-from fastapi import FastAPI, File, UploadFile, HTTPException
+import os
+import asyncio
+from concurrent.futures import ThreadPoolExecutor
+from fastapi import FastAPI, File, UploadFile
 from fastapi.middleware.cors import CORSMiddleware
+from fastapi.middleware.gzip import GZipMiddleware
+import numpy as np
+from PIL import Image
 from paddleocr import PaddleOCR
 from doctr.io import DocumentFile
 from doctr.models import ocr_predictor
-import numpy as np
-from PIL import Image
 import io
 
-# Set up logging
-logging.basicConfig(level=logging.INFO)
-logger = logging.getLogger(__name__)
-
 app = FastAPI()
-
 app.add_middleware(
     CORSMiddleware,
     allow_origins=["*"],
     allow_credentials=True,
     allow_methods=["*"],
-    allow_headers=["*"],
+    allow_headers=["*"]
 )
+app.add_middleware(GZipMiddleware, minimum_size=1000)
 
 # Initialize models once at startup
 ocr_model = ocr_predictor(pretrained=True)
-paddle_ocr = PaddleOCR(lang='en', use_angle_cls=True)
+paddle_ocr = PaddleOCR(lang='en', use_angle_cls=True, use_gpu=True)
+
+# Get the number of available CPUs
+num_cpus = os.cpu_count()
+
+# Initialize ThreadPoolExecutor with dynamic number of workers
+executor = ThreadPoolExecutor(max_workers=num_cpus)
 
 def ocr_with_doctr(file):
     text_output = ''
-    try:
-        logger.info("Processing PDF with Doctr...")
-        doc = DocumentFile.from_pdf(file)
-        result = ocr_model(doc)
-        for page in result.pages:
-            for block in page.blocks:
-                for line in block.lines:
-                    text_output += " ".join([word.value for word in line.words]) + "\n"
-    except Exception as e:
-        logger.error(f"Error processing PDF: {e}")
-        raise HTTPException(status_code=500, detail=f"Error processing PDF: {e}")
+    doc = DocumentFile.from_pdf(file)
+    result = ocr_model(doc)
+    for page in result.pages:
+        for block in page.blocks:
+            for line in block.lines:
+                text_output += " ".join([word.value for word in line.words]) + "\n"
     return text_output
 
 def ocr_with_paddle(img):
     finaltext = ''
-    try:
-        logger.info("Processing image with PaddleOCR...")
-        result = paddle_ocr.ocr(img)
-        for i in range(len(result[0])):
-            text = result[0][i][1][0]
-            finaltext += ' ' + text
-    except Exception as e:
-        logger.error(f"Error processing image: {e}")
-        raise HTTPException(status_code=500, detail=f"Error processing image: {e}")
+    result = paddle_ocr.ocr(img)
+    for i in range(len(result[0])):
+        text = result[0][i][1][0]
+        finaltext += ' ' + text
     return finaltext
 
+def generate_text_from_image(img):
+    return ocr_with_paddle(img)
+
+async def run_blocking_func(func, *args):
+    loop = asyncio.get_event_loop()
+    return await loop.run_in_executor(executor, func, *args)
+
 @app.post("/ocr/")
 async def perform_ocr(file: UploadFile = File(...)):
-    try:
-        logger.info(f"Received file: {file.filename}")
-        file_bytes = await file.read()
-        
-        if file.filename.endswith('.pdf'):
-            logger.info("Detected PDF file")
-            text_output = ocr_with_doctr(io.BytesIO(file_bytes))
-        else:
-            logger.info("Detected image file")
-            img = np.array(Image.open(io.BytesIO(file_bytes)))
-            text_output = ocr_with_paddle(img)
-        
-        logger.info("OCR completed successfully")
-        return {"ocr_text": text_output}
-
-    except Exception as e:
-        logger.error(f"Internal server error: {e}")
-        raise HTTPException(status_code=500, detail=f"Internal server error: {e}")
+    file_bytes = await file.read()
+    if file.filename.endswith('.pdf'):
+        text_output = await run_blocking_func(ocr_with_doctr, io.BytesIO(file_bytes))
+    else:
+        img = np.array(Image.open(io.BytesIO(file_bytes)))
+        text_output = await run_blocking_func(generate_text_from_image, img)
+    return {"ocr_text": text_output}
 
-@app.get("/")
+@app.get("/test/")
 async def test_call():
-    return {"message": "Hi. I'm running. My purpose is just to server requests. Go to docs to see the list of available endpoints"}
+    return {"message": "Hi. I'm running"}