refactor: api/services/recommended_app_service.py to session by asukaminato0721 · Pull Request #32162 · langgenius/dify

asukaminato0721 · 2026-02-09T14:39:18Z

Important

Make sure you have read our contribution guidelines
Ensure there is an associated issue and you have been assigned to it
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

gemini-code-assist · 2026-02-09T14:40:36Z

Summary of Changes

Hello @asukaminato0721, I'm Gemini Code Assist¹! 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 refactors the recommended_app_service.py file to improve database session management by using session_factory and ensuring proper transaction handling. This change enhances the reliability and maintainability of database operations within the service.

Highlights

Database Session Management: This PR refactors the recommended_app_service.py to use session_factory for database session management instead of directly using db.session. This ensures that each database operation is performed within its own session.
Context Management: The code now uses with session_factory.create_session() as session: to create and manage database sessions, ensuring proper resource handling and transaction management.
Transaction Handling: The add_trial_app_record method now uses session.begin() to explicitly manage transactions, ensuring atomicity of database operations.

🧠 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.

Changelog

api/services/recommended_app_service.py
- Replaced direct db.session usage with session_factory for creating database sessions.
- Implemented context management using with statement for database sessions.
- Added explicit transaction management using session.begin() in add_trial_app_record.

Activity

The PR addresses issue [Chore/Refactor] db.session.xxx -> with Session as session #24115.
The changes include refactoring database session management in recommended_app_service.py.
The PR includes updates to ensure proper resource handling and transaction management.

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.

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. ↩

gemini-code-assist

Code Review

This pull request refactors RecommendedAppService to use the session_factory for database operations, which is a positive step towards better session management. However, I've identified a performance regression where a database session is created inside a loop, and a pre-existing race condition that should be addressed. My review includes suggestions to optimize the database queries for better performance and to fix the race condition for improved reliability.

Copilot

Pull request overview

