Lazy-load the watchdog event watcher module

lib/streamlit/watcher/event_based_path_watcher.py

@@ -32,11 +32,14 @@
   listens to folder events, sees if registered paths changed, and fires
   callbacks if so.
 
+This module is lazy-loaded and used only if watchdog is installed.
 """
 
+from __future__ import annotations
+
 import os
 import threading
-from typing import Callable, Dict, Optional, cast
+from typing import Callable, Dict, cast
 
 from blinker import ANY, Signal
 from watchdog import events
@@ -47,7 +50,7 @@
 from streamlit.util import repr_
 from streamlit.watcher import util
 
-LOGGER = get_logger(__name__)
+_LOGGER = get_logger(__name__)
 
 
 class EventBasedPathWatcher:
@@ -58,14 +61,14 @@
         """Close the _MultiPathWatcher singleton."""
         path_watcher = _MultiPathWatcher.get_singleton()
         path_watcher.close()
-        LOGGER.debug("Watcher closed")
+        _LOGGER.debug("Watcher closed")
 
     def __init__(
         self,
         path: str,
         on_changed: Callable[[str], None],
         *,  # keyword-only arguments:
-        glob_pattern: Optional[str] = None,
+        glob_pattern: str | None = None,
         allow_nonexistent: bool = False,
     ) -> None:
         """Constructor for EventBasedPathWatchers.
@@ -76,7 +79,7 @@
             The path to watch.
         on_changed : Callable[[str], None]
             Callback to call when the path changes.
-        glob_pattern : Optional[str]
+        glob_pattern : str or None
             A glob pattern to filter the files in a directory that should be
             watched. Only relevant when creating an EventBasedPathWatcher on a
             directory.
@@ -95,7 +98,7 @@
             glob_pattern=glob_pattern,
             allow_nonexistent=allow_nonexistent,
         )
-        LOGGER.debug("Watcher created for %s", self._path)
+        _LOGGER.debug("Watcher created for %s", self._path)
 
     def __repr__(self) -> str:
         return repr_(self)
@@ -109,7 +112,7 @@
 class _MultiPathWatcher(object):
     """Watches multiple paths."""
 
-    _singleton: Optional["_MultiPathWatcher"] = None
+    _singleton: "_MultiPathWatcher" | None = None
 
     @classmethod
     def get_singleton(cls) -> "_MultiPathWatcher":
@@ -118,7 +121,7 @@
         Instantiates one if necessary.
         """
         if cls._singleton is None:
-            LOGGER.debug("No singleton. Registering one.")
+            _LOGGER.debug("No singleton. Registering one.")
             _MultiPathWatcher()
 
         return cast("_MultiPathWatcher", _MultiPathWatcher._singleton)
@@ -154,7 +157,7 @@
         path: str,
         callback: Callable[[str], None],
         *,  # keyword-only arguments:
-        glob_pattern: Optional[str] = None,
+        glob_pattern: str | None = None,
         allow_nonexistent: bool = False,
     ) -> None:
         """Start watching a path."""
@@ -186,7 +189,7 @@
             folder_handler = self._folder_handlers.get(folder_path)
 
             if folder_handler is None:
-                LOGGER.debug(
+                _LOGGER.debug(
                     "Cannot stop watching path, because it is already not being "
                     "watched. %s",
                     folder_path,
@@ -204,12 +207,12 @@
             """Close this _MultiPathWatcher object forever."""
             if len(self._folder_handlers) != 0:
                 self._folder_handlers = {}
-                LOGGER.debug(
+                _LOGGER.debug(
                     "Stopping observer thread even though there is a non-zero "
                     "number of event observers!"
                 )
             else:
-                LOGGER.debug("Stopping observer thread")
+                _LOGGER.debug("Stopping observer thread")
 
             self._observer.stop()
             self._observer.join(timeout=5)
@@ -223,7 +226,7 @@
         md5: str,
         modification_time: float,
         *,  # keyword-only arguments:
-        glob_pattern: Optional[str] = None,
+        glob_pattern: str | None = None,
         allow_nonexistent: bool = False,
     ):
         self.md5 = md5
@@ -254,7 +257,7 @@
         super(_FolderEventHandler, self).__init__()
         self._watched_paths: Dict[str, WatchedPath] = {}
         self._lock = threading.Lock()  # for watched_paths mutations
-        self.watch: Optional[ObservedWatch] = None
+        self.watch: ObservedWatch | None = None
 
     def __repr__(self) -> str:
         return repr_(self)
@@ -264,7 +267,7 @@
         path: str,
         callback: Callable[[str], None],
         *,  # keyword-only arguments:
-        glob_pattern: Optional[str] = None,
+        glob_pattern: str | None = None,
         allow_nonexistent: bool = False,
     ) -> None:
         """Add a path to this object's event filter."""
