diff --git a/model-providers/chatchat_model_providers/__main__.py b/model-providers/chatchat_model_providers/__main__.py index 318b7e5f..a4ad57e7 100644 --- a/model-providers/chatchat_model_providers/__main__.py +++ b/model-providers/chatchat_model_providers/__main__.py @@ -11,7 +11,7 @@ if __name__ == '__main__': provider_manager = ModelManager( provider_name_to_provider_records_dict={ 'openai': { - 'openai_api_key': "sk- ", + 'openai_api_key': "sk-4M9LYF", } }, provider_name_to_provider_model_records_dict={} diff --git a/model-providers/chatchat_model_providers/core/entities/provider_configuration.py b/model-providers/chatchat_model_providers/core/entities/provider_configuration.py index 0b05635c..ad8326bf 100644 --- a/model-providers/chatchat_model_providers/core/entities/provider_configuration.py +++ b/model-providers/chatchat_model_providers/core/entities/provider_configuration.py @@ -7,18 +7,18 @@ from typing import Optional from pydantic import BaseModel -from model_providers.core.entities.model_entities import ModelStatus, ModelWithProviderEntity, SimpleModelProviderEntity -from model_providers.core.entities.provider_entities import CustomConfiguration -from model_providers.core.model_runtime.entities.model_entities import FetchFrom, ModelType -from model_providers.core.model_runtime.entities.provider_entities import ( +from chatchat_model_providers.core.entities.model_entities import ModelStatus, ModelWithProviderEntity, SimpleModelProviderEntity +from chatchat_model_providers.core.entities.provider_entities import CustomConfiguration +from chatchat_model_providers.core.model_runtime.entities.model_entities import FetchFrom, ModelType +from chatchat_model_providers.core.model_runtime.entities.provider_entities import ( ConfigurateMethod, CredentialFormSchema, FormType, ProviderEntity, ) -from model_providers.core.model_runtime.model_providers import model_provider_factory -from model_providers.core.model_runtime.model_providers.__base.ai_model import AIModel -from model_providers.core.model_runtime.model_providers.__base.model_provider import ModelProvider +from chatchat_model_providers.core.model_runtime.model_providers import model_provider_factory +from chatchat_model_providers.core.model_runtime.model_providers.__base.ai_model import AIModel +from chatchat_model_providers.core.model_runtime.model_providers.__base.model_provider import ModelProvider logger = logging.getLogger(__name__) diff --git a/model-providers/chatchat_model_providers/core/entities/provider_entities.py b/model-providers/chatchat_model_providers/core/entities/provider_entities.py index 715cf899..4b2dabb1 100644 --- a/model-providers/chatchat_model_providers/core/entities/provider_entities.py +++ b/model-providers/chatchat_model_providers/core/entities/provider_entities.py @@ -3,7 +3,7 @@ from typing import Optional from pydantic import BaseModel -from model_providers.core.model_runtime.entities.model_entities import ModelType +from chatchat_model_providers.core.model_runtime.entities.model_entities import ModelType class RestrictModel(BaseModel): diff --git a/model-providers/chatchat_model_providers/core/model_manager.py b/model-providers/chatchat_model_providers/core/model_manager.py index f7e9be10..d61d2916 100644 --- a/model-providers/chatchat_model_providers/core/model_manager.py +++ b/model-providers/chatchat_model_providers/core/model_manager.py @@ -1,21 +1,21 @@ from collections.abc import Generator from typing import IO, Optional, Union, cast -from model_providers.core.entities.provider_configuration import ProviderModelBundle -from model_providers.core.errors.error import ProviderTokenNotInitError -from model_providers.core.model_runtime.callbacks.base_callback import Callback -from model_providers.core.model_runtime.entities.llm_entities import LLMResult -from model_providers.core.model_runtime.entities.message_entities import PromptMessage, PromptMessageTool -from model_providers.core.model_runtime.entities.model_entities import ModelType -from model_providers.core.model_runtime.entities.rerank_entities import RerankResult -from model_providers.core.model_runtime.entities.text_embedding_entities import TextEmbeddingResult -from model_providers.core.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel -from model_providers.core.model_runtime.model_providers.__base.moderation_model import ModerationModel -from model_providers.core.model_runtime.model_providers.__base.rerank_model import RerankModel -from model_providers.core.model_runtime.model_providers.__base.speech2text_model import Speech2TextModel -from model_providers.core.model_runtime.model_providers.__base.text_embedding_model import TextEmbeddingModel -from model_providers.core.model_runtime.model_providers.__base.tts_model import TTSModel -from model_providers.core.provider_manager import ProviderManager +from chatchat_model_providers.core.entities.provider_configuration import ProviderModelBundle +from chatchat_model_providers.errors.error import ProviderTokenNotInitError +from chatchat_model_providers.core.model_runtime.callbacks.base_callback import Callback +from chatchat_model_providers.core.model_runtime.entities.llm_entities import LLMResult +from chatchat_model_providers.core.model_runtime.entities.message_entities import PromptMessage, PromptMessageTool +from chatchat_model_providers.core.model_runtime.entities.model_entities import ModelType +from chatchat_model_providers.core.model_runtime.entities.rerank_entities import RerankResult +from chatchat_model_providers.core.model_runtime.entities.text_embedding_entities import TextEmbeddingResult +from chatchat_model_providers.core.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel +from chatchat_model_providers.core.model_runtime.model_providers.__base.moderation_model import ModerationModel +from chatchat_model_providers.core.model_runtime.model_providers.__base.rerank_model import RerankModel +from chatchat_model_providers.core.model_runtime.model_providers.__base.speech2text_model import Speech2TextModel +from chatchat_model_providers.core.model_runtime.model_providers.__base.text_embedding_model import TextEmbeddingModel +from chatchat_model_providers.core.model_runtime.model_providers.__base.tts_model import TTSModel +from chatchat_model_providers.core.provider_manager import ProviderManager def _fetch_credentials_from_bundle(provider_model_bundle: ProviderModelBundle, model: str) -> dict: diff --git a/model-providers/chatchat_model_providers/core/provider_manager.py b/model-providers/chatchat_model_providers/core/provider_manager.py index a2016963..d18e9950 100644 --- a/model-providers/chatchat_model_providers/core/provider_manager.py +++ b/model-providers/chatchat_model_providers/core/provider_manager.py @@ -5,21 +5,21 @@ from typing import Optional from sqlalchemy.exc import IntegrityError -from model_providers.core.entities.model_entities import DefaultModelEntity, DefaultModelProviderEntity -from model_providers.core.entities.provider_configuration import ProviderConfiguration, ProviderConfigurations, \ +from chatchat_model_providers.core.entities.model_entities import DefaultModelEntity, DefaultModelProviderEntity +from chatchat_model_providers.core.entities.provider_configuration import ProviderConfiguration, ProviderConfigurations, \ ProviderModelBundle -from model_providers.core.entities.provider_entities import ( +from chatchat_model_providers.core.entities.provider_entities import ( CustomConfiguration, CustomModelConfiguration, CustomProviderConfiguration, ) -from model_providers.core.model_runtime.entities.model_entities import ModelType -from model_providers.core.model_runtime.entities.provider_entities import ( +from chatchat_model_providers.core.model_runtime.entities.model_entities import ModelType +from chatchat_model_providers.core.model_runtime.entities.provider_entities import ( CredentialFormSchema, FormType, ProviderEntity, ) -from model_providers.core.model_runtime.model_providers import model_provider_factory +from chatchat_model_providers.core.model_runtime.model_providers import model_provider_factory class ProviderManager: