google-genai 1.4.0__py3-none-any.whl → 1.6.0__py3-none-any.whl

google/genai/operations.py

@@ -113,14 +113,14 @@ def _Video_from_mldev(
     parent_object: Optional[dict] = None,
 ) -> dict:
   to_object: dict[str, Any] = {}
-  if getv(from_object, ['uri']) is not None:
-    setv(to_object, ['uri'], getv(from_object, ['uri']))
+  if getv(from_object, ['video', 'uri']) is not None:
+    setv(to_object, ['uri'], getv(from_object, ['video', 'uri']))
 
-  if getv(from_object, ['encodedVideo']) is not None:
+  if getv(from_object, ['video', 'encodedVideo']) is not None:
     setv(
         to_object,
         ['video_bytes'],
-        t.t_bytes(api_client, getv(from_object, ['encodedVideo'])),
+        t.t_bytes(api_client, getv(from_object, ['video', 'encodedVideo'])),
     )
 
   if getv(from_object, ['encoding']) is not None:
@@ -189,13 +189,13 @@ def _GenerateVideosResponse_from_mldev(
     parent_object: Optional[dict] = None,
 ) -> dict:
   to_object: dict[str, Any] = {}
-  if getv(from_object, ['videos']) is not None:
+  if getv(from_object, ['generatedSamples']) is not None:
     setv(
         to_object,
         ['generated_videos'],
         [
             _GeneratedVideo_from_mldev(api_client, item, to_object)
-            for item in getv(from_object, ['videos'])
+            for item in getv(from_object, ['generatedSamples'])
         ],
     )
 
@@ -359,7 +359,7 @@ class Operations(_api_module.BaseModule):
     http_options: Optional[types.HttpOptionsOrDict] = None
     if isinstance(config, dict):
       http_options = config.get('http_options', None)
-    elif hasattr(config, 'http_options'):
+    elif hasattr(config, 'http_options') and config is not None:
       http_options = config.http_options
 
     request_dict = _common.convert_to_dict(request_dict)
@@ -421,7 +421,7 @@ class Operations(_api_module.BaseModule):
     http_options: Optional[types.HttpOptionsOrDict] = None
     if isinstance(config, dict):
       http_options = config.get('http_options', None)
-    elif hasattr(config, 'http_options'):
+    elif hasattr(config, 'http_options') and config is not None:
       http_options = config.http_options
 
     request_dict = _common.convert_to_dict(request_dict)
@@ -465,10 +465,24 @@ class Operations(_api_module.BaseModule):
     # TODO(b/398233524): Cast operation types
     if self._api_client.vertexai:
       resource_name = operation_name.rpartition('/operations/')[0]
