fix(cli): load .env file before agent import validation in deploy

[OiPunk]

Summary

• Fixes _validate_agent_import() in adk deploy agent_engine --validate-agent-import to load .env files before importing the agent module
• Agents relying on environment variables at import time (e.g. pydantic BaseSettings) would fail validation with ValidationError because the .env file was not loaded
• Added call to envs.load_dotenv_for_agent() before importlib.import_module(), consistent with how AgentLoader._perform_load() handles .env loading

Fixes #4688

Test plan

• Added unit test test_loads_dotenv_before_import that creates an agent.py reading an env var at import time, with a .env file providing the value, and verifies validation succeeds
• All 31 existing tests in test_cli_deploy.py continue to pass
• All 27 tests in test_agent_loader.py continue to pass
• Code formatted with isort and pyink

Passed pytest results

tests/unittests/cli/utils/test_cli_deploy.py - 31 passed
tests/unittests/cli/utils/test_agent_loader.py - 27 passed

[gemini-code-assist]

Summary of Changes

Hello, 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 addresses a critical issue in the adk deploy command where agent import validation would fail for agents that depend on environment variables defined in .env files. The fix ensures that .env files are loaded prior to the agent module being imported for validation, aligning this behavior with the agent loader's existing .env handling and preventing ValidationError exceptions.

Highlights

• Fix _validate_agent_import(): Ensures .env files are loaded before agent module import validation, resolving issues where agents relying on environment variables at import time (e.g., Pydantic BaseSettings) would fail due to ValidationError.

🧠 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

• src/google/adk/cli/cli_deploy.py
  • Imported the envs utility module.
  • Added a call to envs.load_dotenv_for_agent() within _validate_agent_import() to load .env files before importlib.import_module().
• tests/unittests/cli/utils/test_cli_deploy.py
  • Imported the os module.
  • Added a new unit test test_loads_dotenv_before_import to verify that .env files are correctly loaded before agent module import, preventing validation failures.

Activity

• Added a new unit test test_loads_dotenv_before_import to confirm the fix.
• Verified that all existing 31 tests in test_cli_deploy.py and 27 tests in test_agent_loader.py continue to pass.
• Ensured code is formatted with isort and pyink.

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

[gemini-code-assist]

Code Review

This pull request addresses a bug where environment variables from .env files were not available during agent import validation, by correctly loading the .env file before the agent module is imported. No security vulnerabilities were found. I've included one suggestion to improve the robustness of the new test by ensuring resource cleanup even in case of test failure.

[gemini-code-assist]

To ensure the environment variable is cleaned up even if the test fails, it's a good practice to wrap the test assertion logic in a try...finally block. This prevents state from one test leaking into another, which can cause flaky tests.

Suggested change

	# Should not raise because .env is loaded before import
	cli_deploy._validate_agent_import(
	str(tmp_path), "root_agent", is_config_agent=False
	)
	# Clean up the env var
	os.environ.pop("_ADK_TEST_DEPLOY_VAR", None)
	try:
	# Should not raise because .env is loaded before import
	cli_deploy._validate_agent_import(
	str(tmp_path), "root_agent", is_config_agent=False
	)
	finally:
	# Clean up the env var
	os.environ.pop("_ADK_TEST_DEPLOY_VAR", None)