From 7c5d1505b8a85bd0131dfeac09fe38772b6c067f Mon Sep 17 00:00:00 2001 From: Vladimir Mandic Date: Wed, 12 Nov 2025 14:18:45 -0500 Subject: [PATCH] set defaults for version dct Signed-off-by: Vladimir Mandic --- extensions-builtin/sdnext-kanvas | 2 +- installer.py | 9 +++++---- javascript/control.js | 1 - modules/images_resize.py | 5 +++-- wiki | 2 +- 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/extensions-builtin/sdnext-kanvas b/extensions-builtin/sdnext-kanvas index 15928bad4..ec77ebd4a 160000 --- a/extensions-builtin/sdnext-kanvas +++ b/extensions-builtin/sdnext-kanvas @@ -1 +1 @@ -Subproject commit 15928bad4c4f214791991bb58d0ffff11bb1f8f2 +Subproject commit ec77ebd4a50ad5bdc977a7f163c623c9f7bc22e1 diff --git a/installer.py b/installer.py index f411ebf9b..81dba32c1 100644 --- a/installer.py +++ b/installer.py @@ -20,7 +20,7 @@ class Dot(dict): # dot notation access to dictionary attributes pkg_resources, setuptools, distutils = None, None, None # defined via ensure_base_requirements -version = None +version = { 'app': 'sd.next', 'version': 'unknown', 'branch': 'unknown', 'kanvas': 'unknown' } current_branch = None log = logging.getLogger("sd") console = None @@ -613,7 +613,7 @@ def check_diffusers(): t_start = time.time() if args.skip_all: return - sha = '0fd58c7706ac69e046587c374320637c29b62b06' # diffusers commit hash + sha = 'd6c63bb956358f1990443a849ca250419a238b95' # diffusers commit hash # if args.use_rocm or args.use_zluda or args.use_directml: # sha = '043ab2520f6a19fce78e6e060a68dbc947edb9f9' # lock diffusers versions for now pkg = pkg_resources.working_set.by_key.get('diffusers', None) @@ -1438,10 +1438,11 @@ def get_version(force=False): 'updated': updated, 'hash': githash, 'branch': branch_name.replace('\n', ''), - 'url': origin.replace('\n', '').removesuffix('.git') + '/tree/' + branch_name.replace('\n', '') + 'url': origin.replace('\n', '').removesuffix('.git') + '/tree/' + branch_name.replace('\n', ''), + 'kanvas': 'uknown', } except Exception: - version = { 'app': 'sd.next', 'version': 'unknown', 'branch': 'unknown' } + version = { 'app': 'sd.next', 'version': 'unknown', 'branch': 'unknown', 'kanvas': 'unknown' } cwd = os.getcwd() try: if os.path.exists('extensions-builtin/sdnext-modernui'): diff --git a/javascript/control.js b/javascript/control.js index 1e99a4d26..ce1ba04c7 100644 --- a/javascript/control.js +++ b/javascript/control.js @@ -7,7 +7,6 @@ function controlInputMode(inputMode, ...args) { log('controlInputMode', { mode: inputMode, tab: inputTab, kanvas: typeof Kanvas }); if ((inputTab === 'Image') && (typeof 'Kanvas' !== 'undefined')) { inputTab = 'Kanvas'; - // const imageData = window.kanvas.getImageData(); const imageData = window.kanvas.getImage(); args[0] = imageData; } diff --git a/modules/images_resize.py b/modules/images_resize.py index 1f2ba0cea..71bfcb408 100644 --- a/modules/images_resize.py +++ b/modules/images_resize.py @@ -116,13 +116,14 @@ def resize_image(resize_mode: int, im: Union[Image.Image, torch.Tensor], width: src_image = resize(im, src_w, src_h) else: return im - res = Image.fromarray(seam_carving.resize( + np_image = seam_carving.resize( src_image, # source image (rgb or gray) size=(width, height), # target size energy_mode=energy_mode, # choose from {backward, forward} order="width-first", # choose from {width-first, height-first} keep_mask=None, # object mask to protect from removal - )) + ) + res = Image.fromarray(np_image) return res t0 = time.time() diff --git a/wiki b/wiki index 92701d4a2..21b5e921d 160000 --- a/wiki +++ b/wiki @@ -1 +1 @@ -Subproject commit 92701d4a20c93dac2abc1d1fda4571a8cee4c1ed +Subproject commit 21b5e921d81c5dc31447f0869a785e367865b6ed