fix

main.py

@@ -1,13 +1,15 @@
-from typing import List
-from typing_extensions import TypedDict
+import asyncio
+from concurrent.futures import ThreadPoolExecutor
 
 from fastapi import FastAPI
-from pydantic import BaseModel
 
-from summary import summarize
+from utils.cache_layer import get_summarize_from_cache, summarize_un_cache_page
+from utils.data_proto import SummaryReq, SummariesReq
+from utils.summary_utils import summarize
 
 KEY = 'J9l#K4wP5h@2'
 app = FastAPI()
+executor = ThreadPoolExecutor()
 
 
 @app.get("/")
@@ -15,12 +17,6 @@ async def root():
     return {"message": "Hello World"}
 
 
-class SummaryReq(BaseModel):
-    key: str
-    id: str
-    text: str
-
-
 @app.post("/summary/")
 async def summary(request: SummaryReq):
     if request.key != KEY:
@@ -28,25 +24,12 @@ async def summary(request: SummaryReq):
     return summarize(request.id, request.text)
 
 
-class Page(TypedDict):
-    id: str
-    text: str
-
-
-class SummariesReq(BaseModel):
-    key: str
-    pages: List[Page]
-
-
 @app.post("/summaries/")
 async def summaries(request: SummariesReq):
     if request.key != KEY:
         return 'Unauthorized'
-    result = []
     print(f'process pages length: {len(request.pages)}')
-    for page in request.pages:
-        try:
-            result.append(summarize(page['id'], page['text']))
-        except Exception as e:
-            print(e)
-    return result
+    pages_summaries, uncached_pages = get_summarize_from_cache(request.pages)
+    loop = asyncio.get_event_loop()
+    await loop.run_in_executor(executor, summarize_un_cache_page, uncached_pages)
+    return pages_summaries

requirements.txt

@@ -1,5 +1,6 @@
 fastapi
 uvicorn
+asyncio
 diskcache
 langdetect
 protobuf

utils/cache_layer.py

@@ -0,0 +1,30 @@
+from typing import List
+
+from diskcache import Cache
+
+from utils.data_proto import Page
+from utils.summary_utils import summarize
+
+cache = Cache(directory='/.cache/tmp/summary', size_limit=int(1e9))  # 1GB
+
+
+def get_summarize_from_cache(pages: List[Page]):
+    pages_summaries = []
+    uncached_pages = []
+    for page in pages:
+        id = page['id']
+        summary = cache.get(id)
+        if summary is not None:
+            pages_summaries.append(summary)
+        else:
+            uncached_pages.append(page)
+    return pages_summaries, uncached_pages
+
+
+def summarize_un_cache_page(pages: List[Page]):
+    print(f'summarize pages length: {len(pages)}')
+    for page in pages:
+        id = page['id']
+        summary = summarize(id, page['text'])
+        cache.set(id, summary)
+        print(f'processed page: {id}')

utils/data_proto.py

@@ -0,0 +1,20 @@
+from typing import List
+
+from pydantic import BaseModel
+from typing_extensions import TypedDict
+
+
+class SummaryReq(BaseModel):
+    key: str
+    id: str
+    text: str
+
+
+class Page(TypedDict):
+    id: str
+    text: str
+
+
+class SummariesReq(BaseModel):
+    key: str
+    pages: List[Page]

summary.py → utils/summary_utils.py

@@ -1,6 +1,5 @@
 import re
 
-from diskcache import Cache
 from langdetect import detect
 from transformers import pipeline
 
@@ -12,15 +11,8 @@ en_translation_pipe = pipeline("translation", model="Helsinki-NLP/opus-mt-mul-en
 classification_pipe = pipeline("text-classification", model="Yueh-Huan/news-category-classification-distilbert")
 tag_gen_pipe = pipeline("text2text-generation", model="fabiochiu/t5-base-tag-generation")
 
-cache = Cache(directory='/.cache/tmp/summary', size_limit=int(1e9))  # 1GB
-
 
 def summarize(id: str, text: str):
-    value = cache.get(id)
-    if value is not None:
-        print(f'cached page: {id}')
-        return value
-
     if text is None or len(text) < 10:
         return {
             "ver": AiSummaryVersion
@@ -38,8 +30,6 @@ def summarize(id: str, text: str):
         "summary": summary,
         "tags": tags,
     }
-    cache.set(id, value)
-    print(f'processed page: {id}')
     return value