fix(cli): handle agent engine deploy imports

[smwitkowski]

Summary

This PR closes #4237

• Sanitize Agent Engine temp folder names to avoid invalid Python module imports.
• Adjust Agent Engine template imports to support agents located under an app/ subdirectory.
• Document the fixes in the changelog.

Root Cause

• Temp folders derived from agent names included hyphens, yielding invalid module paths for import.
• The generated template always imported from .agent, which fails when the agent is under app/agent.py.

Testing

• uv run pytest tests/unittests/cli/utils/test_cli_deploy.py
• Manual E2E

[gemini-code-assist]

Summary of Changes

Hello @smwitkowski, 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 resolves two critical issues affecting the deployment of Agent Engines. It ensures that temporary directories created during deployment have valid Python module names by sanitizing them, and it adapts the import mechanism to correctly locate agent files whether they are at the root level or nested within an 'app/' subdirectory. These changes enhance the robustness and flexibility of the Agent Engine deployment process.

Highlights

• Temporary Folder Name Sanitization: Introduced a sanitization function to replace hyphens with underscores in Agent Engine temporary folder names, resolving issues with invalid Python module imports.
• Dynamic Agent Import Paths: Modified the Agent Engine deployment logic to dynamically determine the correct import module path, supporting agents located directly in the root or within an 'app/' subdirectory.

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

[adk-bot]

Response from ADK Triaging Agent

Hello @smwitkowski, thank you for creating this PR!

This is a great bug fix. Could you please associate a GitHub issue with this PR? If there is no existing issue, could you please create one? This information will help us to track the bug and the fix more effectively. Thanks!

[gemini-code-assist]

Code Review

This pull request introduces two important fixes for agent engine deployment. First, it sanitizes temporary folder names by replacing hyphens to prevent invalid Python module import errors. Second, it adjusts the agent engine template to correctly handle imports for agents located within an app/ subdirectory. The changes are well-structured and address the root causes described. I've added one suggestion to make the folder name sanitization more robust against other potential invalid characters. Overall, this is a good improvement.

[ryanaiagent]

Hi @smwitkowski , Thank you for your contribution through this pull request! This PR has merge conflicts that require changes from your end. Could you please rebase your branch with the latest main branch to address these? Once this is complete, please let us know so we can proceed with the review.

[smwitkowski]

Hi @ryanaiagent - I've rebased my branch with the recent changes!

cc: @wuliang229