youngkingdom/dify
1
0
Fork 0
mirror of https://github.com/langgenius/dify.git synced 2026-05-03 08:58:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '9c339239' into sandboxed-agent-rebase

Browse Source 
Made-with: Cursor

# Conflicts:
#	api/README.md
#	api/controllers/console/app/workflow_draft_variable.py
#	api/core/agent/cot_agent_runner.py
#	api/core/agent/fc_agent_runner.py
#	api/core/app/apps/advanced_chat/app_runner.py
#	api/core/plugin/backwards_invocation/model.py
#	api/core/prompt/advanced_prompt_transform.py
#	api/core/workflow/nodes/base/node.py
#	api/core/workflow/nodes/llm/llm_utils.py
#	api/core/workflow/nodes/llm/node.py
#	api/core/workflow/nodes/parameter_extractor/parameter_extractor_node.py
#	api/core/workflow/nodes/question_classifier/question_classifier_node.py
#	api/core/workflow/runtime/graph_runtime_state.py
#	api/extensions/storage/base_storage.py
#	api/factories/variable_factory.py
#	api/pyproject.toml
#	api/services/variable_truncator.py
#	api/uv.lock
#	web/app/account/oauth/authorize/page.tsx
#	web/app/components/app/configuration/config-var/config-modal/field.tsx
#	web/app/components/base/alert.tsx
#	web/app/components/base/chat/chat/answer/human-input-content/executed-action.tsx
#	web/app/components/base/chat/chat/answer/more.tsx
#	web/app/components/base/chat/chat/answer/operation.tsx
#	web/app/components/base/chat/chat/answer/workflow-process.tsx
#	web/app/components/base/chat/chat/citation/index.tsx
#	web/app/components/base/chat/chat/citation/popup.tsx
#	web/app/components/base/chat/chat/citation/progress-tooltip.tsx
#	web/app/components/base/chat/chat/citation/tooltip.tsx
#	web/app/components/base/chat/chat/question.tsx
#	web/app/components/base/chat/embedded-chatbot/inputs-form/index.tsx
#	web/app/components/base/chat/embedded-chatbot/inputs-form/view-form-dropdown.tsx
#	web/app/components/base/markdown-blocks/form.tsx
#	web/app/components/base/prompt-editor/plugins/hitl-input-block/component-ui.tsx
#	web/app/components/base/tag-management/panel.tsx
#	web/app/components/base/tag-management/trigger.tsx
#	web/app/components/header/account-setting/index.tsx
#	web/app/components/header/account-setting/members-page/transfer-ownership-modal/index.tsx
#	web/app/components/header/account-setting/model-provider-page/provider-added-card/index.tsx
#	web/app/signin/utils/post-login-redirect.ts
#	web/eslint-suppressions.json
#	web/package.json
#	web/pnpm-lock.yaml
This commit is contained in:
Novice
2026-03-23 09:00:45 +08:00
parent 51c418f497 9c33923985
commit cccff6768a
1009 changed files with 76072 additions and 18166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
api/tests/unit_tests/core/variables/test_segment.py
View File

@ -3,7 +3,10 @@ import dataclasses
from pydantic import BaseModel
from core.helper import encrypter
from core.variables.segments import (
from core.workflow.file import File, FileTransferMethod, FileType
from core.workflow.runtime import VariablePool
from core.workflow.system_variable import SystemVariable
from core.workflow.variables.segments import (
ArrayAnySegment,
ArrayFileSegment,
ArrayNumberSegment,
@ -19,8 +22,8 @@ from core.variables.segments import (
StringSegment,
get_segment_discriminator,
)
from core.variables.types import SegmentType
from core.variables.variables import (
from core.workflow.variables.types import SegmentType
from core.workflow.variables.variables import (
ArrayAnyVariable,
ArrayFileVariable,
ArrayNumberVariable,
@ -35,9 +38,6 @@ from core.variables.variables import (
StringVariable,
Variable,
)
from core.workflow.file import File, FileTransferMethod, FileType
from core.workflow.runtime import VariablePool
from core.workflow.system_variable import SystemVariable
def test_segment_group_to_text():

2
api/tests/unit_tests/core/variables/test_segment_type.py
View File

@ -1,6 +1,6 @@
import pytest
from core.variables.types import ArrayValidation, SegmentType
from core.workflow.variables.types import ArrayValidation, SegmentType
class TestSegmentTypeIsArrayType:

10
api/tests/unit_tests/core/variables/test_segment_type_validation.py
View File

@ -10,8 +10,10 @@ from typing import Any
import pytest
from core.variables.segment_group import SegmentGroup
from core.variables.segments import (
from core.workflow.file.enums import FileTransferMethod, FileType
from core.workflow.file.models import File
from core.workflow.variables.segment_group import SegmentGroup
from core.workflow.variables.segments import (
ArrayFileSegment,
BooleanSegment,
FileSegment,
@ -20,9 +22,7 @@ from core.variables.segments import (
ObjectSegment,
StringSegment,
)
from core.variables.types import ArrayValidation, SegmentType
from core.workflow.file.enums import FileTransferMethod, FileType
from core.workflow.file.models import File
from core.workflow.variables.types import ArrayValidation, SegmentType
def create_test_file(

4
api/tests/unit_tests/core/variables/test_variables.py
View File

@ -1,7 +1,7 @@
import pytest
from pydantic import ValidationError
from core.variables import (
from core.workflow.variables import (
ArrayFileVariable,
ArrayVariable,
FloatVariable,
@ -11,7 +11,7 @@ from core.variables import (
SegmentType,
StringVariable,
)
from core.variables.variables import VariableBase
from core.workflow.variables.variables import VariableBase
def test_frozen_variables():