Skip to content

feat: Rename modules for runtime versioning support #6763

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.

Sign up for GitHub

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

Open
copybara-service wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: Rename modules for runtime versioning support #6763

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions tests/unit/vertexai/genai/replays/test_delete_ae_runtime_revision.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,18 +79,18 @@ def test_delete_runtime_revision(
},
)

runtime_revisions_iter = client.agent_engines.runtimes.revisions.list(
runtime_revisions_iter = client.agent_engines.revisions.list(
name=updated_agent_engine.api_resource.name,
)
runtime_revisions_list = list(runtime_revisions_iter)
assert len(runtime_revisions_list) == 2
revision_to_delete = runtime_revisions_list[1]
operation = client.agent_engines.runtimes.revisions.delete(
operation = client.agent_engines.revisions.delete(
name=revision_to_delete.api_resource.name,
)
assert isinstance(operation, types.DeleteAgentEngineRuntimeRevisionOperation)
assert operation.done
runtime_revisions_iter = client.agent_engines.runtimes.revisions.list(
runtime_revisions_iter = client.agent_engines.revisions.list(
name=updated_agent_engine.api_resource.name,
)
runtime_revisions_list = list(runtime_revisions_iter)
Expand All @@ -105,7 +105,7 @@ def test_delete_runtime_revision(
pytestmark = pytest_helper.setup(
file=__file__,
globals_for_file=globals(),
test_method="agent_engines.runtimes.revisions.delete",
test_method="agent_engines.revisions.delete",
)


Expand Down Expand Up @@ -167,15 +167,15 @@ async def test_delete_runtime_revision_async(
},
)

runtime_revisions_iter = client.aio.agent_engines.runtimes.revisions.list(
runtime_revisions_iter = client.aio.agent_engines.revisions.list(
name=updated_agent_engine.api_resource.name,
)
runtime_revisions_list = []
async for revision in runtime_revisions_iter:
runtime_revisions_list.append(revision)
assert len(runtime_revisions_list) == 2
revision_to_delete = runtime_revisions_list[1]
operation = await client.aio.agent_engines.runtimes.revisions.delete(
operation = await client.aio.agent_engines.revisions.delete(
name=revision_to_delete.api_resource.name,
)
assert isinstance(operation, types.DeleteAgentEngineRuntimeRevisionOperation)
Expand Down
10 changes: 5 additions & 5 deletions tests/unit/vertexai/genai/replays/test_get_ae_runtime_revision.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,15 +58,15 @@ def test_get_runtime_revisions(
agent_engine.api_resource.display_name
== "test-agent-engine-get-runtime-revisions"
)
runtime_revisions_iter = client.agent_engines.runtimes.revisions.list(
runtime_revisions_iter = client.agent_engines.revisions.list(
name=agent_engine.api_resource.name,
)
runtime_revisions_list = list(runtime_revisions_iter)
assert len(runtime_revisions_list) == 1

assert isinstance(runtime_revisions_list[0], types.AgentEngineRuntimeRevision)
runtime_revision_name = runtime_revisions_list[0].api_resource.name
runtime_revision = client.agent_engines.runtimes.revisions.get(
runtime_revision = client.agent_engines.revisions.get(
name=runtime_revision_name,
)
assert isinstance(runtime_revision, types.AgentEngineRuntimeRevision)
Expand All @@ -78,7 +78,7 @@ def test_get_runtime_revisions(
pytestmark = pytest_helper.setup(
file=__file__,
globals_for_file=globals(),
test_method="agent_engines.runtimes.revisions.get",
test_method="agent_engines.revisions.get",
)

pytest_plugins = ("pytest_asyncio",)
Expand Down Expand Up @@ -119,7 +119,7 @@ async def test_async_get_runtime_revisions(
agent_engine.api_resource.display_name
== "test-agent-engine-get-runtime-revisions"
)
runtime_revisions_iter = client.aio.agent_engines.runtimes.revisions.list(
runtime_revisions_iter = client.aio.agent_engines.revisions.list(
name=agent_engine.api_resource.name,
)
runtime_revisions_list = []
Expand All @@ -128,7 +128,7 @@ async def test_async_get_runtime_revisions(
assert len(runtime_revisions_list) == 1
assert isinstance(runtime_revisions_list[0], types.AgentEngineRuntimeRevision)
runtime_revision_name = runtime_revisions_list[0].api_resource.name
runtime_revision = await client.aio.agent_engines.runtimes.revisions.get(
runtime_revision = await client.aio.agent_engines.revisions.get(
name=runtime_revision_name,
)
assert isinstance(runtime_revision, types.AgentEngineRuntimeRevision)
Expand Down
6 changes: 3 additions & 3 deletions tests/unit/vertexai/genai/replays/test_list_ae_runtime_revisions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ def test_list_runtime_revisions(
agent_engine.api_resource.display_name
== "test-agent-engine-list-runtime-revisions"
)
runtime_revisions_iter = client.agent_engines.runtimes.revisions.list(
runtime_revisions_iter = client.agent_engines.revisions.list(
name=agent_engine.api_resource.name,
)
runtime_revisions_list = list(runtime_revisions_iter)
Expand All @@ -74,7 +74,7 @@ def test_list_runtime_revisions(
pytestmark = pytest_helper.setup(
file=__file__,
globals_for_file=globals(),
test_method="agent_engines.runtimes.revisions.list",
test_method="agent_engines.revisions.list",
)

pytest_plugins = ("pytest_asyncio",)
Expand Down Expand Up @@ -115,7 +115,7 @@ async def test_async_list_runtime_revisions(
agent_engine.api_resource.display_name
== "test-agent-engine-list-runtime-revisions"
)
runtime_revisions_iter = client.aio.agent_engines.runtimes.revisions.list(
runtime_revisions_iter = client.aio.agent_engines.revisions.list(
name=agent_engine.api_resource.name,
)
runtime_revisions_list = []
Expand Down
6 changes: 3 additions & 3 deletions tests/unit/vertexai/genai/replays/test_update_traffic_agent_engine.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ def test_agent_engines_update_traffic_to_manual_split(
},
)

runtime_revisions_iter = client.agent_engines.runtimes.revisions.list(
runtime_revisions_iter = client.agent_engines.revisions.list(
name=agent_engine.api_resource.name,
)
runtime_revisions_list = list(runtime_revisions_iter)
Expand Down Expand Up @@ -148,7 +148,7 @@ def test_agent_engines_update_traffic_with_agent_update(
== "test-agent-engine-update-traffic-with-agent-before-update"
)
assert agent_engine.api_resource.traffic_config is None
runtime_revisions_iter = client.agent_engines.runtimes.revisions.list(
runtime_revisions_iter = client.agent_engines.revisions.list(
name=agent_engine.api_resource.name,
)
runtime_revisions_list = list(runtime_revisions_iter)
Expand Down Expand Up @@ -197,7 +197,7 @@ def test_agent_engines_update_traffic_with_agent_update(
== "test-agent-engine-update-traffic-with-agent-after-update"
)
assert updated_agent_engine.api_resource.traffic_config == traffic_config
runtime_revisions_iter = client.agent_engines.runtimes.revisions.list(
runtime_revisions_iter = client.agent_engines.revisions.list(
name=agent_engine.api_resource.name,
)
runtime_revisions_list = list(runtime_revisions_iter)
Expand Down
53 changes: 26 additions & 27 deletions tests/unit/vertexai/genai/test_agent_engine_runtime_revisions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -844,7 +844,7 @@ def teardown_method(self):

def test_get_delete_runtime_revision_operation(self):
with mock.patch.object(
self.client.agent_engines.runtimes.revisions._api_client, "request"
self.client.agent_engines.revisions._api_client, "request"
) as request_mock:
request_mock.return_value = genai_types.HttpResponse(
body=json.dumps(
Expand All @@ -854,7 +854,7 @@ def test_get_delete_runtime_revision_operation(self):
}
),
)
operation = self.client.agent_engines.runtimes.revisions._get_delete_runtime_revision_operation(
operation = self.client.agent_engines.revisions._get_delete_runtime_revision_operation(
operation_name=_TEST_AGENT_ENGINE_REVISION_OPERATION_NAME,
)
request_mock.assert_called_with(
Expand All @@ -870,7 +870,7 @@ def test_get_delete_runtime_revision_operation(self):

def test_await_operation(self):
with mock.patch.object(
self.client.agent_engines.runtimes.revisions._api_client, "request"
self.client.agent_engines.revisions._api_client, "request"
) as request_mock:
request_mock.return_value = genai_types.HttpResponse(
body=json.dumps(
Expand All @@ -882,7 +882,7 @@ def test_await_operation(self):
)
operation = _agent_engines_utils._await_operation(
operation_name=_TEST_AGENT_ENGINE_REVISION_OPERATION_NAME,
get_operation_fn=self.client.agent_engines.runtimes.revisions._get_delete_runtime_revision_operation,
get_operation_fn=self.client.agent_engines.revisions._get_delete_runtime_revision_operation,
)
request_mock.assert_called_with(
"get",
Expand All @@ -895,9 +895,9 @@ def test_await_operation(self):
)

def test_register_api_methods(self):
agent = self.client.agent_engines.runtimes.revisions._register_api_methods(
agent = self.client.agent_engines.revisions._register_api_methods(
agent_engine_runtime_revision=_genai_types.AgentEngineRuntimeRevision(
api_client=self.client.agent_engines.runtimes.revisions._api_client,
api_client=self.client.agent_engines.revisions._api_client,
api_resource=_genai_types.ReasoningEngineRuntimeRevision(
spec=_genai_types.ReasoningEngineSpec(
class_methods=[
Expand Down Expand Up @@ -932,10 +932,10 @@ def teardown_method(self):

def test_get_runtime_revision(self):
with mock.patch.object(
self.client.agent_engines.runtimes.revisions._api_client, "request"
self.client.agent_engines.revisions._api_client, "request"
) as request_mock:
request_mock.return_value = genai_types.HttpResponse(body="")
self.client.agent_engines.runtimes.revisions.get(
self.client.agent_engines.revisions.get(
name=_TEST_AGENT_ENGINE_RUNTIME_REVISION_RESOURCE_NAME
)
request_mock.assert_called_with(
Expand All @@ -947,12 +947,12 @@ def test_get_runtime_revision(self):

def test_list_runtime_revisions(self):
with mock.patch.object(
self.client.agent_engines.runtimes.revisions._api_client, "request"
self.client.agent_engines.revisions._api_client, "request"
) as request_mock:
request_mock.return_value = genai_types.HttpResponse(body="")
expected_query_params = {"filter": _TEST_LIST_FILTER}
list(
self.client.agent_engines.runtimes.revisions.list(
self.client.agent_engines.revisions.list(
name=_TEST_AGENT_ENGINE_RESOURCE_NAME, config=expected_query_params
)
)
Expand All @@ -968,7 +968,7 @@ def test_list_runtime_revisions(self):

def test_delete_runtime_revision(self):
with mock.patch.object(
self.client.agent_engines.runtimes.revisions._api_client, "request"
self.client.agent_engines.revisions._api_client, "request"
) as request_mock:
request_mock.side_effect = [
# First call: response to delete.
Expand All @@ -984,7 +984,7 @@ def test_delete_runtime_revision(self):
),
]

self.client.agent_engines.runtimes.revisions.delete(
self.client.agent_engines.revisions.delete(
name=_TEST_AGENT_ENGINE_RUNTIME_REVISION_RESOURCE_NAME
)
request_mock.call_args_list[0].assert_called_with(
Expand All @@ -1003,12 +1003,12 @@ def test_delete_runtime_revision(self):

def test_query_runtime_revision(self):
with mock.patch.object(
self.client.agent_engines.runtimes.revisions._api_client, "request"
self.client.agent_engines.revisions._api_client, "request"
) as request_mock:
request_mock.return_value = genai_types.HttpResponse(body="")
agent = self.client.agent_engines.runtimes.revisions._register_api_methods(
agent = self.client.agent_engines.revisions._register_api_methods(
agent_engine_runtime_revision=_genai_types.AgentEngineRuntimeRevision(
api_client=self.client.agent_engines.runtimes.revisions,
api_client=self.client.agent_engines.revisions,
api_resource=_genai_types.ReasoningEngineRuntimeRevision(
name=_TEST_AGENT_ENGINE_RUNTIME_REVISION_RESOURCE_NAME,
spec=_genai_types.ReasoningEngineSpec(
Expand All @@ -1032,10 +1032,10 @@ def test_query_runtime_revision(self):
)

def test_query_agent_engine_async(self):
agent = self.client.agent_engines.runtimes.revisions._register_api_methods(
agent = self.client.agent_engines.revisions._register_api_methods(
agent_engine_runtime_revision=_genai_types.AgentEngineRuntimeRevision(
api_async_client=runtime_revisions.AsyncRuntimeRevisions(
api_client_=self.client.agent_engines.runtimes.revisions._api_client
api_client_=self.client.agent_engines.revisions._api_client
),
api_resource=_genai_types.ReasoningEngineRuntimeRevision(
name=_TEST_AGENT_ENGINE_RUNTIME_REVISION_RESOURCE_NAME,
Expand All @@ -1048,7 +1048,7 @@ def test_query_agent_engine_async(self):
)
)
with mock.patch.object(
self.client.agent_engines.runtimes.revisions._api_client, "async_request"
self.client.agent_engines.revisions._api_client, "async_request"
) as request_mock:
request_mock.return_value = genai_types.HttpResponse(body="")
asyncio.run(agent.async_query(query=_TEST_QUERY_PROMPT))
Expand All @@ -1065,11 +1065,11 @@ def test_query_agent_engine_async(self):

def test_query_agent_engine_stream(self):
with mock.patch.object(
self.client.agent_engines.runtimes.revisions._api_client, "request_streamed"
self.client.agent_engines.revisions._api_client, "request_streamed"
) as request_mock:
agent = self.client.agent_engines.runtimes.revisions._register_api_methods(
agent = self.client.agent_engines.revisions._register_api_methods(
agent_engine_runtime_revision=_genai_types.AgentEngineRuntimeRevision(
api_client=self.client.agent_engines.runtimes.revisions,
api_client=self.client.agent_engines.revisions,
api_resource=_genai_types.ReasoningEngineRuntimeRevision(
name=_TEST_AGENT_ENGINE_RUNTIME_REVISION_RESOURCE_NAME,
spec=_genai_types.ReasoningEngineSpec(
Expand Down Expand Up @@ -1097,13 +1097,13 @@ async def mock_async_generator():
yield genai_types.HttpResponse(body=b"")

with mock.patch.object(
self.client.agent_engines.runtimes.revisions._api_client,
self.client.agent_engines.revisions._api_client,
"async_request_streamed",
) as request_mock:
request_mock.return_value = mock_async_generator()
agent = self.client.agent_engines.runtimes.revisions._register_api_methods(
agent = self.client.agent_engines.revisions._register_api_methods(
agent_engine_runtime_revision=_genai_types.AgentEngineRuntimeRevision(
api_client=self.client.agent_engines.runtimes.revisions,
api_client=self.client.agent_engines.revisions,
api_resource=_genai_types.ReasoningEngine(
name=_TEST_AGENT_ENGINE_RUNTIME_REVISION_RESOURCE_NAME,
spec=_genai_types.ReasoningEngineSpec(
Expand Down Expand Up @@ -1154,8 +1154,7 @@ def teardown_method(self):

def test_delete_runtime_revision(self):
with mock.patch.object(
self.client.aio.agent_engines.runtimes.revisions._api_client,
"async_request",
self.client.aio.agent_engines.revisions._api_client, "async_request"
) as request_mock:
request_mock.side_effect = [
# First call: response to delete.
Expand All @@ -1171,7 +1170,7 @@ def test_delete_runtime_revision(self):
),
]
asyncio.run(
self.client.aio.agent_engines.runtimes.revisions.delete(
self.client.aio.agent_engines.revisions.delete(
name=_TEST_AGENT_ENGINE_RUNTIME_REVISION_RESOURCE_NAME
)
)
Expand Down
Loading
Loading