Compare commits

...

3 Commits
3.7 ... 3.7.3

4 changed files with 36 additions and 9 deletions

View File

@@ -537,7 +537,7 @@ def get_all_installed_node_specs():
res.append(node_spec_str) res.append(node_spec_str)
processed.add(k) processed.add(k)
for k, _ in unified_manager.cnr_inactive_nodes.keys(): for k in unified_manager.cnr_inactive_nodes.keys():
if k in processed: if k in processed:
continue continue
@@ -546,7 +546,7 @@ def get_all_installed_node_specs():
node_spec_str = f"{k}@{str(latest[0])}" node_spec_str = f"{k}@{str(latest[0])}"
res.append(node_spec_str) res.append(node_spec_str)
for k, _ in unified_manager.nightly_inactive_nodes.keys(): for k in unified_manager.nightly_inactive_nodes.keys():
if k in processed: if k in processed:
continue continue

View File

@@ -195,7 +195,11 @@ def gitpull(path):
branch_name = current_branch.name branch_name = current_branch.name
remote.fetch() remote.fetch()
remote_commit_hash = repo.refs[f'{remote_name}/{branch_name}'].object.hexsha if f'{remote_name}/{branch_name}' in repo.refs:
remote_commit_hash = repo.refs[f'{remote_name}/{branch_name}'].object.hexsha
else:
print("CUSTOM NODE PULL: Fail") # update fail
return
if commit_hash == remote_commit_hash: if commit_hash == remote_commit_hash:
print("CUSTOM NODE PULL: None") # there is no update print("CUSTOM NODE PULL: None") # there is no update

View File

@@ -41,7 +41,7 @@ import manager_downloader
from node_package import InstalledNodePackage from node_package import InstalledNodePackage
version_code = [3, 7] version_code = [3, 7, 3]
version_str = f"V{version_code[0]}.{version_code[1]}" + (f'.{version_code[2]}' if len(version_code) > 2 else '') version_str = f"V{version_code[0]}.{version_code[1]}" + (f'.{version_code[2]}' if len(version_code) > 2 else '')
@@ -1264,7 +1264,10 @@ class UnifiedManager:
"-----------------------------------------------------------------------------------------\n") "-----------------------------------------------------------------------------------------\n")
commit_hash = repo.head.commit.hexsha commit_hash = repo.head.commit.hexsha
remote_commit_hash = repo.refs[f'{remote_name}/{branch_name}'].object.hexsha if f'{remote_name}/{branch_name}' in repo.refs:
remote_commit_hash = repo.refs[f'{remote_name}/{branch_name}'].object.hexsha
else:
return result.fail(f"Not updatable branch: {branch_name}")
if commit_hash != remote_commit_hash: if commit_hash != remote_commit_hash:
git_pull(repo_path) git_pull(repo_path)
@@ -1859,7 +1862,10 @@ def git_repo_update_check_with(path, do_fetch=False, do_update=False, no_deps=Fa
current_branch = repo.active_branch current_branch = repo.active_branch
branch_name = current_branch.name branch_name = current_branch.name
remote_commit_hash = repo.refs[f'{remote_name}/{branch_name}'].object.hexsha if f'{remote_name}/{branch_name}' in repo.refs:
remote_commit_hash = repo.refs[f'{remote_name}/{branch_name}'].object.hexsha
else:
return False, False
if commit_hash == remote_commit_hash: if commit_hash == remote_commit_hash:
repo.close() repo.close()
@@ -2309,7 +2315,11 @@ def update_path(repo_path, instant_execution=False, no_deps=False):
return "fail" return "fail"
commit_hash = repo.head.commit.hexsha commit_hash = repo.head.commit.hexsha
remote_commit_hash = repo.refs[f'{remote_name}/{branch_name}'].object.hexsha
if f'{remote_name}/{branch_name}' in repo.refs:
remote_commit_hash = repo.refs[f'{remote_name}/{branch_name}'].object.hexsha
else:
return "fail"
if commit_hash != remote_commit_hash: if commit_hash != remote_commit_hash:
git_pull(repo_path) git_pull(repo_path)
@@ -2453,8 +2463,21 @@ async def get_current_snapshot():
cnr_custom_nodes[info['id']] = info['ver'] cnr_custom_nodes[info['id']] = info['ver']
else: else:
repo = git.Repo(fullpath) repo = git.Repo(fullpath)
if repo.head.is_detached:
remote_name = get_remote_name(repo)
else:
current_branch = repo.active_branch
if current_branch.tracking_branch() is None:
remote_name = get_remote_name(repo)
else:
remote_name = current_branch.tracking_branch().remote_name
commit_hash = repo.head.commit.hexsha commit_hash = repo.head.commit.hexsha
url = repo.remotes.origin.url
url = repo.remotes[remote_name].url
git_custom_nodes[url] = dict(hash=commit_hash, disabled=is_disabled) git_custom_nodes[url] = dict(hash=commit_hash, disabled=is_disabled)
except: except:
print(f"Failed to extract snapshots for the custom node '{path}'.") print(f"Failed to extract snapshots for the custom node '{path}'.")

View File

@@ -1,7 +1,7 @@
[project] [project]
name = "comfyui-manager" name = "comfyui-manager"
description = "ComfyUI-Manager provides features to install and manage custom nodes for ComfyUI, as well as various functionalities to assist with ComfyUI." description = "ComfyUI-Manager provides features to install and manage custom nodes for ComfyUI, as well as various functionalities to assist with ComfyUI."
version = "3.7" version = "3.7.3"
license = { file = "LICENSE.txt" } license = { file = "LICENSE.txt" }
dependencies = ["GitPython", "PyGithub", "matrix-client==0.4.0", "transformers", "huggingface-hub>0.20", "typer", "rich", "typing-extensions"] dependencies = ["GitPython", "PyGithub", "matrix-client==0.4.0", "transformers", "huggingface-hub>0.20", "typer", "rich", "typing-extensions"]