googleapis
diff --git a/‎google/cloud/aiplatform/metadata/metadata.py
Lines changed: 24 additions & 1 deletion b/‎google/cloud/aiplatform/metadata/metadata.py
Lines changed: 24 additions & 1 deletion
diff --git a/‎google/cloud/aiplatform/tensorboard/tensorboard_resource.py
Lines changed: 22 additions & 2 deletions b/‎google/cloud/aiplatform/tensorboard/tensorboard_resource.py
Lines changed: 22 additions & 2 deletions
diff --git a/‎tests/unit/aiplatform/test_autologging.py
Lines changed: 12 additions & 0 deletions b/‎tests/unit/aiplatform/test_autologging.py
Lines changed: 12 additions & 0 deletions
@@ -15,6 +15,7 @@
 # limitations under the License.
 #
 
+import datetime
 import logging
 import os
 from typing import Dict, Union, Optional, Any, List
@@ -61,6 +62,24 @@ def _get_experiment_schema_version() -> str:
     return constants.SCHEMA_VERSIONS[constants.SYSTEM_EXPERIMENT]
 
 
+def _get_or_create_default_tensorboard() -> tensorboard_resource.Tensorboard:
+    """Helper method to get the default TensorBoard instance if already exists, or create a default TensorBoard instance.
+
+    Returns:
+         tensorboard_resource.Tensorboard: the default TensorBoard instance.
+    """
+    tensorboards = tensorboard_resource.Tensorboard.list(filter="is_default=true")
+    if tensorboards:
+        return tensorboards[0]
+    else:
+        default_tensorboard = tensorboard_resource.Tensorboard.create(
+            display_name="Default Tensorboard "
+            + datetime.datetime.now().isoformat(sep=" "),
+            is_default=True,
+        )
+        return default_tensorboard
+
+
 # Legacy Experiment tracking
 # Maintaining creation APIs for backwards compatibility testing
 class _LegacyExperimentService:
@@ -268,7 +287,11 @@ def set_experiment(
             experiment_name=experiment, description=description
         )
 
-        backing_tb = backing_tensorboard or self._global_tensorboard
+        backing_tb = (
+            backing_tensorboard
+            or self._global_tensorboard
+            or _get_or_create_default_tensorboard()
+        )
 
         current_backing_tb = experiment.backing_tensorboard_resource_name
 
 
@@ -24,14 +24,18 @@
 from google.cloud.aiplatform import base
 from google.cloud.aiplatform import initializer
 from google.cloud.aiplatform import utils
-from google.cloud.aiplatform.compat.types import tensorboard as gca_tensorboard
+from google.cloud.aiplatform.compat.types import (
+    tensorboard as gca_tensorboard,
+)
 from google.cloud.aiplatform.compat.types import (
     tensorboard_data as gca_tensorboard_data,
 )
 from google.cloud.aiplatform.compat.types import (
     tensorboard_experiment as gca_tensorboard_experiment,
 )
-from google.cloud.aiplatform.compat.types import tensorboard_run as gca_tensorboard_run
+from google.cloud.aiplatform.compat.types import (
+    tensorboard_run as gca_tensorboard_run,
+)
 from google.cloud.aiplatform.compat.types import (
     tensorboard_service as gca_tensorboard_service,
 )
@@ -95,6 +99,7 @@ def create(
         display_name: Optional[str] = None,
         description: Optional[str] = None,
         labels: Optional[Dict[str, str]] = None,
+        is_default=False,
         project: Optional[str] = None,
         location: Optional[str] = None,
         credentials: Optional[auth_credentials.Credentials] = None,
@@ -132,6 +137,10 @@ def create(
                 See https://goo.gl/xmQnxf for more information and examples of labels.
                 System reserved label keys are prefixed with "aiplatform.googleapis.com/"
                 and are immutable.
+            is_default (bool):
+                If the TensorBoard instance is default or not. The default
+                TensorBoard instance will be used by Experiment/ExperimentRun
+                when needed if no TensorBoard instance is explicitly specified.
             project (str):
                 Optional. Project to upload this model to. Overrides project set in
                 aiplatform.init.
@@ -182,6 +191,7 @@ def create(
             display_name=display_name,
             description=description,
             labels=labels,
+            is_default=is_default,
             encryption_spec=encryption_spec,
         )
 
@@ -208,6 +218,7 @@ def update(
         display_name: Optional[str] = None,
         description: Optional[str] = None,
         labels: Optional[Dict[str, str]] = None,
+        is_default: Optional[bool] = None,
         request_metadata: Optional[Sequence[Tuple[str, str]]] = (),
         encryption_spec_key_name: Optional[str] = None,
     ) -> "Tensorboard":
@@ -238,6 +249,11 @@ def update(
                 See https://goo.gl/xmQnxf for more information and examples of labels.
                 System reserved label keys are prefixed with "aiplatform.googleapis.com/"
                 and are immutable.
+            is_default (bool):
+                Optional. If the TensorBoard instance is default or not.
+                The default TensorBoard instance will be used by
+                Experiment/ExperimentRun when needed if no TensorBoard instance
+                is explicitly specified.
             request_metadata (Sequence[Tuple[str, str]]):
                 Optional. Strings which should be sent along with the request as metadata.
             encryption_spec_key_name (str):
@@ -268,6 +284,9 @@ def update(
             utils.validate_labels(labels)
             update_mask.append("labels")
 
+        if is_default is not None:
+            update_mask.append("is_default")
+
         encryption_spec = None
         if encryption_spec_key_name:
             encryption_spec = initializer.global_config.get_encryption_spec(
@@ -282,6 +301,7 @@ def update(
             display_name=display_name,
             description=description,
             labels=labels,
+            is_default=is_default,
             encryption_spec=encryption_spec,
         )
 
 
@@ -60,6 +60,8 @@
 from google.cloud.aiplatform.compat.types import (
     tensorboard as gca_tensorboard,
 )
+from google.cloud.aiplatform.metadata import metadata
+
 
 import test_tensorboard
 import test_metadata
@@ -454,6 +456,15 @@ def update_context_mock():
         yield update_context_mock
 
 
+@pytest.fixture
+def get_or_create_default_tb_none_mock():
+    with patch.object(
+        metadata, "_get_or_create_default_tensorboard"
+    ) as get_or_create_default_tb_none_mock:
+        get_or_create_default_tb_none_mock.return_value = None
+        yield get_or_create_default_tb_none_mock
+
+
 _TEST_EXPERIMENT_RUN_CONTEXT_NAME = f"{_TEST_PARENT}/contexts/{_TEST_EXECUTION_ID}"
 _TEST_OTHER_EXPERIMENT_RUN_CONTEXT_NAME = (
     f"{_TEST_PARENT}/contexts/{_TEST_OTHER_EXECUTION_ID}"
@@ -702,6 +713,7 @@ def test_autologging_raises_if_experiment_not_set(
         "get_experiment_mock_without_tensorboard",
         "get_metadata_store_mock",
         "update_context_mock",
+        "get_or_create_default_tb_none_mock",
     )
     def test_autologging_raises_if_experiment_tensorboard_not_set(
         self,