Merge branch 'master' into hparam_redux_final

Author: hoonji

tensorboard/BUILD

@@ -34,7 +34,6 @@ py_binary(
         ":program",
         "//tensorboard:expect_tensorflow_installed",
         "//tensorboard/plugins:base_plugin",
-        "//tensorboard/uploader:uploader_subcommand",
         "//tensorboard/util:tb_logging",
         "//tensorboard/util:timing",  # non-strict dep, for patching convenience
     ],
@@ -62,7 +61,6 @@ py_binary(
         ":lib",
         ":main_lib",
         ":program",
-        "//tensorboard/uploader:uploader_subcommand",
     ],
 )
 
@@ -442,11 +440,6 @@ py_library(name = "expect_absl_app_installed")
 # `pip install absl-py`
 py_library(name = "expect_absl_flags_installed")
 
-# This is a dummy rule used as a absl-py dependency in open-source.
-# We expect absl-py to already be installed on the system, e.g. via
-# `pip install absl-py`
-py_library(name = "expect_absl_flags_argparse_flags_installed")
-
 # This is a dummy rule used as a absl-py dependency in open-source.
 # We expect absl-py to already be installed on the system, e.g. via
 # `pip install absl-py`
@@ -457,26 +450,11 @@ py_library(name = "expect_absl_logging_installed")
 # `pip install absl-py`
 py_library(name = "expect_absl_testing_absltest_installed")
 
-# This is a dummy rule used as a google_auth dependency in open-source.
-# We expect google_auth to already be installed on the system, e.g., via
-# `pip install google-auth`.
-py_library(name = "expect_google_auth_installed")
-
-# This is a dummy rule used as a google_auth oauthlib_dependency in open-source.
-# We expect google_auth_oauthlib to already be installed on the system, e.g., via
-# `pip install google-auth-oauthlib`.
-py_library(name = "expect_google_auth_oauthlib_installed")
-
 # This is a dummy rule used as a pkg-resources dependency in open-source.
 # We expect pkg-resources to already be installed on the system, e.g., via
 # `pip install setuptools`.
 py_library(name = "expect_pkg_resources_installed")
 
-# This is a dummy rule used as a requests dependency in open-source.
-# We expect requests to already be installed on the system, e.g., via
-# `pip install requests`.
-py_library(name = "expect_requests_installed")
-
 # This is a dummy rule used as a pandas dependency in open-source.
 # We expect pandas to already be installed on the system, e.g. via
 # `pip install pandas`.

tensorboard/main.py

@@ -28,7 +28,6 @@
 from tensorboard import main_lib
 from tensorboard import program
 from tensorboard.plugins import base_plugin
-from tensorboard.uploader import uploader_subcommand
 from tensorboard.util import tb_logging
 
 logger = tb_logging.get_logger()
@@ -37,11 +36,7 @@
 def run_main():
     """Initializes flags and calls main()."""
     main_lib.global_init()
-
-    tensorboard = program.TensorBoard(
-        plugins=default.get_plugins(),
-        subcommands=[uploader_subcommand.UploaderSubcommand()],
-    )
+    tensorboard = program.TensorBoard(plugins=default.get_plugins())
     try:
         app.run(tensorboard.main, flags_parser=tensorboard.configure)
     except base_plugin.FlagsError as e:

tensorboard/main_dev.py

@@ -22,7 +22,6 @@
 from tensorboard import main_lib
 from tensorboard import program
 from tensorboard.plugins import base_plugin
-from tensorboard.uploader import uploader_subcommand
 
 
 def run_main():
@@ -33,7 +32,6 @@ def run_main():
     tensorboard = program.TensorBoard(
         plugins=default.get_plugins(),
         assets_zip_provider=lambda: open(path, "rb"),
-        subcommands=[uploader_subcommand.UploaderSubcommand()],
     )
 
     try:

tensorboard/main_lib.py

@@ -22,6 +22,16 @@
 from tensorboard.compat import tf
 
 
+_TBDEV_SHUTDOWN_MESSAGE = """\
+======================================================================
+ERROR: The `tensorboard dev` command is no longer available.
+
+TensorBoard.dev has been shut down. For further information,
+see the FAQ at <https://tensorboard.dev/>.
+======================================================================
+"""
+
+
 def global_init():
     """Modifies the global environment for running TensorBoard as main.
 
@@ -45,3 +55,9 @@ def global_init():
 
     # Only emit log messages at WARNING and above by default to reduce spam.
     absl.logging.set_verbosity(absl.logging.WARNING)
+
+    # Intercept attempts to invoke `tensorboard dev` and print turndown message.
+    if sys.argv[1:] and sys.argv[1] == "dev":
+        sys.stderr.write(_TBDEV_SHUTDOWN_MESSAGE)
+        sys.stderr.flush()
+        sys.exit(1)

tensorboard/pip_package/requirements.txt

@@ -18,16 +18,13 @@
 absl-py >= 0.4
 # NOTE: this version should be >= the grpc version in our WORKSPACE file.
 grpcio >= 1.48.2
-google-auth >= 1.6.3, < 3
-google-auth-oauthlib >= 0.5, < 2
 markdown >= 2.6.8
 numpy >= 1.12.0
 # NOTE: this version must be >= the protoc version in our WORKSPACE file.
 # At the same time, any constraints we specify here must allow at least some
 # version to be installed that is also compatible with TensorFlow's constraints:
 # https://github.com/tensorflow/tensorflow/blob/9d22f4a0a9499c8e10a4312503e63e0da35ccd94/tensorflow/tools/pip_package/setup.py#L100-L107
 protobuf >= 3.19.6
-requests >= 2.21.0, < 3
 setuptools >= 41.0.0  # Note: provides pkg_resources as well as setuptools
 # A dependency of our vendored packages. This lower bound has not been correctly
 # vetted, but I wanted to be the least restrictive we can, since it's not a new

tensorboard/plugins/hparams/get_experiment.py

@@ -14,6 +14,8 @@
 # ==============================================================================
 """Classes and functions for handling the GetExperiment API call."""
 
+from tensorboard.plugins.hparams import api_pb2
+
 
 class Handler:
     """Handles a GetExperiment request."""
@@ -27,7 +29,7 @@ def __init__(
           request_context: A tensorboard.context.RequestContext.
           backend_context: A backend_context.Context instance.
           experiment_id: A string, as from `plugin_util.experiment_id`.
-          request: A api_pb2.GetExperimentRequest instance.
+          request: A request proto.
         """
         self._request_context = request_context
         self._backend_context = backend_context
@@ -38,7 +40,11 @@ def __init__(
             not request.HasField("include_metrics")
             or request.include_metrics
         )
-        self._hparams_limit = request.hparams_limit
+        self._hparams_limit = (
+            request.hparams_limit
+            if isinstance(request, api_pb2.GetExperimentRequest)
+            else None
+        )
 
     def run(self):
         """Handles the request specified on construction.

tensorboard/plugins/hparams/hparams_plugin.py

@@ -93,7 +93,7 @@ def download_data_route(self, request):
                 ctx, self._context, experiment_id, request_proto
             ).run()
             experiment = get_experiment.Handler(
-                ctx, self._context, experiment_id
+                ctx, self._context, experiment_id, request_proto
             ).run()
             body, mime_type = download_data.Handler(
                 self._context,