Skip to content

Commit 38dc7a0

Browse files
authored
fix: relax a2a sdk compatibility (#950)
1 parent 20146db commit 38dc7a0

8 files changed

Lines changed: 14 additions & 13 deletions

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ authors = [
1717
]
1818
dependencies = [
1919
"pydantic-settings==2.10.1", # Config management
20-
"a2a-sdk==0.3.7", # For Google Agent2Agent protocol
20+
"a2a-sdk>=0.3.7,<1.0.0", # For Google Agent2Agent protocol
2121
"deprecated==1.2.18",
2222
"google-adk>=1.34.0", # For basic agent architecture
2323
# litellm and sqlalchemy are required by code paths veadk always uses

tests/cli/test_generated_agent_backend_codegen_extended.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
"agents/demo_agent/__init__.py": "ba3abbb199bbae74dc75151a44ba53a557e5f47d509835950ca756346c5a9582",
7373
"agents/demo_agent/dynamic_a2a.py": "d136f27d6a77439708c415686a3d167f2ad2fb9a96a5f8a0751916b09d46e364",
7474
".env.example": "ec3258da9bef4e74333376d8554c265ccb12a4a1e5d4e1e1b0acdf5c9ae93ab6",
75-
"requirements.txt": "220cfbc918879965e134924dd704b76d2282392a371da60492d5405d7b83bf48",
75+
"requirements.txt": "d04dddbe531e1d4315ea5ea6349bd9eff73815d9e3b4e996448e6c3db96caf15",
7676
"README.md": "a34208314cf9061c02662028d7a9dd97448e6b73c1d732cb4aeaa8f70dbbc684",
7777
}
7878

@@ -83,7 +83,7 @@
8383
"agents/full_agent/__init__.py": "ba3abbb199bbae74dc75151a44ba53a557e5f47d509835950ca756346c5a9582",
8484
"agents/full_agent/dynamic_a2a.py": "d136f27d6a77439708c415686a3d167f2ad2fb9a96a5f8a0751916b09d46e364",
8585
".env.example": "2bfd3afda4e661fbb71588ec5f0d584ce6682363cacc81b0394f8da09f7977e8",
86-
"requirements.txt": "17a9afc0b90bf3ba6e8bc3711181b8f0b01918824d554f1b435cf22ef780bff4",
86+
"requirements.txt": "35f70f219bbb2c5f0f22cbc0774d9d8e50d9162727579476ca006604ec0da7e2",
8787
"README.md": "1bf4dc889c7d1076f50784d253b53412ba7c49bcb69a5d948f9092dbbecb18ac",
8888
}
8989

