* VSCode settings and debug options moved to the workspace file.

* ComfyUI: fix model input as optional.

.gitignore

@@ -3,8 +3,6 @@
 venv
 
 .vscode/**/*
-!.vscode/settings.json
-!.vscode/launch.json
 
 logs
 tests/tests_local.py

.vscode/launch.json

@@ -1,23 +0,0 @@
-{
-    // Use IntelliSense to learn about possible attributes.
-    // Hover to view descriptions of existing attributes.
-    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "name": "Python Debugger: Attach using Process Id",
-            "type": "debugpy",
-            "request": "attach",
-            "processId": "${command:pickProcess}"
-        },
-        {
-            "name": "Python: Debug Tests (Testing Panel)",
-            "type": "debugpy",
-            "request": "launch",
-            "purpose": ["debug-test"],
-            "console": "integratedTerminal",
-            "justMyCode": false,
-            "cwd": "${workspaceFolder}"
-        }
-    ]
-}

.vscode/settings.json

@@ -1,23 +0,0 @@
-{
-    "python.analysis.extraPaths": ["../.."],
-    "python.testing.unittestArgs": [
-        "-v",
-        "-s",
-        ".",
-        "-p",
-        "test*.py"
-    ],
-    "python.testing.pytestEnabled": false,
-    "python.testing.unittestEnabled": true,
-    "python.analysis.typeCheckingMode": "off",
-    "black-formatter.args": [
-        "--line-length=120"
-    ],
-    "python-envs.pythonProjects": [
-        {
-            "path": ".",
-            "envManager": "ms-python.python:venv",
-            "packageManager": "ms-python.python:pip"
-        }
-    ]
-}

ppp.code-workspace

@@ -6,17 +6,56 @@
 		}
 	],
 	"settings": {
+		"python.analysis.extraPaths": [
+			"../.."
+		],
+		"python.testing.unittestArgs": [
+			"-v",
+			"-s",
+			".",
+			"-p",
+			"test*.py"
+		],
+		"python.testing.pytestEnabled": false,
+		"python.testing.unittestEnabled": true,
+		"python.analysis.typeCheckingMode": "off",
+		"yaml.schemaStore.enable": false,
+		"powershell.cwd": "sd-webui-prompt-postprocessor",
 		"[python]": {
 			"editor.defaultFormatter": "ms-python.black-formatter"
 		},
-		"yaml.schemaStore.enable": false,
-		"cSpell.enabledFiletypes": [
-			"lark"
+		"black-formatter.args": [
+			"--line-length=120"
 		],
-		"powershell.cwd": "sd-webui-prompt-postprocessor"
+		"python-envs.pythonProjects": [
+			{
+				"path": ".",
+				"envManager": "ms-python.python:venv",
+				"packageManager": "ms-python.python:pip"
+			}
+		]
 	},
 	"launch": {
 		"version": "0.2.0",
-		"configurations": []
+		"configurations": [
+			{
+				"name": "Python Debugger: Attach using Process Id",
+				"type": "debugpy",
+				"request": "attach",
+				"processId": "${command:pickProcess}"
+			},
+			{
+				"name": "Python: Debug Tests (Testing Panel)",
+				"type": "debugpy",
+				"request": "launch",
+				"purpose": [
+					"debug-test"
+				],
+				"console": "integratedTerminal",
+				"justMyCode": false,
+				"cwd": "${workspaceFolder}"
+			}
+		],
+		"compounds": []
 	}
 }

ppp_comfyui.py

@@ -288,7 +288,6 @@ class PromptPostProcessorComfyUINode:
 
     def process(
         self,
-        model,
         modelname,
         pos_prompt,
         neg_prompt,
@@ -301,6 +300,7 @@ class PromptPostProcessorComfyUINode:
         do_combinatorial,
         combinatorial_shuffle,
         combinatorial_limit,
+        model=None,
         wc_options=None,
         stn_options=None,
         cup_options=None,
@@ -315,14 +315,14 @@ class PromptPostProcessorComfyUINode:
                 self.logger,
                 DEBUG_LEVEL.minimal,
                 logging.WARNING,
-                "Model class is not provided. System variables might not be properly set.",
+                "Model class is not provided. System model variables will not be properly set.",
             )
         if modelname == "":
             log(
                 self.logger,
                 DEBUG_LEVEL.minimal,
                 logging.WARNING,
-                "Modelname is not provided. System variables will not be properly set.",
+                "Modelname is not provided. System model and variant variables will not be properly set.",
             )
         # model class values in ComfyUI\comfy\supported_models.py
         env_info = {