Skip to content
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

feat: Update Client.api_client from private to public #537

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

feat: Update Client.api_client from private to public #537

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
4 changes: 2 additions & 2 deletions google/genai/_api_module.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
class BaseModule:

def __init__(self, api_client_: _api_client.BaseApiClient):
self._api_client = api_client_
self.api_client = api_client_

@property
def vertexai(self) -> Optional[bool]:
return self._api_client.vertexai
return self.api_client.vertexai
124 changes: 62 additions & 62 deletions google/genai/batches.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -647,11 +647,11 @@ def _create(
)

request_url_dict: Optional[dict[str, str]]
if not self._api_client.vertexai:
if not self.api_client.vertexai:
raise ValueError('This method is only supported in the Vertex AI client.')
else:
request_dict = _CreateBatchJobParameters_to_vertex(
self._api_client, parameter_model
self.api_client, parameter_model
)
request_url_dict = request_dict.get('_url')
if request_url_dict:
Expand All @@ -674,19 +674,19 @@ def _create(
request_dict = _common.convert_to_dict(request_dict)
request_dict = _common.encode_unserializable_types(request_dict)

response_dict = self._api_client.request(
response_dict = self.api_client.request(
'post', path, request_dict, http_options
)

if self._api_client.vertexai:
response_dict = _BatchJob_from_vertex(self._api_client, response_dict)
if self.api_client.vertexai:
response_dict = _BatchJob_from_vertex(self.api_client, response_dict)
else:
response_dict = _BatchJob_from_mldev(self._api_client, response_dict)
response_dict = _BatchJob_from_mldev(self.api_client, response_dict)

return_value = types.BatchJob._from_response(
response=response_dict, kwargs=parameter_model.model_dump()
)
self._api_client._verify_response(return_value)
self.api_client._verify_response(return_value)
return return_value

def get(
Expand Down Expand Up @@ -716,11 +716,11 @@ def get(
)

request_url_dict: Optional[dict[str, str]]
if not self._api_client.vertexai:
if not self.api_client.vertexai:
raise ValueError('This method is only supported in the Vertex AI client.')
else:
request_dict = _GetBatchJobParameters_to_vertex(
self._api_client, parameter_model
self.api_client, parameter_model
)
request_url_dict = request_dict.get('_url')
if request_url_dict:
Expand All @@ -743,19 +743,19 @@ def get(
request_dict = _common.convert_to_dict(request_dict)
request_dict = _common.encode_unserializable_types(request_dict)

response_dict = self._api_client.request(
response_dict = self.api_client.request(
'get', path, request_dict, http_options
)

if self._api_client.vertexai:
response_dict = _BatchJob_from_vertex(self._api_client, response_dict)
if self.api_client.vertexai:
response_dict = _BatchJob_from_vertex(self.api_client, response_dict)
else:
response_dict = _BatchJob_from_mldev(self._api_client, response_dict)
response_dict = _BatchJob_from_mldev(self.api_client, response_dict)

return_value = types.BatchJob._from_response(
response=response_dict, kwargs=parameter_model.model_dump()
)
self._api_client._verify_response(return_value)
self.api_client._verify_response(return_value)
return return_value

def cancel(
Expand Down Expand Up @@ -786,11 +786,11 @@ def cancel(
)

request_url_dict: Optional[dict[str, str]]
if not self._api_client.vertexai:
if not self.api_client.vertexai:
raise ValueError('This method is only supported in the Vertex AI client.')
else:
request_dict = _CancelBatchJobParameters_to_vertex(
self._api_client, parameter_model
self.api_client, parameter_model
)
request_url_dict = request_dict.get('_url')
if request_url_dict:
Expand All @@ -813,7 +813,7 @@ def cancel(
request_dict = _common.convert_to_dict(request_dict)
request_dict = _common.encode_unserializable_types(request_dict)

response_dict = self._api_client.request(
response_dict = self.api_client.request(
'post', path, request_dict, http_options
)

Expand All @@ -825,11 +825,11 @@ def _list(
)

request_url_dict: Optional[dict[str, str]]
if not self._api_client.vertexai:
if not self.api_client.vertexai:
raise ValueError('This method is only supported in the Vertex AI client.')
else:
request_dict = _ListBatchJobsParameters_to_vertex(
self._api_client, parameter_model
self.api_client, parameter_model
)
request_url_dict = request_dict.get('_url')
if request_url_dict:
Expand All @@ -852,23 +852,23 @@ def _list(
request_dict = _common.convert_to_dict(request_dict)
request_dict = _common.encode_unserializable_types(request_dict)

response_dict = self._api_client.request(
response_dict = self.api_client.request(
'get', path, request_dict, http_options
)

if self._api_client.vertexai:
if self.api_client.vertexai:
response_dict = _ListBatchJobsResponse_from_vertex(
self._api_client, response_dict
self.api_client, response_dict
)
else:
response_dict = _ListBatchJobsResponse_from_mldev(
self._api_client, response_dict
self.api_client, response_dict
)

return_value = types.ListBatchJobsResponse._from_response(
response=response_dict, kwargs=parameter_model.model_dump()
)
self._api_client._verify_response(return_value)
self.api_client._verify_response(return_value)
return return_value

def delete(
Expand Down Expand Up @@ -900,11 +900,11 @@ def delete(
)

request_url_dict: Optional[dict[str, str]]
if not self._api_client.vertexai:
if not self.api_client.vertexai:
raise ValueError('This method is only supported in the Vertex AI client.')
else:
request_dict = _DeleteBatchJobParameters_to_vertex(
self._api_client, parameter_model
self.api_client, parameter_model
)
request_url_dict = request_dict.get('_url')
if request_url_dict:
Expand All @@ -927,23 +927,23 @@ def delete(
request_dict = _common.convert_to_dict(request_dict)
request_dict = _common.encode_unserializable_types(request_dict)

response_dict = self._api_client.request(
response_dict = self.api_client.request(
'delete', path, request_dict, http_options
)

if self._api_client.vertexai:
if self.api_client.vertexai:
response_dict = _DeleteResourceJob_from_vertex(
self._api_client, response_dict
self.api_client, response_dict
)
else:
response_dict = _DeleteResourceJob_from_mldev(
self._api_client, response_dict
self.api_client, response_dict
)

return_value = types.DeleteResourceJob._from_response(
response=response_dict, kwargs=parameter_model.model_dump()
)
self._api_client._verify_response(return_value)
self.api_client._verify_response(return_value)
return return_value

def create(
Expand Down Expand Up @@ -1024,11 +1024,11 @@ async def _create(
)

request_url_dict: Optional[dict[str, str]]
if not self._api_client.vertexai:
if not self.api_client.vertexai:
raise ValueError('This method is only supported in the Vertex AI client.')
else:
request_dict = _CreateBatchJobParameters_to_vertex(
self._api_client, parameter_model
self.api_client, parameter_model
)
request_url_dict = request_dict.get('_url')
if request_url_dict:
Expand All @@ -1051,19 +1051,19 @@ async def _create(
request_dict = _common.convert_to_dict(request_dict)
request_dict = _common.encode_unserializable_types(request_dict)

response_dict = await self._api_client.async_request(
response_dict = await self.api_client.async_request(
'post', path, request_dict, http_options
)

if self._api_client.vertexai:
response_dict = _BatchJob_from_vertex(self._api_client, response_dict)
if self.api_client.vertexai:
response_dict = _BatchJob_from_vertex(self.api_client, response_dict)
else:
response_dict = _BatchJob_from_mldev(self._api_client, response_dict)
response_dict = _BatchJob_from_mldev(self.api_client, response_dict)

return_value = types.BatchJob._from_response(
response=response_dict, kwargs=parameter_model.model_dump()
)
self._api_client._verify_response(return_value)
self.api_client._verify_response(return_value)
return return_value

async def get(
Expand Down Expand Up @@ -1093,11 +1093,11 @@ async def get(
)

request_url_dict: Optional[dict[str, str]]
if not self._api_client.vertexai:
if not self.api_client.vertexai:
raise ValueError('This method is only supported in the Vertex AI client.')
else:
request_dict = _GetBatchJobParameters_to_vertex(
self._api_client, parameter_model
self.api_client, parameter_model
)
request_url_dict = request_dict.get('_url')
if request_url_dict:
Expand All @@ -1120,19 +1120,19 @@ async def get(
request_dict = _common.convert_to_dict(request_dict)
request_dict = _common.encode_unserializable_types(request_dict)

response_dict = await self._api_client.async_request(
response_dict = await self.api_client.async_request(
'get', path, request_dict, http_options
)

if self._api_client.vertexai:
response_dict = _BatchJob_from_vertex(self._api_client, response_dict)
if self.api_client.vertexai:
response_dict = _BatchJob_from_vertex(self.api_client, response_dict)
else:
response_dict = _BatchJob_from_mldev(self._api_client, response_dict)
response_dict = _BatchJob_from_mldev(self.api_client, response_dict)

return_value = types.BatchJob._from_response(
response=response_dict, kwargs=parameter_model.model_dump()
)
self._api_client._verify_response(return_value)
self.api_client._verify_response(return_value)
return return_value

async def cancel(
Expand Down Expand Up @@ -1163,11 +1163,11 @@ async def cancel(
)

request_url_dict: Optional[dict[str, str]]
if not self._api_client.vertexai:
if not self.api_client.vertexai:
raise ValueError('This method is only supported in the Vertex AI client.')
else:
request_dict = _CancelBatchJobParameters_to_vertex(
self._api_client, parameter_model
self.api_client, parameter_model
)
request_url_dict = request_dict.get('_url')
if request_url_dict:
Expand All @@ -1190,7 +1190,7 @@ async def cancel(
request_dict = _common.convert_to_dict(request_dict)
request_dict = _common.encode_unserializable_types(request_dict)

response_dict = await self._api_client.async_request(
response_dict = await self.api_client.async_request(
'post', path, request_dict, http_options
)

Expand All @@ -1202,11 +1202,11 @@ async def _list(
)

request_url_dict: Optional[dict[str, str]]
if not self._api_client.vertexai:
if not self.api_client.vertexai:
raise ValueError('This method is only supported in the Vertex AI client.')
else:
request_dict = _ListBatchJobsParameters_to_vertex(
self._api_client, parameter_model
self.api_client, parameter_model
)
request_url_dict = request_dict.get('_url')
if request_url_dict:
Expand All @@ -1229,23 +1229,23 @@ async def _list(
request_dict = _common.convert_to_dict(request_dict)
request_dict = _common.encode_unserializable_types(request_dict)

response_dict = await self._api_client.async_request(
response_dict = await self.api_client.async_request(
'get', path, request_dict, http_options
)

if self._api_client.vertexai:
if self.api_client.vertexai:
response_dict = _ListBatchJobsResponse_from_vertex(
self._api_client, response_dict
self.api_client, response_dict
)
else:
response_dict = _ListBatchJobsResponse_from_mldev(
self._api_client, response_dict
self.api_client, response_dict
)

return_value = types.ListBatchJobsResponse._from_response(
response=response_dict, kwargs=parameter_model.model_dump()
)
self._api_client._verify_response(return_value)
self.api_client._verify_response(return_value)
return return_value

async def delete(
Expand Down Expand Up @@ -1277,11 +1277,11 @@ async def delete(
)

request_url_dict: Optional[dict[str, str]]
if not self._api_client.vertexai:
if not self.api_client.vertexai:
raise ValueError('This method is only supported in the Vertex AI client.')
else:
request_dict = _DeleteBatchJobParameters_to_vertex(
self._api_client, parameter_model
self.api_client, parameter_model
)
request_url_dict = request_dict.get('_url')
if request_url_dict:
Expand All @@ -1304,23 +1304,23 @@ async def delete(
request_dict = _common.convert_to_dict(request_dict)
request_dict = _common.encode_unserializable_types(request_dict)

response_dict = await self._api_client.async_request(
response_dict = await self.api_client.async_request(
'delete', path, request_dict, http_options
)

if self._api_client.vertexai:
if self.api_client.vertexai:
response_dict = _DeleteResourceJob_from_vertex(
self._api_client, response_dict
self.api_client, response_dict
)
else:
response_dict = _DeleteResourceJob_from_mldev(
self._api_client, response_dict
self.api_client, response_dict
)

return_value = types.DeleteResourceJob._from_response(
response=response_dict, kwargs=parameter_model.model_dump()
)
self._api_client._verify_response(return_value)
self.api_client._verify_response(return_value)
return return_value

async def create(
Expand Down
Loading