From 712c4daf3b861892b2f47fa277c322c0ddb4db49 Mon Sep 17 00:00:00 2001 From: Vladimir Mandic Date: Sat, 14 Oct 2023 09:06:01 -0400 Subject: [PATCH 1/2] temp fix master --- extensions-builtin/sd-extension-chainner | 1 + extensions-builtin/sd-extension-system-info | 2 +- extensions-builtin/sd-webui-agent-scheduler | 2 +- extensions-builtin/sd-webui-controlnet | 2 +- .../stable-diffusion-webui-images-browser | 2 +- extensions-builtin/stable-diffusion-webui-rembg | 2 +- modules/lora | 2 +- modules/ui_extensions.py | 13 ++++++++----- wiki | 2 +- 9 files changed, 16 insertions(+), 12 deletions(-) create mode 160000 extensions-builtin/sd-extension-chainner diff --git a/extensions-builtin/sd-extension-chainner b/extensions-builtin/sd-extension-chainner new file mode 160000 index 000000000..d599c7cbe --- /dev/null +++ b/extensions-builtin/sd-extension-chainner @@ -0,0 +1 @@ +Subproject commit d599c7cbe6223290a0e91bcf062dc1770a7d9182 diff --git a/extensions-builtin/sd-extension-system-info b/extensions-builtin/sd-extension-system-info index b73ffdcc8..1841cf762 160000 --- a/extensions-builtin/sd-extension-system-info +++ b/extensions-builtin/sd-extension-system-info @@ -1 +1 @@ -Subproject commit b73ffdcc8d6a9622d3d8074862b109b20726ac73 +Subproject commit 1841cf7627d3991d7ba3dfe8b86a14b18f78f933 diff --git a/extensions-builtin/sd-webui-agent-scheduler b/extensions-builtin/sd-webui-agent-scheduler index 097fe4e5c..7480096fc 160000 --- a/extensions-builtin/sd-webui-agent-scheduler +++ b/extensions-builtin/sd-webui-agent-scheduler @@ -1 +1 @@ -Subproject commit 097fe4e5c97612520b3e4d80d44f36088c53e2c4 +Subproject commit 7480096fca60a74ad922441fe1f2f8f5ccdd819f diff --git a/extensions-builtin/sd-webui-controlnet b/extensions-builtin/sd-webui-controlnet index e67e01773..7a4805c8e 160000 --- a/extensions-builtin/sd-webui-controlnet +++ b/extensions-builtin/sd-webui-controlnet @@ -1 +1 @@ -Subproject commit e67e017731aad05796b9615dc6eadce911298ea1 +Subproject commit 7a4805c8ea3256a0eab3512280bd4f84ca0c8182 diff --git a/extensions-builtin/stable-diffusion-webui-images-browser b/extensions-builtin/stable-diffusion-webui-images-browser index 9f95e6d48..08fc2647f 160000 --- a/extensions-builtin/stable-diffusion-webui-images-browser +++ b/extensions-builtin/stable-diffusion-webui-images-browser @@ -1 +1 @@ -Subproject commit 9f95e6d4812ca7acb3ec56cbf45fbc85aef0236d +Subproject commit 08fc2647f1fe413699612df923b5f495d26853ef diff --git a/extensions-builtin/stable-diffusion-webui-rembg b/extensions-builtin/stable-diffusion-webui-rembg index 99fa213b8..153157bd5 160000 --- a/extensions-builtin/stable-diffusion-webui-rembg +++ b/extensions-builtin/stable-diffusion-webui-rembg @@ -1 +1 @@ -Subproject commit 99fa213b8daff7a6200a0149f2bef7a81b99b30a +Subproject commit 153157bd527865fbfdbd2b676f63cb14ae93a211 diff --git a/modules/lora b/modules/lora index 4c6f3125f..2a23713f7 160000 --- a/modules/lora +++ b/modules/lora @@ -1 +1 @@ -Subproject commit 4c6f3125fce31f86aa949026030e923f3d7d826b +Subproject commit 2a23713f71628b2d1b88a51035b3e4ee2b5dbe46 diff --git a/modules/ui_extensions.py b/modules/ui_extensions.py index c789391a1..86dea0e4c 100644 --- a/modules/ui_extensions.py +++ b/modules/ui_extensions.py @@ -313,10 +313,10 @@ def refresh_extensions_list_from_data(search_text, sort_column): def dt(x: str): val = ext.get(x, None) - if val is not None: - return datetime.fromisoformat(val[:-1]).strftime('%a %b%d %Y %H:%M') - else: - return "N/A" + try: + return datetime.fromisoformat(val[:-1]).strftime('%a %b%d %Y %H:%M') if val is not None else "N/A" + except: + return 'N/A' stats = { 'processed': 0, 'enabled': 0, 'hidden': 0, 'installed': 0 } for ext in sorted(extensions_list, key=sort_function, reverse=sort_reverse): @@ -336,7 +336,10 @@ def refresh_extensions_list_from_data(search_text, sort_column): path = ext.get("path", "") remote = ext.get("remote", None) commit_date = ext.get("commit_date", 1577836800) or 1577836800 - update_available = (remote is not None) & (installed) & (datetime.utcfromtimestamp(commit_date + 60 * 60) < datetime.fromisoformat(ext.get('updated', '2000-01-01T00:00:00.000Z')[:-1])) + try: + update_available = (remote is not None) & (installed) & (datetime.utcfromtimestamp(commit_date + 60 * 60) < datetime.fromisoformat(ext.get('updated', '2000-01-01T00:00:00.000Z')[:-1])) + except: + update_available = False ext['sort_user'] = f"{'0' if ext['is_builtin'] else '1'}{'1' if ext['installed'] else '0'}{ext.get('name', '')}" ext['sort_enabled'] = f"{'0' if ext['enabled'] else '1'}{'1' if ext['is_builtin'] else '0'}{'1' if ext['installed'] else '0'}{ext.get('updated', '2000-01-01T00:00')}" ext['sort_update'] = f"{'1' if update_available else '0'}{'1' if ext['installed'] else '0'}{ext.get('updated', '2000-01-01T00:00')}" diff --git a/wiki b/wiki index d43376f66..128faf8d7 160000 --- a/wiki +++ b/wiki @@ -1 +1 @@ -Subproject commit d43376f66fe454d2911a3b284077910df2b16b23 +Subproject commit 128faf8d7fc9e8f94376fb211b0e44f30d15638f From 98bf24d713dbe0826239d21c03ebb61637c74954 Mon Sep 17 00:00:00 2001 From: Vladimir Mandic Date: Sat, 14 Oct 2023 10:26:11 -0400 Subject: [PATCH 2/2] fix git modules --- .gitmodules | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitmodules b/.gitmodules index 8eecc252a..cb61b8a26 100644 --- a/.gitmodules +++ b/.gitmodules @@ -39,3 +39,7 @@ [submodule "extensions-builtin/sd-webui-agent-scheduler"] path = extensions-builtin/sd-webui-agent-scheduler url = https://github.com/ArtVentureX/sd-webui-agent-scheduler +[submodule "extensions-builtin/sd-extension-chainner"] + path = extensions-builtin/sd-extension-chainner + url = https://github.com/vladmandic/sd-extension-chainner + ignore = dirty