Address review on explicit import-surface coverage

Author: fede-kamel

src/openai/__init__.py

@@ -121,11 +121,6 @@
             pass
 
 
-def _is_truthy_env_var(name: str) -> bool:
-    value = _os.environ.get(name, "")
-    return value not in ("", "0", "false", "False")
-
-
 def _lazy_azure_openai() -> object:
     from .lib.azure import AzureOpenAI
 
@@ -180,21 +175,6 @@ def __getattr__(name: str) -> object:
 
     raise AttributeError(f"module {__name__!r} has no attribute {name!r}")
 
-
-def _resolve_eager_imports() -> None:
-    if not _is_truthy_env_var("OPENAI_EAGER_IMPORT"):
-        return
-
-    import importlib
-
-    # Resolve all lazy exports up-front in eager mode to catch import failures in CI/dev.
-    globals()["types"] = importlib.import_module("openai.types")
-    for name in _LAZY_EXPORTS:
-        __getattr__(name)
-
-
-_resolve_eager_imports()
-
 # ------ Module level client ------
 import typing as _t
 import typing_extensions as _te

src/openai/lib/__init__.py

@@ -1,2 +1,23 @@
-from ._tools import pydantic_function_tool as pydantic_function_tool
-from ._parsing import ResponseFormatT as ResponseFormatT
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Any
+
+if TYPE_CHECKING:
+    from ._parsing import ResponseFormatT as ResponseFormatT
+    from ._tools import pydantic_function_tool as pydantic_function_tool
+
+
+def __getattr__(name: str) -> Any:
+    if name == "pydantic_function_tool":
+        from ._tools import pydantic_function_tool
+
+        globals()[name] = pydantic_function_tool
+        return pydantic_function_tool
+
+    if name == "ResponseFormatT":
+        from ._parsing import ResponseFormatT
+
+        globals()[name] = ResponseFormatT
+        return ResponseFormatT
+
+    raise AttributeError(f"module {__name__!r} has no attribute {name!r}")

tests/lib/test_import_surface_live.py

@@ -18,11 +18,18 @@ def _restore_openai_modules(original_modules: dict[str, object]) -> None:
     sys.modules.update(original_modules)
 
 
+def _resolve_lazy_exports(openai_module: object) -> None:
+    getattr(openai_module, "types")
+    getattr(openai_module, "AzureOpenAI")
+    getattr(openai_module, "AsyncAzureOpenAI")
+    getattr(openai_module, "pydantic_function_tool")
+    getattr(openai_module, "AssistantEventHandler")
+    getattr(openai_module, "AsyncAssistantEventHandler")
+
+
 @pytest.mark.skipif(os.environ.get("OPENAI_LIVE") != "1", reason="requires OPENAI_LIVE=1")
 @pytest.mark.skipif(not os.environ.get("OPENAI_API_KEY"), reason="requires OPENAI_API_KEY")
-def test_eager_import_with_live_token_allows_real_request(monkeypatch) -> None:
-    # Exercise eager mode in a real SDK flow behind explicit live-test flags.
-    monkeypatch.setenv("OPENAI_EAGER_IMPORT", "1")
+def test_explicit_lazy_export_resolution_allows_real_request() -> None:
     original_modules = _openai_modules()
 
     for name in original_modules:
@@ -32,6 +39,8 @@ def test_eager_import_with_live_token_allows_real_request(monkeypatch) -> None:
     try:
         openai = importlib.import_module("openai")
 
+        _resolve_lazy_exports(openai)
+
         assert "openai.types" in sys.modules
         assert "openai.lib.azure" in sys.modules
         assert "AzureOpenAI" in openai.__dict__

tests/test_import_surface.py

@@ -15,8 +15,16 @@ def _restore_openai_modules(original_modules: dict[str, object]) -> None:
     sys.modules.update(original_modules)
 
 
-def test_openai_azure_is_lazy_imported(monkeypatch) -> None:
-    monkeypatch.delenv("OPENAI_EAGER_IMPORT", raising=False)
+def _resolve_lazy_exports(openai_module: object) -> None:
+    getattr(openai_module, "types")
+    getattr(openai_module, "AzureOpenAI")
+    getattr(openai_module, "AsyncAzureOpenAI")
+    getattr(openai_module, "pydantic_function_tool")
+    getattr(openai_module, "AssistantEventHandler")
+    getattr(openai_module, "AsyncAssistantEventHandler")
+
+
+def test_openai_azure_is_lazy_imported() -> None:
     original_modules = _openai_modules()
 
     for name in original_modules:
@@ -33,16 +41,20 @@ def test_openai_azure_is_lazy_imported(monkeypatch) -> None:
         _restore_openai_modules(original_modules)
 
 
-def test_openai_eager_import_resolves_lazy_exports(monkeypatch) -> None:
+def test_openai_can_explicitly_resolve_lazy_exports() -> None:
     original_modules = _openai_modules()
-    monkeypatch.setenv("OPENAI_EAGER_IMPORT", "1")
 
     for name in original_modules:
         sys.modules.pop(name, None)
 
     try:
         openai = importlib.import_module("openai")
 
+        assert "openai.types" not in sys.modules
+        assert "openai.lib.azure" not in sys.modules
+
+        _resolve_lazy_exports(openai)
+
         assert "openai.types" in sys.modules
         assert "openai.lib.azure" in sys.modules
         assert "AzureOpenAI" in openai.__dict__