opensource/dify
2
0
Fork 0
mirror of https://github.com/langgenius/dify.git synced 2026-04-26 10:16:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(api): fix format, replace .filter with .where (#25858)

Browse Source
This commit is contained in:
QuantumGhost 2025-09-17 23:06:04 +08:00 committed by GitHub
commit 41be002ec3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
18 changed files with 41 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/controllers/console/datasets/wraps.py
View File

@ -27,7 +27,7 @@ def get_rag_pipeline(
pipeline = ( pipeline = (
db.session.query(Pipeline) db.session.query(Pipeline)
.filter(Pipeline.id == pipeline_id, Pipeline.tenant_id == current_user.current_tenant_id) .where(Pipeline.id == pipeline_id, Pipeline.tenant_id == current_user.current_tenant_id)
.first() .first()
) )

2
api/controllers/service_api/dataset/rag_pipeline/rag_pipeline_workflow.py
View File

@ -215,7 +215,7 @@ class KnowledgebasePipelineFileUploadApi(DatasetApiResource):
if not file.filename: if not file.filename:
raise FilenameNotExistsError raise FilenameNotExistsError
if not current_user: if not current_user:
raise ValueError("Invalid user account") raise ValueError("Invalid user account")

6
api/core/app/apps/pipeline/pipeline_runner.py
View File

@ -195,9 +195,7 @@ class PipelineRunner(WorkflowBasedAppRunner):
# fetch workflow by workflow_id # fetch workflow by workflow_id
workflow = ( workflow = (
db.session.query(Workflow) db.session.query(Workflow)
.filter( .where(Workflow.tenant_id == pipeline.tenant_id, Workflow.app_id == pipeline.id, Workflow.id == workflow_id)
Workflow.tenant_id == pipeline.tenant_id, Workflow.app_id == pipeline.id, Workflow.id == workflow_id
)
.first() .first()
) )
@ -272,7 +270,7 @@ class PipelineRunner(WorkflowBasedAppRunner):
if document_id and dataset_id: if document_id and dataset_id:
document = ( document = (
db.session.query(Document) db.session.query(Document)
.filter(Document.id == document_id, Document.dataset_id == dataset_id) .where(Document.id == document_id, Document.dataset_id == dataset_id)
.first() .first()
) )
if document: if document:

20
api/core/datasource/datasource_file_manager.py
View File

@ -152,10 +152,7 @@ class DatasourceFileManager:
:return: the binary of the file, mime type :return: the binary of the file, mime type
""" """
upload_file: UploadFile | None = ( upload_file: UploadFile | None = db.session.query(UploadFile).where(UploadFile.id == id).first()
db.session.query(UploadFile).where(UploadFile.id == id)
.first()
)
if not upload_file: if not upload_file:
return None return None
@ -173,10 +170,7 @@ class DatasourceFileManager:
:return: the binary of the file, mime type :return: the binary of the file, mime type
""" """
message_file: MessageFile | None = ( message_file: MessageFile | None = db.session.query(MessageFile).where(MessageFile.id == id).first()
db.session.query(MessageFile).where(MessageFile.id == id)
.first()
)
# Check if message_file is not None # Check if message_file is not None
if message_file is not None: if message_file is not None:
@ -190,10 +184,7 @@ class DatasourceFileManager:
else: else:
tool_file_id = None tool_file_id = None
tool_file: ToolFile | None = ( tool_file: ToolFile | None = db.session.query(ToolFile).where(ToolFile.id == tool_file_id).first()
db.session.query(ToolFile).where(ToolFile.id == tool_file_id)
.first()
)
if not tool_file: if not tool_file:
return None return None
@ -211,10 +202,7 @@ class DatasourceFileManager:
:return: the binary of the file, mime type :return: the binary of the file, mime type
""" """
upload_file: UploadFile | None = ( upload_file: UploadFile | None = db.session.query(UploadFile).where(UploadFile.id == upload_file_id).first()
db.session.query(UploadFile).where(UploadFile.id == upload_file_id)
.first()
)
if not upload_file: if not upload_file:
return None, None return None, None

1
api/core/datasource/entities/common_entities.py
View File

@ -1,4 +1,3 @@
from pydantic import BaseModel, Field from pydantic import BaseModel, Field

1
api/core/entities/knowledge_entities.py
View File

@ -1,4 +1,3 @@
from pydantic import BaseModel from pydantic import BaseModel

1
api/core/rag/extractor/entity/extract_setting.py
View File

@ -1,4 +1,3 @@
from pydantic import BaseModel, ConfigDict from pydantic import BaseModel, ConfigDict
from models.dataset import Document from models.dataset import Document

2
api/core/workflow/errors.py
View File

@ -13,4 +13,4 @@ class WorkflowNodeRunFailedError(Exception):
@property @property
def error(self) -> str: def error(self) -> str:
return self._error return self._error

4
api/core/workflow/nodes/knowledge_index/knowledge_index_node.py
View File

@ -160,7 +160,7 @@ class KnowledgeIndexNode(Node):
document.completed_at = datetime.datetime.now(datetime.UTC).replace(tzinfo=None) document.completed_at = datetime.datetime.now(datetime.UTC).replace(tzinfo=None)
document.word_count = ( document.word_count = (
db.session.query(func.sum(DocumentSegment.word_count)) db.session.query(func.sum(DocumentSegment.word_count))
.filter( .where(
DocumentSegment.document_id == document.id, DocumentSegment.document_id == document.id,
DocumentSegment.dataset_id == dataset.id, DocumentSegment.dataset_id == dataset.id,
) )
@ -168,7 +168,7 @@ class KnowledgeIndexNode(Node):
) )
db.session.add(document) db.session.add(document)
# update document segment status # update document segment status
db.session.query(DocumentSegment).filter( db.session.query(DocumentSegment).where(
DocumentSegment.document_id == document.id, DocumentSegment.document_id == document.id,
DocumentSegment.dataset_id == dataset.id, DocumentSegment.dataset_id == dataset.id,
).update( ).update(

2
api/factories/file_factory.py
View File

@ -326,7 +326,7 @@ def _build_from_datasource_file(
) -> File: ) -> File:
datasource_file = ( datasource_file = (
db.session.query(UploadFile) db.session.query(UploadFile)
.filter( .where(
UploadFile.id == mapping.get("datasource_file_id"), UploadFile.id == mapping.get("datasource_file_id"),
UploadFile.tenant_id == tenant_id, UploadFile.tenant_id == tenant_id,
) )

2
api/models/dataset.py
View File

@ -82,7 +82,7 @@ class Dataset(Base):
def total_available_documents(self): def total_available_documents(self):
return ( return (
db.session.query(func.count(Document.id)) db.session.query(func.count(Document.id))
.filter( .where(
Document.dataset_id == self.id, Document.dataset_id == self.id,
Document.indexing_status == "completed", Document.indexing_status == "completed",
Document.enabled == True, Document.enabled == True,

2
api/services/dataset_service.py
View File

@ -419,7 +419,7 @@ class DatasetService:
def _has_dataset_same_name(tenant_id: str, dataset_id: str, name: str): def _has_dataset_same_name(tenant_id: str, dataset_id: str, name: str):
dataset = ( dataset = (
db.session.query(Dataset) db.session.query(Dataset)
.filter( .where(
Dataset.id != dataset_id, Dataset.id != dataset_id,
Dataset.name == name, Dataset.name == name,
Dataset.tenant_id == tenant_id, Dataset.tenant_id == tenant_id,

4
api/services/datasource_provider_service.py
View File

@ -690,7 +690,7 @@ class DatasourceProviderService:
# Get all provider configurations of the current workspace # Get all provider configurations of the current workspace
datasource_providers: list[DatasourceProvider] = ( datasource_providers: list[DatasourceProvider] = (
db.session.query(DatasourceProvider) db.session.query(DatasourceProvider)
.filter( .where(
DatasourceProvider.tenant_id == tenant_id, DatasourceProvider.tenant_id == tenant_id,
DatasourceProvider.provider == provider, DatasourceProvider.provider == provider,
DatasourceProvider.plugin_id == plugin_id, DatasourceProvider.plugin_id == plugin_id,
@ -862,7 +862,7 @@ class DatasourceProviderService:
# Get all provider configurations of the current workspace # Get all provider configurations of the current workspace
datasource_providers: list[DatasourceProvider] = ( datasource_providers: list[DatasourceProvider] = (
db.session.query(DatasourceProvider) db.session.query(DatasourceProvider)
.filter( .where(
DatasourceProvider.tenant_id == tenant_id, DatasourceProvider.tenant_id == tenant_id,
DatasourceProvider.provider == provider, DatasourceProvider.provider == provider,
DatasourceProvider.plugin_id == plugin_id, DatasourceProvider.plugin_id == plugin_id,

3
api/services/rag_pipeline/pipeline_template/customized/customized_retrieval.py
View File

@ -1,4 +1,3 @@
import yaml import yaml
from flask_login import current_user from flask_login import current_user
@ -36,7 +35,7 @@ class CustomizedPipelineTemplateRetrieval(PipelineTemplateRetrievalBase):
""" """
pipeline_customized_templates = ( pipeline_customized_templates = (
db.session.query(PipelineCustomizedTemplate) db.session.query(PipelineCustomizedTemplate)
.filter(PipelineCustomizedTemplate.tenant_id == tenant_id, PipelineCustomizedTemplate.language == language) .where(PipelineCustomizedTemplate.tenant_id == tenant_id, PipelineCustomizedTemplate.language == language)
.order_by(PipelineCustomizedTemplate.position.asc(), PipelineCustomizedTemplate.created_at.desc()) .order_by(PipelineCustomizedTemplate.position.asc(), PipelineCustomizedTemplate.created_at.desc())
.all() .all()
) )

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

@ -1,4 +1,3 @@
import yaml import yaml
from extensions.ext_database import db from extensions.ext_database import db

32
api/services/rag_pipeline/rag_pipeline.py
View File

@ -138,7 +138,7 @@ class RagPipelineService:
""" """
customized_template: PipelineCustomizedTemplate | None = ( customized_template: PipelineCustomizedTemplate | None = (
db.session.query(PipelineCustomizedTemplate) db.session.query(PipelineCustomizedTemplate)
.filter( .where(
PipelineCustomizedTemplate.id == template_id, PipelineCustomizedTemplate.id == template_id,
PipelineCustomizedTemplate.tenant_id == current_user.current_tenant_id, PipelineCustomizedTemplate.tenant_id == current_user.current_tenant_id,
) )
@ -151,7 +151,7 @@ class RagPipelineService:
if template_name: if template_name:
template = ( template = (
db.session.query(PipelineCustomizedTemplate) db.session.query(PipelineCustomizedTemplate)
.filter( .where(
PipelineCustomizedTemplate.name == template_name, PipelineCustomizedTemplate.name == template_name,
PipelineCustomizedTemplate.tenant_id == current_user.current_tenant_id, PipelineCustomizedTemplate.tenant_id == current_user.current_tenant_id,
PipelineCustomizedTemplate.id != template_id, PipelineCustomizedTemplate.id != template_id,
@ -174,7 +174,7 @@ class RagPipelineService:
""" """
customized_template: PipelineCustomizedTemplate | None = ( customized_template: PipelineCustomizedTemplate | None = (
db.session.query(PipelineCustomizedTemplate) db.session.query(PipelineCustomizedTemplate)
.filter( .where(
PipelineCustomizedTemplate.id == template_id, PipelineCustomizedTemplate.id == template_id,
PipelineCustomizedTemplate.tenant_id == current_user.current_tenant_id, PipelineCustomizedTemplate.tenant_id == current_user.current_tenant_id,
) )
@ -192,7 +192,7 @@ class RagPipelineService:
# fetch draft workflow by rag pipeline # fetch draft workflow by rag pipeline
workflow = ( workflow = (
db.session.query(Workflow) db.session.query(Workflow)
.filter( .where(
Workflow.tenant_id == pipeline.tenant_id, Workflow.tenant_id == pipeline.tenant_id,
Workflow.app_id == pipeline.id, Workflow.app_id == pipeline.id,
Workflow.version == "draft", Workflow.version == "draft",
@ -214,7 +214,7 @@ class RagPipelineService:
# fetch published workflow by workflow_id # fetch published workflow by workflow_id
workflow = ( workflow = (
db.session.query(Workflow) db.session.query(Workflow)
.filter( .where(
Workflow.tenant_id == pipeline.tenant_id, Workflow.tenant_id == pipeline.tenant_id,
Workflow.app_id == pipeline.id, Workflow.app_id == pipeline.id,
Workflow.id == pipeline.workflow_id, Workflow.id == pipeline.workflow_id,
@ -1015,7 +1015,7 @@ class RagPipelineService:
""" """
limit = int(args.get("limit", 20)) limit = int(args.get("limit", 20))
base_query = db.session.query(WorkflowRun).filter( base_query = db.session.query(WorkflowRun).where(
WorkflowRun.tenant_id == pipeline.tenant_id, WorkflowRun.tenant_id == pipeline.tenant_id,
WorkflowRun.app_id == pipeline.id, WorkflowRun.app_id == pipeline.id,
or_( or_(
@ -1025,7 +1025,7 @@ class RagPipelineService:
) )
if args.get("last_id"): if args.get("last_id"):
last_workflow_run = base_query.filter( last_workflow_run = base_query.where(
WorkflowRun.id == args.get("last_id"), WorkflowRun.id == args.get("last_id"),
).first() ).first()
@ -1033,7 +1033,7 @@ class RagPipelineService:
raise ValueError("Last workflow run not exists") raise ValueError("Last workflow run not exists")
workflow_runs = ( workflow_runs = (
base_query.filter( base_query.where(
WorkflowRun.created_at < last_workflow_run.created_at, WorkflowRun.id != last_workflow_run.id WorkflowRun.created_at < last_workflow_run.created_at, WorkflowRun.id != last_workflow_run.id
) )
.order_by(WorkflowRun.created_at.desc()) .order_by(WorkflowRun.created_at.desc())
@ -1046,7 +1046,7 @@ class RagPipelineService:
has_more = False has_more = False
if len(workflow_runs) == limit: if len(workflow_runs) == limit:
current_page_first_workflow_run = workflow_runs[-1] current_page_first_workflow_run = workflow_runs[-1]
rest_count = base_query.filter( rest_count = base_query.where(
WorkflowRun.created_at < current_page_first_workflow_run.created_at, WorkflowRun.created_at < current_page_first_workflow_run.created_at,
WorkflowRun.id != current_page_first_workflow_run.id, WorkflowRun.id != current_page_first_workflow_run.id,
).count() ).count()
@ -1065,7 +1065,7 @@ class RagPipelineService:
""" """
workflow_run = ( workflow_run = (
db.session.query(WorkflowRun) db.session.query(WorkflowRun)
.filter( .where(
WorkflowRun.tenant_id == pipeline.tenant_id, WorkflowRun.tenant_id == pipeline.tenant_id,
WorkflowRun.app_id == pipeline.id, WorkflowRun.app_id == pipeline.id,
WorkflowRun.id == run_id, WorkflowRun.id == run_id,
@ -1130,7 +1130,7 @@ class RagPipelineService:
if template_name: if template_name:
template = ( template = (
db.session.query(PipelineCustomizedTemplate) db.session.query(PipelineCustomizedTemplate)
.filter( .where(
PipelineCustomizedTemplate.name == template_name, PipelineCustomizedTemplate.name == template_name,
PipelineCustomizedTemplate.tenant_id == pipeline.tenant_id, PipelineCustomizedTemplate.tenant_id == pipeline.tenant_id,
) )
@ -1168,7 +1168,7 @@ class RagPipelineService:
def is_workflow_exist(self, pipeline: Pipeline) -> bool: def is_workflow_exist(self, pipeline: Pipeline) -> bool:
return ( return (
db.session.query(Workflow) db.session.query(Workflow)
.filter( .where(
Workflow.tenant_id == pipeline.tenant_id, Workflow.tenant_id == pipeline.tenant_id,
Workflow.app_id == pipeline.id, Workflow.app_id == pipeline.id,
Workflow.version == Workflow.VERSION_DRAFT, Workflow.version == Workflow.VERSION_DRAFT,
@ -1362,10 +1362,10 @@ class RagPipelineService:
""" """
Get datasource plugins Get datasource plugins
""" """
dataset: Dataset | None = db.session.query(Dataset).filter(Dataset.id == dataset_id).first() dataset: Dataset | None = db.session.query(Dataset).where(Dataset.id == dataset_id).first()
if not dataset: if not dataset:
raise ValueError("Dataset not found") raise ValueError("Dataset not found")
pipeline: Pipeline | None = db.session.query(Pipeline).filter(Pipeline.id == dataset.pipeline_id).first() pipeline: Pipeline | None = db.session.query(Pipeline).where(Pipeline.id == dataset.pipeline_id).first()
if not pipeline: if not pipeline:
raise ValueError("Pipeline not found") raise ValueError("Pipeline not found")
@ -1446,10 +1446,10 @@ class RagPipelineService:
""" """
Get pipeline Get pipeline
""" """
dataset: Dataset | None = db.session.query(Dataset).filter(Dataset.id == dataset_id).first() dataset: Dataset | None = db.session.query(Dataset).where(Dataset.id == dataset_id).first()
if not dataset: if not dataset:
raise ValueError("Dataset not found") raise ValueError("Dataset not found")
pipeline: Pipeline | None = db.session.query(Pipeline).filter(Pipeline.id == dataset.pipeline_id).first() pipeline: Pipeline | None = db.session.query(Pipeline).where(Pipeline.id == dataset.pipeline_id).first()
if not pipeline: if not pipeline:
raise ValueError("Pipeline not found") raise ValueError("Pipeline not found")
return pipeline return pipeline

8
api/services/rag_pipeline/rag_pipeline_dsl_service.py
View File

@ -318,7 +318,7 @@ class RagPipelineDslService:
if knowledge_configuration.indexing_technique == "high_quality": if knowledge_configuration.indexing_technique == "high_quality":
dataset_collection_binding = ( dataset_collection_binding = (
self._session.query(DatasetCollectionBinding) self._session.query(DatasetCollectionBinding)
.filter( .where(
DatasetCollectionBinding.provider_name DatasetCollectionBinding.provider_name
== knowledge_configuration.embedding_model_provider, == knowledge_configuration.embedding_model_provider,
DatasetCollectionBinding.model_name == knowledge_configuration.embedding_model, DatasetCollectionBinding.model_name == knowledge_configuration.embedding_model,
@ -452,7 +452,7 @@ class RagPipelineDslService:
if knowledge_configuration.indexing_technique == "high_quality": if knowledge_configuration.indexing_technique == "high_quality":
dataset_collection_binding = ( dataset_collection_binding = (
self._session.query(DatasetCollectionBinding) self._session.query(DatasetCollectionBinding)
.filter( .where(
DatasetCollectionBinding.provider_name DatasetCollectionBinding.provider_name
== knowledge_configuration.embedding_model_provider, == knowledge_configuration.embedding_model_provider,
DatasetCollectionBinding.model_name == knowledge_configuration.embedding_model, DatasetCollectionBinding.model_name == knowledge_configuration.embedding_model,
@ -599,7 +599,7 @@ class RagPipelineDslService:
) )
workflow = ( workflow = (
self._session.query(Workflow) self._session.query(Workflow)
.filter( .where(
Workflow.tenant_id == pipeline.tenant_id, Workflow.tenant_id == pipeline.tenant_id,
Workflow.app_id == pipeline.id, Workflow.app_id == pipeline.id,
Workflow.version == "draft", Workflow.version == "draft",
@ -673,7 +673,7 @@ class RagPipelineDslService:
workflow = ( workflow = (
self._session.query(Workflow) self._session.query(Workflow)
.filter( .where(
Workflow.tenant_id == pipeline.tenant_id, Workflow.tenant_id == pipeline.tenant_id,
Workflow.app_id == pipeline.id, Workflow.app_id == pipeline.id,
Workflow.version == "draft", Workflow.version == "draft",

8
api/tasks/deal_dataset_index_update_task.py
View File

@ -33,7 +33,7 @@ def deal_dataset_index_update_task(dataset_id: str, action: str):
if action == "upgrade": if action == "upgrade":
dataset_documents = ( dataset_documents = (
db.session.query(DatasetDocument) db.session.query(DatasetDocument)
.filter( .where(
DatasetDocument.dataset_id == dataset_id, DatasetDocument.dataset_id == dataset_id,
DatasetDocument.indexing_status == "completed", DatasetDocument.indexing_status == "completed",
DatasetDocument.enabled == True, DatasetDocument.enabled == True,
@ -54,7 +54,7 @@ def deal_dataset_index_update_task(dataset_id: str, action: str):
# add from vector index # add from vector index
segments = ( segments = (
db.session.query(DocumentSegment) db.session.query(DocumentSegment)
.filter(DocumentSegment.document_id == dataset_document.id, DocumentSegment.enabled == True) .where(DocumentSegment.document_id == dataset_document.id, DocumentSegment.enabled == True)
.order_by(DocumentSegment.position.asc()) .order_by(DocumentSegment.position.asc())
.all() .all()
) )
@ -88,7 +88,7 @@ def deal_dataset_index_update_task(dataset_id: str, action: str):
elif action == "update": elif action == "update":
dataset_documents = ( dataset_documents = (
db.session.query(DatasetDocument) db.session.query(DatasetDocument)
.filter( .where(
DatasetDocument.dataset_id == dataset_id, DatasetDocument.dataset_id == dataset_id,
DatasetDocument.indexing_status == "completed", DatasetDocument.indexing_status == "completed",
DatasetDocument.enabled == True, DatasetDocument.enabled == True,
@ -113,7 +113,7 @@ def deal_dataset_index_update_task(dataset_id: str, action: str):
try: try:
segments = ( segments = (
db.session.query(DocumentSegment) db.session.query(DocumentSegment)
.filter(DocumentSegment.document_id == dataset_document.id, DocumentSegment.enabled == True) .where(DocumentSegment.document_id == dataset_document.id, DocumentSegment.enabled == True)
.order_by(DocumentSegment.position.asc()) .order_by(DocumentSegment.position.asc())
.all() .all()
) )