mirror of
https://github.com/langgenius/dify.git
synced 2026-04-29 04:26:30 +08:00
fix(api): fix variable truncation related field not returned.
This commit is contained in:
parent
617dc247f5
commit
e2ff7fac77
@ -10,6 +10,10 @@ from controllers.console import api
|
|||||||
from controllers.console.app.error import (
|
from controllers.console.app.error import (
|
||||||
DraftWorkflowNotExist,
|
DraftWorkflowNotExist,
|
||||||
)
|
)
|
||||||
|
from controllers.console.app.workflow_draft_variable import (
|
||||||
|
_WORKFLOW_DRAFT_VARIABLE_FIELDS,
|
||||||
|
_WORKFLOW_DRAFT_VARIABLE_WITHOUT_VALUE_FIELDS,
|
||||||
|
)
|
||||||
from controllers.console.datasets.wraps import get_rag_pipeline
|
from controllers.console.datasets.wraps import get_rag_pipeline
|
||||||
from controllers.console.wraps import account_initialization_required, setup_required
|
from controllers.console.wraps import account_initialization_required, setup_required
|
||||||
from controllers.web.error import InvalidArgumentError, NotFoundError
|
from controllers.web.error import InvalidArgumentError, NotFoundError
|
||||||
@ -70,38 +74,6 @@ def _create_pagination_parser():
|
|||||||
return parser
|
return parser
|
||||||
|
|
||||||
|
|
||||||
_WORKFLOW_DRAFT_VARIABLE_WITHOUT_VALUE_FIELDS = {
|
|
||||||
"id": fields.String,
|
|
||||||
"type": fields.String(attribute=lambda model: model.get_variable_type()),
|
|
||||||
"name": fields.String,
|
|
||||||
"description": fields.String,
|
|
||||||
"selector": fields.List(fields.String, attribute=lambda model: model.get_selector()),
|
|
||||||
"value_type": fields.String,
|
|
||||||
"edited": fields.Boolean(attribute=lambda model: model.edited),
|
|
||||||
"visible": fields.Boolean,
|
|
||||||
}
|
|
||||||
|
|
||||||
_WORKFLOW_DRAFT_VARIABLE_FIELDS = dict(
|
|
||||||
_WORKFLOW_DRAFT_VARIABLE_WITHOUT_VALUE_FIELDS,
|
|
||||||
value=fields.Raw(attribute=_serialize_var_value),
|
|
||||||
)
|
|
||||||
|
|
||||||
_WORKFLOW_DRAFT_ENV_VARIABLE_FIELDS = {
|
|
||||||
"id": fields.String,
|
|
||||||
"type": fields.String(attribute=lambda _: "env"),
|
|
||||||
"name": fields.String,
|
|
||||||
"description": fields.String,
|
|
||||||
"selector": fields.List(fields.String, attribute=lambda model: model.get_selector()),
|
|
||||||
"value_type": fields.String,
|
|
||||||
"edited": fields.Boolean(attribute=lambda model: model.edited),
|
|
||||||
"visible": fields.Boolean,
|
|
||||||
}
|
|
||||||
|
|
||||||
_WORKFLOW_DRAFT_ENV_VARIABLE_LIST_FIELDS = {
|
|
||||||
"items": fields.List(fields.Nested(_WORKFLOW_DRAFT_ENV_VARIABLE_FIELDS)),
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
def _get_items(var_list: WorkflowDraftVariableList) -> list[WorkflowDraftVariable]:
|
def _get_items(var_list: WorkflowDraftVariableList) -> list[WorkflowDraftVariable]:
|
||||||
return var_list.variables
|
return var_list.variables
|
||||||
|
|
||||||
|
|||||||
@ -984,6 +984,7 @@ class RagPipelineDatasourceVariableApi(Resource):
|
|||||||
)
|
)
|
||||||
return workflow_node_execution
|
return workflow_node_execution
|
||||||
|
|
||||||
|
|
||||||
class RagPipelineRecommendedPluginApi(Resource):
|
class RagPipelineRecommendedPluginApi(Resource):
|
||||||
@setup_required
|
@setup_required
|
||||||
@login_required
|
@login_required
|
||||||
@ -993,6 +994,7 @@ class RagPipelineRecommendedPluginApi(Resource):
|
|||||||
recommended_plugins = rag_pipeline_service.get_recommended_plugins()
|
recommended_plugins = rag_pipeline_service.get_recommended_plugins()
|
||||||
return recommended_plugins
|
return recommended_plugins
|
||||||
|
|
||||||
|
|
||||||
api.add_resource(
|
api.add_resource(
|
||||||
DraftRagPipelineApi,
|
DraftRagPipelineApi,
|
||||||
"/rag/pipelines/<uuid:pipeline_id>/workflows/draft",
|
"/rag/pipelines/<uuid:pipeline_id>/workflows/draft",
|
||||||
@ -1105,4 +1107,4 @@ api.add_resource(
|
|||||||
api.add_resource(
|
api.add_resource(
|
||||||
RagPipelineRecommendedPluginApi,
|
RagPipelineRecommendedPluginApi,
|
||||||
"/rag/pipelines/recommended-plugins",
|
"/rag/pipelines/recommended-plugins",
|
||||||
)
|
)
|
||||||
|
|||||||
@ -1307,4 +1307,3 @@ class RagPipelineService:
|
|||||||
"installed_recommended_plugins": installed_plugin_list,
|
"installed_recommended_plugins": installed_plugin_list,
|
||||||
"uninstalled_recommended_plugins": uninstalled_plugin_list,
|
"uninstalled_recommended_plugins": uninstalled_plugin_list,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user