Refactors RecommendedAppService to use the project’s pure SQLAlchemy session_factory instead of Flask-SQLAlchemy’s db.session, aligning with the ongoing DB session migration effort (issue #24115).

Changes:

Replace db.session queries with session_factory.create_session() for trial-app lookups.
Wrap trial record mutation in a session.begin() transaction context.

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

github-actions · 2026-03-01T08:24:22Z

Pyrefly Diff

No changes detected.

Copilot

Pull request overview

Copilot reviewed 1 out of 1 changed files in this pull request and generated 3 comments.

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

Copilot · 2026-03-01T08:27:36Z

        if FeatureService.get_system_features().enable_trial_app:
            apps = result["recommended_apps"]
            for app in apps:
                app_id = app["app_id"]
-                trial_app_model = db.session.query(TrialApp).where(TrialApp.app_id == app_id).first()
-                if trial_app_model:
-                    app["can_trial"] = True
-                else:
-                    app["can_trial"] = False
+                with session_factory.create_session() as session:
+                    trial_app_model = session.query(TrialApp).where(TrialApp.app_id == app_id).first()


There are existing unit tests for RecommendedAppService, but none exercise the enable_trial_app branches touched here (the session_factory lookups / can_trial flag behavior). Add tests that set FeatureService.get_system_features().enable_trial_app = True and mock session_factory.create_session() so the trial-app behavior is covered and protected during the db.session -> session_factory migration.

Copilot · 2026-03-01T08:27:37Z

            for app in apps:
                app_id = app["app_id"]
-                trial_app_model = db.session.query(TrialApp).where(TrialApp.app_id == app_id).first()
-                if trial_app_model:
-                    app["can_trial"] = True
-                else:
-                    app["can_trial"] = False
+                with session_factory.create_session() as session:
+                    trial_app_model = session.query(TrialApp).where(TrialApp.app_id == app_id).first()
+                    if trial_app_model:


get_recommended_apps_and_categories opens a new SQLAlchemy Session and runs a query for each app in the loop. This creates an N+1 query pattern and can put unnecessary pressure on the connection pool. Consider creating a single session for the whole block and fetching all matching TrialApp.app_id values in one IN (...) query, then setting can_trial via set membership.

Copilot · 2026-03-01T08:27:37Z

        result: dict = retrieval_instance.get_recommend_app_detail(app_id)
        if FeatureService.get_system_features().enable_trial_app:
            app_id = result["id"]
-            trial_app_model = db.session.query(TrialApp).where(TrialApp.app_id == app_id).first()
-            if trial_app_model:
-                result["can_trial"] = True
-            else:
-                result["can_trial"] = False
+            with session_factory.create_session() as session:
+                trial_app_model = session.query(TrialApp).where(TrialApp.app_id == app_id).first()


get_recommend_app_detail can return None (e.g., remote retrieval non-200). When enable_trial_app is enabled, this code will raise a TypeError by subscripting result["id"]. Add a guard to return None early when result is falsy before using it in the trial-app lookup.

github-actions · 2026-03-02T05:07:56Z

Pyrefly Diff

No changes detected.

github-actions · 2026-03-13T13:26:59Z

Pyrefly Diff

No changes detected.

github-actions · 2026-03-18T00:24:41Z

Pyrefly Diff

No changes detected.

Copilot

Pull request overview

Copilot reviewed 1 out of 1 changed files in this pull request and generated 1 comment.

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

You can also share your feedback on Copilot code review. Take the survey.

+            with session_factory.create_session() as session:
+                trial_app_model = session.query(TrialApp).where(TrialApp.app_id == app_id).first()
+                if trial_app_model:
+                    result["can_trial"] = True
+                else:


github-actions · 2026-03-27T23:25:50Z

Pyrefly Diff

No changes detected.

asukaminato0721 requested a review from QuantumGhost as a code owner February 9, 2026 14:39

Copilot AI review requested due to automatic review settings February 9, 2026 14:39

dosubot bot added size:M This PR changes 30-99 lines, ignoring generated files. refactor labels Feb 9, 2026

Copilot started reviewing on behalf of asukaminato0721 February 9, 2026 14:39 View session

gemini-code-assist bot reviewed Feb 9, 2026

View reviewed changes

Comment thread api/services/recommended_app_service.py

Comment thread api/services/recommended_app_service.py

Comment thread api/services/recommended_app_service.py

Copilot AI reviewed Feb 9, 2026

View reviewed changes

Comment thread api/services/recommended_app_service.py

Comment thread api/services/recommended_app_service.py

Comment thread api/services/recommended_app_service.py

Comment thread api/services/recommended_app_service.py

Copilot AI review requested due to automatic review settings March 1, 2026 08:23

Copilot started reviewing on behalf of asukaminato0721 March 1, 2026 08:23 View session

Copilot AI reviewed Mar 1, 2026

View reviewed changes

asukaminato0721 requested review from Copilot and crazywoola and removed request for Copilot March 13, 2026 13:25

Copilot AI review requested due to automatic review settings March 18, 2026 00:22

Copilot started reviewing on behalf of asukaminato0721 March 18, 2026 00:23 View session

Copilot AI reviewed Mar 18, 2026

View reviewed changes

Comment thread api/services/recommended_app_service.py

Comment on lines +50 to +54

with session_factory.create_session() as session:

trial_app_model = session.query(TrialApp).where(TrialApp.app_id == app_id).first()

if trial_app_model:

result["can_trial"] = True

else:

.

262ec62

asukaminato0721 force-pushed the 24115-services/recommended_app_service.py branch from 0bb07c6 to 262ec62 Compare March 27, 2026 23:24

Conversation

asukaminato0721 commented Feb 9, 2026

Summary

Screenshots

Checklist

Uh oh!

gemini-code-assist bot commented Feb 9, 2026

Summary of Changes

Highlights

Footnotes

Uh oh!

gemini-code-assist bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

github-actions bot commented Mar 1, 2026

Pyrefly Diff

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Copilot AI Mar 1, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 1, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 1, 2026

Choose a reason for hiding this comment

Uh oh!

github-actions bot commented Mar 2, 2026

Pyrefly Diff

Uh oh!

github-actions bot commented Mar 13, 2026

Pyrefly Diff

Uh oh!

github-actions bot commented Mar 18, 2026

Pyrefly Diff

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

github-actions bot commented Mar 27, 2026

Pyrefly Diff

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants