-
Notifications
You must be signed in to change notification settings - Fork 2.7k
feat: handle location in DiscoveryEngineSearchTool #4050
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 @ranand12, 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 enhances 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 @ranand12, thank you for your contribution! Before we can merge this pull request, you'll need to sign the Contributor License Agreement (CLA). You can do so by following the instructions in the "cla/google" check at the bottom of the pull request. 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 effectively adds support for regional endpoints in DiscoveryEngineSearchTool by dynamically detecting the location from the resource ID. The change is well-implemented and includes a corresponding unit test to ensure correctness. I have one suggestion to simplify the location parsing logic for improved code clarity and maintainability.
PR Title
feat: support regional endpoints in DiscoveryEngineSearchTool
PR Description
Problem:
DiscoveryEngineSearchTool was defaulting to the global Discovery Engine API endpoint. This caused failures (400 Incorrect API endpoint used. The current endpoint can only serve traffic from "global" region, but got "us" region from the API request. Please follow https://cloud.google.com/generative-ai-app-builder/docs/locations to use the correct regional API endpoint) when attempting to access Data Stores or Search Engines located in specific regions like us or eu.
Solution:
Updated the tool to dynamically detect the region from the resource ID:
specific region is detected.
Testing Plan
Unit Tests:
Summary of passed
pytestresults:1 $ uv run pytest tests/unittests/tools/test_discovery_engine_search_tool.py
2 ============================= 9 passed in 3.90s ==============================
(Verified against the full suite of 3680 tests, all passed.)
Manual End-to-End (E2E) Tests:
To verify, initialize the tool using a regional Data Store ID and observe the client configuration:
1 from google.adk.tools.discovery_engine_search_tool import DiscoveryEngineSearchTool
2
3 # Regional ID
4 ds_id = "projects/my-project/locations/us/collections/default_collection/dataStores/my-ds"
5 tool = DiscoveryEngineSearchTool(data_store_id=ds_id)
6
7 # The internal client now uses the 'us-discoveryengine.googleapis.com' endpoint.
Checklist
Additional context
The implementation ensures that regional Data Stores work out-of-the-box without requiring users to manually configure API endpoints, while maintaining full backward compatibility for global stores.