mirror of
https://github.com/langgenius/dify.git
synced 2026-05-04 17:38:04 +08:00
Merge branch 'main' into feat/memory-orchestration-be
# Conflicts: # api/core/app/apps/advanced_chat/app_runner.py # api/core/workflow/constants.py # api/core/workflow/entities/variable_pool.py # api/core/workflow/nodes/llm/node.py # api/models/workflow.py
This commit is contained in:
@ -130,7 +130,7 @@ class ArraySegment(Segment):
|
||||
def markdown(self) -> str:
|
||||
items = []
|
||||
for item in self.value:
|
||||
items.append(str(item))
|
||||
items.append(f"- {item}")
|
||||
return "\n".join(items)
|
||||
|
||||
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
from collections.abc import Sequence
|
||||
from typing import Annotated, TypeAlias
|
||||
from typing import Annotated, Any, TypeAlias
|
||||
from uuid import uuid4
|
||||
|
||||
from pydantic import Discriminator, Field, Tag
|
||||
from pydantic import BaseModel, Discriminator, Field, Tag
|
||||
|
||||
from core.helper import encrypter
|
||||
|
||||
@ -112,6 +112,35 @@ class ArrayBooleanVariable(ArrayBooleanSegment, ArrayVariable):
|
||||
pass
|
||||
|
||||
|
||||
class RAGPipelineVariable(BaseModel):
|
||||
belong_to_node_id: str = Field(description="belong to which node id, shared means public")
|
||||
type: str = Field(description="variable type, text-input, paragraph, select, number, file, file-list")
|
||||
label: str = Field(description="label")
|
||||
description: str | None = Field(description="description", default="")
|
||||
variable: str = Field(description="variable key", default="")
|
||||
max_length: int | None = Field(
|
||||
description="max length, applicable to text-input, paragraph, and file-list", default=0
|
||||
)
|
||||
default_value: Any = Field(description="default value", default="")
|
||||
placeholder: str | None = Field(description="placeholder", default="")
|
||||
unit: str | None = Field(description="unit, applicable to Number", default="")
|
||||
tooltips: str | None = Field(description="helpful text", default="")
|
||||
allowed_file_types: list[str] | None = Field(
|
||||
description="image, document, audio, video, custom.", default_factory=list
|
||||
)
|
||||
allowed_file_extensions: list[str] | None = Field(description="e.g. ['.jpg', '.mp3']", default_factory=list)
|
||||
allowed_file_upload_methods: list[str] | None = Field(
|
||||
description="remote_url, local_file, tool_file.", default_factory=list
|
||||
)
|
||||
required: bool = Field(description="optional, default false", default=False)
|
||||
options: list[str] | None = Field(default_factory=list)
|
||||
|
||||
|
||||
class RAGPipelineVariableInput(BaseModel):
|
||||
variable: RAGPipelineVariable
|
||||
value: Any
|
||||
|
||||
|
||||
# The `VariableUnion`` type is used to enable serialization and deserialization with Pydantic.
|
||||
# Use `Variable` for type hinting when serialization is not required.
|
||||
#
|
||||
|
||||
Reference in New Issue
Block a user