-
Notifications
You must be signed in to change notification settings - Fork 2.7k
refs #4077, removing sqlite prefix in path to db file expected by aio… #4081
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.
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
base: main
Are you sure you want to change the base?
Conversation
|
Thanks for your pull request! It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA). View this failed invocation of the CLA check for more information. For the most up to date status, view the checks section at the bottom of the pull request. |
Summary of ChangesHello @agherasim, 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 resolves a critical compatibility issue where the Highlights
🧠 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 AssistThe 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
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 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
|
|
Response from ADK Triaging Agent Hello @agherasim, thank you for creating this PR! Before we can proceed with the review, could you please address the following points from our contribution guidelines:
This information will help us to review and merge your contribution more efficiently. Thanks! |
There was a problem hiding this 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 addresses an issue where aiosqlite receives a database URI instead of a file path. The proposed change strips the protocol prefix to resolve this. My review identifies two points for improvement. First, for robustness, str.removeprefix() should be preferred over str.replace() for removing the prefix. Second, and more critically, the fix is incomplete. A similar issue exists in the __init__ method where _is_migration_needed is called, which will cause the service to fail on initialization when a URI is provided. The path stripping logic should be centralized in __init__ to ensure all methods use the correct file path.
| # aiosqlite requires a file path | ||
| path = self._db_path.replace("sqlite+aiosqlite:///", "") | ||
| async with aiosqlite.connect(path) as db: |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
While this change correctly handles the database path for aiosqlite.connect, a similar issue exists in the __init__ method. The _is_migration_needed method is called from __init__ and it internally uses os.path.exists(self._db_path) and sqlite3.connect(self._db_path). Both of these will fail if self._db_path is a URI like sqlite+aiosqlite:///..., causing a RuntimeError during the initialization of SqliteSessionService before this method is ever called.
To resolve this, the path stripping logic should be applied in __init__ so that self._db_path holds the clean file path throughout the object's lifecycle.
| """Connects to the db and performs initial setup.""" | ||
| async with aiosqlite.connect(self._db_path) as db: | ||
| # aiosqlite requires a file path | ||
| path = self._db_path.replace("sqlite+aiosqlite:///", "") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Using str.replace() for removing a prefix can be less robust than alternatives. For removing a prefix, it's more idiomatic and safer to use str.removeprefix() (available in Python 3.9+). Given the modern Python features used elsewhere in the codebase, removeprefix is likely available and is the cleanest option.
| path = self._db_path.replace("sqlite+aiosqlite:///", "") | |
| path = self._db_path.removeprefix("sqlite+aiosqlite:///") |
…sqlite
Please ensure you have read the contribution guide before creating a pull request.
Link to Issue or Description of Change
Problem:
aiosqlitelibrary expects a relative or full path as connection parameter. Google ADK uses a protocol uri approach to select database driver, such assqlite+aiosqlite:///<path>which results in an invalid file path.Solution:
Stripping the protocol part
sqlite+aiosqlite:///results in a file path appropriate for aiosqlite.Testing Plan
Unit Tests:
Please include a summary of passed
pytestresults.Manual End-to-End (E2E) Tests:
Please provide instructions on how to manually test your changes, including any
necessary setup or configuration. Please provide logs or screenshots to help
reviewers better understand the fix.
Checklist
Additional context
Add any other context or screenshots about the feature request here.