From 48d4c547623b3a73df9e22be557c3fe573de2c91 Mon Sep 17 00:00:00 2001 From: FFXN Date: Mon, 30 Mar 2026 15:22:27 +0800 Subject: [PATCH] feat: snippet input_fields. --- api/controllers/console/evaluation/evaluation.py | 2 +- api/controllers/console/snippets/payloads.py | 2 +- api/controllers/console/snippets/snippet_workflow.py | 4 ++-- api/services/snippet_dsl_service.py | 6 +++--- api/services/snippet_generate_service.py | 2 +- api/services/snippet_service.py | 10 +++++----- api/tasks/evaluation_task.py | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/api/controllers/console/evaluation/evaluation.py b/api/controllers/console/evaluation/evaluation.py index 1767732f2e..12fa5f5a4b 100644 --- a/api/controllers/console/evaluation/evaluation.py +++ b/api/controllers/console/evaluation/evaluation.py @@ -21,9 +21,9 @@ from controllers.console.wraps import ( setup_required, ) from core.evaluation.entities.evaluation_entity import EvaluationCategory, EvaluationConfigData, EvaluationRunRequest -from graphon.file import helpers as file_helpers from extensions.ext_database import db from extensions.ext_storage import storage +from graphon.file import helpers as file_helpers from libs.helper import TimestampField from libs.login import current_account_with_tenant, login_required from models import App, Dataset diff --git a/api/controllers/console/snippets/payloads.py b/api/controllers/console/snippets/payloads.py index 2c7f8db81b..22a0aec998 100644 --- a/api/controllers/console/snippets/payloads.py +++ b/api/controllers/console/snippets/payloads.py @@ -73,7 +73,7 @@ class SnippetDraftSyncPayload(BaseModel): hash: str | None = None environment_variables: list[dict[str, Any]] | None = None conversation_variables: list[dict[str, Any]] | None = None - input_variables: list[dict[str, Any]] | None = None + input_fields: list[dict[str, Any]] | None = None class WorkflowRunQuery(BaseModel): diff --git a/api/controllers/console/snippets/snippet_workflow.py b/api/controllers/console/snippets/snippet_workflow.py index 48420ed544..01c5a69fad 100644 --- a/api/controllers/console/snippets/snippet_workflow.py +++ b/api/controllers/console/snippets/snippet_workflow.py @@ -34,10 +34,10 @@ from controllers.console.wraps import ( ) from core.app.apps.base_app_queue_manager import AppQueueManager from core.app.entities.app_invoke_entities import InvokeFrom -from graphon.graph_engine.manager import GraphEngineManager from extensions.ext_database import db from extensions.ext_redis import redis_client from factories import variable_factory +from graphon.graph_engine.manager import GraphEngineManager from libs import helper from libs.helper import TimestampField from libs.login import current_account_with_tenant, login_required @@ -151,7 +151,7 @@ class SnippetDraftWorkflowApi(Resource): account=current_user, environment_variables=environment_variables, conversation_variables=conversation_variables, - input_variables=payload.input_variables, + input_fields=payload.input_fields, ) except WorkflowHashNotEqualError: raise DraftWorkflowNotSync() diff --git a/api/services/snippet_dsl_service.py b/api/services/snippet_dsl_service.py index f4c0132337..505474e5a2 100644 --- a/api/services/snippet_dsl_service.py +++ b/api/services/snippet_dsl_service.py @@ -14,10 +14,10 @@ from sqlalchemy.orm import Session from core.helper import ssrf_proxy from core.plugin.entities.plugin import PluginDependency -from graphon.enums import BuiltinNodeTypes -from graphon.model_runtime.utils.encoders import jsonable_encoder from extensions.ext_redis import redis_client from factories import variable_factory +from graphon.enums import BuiltinNodeTypes +from graphon.model_runtime.utils.encoders import jsonable_encoder from models import Account from models.snippet import CustomizedSnippet, SnippetType from models.workflow import Workflow @@ -449,7 +449,7 @@ class SnippetDslService: account=account, environment_variables=environment_variables, conversation_variables=conversation_variables, - input_variables=input_fields, + input_fields=input_fields, ) self._session.commit() diff --git a/api/services/snippet_generate_service.py b/api/services/snippet_generate_service.py index 4075a708b7..5e0d25c8f7 100644 --- a/api/services/snippet_generate_service.py +++ b/api/services/snippet_generate_service.py @@ -28,8 +28,8 @@ from sqlalchemy.orm import make_transient from core.app.app_config.features.file_upload.manager import FileUploadConfigManager from core.app.apps.workflow.app_generator import WorkflowAppGenerator from core.app.entities.app_invoke_entities import InvokeFrom -from graphon.file.models import File from factories import file_factory +from graphon.file.models import File from models import Account from models.model import AppMode, EndUser from models.snippet import CustomizedSnippet diff --git a/api/services/snippet_service.py b/api/services/snippet_service.py index 8db57cf487..47bce144a9 100644 --- a/api/services/snippet_service.py +++ b/api/services/snippet_service.py @@ -8,9 +8,9 @@ from sqlalchemy import func, select from sqlalchemy.orm import Session, sessionmaker from core.workflow.node_factory import LATEST_VERSION, NODE_TYPE_CLASSES_MAPPING +from extensions.ext_database import db from graphon.enums import NodeType from graphon.variables.variables import VariableBase -from extensions.ext_database import db from libs.infinite_scroll_pagination import InfiniteScrollPagination from models import Account from models.enums import WorkflowRunTriggeredFrom @@ -278,7 +278,7 @@ class SnippetService: account: Account, environment_variables: Sequence[VariableBase], conversation_variables: Sequence[VariableBase], - input_variables: list[dict] | None = None, + input_fields: list[dict] | None = None, ) -> Workflow: """ Sync draft workflow for snippet. @@ -289,7 +289,7 @@ class SnippetService: :param account: Account making the change :param environment_variables: Environment variables :param conversation_variables: Conversation variables - :param input_variables: Input variables for snippet + :param input_fields: Input fields for snippet :return: Synced Workflow :raises WorkflowHashNotEqualError: If hash mismatch """ @@ -322,8 +322,8 @@ class SnippetService: workflow.conversation_variables = conversation_variables # Update snippet's input_fields if provided - if input_variables is not None: - snippet.input_fields = json.dumps(input_variables) + if input_fields is not None: + snippet.input_fields = json.dumps(input_fields) snippet.updated_by = account.id snippet.updated_at = datetime.now(UTC).replace(tzinfo=None) diff --git a/api/tasks/evaluation_task.py b/api/tasks/evaluation_task.py index 3c2f7fbd17..bbfa8e62c1 100644 --- a/api/tasks/evaluation_task.py +++ b/api/tasks/evaluation_task.py @@ -24,8 +24,8 @@ from core.evaluation.runners.llm_evaluation_runner import LLMEvaluationRunner from core.evaluation.runners.retrieval_evaluation_runner import RetrievalEvaluationRunner from core.evaluation.runners.snippet_evaluation_runner import SnippetEvaluationRunner from core.evaluation.runners.workflow_evaluation_runner import WorkflowEvaluationRunner -from graphon.node_events import NodeRunResult from extensions.ext_database import db +from graphon.node_events import NodeRunResult from libs.datetime_utils import naive_utc_now from models.enums import CreatorUserRole from models.evaluation import EvaluationRun, EvaluationRunStatus