Merge branch 'feat/model-runtime' into deploy/dev

langgenius · Jan 2, 2024 · d558a8d · d558a8d
2 parents 293e0b4 + 7777c34
commit d558a8d
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/api/core/model_runtime/model_providers/openai_api_compatible/_common.py b/api/core/model_runtime/model_providers/openai_api_compatible/_common.py
@@ -1,5 +1,11 @@
+from decimal import Decimal
 import requests
 
+from core.model_runtime.entities.common_entities import I18nObject
+from core.model_runtime.entities.llm_entities import LLMMode
+from core.model_runtime.entities.model_entities import AIModelEntity, DefaultParameterName, \
+      FetchFrom, ModelPropertyKey, ModelType, ParameterRule, ParameterType, PriceConfig
+
 from core.model_runtime.errors.invoke import InvokeConnectionError, InvokeServerUnavailableError, \
       InvokeRateLimitError, InvokeAuthorizationError, InvokeBadRequestError, InvokeError
 
@@ -35,8 +41,6 @@ def _invoke_error_mapping(self) -> dict[type[InvokeError], list[type[Exception]]
                 requests.exceptions.ReadTimeout  # Timeout
             ]
         }
-<<<<<<< Updated upstream
-=======
 
     def get_customizable_model_schema(self, model: str, credentials: dict) -> AIModelEntity:
         """
@@ -120,4 +124,3 @@ def get_customizable_model_schema(self, model: str, credentials: dict) -> AIMode
                 raise ValueError(f"Unknown completion type {credentials['completion_type']}")
 
         return entity
->>>>>>> Stashed changes