Repository navigation
Fix failure answers, console messages and settings (5 fixes) #3543
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
Merged
+331
−22
Merged
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
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,41 @@ | ||
| """`comfyui_versions` answers 400 when the versions of ComfyUI cannot be read. | ||
| Each case runs the real handler of `glob/manager_server.py`; `core` is replaced. | ||
| """ | ||
| import ast | ||
| import asyncio | ||
| import logging | ||
| import sys | ||
| from types import SimpleNamespace | ||
|
|
||
| from aiohttp import web | ||
|
|
||
| from manager_test_utils import GLOB_DIR | ||
|
|
||
|
|
||
| def fail(): | ||
| raise RuntimeError("not a git repository") | ||
|
|
||
|
|
||
| def answer(get_comfyui_versions): | ||
| """The status and text `comfyui_versions` answers.""" | ||
| source = (GLOB_DIR / "manager_server.py").read_text(encoding="utf-8") | ||
| handler = [node for node in ast.parse(source).body | ||
| if isinstance(node, ast.AsyncFunctionDef) and node.name == "comfyui_versions"] | ||
| assert len(handler) == 1 | ||
| namespace = {"web": web, "logging": logging, "sys": sys, | ||
| "core": SimpleNamespace(get_comfyui_versions=get_comfyui_versions), | ||
| "routes": SimpleNamespace(get=lambda path: lambda handler: handler)} | ||
| exec(compile(ast.Module(body=handler, type_ignores=[]), "<comfyui_versions>", "exec"), namespace) | ||
| response = asyncio.run(namespace["comfyui_versions"](None)) | ||
| return response.status, response.text | ||
|
|
||
|
|
||
| def test_version_list_that_cannot_be_read_is_answered_with_400(caplog): | ||
| assert answer(fail) == (400, None) | ||
| assert "ComfyUI update fail: not a git repository" in caplog.text | ||
|
|
||
|
|
||
| def test_version_list_is_answered_with_the_versions(): | ||
| assert answer(lambda: (["nightly", "v0.3.1"], "v0.3.1", "v0.3.1")) == ( | ||
| 200, '{"versions": ["nightly", "v0.3.1"], "current": "v0.3.1"}') |
Oops, something went wrong.
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.