From af28d82ebcfb202a55f64bd4c8e29b96cbe8299f Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Tue, 25 Oct 2022 10:44:37 +0530 Subject: [PATCH 1/7] Merge pull request #377 from madrang/beta Missing '?' in case renderRequest is ever undefined. --- ui/media/js/main.js | 2 +- ui/server.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ui/media/js/main.js b/ui/media/js/main.js index e82627cc..dc9e5a22 100644 --- a/ui/media/js/main.js +++ b/ui/media/js/main.js @@ -522,7 +522,7 @@ async function doMakeImage(task) { if (typeof renderRequest?.stream !== 'string') { console.log('Endpoint response: ', renderRequest) - throw new Error(renderRequest.detail || 'Endpoint response does not contains a response stream url.') + throw new Error(renderRequest?.detail || 'Endpoint response does not contains a response stream url.') } task['taskStatusLabel'].innerText = "Waiting" diff --git a/ui/server.py b/ui/server.py index 61bc7f4d..6125affe 100644 --- a/ui/server.py +++ b/ui/server.py @@ -85,9 +85,9 @@ def read_root(): @app.get('/ping') # Get server and optionally session status. def ping(session_id:str=None): if not task_manager.render_thread.is_alive(): # Render thread is dead. - if task_manager.current_state_error: raise HTTPException(status_code=500, detail=str(current_state_error)) + if task_manager.current_state_error: raise HTTPException(status_code=500, detail=str(task_manager.current_state_error)) raise HTTPException(status_code=500, detail='Render thread is dead.') - if task_manager.current_state_error and not isinstance(task_manager.current_state_error, StopAsyncIteration): raise HTTPException(status_code=500, detail=str(current_state_error)) + if task_manager.current_state_error and not isinstance(task_manager.current_state_error, StopAsyncIteration): raise HTTPException(status_code=500, detail=str(task_manager.current_state_error)) # Alive response = {'status': str(task_manager.current_state)} if session_id: @@ -223,7 +223,7 @@ def setConfig(config): config_json_path = os.path.join(CONFIG_DIR, 'config.json') with open(config_json_path, 'w', encoding='utf-8') as f: return json.dump(config, f) - except: + except Exception as e: print(str(e)) print(traceback.format_exc()) From 9783c1052dac03f04461ec5d36889835e0e62a39 Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Tue, 25 Oct 2022 22:58:44 +0530 Subject: [PATCH 2/7] Update README.md --- README.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 41bf8d70..4f41aa60 100644 --- a/README.md +++ b/README.md @@ -91,7 +91,12 @@ Please use our [guide](https://github.com/cmdr2/stable-diffusion-ui/wiki/How-to- # Bugs reports and code contributions welcome If there are any problems or suggestions, please feel free to ask on the [discord server](https://discord.com/invite/u9yhsFmEkB) or [file an issue](https://github.com/cmdr2/stable-diffusion-ui/issues). -Also, please feel free to submit a pull request, if you have any code contributions in mind. Join the [discord server](https://discord.com/invite/u9yhsFmEkB) for development-related discussions, and for helping other users. +We could really use programming help on these aspects: +* User Interface: https://github.com/users/cmdr2/projects/1/views/1 +* Engine: https://github.com/users/cmdr2/projects/3/views/1 +* Installer: https://github.com/users/cmdr2/projects/4/views/1 + +If you have any code contributions in mind, please feel free to say Hi to us on the [discord server](https://discord.com/invite/u9yhsFmEkB). We use the Discord server for development-related discussions, and for helping users. # Disclaimer The authors of this project are not responsible for any content generated using this interface. From 0eaff4c62698112d7dd119660f06a6f84ba69c62 Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Wed, 26 Oct 2022 10:55:00 +0530 Subject: [PATCH 3/7] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4f41aa60..467c42c7 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ ---- -## Step 1: Download the installer +## Step 1: Download the installer, and unzip it

From c618c5c5f098b0d2432f4a140c6b3eaf29c83736 Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Wed, 26 Oct 2022 10:55:25 +0530 Subject: [PATCH 4/7] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 467c42c7..4f41aa60 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ ---- -## Step 1: Download the installer, and unzip it +## Step 1: Download the installer

From 81389401df20d4d1ae64d59e2e8fe2c3fe5931e4 Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Wed, 26 Oct 2022 11:02:06 +0530 Subject: [PATCH 5/7] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 4f41aa60..bab77a43 100644 --- a/README.md +++ b/README.md @@ -95,6 +95,7 @@ We could really use programming help on these aspects: * User Interface: https://github.com/users/cmdr2/projects/1/views/1 * Engine: https://github.com/users/cmdr2/projects/3/views/1 * Installer: https://github.com/users/cmdr2/projects/4/views/1 +* Documentation: https://github.com/users/cmdr2/projects/5/views/1 If you have any code contributions in mind, please feel free to say Hi to us on the [discord server](https://discord.com/invite/u9yhsFmEkB). We use the Discord server for development-related discussions, and for helping users. From 28f58f72ddeef1f14b32263c3dfdfe2bbb3cdc11 Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Wed, 26 Oct 2022 11:02:53 +0530 Subject: [PATCH 6/7] Update README.md --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index bab77a43..52612bd7 100644 --- a/README.md +++ b/README.md @@ -91,11 +91,11 @@ Please use our [guide](https://github.com/cmdr2/stable-diffusion-ui/wiki/How-to- # Bugs reports and code contributions welcome If there are any problems or suggestions, please feel free to ask on the [discord server](https://discord.com/invite/u9yhsFmEkB) or [file an issue](https://github.com/cmdr2/stable-diffusion-ui/issues). -We could really use programming help on these aspects: -* User Interface: https://github.com/users/cmdr2/projects/1/views/1 -* Engine: https://github.com/users/cmdr2/projects/3/views/1 -* Installer: https://github.com/users/cmdr2/projects/4/views/1 -* Documentation: https://github.com/users/cmdr2/projects/5/views/1 +We could really use programming help on these aspects (click to view tasks that need your help): +* [User Interface](https://github.com/users/cmdr2/projects/1/views/1) +* [Engine](https://github.com/users/cmdr2/projects/3/views/1) +* [Installer](https://github.com/users/cmdr2/projects/4/views/1) +* [Documentation](https://github.com/users/cmdr2/projects/5/views/1) If you have any code contributions in mind, please feel free to say Hi to us on the [discord server](https://discord.com/invite/u9yhsFmEkB). We use the Discord server for development-related discussions, and for helping users. From eb2f1cbc9efbdd13b1c2be4305c2d102fb1d2bcc Mon Sep 17 00:00:00 2001 From: cmdr2 Date: Wed, 26 Oct 2022 11:03:12 +0530 Subject: [PATCH 7/7] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 52612bd7..7f193dca 100644 --- a/README.md +++ b/README.md @@ -91,7 +91,7 @@ Please use our [guide](https://github.com/cmdr2/stable-diffusion-ui/wiki/How-to- # Bugs reports and code contributions welcome If there are any problems or suggestions, please feel free to ask on the [discord server](https://discord.com/invite/u9yhsFmEkB) or [file an issue](https://github.com/cmdr2/stable-diffusion-ui/issues). -We could really use programming help on these aspects (click to view tasks that need your help): +We could really use help on these aspects (click to view tasks that need your help): * [User Interface](https://github.com/users/cmdr2/projects/1/views/1) * [Engine](https://github.com/users/cmdr2/projects/3/views/1) * [Installer](https://github.com/users/cmdr2/projects/4/views/1)