From b68c139125213b4fa22f5e119f1c6bd1c8476eef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8E=98=E6=9D=83=20=E9=A9=AC?= <mashenquan@fuzhi.ai>
Date: Mon, 26 Aug 2024 14:07:02 +0800
Subject: [PATCH] feat: +omniparse timeout

---
 metagpt/configs/omniparse_config.py |  1 +
 metagpt/tools/libs/editor.py        | 20 +++++++++++---------
 metagpt/utils/omniparse_client.py   |  2 +-
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/metagpt/configs/omniparse_config.py b/metagpt/configs/omniparse_config.py
index bf1516fc8..ecae78697 100644
--- a/metagpt/configs/omniparse_config.py
+++ b/metagpt/configs/omniparse_config.py
@@ -3,3 +3,4 @@ from metagpt.utils.yaml_model import YamlModel
 
 class OmniParseConfig(YamlModel):
     url: str = ""
+    timeout: int = 600
diff --git a/metagpt/tools/libs/editor.py b/metagpt/tools/libs/editor.py
index 240c28767..76f009fa6 100644
--- a/metagpt/tools/libs/editor.py
+++ b/metagpt/tools/libs/editor.py
@@ -3,7 +3,7 @@ import os
 import shutil
 import subprocess
 from pathlib import Path
-from typing import List, Optional, Union
+from typing import List, Optional, Tuple, Union
 
 from pydantic import BaseModel, ConfigDict
 
@@ -251,15 +251,17 @@ class Editor(BaseModel):
         from metagpt.tools.libs import get_env_default
         from metagpt.utils.omniparse_client import OmniParseClient
 
-        base_url = await get_env_default(key="base_url", app_name="OmniParse", default_value="")
-        if not base_url:
-            base_url = await Editor._read_omniparse_config()
+        base_url1 = await get_env_default(key="base_url", app_name="OmniParse", default_value="")
+        timeout1 = await get_env_default(key="timeout", app_name="OmniParse", default_value="")
+        base_url2, timeout2 = await Editor._read_omniparse_config()
+
+        base_url = base_url1 or base_url2
         if not base_url:
             return None
         api_key = await get_env_default(key="api_key", app_name="OmniParse", default_value="")
-        v = await get_env_default(key="timeout", app_name="OmniParse", default_value="120")
+        timeout = timeout1 or timeout2 or 120
         try:
-            timeout = int(v) or 120
+            timeout = int(timeout)
         except ValueError:
             timeout = 120
 
@@ -287,8 +289,8 @@ class Editor(BaseModel):
         return result
 
     @staticmethod
-    async def _read_omniparse_config() -> str:
+    async def _read_omniparse_config() -> Tuple[str, int]:
         config = Config.default()
         if config.omniparse and config.omniparse.url:
-            return config.omniparse.url
-        return ""
+            return config.omniparse.url, config.omniparse.timeout
+        return "", 0
diff --git a/metagpt/utils/omniparse_client.py b/metagpt/utils/omniparse_client.py
index cb2341944..361e84fd1 100644
--- a/metagpt/utils/omniparse_client.py
+++ b/metagpt/utils/omniparse_client.py
@@ -189,7 +189,7 @@ class OmniParseClient:
             # Do not verify if only byte data is provided
             return
 
-        file_ext = Path(verify_file_path).suffix
+        file_ext = Path(verify_file_path).suffix.lower()
         if file_ext not in allowed_file_extensions:
             raise ValueError(f"Not allowed {file_ext} File extension must be one of {allowed_file_extensions}")