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

feat: move model request to plugin daemon

Browse Source
This commit is contained in:
takatost
2024-09-29 00:14:44 +08:00
parent 1c3213184e
commit 47c8824be6
29 changed files with 127 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
api/core/tools/entities/tool_entities.py
View File

@ -375,6 +375,3 @@ class ToolInvokeFrom(Enum):
WORKFLOW = "workflow"
AGENT = "agent"

2
api/core/tools/utils/workflow_configuration_sync.py
View File

@ -43,4 +43,4 @@ class WorkflowToolConfigurationUtils:
for parameter in tool_configurations:
if parameter.name not in variable_names:
raise ValueError('parameter configuration mismatch, please republish the tool to update')
raise ValueError("parameter configuration mismatch, please republish the tool to update")

30
api/core/tools/workflow_as_tool/provider.py
View File

@ -65,7 +65,7 @@ class WorkflowToolProviderController(ToolProviderController):
@property
def provider_type(self) -> ToolProviderType:
return ToolProviderType.WORKFLOW
def _get_db_provider_tool(self, db_provider: WorkflowToolProvider, app: App) -> WorkflowTool:
"""
get db provider tool
@ -73,10 +73,11 @@ class WorkflowToolProviderController(ToolProviderController):
:param app: the app
:return: the tool
"""
workflow: Workflow | None = db.session.query(Workflow).filter(
Workflow.app_id == db_provider.app_id,
Workflow.version == db_provider.version
).first()
workflow: Workflow | None = (
db.session.query(Workflow)
.filter(Workflow.app_id == db_provider.app_id, Workflow.version == db_provider.version)
.first()
)
if not workflow:
raise ValueError("workflow not found")
@ -84,10 +85,7 @@ class WorkflowToolProviderController(ToolProviderController):
# fetch start node
graph: Mapping = workflow.graph_dict
features_dict: Mapping = workflow.features_dict
features = WorkflowAppConfigManager.convert_features(
config_dict=features_dict,
app_mode=AppMode.WORKFLOW
)
features = WorkflowAppConfigManager.convert_features(config_dict=features_dict, app_mode=AppMode.WORKFLOW)
parameters = db_provider.parameter_configurations
variables = WorkflowToolConfigurationUtils.get_workflow_graph_variables(graph)
@ -180,14 +178,18 @@ class WorkflowToolProviderController(ToolProviderController):
if self.tools is not None:
return self.tools
db_providers: WorkflowToolProvider | None = db.session.query(WorkflowToolProvider).filter(
WorkflowToolProvider.tenant_id == tenant_id,
WorkflowToolProvider.app_id == self.provider_id,
).first()
db_providers: WorkflowToolProvider | None = (
db.session.query(WorkflowToolProvider)
.filter(
WorkflowToolProvider.tenant_id == tenant_id,
WorkflowToolProvider.app_id == self.provider_id,
)
.first()
)
if not db_providers:
return []
app = db_providers.app
if not app:
raise ValueError("can not read app of workflow")