Merge pull request #5199 from plotly/fix-5186-type-checking-renegerate-code

Fix 5186 type checking renegerate code

Author: gvwilson

.gitignore

@@ -62,3 +62,4 @@ doc/check-or-enforce-order.py
 
 tests/percy/*.html
 tests/percy/pandas2/*.html
+test_path.png

codegen/__init__.py

@@ -271,24 +271,36 @@ def perform_codegen(reformat=True):
         root_datatype_imports.append(f"._deprecations.{dep_clas}")
 
     optional_figure_widget_import = f"""
-__all__.append("FigureWidget")
-orig_getattr = __getattr__
-def __getattr__(import_name):
-    if import_name == "FigureWidget":
-        try:
-            import ipywidgets
-            from packaging.version import Version
-
-            if Version(ipywidgets.__version__) >= Version("7.0.0"):
-                from ..graph_objs._figurewidget import FigureWidget
+if sys.version_info < (3, 7) or TYPE_CHECKING:
+    try:
+        import ipywidgets as _ipywidgets
+        from packaging.version import Version as _Version
+        if _Version(_ipywidgets.__version__) >= _Version("7.0.0"):
+            from ..graph_objs._figurewidget import FigureWidget
+        else:
+            raise ImportError()
+    except Exception:
+        from ..missing_anywidget import FigureWidget
+else:
+    __all__.append("FigureWidget")
+    orig_getattr = __getattr__
+    def __getattr__(import_name):
+        if import_name == "FigureWidget":
+            try:
+                import ipywidgets
+                from packaging.version import Version
+                if Version(ipywidgets.__version__) >= Version("7.0.0"):
+                    from ..graph_objs._figurewidget import FigureWidget
+                    return FigureWidget
+                else:
+                    raise ImportError()
+            except Exception:
+                from ..missing_anywidget import FigureWidget
                 return FigureWidget
             else:
                 raise ImportError()
-        except Exception:
-            from ..missing_anywidget import FigureWidget
-            return FigureWidget
 
-    return orig_getattr(import_name)
+        return orig_getattr(import_name)
 """
     # ### __all__ ###
     for path_parts, class_names in alls.items():

codegen/utils.py

@@ -82,12 +82,16 @@ def build_from_imports_py(rel_modules=(), rel_classes=(), init_extra=""):
 
     result = f"""\
 import sys
-from _plotly_utils.importers import relative_import
-__all__, __getattr__, __dir__ = relative_import(
-    __name__,
-    {repr(rel_modules)},
-    {repr(rel_classes)}
-)
+from typing import TYPE_CHECKING
+if TYPE_CHECKING:
+    {imports_str}
+else:
+    from _plotly_utils.importers import relative_import
+    __all__, __getattr__, __dir__ = relative_import(
+        __name__,
+        {repr(rel_modules)},
+        {repr(rel_classes)}
+    )
 
 {init_extra}
 """

plotly/__init__.py

@@ -26,7 +26,6 @@
 
 """
 
-import sys
 from typing import TYPE_CHECKING
 from _plotly_utils.importers import relative_import
 import importlib.metadata
@@ -35,7 +34,7 @@
 __version__ = importlib.metadata.version("plotly")
 version = __version__
 
-if sys.version_info < (3, 7) or TYPE_CHECKING:
+if TYPE_CHECKING:
     from plotly import (
         graph_objs,
         tools,