infra: create dev target

tensorboard/BUILD

@@ -19,11 +19,12 @@ package_group(
 py_binary(
     name = "tensorboard",
     srcs = ["main.py"],
+    data = ["webfiles.zip"],
     main = "main.py",
     srcs_version = "PY3",
     deps = [
         ":default",
-        ":dynamic_plugins",
+        ":dynamic_plugins",  # loads internal dynamic plugin like projector
         ":lib",
         ":main_lib",
         ":program",
@@ -45,6 +46,22 @@ py_library(
     ],
 )
 
+py_binary(
+    name = "dev",
+    srcs = ["main_dev.py"],
+    data = ["dev_webfiles.zip"],
+    main = "main_dev.py",
+    srcs_version = "PY3",
+    deps = [
+        ":default",
+        ":dynamic_plugins",  # loads internal dynamic plugin like projector
+        ":lib",
+        ":main_lib",
+        ":program",
+        "//tensorboard/uploader:uploader_subcommand",
+    ],
+)
+
 # The public TensorBoard python library, bundled with the pip package and
 # available via 'import tensorboard as tb' once installed.
 py_library(
@@ -248,7 +265,6 @@ py_library(
 py_library(
     name = "default",
     srcs = ["default.py"],
-    data = ["webfiles.zip"],
     srcs_version = "PY3",
     deps = [
         "//tensorboard:expect_pkg_resources_installed",
@@ -336,6 +352,29 @@ tf_web_library(
     ],
 )
 
+tensorboard_zip_file(
+    name = "dev_webfiles",
+    deps = [":dev_assets"],
+)
+
+# Should keep the asset dependencies in sync with :assets.
+tf_web_library(
+    name = "dev_assets",
+    srcs = [
+        "//tensorboard/webapp:index.html",
+        "//tensorboard/webapp:index.js",
+        "//tensorboard/webapp:svg_bundle",
+        "//tensorboard/webapp/widgets/line_chart_v2/lib/worker:chart_worker.js",
+    ],
+    path = "/",
+    suppress = ["strictDependencies"],
+    deps = [
+        "//tensorboard/webapp/widgets/source_code/monaco:monaco_editor",
+        "//tensorboard/webapp/widgets/source_code/monaco:monaco_languages",
+        "@com_google_fonts_roboto",
+    ],
+)
+
 # This is a dummy rule used as a numpy dependency in open-source.
 # We expect numpy to already be installed on the system, e.g. via
 # `pip install numpy`

tensorboard/main.py

@@ -21,7 +21,8 @@
 TensorBoard uses can swap out this file with their own.
 """
 
-
+import inspect
+import os
 import sys
 
 from absl import app
@@ -30,14 +31,26 @@
 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()
 
 
 def run_main():
     """Initializes flags and calls main()."""
     main_lib.global_init()
+
+    path = os.path.join(
+        os.path.dirname(inspect.getfile(sys._getframe(0))), "webfiles.zip"
+    )
+
+    if not os.path.exists(path):
+        logger.warning("webfiles.zip static assets not found: %s", path)
+        return None
+
     tensorboard = program.TensorBoard(
-        default.get_plugins(),
-        program.get_default_assets_zip_provider(),
+        lambda: open(path, "rb"),
+        plugins=default.get_plugins(),
         subcommands=[uploader_subcommand.UploaderSubcommand()],
     )
     try:

tensorboard/main_dev.py

@@ -0,0 +1,51 @@
+# Copyright 2021 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""TensorBoard dev main module."""
+
+import inspect
+import os
+import sys
+
+from absl import app
+from tensorboard import default
+from tensorboard import main_lib
+from tensorboard import program
+from tensorboard.plugins import base_plugin
+from tensorboard.uploader import uploader_subcommand
+
+
+def run_main():
+    """Initializes flags and calls main()."""
+    main_lib.global_init()
+
+    path = os.path.join(
+        os.path.dirname(inspect.getfile(sys._getframe(0))), "dev_webfiles.zip"
+    )
+
+    tensorboard = program.TensorBoard(
+        lambda: open(path, "rb"),
+        plugins=default.get_plugins(),
+        subcommands=[uploader_subcommand.UploaderSubcommand()],
+    )
+
+    try:
+        app.run(tensorboard.main, flags_parser=tensorboard.configure)
+    except base_plugin.FlagsError as e:
+        print("Error: %s" % e, file=sys.stderr)
+        sys.exit(1)
+
+
+if __name__ == "__main__":
+    run_main()

tensorboard/program.py

@@ -32,7 +32,6 @@
 import atexit
 from collections import defaultdict
 import errno
-import inspect
 import logging
 import mimetypes
 import os
@@ -65,24 +64,6 @@
 _SUBCOMMAND_FLAG = "__tensorboard_subcommand"
 
 
-def get_default_assets_zip_provider():
-    """Opens stock TensorBoard web assets collection.
-
-    Returns:
-      Returns function that returns a newly opened file handle to zip file
-      containing static assets for stock TensorBoard, or None if webfiles.zip
-      could not be found. The value the callback returns must be closed. The
-      paths inside the zip file are considered absolute paths on the web server.
-    """
-    path = os.path.join(
-        os.path.dirname(inspect.getfile(sys._getframe(1))), "webfiles.zip"
-    )
-    if not os.path.exists(path):
-        logger.warning("webfiles.zip static assets not found: %s", path)
-        return None
-    return lambda: open(path, "rb")
-
-
 class TensorBoard(object):
     """Class for running TensorBoard.
 
@@ -96,18 +77,19 @@ class TensorBoard(object):
 
     def __init__(
         self,
+        assets_zip_provider,
         plugins=None,
-        assets_zip_provider=None,
         server_class=None,
         subcommands=None,
     ):
         """Creates new instance.
 
         Args:
+          assets_zip_provider: A function that provides a zip file containing assets to
+            the application.
           plugins: A list of TensorBoard plugins to load, as TBPlugin classes or
             TBLoader instances or classes. If not specified, defaults to first-party
             plugins.
-          assets_zip_provider: Delegates to TBContext or uses default if None.
           server_class: An optional factory for a `TensorBoardServer` to use
             for serving the TensorBoard WSGI app. If provided, its callable
             signature should match that of `TensorBoardServer.__init__`.
@@ -122,8 +104,6 @@ def __init__(
             from tensorboard import default
 
             plugins = default.get_plugins()
-        if assets_zip_provider is None:
-            assets_zip_provider = get_default_assets_zip_provider()
         if server_class is None:
             server_class = create_port_scanning_werkzeug_server
         if subcommands is None:

tensorboard/program_test.py

@@ -26,37 +26,51 @@
 from tensorboard.plugins.core import core_plugin
 
 
+def fake_asset_provider():
+    pass
+
+
 class TensorBoardTest(tb_test.TestCase):
     """Tests the TensorBoard program."""
 
     def testPlugins_pluginClass(self):
-        tb = program.TensorBoard(plugins=[core_plugin.CorePlugin])
+        tb = program.TensorBoard(
+            fake_asset_provider, plugins=[core_plugin.CorePlugin]
+        )
         self.assertIsInstance(tb.plugin_loaders[0], base_plugin.BasicLoader)
         self.assertIs(tb.plugin_loaders[0].plugin_class, core_plugin.CorePlugin)
 
     def testPlugins_pluginLoaderClass(self):
-        tb = program.TensorBoard(plugins=[core_plugin.CorePluginLoader])
+        tb = program.TensorBoard(
+            fake_asset_provider, plugins=[core_plugin.CorePluginLoader]
+        )
         self.assertIsInstance(
             tb.plugin_loaders[0], core_plugin.CorePluginLoader
         )
 
     def testPlugins_pluginLoader(self):
         loader = core_plugin.CorePluginLoader()
-        tb = program.TensorBoard(plugins=[loader])
+        tb = program.TensorBoard(fake_asset_provider, plugins=[loader])
         self.assertIs(tb.plugin_loaders[0], loader)
 
     def testPlugins_invalidType(self):
         plugin_instance = core_plugin.CorePlugin(base_plugin.TBContext())
         with self.assertRaisesRegex(TypeError, "CorePlugin"):
-            tb = program.TensorBoard(plugins=[plugin_instance])
+            tb = program.TensorBoard(
+                fake_asset_provider, plugins=[plugin_instance]
+            )
 
     def testConfigure(self):
-        tb = program.TensorBoard(plugins=[core_plugin.CorePluginLoader])
+        tb = program.TensorBoard(
+            fake_asset_provider, plugins=[core_plugin.CorePluginLoader]
+        )
         tb.configure(logdir="foo")
         self.assertEqual(tb.flags.logdir, "foo")
 
     def testConfigure_unknownFlag(self):
-        tb = program.TensorBoard(plugins=[core_plugin.CorePlugin])
+        tb = program.TensorBoard(
+            fake_asset_provider, plugins=[core_plugin.CorePlugin]
+        )
         with self.assertRaisesRegex(ValueError, "Unknown TensorBoard flag"):
             tb.configure(foo="bar")
 
@@ -150,6 +164,7 @@ def tearDown(self):
 
     def testImplicitServe(self):
         tb = program.TensorBoard(
+            fake_asset_provider,
             plugins=[core_plugin.CorePluginLoader],
             subcommands=[_TestSubcommand(lambda parser: None)],
         )
@@ -162,6 +177,7 @@ def testImplicitServe(self):
 
     def testExplicitServe(self):
         tb = program.TensorBoard(
+            fake_asset_provider,
             plugins=[core_plugin.CorePluginLoader],
             subcommands=[_TestSubcommand()],
         )
@@ -179,6 +195,7 @@ def define_flags(parser):
             parser.add_argument("--hello")
 
         tb = program.TensorBoard(
+            fake_asset_provider,
             plugins=[core_plugin.CorePluginLoader],
             subcommands=[_TestSubcommand(define_flags=define_flags)],
         )
@@ -190,6 +207,7 @@ def define_flags(parser):
 
     def testSubcommand_ExitCode(self):
         tb = program.TensorBoard(
+            fake_asset_provider,
             plugins=[core_plugin.CorePluginLoader],
             subcommands=[_TestSubcommand()],
         )
@@ -199,6 +217,7 @@ def testSubcommand_ExitCode(self):
 
     def testSubcommand_DoesNotInheritBaseArgs(self):
         tb = program.TensorBoard(
+            fake_asset_provider,
             plugins=[core_plugin.CorePluginLoader],
             subcommands=[_TestSubcommand()],
         )
@@ -214,6 +233,7 @@ def define_flags(parser):
             parser.add_argument("payload")
 
         tb = program.TensorBoard(
+            fake_asset_provider,
             plugins=[core_plugin.CorePluginLoader],
             subcommands=[_TestSubcommand(define_flags=define_flags)],
         )
@@ -226,6 +246,7 @@ def define_flags(parser):
     def testConflictingNames_AmongSubcommands(self):
         with self.assertRaises(ValueError) as cm:
             tb = program.TensorBoard(
+                fake_asset_provider,
                 plugins=[core_plugin.CorePluginLoader],
                 subcommands=[_TestSubcommand(), _TestSubcommand()],
             )
@@ -235,6 +256,7 @@ def testConflictingNames_AmongSubcommands(self):
     def testConflictingNames_WithServe(self):
         with self.assertRaises(ValueError) as cm:
             tb = program.TensorBoard(
+                fake_asset_provider,
                 plugins=[core_plugin.CorePluginLoader],
                 subcommands=[_TestSubcommand(name="serve")],
             )