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 branch 'main' into fix/chore-fix

Browse Source
This commit is contained in:
Yeuoly
2024-12-04 15:34:39 +08:00
parent 7679a57f18 d470e55f8c
commit 86291c13e4
288 changed files with 8067 additions and 1950 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
api/models/__init__.py
View File

@ -24,30 +24,30 @@ from .workflow import (
)
__all__ = [
"Account",
"AccountIntegrate",
"ApiToken",
"App",
"AppMode",
"Conversation",
"ConversationVariable",
"Document",
"DataSourceOauthBinding",
"Dataset",
"DatasetProcessRule",
"Document",
"DocumentSegment",
"DataSourceOauthBinding",
"AppMode",
"Workflow",
"App",
"Message",
"EndUser",
"InstalledApp",
"InvitationCode",
"Message",
"MessageAnnotation",
"MessageFile",
"RecommendedApp",
"Site",
"Tenant",
"ToolFile",
"UploadFile",
"Account",
"Workflow",
"WorkflowAppLog",
"WorkflowRun",
"Site",
"InstalledApp",
"RecommendedApp",
"ApiToken",
"AccountIntegrate",
"InvitationCode",
"Tenant",
"Conversation",
"MessageAnnotation",
"ToolFile",
]

8
api/models/workflow.py
View File

@ -243,7 +243,9 @@ class Workflow(Base):
tenant_id = contexts.tenant_id.get()
environment_variables_dict: dict[str, Any] = json.loads(self._environment_variables)
results = [variable_factory.build_variable_from_mapping(v) for v in environment_variables_dict.values()]
results = [
variable_factory.build_environment_variable_from_mapping(v) for v in environment_variables_dict.values()
]
# decrypt secret variables value
decrypt_func = (
@ -308,7 +310,7 @@ class Workflow(Base):
self._conversation_variables = "{}"
variables_dict: dict[str, Any] = json.loads(self._conversation_variables)
results = [variable_factory.build_variable_from_mapping(v) for v in variables_dict.values()]
results = [variable_factory.build_conversation_variable_from_mapping(v) for v in variables_dict.values()]
return results
@conversation_variables.setter
@ -803,4 +805,4 @@ class ConversationVariable(Base):
def to_variable(self) -> Variable:
mapping = json.loads(self.data)
return variable_factory.build_variable_from_mapping(mapping)
return variable_factory.build_conversation_variable_from_mapping(mapping)