-
Notifications
You must be signed in to change notification settings - Fork 1.7k
fix(cli): defer graph initialization #436
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
deepujain
wants to merge
14
commits into
NVIDIA:main
Choose a base branch
from
deepujain:fix/435-lazy-graph
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.
Open
Changes from all commits
Commits
Show all changes
14 commits
Select commit
Hold shift + click to select a range
0115544
fix(cli): defer graph initialization
deepujain d1f9267
fix(cli): satisfy lazy graph lint
deepujain 3ce8306
style: format lazy graph changes
deepujain 7d41d9e
test(cli): cover post-load graph re-import stability
deepujain 812b904
test(cli): isolate graph proxy reload from real graph import
deepujain 937a22c
test(graph): keep lazy package export stable after submodule load
deepujain 3306d23
test(graph): assert lazy export restore without import isolation
deepujain 6b49046
test(graph): clear monkeypatched invoke before lazy export assertions
deepujain 0e79370
test(mcp): use public graph factory after lazy export
deepujain fbcf688
test(mcp): build the late-bound graph from its module
deepujain 5798fd7
test(mcp): use the credential-independent graph
deepujain b339eba
fix(cli): preserve lazy graph export across import orders
deepujain f176df0
test(skillspector): restore pre-existing invoke attr in graph isolati…
deepujain 6d603ae
test: preserve incoming graph sentinel state
deepujain 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
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,66 @@ | ||
| # SPDX-FileCopyrightText: Copyright (c) 2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved. | ||
| # SPDX-License-Identifier: Apache-2.0 | ||
| # | ||
| # 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. | ||
|
|
||
| """Lightweight lazy access to the compiled SkillSpector workflow graph.""" | ||
|
|
||
| from __future__ import annotations | ||
|
|
||
| import sys | ||
| from threading import Lock | ||
| from typing import Any | ||
|
|
||
|
|
||
| class LazyGraph: | ||
| """Load the compiled workflow only when a caller first uses it.""" | ||
|
|
||
| def __init__(self) -> None: | ||
| self._compiled: Any | None = None | ||
| self._lock = Lock() | ||
|
|
||
| def _get_compiled(self) -> Any: | ||
| if self._compiled is None: | ||
| with self._lock: | ||
| if self._compiled is None: | ||
| from skillspector.graph import graph as compiled_graph | ||
|
deepujain marked this conversation as resolved.
|
||
|
|
||
| self._compiled = compiled_graph | ||
| # Importing the submodule assigns it to the parent package. | ||
| # Restore the documented package-level lazy export before | ||
| # another caller imports it. | ||
| import skillspector as _skillspector_pkg | ||
|
|
||
| _skillspector_pkg.graph = graph | ||
| sys.modules["skillspector"].graph = graph | ||
| return self._compiled | ||
|
|
||
| def __getattr__(self, name: str) -> Any: | ||
| return getattr(self._get_compiled(), name) | ||
|
|
||
|
|
||
| def restore_package_graph_export() -> None: | ||
| """Re-assert the lazy proxy as the package-level ``graph`` export. | ||
|
|
||
| Importing the ``skillspector.graph`` submodule assigns the module object | ||
| to the parent package's ``graph`` attribute, shadowing this proxy. Call | ||
| this after any eager submodule import (the ``create_graph()`` factory | ||
| wrapper, ``mcp_server``) so ``skillspector.graph`` stays invokable | ||
| regardless of import order. | ||
| """ | ||
| import skillspector as _pkg | ||
|
|
||
| _pkg.graph = graph | ||
|
|
||
|
|
||
| graph = LazyGraph() | ||
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
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,94 @@ | ||
| # SPDX-FileCopyrightText: Copyright (c) 2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved. | ||
| # SPDX-License-Identifier: Apache-2.0 | ||
|
|
||
| """Tests for the lazy package-level graph export.""" | ||
|
|
||
| from __future__ import annotations | ||
|
|
||
| import importlib | ||
| import sys | ||
| from collections.abc import Generator | ||
|
|
||
| import pytest | ||
|
|
||
| import skillspector | ||
| from skillspector.graph_proxy import LazyGraph | ||
| from skillspector.graph_proxy import graph as lazy_graph | ||
|
|
||
|
|
||
| @pytest.fixture | ||
| def _graph_import_state( | ||
| monkeypatch: pytest.MonkeyPatch, | ||
| ) -> Generator[None, None, None]: | ||
| """Snapshot and restore all shared graph import state. | ||
|
|
||
| Closes rng1995/yashrajp22 reviews on #436: graph import-order tests must | ||
| exercise the real factory/import paths without leaking ``sys.modules`` | ||
| entries, the package ``graph`` attribute, or ``LazyGraph`` compiled | ||
| state into other tests. | ||
| """ | ||
| monkeypatch.delitem(sys.modules, "skillspector.graph", raising=False) | ||
| monkeypatch.delitem(sys.modules, "skillspector.mcp_server", raising=False) | ||
| monkeypatch.setattr(skillspector, "graph", lazy_graph, raising=False) | ||
| monkeypatch.setattr(lazy_graph, "_compiled", None, raising=False) | ||
| # A leaked instance attribute would shadow __getattr__ delegation; | ||
| # drop it so the proxy is pristine, restoring the exact prior value | ||
| # (or its absence) after the test. monkeypatch.delattr cannot cover | ||
| # this: LazyGraph.__getattr__ delegation makes hasattr() true even | ||
| # when the instance dict holds no such attribute, so the instance | ||
| # dict is snapshotted and restored explicitly. | ||
| had_invoke = "invoke" in lazy_graph.__dict__ | ||
| prior_invoke = lazy_graph.__dict__.pop("invoke", None) | ||
| try: | ||
| yield | ||
| finally: | ||
| if had_invoke: | ||
| lazy_graph.__dict__["invoke"] = prior_invoke | ||
|
|
||
|
|
||
| def _assert_graph_export_invokable() -> None: | ||
| exported = skillspector.graph | ||
| for name in ("invoke", "ainvoke", "stream"): | ||
| assert callable(getattr(exported, name)), ( | ||
| f"skillspector.graph lost {name} after import-order change" | ||
| ) | ||
|
|
||
|
|
||
| def test_create_graph_first_preserves_lazy_export( | ||
| _graph_import_state: None, | ||
| ) -> None: | ||
| """rng1995 #436: create_graph() as first access keeps the lazy export.""" | ||
| skillspector.create_graph() | ||
| assert isinstance(skillspector.graph, LazyGraph) | ||
| _assert_graph_export_invokable() | ||
|
|
||
|
|
||
| def test_mcp_import_first_preserves_lazy_export(_graph_import_state: None) -> None: | ||
| """yashrajp22 #436: importing MCP first keeps the lazy export.""" | ||
| importlib.import_module("skillspector.mcp_server") | ||
| assert isinstance(skillspector.graph, LazyGraph) | ||
| _assert_graph_export_invokable() | ||
|
|
||
|
|
||
| def test_direct_submodule_import_keeps_graph_invokable( | ||
| _graph_import_state: None, | ||
| ) -> None: | ||
| """yashrajp22 #436: direct submodule import keeps skillspector.graph invokable.""" | ||
| importlib.import_module("skillspector.graph") | ||
| _assert_graph_export_invokable() | ||
|
|
||
|
|
||
| def test_graph_import_state_restores_preexisting_invoke_attribute( | ||
| monkeypatch: pytest.MonkeyPatch, | ||
| ) -> None: | ||
| """rng1995 #436: isolation must not delete a pre-existing ``invoke`` attribute.""" | ||
| sentinel = object() | ||
| monkeypatch.setitem(lazy_graph.__dict__, "invoke", sentinel) | ||
| fixture_gen = _graph_import_state.__wrapped__(monkeypatch) | ||
| next(fixture_gen) | ||
| try: | ||
| assert "invoke" not in lazy_graph.__dict__ | ||
| finally: | ||
| with pytest.raises(StopIteration): | ||
| next(fixture_gen) | ||
| assert lazy_graph.__dict__["invoke"] is sentinel |
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
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.