Update app.py

app.py

@@ -52,7 +52,7 @@ preset_prompts = [
 
 
 def send_pdf_to_parse(file_path, server_ip, port, route="/upload", api_key=None):
-    url = f"http://{server_ip}:{port}{route}"
+    url = f"{openai_api_base}{route}"
     headers = {}
     if api_key:
         headers["Authorization"] = f"Bearer {api_key}"
@@ -65,12 +65,12 @@ def send_pdf_to_parse(file_path, server_ip, port, route="/upload", api_key=None)
 
 
 
-async def send_pdf_async_aiohttp(file_path, server_ip, port, route="/upload", api_key=None):
+async def send_pdf_async_aiohttp(file_path, server_ip, route="/upload", Authorization=None):
     """使用aiohttp异步发送PDF"""
     url = f"http://{server_ip}:{port}{route}"
     headers = {}
-    if api_key:
-        headers["Authorization"] = f"Bearer {api_key}"
+    if Authorization:
+        headers["Authorization"] = f"Bearer {Authorization}"
 
     try:
         async with aiohttp.ClientSession() as session:
@@ -100,38 +100,41 @@ IP = os.environ.get("IP")
 
 PORT = os.environ.get("PORT")
 
-
+Authorization = os.environ.get("Authorization")
 
 client = AsyncOpenAI(
     api_key=openai_api_key,
-    base_url=openai_api_base,
+    base_url=openai_api_base + "/v1",
 )
 
 
 async def request(messages):
-    
+
     chat_completion_from_base64 = await client.chat.completions.create(
         messages=messages,
+        extra_headers={
+            "Authorization": f"Bearer {Authorization}"
+        },
         model="Qwen2_5VL",
         max_completion_tokens=4096,
         stream=True,                                    
         temperature=0.0,
         top_p=0.95
     )
-    
+
     page = ""
     async for chunk in chat_completion_from_base64:
         if chunk.choices[0].delta.content:
             content = chunk.choices[0].delta.content
-            
+
             choice = chunk.choices[0]
             if choice.finish_reason is not None:
                 print(f"end reason = {choice.finish_reason}")
                 break
             page += content
-            
+
             yield content
-            
+
 
 def images_to_pdf(img_paths, pdf_path):
 
@@ -165,7 +168,7 @@ def encode_image(image_path):
         return base64.b64encode(image_file.read()).decode("utf-8")
 
 def build_message(image_path, prompt):
-    
+
     content = [
         {
             "type": "image_url",
@@ -175,14 +178,14 @@ def build_message(image_path, prompt):
         },
         {"type": "text", 'text': prompt}  
     ]
-    
-    
+
+
     messages = [
         {"role": "system", "content": "You are a helpful assistant."},
         {'role': 'user', 'content': content}
-        
+
     ]
-    
+
     return messages
 
 
@@ -211,14 +214,14 @@ async def doc_parser(doc_path, prompt):
             for idx, page in enumerate(pages, start=1):
                 img_path = tmpdir / f"page_{idx}.png"
                 page.save(img_path, "PNG")
-                
+
                 messages = build_message(img_path, prompt)
                 queries.append(messages)
-                
+
         else:
             messages = build_message(doc_path, prompt)
             queries.append(messages)
-            
+
     all_pages = []
     all_pages_raw = []
     for query in queries:
@@ -231,19 +234,19 @@ async def doc_parser(doc_path, prompt):
         print(all_pages)
         yield "\n---\n".join(all_pages), "\n\n".join(all_pages_raw)
 
-        
+
 def compress_directory_to_zip(directory_path, output_zip_path):
     try:
         with zipfile.ZipFile(output_zip_path, 'w', zipfile.ZIP_DEFLATED) as zipf:
 
-   
+
             for root, dirs, files in os.walk(directory_path):
                 for file in files:
-            
+
                     file_path = os.path.join(root, file)
 
                     arcname = os.path.relpath(file_path, directory_path)
-            
+
                     zipf.write(file_path, arcname)
         return 0
     except Exception as e:
@@ -263,7 +266,7 @@ def check_prompt(prompt):
     return prompt
 
 def to_file(image_path):
-    
+
     if image_path.endswith("Academic_Papers.png"):
         image_path = image_path.replace("Academic_Papers.png", "Academic_Papers.pdf")
 
@@ -293,7 +296,7 @@ async def process_file(file_path):
         images_to_pdf(file_path, tmp_file_path)
     else:
         tmp_file_path = file_path
-        asyncio.create_task(send_pdf_async_aiohttp(tmp_file_path, IP, PORT))
+        asyncio.create_task(send_pdf_async_aiohttp(tmp_file_path, server_ip=openai_api_base, Authorization=Authorization))
 
     return str(tmp_file_path)
 
@@ -302,7 +305,7 @@ if __name__ == '__main__':
     with gr.Blocks() as demo:
         with gr.Row():
             with gr.Column(variant='panel', scale=5):
-                
+
                 file = gr.File(label='Please upload a PDF or image', file_types=['.pdf', '.png', '.jpeg', '.jpg'], type="filepath")
                 prompts = gr.Dropdown(
                     choices=preset_prompts,
@@ -320,7 +323,7 @@ if __name__ == '__main__':
                 pdf_show = PDF(label='Preview', interactive=False, visible=True, height=800)
 
 
-         
+
                 example_root = os.path.join(os.path.dirname(__file__), 'examples')
                 images = [
                     os.path.join(example_root, f)
@@ -334,9 +337,9 @@ if __name__ == '__main__':
                     file_path = [
                         os.path.join(example_root, f)
                         for f in ["Financial_Reports.png", "Books.png", "Magazines.png", "Academic_Papers.png"]
-                       
+
                     ]
-                    
+
                     with gr.Row():
                         for i, label in enumerate(["Financial Reports(IMG)", "Books(IMG)", "Magazines(IMG)", "Academic Papers(PDF)"]):
                             with gr.Column(scale=1, min_width=120):
@@ -348,11 +351,11 @@ if __name__ == '__main__':
                                     show_download_button=False
                                 )
                                 gr.Button(label).click(fn=to_file, inputs=gr.State(file_path[i]), outputs=file)
-                            
-                            
+
+
                 download_btn = gr.Button("⬇️ Generate download link", size="sm")
                 output_file = gr.File(label='Parse result', interactive=False, elem_id="down-file-box",visible=False)
-               
+
                 gr.HTML("""
                 <style>
                 #down-file-box {
@@ -367,9 +370,9 @@ if __name__ == '__main__':
                              line_breaks=True)
                     with gr.Tab('Markdown text'):
                         md_text = gr.TextArea(lines=45, show_copy_button=True)
-                            
-                        
-               
+
+
+
         file.change(fn=process_file, inputs=file, outputs=pdf_show)
 
 
@@ -386,9 +389,9 @@ if __name__ == '__main__':
             inputs=[file, prompts],
             outputs=[md, md_text]
         )
-        
+
         clear_bu.add([file, md, pdf_show, md_text])
-        
+
         download_btn.click(
             fn=download_markdown_file,
             inputs=md_text,