+      http_options = types.HttpOptions()
+      if isinstance(config, dict):
+        dict_options = config.get('http_options', None)
+        if dict_options is not None:
+          http_options = types.HttpOptions(**dict(dict_options))
+      elif isinstance(config, types.GetOperationConfig) and config is not None:
+        http_options = (
+            config.http_options
+            if config.http_options is not None
+            else types.HttpOptions()
+        )
+      fetch_operation_config = types.FetchPredictOperationConfig(
+          http_options=http_options
+      )
       return self._fetch_predict_operation(
           operation_name=operation_name,
           resource_name=resource_name,
-          config=config,
+          config=fetch_operation_config,
       )
     else:
       return self._get_operation(
@@ -519,7 +533,7 @@ class AsyncOperations(_api_module.BaseModule):
     http_options: Optional[types.HttpOptionsOrDict] = None
     if isinstance(config, dict):
       http_options = config.get('http_options', None)
-    elif hasattr(config, 'http_options'):
+    elif hasattr(config, 'http_options') and config is not None:
       http_options = config.http_options
 
     request_dict = _common.convert_to_dict(request_dict)
@@ -581,7 +595,7 @@ class AsyncOperations(_api_module.BaseModule):
     http_options: Optional[types.HttpOptionsOrDict] = None
     if isinstance(config, dict):
       http_options = config.get('http_options', None)
-    elif hasattr(config, 'http_options'):
+    elif hasattr(config, 'http_options') and config is not None:
       http_options = config.http_options
 
     request_dict = _common.convert_to_dict(request_dict)
@@ -623,10 +637,24 @@ class AsyncOperations(_api_module.BaseModule):
 
     if self._api_client.vertexai:
       resource_name = operation_name.rpartition('/operations/')[0]
+      http_options = types.HttpOptions()
+      if isinstance(config, dict):
+        dict_options = config.get('http_options', None)
+        if dict_options is not None:
+          http_options = types.HttpOptions(**dict(dict_options))
+      elif isinstance(config, types.GetOperationConfig) and config is not None:
+        http_options = (
+            config.http_options
+            if config.http_options is not None
+            else types.HttpOptions()
+        )
+      fetch_operation_config = types.FetchPredictOperationConfig(
+          http_options=http_options
+      )
       return await self._fetch_predict_operation(
           operation_name=operation_name,
           resource_name=resource_name,
-          config=config,
+          config=fetch_operation_config,
       )
     else:
       return await self._get_operation(

google/genai/pagers.py

@@ -18,7 +18,7 @@
 # pylint: disable=protected-access
 
 import copy
-from typing import Any, Awaitable, Callable, Generic, Iterator, Literal, TypeVar
+from typing import Any, AsyncIterator,Awaitable, Callable, Generic, Iterator, Literal, TypeVar
 
 T = TypeVar('T')
 
@@ -30,7 +30,7 @@ PagedItem = Literal[
 class _BasePager(Generic[T]):
   """Base pager class for iterating through paginated results."""
 
-  def __init__(
+  def _init_page(
       self,
       name: PagedItem,
       request: Callable[..., Any],
@@ -54,11 +54,20 @@ class _BasePager(Generic[T]):
 
     self._page_size = request_config.get('page_size', len(self._page))
 
+  def __init__(
+      self,
+      name: PagedItem,
+      request: Callable[..., Any],
+      response: Any,
+      config: Any,
+  ):
+    self._init_page(name, request, response, config)
+
   @property
   def page(self) -> list[T]:
-    """Returns the current page, which is a list of items.
+    """Returns a subset of the entire list of items. 
 
-    The returned list of items is a subset of the entire list.
+    For the number of items returned, see `pageSize()`.
 
     Usage:
 
@@ -72,7 +81,7 @@ class _BasePager(Generic[T]):
     return self._page
 
   @property
-  def name(self) -> str:
+  def name(self) -> PagedItem:
     """Returns the type of paged item (for example, ``batch_jobs``).
 
     Usage:
@@ -88,9 +97,7 @@ class _BasePager(Generic[T]):
 
   @property
   def page_size(self) -> int:
-    """Returns the length of the page fetched each time by this pager.
-
-    The number of items in the page is less than or equal to the page length.
+    """Returns the maximum number of items fetched by the pager at one time.
 
     Usage:
 
@@ -139,7 +146,7 @@ class _BasePager(Generic[T]):
     Args:
       response: The response object from the API request.
     """
-    self.__init__(self.name, self._request, response, self.config)
+    self._init_page(self.name, self._request, response, self.config)
 
 
 class Pager(_BasePager[T]):
@@ -197,7 +204,7 @@ class AsyncPager(_BasePager[T]):
   ):
     super().__init__(name, request, response, config)
 
-  def __aiter__(self) -> T:
+  def __aiter__(self) -> AsyncIterator[T]:
     """Returns an async iterator over the items."""
     self._idx = 0
     return self

google/genai/tunings.py

@@ -332,7 +332,7 @@ def _CreateTuningJobConfig_to_vertex(
 
   if getv(from_object, ['learning_rate_multiplier']) is not None:
     setv(
-        to_object,
+        parent_object,
         ['supervisedTuningSpec', 'hyperParameters', 'learningRateMultiplier'],
         getv(from_object, ['learning_rate_multiplier']),
     )
@@ -757,7 +757,7 @@ class Tunings(_api_module.BaseModule):
     http_options: Optional[types.HttpOptionsOrDict] = None
     if isinstance(config, dict):
       http_options = config.get('http_options', None)
-    elif hasattr(config, 'http_options'):
+    elif hasattr(config, 'http_options') and config is not None:
       http_options = config.http_options
 
     request_dict = _common.convert_to_dict(request_dict)
@@ -781,13 +781,13 @@ class Tunings(_api_module.BaseModule):
   def _list(
       self, *, config: Optional[types.ListTuningJobsConfigOrDict] = None
   ) -> types.ListTuningJobsResponse:
-    """Lists tuning jobs.
+    """Lists `TuningJob` objects.
 
     Args:
       config: The configuration for the list request.
 
     Returns:
-      A list of tuning jobs.
+      A list of `TuningJob` objects.
     """
 
     parameter_model = types._ListTuningJobsParameters(
@@ -823,7 +823,7 @@ class Tunings(_api_module.BaseModule):
     http_options: Optional[types.HttpOptionsOrDict] = None
     if isinstance(config, dict):
       http_options = config.get('http_options', None)
-    elif hasattr(config, 'http_options'):
+    elif hasattr(config, 'http_options') and config is not None:
       http_options = config.http_options
 
     request_dict = _common.convert_to_dict(request_dict)
@@ -855,7 +855,7 @@ class Tunings(_api_module.BaseModule):
       training_dataset: types.TuningDatasetOrDict,
       config: Optional[types.CreateTuningJobConfigOrDict] = None,
   ) -> types.TuningJob:
-    """Creates a supervised fine-tuning job.
+    """Creates a supervised fine-tuning job and returns the TuningJob object.
 
     Args:
       base_model: The name of the model to tune.
@@ -894,7 +894,7 @@ class Tunings(_api_module.BaseModule):
     http_options: Optional[types.HttpOptionsOrDict] = None
     if isinstance(config, dict):
       http_options = config.get('http_options', None)
-    elif hasattr(config, 'http_options'):
+    elif hasattr(config, 'http_options') and config is not None:
       http_options = config.http_options
 
     request_dict = _common.convert_to_dict(request_dict)
@@ -922,7 +922,7 @@ class Tunings(_api_module.BaseModule):
       training_dataset: types.TuningDatasetOrDict,
       config: Optional[types.CreateTuningJobConfigOrDict] = None,
   ) -> types.Operation:
-    """Creates a supervised fine-tuning job.
+    """Creates a supervised fine-tuning job and returns the TuningJob object.
 
     Args:
       base_model: The name of the model to tune.
@@ -961,7 +961,7 @@ class Tunings(_api_module.BaseModule):
     http_options: Optional[types.HttpOptionsOrDict] = None
     if isinstance(config, dict):
       http_options = config.get('http_options', None)
-    elif hasattr(config, 'http_options'):
+    elif hasattr(config, 'http_options') and config is not None:
       http_options = config.http_options
 
     request_dict = _common.convert_to_dict(request_dict)
@@ -999,7 +999,11 @@ class Tunings(_api_module.BaseModule):
       config: Optional[types.GetTuningJobConfigOrDict] = None,
   ) -> types.TuningJob:
     job = self._get(name=name, config=config)
-    if job.experiment and self._api_client.vertexai:
+    if (
+        job.experiment
+        and self._api_client.vertexai
+        and self._api_client.project is not None
+    ):
       _IpythonUtils.display_experiment_button(
           experiment=job.experiment,
           project=self._api_client.project,
@@ -1029,11 +1033,12 @@ class Tunings(_api_module.BaseModule):
           training_dataset=training_dataset,
           config=config,
       )
-      operation_dict = operation.to_json_dict()
-      try:
-        tuned_model_name = operation_dict['metadata']['tunedModel']
-      except KeyError:
-        tuned_model_name = operation_dict['name'].partition('/operations/')[0]
+      if operation.metadata is not None and 'tunedModel' in operation.metadata:
+        tuned_model_name = operation.metadata['tunedModel']
+      else:
+        if operation.name is None:
+          raise ValueError('Operation name is required.')
+        tuned_model_name = operation.name.partition('/operations/')[0]
       tuning_job = types.TuningJob(
           name=tuned_model_name,
           state=types.JobState.JOB_STATE_QUEUED,
@@ -1096,7 +1101,7 @@ class AsyncTunings(_api_module.BaseModule):
     http_options: Optional[types.HttpOptionsOrDict] = None
     if isinstance(config, dict):
       http_options = config.get('http_options', None)
-    elif hasattr(config, 'http_options'):
+    elif hasattr(config, 'http_options') and config is not None:
       http_options = config.http_options
 
     request_dict = _common.convert_to_dict(request_dict)
@@ -1120,13 +1125,13 @@ class AsyncTunings(_api_module.BaseModule):
   async def _list(
       self, *, config: Optional[types.ListTuningJobsConfigOrDict] = None
   ) -> types.ListTuningJobsResponse:
-    """Lists tuning jobs.
+    """Lists `TuningJob` objects.
 
     Args:
       config: The configuration for the list request.
 
     Returns:
-      A list of tuning jobs.
+      A list of `TuningJob` objects.
     """
 
     parameter_model = types._ListTuningJobsParameters(
@@ -1162,7 +1167,7 @@ class AsyncTunings(_api_module.BaseModule):
     http_options: Optional[types.HttpOptionsOrDict] = None
     if isinstance(config, dict):
       http_options = config.get('http_options', None)
-    elif hasattr(config, 'http_options'):
+    elif hasattr(config, 'http_options') and config is not None:
       http_options = config.http_options
 
     request_dict = _common.convert_to_dict(request_dict)
@@ -1194,7 +1199,7 @@ class AsyncTunings(_api_module.BaseModule):
       training_dataset: types.TuningDatasetOrDict,
       config: Optional[types.CreateTuningJobConfigOrDict] = None,
   ) -> types.TuningJob:
-    """Creates a supervised fine-tuning job.
+    """Creates a supervised fine-tuning job and returns the TuningJob object.
 
     Args:
       base_model: The name of the model to tune.
@@ -1233,7 +1238,7 @@ class AsyncTunings(_api_module.BaseModule):
     http_options: Optional[types.HttpOptionsOrDict] = None
     if isinstance(config, dict):
       http_options = config.get('http_options', None)
-    elif hasattr(config, 'http_options'):
+    elif hasattr(config, 'http_options') and config is not None:
       http_options = config.http_options
 
     request_dict = _common.convert_to_dict(request_dict)
@@ -1261,7 +1266,7 @@ class AsyncTunings(_api_module.BaseModule):
       training_dataset: types.TuningDatasetOrDict,
       config: Optional[types.CreateTuningJobConfigOrDict] = None,
   ) -> types.Operation:
-    """Creates a supervised fine-tuning job.
+    """Creates a supervised fine-tuning job and returns the TuningJob object.
 
     Args:
       base_model: The name of the model to tune.
@@ -1300,7 +1305,7 @@ class AsyncTunings(_api_module.BaseModule):
     http_options: Optional[types.HttpOptionsOrDict] = None
     if isinstance(config, dict):
       http_options = config.get('http_options', None)
-    elif hasattr(config, 'http_options'):
+    elif hasattr(config, 'http_options') and config is not None:
       http_options = config.http_options
 
     request_dict = _common.convert_to_dict(request_dict)
@@ -1338,7 +1343,11 @@ class AsyncTunings(_api_module.BaseModule):
       config: Optional[types.GetTuningJobConfigOrDict] = None,
   ) -> types.TuningJob:
     job = await self._get(name=name, config=config)
-    if job.experiment and self._api_client.vertexai:
+    if (
+        job.experiment
+        and self._api_client.vertexai
+        and self._api_client.project is not None
+    ):
       _IpythonUtils.display_experiment_button(
           experiment=job.experiment,
           project=self._api_client.project,
@@ -1368,11 +1377,12 @@ class AsyncTunings(_api_module.BaseModule):
           training_dataset=training_dataset,
           config=config,
       )
-      operation_dict = operation.to_json_dict()
-      try:
-        tuned_model_name = operation_dict['metadata']['tunedModel']
-      except KeyError:
-        tuned_model_name = operation_dict['name'].partition('/operations/')[0]
+      if operation.metadata is not None and 'tunedModel' in operation.metadata:
+        tuned_model_name = operation.metadata['tunedModel']
+      else:
+        if operation.name is None:
+          raise ValueError('Operation name is required.')
+        tuned_model_name = operation.name.partition('/operations/')[0]
       tuning_job = types.TuningJob(
           name=tuned_model_name,
           state=types.JobState.JOB_STATE_QUEUED,
@@ -1404,7 +1414,7 @@ class _IpythonUtils:
     return bool(_IpythonUtils._get_ipython_shell_name())
 
   @staticmethod
-  def _get_styles() -> None:
+  def _get_styles() -> str:
     """Returns the HTML style markup to support custom buttons."""
     return """
     <link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons">