This commit is contained in:
glide-the 2024-04-16 11:14:10 +08:00
parent 6f20d8d623
commit 99a2be6970
33 changed files with 39 additions and 36 deletions

View File

@ -1,5 +1,5 @@
from abc import abstractmethod 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.entities.model_entities import ModelType
from model_providers.core.model_runtime.model_providers.__base.ai_model import AIModel from model_providers.core.model_runtime.model_providers.__base.ai_model import AIModel

View File

@ -1,6 +1,6 @@
import base64 import base64
import mimetypes 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 anthropic
import requests import requests

View File

@ -1,4 +1,4 @@
from typing import Dict, Type, List from typing import Dict, List, Type
import openai import openai
from httpx import Timeout from httpx import Timeout

View File

@ -1,6 +1,6 @@
import copy import copy
import logging import logging
from typing import Optional, Union, cast, List, Generator from typing import Generator, List, Optional, Union, cast
import tiktoken import tiktoken
from openai import AzureOpenAI, Stream from openai import AzureOpenAI, Stream
@ -544,7 +544,9 @@ class AzureOpenAILargeLanguageModel(_CommonAzureOpenAI, LargeLanguageModel):
@staticmethod @staticmethod
def _extract_response_tool_calls( def _extract_response_tool_calls(
response_tool_calls: List[Union[ChatCompletionMessageToolCall, ChoiceDeltaToolCall]], response_tool_calls: List[
Union[ChatCompletionMessageToolCall, ChoiceDeltaToolCall]
],
) -> List[AssistantPromptMessage.ToolCall]: ) -> List[AssistantPromptMessage.ToolCall]:
tool_calls = [] tool_calls = []
if response_tool_calls: if response_tool_calls:

View File

@ -1,7 +1,7 @@
import base64 import base64
import copy import copy
import time import time
from typing import Optional, Union, List from typing import List, Optional, Union
import numpy as np import numpy as np
import tiktoken import tiktoken

View File

@ -1,7 +1,7 @@
from enum import Enum from enum import Enum
from hashlib import md5 from hashlib import md5
from json import dumps, loads 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 from requests import post

View File

