mirror of
https://github.com/infiniflow/ragflow.git
synced 2025-12-08 12:32:30 +08:00
Move 'timeout' to common folder (#10983)
### What problem does this PR solve? As title. ### Type of change - [x] Refactoring Signed-off-by: Jin Hai <haijin.chn@gmail.com>
This commit is contained in:
@ -27,7 +27,7 @@ from agent.tools.base import LLMToolPluginCallSession, ToolParamBase, ToolBase,
|
|||||||
from api.db.services.llm_service import LLMBundle
|
from api.db.services.llm_service import LLMBundle
|
||||||
from api.db.services.tenant_llm_service import TenantLLMService
|
from api.db.services.tenant_llm_service import TenantLLMService
|
||||||
from api.db.services.mcp_server_service import MCPServerService
|
from api.db.services.mcp_server_service import MCPServerService
|
||||||
from api.utils.api_utils import timeout
|
from common.connection_utils import timeout
|
||||||
from rag.prompts.generator import next_step, COMPLETE_TASK, analyze_task, \
|
from rag.prompts.generator import next_step, COMPLETE_TASK, analyze_task, \
|
||||||
citation_prompt, reflect, rank_memories, kb_prompt, citation_plus, full_question, message_fit_in
|
citation_prompt, reflect, rank_memories, kb_prompt, citation_plus, full_question, message_fit_in
|
||||||
from rag.utils.mcp_tool_call_conn import MCPToolCallSession, mcp_tool_metadata_to_openai_tool
|
from rag.utils.mcp_tool_call_conn import MCPToolCallSession, mcp_tool_metadata_to_openai_tool
|
||||||
|
|||||||
@ -25,7 +25,7 @@ from typing import Any, List, Union
|
|||||||
import pandas as pd
|
import pandas as pd
|
||||||
import trio
|
import trio
|
||||||
from agent import settings
|
from agent import settings
|
||||||
from api.utils.api_utils import timeout
|
from common.connection_utils import timeout
|
||||||
|
|
||||||
|
|
||||||
_FEEDED_DEPRECATED_PARAMS = "_feeded_deprecated_params"
|
_FEEDED_DEPRECATED_PARAMS = "_feeded_deprecated_params"
|
||||||
|
|||||||
@ -21,7 +21,7 @@ from abc import ABC
|
|||||||
from api.db import LLMType
|
from api.db import LLMType
|
||||||
from api.db.services.llm_service import LLMBundle
|
from api.db.services.llm_service import LLMBundle
|
||||||
from agent.component.llm import LLMParam, LLM
|
from agent.component.llm import LLMParam, LLM
|
||||||
from api.utils.api_utils import timeout
|
from common.connection_utils import timeout
|
||||||
from rag.llm.chat_model import ERROR_PREFIX
|
from rag.llm.chat_model import ERROR_PREFIX
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -23,7 +23,7 @@ from abc import ABC
|
|||||||
import requests
|
import requests
|
||||||
|
|
||||||
from agent.component.base import ComponentBase, ComponentParamBase
|
from agent.component.base import ComponentBase, ComponentParamBase
|
||||||
from api.utils.api_utils import timeout
|
from common.connection_utils import timeout
|
||||||
from deepdoc.parser import HtmlParser
|
from deepdoc.parser import HtmlParser
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -25,7 +25,7 @@ from api.db import LLMType
|
|||||||
from api.db.services.llm_service import LLMBundle
|
from api.db.services.llm_service import LLMBundle
|
||||||
from api.db.services.tenant_llm_service import TenantLLMService
|
from api.db.services.tenant_llm_service import TenantLLMService
|
||||||
from agent.component.base import ComponentBase, ComponentParamBase
|
from agent.component.base import ComponentBase, ComponentParamBase
|
||||||
from api.utils.api_utils import timeout
|
from common.connection_utils import timeout
|
||||||
from rag.prompts.generator import tool_call_summary, message_fit_in, citation_prompt, structured_output_prompt
|
from rag.prompts.generator import tool_call_summary, message_fit_in, citation_prompt, structured_output_prompt
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -23,7 +23,7 @@ from typing import Any
|
|||||||
from agent.component.base import ComponentBase, ComponentParamBase
|
from agent.component.base import ComponentBase, ComponentParamBase
|
||||||
from jinja2 import Template as Jinja2Template
|
from jinja2 import Template as Jinja2Template
|
||||||
|
|
||||||
from api.utils.api_utils import timeout
|
from common.connection_utils import timeout
|
||||||
|
|
||||||
|
|
||||||
class MessageParam(ComponentParamBase):
|
class MessageParam(ComponentParamBase):
|
||||||
|
|||||||
@ -18,7 +18,7 @@ import re
|
|||||||
from abc import ABC
|
from abc import ABC
|
||||||
from jinja2 import Template as Jinja2Template
|
from jinja2 import Template as Jinja2Template
|
||||||
from agent.component.base import ComponentParamBase
|
from agent.component.base import ComponentParamBase
|
||||||
from api.utils.api_utils import timeout
|
from common.connection_utils import timeout
|
||||||
from .message import Message
|
from .message import Message
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -19,7 +19,7 @@ from abc import ABC
|
|||||||
from typing import Any
|
from typing import Any
|
||||||
|
|
||||||
from agent.component.base import ComponentBase, ComponentParamBase
|
from agent.component.base import ComponentBase, ComponentParamBase
|
||||||
from api.utils.api_utils import timeout
|
from common.connection_utils import timeout
|
||||||
|
|
||||||
|
|
||||||
class SwitchParam(ComponentParamBase):
|
class SwitchParam(ComponentParamBase):
|
||||||
|
|||||||
@ -19,7 +19,7 @@ import time
|
|||||||
from abc import ABC
|
from abc import ABC
|
||||||
import arxiv
|
import arxiv
|
||||||
from agent.tools.base import ToolParamBase, ToolMeta, ToolBase
|
from agent.tools.base import ToolParamBase, ToolMeta, ToolBase
|
||||||
from api.utils.api_utils import timeout
|
from common.connection_utils import timeout
|
||||||
|
|
||||||
|
|
||||||
class ArXivParam(ToolParamBase):
|
class ArXivParam(ToolParamBase):
|
||||||
|
|||||||
@ -22,7 +22,7 @@ from typing import Optional
|
|||||||
from pydantic import BaseModel, Field, field_validator
|
from pydantic import BaseModel, Field, field_validator
|
||||||
from agent.tools.base import ToolParamBase, ToolBase, ToolMeta
|
from agent.tools.base import ToolParamBase, ToolBase, ToolMeta
|
||||||
from api import settings
|
from api import settings
|
||||||
from api.utils.api_utils import timeout
|
from common.connection_utils import timeout
|
||||||
|
|
||||||
|
|
||||||
class Language(StrEnum):
|
class Language(StrEnum):
|
||||||
|
|||||||
@ -19,7 +19,7 @@ import time
|
|||||||
from abc import ABC
|
from abc import ABC
|
||||||
from duckduckgo_search import DDGS
|
from duckduckgo_search import DDGS
|
||||||
from agent.tools.base import ToolMeta, ToolParamBase, ToolBase
|
from agent.tools.base import ToolMeta, ToolParamBase, ToolBase
|
||||||
from api.utils.api_utils import timeout
|
from common.connection_utils import timeout
|
||||||
|
|
||||||
|
|
||||||
class DuckDuckGoParam(ToolParamBase):
|
class DuckDuckGoParam(ToolParamBase):
|
||||||
|
|||||||
@ -25,7 +25,7 @@ from email.header import Header
|
|||||||
from email.utils import formataddr
|
from email.utils import formataddr
|
||||||
|
|
||||||
from agent.tools.base import ToolParamBase, ToolBase, ToolMeta
|
from agent.tools.base import ToolParamBase, ToolBase, ToolMeta
|
||||||
from api.utils.api_utils import timeout
|
from common.connection_utils import timeout
|
||||||
|
|
||||||
|
|
||||||
class EmailParam(ToolParamBase):
|
class EmailParam(ToolParamBase):
|
||||||
|
|||||||
@ -22,7 +22,7 @@ import pymysql
|
|||||||
import psycopg2
|
import psycopg2
|
||||||
import pyodbc
|
import pyodbc
|
||||||
from agent.tools.base import ToolParamBase, ToolBase, ToolMeta
|
from agent.tools.base import ToolParamBase, ToolBase, ToolMeta
|
||||||
from api.utils.api_utils import timeout
|
from common.connection_utils import timeout
|
||||||
|
|
||||||
|
|
||||||
class ExeSQLParam(ToolParamBase):
|
class ExeSQLParam(ToolParamBase):
|
||||||
|
|||||||
@ -19,7 +19,7 @@ import time
|
|||||||
from abc import ABC
|
from abc import ABC
|
||||||
import requests
|
import requests
|
||||||
from agent.tools.base import ToolParamBase, ToolMeta, ToolBase
|
from agent.tools.base import ToolParamBase, ToolMeta, ToolBase
|
||||||
from api.utils.api_utils import timeout
|
from common.connection_utils import timeout
|
||||||
|
|
||||||
|
|
||||||
class GitHubParam(ToolParamBase):
|
class GitHubParam(ToolParamBase):
|
||||||
|
|||||||
@ -19,7 +19,7 @@ import time
|
|||||||
from abc import ABC
|
from abc import ABC
|
||||||
from serpapi import GoogleSearch
|
from serpapi import GoogleSearch
|
||||||
from agent.tools.base import ToolParamBase, ToolMeta, ToolBase
|
from agent.tools.base import ToolParamBase, ToolMeta, ToolBase
|
||||||
from api.utils.api_utils import timeout
|
from common.connection_utils import timeout
|
||||||
|
|
||||||
|
|
||||||
class GoogleParam(ToolParamBase):
|
class GoogleParam(ToolParamBase):
|
||||||
|
|||||||
@ -19,7 +19,7 @@ import time
|
|||||||
from abc import ABC
|
from abc import ABC
|
||||||
from scholarly import scholarly
|
from scholarly import scholarly
|
||||||
from agent.tools.base import ToolMeta, ToolParamBase, ToolBase
|
from agent.tools.base import ToolMeta, ToolParamBase, ToolBase
|
||||||
from api.utils.api_utils import timeout
|
from common.connection_utils import timeout
|
||||||
|
|
||||||
|
|
||||||
class GoogleScholarParam(ToolParamBase):
|
class GoogleScholarParam(ToolParamBase):
|
||||||
|
|||||||
@ -21,7 +21,7 @@ from Bio import Entrez
|
|||||||
import re
|
import re
|
||||||
import xml.etree.ElementTree as ET
|
import xml.etree.ElementTree as ET
|
||||||
from agent.tools.base import ToolParamBase, ToolMeta, ToolBase
|
from agent.tools.base import ToolParamBase, ToolMeta, ToolBase
|
||||||
from api.utils.api_utils import timeout
|
from common.connection_utils import timeout
|
||||||
|
|
||||||
|
|
||||||
class PubMedParam(ToolParamBase):
|
class PubMedParam(ToolParamBase):
|
||||||
|
|||||||
@ -25,7 +25,7 @@ from api.db.services.dialog_service import meta_filter
|
|||||||
from api.db.services.knowledgebase_service import KnowledgebaseService
|
from api.db.services.knowledgebase_service import KnowledgebaseService
|
||||||
from api.db.services.llm_service import LLMBundle
|
from api.db.services.llm_service import LLMBundle
|
||||||
from api import settings
|
from api import settings
|
||||||
from api.utils.api_utils import timeout
|
from common.connection_utils import timeout
|
||||||
from rag.app.tag import label_question
|
from rag.app.tag import label_question
|
||||||
from rag.prompts.generator import cross_languages, kb_prompt, gen_meta_filter
|
from rag.prompts.generator import cross_languages, kb_prompt, gen_meta_filter
|
||||||
|
|
||||||
|
|||||||
@ -19,7 +19,7 @@ import time
|
|||||||
from abc import ABC
|
from abc import ABC
|
||||||
import requests
|
import requests
|
||||||
from agent.tools.base import ToolMeta, ToolParamBase, ToolBase
|
from agent.tools.base import ToolMeta, ToolParamBase, ToolBase
|
||||||
from api.utils.api_utils import timeout
|
from common.connection_utils import timeout
|
||||||
|
|
||||||
|
|
||||||
class SearXNGParam(ToolParamBase):
|
class SearXNGParam(ToolParamBase):
|
||||||
|
|||||||
@ -19,7 +19,7 @@ import time
|
|||||||
from abc import ABC
|
from abc import ABC
|
||||||
from tavily import TavilyClient
|
from tavily import TavilyClient
|
||||||
from agent.tools.base import ToolParamBase, ToolBase, ToolMeta
|
from agent.tools.base import ToolParamBase, ToolBase, ToolMeta
|
||||||
from api.utils.api_utils import timeout
|
from common.connection_utils import timeout
|
||||||
|
|
||||||
|
|
||||||
class TavilySearchParam(ToolParamBase):
|
class TavilySearchParam(ToolParamBase):
|
||||||
|
|||||||
@ -21,7 +21,7 @@ import pandas as pd
|
|||||||
import pywencai
|
import pywencai
|
||||||
|
|
||||||
from agent.tools.base import ToolParamBase, ToolMeta, ToolBase
|
from agent.tools.base import ToolParamBase, ToolMeta, ToolBase
|
||||||
from api.utils.api_utils import timeout
|
from common.connection_utils import timeout
|
||||||
|
|
||||||
|
|
||||||
class WenCaiParam(ToolParamBase):
|
class WenCaiParam(ToolParamBase):
|
||||||
|
|||||||
@ -19,7 +19,7 @@ import time
|
|||||||
from abc import ABC
|
from abc import ABC
|
||||||
import wikipedia
|
import wikipedia
|
||||||
from agent.tools.base import ToolMeta, ToolParamBase, ToolBase
|
from agent.tools.base import ToolMeta, ToolParamBase, ToolBase
|
||||||
from api.utils.api_utils import timeout
|
from common.connection_utils import timeout
|
||||||
|
|
||||||
|
|
||||||
class WikipediaParam(ToolParamBase):
|
class WikipediaParam(ToolParamBase):
|
||||||
|
|||||||
@ -20,7 +20,7 @@ from abc import ABC
|
|||||||
import pandas as pd
|
import pandas as pd
|
||||||
import yfinance as yf
|
import yfinance as yf
|
||||||
from agent.tools.base import ToolMeta, ToolParamBase, ToolBase
|
from agent.tools.base import ToolMeta, ToolParamBase, ToolBase
|
||||||
from api.utils.api_utils import timeout
|
from common.connection_utils import timeout
|
||||||
|
|
||||||
|
|
||||||
class YahooFinanceParam(ToolParamBase):
|
class YahooFinanceParam(ToolParamBase):
|
||||||
|
|||||||
@ -13,17 +13,14 @@
|
|||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
#
|
#
|
||||||
import asyncio
|
|
||||||
import functools
|
import functools
|
||||||
import json
|
import json
|
||||||
import logging
|
import logging
|
||||||
import os
|
import os
|
||||||
import queue
|
|
||||||
import threading
|
|
||||||
import time
|
import time
|
||||||
from copy import deepcopy
|
from copy import deepcopy
|
||||||
from functools import wraps
|
from functools import wraps
|
||||||
from typing import Any, Callable, Coroutine, Optional, Type, Union
|
|
||||||
|
|
||||||
import requests
|
import requests
|
||||||
import trio
|
import trio
|
||||||
@ -43,6 +40,7 @@ from api.db import ActiveEnum
|
|||||||
from api.db.db_models import APIToken
|
from api.db.db_models import APIToken
|
||||||
from api.utils.json_encode import CustomJSONEncoder
|
from api.utils.json_encode import CustomJSONEncoder
|
||||||
from rag.utils.mcp_tool_call_conn import MCPToolCallSession, close_multiple_mcp_toolcall_sessions
|
from rag.utils.mcp_tool_call_conn import MCPToolCallSession, close_multiple_mcp_toolcall_sessions
|
||||||
|
from common.connection_utils import timeout
|
||||||
|
|
||||||
requests.models.complexjson.dumps = functools.partial(json.dumps, cls=CustomJSONEncoder)
|
requests.models.complexjson.dumps = functools.partial(json.dumps, cls=CustomJSONEncoder)
|
||||||
|
|
||||||
@ -604,82 +602,6 @@ def get_mcp_tools(mcp_servers: list, timeout: float | int = 10) -> tuple[dict, s
|
|||||||
return {}, str(e)
|
return {}, str(e)
|
||||||
|
|
||||||
|
|
||||||
TimeoutException = Union[Type[BaseException], BaseException]
|
|
||||||
OnTimeoutCallback = Union[Callable[..., Any], Coroutine[Any, Any, Any]]
|
|
||||||
|
|
||||||
|
|
||||||
def timeout(seconds: float | int | str = None, attempts: int = 2, *, exception: Optional[TimeoutException] = None, on_timeout: Optional[OnTimeoutCallback] = None):
|
|
||||||
if isinstance(seconds, str):
|
|
||||||
seconds = float(seconds)
|
|
||||||
def decorator(func):
|
|
||||||
@wraps(func)
|
|
||||||
def wrapper(*args, **kwargs):
|
|
||||||
result_queue = queue.Queue(maxsize=1)
|
|
||||||
|
|
||||||
def target():
|
|
||||||
try:
|
|
||||||
result = func(*args, **kwargs)
|
|
||||||
result_queue.put(result)
|
|
||||||
except Exception as e:
|
|
||||||
result_queue.put(e)
|
|
||||||
|
|
||||||
thread = threading.Thread(target=target)
|
|
||||||
thread.daemon = True
|
|
||||||
thread.start()
|
|
||||||
|
|
||||||
for a in range(attempts):
|
|
||||||
try:
|
|
||||||
if os.environ.get("ENABLE_TIMEOUT_ASSERTION"):
|
|
||||||
result = result_queue.get(timeout=seconds)
|
|
||||||
else:
|
|
||||||
result = result_queue.get()
|
|
||||||
if isinstance(result, Exception):
|
|
||||||
raise result
|
|
||||||
return result
|
|
||||||
except queue.Empty:
|
|
||||||
pass
|
|
||||||
raise TimeoutError(f"Function '{func.__name__}' timed out after {seconds} seconds and {attempts} attempts.")
|
|
||||||
|
|
||||||
@wraps(func)
|
|
||||||
async def async_wrapper(*args, **kwargs) -> Any:
|
|
||||||
if seconds is None:
|
|
||||||
return await func(*args, **kwargs)
|
|
||||||
|
|
||||||
for a in range(attempts):
|
|
||||||
try:
|
|
||||||
if os.environ.get("ENABLE_TIMEOUT_ASSERTION"):
|
|
||||||
with trio.fail_after(seconds):
|
|
||||||
return await func(*args, **kwargs)
|
|
||||||
else:
|
|
||||||
return await func(*args, **kwargs)
|
|
||||||
except trio.TooSlowError:
|
|
||||||
if a < attempts - 1:
|
|
||||||
continue
|
|
||||||
if on_timeout is not None:
|
|
||||||
if callable(on_timeout):
|
|
||||||
result = on_timeout()
|
|
||||||
if isinstance(result, Coroutine):
|
|
||||||
return await result
|
|
||||||
return result
|
|
||||||
return on_timeout
|
|
||||||
|
|
||||||
if exception is None:
|
|
||||||
raise TimeoutError(f"Operation timed out after {seconds} seconds and {attempts} attempts.")
|
|
||||||
|
|
||||||
if isinstance(exception, BaseException):
|
|
||||||
raise exception
|
|
||||||
|
|
||||||
if isinstance(exception, type) and issubclass(exception, BaseException):
|
|
||||||
raise exception(f"Operation timed out after {seconds} seconds and {attempts} attempts.")
|
|
||||||
|
|
||||||
raise RuntimeError("Invalid exception type provided")
|
|
||||||
|
|
||||||
if asyncio.iscoroutinefunction(func):
|
|
||||||
return async_wrapper
|
|
||||||
return wrapper
|
|
||||||
|
|
||||||
return decorator
|
|
||||||
|
|
||||||
|
|
||||||
async def is_strong_enough(chat_model, embedding_model):
|
async def is_strong_enough(chat_model, embedding_model):
|
||||||
count = settings.STRONG_TEST_COUNT
|
count = settings.STRONG_TEST_COUNT
|
||||||
|
|||||||
101
common/connection_utils.py
Normal file
101
common/connection_utils.py
Normal file
@ -0,0 +1,101 @@
|
|||||||
|
#
|
||||||
|
# Copyright 2025 The InfiniFlow Authors. All Rights Reserved.
|
||||||
|
#
|
||||||
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
# you may not use this file except in compliance with the License.
|
||||||
|
# You may obtain a copy of the License at
|
||||||
|
#
|
||||||
|
# http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
#
|
||||||
|
# Unless required by applicable law or agreed to in writing, software
|
||||||
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
# See the License for the specific language governing permissions and
|
||||||
|
# limitations under the License.
|
||||||
|
#
|
||||||
|
|
||||||
|
import os
|
||||||
|
import queue
|
||||||
|
import threading
|
||||||
|
from typing import Any, Callable, Coroutine, Optional, Type, Union
|
||||||
|
import asyncio
|
||||||
|
import trio
|
||||||
|
from functools import wraps
|
||||||
|
|
||||||
|
TimeoutException = Union[Type[BaseException], BaseException]
|
||||||
|
OnTimeoutCallback = Union[Callable[..., Any], Coroutine[Any, Any, Any]]
|
||||||
|
|
||||||
|
|
||||||
|
def timeout(seconds: float | int | str = None, attempts: int = 2, *, exception: Optional[TimeoutException] = None,
|
||||||
|
on_timeout: Optional[OnTimeoutCallback] = None):
|
||||||
|
if isinstance(seconds, str):
|
||||||
|
seconds = float(seconds)
|
||||||
|
|
||||||
|
def decorator(func):
|
||||||
|
@wraps(func)
|
||||||
|
def wrapper(*args, **kwargs):
|
||||||
|
result_queue = queue.Queue(maxsize=1)
|
||||||
|
|
||||||
|
def target():
|
||||||
|
try:
|
||||||
|
result = func(*args, **kwargs)
|
||||||
|
result_queue.put(result)
|
||||||
|
except Exception as e:
|
||||||
|
result_queue.put(e)
|
||||||
|
|
||||||
|
thread = threading.Thread(target=target)
|
||||||
|
thread.daemon = True
|
||||||
|
thread.start()
|
||||||
|
|
||||||
|
for a in range(attempts):
|
||||||
|
try:
|
||||||
|
if os.environ.get("ENABLE_TIMEOUT_ASSERTION"):
|
||||||
|
result = result_queue.get(timeout=seconds)
|
||||||
|
else:
|
||||||
|
result = result_queue.get()
|
||||||
|
if isinstance(result, Exception):
|
||||||
|
raise result
|
||||||
|
return result
|
||||||
|
except queue.Empty:
|
||||||
|
pass
|
||||||
|
raise TimeoutError(f"Function '{func.__name__}' timed out after {seconds} seconds and {attempts} attempts.")
|
||||||
|
|
||||||
|
@wraps(func)
|
||||||
|
async def async_wrapper(*args, **kwargs) -> Any:
|
||||||
|
if seconds is None:
|
||||||
|
return await func(*args, **kwargs)
|
||||||
|
|
||||||
|
for a in range(attempts):
|
||||||
|
try:
|
||||||
|
if os.environ.get("ENABLE_TIMEOUT_ASSERTION"):
|
||||||
|
with trio.fail_after(seconds):
|
||||||
|
return await func(*args, **kwargs)
|
||||||
|
else:
|
||||||
|
return await func(*args, **kwargs)
|
||||||
|
except trio.TooSlowError:
|
||||||
|
if a < attempts - 1:
|
||||||
|
continue
|
||||||
|
if on_timeout is not None:
|
||||||
|
if callable(on_timeout):
|
||||||
|
result = on_timeout()
|
||||||
|
if isinstance(result, Coroutine):
|
||||||
|
return await result
|
||||||
|
return result
|
||||||
|
return on_timeout
|
||||||
|
|
||||||
|
if exception is None:
|
||||||
|
raise TimeoutError(f"Operation timed out after {seconds} seconds and {attempts} attempts.")
|
||||||
|
|
||||||
|
if isinstance(exception, BaseException):
|
||||||
|
raise exception
|
||||||
|
|
||||||
|
if isinstance(exception, type) and issubclass(exception, BaseException):
|
||||||
|
raise exception(f"Operation timed out after {seconds} seconds and {attempts} attempts.")
|
||||||
|
|
||||||
|
raise RuntimeError("Invalid exception type provided")
|
||||||
|
|
||||||
|
if asyncio.iscoroutinefunction(func):
|
||||||
|
return async_wrapper
|
||||||
|
return wrapper
|
||||||
|
|
||||||
|
return decorator
|
||||||
@ -19,7 +19,7 @@ from PIL import Image
|
|||||||
|
|
||||||
from api.db import LLMType
|
from api.db import LLMType
|
||||||
from api.db.services.llm_service import LLMBundle
|
from api.db.services.llm_service import LLMBundle
|
||||||
from api.utils.api_utils import timeout
|
from common.connection_utils import timeout
|
||||||
from rag.app.picture import vision_llm_chunk as picture_vision_llm_chunk
|
from rag.app.picture import vision_llm_chunk as picture_vision_llm_chunk
|
||||||
from rag.prompts.generator import vision_llm_figure_describe_prompt
|
from rag.prompts.generator import vision_llm_figure_describe_prompt
|
||||||
|
|
||||||
|
|||||||
@ -14,7 +14,7 @@ from dataclasses import dataclass
|
|||||||
import networkx as nx
|
import networkx as nx
|
||||||
import pandas as pd
|
import pandas as pd
|
||||||
|
|
||||||
from api.utils.api_utils import timeout
|
from common.connection_utils import timeout
|
||||||
from graphrag.general import leiden
|
from graphrag.general import leiden
|
||||||
from graphrag.general.community_report_prompt import COMMUNITY_REPORT_PROMPT
|
from graphrag.general.community_report_prompt import COMMUNITY_REPORT_PROMPT
|
||||||
from graphrag.general.extractor import Extractor
|
from graphrag.general.extractor import Extractor
|
||||||
|
|||||||
@ -23,7 +23,7 @@ from typing import Callable
|
|||||||
import networkx as nx
|
import networkx as nx
|
||||||
import trio
|
import trio
|
||||||
|
|
||||||
from api.utils.api_utils import timeout
|
from common.connection_utils import timeout
|
||||||
from graphrag.general.graph_prompt import SUMMARIZE_DESCRIPTIONS_PROMPT
|
from graphrag.general.graph_prompt import SUMMARIZE_DESCRIPTIONS_PROMPT
|
||||||
from graphrag.utils import (
|
from graphrag.utils import (
|
||||||
GraphChange,
|
GraphChange,
|
||||||
|
|||||||
@ -23,7 +23,7 @@ import trio
|
|||||||
from api import settings
|
from api import settings
|
||||||
from api.db.services.document_service import DocumentService
|
from api.db.services.document_service import DocumentService
|
||||||
from common.misc_utils import get_uuid
|
from common.misc_utils import get_uuid
|
||||||
from api.utils.api_utils import timeout
|
from common.connection_utils import timeout
|
||||||
from graphrag.entity_resolution import EntityResolution
|
from graphrag.entity_resolution import EntityResolution
|
||||||
from graphrag.general.community_reports_extractor import CommunityReportsExtractor
|
from graphrag.general.community_reports_extractor import CommunityReportsExtractor
|
||||||
from graphrag.general.extractor import Extractor
|
from graphrag.general.extractor import Extractor
|
||||||
|
|||||||
@ -25,7 +25,7 @@ from networkx.readwrite import json_graph
|
|||||||
|
|
||||||
from api import settings
|
from api import settings
|
||||||
from common.misc_utils import get_uuid
|
from common.misc_utils import get_uuid
|
||||||
from api.utils.api_utils import timeout
|
from common.connection_utils import timeout
|
||||||
from rag.nlp import rag_tokenizer, search
|
from rag.nlp import rag_tokenizer, search
|
||||||
from rag.utils.doc_store_conn import OrderByExpr
|
from rag.utils.doc_store_conn import OrderByExpr
|
||||||
from rag.utils.redis_conn import REDIS_CONN
|
from rag.utils.redis_conn import REDIS_CONN
|
||||||
|
|||||||
@ -20,7 +20,7 @@ from functools import partial
|
|||||||
from typing import Any
|
from typing import Any
|
||||||
import trio
|
import trio
|
||||||
from agent.component.base import ComponentBase, ComponentParamBase
|
from agent.component.base import ComponentBase, ComponentParamBase
|
||||||
from api.utils.api_utils import timeout
|
from common.connection_utils import timeout
|
||||||
|
|
||||||
|
|
||||||
class ProcessParamBase(ComponentParamBase):
|
class ProcessParamBase(ComponentParamBase):
|
||||||
|
|||||||
@ -23,7 +23,7 @@ from api.db import LLMType
|
|||||||
from api.db.services.knowledgebase_service import KnowledgebaseService
|
from api.db.services.knowledgebase_service import KnowledgebaseService
|
||||||
from api.db.services.llm_service import LLMBundle
|
from api.db.services.llm_service import LLMBundle
|
||||||
from api.db.services.user_service import TenantService
|
from api.db.services.user_service import TenantService
|
||||||
from api.utils.api_utils import timeout
|
from common.connection_utils import timeout
|
||||||
from rag.flow.base import ProcessBase, ProcessParamBase
|
from rag.flow.base import ProcessBase, ProcessParamBase
|
||||||
from rag.flow.tokenizer.schema import TokenizerFromUpstream
|
from rag.flow.tokenizer.schema import TokenizerFromUpstream
|
||||||
from rag.nlp import rag_tokenizer
|
from rag.nlp import rag_tokenizer
|
||||||
|
|||||||
@ -20,7 +20,7 @@ import numpy as np
|
|||||||
from sklearn.mixture import GaussianMixture
|
from sklearn.mixture import GaussianMixture
|
||||||
import trio
|
import trio
|
||||||
|
|
||||||
from api.utils.api_utils import timeout
|
from common.connection_utils import timeout
|
||||||
from graphrag.utils import (
|
from graphrag.utils import (
|
||||||
get_llm_cache,
|
get_llm_cache,
|
||||||
get_embed_cache,
|
get_embed_cache,
|
||||||
|
|||||||
@ -26,7 +26,7 @@ import json_repair
|
|||||||
from api.db.services.canvas_service import UserCanvasService
|
from api.db.services.canvas_service import UserCanvasService
|
||||||
from api.db.services.knowledgebase_service import KnowledgebaseService
|
from api.db.services.knowledgebase_service import KnowledgebaseService
|
||||||
from api.db.services.pipeline_operation_log_service import PipelineOperationLogService
|
from api.db.services.pipeline_operation_log_service import PipelineOperationLogService
|
||||||
from api.utils.api_utils import timeout
|
from common.connection_utils import timeout
|
||||||
from common.base64_image import image2id
|
from common.base64_image import image2id
|
||||||
from common.log_utils import init_root_logger
|
from common.log_utils import init_root_logger
|
||||||
from common.file_utils import get_project_base_directory
|
from common.file_utils import get_project_base_directory
|
||||||
|
|||||||
Reference in New Issue
Block a user