tests/cli/test_generated_agent_harness_sidecar.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ def test_selected_component_generates_extra_app_plugins_and_close_lifecycle(
7474
main_py = files["main.py"]
7575
agent_py = files["agents/sidecar_agent/agent.py"]
7676
assert "veadk-python[harness-sidecar]" in requirements
77-
assert "agentkit-sdk-python==0.8.1" in requirements
77+
assert "agentkit-sdk-python==0.8.4" in requirements
7878
assert "bytedance-agentkit-harness-sidecar" not in requirements
7979
assert "HarnessExtension.from_env()" in agent_py
8080
assert "plugins=harness_extension.plugins()" in agent_py

tests/cli/test_managed_sidecar_source.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,23 +60,23 @@ def test_rewrite_uses_source_snapshot_and_pins_public_sdk() -> None:
6060
assert "veadk-python" in rewritten.splitlines()[0]
6161
assert "veadk-python[" not in rewritten
6262
assert "agentkit-harness-sidecar-integration" not in rewritten
63-
assert rewritten.splitlines()[1] == "agentkit-sdk-python==0.8.1"
64-
assert rewritten.splitlines().count("agentkit-sdk-python==0.8.1") == 1
63+
assert rewritten.splitlines()[1] == "agentkit-sdk-python==0.8.4"
64+
assert rewritten.splitlines().count("agentkit-sdk-python==0.8.4") == 1
6565
assert "google-adk>=1.34.0" in rewritten
6666

6767

6868
def test_rewrite_preserves_comments_and_rejects_missing_veadk() -> None:
6969
with pytest.raises(ManagedSidecarSourceError, match="requirement_missing"):
7070
rewrite_managed_sidecar_requirements(
71-
"# keep\n@local-reference\nagentkit-sdk-python==0.8.1\n"
71+
"# keep\n@local-reference\nagentkit-sdk-python==0.8.4\n"
7272
)
7373

7474
rewritten = rewrite_managed_sidecar_requirements(
7575
"# keep\nveadk-python[harness-sidecar]\n"
76-
"agentkit-sdk-python>=0.8\nagentkit_sdk_python==0.8.1\n"
76+
"agentkit-sdk-python>=0.8\nagentkit_sdk_python==0.8.4\n"
7777
)
7878
assert "# keep" in rewritten
79-
assert rewritten.splitlines().count("agentkit-sdk-python==0.8.1") == 1
79+
assert rewritten.splitlines().count("agentkit-sdk-python==0.8.4") == 1
8080

8181

8282
def test_stage_copies_only_safe_runtime_source_and_rewrites_requirements(
@@ -106,7 +106,7 @@ def test_stage_copies_only_safe_runtime_source_and_rewrites_requirements(
106106
assert not (project / "veadk/__pycache__").exists()
107107
assert not (project / "veadk/.env.local").exists()
108108
requirements = (project / "requirements.txt").read_text(encoding="utf-8")
109-
assert requirements.splitlines().count("agentkit-sdk-python==0.8.1") == 1
109+
assert requirements.splitlines().count("agentkit-sdk-python==0.8.4") == 1
110110
assert "veadk-python[" not in requirements
111111

112112

tests/cli/test_studio_rbac.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3686,7 +3686,7 @@ def kill(self) -> None:
36863686
assert captured["create_only"] is True
36873687
assert captured["managed_source_present"] is True
36883688
assert "veadk-python[" not in captured["requirements"]
3689-
assert "agentkit-sdk-python==0.8.1" in captured["requirements"]
3689+
assert "agentkit-sdk-python==0.8.4" in captured["requirements"]
36903690
assert captured["config"]["name"] == runtime_name
36913691
assert captured["config"]["harness_sidecar"]["component_overrides"] == {
36923692
"context_engine": True,

tests/test_ve_tos.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ def test_ve_tos_database_region_wins_over_region_env(monkeypatch, fake_tos):
8686
def test_tos_config_uses_region_env_fallback_and_updates_endpoint(monkeypatch):
8787
from veadk.configs.database_configs import TOSConfig
8888

89+
monkeypatch.delenv("AGENTKIT_CLOUD_PROVIDER", raising=False)
8990
monkeypatch.setenv("CLOUD_PROVIDER", "volces")
9091
monkeypatch.delenv("DATABASE_TOS_REGION", raising=False)
9192
monkeypatch.delenv("DATABASE_TOS_ENDPOINT", raising=False)

veadk/cli/generated_agent_codegen.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -922,7 +922,7 @@ def render_requirements(extras: set[str], include_feishu_channel: bool) -> str:
922922
extras_str = f"[{','.join(unique_extras)}]" if unique_extras else ""
923923
minimum_version = "1.1.1" if "harness-sidecar" in all_extras else "1.0.5"
924924
pkg = f"veadk-python{extras_str}>={minimum_version}"
925-
packages = [pkg, "agentkit-sdk-python==0.8.1", "google-adk", "starlette<1.0.0"]
925+
packages = [pkg, "agentkit-sdk-python==0.8.4", "google-adk", "starlette<1.0.0"]
926926
return "\n".join(packages) + "\n"
927927

928928

veadk/cli/managed_sidecar_source.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"agentkit-harness-sidecar-integration",
2929
"veadk-python",
3030
}
31-
_MANAGED_SDK_REQUIREMENT = "agentkit-sdk-python==0.8.1"
31+
_MANAGED_SDK_REQUIREMENT = "agentkit-sdk-python==0.8.4"
3232
_IGNORED_PARTS = {".git", "__pycache__"}
3333
_IGNORED_SUFFIXES = {".pyc", ".pyo"}
3434
_BLOCKED_SUFFIXES = {".key", ".p12", ".pem", ".pfx"}

0 commit comments

Comments
 (0)