opensource
/
dify
mirror of https://github.com/langgenius/dify.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix preview and recommend plugins

This commit is contained in:
jyong 2025-09-02 19:41:29 +08:00
parent fc4bc08796
commit 343f1a375f
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
api/services/rag_pipeline/pipeline_template/database/database_retrieval.py
View File

@ -17,8 +17,8 @@ class DatabasePipelineTemplateRetrieval(PipelineTemplateRetrievalBase):
result = self.fetch_pipeline_templates_from_db(language)
return result
def get_pipeline_template_detail(self, pipeline_id: str):
result = self.fetch_pipeline_template_detail_from_db(pipeline_id)
def get_pipeline_template_detail(self, template_id: str):
result = self.fetch_pipeline_template_detail_from_db(template_id)
return result
def get_type(self) -> str:
@ -53,7 +53,7 @@ class DatabasePipelineTemplateRetrieval(PipelineTemplateRetrievalBase):
return {"pipeline_templates": recommended_pipelines_results}
@classmethod
def fetch_pipeline_template_detail_from_db(cls, pipeline_id: str) -> Optional[dict]:
def fetch_pipeline_template_detail_from_db(cls, template_id: str) -> Optional[dict]:
"""
Fetch pipeline template detail from db.
:param pipeline_id: Pipeline ID
@ -61,7 +61,7 @@ class DatabasePipelineTemplateRetrieval(PipelineTemplateRetrievalBase):
"""
# is in public recommended list
pipeline_template = (
db.session.query(PipelineBuiltInTemplate).filter(PipelineBuiltInTemplate.id == pipeline_id).first()
db.session.query(PipelineBuiltInTemplate).filter(PipelineBuiltInTemplate.id == template_id).first()
)
if not pipeline_template:

14
api/services/rag_pipeline/pipeline_template/remote/remote_retrieval.py
View File

@ -16,12 +16,12 @@ class RemotePipelineTemplateRetrieval(PipelineTemplateRetrievalBase):
Retrieval recommended app from dify official
"""
def get_pipeline_template_detail(self, pipeline_id: str):
def get_pipeline_template_detail(self, template_id: str):
try:
result = self.fetch_pipeline_template_detail_from_dify_official(pipeline_id)
result = self.fetch_pipeline_template_detail_from_dify_official(template_id)
except Exception as e:
logger.warning("fetch recommended app detail from dify official failed: %r, switch to built-in.", e)
result = BuildInRecommendAppRetrieval.fetch_recommended_app_detail_from_builtin(pipeline_id)
result = BuildInRecommendAppRetrieval.fetch_recommended_app_detail_from_builtin(template_id)
return result
def get_pipeline_templates(self, language: str) -> dict:
@ -36,14 +36,14 @@ class RemotePipelineTemplateRetrieval(PipelineTemplateRetrievalBase):
return PipelineTemplateType.REMOTE
@classmethod
def fetch_pipeline_template_detail_from_dify_official(cls, pipeline_id: str) -> Optional[dict]:
def fetch_pipeline_template_detail_from_dify_official(cls, template_id: str) -> Optional[dict]:
"""
Fetch pipeline template detail from dify official.
:param pipeline_id: Pipeline ID
:param template_id: Pipeline ID
:return:
"""
domain = dify_config.HOSTED_FETCH_PIPELINE_TEMPLATES_REMOTE_DOMAIN
url = f"{domain}/pipelines/{pipeline_id}"
url = f"{domain}/pipeline-templates/{template_id}"
response = requests.get(url, timeout=(3, 10))
if response.status_code != 200:
return None
@ -58,7 +58,7 @@ class RemotePipelineTemplateRetrieval(PipelineTemplateRetrievalBase):
:return:
"""
domain = dify_config.HOSTED_FETCH_PIPELINE_TEMPLATES_REMOTE_DOMAIN
url = f"{domain}/pipelines?language={language}"
url = f"{domain}/pipeline-templates?language={language}"
response = requests.get(url, timeout=(3, 10))
if response.status_code != 200:
raise ValueError(f"fetch pipeline templates failed, status code: {response.status_code}")