Skip to content

fix: close session before doing long latency operation #22306

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JohnJyong merged 1 commit into from
Jul 14, 2025
Merged

fix: close session before doing long latency operation #22306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions api/core/rag/datasource/retrieval_service.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from typing import Optional

from flask import Flask, current_app
from sqlalchemy.orm import load_only
from sqlalchemy.orm import Session, load_only

from configs import dify_config
from core.rag.data_post_processor.data_post_processor import DataPostProcessor
Expand Down Expand Up @@ -144,7 +144,8 @@ def external_retrieve(

@classmethod
def _get_dataset(cls, dataset_id: str) -> Optional[Dataset]:
return db.session.query(Dataset).filter(Dataset.id == dataset_id).first()
with Session(db.engine) as session:
return session.query(Dataset).filter(Dataset.id == dataset_id).first()

@classmethod
def keyword_search(
Expand Down
4 changes: 3 additions & 1 deletion api/core/rag/retrieval/dataset_retrieval.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
from flask import Flask, current_app
from sqlalchemy import Float, and_, or_, text
from sqlalchemy import cast as sqlalchemy_cast
from sqlalchemy.orm import Session

from core.app.app_config.entities import (
DatasetEntity,
Expand Down Expand Up @@ -598,7 +599,8 @@ def _retriever(
metadata_condition: Optional[MetadataCondition] = None,
):
with flask_app.app_context():
dataset = db.session.query(Dataset).filter(Dataset.id == dataset_id).first()
with Session(db.engine) as session:
dataset = session.query(Dataset).filter(Dataset.id == dataset_id).first()

if not dataset:
return []
Expand Down
5 changes: 5 additions & 0 deletions api/core/workflow/nodes/knowledge_retrieval/knowledge_retrieval_node.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,8 @@ def _run(self) -> NodeRunResult: # type: ignore
error=str(e),
error_type=type(e).__name__,
)
finally:
db.session.close()

def _fetch_dataset_retriever(self, node_data: KnowledgeRetrievalNodeData, query: str) -> list[dict[str, Any]]:
available_datasets = []
Expand Down Expand Up @@ -171,6 +173,9 @@ def _fetch_dataset_retriever(self, node_data: KnowledgeRetrievalNodeData, query:
.all()
)

# avoid blocking at retrieval
db.session.close()

for dataset in results:
# pass if dataset is not available
if not dataset:
Expand Down