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

fix: bugs

Browse Source
This commit is contained in:
Yeuoly 2025-01-06 14:59:40 +08:00
parent 5f51a19de2
commit d2ff8a2381
2 changed files with 62 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/commands.py
View File

@ -695,7 +695,7 @@ def extract_unique_plugins(output_file: str, input_file: str):
""" """
click.echo(click.style("Starting extract unique plugins.", fg="white")) click.echo(click.style("Starting extract unique plugins.", fg="white"))
PluginMigration.extract_unique_plugins(input_file, output_file) PluginMigration.extract_unique_plugins_to_file(input_file, output_file)
click.echo(click.style("Extract unique plugins completed.", fg="green")) click.echo(click.style("Extract unique plugins completed.", fg="green"))

49
api/controllers/inner_api/plugin/plugin.py
View File

@ -5,6 +5,7 @@ from controllers.inner_api import api
from controllers.inner_api.plugin.wraps import get_user_tenant, plugin_data from controllers.inner_api.plugin.wraps import get_user_tenant, plugin_data
from controllers.inner_api.wraps import plugin_inner_api_only from controllers.inner_api.wraps import plugin_inner_api_only
from core.file.helpers import get_signed_file_url_for_plugin from core.file.helpers import get_signed_file_url_for_plugin
from core.model_runtime.utils.encoders import jsonable_encoder
from core.plugin.backwards_invocation.app import PluginAppBackwardsInvocation from core.plugin.backwards_invocation.app import PluginAppBackwardsInvocation
from core.plugin.backwards_invocation.base import BaseBackwardsInvocationResponse from core.plugin.backwards_invocation.base import BaseBackwardsInvocationResponse
from core.plugin.backwards_invocation.encrypt import PluginEncrypter from core.plugin.backwards_invocation.encrypt import PluginEncrypter
@ -52,15 +53,17 @@ class PluginInvokeTextEmbeddingApi(Resource):
@plugin_data(payload_type=RequestInvokeTextEmbedding) @plugin_data(payload_type=RequestInvokeTextEmbedding)
def post(self, user_model: Account | EndUser, tenant_model: Tenant, payload: RequestInvokeTextEmbedding): def post(self, user_model: Account | EndUser, tenant_model: Tenant, payload: RequestInvokeTextEmbedding):
try: try:
return BaseBackwardsInvocationResponse( return jsonable_encoder(
BaseBackwardsInvocationResponse(
data=PluginModelBackwardsInvocation.invoke_text_embedding( data=PluginModelBackwardsInvocation.invoke_text_embedding(
user_id=user_model.id, user_id=user_model.id,
tenant=tenant_model, tenant=tenant_model,
payload=payload, payload=payload,
) )
).model_dump() )
)
except Exception as e: except Exception as e:
return BaseBackwardsInvocationResponse(error=str(e)).model_dump() return jsonable_encoder(BaseBackwardsInvocationResponse(error=str(e)))
class PluginInvokeRerankApi(Resource): class PluginInvokeRerankApi(Resource):
@ -70,15 +73,17 @@ class PluginInvokeRerankApi(Resource):
@plugin_data(payload_type=RequestInvokeRerank) @plugin_data(payload_type=RequestInvokeRerank)
def post(self, user_model: Account | EndUser, tenant_model: Tenant, payload: RequestInvokeRerank): def post(self, user_model: Account | EndUser, tenant_model: Tenant, payload: RequestInvokeRerank):
try: try:
return BaseBackwardsInvocationResponse( return jsonable_encoder(
BaseBackwardsInvocationResponse(
data=PluginModelBackwardsInvocation.invoke_rerank( data=PluginModelBackwardsInvocation.invoke_rerank(
user_id=user_model.id, user_id=user_model.id,
tenant=tenant_model, tenant=tenant_model,
payload=payload, payload=payload,
) )
).model_dump() )
)
except Exception as e: except Exception as e:
return BaseBackwardsInvocationResponse(error=str(e)).model_dump() return jsonable_encoder(BaseBackwardsInvocationResponse(error=str(e)))
class PluginInvokeTTSApi(Resource): class PluginInvokeTTSApi(Resource):
@ -105,15 +110,17 @@ class PluginInvokeSpeech2TextApi(Resource):
@plugin_data(payload_type=RequestInvokeSpeech2Text) @plugin_data(payload_type=RequestInvokeSpeech2Text)
def post(self, user_model: Account | EndUser, tenant_model: Tenant, payload: RequestInvokeSpeech2Text): def post(self, user_model: Account | EndUser, tenant_model: Tenant, payload: RequestInvokeSpeech2Text):
try: try:
return BaseBackwardsInvocationResponse( return jsonable_encoder(
BaseBackwardsInvocationResponse(
data=PluginModelBackwardsInvocation.invoke_speech2text( data=PluginModelBackwardsInvocation.invoke_speech2text(
user_id=user_model.id, user_id=user_model.id,
tenant=tenant_model, tenant=tenant_model,
payload=payload, payload=payload,
) )
).model_dump() )
)
except Exception as e: except Exception as e:
return BaseBackwardsInvocationResponse(error=str(e)).model_dump() return jsonable_encoder(BaseBackwardsInvocationResponse(error=str(e)))
class PluginInvokeModerationApi(Resource): class PluginInvokeModerationApi(Resource):
@ -123,15 +130,17 @@ class PluginInvokeModerationApi(Resource):
@plugin_data(payload_type=RequestInvokeModeration) @plugin_data(payload_type=RequestInvokeModeration)
def post(self, user_model: Account | EndUser, tenant_model: Tenant, payload: RequestInvokeModeration): def post(self, user_model: Account | EndUser, tenant_model: Tenant, payload: RequestInvokeModeration):
try: try:
return BaseBackwardsInvocationResponse( return jsonable_encoder(
BaseBackwardsInvocationResponse(
data=PluginModelBackwardsInvocation.invoke_moderation( data=PluginModelBackwardsInvocation.invoke_moderation(
user_id=user_model.id, user_id=user_model.id,
tenant=tenant_model, tenant=tenant_model,
payload=payload, payload=payload,
) )
).model_dump() )
)
except Exception as e: except Exception as e:
return BaseBackwardsInvocationResponse(error=str(e)).model_dump() return jsonable_encoder(BaseBackwardsInvocationResponse(error=str(e)))
class PluginInvokeToolApi(Resource): class PluginInvokeToolApi(Resource):
@ -162,7 +171,8 @@ class PluginInvokeParameterExtractorNodeApi(Resource):
@plugin_data(payload_type=RequestInvokeParameterExtractorNode) @plugin_data(payload_type=RequestInvokeParameterExtractorNode)
def post(self, user_model: Account | EndUser, tenant_model: Tenant, payload: RequestInvokeParameterExtractorNode): def post(self, user_model: Account | EndUser, tenant_model: Tenant, payload: RequestInvokeParameterExtractorNode):
try: try:
return BaseBackwardsInvocationResponse( return jsonable_encoder(
BaseBackwardsInvocationResponse(
data=PluginNodeBackwardsInvocation.invoke_parameter_extractor( data=PluginNodeBackwardsInvocation.invoke_parameter_extractor(
tenant_id=tenant_model.id, tenant_id=tenant_model.id,
user_id=user_model.id, user_id=user_model.id,
@ -171,9 +181,10 @@ class PluginInvokeParameterExtractorNodeApi(Resource):
instruction=payload.instruction, instruction=payload.instruction,
query=payload.query, query=payload.query,
) )
).model_dump() )
)
except Exception as e: except Exception as e:
return BaseBackwardsInvocationResponse(error=str(e)).model_dump() return jsonable_encoder(BaseBackwardsInvocationResponse(error=str(e)))
class PluginInvokeQuestionClassifierNodeApi(Resource): class PluginInvokeQuestionClassifierNodeApi(Resource):
@ -183,7 +194,8 @@ class PluginInvokeQuestionClassifierNodeApi(Resource):
@plugin_data(payload_type=RequestInvokeQuestionClassifierNode) @plugin_data(payload_type=RequestInvokeQuestionClassifierNode)
def post(self, user_model: Account | EndUser, tenant_model: Tenant, payload: RequestInvokeQuestionClassifierNode): def post(self, user_model: Account | EndUser, tenant_model: Tenant, payload: RequestInvokeQuestionClassifierNode):
try: try:
return BaseBackwardsInvocationResponse( return jsonable_encoder(
BaseBackwardsInvocationResponse(
data=PluginNodeBackwardsInvocation.invoke_question_classifier( data=PluginNodeBackwardsInvocation.invoke_question_classifier(
tenant_id=tenant_model.id, tenant_id=tenant_model.id,
user_id=user_model.id, user_id=user_model.id,
@ -192,9 +204,10 @@ class PluginInvokeQuestionClassifierNodeApi(Resource):
classes=payload.classes, classes=payload.classes,
instruction=payload.instruction, instruction=payload.instruction,
) )
).model_dump() )
)
except Exception as e: except Exception as e:
return BaseBackwardsInvocationResponse(error=str(e)).model_dump() return jsonable_encoder(BaseBackwardsInvocationResponse(error=str(e)))
class PluginInvokeAppApi(Resource): class PluginInvokeAppApi(Resource):