python3.8兼容

model-providers/model_providers/core/model_runtime/model_providers/cohere/llm/llm.py

@@ -1,5 +1,5 @@
 import logging
-from collections.abc import Generator
+from typing import Generator
 from typing import Dict, List, Optional, Type, Union, cast
 
 import cohere

model-providers/model_providers/core/model_runtime/model_providers/deepseek/llm/llm.py

@@ -1,5 +1,5 @@
 import logging
-from collections.abc import Generator
+from typing import Generator
 from typing import List, Optional, Union, cast
 from decimal import Decimal
 

model-providers/model_providers/core/model_runtime/model_providers/minimax/llm/llm.py

@@ -1,4 +1,4 @@
-from collections.abc import Generator
+from typing import Generator
 
 from model_providers.core.model_runtime.entities.llm_entities import (
     LLMResult,

model-providers/model_providers/core/model_runtime/model_providers/moonshot/llm/llm.py

@@ -1,4 +1,4 @@
-from collections.abc import Generator
+from typing import Generator
 from typing import List, Optional, Union
 
 from model_providers.core.model_runtime.entities.llm_entities import LLMResult

model-providers/model_providers/core/model_runtime/model_providers/ollama/llm/llm.py

@@ -1,5 +1,5 @@
 import logging
-from collections.abc import Generator
+from typing import Generator
 from typing import List, Optional, Union, cast
 from decimal import Decimal
 

model-providers/model_providers/core/model_runtime/model_providers/openai/llm/llm.py

@@ -1,5 +1,5 @@
 import logging
-from collections.abc import Generator
+from typing import Generator
 from typing import List, Optional, Union, cast
 
 import tiktoken

model-providers/model_providers/core/model_runtime/model_providers/openai_api_compatible/llm/llm.py

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

model-providers/model_providers/core/model_runtime/model_providers/openllm/llm/openllm_generate.py

@@ -1,4 +1,4 @@
-from collections.abc import Generator
+from typing import Generator
 from enum import Enum
 from json import dumps, loads
 from typing import Any, Union

model-providers/model_providers/core/model_runtime/model_providers/spark/llm/llm.py

@@ -1,5 +1,5 @@
 import threading
-from collections.abc import Generator
+from typing import Generator
 from typing import Dict, List, Optional, Type, Union
 
 from model_providers.core.model_runtime.entities.llm_entities import (

model-providers/model_providers/core/model_runtime/model_providers/togetherai/llm/llm.py

@@ -1,4 +1,4 @@
-from collections.abc import Generator
+from typing import Generator
 from typing import List, Optional, Union
 
 from model_providers.core.model_runtime.entities.llm_entities import LLMResult

model-providers/model_providers/core/model_runtime/model_providers/tongyi/llm/llm.py

@@ -1,4 +1,4 @@
-from collections.abc import Generator
+from typing import Generator
 from typing import Dict, List, Optional, Type, Union
 
 from dashscope import get_tokenizer

model-providers/model_providers/core/model_runtime/model_providers/xinference/llm/llm.py

@@ -1,4 +1,5 @@
-from collections.abc import Generator, Iterator
+from typing import Generator, Iterator
+
 from typing import Dict, List, Union, cast, Type
 
 from openai import (
@@ -464,7 +465,7 @@ class XinferenceAILargeLanguageModel(LargeLanguageModel):
             ]
 
         if isinstance(
-            xinference_model, RESTfulChatModelHandle | RESTfulChatglmCppChatModelHandle
+            xinference_model, (RESTfulChatModelHandle, RESTfulChatglmCppChatModelHandle)
         ):
             resp = client.chat.completions.create(
                 model=credentials["model_uid"],

model-providers/model_providers/core/model_runtime/utils/encoders.py

@@ -15,7 +15,7 @@ from ipaddress import (
 from pathlib import Path, PurePath
 from re import Pattern
 from types import GeneratorType
-from typing import Any, Optional, Union
+from typing import Any, Optional, Union, Dict, Type, List, Tuple
 from uuid import UUID
 
 from pydantic import BaseModel
@@ -54,7 +54,7 @@ def decimal_encoder(dec_value: Decimal) -> Union[int, float]:
         return float(dec_value)
 
 
-ENCODERS_BY_TYPE: Dict[type[Any], Callable[[Any], Any]] = {
+ENCODERS_BY_TYPE: Dict[Type[Any], Callable[[Any], Any]] = {
     bytes: lambda o: o.decode(),
     Color: str,
     datetime.date: isoformat,
@@ -86,8 +86,8 @@ ENCODERS_BY_TYPE: Dict[type[Any], Callable[[Any], Any]] = {
 
 def generate_encoders_by_class_tuples(
     type_encoder_map: Dict[Any, Callable[[Any], Any]],
-) -> Dict[Callable[[Any], Any], tuple[Any, ...]]:
+) -> Dict[Callable[[Any], Any], Tuple[Any, ...]]:
-    encoders_by_class_tuples: Dict[Callable[[Any], Any], tuple[Any, ...]] = defaultdict(
+    encoders_by_class_tuples: Dict[Callable[[Any], Any], Tuple[Any, ...]] = defaultdict(
         tuple
     )
     for type_, encoder in type_encoder_map.items():
@@ -104,7 +104,7 @@ def jsonable_encoder(
     exclude_unset: bool = False,
     exclude_defaults: bool = False,
     exclude_none: bool = False,
-    custom_encoder: Optional[dict[Any, Callable[[Any], Any]]] = None,
+    custom_encoder: Optional[Dict[Any, Callable[[Any], Any]]] = None,
     sqlalchemy_safe: bool = True,
 ) -> Any:
     custom_encoder = custom_encoder or {}
@@ -192,7 +192,7 @@ def jsonable_encoder(
                 )
                 encoded_dict[encoded_key] = encoded_value
         return encoded_dict
-    if isinstance(obj, list | set | frozenset | GeneratorType | tuple | deque):
+    if isinstance(obj, (list, set, frozenset, GeneratorType, tuple, deque)):
         encoded_list = []
         for item in obj:
             encoded_list.append(
@@ -217,8 +217,7 @@ def jsonable_encoder(
     try:
         data = dict(obj)
     except Exception as e:
-        errors: List[Exception] = []
+        errors: List[Exception] = [e]
-        errors.append(e)
         try:
             data = vars(obj)
         except Exception as e:

model-providers/model_providers/extensions/ext_storage.py

@@ -1,6 +1,6 @@
 import os
 import shutil
-from collections.abc import Generator
+from typing import Generator
 from contextlib import closing
 from typing import Union