@ -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 ( from model_providers.core.model_runtime.entities.llm_entities import (
LLMResult, LLMResult,

View File

@ -1,6 +1,6 @@
import logging import logging
from collections.abc import Generator 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 import cohere
from cohere.responses import Chat, Generations from cohere.responses import Chat, Generations

View File

@ -1,4 +1,4 @@
from typing import Optional, List, Dict, Type from typing import Dict, List, Optional, Type
import cohere import cohere

View File

@ -1,6 +1,6 @@
import json import json
import logging 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.api_core.exceptions as exceptions
import google.generativeai as genai import google.generativeai as genai
@ -471,7 +471,6 @@ class GoogleLargeLanguageModel(LargeLanguageModel):
""" """
tool_call = None tool_call = None
if response_function_call: if response_function_call:
if isinstance(response_function_call, FunctionCall): if isinstance(response_function_call, FunctionCall):
map_composite_dict = dict(response_function_call.args.items()) map_composite_dict = dict(response_function_call.args.items())
function = AssistantPromptMessage.ToolCall.ToolCallFunction( function = AssistantPromptMessage.ToolCall.ToolCallFunction(

View File

@ -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.llm_entities import LLMResult
from model_providers.core.model_runtime.entities.message_entities import ( from model_providers.core.model_runtime.entities.message_entities import (

View File

@ -1,4 +1,4 @@
from typing import Dict, Type, List from typing import Dict, List, Type
from huggingface_hub.utils import BadRequestError, HfHubHTTPError from huggingface_hub.utils import BadRequestError, HfHubHTTPError

View File

@ -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 import InferenceClient
from huggingface_hub.hf_api import HfApi from huggingface_hub.hf_api import HfApi

View File

@ -1,6 +1,6 @@
import json import json
import time import time
from typing import Optional, List from typing import List, Optional
import numpy as np import numpy as np
import requests import requests

View File

@ -1,4 +1,4 @@
from typing import Optional, List, Dict, Type from typing import Dict, List, Optional, Type
import httpx import httpx

View File

@ -1,6 +1,6 @@
import time import time
from json import JSONDecodeError, dumps from json import JSONDecodeError, dumps
from typing import Optional, List, Dict, Type from typing import Dict, List, Optional, Type
from requests import post from requests import post

View File

@ -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 httpx import Timeout
from openai import ( from openai import (

View File

@ -1,6 +1,6 @@
import time import time
from json import JSONDecodeError, dumps 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 requests import post
from yarl import URL from yarl import URL

View File

@ -1,5 +1,5 @@
from json import dumps, loads 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 from requests import Response, post

View File

@ -1,5 +1,5 @@
from json import dumps, loads 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 from requests import Response, post

View File

@ -1,6 +1,6 @@
import time import time
from json import dumps from json import dumps
from typing import Optional, List, Dict, Type from typing import Dict, List, Optional, Type
from requests import post from requests import post

View File

@ -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.llm_entities import LLMResult
from model_providers.core.model_runtime.entities.message_entities import ( from model_providers.core.model_runtime.entities.message_entities import (

View File

@ -1,5 +1,5 @@
from collections.abc import Generator 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.llm_entities import LLMResult
from model_providers.core.model_runtime.entities.message_entities import ( from model_providers.core.model_runtime.entities.message_entities import (

View File

@ -3,7 +3,7 @@ import logging
import re import re
from collections.abc import Generator from collections.abc import Generator
from decimal import Decimal 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 from urllib.parse import urljoin
import requests import requests

View File

@ -2,7 +2,7 @@ import json
import logging import logging
import time import time
from decimal import Decimal from decimal import Decimal
from typing import Optional, List, Dict, Type from typing import Dict, List, Optional, Type
from urllib.parse import urljoin from urllib.parse import urljoin
import numpy as np import numpy as np

View File

@ -1,4 +1,4 @@
from typing import Dict, Type, List from typing import Dict, List, Type
import openai import openai
from httpx import Timeout from httpx import Timeout

View File

@ -1,6 +1,6 @@
import logging import logging
from collections.abc import Generator from collections.abc import Generator
from typing import Optional, Union, cast, List from typing import List, Optional, Union, cast
import tiktoken import tiktoken
from openai import OpenAI, Stream from openai import OpenAI, Stream
@ -851,7 +851,9 @@ class OpenAILargeLanguageModel(_CommonOpenAI, LargeLanguageModel):
def _extract_response_tool_calls( def _extract_response_tool_calls(
self, self,
response_tool_calls: List[Union[ChatCompletionMessageToolCall, ChoiceDeltaToolCall]], response_tool_calls: List[
Union[ChatCompletionMessageToolCall, ChoiceDeltaToolCall]
],
) -> List[AssistantPromptMessage.ToolCall]: ) -> List[AssistantPromptMessage.ToolCall]:
""" """
Extract tool calls from response Extract tool calls from response

View File

@ -1,4 +1,4 @@
from typing import Optional, List from typing import List, Optional
from openai import OpenAI from openai import OpenAI
from openai.types import ModerationCreateResponse from openai.types import ModerationCreateResponse

View File

@ -1,6 +1,6 @@
import base64 import base64
import time import time
from typing import Optional, Union, List, Tuple from typing import List, Optional, Tuple, Union
import numpy as np import numpy as np
import tiktoken import tiktoken

View File

@ -1,4 +1,4 @@
from typing import Dict, Type, List from typing import Dict, List, Type
import requests import requests

View File

@ -2,7 +2,7 @@ import json
import logging import logging
from collections.abc import Generator from collections.abc import Generator
from decimal import Decimal from decimal import Decimal
from typing import Optional, Union, cast, List from typing import List, Optional, Union, cast
from urllib.parse import urljoin from urllib.parse import urljoin
import requests import requests

View File

@ -1,7 +1,7 @@
import json import json
import time import time
from decimal import Decimal from decimal import Decimal
from typing import Optional, List from typing import List, Optional
from urllib.parse import urljoin from urllib.parse import urljoin
import numpy as np import numpy as np

View File

@ -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.common_entities import I18nObject
from model_providers.core.model_runtime.entities.llm_entities import ( from model_providers.core.model_runtime.entities.llm_entities import (