Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

refactor: support volcanic engine embeddings #2006

Merged
merged 1 commit into from
Jan 10, 2025
Merged

refactor: support volcanic engine embeddings #2006

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/setting/models_provider/impl/volcanic_engine_model_provider/credential/embedding.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
from setting.models_provider.base_model_provider import BaseModelCredential, ValidCode


class OpenAIEmbeddingCredential(BaseForm, BaseModelCredential):
class VolcanicEmbeddingCredential(BaseForm, BaseModelCredential):
def is_valid(self, model_type: str, model_name, model_credential: Dict[str, object], model_params, provider,
raise_exception=True):
model_type_list = provider.get_model_type_list()
Expand Down
7 changes: 4 additions & 3 deletions apps/setting/models_provider/impl/volcanic_engine_model_provider/model/embedding.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
from typing import Dict

from langchain_community.embeddings import VolcanoEmbeddings
from langchain_openai import OpenAIEmbeddings

from setting.models_provider.base_model_provider import MaxKBBaseModel


class VolcanicEngineEmbeddingModel(MaxKBBaseModel, VolcanoEmbeddings):
class VolcanicEngineEmbeddingModel(MaxKBBaseModel, OpenAIEmbeddings):
@staticmethod
def new_instance(model_type, model_name, model_credential: Dict[str, object], **model_kwargs):
return VolcanicEngineEmbeddingModel(
api_key=model_credential.get('api_key'),
openai_api_key=model_credential.get('api_key'),
model=model_name,
openai_api_base=model_credential.get('api_base'),
check_embedding_ctx_length=False,
)
9 changes: 7 additions & 2 deletions ...ing/models_provider/impl/volcanic_engine_model_provider/volcanic_engine_model_provider.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,12 @@
from setting.models_provider.impl.openai_model_provider.credential.embedding import OpenAIEmbeddingCredential
from setting.models_provider.impl.openai_model_provider.credential.llm import OpenAILLMModelCredential
from setting.models_provider.impl.openai_model_provider.model.embedding import OpenAIEmbeddingModel
from setting.models_provider.impl.volcanic_engine_model_provider.credential.embedding import VolcanicEmbeddingCredential
from setting.models_provider.impl.volcanic_engine_model_provider.credential.image import \
VolcanicEngineImageModelCredential
from setting.models_provider.impl.volcanic_engine_model_provider.credential.tti import VolcanicEngineTTIModelCredential
from setting.models_provider.impl.volcanic_engine_model_provider.credential.tts import VolcanicEngineTTSModelCredential
from setting.models_provider.impl.volcanic_engine_model_provider.model.embedding import VolcanicEngineEmbeddingModel
from setting.models_provider.impl.volcanic_engine_model_provider.model.image import VolcanicEngineImage
from setting.models_provider.impl.volcanic_engine_model_provider.model.llm import VolcanicEngineChatModel
from setting.models_provider.impl.volcanic_engine_model_provider.credential.stt import VolcanicEngineSTTModelCredential
Expand Down Expand Up @@ -81,12 +83,13 @@
),
]

open_ai_embedding_credential = OpenAIEmbeddingCredential()
open_ai_embedding_credential = VolcanicEmbeddingCredential()
model_info_embedding_list = [
ModelInfo('ep-xxxxxxxxxx-yyyy',
'用户前往火山方舟的模型推理页面创建推理接入点，这里需要输入ep-xxxxxxxxxx-yyyy进行调用',
ModelTypeConst.EMBEDDING, open_ai_embedding_credential,
OpenAIEmbeddingModel)]
VolcanicEngineEmbeddingModel)
]

model_info_manage = (
ModelInfoManage.builder()
Expand All @@ -96,6 +99,8 @@
.append_default_model_info(model_info_list[2])
.append_default_model_info(model_info_list[3])
.append_default_model_info(model_info_list[4])
.append_model_info_list(model_info_embedding_list)
.append_default_model_info(model_info_embedding_list[0])
.build()
)

Expand Down
Loading