mirror of
https://github.com/EvolutionAPI/adk-python.git
synced 2025-12-19 03:42:22 -06:00
chore: reformat the codes using autoformat.sh
PiperOrigin-RevId: 762004002
This commit is contained in:
Xiang (Sean) Zhou
committed by
Copybara-Service
Copybara-Service
parent
a2263b1808
commit
ff8a3c9b43
@@ -17,70 +17,74 @@
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import click
|
||||
from pathlib import Path
|
||||
import shutil
|
||||
import pytest
|
||||
import subprocess
|
||||
import tempfile
|
||||
import types
|
||||
|
||||
import google.adk.cli.cli_deploy as cli_deploy
|
||||
|
||||
from pathlib import Path
|
||||
from typing import Any, Callable, Dict, List, Tuple
|
||||
from typing import Any
|
||||
from typing import Callable
|
||||
from typing import Dict
|
||||
from typing import List
|
||||
from typing import Tuple
|
||||
from unittest import mock
|
||||
|
||||
import click
|
||||
import google.adk.cli.cli_deploy as cli_deploy
|
||||
import pytest
|
||||
|
||||
|
||||
# Helpers
|
||||
class _Recorder:
|
||||
"""A callable object that records every invocation."""
|
||||
"""A callable object that records every invocation."""
|
||||
|
||||
def __init__(self) -> None:
|
||||
self.calls: List[Tuple[Tuple[Any, ...], Dict[str, Any]]] = []
|
||||
def __init__(self) -> None:
|
||||
self.calls: List[Tuple[Tuple[Any, ...], Dict[str, Any]]] = []
|
||||
|
||||
def __call__(self, *args: Any, **kwargs: Any) -> None:
|
||||
self.calls.append((args, kwargs))
|
||||
def __call__(self, *args: Any, **kwargs: Any) -> None:
|
||||
self.calls.append((args, kwargs))
|
||||
|
||||
|
||||
# Fixtures
|
||||
@pytest.fixture(autouse=True)
|
||||
def _mute_click(monkeypatch: pytest.MonkeyPatch) -> None:
|
||||
"""Suppress click.echo to keep test output clean."""
|
||||
monkeypatch.setattr(click, "echo", lambda *a, **k: None)
|
||||
"""Suppress click.echo to keep test output clean."""
|
||||
monkeypatch.setattr(click, "echo", lambda *a, **k: None)
|
||||
|
||||
|
||||
@pytest.fixture()
|
||||
def agent_dir(tmp_path: Path) -> Callable[[bool], Path]:
|
||||
"""Return a factory that creates a dummy agent directory tree."""
|
||||
"""Return a factory that creates a dummy agent directory tree."""
|
||||
|
||||
def _factory(include_requirements: bool) -> Path:
|
||||
base = tmp_path / "agent"
|
||||
base.mkdir()
|
||||
(base / "agent.py").write_text("# dummy agent")
|
||||
(base / "__init__.py").touch()
|
||||
if include_requirements:
|
||||
(base / "requirements.txt").write_text("pytest\n")
|
||||
return base
|
||||
def _factory(include_requirements: bool) -> Path:
|
||||
base = tmp_path / "agent"
|
||||
base.mkdir()
|
||||
(base / "agent.py").write_text("# dummy agent")
|
||||
(base / "__init__.py").touch()
|
||||
if include_requirements:
|
||||
(base / "requirements.txt").write_text("pytest\n")
|
||||
return base
|
||||
|
||||
return _factory
|
||||
return _factory
|
||||
|
||||
|
||||
# _resolve_project
|
||||
def test_resolve_project_with_option() -> None:
|
||||
"""It should return the explicit project value untouched."""
|
||||
assert cli_deploy._resolve_project("my-project") == "my-project"
|
||||
"""It should return the explicit project value untouched."""
|
||||
assert cli_deploy._resolve_project("my-project") == "my-project"
|
||||
|
||||
|
||||
def test_resolve_project_from_gcloud(monkeypatch: pytest.MonkeyPatch) -> None:
|
||||
"""It should fall back to `gcloud config get-value project` when no value supplied."""
|
||||
monkeypatch.setattr(
|
||||
subprocess,
|
||||
"run",
|
||||
lambda *a, **k: types.SimpleNamespace(stdout="gcp-proj\n"),
|
||||
)
|
||||
"""It should fall back to `gcloud config get-value project` when no value supplied."""
|
||||
monkeypatch.setattr(
|
||||
subprocess,
|
||||
"run",
|
||||
lambda *a, **k: types.SimpleNamespace(stdout="gcp-proj\n"),
|
||||
)
|
||||
|
||||
with mock.patch("click.echo") as mocked_echo:
|
||||
assert cli_deploy._resolve_project(None) == "gcp-proj"
|
||||
mocked_echo.assert_called_once()
|
||||
with mock.patch("click.echo") as mocked_echo:
|
||||
assert cli_deploy._resolve_project(None) == "gcp-proj"
|
||||
mocked_echo.assert_called_once()
|
||||
|
||||
|
||||
# to_cloud_run
|
||||
@@ -90,81 +94,83 @@ def test_to_cloud_run_happy_path(
|
||||
agent_dir: Callable[[bool], Path],
|
||||
include_requirements: bool,
|
||||
) -> None:
|
||||
"""
|
||||
End-to-end execution test for `to_cloud_run` covering both presence and
|
||||
absence of *requirements.txt*.
|
||||
"""
|
||||
tmp_dir = Path(tempfile.mkdtemp())
|
||||
src_dir = agent_dir(include_requirements)
|
||||
"""
|
||||
End-to-end execution test for `to_cloud_run` covering both presence and
|
||||
absence of *requirements.txt*.
|
||||
"""
|
||||
tmp_dir = Path(tempfile.mkdtemp())
|
||||
src_dir = agent_dir(include_requirements)
|
||||
|
||||
copy_recorder = _Recorder()
|
||||
run_recorder = _Recorder()
|
||||
copy_recorder = _Recorder()
|
||||
run_recorder = _Recorder()
|
||||
|
||||
# Cache the ORIGINAL copytree before patching
|
||||
original_copytree = cli_deploy.shutil.copytree
|
||||
# Cache the ORIGINAL copytree before patching
|
||||
original_copytree = cli_deploy.shutil.copytree
|
||||
|
||||
def _recording_copytree(*args: Any, **kwargs: Any):
|
||||
copy_recorder(*args, **kwargs)
|
||||
return original_copytree(*args, **kwargs)
|
||||
def _recording_copytree(*args: Any, **kwargs: Any):
|
||||
copy_recorder(*args, **kwargs)
|
||||
return original_copytree(*args, **kwargs)
|
||||
|
||||
monkeypatch.setattr(cli_deploy.shutil, "copytree", _recording_copytree)
|
||||
# Skip actual cleanup so that we can inspect generated files later.
|
||||
monkeypatch.setattr(cli_deploy.shutil, "rmtree", lambda *_a, **_k: None)
|
||||
monkeypatch.setattr(subprocess, "run", run_recorder)
|
||||
monkeypatch.setattr(cli_deploy.shutil, "copytree", _recording_copytree)
|
||||
# Skip actual cleanup so that we can inspect generated files later.
|
||||
monkeypatch.setattr(cli_deploy.shutil, "rmtree", lambda *_a, **_k: None)
|
||||
monkeypatch.setattr(subprocess, "run", run_recorder)
|
||||
|
||||
cli_deploy.to_cloud_run(
|
||||
agent_folder=str(src_dir),
|
||||
project="proj",
|
||||
region="asia-northeast1",
|
||||
service_name="svc",
|
||||
app_name="app",
|
||||
temp_folder=str(tmp_dir),
|
||||
port=8080,
|
||||
trace_to_cloud=True,
|
||||
with_ui=True,
|
||||
verbosity="info",
|
||||
session_db_url="sqlite://",
|
||||
adk_version="0.0.5",
|
||||
)
|
||||
cli_deploy.to_cloud_run(
|
||||
agent_folder=str(src_dir),
|
||||
project="proj",
|
||||
region="asia-northeast1",
|
||||
service_name="svc",
|
||||
app_name="app",
|
||||
temp_folder=str(tmp_dir),
|
||||
port=8080,
|
||||
trace_to_cloud=True,
|
||||
with_ui=True,
|
||||
verbosity="info",
|
||||
session_db_url="sqlite://",
|
||||
adk_version="0.0.5",
|
||||
)
|
||||
|
||||
# Assertions
|
||||
assert len(copy_recorder.calls) == 1, "Agent sources must be copied exactly once."
|
||||
assert run_recorder.calls, "gcloud command should be executed at least once."
|
||||
assert (tmp_dir / "Dockerfile").exists(), "Dockerfile must be generated."
|
||||
# Assertions
|
||||
assert (
|
||||
len(copy_recorder.calls) == 1
|
||||
), "Agent sources must be copied exactly once."
|
||||
assert run_recorder.calls, "gcloud command should be executed at least once."
|
||||
assert (tmp_dir / "Dockerfile").exists(), "Dockerfile must be generated."
|
||||
|
||||
# Manual cleanup because we disabled rmtree in the monkeypatch.
|
||||
shutil.rmtree(tmp_dir, ignore_errors=True)
|
||||
# Manual cleanup because we disabled rmtree in the monkeypatch.
|
||||
shutil.rmtree(tmp_dir, ignore_errors=True)
|
||||
|
||||
|
||||
def test_to_cloud_run_cleans_temp_dir(
|
||||
monkeypatch: pytest.MonkeyPatch,
|
||||
agent_dir: Callable[[bool], Path],
|
||||
) -> None:
|
||||
"""`to_cloud_run` should always delete the temporary folder on exit."""
|
||||
tmp_dir = Path(tempfile.mkdtemp())
|
||||
src_dir = agent_dir(False)
|
||||
"""`to_cloud_run` should always delete the temporary folder on exit."""
|
||||
tmp_dir = Path(tempfile.mkdtemp())
|
||||
src_dir = agent_dir(False)
|
||||
|
||||
deleted: Dict[str, Path] = {}
|
||||
deleted: Dict[str, Path] = {}
|
||||
|
||||
def _fake_rmtree(path: str | Path, *a: Any, **k: Any) -> None:
|
||||
deleted["path"] = Path(path)
|
||||
def _fake_rmtree(path: str | Path, *a: Any, **k: Any) -> None:
|
||||
deleted["path"] = Path(path)
|
||||
|
||||
monkeypatch.setattr(cli_deploy.shutil, "rmtree", _fake_rmtree)
|
||||
monkeypatch.setattr(subprocess, "run", _Recorder())
|
||||
monkeypatch.setattr(cli_deploy.shutil, "rmtree", _fake_rmtree)
|
||||
monkeypatch.setattr(subprocess, "run", _Recorder())
|
||||
|
||||
cli_deploy.to_cloud_run(
|
||||
agent_folder=str(src_dir),
|
||||
project="proj",
|
||||
region=None,
|
||||
service_name="svc",
|
||||
app_name="app",
|
||||
temp_folder=str(tmp_dir),
|
||||
port=8080,
|
||||
trace_to_cloud=False,
|
||||
with_ui=False,
|
||||
verbosity="info",
|
||||
session_db_url=None,
|
||||
adk_version="0.0.5",
|
||||
)
|
||||
cli_deploy.to_cloud_run(
|
||||
agent_folder=str(src_dir),
|
||||
project="proj",
|
||||
region=None,
|
||||
service_name="svc",
|
||||
app_name="app",
|
||||
temp_folder=str(tmp_dir),
|
||||
port=8080,
|
||||
trace_to_cloud=False,
|
||||
with_ui=False,
|
||||
verbosity="info",
|
||||
session_db_url=None,
|
||||
adk_version="0.0.5",
|
||||
)
|
||||
|
||||
assert deleted["path"] == tmp_dir
|
||||
assert deleted["path"] == tmp_dir
|
||||
|
||||
Reference in New Issue
Block a user