Skip to content

Conversation

@yihong0618
Copy link
Contributor

@yihong0618 yihong0618 commented Jan 16, 2026

Important

  1. Make sure you have read our contribution guidelines
  2. Ensure there is an associated issue and you have been assigned to it
  3. Use the correct syntax to link this PR: Fixes #<issue number>.

Summary

Screenshots

Before After
... ...

Checklist

  • This change requires a documentation update, included: Dify Document
  • I understand that this PR may be closed in case there was no previous discussion or issues. (This doesn't apply to typos!)
  • I've added a test for each change that was introduced, and I tried as much as possible to make a single atomic change.
  • I've updated the documentation accordingly.
  • I ran make lint and make type-check (backend) and cd web && npx lint-staged (frontend) to appease the lint gods

as diff

fix: #31142

Signed-off-by: yihong0618 <[email protected]>
Copilot AI review requested due to automatic review settings January 16, 2026 11:46
@dosubot dosubot bot added the size:S This PR changes 10-29 lines, ignoring generated files. label Jan 16, 2026
@gemini-code-assist
Copy link
Contributor

Summary of Changes

Hello @yihong0618, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request addresses a potential session leak by refining the database session handling within the file service. The change ensures that database connections are explicitly and correctly closed, leading to improved resource management and overall application stability.

Highlights

  • Database Session Management: The get_file_base64 method in api/services/file_service.py has been updated to use a with statement for managing the database session. This ensures that the session is properly closed after use, preventing potential resource leaks.
  • Resource Key Retrieval: The upload_file.key is now retrieved and stored in a local variable file_key within the with block, ensuring its availability even after the database session is closed.

🧠 New Feature in Public Preview: You can now enable Memory to help Gemini Code Assist learn from your team's feedback. This makes future code reviews more consistent and personalized to your project's style. Click here to enable Memory in your admin console.

Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point by creating a comment using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

Feature Command Description
Code Review /gemini review Performs a code review for the current pull request in its current state.
Pull Request Summary /gemini summary Provides a summary of the current pull request in its current state.
Comment @gemini-code-assist Responds in comments when explicitly tagged, both in pull request comments and review comments.
Help /gemini help Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

Footnotes

  1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution.

Copy link
Contributor

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Review

This pull request correctly addresses a session leak in get_file_base64 by using a with statement to ensure the database session is properly closed. This is an important fix for resource management. I've added one suggestion to further optimize the database query for better performance.

Comment on lines +129 to +132
upload_file = session.query(UploadFile).where(UploadFile.id == file_id).first()
if not upload_file:
raise NotFound("File not found")
file_key = upload_file.key
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

For better performance, you can optimize this query to only select the key column instead of fetching the entire UploadFile object. This reduces the amount of data transferred from the database and avoids creating a full ORM object when only one field is needed.

Suggested change
upload_file = session.query(UploadFile).where(UploadFile.id == file_id).first()
if not upload_file:
raise NotFound("File not found")
file_key = upload_file.key
file_key = session.query(UploadFile.key).filter(UploadFile.id == file_id).scalar()
if not file_key:
raise NotFound("File not found")

Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR fixes a session leak in the FileService.get_file_base64 method by properly managing the database session lifecycle with a context manager.

Changes:

  • Updated get_file_base64 method to use a context manager (with statement) for session management
  • Extracted file_key from upload_file before the session closes to avoid accessing detached ORM objects

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

raise NotFound("File not found")
blob = storage.load_once(upload_file.key)
with self._session_maker(expire_on_commit=False) as session:
upload_file = session.query(UploadFile).where(UploadFile.id == file_id).first()
Copy link

Copilot AI Jan 16, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The get_file_base64 method lacks test coverage. The file has comprehensive integration tests in api/tests/test_containers_integration_tests/services/test_file_service.py, but there are no tests for this method. Consider adding tests to verify the session is properly closed and that the method correctly handles both valid and invalid file IDs.

Copilot uses AI. Check for mistakes.
@crazywoola
Copy link
Member

Please link an issue in the description.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:S This PR changes 10-29 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

There is a potential session leak in file server

2 participants