Merge branch 'main' into main

Author: sasha-gitg

google/cloud/aiplatform/tensorboard/plugins/tf_profiler/profile_uploader.py

@@ -176,7 +176,10 @@ def send_request(self, run_name: str):
                 self._profile_dir(run_name)
             )
 
-        tb_run = self._one_platform_resource_manager.get_run_resource_name(run_name)
+        tensorboard_run_name = run_name if run_name else "profile"
+        tb_run = self._one_platform_resource_manager.get_run_resource_name(
+            tensorboard_run_name
+        )
 
         if run_name not in self._run_to_file_request_sender:
             self._run_to_file_request_sender[

google/cloud/aiplatform/tensorboard/uploader_utils.py

@@ -23,6 +23,7 @@
 import re
 import time
 from typing import Callable, Dict, Generator, List, Optional, Tuple
+import uuid
 
 from absl import app
 from google.api_core import exceptions
@@ -225,6 +226,8 @@ def _create_or_get_run_resource(
             project=project, location=location, run_name=run_name
         )
         if not experiment_run:
+            if not run_name:
+                run_name = str(uuid.uuid4())
             experiment_run = experiment_run_resource.ExperimentRun.create(
                 project=project,
                 location=location,

google/cloud/aiplatform_v1beta1/types/content.py

@@ -19,6 +19,7 @@
 
 import proto  # type: ignore
 
+from google.cloud.aiplatform_v1beta1.types import openapi
 from google.cloud.aiplatform_v1beta1.types import tool
 from google.protobuf import duration_pb2  # type: ignore
 from google.type import date_pb2  # type: ignore
@@ -309,6 +310,17 @@ class GenerationConfig(proto.Message):
                The model needs to be prompted to output the appropriate
                response type, otherwise the behavior is undefined. This
                is a preview feature.
+        response_schema (google.cloud.aiplatform_v1beta1.types.Schema):
+            Optional. The ``Schema`` object allows the definition of
+            input and output data types. These types can be objects, but
+            also primitives and arrays. Represents a select subset of an
+            `OpenAPI 3.0 schema
+            object <https://spec.openapis.org/oas/v3.0.3#schema>`__. If
+            set, a compatible response_mime_type must also be set.
+            Compatible mimetypes: ``application/json``: Schema for JSON
+            response.
+
+            This field is a member of `oneof`_ ``_response_schema``.
     """
 
     temperature: float = proto.Field(
@@ -354,6 +366,12 @@ class GenerationConfig(proto.Message):
         proto.STRING,
         number=13,
     )
+    response_schema: openapi.Schema = proto.Field(
+        proto.MESSAGE,
+        number=16,
+        optional=True,
+        message=openapi.Schema,
+    )
 
 
 class SafetySetting(proto.Message):

noxfile.py

@@ -28,7 +28,7 @@
 FLAKE8_VERSION = "flake8==6.1.0"
 BLACK_VERSION = "black==22.3.0"
 ISORT_VERSION = "isort==5.10.1"
-LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"]
+LINT_PATHS = ["docs", "google", "vertexai", "tests", "noxfile.py", "setup.py"]
 
 DEFAULT_PYTHON_VERSION = "3.8"