@@ -320,22 +323,24 @@
             # the desired subtype from the event_type check
             event = cast(events.FileSystemMovedEvent, event)
 
-            LOGGER.debug("Move event: src %s; dest %s", event.src_path, event.dest_path)
+            _LOGGER.debug(
+                "Move event: src %s; dest %s", event.src_path, event.dest_path
+            )
             changed_path = event.dest_path
         # On OSX with VI, on save, the file is deleted, the swap file is
         # modified and then the original file is created hence why we
         # capture EVENT_TYPE_CREATED
         elif event.event_type == events.EVENT_TYPE_CREATED:
             changed_path = event.src_path
         else:
-            LOGGER.debug("Don't care about event type %s", event.event_type)
+            _LOGGER.debug("Don't care about event type %s", event.event_type)
             return
 
         changed_path = os.path.abspath(changed_path)
 
         changed_path_info = self._watched_paths.get(changed_path, None)
         if changed_path_info is None:
-            LOGGER.debug(
+            _LOGGER.debug(
                 "Ignoring changed path %s.\nWatched_paths: %s",
                 changed_path,
                 self._watched_paths,
@@ -352,7 +357,7 @@
             modification_time != 0.0
             and modification_time == changed_path_info.modification_time
         ):
-            LOGGER.debug("File/dir timestamp did not change: %s", changed_path)
+            _LOGGER.debug("File/dir timestamp did not change: %s", changed_path)
             return
 
         changed_path_info.modification_time = modification_time
@@ -363,10 +368,10 @@
             allow_nonexistent=changed_path_info.allow_nonexistent,
         )
         if new_md5 == changed_path_info.md5:
-            LOGGER.debug("File/dir MD5 did not change: %s", changed_path)
+            _LOGGER.debug("File/dir MD5 did not change: %s", changed_path)
             return
 
-        LOGGER.debug("File/dir MD5 changed: %s", changed_path)
+        _LOGGER.debug("File/dir MD5 changed: %s", changed_path)
         changed_path_info.md5 = new_md5
         changed_path_info.on_changed.send(changed_path)
 

lib/streamlit/watcher/path_watcher.py

@@ -12,9 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from typing import Callable, Optional, Type, Union
+from __future__ import annotations
 
-import click
+from typing import Callable, Type, Union
 
 import streamlit.watcher
 from streamlit import config, env_util
@@ -23,18 +23,6 @@
 
 LOGGER = get_logger(__name__)
 
-try:
-    # Check if the watchdog module is installed.
-    from streamlit.watcher.event_based_path_watcher import EventBasedPathWatcher
-
-    watchdog_available = True
-except ImportError:
-    watchdog_available = False
-    # Stub the EventBasedPathWatcher so it can be mocked by tests
-
-    class EventBasedPathWatcher:  # type: ignore
-        pass
-
 
 # local_sources_watcher.py caches the return value of
 # get_default_path_watcher_class(), so it needs to differentiate between the
@@ -50,7 +38,7 @@ def __init__(
         _path_str: str,
         _on_changed: Callable[[str], None],
         *,  # keyword-only arguments:
-        glob_pattern: Optional[str] = None,
+        glob_pattern: str | None = None,
         allow_nonexistent: bool = False,
     ):
         pass
@@ -66,32 +54,45 @@ def __init__(
 ]
 
 
+def _is_watchdog_available() -> bool:
+    """Check if the watchdog module is installed."""
+    try:
+        import watchdog  # noqa: F401
+
+        return True
+    except ImportError:
+        return False
+
+
 def report_watchdog_availability():
