Update app/main.py

app/main.py

@@ -8,6 +8,7 @@ import re
 import random
 from datetime import datetime
 from jinja2 import Template
+import urllib.parse
 import openai
 
 # —— 环境变量读取 —— #
@@ -21,34 +22,36 @@ def get_access_token(api_key, secret_key):
     resp = requests.post(
         "https://aip.baidubce.com/oauth/2.0/token",
         params={
-            "grant_type":"client_credentials",
+            "grant_type": "client_credentials",
             "client_id": api_key,
             "client_secret": secret_key
         }
     )
+    resp.raise_for_status()
     return resp.json().get("access_token")
 
 def ocr_image(image_bytes, token):
+    # Base64 encode and URL-encode the image
     img_b64 = base64.b64encode(image_bytes).decode()
-    resp = requests.post(
-        f"https://aip.baidubce.com/rest/2.0/ocr/v1/handwriting?access_token={token}",
-        headers={"Content-Type":"application/x-www-form-urlencoded"},
-        data={"image": img_b64, "language_type":"ENG"}
-    )
+    img_encoded = urllib.parse.quote_plus(img_b64)
+    url = f"https://aip.baidubce.com/rest/2.0/ocr/v1/handwriting?access_token={token}"
+    headers = {"Content-Type": "application/x-www-form-urlencoded"}
+    data = f"image={img_encoded}&language_type=ENG"
+    resp = requests.post(url, headers=headers, data=data)
+    resp.raise_for_status()
     return resp.json().get("words_result", [])
 
 # —— 文本高亮 —— #
 def highlight_brackets(text):
-    # 中括号绿色；小括号红色
     text = re.sub(r'\[([^\[\]]+)\]', r'<span class="highlight-bracket-green">\1</span>', text)
     text = re.sub(r'\(([^\(\)]+)\)', r'<span class="highlight-bracket">\1</span>', text)
     return text.replace("\n", "<br>")
 
 # —— 主处理函数 —— #
-def process(image):
+def process(image_bytes: bytes):
     # 1. OCR
     token = get_access_token(BAIDU_API_KEY, BAIDU_SECRET_KEY)
-    words = ocr_image(image.read(), token)
+    words = ocr_image(image_bytes, token)
     essay_text = "\n".join([w["words"] for w in words])
 
     # 2. 格式化原文
@@ -59,7 +62,7 @@ def process(image):
     )
     fm = openai.ChatCompletion.create(
         model="gpt-4o-mini",
-        messages=[{"role":"user","content":fmt_prompt}]
+        messages=[{"role": "user", "content": fmt_prompt}]
     )
     revised = fm.choices[0].message.content
 
@@ -70,7 +73,7 @@ def process(image):
     )
     cm = openai.ChatCompletion.create(
         model="gpt-4o-mini",
-        messages=[{"role":"user","content":corr_prompt}]
+        messages=[{"role": "user", "content": corr_prompt}]
     )
     corrected = cm.choices[0].message.content
 
@@ -81,7 +84,7 @@ def process(image):
     )
     rm = openai.ChatCompletion.create(
         model="gpt-4o-mini",
-        messages=[{"role":"user","content":review_prompt}]
+        messages=[{"role": "user", "content": review_prompt}]
     )
     review = rm.choices[0].message.content
 
@@ -92,7 +95,7 @@ def process(image):
     )
     rr = openai.ChatCompletion.create(
         model="gpt-4o-mini",
-        messages=[{"role":"user","content":rate_prompt}]
+        messages=[{"role": "user", "content": rate_prompt}]
     )
     rating = rr.choices[0].message.content
 
@@ -102,7 +105,7 @@ def process(image):
     )
     wm = openai.ChatCompletion.create(
         model="gpt-4o-mini",
-        messages=[{"role":"user","content":rewrite_prompt}]
+        messages=[{"role": "user", "content": rewrite_prompt}]
     )
     perfect = wm.choices[0].message.content
 
@@ -125,19 +128,19 @@ def process(image):
     full_html = tpl.render(code=code, content=html_content)
 
     # 写文件
-    html_path = f"/app/output/{code}.html"
-    pdf_path  = f"/app/output/{code}.pdf"
-    os.makedirs("/app/output", exist_ok=True)
+    os.makedirs("app/output", exist_ok=True)
+    html_path = f"app/output/{code}.html"
+    pdf_path  = f"app/output/{code}.pdf"
     with open(html_path, "w", encoding="utf-8") as f:
         f.write(full_html)
-    pdfkit.from_string(full_html, pdf_path, options={"enable-local-file-access":""})
+    pdfkit.from_string(full_html, pdf_path, options={"enable-local-file-access": ""})
 
     return full_html, html_path, pdf_path
 
 # —— Gradio 接口 —— #
 with gr.Blocks(title="英语作文批改") as demo:
     gr.Markdown("## 上传英语作文照片，等待批改完成后下载 HTML 或 PDF")
-    image_in = gr.File(file_count="single", label="上传照片")
+    image_in = gr.Image(type="bytes", label="上传照片")
     output_html = gr.HTML()
     btn = gr.Button("开始批改")
     file_html = gr.File(label="下载 HTML")