-
Notifications
You must be signed in to change notification settings - Fork 5.2k
perf: defer eager type/streaming imports at import openai
#3843
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
harsheet-shah
wants to merge
1
commit into
openai:main
Choose a base branch
from
harsheet-shah:harsheet/lazy-top-level-imports
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+156
−12
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| from __future__ import annotations | ||
|
|
||
| from typing import Any | ||
| from typing_extensions import override | ||
|
|
||
| from ._proxy import LazyProxy | ||
|
|
||
|
|
||
| class TypesProxy(LazyProxy[Any]): | ||
| """Lazily import ``openai.types`` when an exported type is accessed.""" | ||
|
|
||
| @override | ||
| def __load__(self) -> Any: | ||
| import importlib | ||
|
|
||
| return importlib.import_module("openai.types") | ||
|
|
||
|
|
||
| types = TypesProxy().__as_proxied__() |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,30 @@ | ||
| from ._tools import pydantic_function_tool as pydantic_function_tool | ||
| from ._parsing import ResponseFormatT as ResponseFormatT | ||
| from __future__ import annotations | ||
|
|
||
| import importlib | ||
| from typing import TYPE_CHECKING, Any | ||
|
|
||
| if TYPE_CHECKING: | ||
| from ._tools import pydantic_function_tool as pydantic_function_tool | ||
| from ._parsing import ResponseFormatT as ResponseFormatT | ||
|
|
||
| __all__ = ["ResponseFormatT", "pydantic_function_tool"] | ||
|
|
||
| _LAZY_IMPORTS = { | ||
| "ResponseFormatT": ("._parsing", "ResponseFormatT"), | ||
| "pydantic_function_tool": ("._tools", "pydantic_function_tool"), | ||
| } | ||
|
|
||
|
|
||
| def __getattr__(name: str) -> Any: | ||
| lazy_import = _LAZY_IMPORTS.get(name) | ||
| if lazy_import is None: | ||
| raise AttributeError(f"module {__name__!r} has no attribute {name!r}") | ||
|
|
||
| module_name, attribute_name = lazy_import | ||
| value = getattr(importlib.import_module(module_name, __name__), attribute_name) | ||
| globals()[name] = value | ||
| return value | ||
|
|
||
|
|
||
| def __dir__() -> list[str]: | ||
| return sorted(set(globals()) | set(_LAZY_IMPORTS)) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| from __future__ import annotations | ||
|
|
||
| import json | ||
| import os | ||
| import subprocess | ||
| import sys | ||
| from pathlib import Path | ||
|
|
||
| import openai | ||
|
|
||
|
|
||
| def _run_fresh_import(source: str) -> dict[str, object]: | ||
| env = os.environ.copy() | ||
| env["PYTHONPATH"] = str(Path(__file__).parents[1] / "src") | ||
| result = subprocess.run( | ||
| [sys.executable, "-c", source], | ||
| check=True, | ||
| capture_output=True, | ||
| text=True, | ||
| env=env, | ||
| ) | ||
| return json.loads(result.stdout) | ||
|
|
||
|
|
||
| def test_top_level_import_defers_optional_subtrees() -> None: | ||
| # `import openai` should no longer eagerly build the Assistants ``beta`` type | ||
| # tree (the largest unused subtree) or the streaming helpers. They must load | ||
| # only on first use. | ||
| imported = _run_fresh_import( | ||
| """ | ||
| import json | ||
| import sys | ||
| import openai | ||
|
|
||
| print(json.dumps({ | ||
| "beta": "openai.types.beta" in sys.modules, | ||
| "streaming": "openai.lib.streaming" in sys.modules, | ||
| })) | ||
| """ | ||
| ) | ||
|
|
||
| assert imported == {"beta": False, "streaming": False} | ||
|
|
||
|
|
||
| def test_lazy_top_level_exports_preserve_public_objects() -> None: | ||
| from openai.lib import pydantic_function_tool | ||
| from openai.lib.streaming import AssistantEventHandler, AsyncAssistantEventHandler | ||
|
|
||
| assert openai.pydantic_function_tool is pydantic_function_tool | ||
| assert openai.AssistantEventHandler is AssistantEventHandler | ||
| assert openai.AsyncAssistantEventHandler is AsyncAssistantEventHandler | ||
|
|
||
|
|
||
| def test_types_proxy_loads_real_module_on_access() -> None: | ||
| imported = _run_fresh_import( | ||
| """ | ||
| import json | ||
| import sys | ||
| import openai | ||
|
|
||
| batch = openai.types.Batch | ||
| print(json.dumps({ | ||
| "name": batch.__name__, | ||
| "types": "openai.types" in sys.modules, | ||
| })) | ||
| """ | ||
| ) | ||
|
|
||
| assert imported == {"name": "Batch", "types": True} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
During every
import openai,_exceptions.py:10has already importedopenai.types.shared.oauth_error_code, which executes and caches the realopenai.typespackage. This assignment therefore replaces the parent attribute after the module is cached rather than deferring its import; subsequentimport openai.types as typesreturns theTypesProxy, and operations requiring a genuine module, such asimportlib.reload(types), fail because the proxy is not the object insys.modules. Keep the cached module here, or remove the earlier package import before installing a proxy, so the exported module API is not changed without any import-time benefit.AGENTS.md reference: AGENTS.md:L5-L8
Useful? React with 👍 / 👎.