-    if not watchdog_available:
-        if not config.get_option("global.disableWatchdogWarning") and config.get_option(
-            "server.fileWatcherType"
-        ) not in ["poll", "none"]:
-            msg = "\n  $ xcode-select --install" if env_util.IS_DARWIN else ""
-
-            click.secho(
-                "  %s" % "For better performance, install the Watchdog module:",
-                fg="blue",
-                bold=True,
-            )
-            click.secho(
-                """%s
-  $ pip install watchdog
-            """
-                % msg
-            )
+    if (
+        not config.get_option("global.disableWatchdogWarning")
+        and config.get_option("server.fileWatcherType") not in ["poll", "none"]
+        and not _is_watchdog_available()
+    ):
+        import click
+
+        msg = "\n  $ xcode-select --install" if env_util.IS_DARWIN else ""
+
+        click.secho(
+            "  %s" % "For better performance, install the Watchdog module:",
+            fg="blue",
+            bold=True,
+        )
+        click.secho(
+            """%s
+$ pip install watchdog
+        """
+            % msg
+        )
 
 
 def _watch_path(
     path: str,
     on_path_changed: Callable[[str], None],
-    watcher_type: Optional[str] = None,
+    watcher_type: str | None = None,
     *,  # keyword-only arguments:
-    glob_pattern: Optional[str] = None,
+    glob_pattern: str | None = None,
     allow_nonexistent: bool = False,
 ) -> bool:
     """Create a PathWatcher for the given path if we have a viable
@@ -139,17 +140,17 @@ def _watch_path(
 def watch_file(
     path: str,
     on_file_changed: Callable[[str], None],
-    watcher_type: Optional[str] = None,
+    watcher_type: str | None = None,
 ) -> bool:
     return _watch_path(path, on_file_changed, watcher_type)
 
 
 def watch_dir(
     path: str,
     on_dir_changed: Callable[[str], None],
-    watcher_type: Optional[str] = None,
+    watcher_type: str | None = None,
     *,  # keyword-only arguments:
-    glob_pattern: Optional[str] = None,
+    glob_pattern: str | None = None,
     allow_nonexistent: bool = False,
 ) -> bool:
     return _watch_path(
@@ -172,13 +173,13 @@ def get_path_watcher_class(watcher_type: str) -> PathWatcherType:
     """Return the PathWatcher class that corresponds to the given watcher_type
     string. Acceptable values are 'auto', 'watchdog', 'poll' and 'none'.
     """
-    if watcher_type == "auto":
-        if watchdog_available:
-            return EventBasedPathWatcher
-        else:
-            return PollingPathWatcher
-    elif watcher_type == "watchdog" and watchdog_available:
+    if watcher_type in {"watchdog", "auto"} and _is_watchdog_available():
+        # Lazy-import this module to prevent unnecessary imports of the watchdog package.
+        from streamlit.watcher.event_based_path_watcher import EventBasedPathWatcher
+
         return EventBasedPathWatcher
+    elif watcher_type == "auto":
+        return PollingPathWatcher
     elif watcher_type == "poll":
         return PollingPathWatcher
     else:

lib/tests/streamlit/watcher/local_sources_watcher_test.py

@@ -26,7 +26,7 @@
 import tests.streamlit.watcher.test_data.nested_module_parent as NESTED_MODULE_PARENT
 from streamlit import config
 from streamlit.watcher import local_sources_watcher
-from streamlit.watcher.path_watcher import NoOpPathWatcher, watchdog_available
+from streamlit.watcher.path_watcher import NoOpPathWatcher, _is_watchdog_available
 
 SCRIPT_PATH = os.path.join(os.path.dirname(__file__), "test_data/not_a_real_script.py")
 
@@ -242,7 +242,7 @@ def test_config_watcherType(self):
         config.set_option("server.fileWatcherType", "watchdog")
         self.assertEqual(
             local_sources_watcher.get_default_path_watcher_class().__name__,
-            "EventBasedPathWatcher" if watchdog_available else "NoOpPathWatcher",
+            "EventBasedPathWatcher" if _is_watchdog_available() else "NoOpPathWatcher",
         )
 
         config.set_option("server.fileWatcherType", "auto")