AI/dify
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/langgenius/dify.git synced 2025-08-20 05:19:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Yeuoly 2024-11-22 18:19:02 +08:00
parent cfa7c89dfe
commit e63ae36665
No known key found for this signature in database
GPG Key ID: A66E7E320FB19F61
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/core/model_manager.py
View File

@ -235,7 +235,7 @@ class ModelInstance:
model=self.model, model=self.model,
credentials=self.credentials, credentials=self.credentials,
texts=texts, texts=texts,
) )[0] # TODO: fix this, this is only for temporary compatibility with old
def invoke_rerank( def invoke_rerank(
self, self,

10
api/core/plugin/entities/plugin_daemon.py
View File

@ -71,7 +71,7 @@ class PluginModelProviderEntity(BaseModel):
declaration: ProviderEntity = Field(description="The declaration of the model provider.") declaration: ProviderEntity = Field(description="The declaration of the model provider.")
class PluginNumTokensResponse(BaseModel): class PluginTextEmbeddingNumTokensResponse(BaseModel):
""" """
Response for number of tokens. Response for number of tokens.
""" """
@ -79,6 +79,14 @@ class PluginNumTokensResponse(BaseModel):
num_tokens: list[int] = Field(description="The number of tokens.") num_tokens: list[int] = Field(description="The number of tokens.")
class PluginLLMNumTokensResponse(BaseModel):
"""
Response for number of tokens.
"""
num_tokens: int = Field(description="The number of tokens.")
class PluginStringResultResponse(BaseModel): class PluginStringResultResponse(BaseModel):
result: str = Field(description="The result of the string.") result: str = Field(description="The result of the string.")

7
api/core/plugin/manager/model.py
View File

@ -11,10 +11,11 @@ from core.model_runtime.utils.encoders import jsonable_encoder
from core.plugin.entities.plugin_daemon import ( from core.plugin.entities.plugin_daemon import (
PluginBasicBooleanResponse, PluginBasicBooleanResponse,
PluginDaemonInnerError, PluginDaemonInnerError,
PluginLLMNumTokensResponse,
PluginModelProviderEntity, PluginModelProviderEntity,
PluginModelSchemaEntity, PluginModelSchemaEntity,
PluginNumTokensResponse,
PluginStringResultResponse, PluginStringResultResponse,
PluginTextEmbeddingNumTokensResponse,
PluginVoicesResponse, PluginVoicesResponse,
) )
from core.plugin.manager.base import BasePluginManager from core.plugin.manager.base import BasePluginManager
@ -201,7 +202,7 @@ class PluginModelManager(BasePluginManager):
response = self._request_with_plugin_daemon_response_stream( response = self._request_with_plugin_daemon_response_stream(
method="POST", method="POST",
path=f"plugin/{tenant_id}/dispatch/llm/num_tokens", path=f"plugin/{tenant_id}/dispatch/llm/num_tokens",
type=PluginNumTokensResponse, type=PluginLLMNumTokensResponse,
data=jsonable_encoder( data=jsonable_encoder(
{ {
"user_id": user_id, "user_id": user_id,
@ -284,7 +285,7 @@ class PluginModelManager(BasePluginManager):
response = self._request_with_plugin_daemon_response_stream( response = self._request_with_plugin_daemon_response_stream(
method="POST", method="POST",
path=f"plugin/{tenant_id}/dispatch/text_embedding/num_tokens", path=f"plugin/{tenant_id}/dispatch/text_embedding/num_tokens",
type=PluginNumTokensResponse, type=PluginTextEmbeddingNumTokensResponse,
data=jsonable_encoder( data=jsonable_encoder(
{ {
"user_id": user_id, "user_id": user_id,