From e1c948ec4f0d8c6e25944e842db889c4aac1ccb4 Mon Sep 17 00:00:00 2001 From: receyuki Date: Mon, 9 Oct 2023 04:53:22 +0800 Subject: [PATCH 1/3] Add ISSUE_TEMPLATE --- .github/ISSUE_TEMPLATE/BUG-REPORT.yml | 47 ++++++++++++++++++++++ .github/ISSUE_TEMPLATE/FEATURE-REQUEST.yml | 31 ++++++++++++++ .github/ISSUE_TEMPLATE/config.yml | 1 + 3 files changed, 79 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/BUG-REPORT.yml create mode 100644 .github/ISSUE_TEMPLATE/FEATURE-REQUEST.yml create mode 100644 .github/ISSUE_TEMPLATE/config.yml diff --git a/.github/ISSUE_TEMPLATE/BUG-REPORT.yml b/.github/ISSUE_TEMPLATE/BUG-REPORT.yml new file mode 100644 index 0000000..374eb39 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/BUG-REPORT.yml @@ -0,0 +1,47 @@ +name: "Bug Report" +description: Create a new ticket for a bug. +title: "[BUG] - title" +labels: [ + "bug" +] +body: + - type: textarea + id: description + attributes: + label: "Description" + description: Please enter an explicit description of your issue. + placeholder: Short and explicit description of your incident... + validations: + required: true + - type: textarea + id: reprod + attributes: + label: "Reproduction steps" + description: Please enter an explicit description of your issue. + placeholder: | + 1. Go to '...' + 2. Click on '....' + 3. Scroll down to '....' + 4. See error + validations: + required: false + - type: textarea + id: image + attributes: + label: "Image file" + description: If applicable, add screenshots to help explain your problem. + placeholder: | + ![DESCRIPTION](LINK.png) + validations: + required: false + - type: dropdown + id: version + attributes: + label: "Version" + description: What version are you running? + multiple: false + options: + - 1.0.0 + default: 0 + validations: + required: false \ No newline at end of file diff --git a/.github/ISSUE_TEMPLATE/FEATURE-REQUEST.yml b/.github/ISSUE_TEMPLATE/FEATURE-REQUEST.yml new file mode 100644 index 0000000..ea2e39f --- /dev/null +++ b/.github/ISSUE_TEMPLATE/FEATURE-REQUEST.yml @@ -0,0 +1,31 @@ +name: "Feature Request" +description: Create a new ticket for a new feature request. +title: "[FEATURE REQUEST] - title" +labels: [ + "question" +] +body: + - type: textarea + id: summary + attributes: + label: "Summary" + description: Provide a brief explanation of the feature. + placeholder: Describe in a few lines your feature request. + validations: + required: true + - type: textarea + id: basic_example + attributes: + label: "Basic Example" + description: Indicate here some basic examples of your feature. + placeholder: A few specific words about your feature request. + validations: + required: true + - type: textarea + id: reference_issues + attributes: + label: "Reference Issues." + description: Common issues + placeholder: "#Issues IDs" + validations: + required: false \ No newline at end of file diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml new file mode 100644 index 0000000..a49eab2 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -0,0 +1 @@ +blank_issues_enabled: true \ No newline at end of file From d4e50ff463077820a1ec110eb67cab49d85f28f2 Mon Sep 17 00:00:00 2001 From: Rhys Yang Date: Sun, 8 Oct 2023 22:09:07 +0800 Subject: [PATCH 2/3] Update README.md --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f260edc..41398e0 100644 --- a/README.md +++ b/README.md @@ -44,9 +44,10 @@ additional metadata to ensure compatibility with metadata detection on websites See [SD Prompt Reader](https://github.com/receyuki/stable-diffusion-prompt-reader#supported-formats) for details ## Installation -### Install via [ComfyUI Manager](https://github.com/ltdrdata/ComfyUI-Manager) (Recommended) +### Install and update via [ComfyUI Manager](https://github.com/ltdrdata/ComfyUI-Manager) (Recommended) Search for `SD Prompt Reader` in the ComfyUI Manager and install it. ### Install manually +Please make sure to install the submodules along with the main repository. 1. `cd` to the `custom_node` folder 2. Clone this repo ```shell @@ -58,7 +59,7 @@ Search for `SD Prompt Reader` in the ComfyUI Manager and install it. pip install -r requirements.txt ``` #### Update -Please ensure that you update the submodules along with the main repo. +When updating, don't forget to include the submodules along with the main repository. ```shell git pull --recurse-submodules ``` From a1360bafbb034d864dc2b7285b644e4b001941d1 Mon Sep 17 00:00:00 2001 From: Rhys Yang Date: Sun, 8 Oct 2023 23:17:55 +0800 Subject: [PATCH 3/3] Remove with_config and add "disable" to config_name --- nodes.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/nodes.py b/nodes.py index 5140d83..204a80d 100644 --- a/nodes.py +++ b/nodes.py @@ -355,8 +355,10 @@ class SDParameterGenerator: return { "required": { "ckpt_name": (folder_paths.get_filename_list("checkpoints"),), - "with_config": ("BOOLEAN", {"default": False}), - "config_name": (folder_paths.get_filename_list("configs"),), + "config_name": ( + ["disable"] + folder_paths.get_filename_list("configs"), + {"default": "disable"}, + ), }, "optional": { "seed": ( @@ -421,7 +423,6 @@ class SDParameterGenerator: def generate_parameter( self, ckpt_name, - with_config, config_name, seed, steps, @@ -433,9 +434,9 @@ class SDParameterGenerator: output_vae=True, output_clip=True, ): - config_path = folder_paths.get_full_path("configs", config_name) ckpt_path = folder_paths.get_full_path("checkpoints", ckpt_name) - if with_config: + if config_name != "disable": + config_path = folder_paths.get_full_path("configs", config_name) checkpoint = comfy.sd.load_checkpoint( config_path, ckpt_path,