diff --git a/modules/async_worker.py b/modules/async_worker.py index 06072b84..47989f32 100644 --- a/modules/async_worker.py +++ b/modules/async_worker.py @@ -405,7 +405,7 @@ def worker(): task_prompt = apply_wildcards(prompt, task_rng) if wildprompt_prompt and task_prompt: - task_prompt = f"{wildprompt_prompt}, {task_prompt}" + task_prompt = f"{task_prompt}, {wildprompt_prompt}" elif wildprompt_prompt: task_prompt = wildprompt_prompt diff --git a/modules/private_logger.py b/modules/private_logger.py index 65072b43..b4d8af51 100644 --- a/modules/private_logger.py +++ b/modules/private_logger.py @@ -64,63 +64,11 @@ def log(img, dic, wildprompt=''): } alert('Copied to Clipboard!\\nPaste to prompt area to load parameters.\\nCurrent clipboard content is:\\n\\n' + txt); } - - // Extracting distinct data-model and data-wildprompts values - var modelSet = new Set(); - var wildpromptsSet = new Set(); - - document.querySelectorAll('.image-container').forEach(function(container) { - var model = container.getAttribute('data-model'); - var wildprompts = container.getAttribute('data-wildprompts'); - - modelSet.add(model); - wildpromptsSet.add(wildprompts); - }); - - // Creating checkboxes for data-model values - var modelCheckboxList = document.createElement('div'); - modelCheckboxList.innerHTML = '

Data Model

'; - modelSet.forEach(function(model) { - var checkbox = document.createElement('input'); - checkbox.type = 'checkbox'; - checkbox.value = model; - checkbox.id = 'model_' + model; - - var label = document.createElement('label'); - label.htmlFor = 'model_' + model; - label.appendChild(document.createTextNode(model)); - - modelCheckboxList.appendChild(checkbox); - modelCheckboxList.appendChild(label); - modelCheckboxList.appendChild(document.createElement('br')); - }); - - // Creating checkboxes for data-wildprompts values - var wildpromptsCheckboxList = document.createElement('div'); - wildpromptsCheckboxList.innerHTML = '

Data Wildprompts

'; - wildpromptsSet.forEach(function(wildprompt) { - var checkbox = document.createElement('input'); - checkbox.type = 'checkbox'; - checkbox.value = wildprompt; - checkbox.id = 'wildprompt_' + wildprompt; - - var label = document.createElement('label'); - label.htmlFor = 'wildprompt_' + wildprompt; - label.appendChild(document.createTextNode(wildprompt)); - - wildpromptsCheckboxList.appendChild(checkbox); - wildpromptsCheckboxList.appendChild(label); - wildpromptsCheckboxList.appendChild(document.createElement('br')); - }); - - // Appending checkbox lists to the DOM - document.body.appendChild(modelCheckboxList); - document.body.appendChild(wildpromptsCheckboxList); """ ) - begin_part = f"Fooocus Log {date_string}{css_styles}{js}

Fooocus Log {date_string} (private)

\n

All images are clean, without any hidden data/meta, and safe to share with others.

\n\n" + begin_part = f"Fooocus Log {date_string}{css_styles}\n{js}\n

Fooocus Log {date_string} (private)

\n\n" end_part = f'\n' middle_part = log_cache.get(html_name, "")