From 99a2be697035491644e53ef2a8499fc0bb3811a1 Mon Sep 17 00:00:00 2001 From: glide-the <2533736852@qq.com> Date: Tue, 16 Apr 2024 11:14:10 +0800 Subject: [PATCH] formater --- .../model_runtime/model_providers/__base/text2img_model.py | 2 +- .../core/model_runtime/model_providers/anthropic/llm/llm.py | 2 +- .../model_runtime/model_providers/azure_openai/_common.py | 2 +- .../model_runtime/model_providers/azure_openai/llm/llm.py | 6 ++++-- .../azure_openai/text_embedding/text_embedding.py | 2 +- .../model_providers/baichuan/llm/baichuan_turbo.py | 2 +- .../core/model_runtime/model_providers/baichuan/llm/llm.py | 2 +- .../core/model_runtime/model_providers/cohere/llm/llm.py | 2 +- .../model_runtime/model_providers/cohere/rerank/rerank.py | 2 +- .../core/model_runtime/model_providers/google/llm/llm.py | 3 +-- .../core/model_runtime/model_providers/groq/llm/llm.py | 2 +- .../model_providers/huggingface_hub/_common.py | 2 +- .../model_providers/huggingface_hub/llm/llm.py | 2 +- .../huggingface_hub/text_embedding/text_embedding.py | 2 +- .../model_runtime/model_providers/jina/rerank/rerank.py | 2 +- .../model_providers/jina/text_embedding/text_embedding.py | 2 +- .../core/model_runtime/model_providers/localai/llm/llm.py | 2 +- .../localai/text_embedding/text_embedding.py | 2 +- .../model_providers/minimax/llm/chat_completion.py | 2 +- .../model_providers/minimax/llm/chat_completion_pro.py | 2 +- .../minimax/text_embedding/text_embedding.py | 2 +- .../core/model_runtime/model_providers/mistralai/llm/llm.py | 2 +- .../core/model_runtime/model_providers/moonshot/llm/llm.py | 2 +- .../core/model_runtime/model_providers/ollama/llm/llm.py | 2 +- .../model_providers/ollama/text_embedding/text_embedding.py | 2 +- .../core/model_runtime/model_providers/openai/_common.py | 2 +- .../core/model_runtime/model_providers/openai/llm/llm.py | 6 ++++-- .../model_providers/openai/moderation/moderation.py | 2 +- .../model_providers/openai/text_embedding/text_embedding.py | 2 +- .../model_providers/openai_api_compatible/_common.py | 2 +- .../model_providers/openai_api_compatible/llm/llm.py | 2 +- .../openai_api_compatible/text_embedding/text_embedding.py | 2 +- .../core/model_runtime/model_providers/openllm/llm/llm.py | 2 +- 33 files changed, 39 insertions(+), 36 deletions(-) diff --git a/model-providers/model_providers/core/model_runtime/model_providers/__base/text2img_model.py b/model-providers/model_providers/core/model_runtime/model_providers/__base/text2img_model.py index c411b547..4eab10fc 100644 --- a/model-providers/model_providers/core/model_runtime/model_providers/__base/text2img_model.py +++ b/model-providers/model_providers/core/model_runtime/model_providers/__base/text2img_model.py @@ -1,5 +1,5 @@ from abc import abstractmethod -from typing import IO, Optional, List +from typing import IO, List, Optional from model_providers.core.model_runtime.entities.model_entities import ModelType from model_providers.core.model_runtime.model_providers.__base.ai_model import AIModel diff --git a/model-providers/model_providers/core/model_runtime/model_providers/anthropic/llm/llm.py b/model-providers/model_providers/core/model_runtime/model_providers/anthropic/llm/llm.py index e13e3b06..df3308f5 100644 --- a/model-providers/model_providers/core/model_runtime/model_providers/anthropic/llm/llm.py +++ b/model-providers/model_providers/core/model_runtime/model_providers/anthropic/llm/llm.py @@ -1,6 +1,6 @@ import base64 import mimetypes -from typing import Optional, Union, cast, Generator, List, Dict, Type +from typing import Dict, Generator, List, Optional, Type, Union, cast import anthropic import requests diff --git a/model-providers/model_providers/core/model_runtime/model_providers/azure_openai/_common.py b/model-providers/model_providers/core/model_runtime/model_providers/azure_openai/_common.py index 92bf471d..b09f51a2 100644 --- a/model-providers/model_providers/core/model_runtime/model_providers/azure_openai/_common.py +++ b/model-providers/model_providers/core/model_runtime/model_providers/azure_openai/_common.py @@ -1,4 +1,4 @@ -from typing import Dict, Type, List +from typing import Dict, List, Type import openai from httpx import Timeout diff --git a/model-providers/model_providers/core/model_runtime/model_providers/azure_openai/llm/llm.py b/model-providers/model_providers/core/model_runtime/model_providers/azure_openai/llm/llm.py index e1b1b6f0..5da71d39 100644 --- a/model-providers/model_providers/core/model_runtime/model_providers/azure_openai/llm/llm.py +++ b/model-providers/model_providers/core/model_runtime/model_providers/azure_openai/llm/llm.py @@ -1,6 +1,6 @@ import copy import logging -from typing import Optional, Union, cast, List, Generator +from typing import Generator, List, Optional, Union, cast import tiktoken from openai import AzureOpenAI, Stream @@ -544,7 +544,9 @@ class AzureOpenAILargeLanguageModel(_CommonAzureOpenAI, LargeLanguageModel): @staticmethod def _extract_response_tool_calls( - response_tool_calls: List[Union[ChatCompletionMessageToolCall, ChoiceDeltaToolCall]], + response_tool_calls: List[ + Union[ChatCompletionMessageToolCall, ChoiceDeltaToolCall] + ], ) -> List[AssistantPromptMessage.ToolCall]: tool_calls = [] if response_tool_calls: diff --git a/model-providers/model_providers/core/model_runtime/model_providers/azure_openai/text_embedding/text_embedding.py b/model-providers/model_providers/core/model_runtime/model_providers/azure_openai/text_embedding/text_embedding.py index 6bd4c0f6..22a2ba5a 100644 --- a/model-providers/model_providers/core/model_runtime/model_providers/azure_openai/text_embedding/text_embedding.py +++ b/model-providers/model_providers/core/model_runtime/model_providers/azure_openai/text_embedding/text_embedding.py @@ -1,7 +1,7 @@ import base64 import copy import time -from typing import Optional, Union, List +from typing import List, Optional, Union import numpy as np import tiktoken diff --git a/model-providers/model_providers/core/model_runtime/model_providers/baichuan/llm/baichuan_turbo.py b/model-providers/model_providers/core/model_runtime/model_providers/baichuan/llm/baichuan_turbo.py index 95c822f4..94d7a392 100644 --- a/model-providers/model_providers/core/model_runtime/model_providers/baichuan/llm/baichuan_turbo.py +++ b/model-providers/model_providers/core/model_runtime/model_providers/baichuan/llm/baichuan_turbo.py @@ -1,7 +1,7 @@ from enum import Enum from hashlib import md5 from json import dumps, loads -from typing import Any, Union, Dict, List, Generator +from typing import Any, Dict, Generator, List, Union from requests import post diff --git a/model-providers/model_providers/core/model_runtime/model_providers/baichuan/llm/llm.py b/model-providers/model_providers/core/model_runtime/model_providers/baichuan/llm/llm.py index 14231d73..d2c116c0 100644 --- a/model-providers/model_providers/core/model_runtime/model_providers/baichuan/llm/llm.py +++ b/model-providers/model_providers/core/model_runtime/model_providers/baichuan/llm/llm.py @@ -1,4 +1,4 @@ -from typing import cast, Generator, List, Union, Dict, Type +from typing import Dict, Generator, List, Type, Union, cast from model_providers.core.model_runtime.entities.llm_entities import ( LLMResult, diff --git a/model-providers/model_providers/core/model_runtime/model_providers/cohere/llm/llm.py b/model-providers/model_providers/core/model_runtime/model_providers/cohere/llm/llm.py index 98612345..fde1a2a1 100644 --- a/model-providers/model_providers/core/model_runtime/model_providers/cohere/llm/llm.py +++ b/model-providers/model_providers/core/model_runtime/model_providers/cohere/llm/llm.py @@ -1,6 +1,6 @@ import logging from collections.abc import Generator -from typing import Optional, Union, cast, List, Dict, Type +from typing import Dict, List, Optional, Type, Union, cast import cohere from cohere.responses import Chat, Generations diff --git a/model-providers/model_providers/core/model_runtime/model_providers/cohere/rerank/rerank.py b/model-providers/model_providers/core/model_runtime/model_providers/cohere/rerank/rerank.py index d07ffe8e..4cf159c1 100644 --- a/model-providers/model_providers/core/model_runtime/model_providers/cohere/rerank/rerank.py +++ b/model-providers/model_providers/core/model_runtime/model_providers/cohere/rerank/rerank.py @@ -1,4 +1,4 @@ -from typing import Optional, List, Dict, Type +from typing import Dict, List, Optional, Type import cohere diff --git a/model-providers/model_providers/core/model_runtime/model_providers/google/llm/llm.py b/model-providers/model_providers/core/model_runtime/model_providers/google/llm/llm.py index c8a52ed7..36b35ca6 100644 --- a/model-providers/model_providers/core/model_runtime/model_providers/google/llm/llm.py +++ b/model-providers/model_providers/core/model_runtime/model_providers/google/llm/llm.py @@ -1,6 +1,6 @@ import json import logging -from typing import Optional, Union, Generator, List, Dict, Type +from typing import Dict, Generator, List, Optional, Type, Union import google.api_core.exceptions as exceptions import google.generativeai as genai @@ -471,7 +471,6 @@ class GoogleLargeLanguageModel(LargeLanguageModel): """ tool_call = None if response_function_call: - if isinstance(response_function_call, FunctionCall): map_composite_dict = dict(response_function_call.args.items()) function = AssistantPromptMessage.ToolCall.ToolCallFunction( diff --git a/model-providers/model_providers/core/model_runtime/model_providers/groq/llm/llm.py b/model-providers/model_providers/core/model_runtime/model_providers/groq/llm/llm.py index 0c63d759..e0ca7ade 100644 --- a/model-providers/model_providers/core/model_runtime/model_providers/groq/llm/llm.py +++ b/model-providers/model_providers/core/model_runtime/model_providers/groq/llm/llm.py @@ -1,4 +1,4 @@ -from typing import Optional, Union, List, Generator +from typing import Generator, List, Optional, Union from model_providers.core.model_runtime.entities.llm_entities import LLMResult from model_providers.core.model_runtime.entities.message_entities import ( diff --git a/model-providers/model_providers/core/model_runtime/model_providers/huggingface_hub/_common.py b/model-providers/model_providers/core/model_runtime/model_providers/huggingface_hub/_common.py index a11d6c74..bc87e2ce 100644 --- a/model-providers/model_providers/core/model_runtime/model_providers/huggingface_hub/_common.py +++ b/model-providers/model_providers/core/model_runtime/model_providers/huggingface_hub/_common.py @@ -1,4 +1,4 @@ -from typing import Dict, Type, List +from typing import Dict, List, Type from huggingface_hub.utils import BadRequestError, HfHubHTTPError diff --git a/model-providers/model_providers/core/model_runtime/model_providers/huggingface_hub/llm/llm.py b/model-providers/model_providers/core/model_runtime/model_providers/huggingface_hub/llm/llm.py index fdfad9ae..585a19d5 100644 --- a/model-providers/model_providers/core/model_runtime/model_providers/huggingface_hub/llm/llm.py +++ b/model-providers/model_providers/core/model_runtime/model_providers/huggingface_hub/llm/llm.py @@ -1,4 +1,4 @@ -from typing import Optional, Union, List, Generator +from typing import Generator, List, Optional, Union from huggingface_hub import InferenceClient from huggingface_hub.hf_api import HfApi diff --git a/model-providers/model_providers/core/model_runtime/model_providers/huggingface_hub/text_embedding/text_embedding.py b/model-providers/model_providers/core/model_runtime/model_providers/huggingface_hub/text_embedding/text_embedding.py index 0d85ab57..8afaff1e 100644 --- a/model-providers/model_providers/core/model_runtime/model_providers/huggingface_hub/text_embedding/text_embedding.py +++ b/model-providers/model_providers/core/model_runtime/model_providers/huggingface_hub/text_embedding/text_embedding.py @@ -1,6 +1,6 @@ import json import time -from typing import Optional, List +from typing import List, Optional import numpy as np import requests diff --git a/model-providers/model_providers/core/model_runtime/model_providers/jina/rerank/rerank.py b/model-providers/model_providers/core/model_runtime/model_providers/jina/rerank/rerank.py index 7af979e8..90147dea 100644 --- a/model-providers/model_providers/core/model_runtime/model_providers/jina/rerank/rerank.py +++ b/model-providers/model_providers/core/model_runtime/model_providers/jina/rerank/rerank.py @@ -1,4 +1,4 @@ -from typing import Optional, List, Dict, Type +from typing import Dict, List, Optional, Type import httpx diff --git a/model-providers/model_providers/core/model_runtime/model_providers/jina/text_embedding/text_embedding.py b/model-providers/model_providers/core/model_runtime/model_providers/jina/text_embedding/text_embedding.py index 0cacbf73..52a95881 100644 --- a/model-providers/model_providers/core/model_runtime/model_providers/jina/text_embedding/text_embedding.py +++ b/model-providers/model_providers/core/model_runtime/model_providers/jina/text_embedding/text_embedding.py @@ -1,6 +1,6 @@ import time from json import JSONDecodeError, dumps -from typing import Optional, List, Dict, Type +from typing import Dict, List, Optional, Type from requests import post diff --git a/model-providers/model_providers/core/model_runtime/model_providers/localai/llm/llm.py b/model-providers/model_providers/core/model_runtime/model_providers/localai/llm/llm.py index 6375595f..b359df99 100644 --- a/model-providers/model_providers/core/model_runtime/model_providers/localai/llm/llm.py +++ b/model-providers/model_providers/core/model_runtime/model_providers/localai/llm/llm.py @@ -1,4 +1,4 @@ -from typing import cast, List, Union, Dict, Type, Generator +from typing import Dict, Generator, List, Type, Union, cast from httpx import Timeout from openai import ( diff --git a/model-providers/model_providers/core/model_runtime/model_providers/localai/text_embedding/text_embedding.py b/model-providers/model_providers/core/model_runtime/model_providers/localai/text_embedding/text_embedding.py index 41522010..5823ebc9 100644 --- a/model-providers/model_providers/core/model_runtime/model_providers/localai/text_embedding/text_embedding.py +++ b/model-providers/model_providers/core/model_runtime/model_providers/localai/text_embedding/text_embedding.py @@ -1,6 +1,6 @@ import time from json import JSONDecodeError, dumps -from typing import Optional, List, Union, Dict, Type +from typing import Dict, List, Optional, Type, Union from requests import post from yarl import URL diff --git a/model-providers/model_providers/core/model_runtime/model_providers/minimax/llm/chat_completion.py b/model-providers/model_providers/core/model_runtime/model_providers/minimax/llm/chat_completion.py index f73876ee..8a6df376 100644 --- a/model-providers/model_providers/core/model_runtime/model_providers/minimax/llm/chat_completion.py +++ b/model-providers/model_providers/core/model_runtime/model_providers/minimax/llm/chat_completion.py @@ -1,5 +1,5 @@ from json import dumps, loads -from typing import Any, Union, Generator, List, Dict +from typing import Any, Dict, Generator, List, Union from requests import Response, post diff --git a/model-providers/model_providers/core/model_runtime/model_providers/minimax/llm/chat_completion_pro.py b/model-providers/model_providers/core/model_runtime/model_providers/minimax/llm/chat_completion_pro.py index 34e0857e..8643d33e 100644 --- a/model-providers/model_providers/core/model_runtime/model_providers/minimax/llm/chat_completion_pro.py +++ b/model-providers/model_providers/core/model_runtime/model_providers/minimax/llm/chat_completion_pro.py @@ -1,5 +1,5 @@ from json import dumps, loads -from typing import Any, Union, List, Dict, Generator +from typing import Any, Dict, Generator, List, Union from requests import Response, post diff --git a/model-providers/model_providers/core/model_runtime/model_providers/minimax/text_embedding/text_embedding.py b/model-providers/model_providers/core/model_runtime/model_providers/minimax/text_embedding/text_embedding.py index 8832ea71..9974d585 100644 --- a/model-providers/model_providers/core/model_runtime/model_providers/minimax/text_embedding/text_embedding.py +++ b/model-providers/model_providers/core/model_runtime/model_providers/minimax/text_embedding/text_embedding.py @@ -1,6 +1,6 @@ import time from json import dumps -from typing import Optional, List, Dict, Type +from typing import Dict, List, Optional, Type from requests import post diff --git a/model-providers/model_providers/core/model_runtime/model_providers/mistralai/llm/llm.py b/model-providers/model_providers/core/model_runtime/model_providers/mistralai/llm/llm.py index 6a3cf428..948d308a 100644 --- a/model-providers/model_providers/core/model_runtime/model_providers/mistralai/llm/llm.py +++ b/model-providers/model_providers/core/model_runtime/model_providers/mistralai/llm/llm.py @@ -1,4 +1,4 @@ -from typing import Optional, Union, List, Generator +from typing import Generator, List, Optional, Union from model_providers.core.model_runtime.entities.llm_entities import LLMResult from model_providers.core.model_runtime.entities.message_entities import ( diff --git a/model-providers/model_providers/core/model_runtime/model_providers/moonshot/llm/llm.py b/model-providers/model_providers/core/model_runtime/model_providers/moonshot/llm/llm.py index 027f00cd..8bd0f500 100644 --- a/model-providers/model_providers/core/model_runtime/model_providers/moonshot/llm/llm.py +++ b/model-providers/model_providers/core/model_runtime/model_providers/moonshot/llm/llm.py @@ -1,5 +1,5 @@ from collections.abc import Generator -from typing import Optional, Union, List +from typing import List, Optional, Union from model_providers.core.model_runtime.entities.llm_entities import LLMResult from model_providers.core.model_runtime.entities.message_entities import ( diff --git a/model-providers/model_providers/core/model_runtime/model_providers/ollama/llm/llm.py b/model-providers/model_providers/core/model_runtime/model_providers/ollama/llm/llm.py index b9ac688b..3ce6f73f 100644 --- a/model-providers/model_providers/core/model_runtime/model_providers/ollama/llm/llm.py +++ b/model-providers/model_providers/core/model_runtime/model_providers/ollama/llm/llm.py @@ -3,7 +3,7 @@ import logging import re from collections.abc import Generator from decimal import Decimal -from typing import Optional, Union, cast, List, Dict, Type +from typing import Dict, List, Optional, Type, Union, cast from urllib.parse import urljoin import requests diff --git a/model-providers/model_providers/core/model_runtime/model_providers/ollama/text_embedding/text_embedding.py b/model-providers/model_providers/core/model_runtime/model_providers/ollama/text_embedding/text_embedding.py index bc8d7185..15a8911a 100644 --- a/model-providers/model_providers/core/model_runtime/model_providers/ollama/text_embedding/text_embedding.py +++ b/model-providers/model_providers/core/model_runtime/model_providers/ollama/text_embedding/text_embedding.py @@ -2,7 +2,7 @@ import json import logging import time from decimal import Decimal -from typing import Optional, List, Dict, Type +from typing import Dict, List, Optional, Type from urllib.parse import urljoin import numpy as np diff --git a/model-providers/model_providers/core/model_runtime/model_providers/openai/_common.py b/model-providers/model_providers/core/model_runtime/model_providers/openai/_common.py index 41464c68..b6f3ee40 100644 --- a/model-providers/model_providers/core/model_runtime/model_providers/openai/_common.py +++ b/model-providers/model_providers/core/model_runtime/model_providers/openai/_common.py @@ -1,4 +1,4 @@ -from typing import Dict, Type, List +from typing import Dict, List, Type import openai from httpx import Timeout diff --git a/model-providers/model_providers/core/model_runtime/model_providers/openai/llm/llm.py b/model-providers/model_providers/core/model_runtime/model_providers/openai/llm/llm.py index 33f34bdd..230ad76e 100644 --- a/model-providers/model_providers/core/model_runtime/model_providers/openai/llm/llm.py +++ b/model-providers/model_providers/core/model_runtime/model_providers/openai/llm/llm.py @@ -1,6 +1,6 @@ import logging from collections.abc import Generator -from typing import Optional, Union, cast, List +from typing import List, Optional, Union, cast import tiktoken from openai import OpenAI, Stream @@ -851,7 +851,9 @@ class OpenAILargeLanguageModel(_CommonOpenAI, LargeLanguageModel): def _extract_response_tool_calls( self, - response_tool_calls: List[Union[ChatCompletionMessageToolCall, ChoiceDeltaToolCall]], + response_tool_calls: List[ + Union[ChatCompletionMessageToolCall, ChoiceDeltaToolCall] + ], ) -> List[AssistantPromptMessage.ToolCall]: """ Extract tool calls from response diff --git a/model-providers/model_providers/core/model_runtime/model_providers/openai/moderation/moderation.py b/model-providers/model_providers/core/model_runtime/model_providers/openai/moderation/moderation.py index 69d5c810..3797e815 100644 --- a/model-providers/model_providers/core/model_runtime/model_providers/openai/moderation/moderation.py +++ b/model-providers/model_providers/core/model_runtime/model_providers/openai/moderation/moderation.py @@ -1,4 +1,4 @@ -from typing import Optional, List +from typing import List, Optional from openai import OpenAI from openai.types import ModerationCreateResponse diff --git a/model-providers/model_providers/core/model_runtime/model_providers/openai/text_embedding/text_embedding.py b/model-providers/model_providers/core/model_runtime/model_providers/openai/text_embedding/text_embedding.py index 04db0f63..f502b544 100644 --- a/model-providers/model_providers/core/model_runtime/model_providers/openai/text_embedding/text_embedding.py +++ b/model-providers/model_providers/core/model_runtime/model_providers/openai/text_embedding/text_embedding.py @@ -1,6 +1,6 @@ import base64 import time -from typing import Optional, Union, List, Tuple +from typing import List, Optional, Tuple, Union import numpy as np import tiktoken diff --git a/model-providers/model_providers/core/model_runtime/model_providers/openai_api_compatible/_common.py b/model-providers/model_providers/core/model_runtime/model_providers/openai_api_compatible/_common.py index e7c259fd..3abbff45 100644 --- a/model-providers/model_providers/core/model_runtime/model_providers/openai_api_compatible/_common.py +++ b/model-providers/model_providers/core/model_runtime/model_providers/openai_api_compatible/_common.py @@ -1,4 +1,4 @@ -from typing import Dict, Type, List +from typing import Dict, List, Type import requests diff --git a/model-providers/model_providers/core/model_runtime/model_providers/openai_api_compatible/llm/llm.py b/model-providers/model_providers/core/model_runtime/model_providers/openai_api_compatible/llm/llm.py index c365b769..014008dd 100644 --- a/model-providers/model_providers/core/model_runtime/model_providers/openai_api_compatible/llm/llm.py +++ b/model-providers/model_providers/core/model_runtime/model_providers/openai_api_compatible/llm/llm.py @@ -2,7 +2,7 @@ import json import logging from collections.abc import Generator from decimal import Decimal -from typing import Optional, Union, cast, List +from typing import List, Optional, Union, cast from urllib.parse import urljoin import requests diff --git a/model-providers/model_providers/core/model_runtime/model_providers/openai_api_compatible/text_embedding/text_embedding.py b/model-providers/model_providers/core/model_runtime/model_providers/openai_api_compatible/text_embedding/text_embedding.py index c6f1bd78..fcf13f62 100644 --- a/model-providers/model_providers/core/model_runtime/model_providers/openai_api_compatible/text_embedding/text_embedding.py +++ b/model-providers/model_providers/core/model_runtime/model_providers/openai_api_compatible/text_embedding/text_embedding.py @@ -1,7 +1,7 @@ import json import time from decimal import Decimal -from typing import Optional, List +from typing import List, Optional from urllib.parse import urljoin import numpy as np diff --git a/model-providers/model_providers/core/model_runtime/model_providers/openllm/llm/llm.py b/model-providers/model_providers/core/model_runtime/model_providers/openllm/llm/llm.py index 812f304a..04c46075 100644 --- a/model-providers/model_providers/core/model_runtime/model_providers/openllm/llm/llm.py +++ b/model-providers/model_providers/core/model_runtime/model_providers/openllm/llm/llm.py @@ -1,4 +1,4 @@ -from typing import List, Union, Type, Dict, Generator +from typing import Dict, Generator, List, Type, Union from model_providers.core.model_runtime.entities.common_entities import I18nObject from model_providers.core.model_runtime.entities.llm_entities import (