xinyun/ComfyUI-Manager
1
0
Fork 0
mirror of https://git.datalinker.icu/ltdrdata/ComfyUI-Manager synced 2025-12-09 22:24:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: invalid variable scopes

Browse Source 
https://github.com/ltdrdata/ComfyUI-Manager/issues/568#issuecomment-2057970786
This commit is contained in:
dr.lt.data 2024-04-16 11:29:13 +09:00
parent 6c0dfb2ed2
commit 9a1f489959
2 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
__init__.py
View File

@ -13,12 +13,13 @@ import threading
import re import re
import shutil import shutil
from datetime import datetime from datetime import datetime
import git
from server import PromptServer from server import PromptServer
from .glob import manager_core as core from .glob import manager_core as core
import cm_global import cm_global
version = [2, 18, 3] version = [2, 18, 4]
version_str = f"V{version[0]}.{version[1]}" + (f'.{version[2]}' if len(version) > 2 else '') version_str = f"V{version[0]}.{version[1]}" + (f'.{version[2]}' if len(version) > 2 else '')
print(f"### Loading: ComfyUI-Manager ({version_str})") print(f"### Loading: ComfyUI-Manager ({version_str})")
@ -127,27 +128,25 @@ def set_double_click_policy(mode):
def print_comfyui_version(): def print_comfyui_version():
global comfy_ui_revision
global comfy_ui_commit_datetime
global comfy_ui_hash global comfy_ui_hash
is_detached = False is_detached = False
try: try:
repo = git.Repo(os.path.dirname(folder_paths.__file__)) repo = git.Repo(os.path.dirname(folder_paths.__file__))
comfy_ui_revision = len(list(repo.iter_commits('HEAD'))) core.comfy_ui_revision = len(list(repo.iter_commits('HEAD')))
comfy_ui_hash = repo.head.commit.hexsha comfy_ui_hash = repo.head.commit.hexsha
cm_global.variables['comfyui.revision'] = comfy_ui_revision cm_global.variables['comfyui.revision'] = core.comfy_ui_revision
comfy_ui_commit_datetime = repo.head.commit.committed_datetime core.comfy_ui_commit_datetime = repo.head.commit.committed_datetime
cm_global.variables['comfyui.commit_datetime'] = comfy_ui_commit_datetime cm_global.variables['comfyui.commit_datetime'] = core.comfy_ui_commit_datetime
is_detached = repo.head.is_detached is_detached = repo.head.is_detached
current_branch = repo.active_branch.name current_branch = repo.active_branch.name
try: try:
if comfy_ui_commit_datetime.date() < core.comfy_ui_required_commit_datetime.date(): if core.comfy_ui_commit_datetime.date() < core.comfy_ui_required_commit_datetime.date():
print(f"\n\n## [WARN] ComfyUI-Manager: Your ComfyUI version ({comfy_ui_revision})[{comfy_ui_commit_datetime.date()}] is too old. Please update to the latest version. ##\n\n") print(f"\n\n## [WARN] ComfyUI-Manager: Your ComfyUI version ({core.comfy_ui_revision})[{core.comfy_ui_commit_datetime.date()}] is too old. Please update to the latest version. ##\n\n")
except: except:
pass pass
@ -155,7 +154,7 @@ def print_comfyui_version():
if 'cm.on_revision_detected_handler' in cm_global.variables: if 'cm.on_revision_detected_handler' in cm_global.variables:
for k, f in cm_global.variables['cm.on_revision_detected_handler']: for k, f in cm_global.variables['cm.on_revision_detected_handler']:
try: try:
f(comfy_ui_revision) f(core.comfy_ui_revision)
except Exception: except Exception:
print(f"[ERROR] '{k}' on_revision_detected_handler") print(f"[ERROR] '{k}' on_revision_detected_handler")
traceback.print_exc() traceback.print_exc()
@ -166,12 +165,12 @@ def print_comfyui_version():
# <-- # <--
if current_branch == "master": if current_branch == "master":
print(f"### ComfyUI Revision: {comfy_ui_revision} [{comfy_ui_hash[:8]}] | Released on '{comfy_ui_commit_datetime.date()}'") print(f"### ComfyUI Revision: {core.comfy_ui_revision} [{comfy_ui_hash[:8]}] | Released on '{core.comfy_ui_commit_datetime.date()}'")
else: else:
print(f"### ComfyUI Revision: {comfy_ui_revision} on '{current_branch}' [{comfy_ui_hash[:8]}] | Released on '{comfy_ui_commit_datetime.date()}'") print(f"### ComfyUI Revision: {core.comfy_ui_revision} on '{current_branch}' [{comfy_ui_hash[:8]}] | Released on '{core.comfy_ui_commit_datetime.date()}'")
except: except:
if is_detached: if is_detached:
print(f"### ComfyUI Revision: {comfy_ui_revision} [{comfy_ui_hash[:8]}] *DETACHED | Released on '{comfy_ui_commit_datetime.date()}'") print(f"### ComfyUI Revision: {core.comfy_ui_revision} [{comfy_ui_hash[:8]}] *DETACHED | Released on '{core.comfy_ui_commit_datetime.date()}'")
else: else:
print("### ComfyUI Revision: UNKNOWN (The currently installed ComfyUI is not a Git repository)") print("### ComfyUI Revision: UNKNOWN (The currently installed ComfyUI is not a Git repository)")
@ -1161,12 +1160,12 @@ async def get_notice(request):
if match: if match:
markdown_content = match.group(1) markdown_content = match.group(1)
markdown_content += f"<HR>ComfyUI: {comfy_ui_revision}[{comfy_ui_hash[:6]}]({comfy_ui_commit_datetime.date()})" markdown_content += f"<HR>ComfyUI: {core.comfy_ui_revision}[{comfy_ui_hash[:6]}]({core.comfy_ui_commit_datetime.date()})"
# markdown_content += f"<BR>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;()" # markdown_content += f"<BR>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;()"
markdown_content += f"<BR>Manager: {version_str}" markdown_content += f"<BR>Manager: {version_str}"
try: try:
if core.comfy_ui_required_commit_datetime.date() > comfy_ui_commit_datetime.date(): if core.comfy_ui_required_commit_datetime.date() > core.comfy_ui_commit_datetime.date():
markdown_content = f'<P style="text-align: center; color:red; background-color:white; font-weight:bold">Your ComfyUI is too OUTDATED!!!</P>' + markdown_content markdown_content = f'<P style="text-align: center; color:red; background-color:white; font-weight:bold">Your ComfyUI is too OUTDATED!!!</P>' + markdown_content
except: except:
pass pass

2
glob/manager_core.py
View File

@ -255,7 +255,7 @@ def try_install_script(url, repo_path, install_cmd, instant_execution=False):
print(f"\n## ComfyUI-Manager: EXECUTE => {install_cmd}") print(f"\n## ComfyUI-Manager: EXECUTE => {install_cmd}")
code = manager_funcs.run_script(install_cmd, cwd=repo_path) code = manager_funcs.run_script(install_cmd, cwd=repo_path)
if platform.system() == "Windows": if platform.system() != "Windows":
try: try:
if comfy_ui_commit_datetime.date() < comfy_ui_required_commit_datetime.date(): if comfy_ui_commit_datetime.date() < comfy_ui_required_commit_datetime.date():
print("\n\n###################################################################") print("\n\n###################################################################")