parent
3aace6e15b
commit
55342fcd58
|
|
@ -1 +1 @@
|
||||||
version = '1.0.31'
|
version = '1.0.32'
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,6 @@ outputs = []
|
||||||
def worker():
|
def worker():
|
||||||
global buffer, outputs
|
global buffer, outputs
|
||||||
|
|
||||||
import os
|
|
||||||
import time
|
import time
|
||||||
import shared
|
import shared
|
||||||
import random
|
import random
|
||||||
|
|
@ -16,9 +15,8 @@ def worker():
|
||||||
import modules.path
|
import modules.path
|
||||||
import modules.patch
|
import modules.patch
|
||||||
|
|
||||||
from PIL import Image
|
|
||||||
from modules.sdxl_styles import apply_style, aspect_ratios
|
from modules.sdxl_styles import apply_style, aspect_ratios
|
||||||
from modules.util import generate_temp_filename
|
from modules.private_logger import log
|
||||||
|
|
||||||
try:
|
try:
|
||||||
async_gradio_app = shared.gradio_root
|
async_gradio_app = shared.gradio_root
|
||||||
|
|
@ -72,9 +70,20 @@ def worker():
|
||||||
imgs = pipeline.process(p_txt, n_txt, steps, switch, width, height, seed, callback=callback)
|
imgs = pipeline.process(p_txt, n_txt, steps, switch, width, height, seed, callback=callback)
|
||||||
|
|
||||||
for x in imgs:
|
for x in imgs:
|
||||||
local_temp_filename = generate_temp_filename(folder=modules.path.temp_outputs_path, extension='png')
|
d = [
|
||||||
os.makedirs(os.path.dirname(local_temp_filename), exist_ok=True)
|
('Prompt', prompt),
|
||||||
Image.fromarray(x).save(local_temp_filename)
|
('Negative Prompt', negative_prompt),
|
||||||
|
('Style', style_selction),
|
||||||
|
('Performance', performance_selction),
|
||||||
|
('Resolution', aspect_ratios_selction),
|
||||||
|
('Sharpness', sharpness),
|
||||||
|
('Base Model', base_model_name),
|
||||||
|
('Refiner Model', refiner_model_name),
|
||||||
|
]
|
||||||
|
for n, w in loras:
|
||||||
|
if n != 'None':
|
||||||
|
d.append((f'Lora [{n}] weight', w))
|
||||||
|
log(x, d)
|
||||||
|
|
||||||
seed += 1
|
seed += 1
|
||||||
results += imgs
|
results += imgs
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,36 @@
|
||||||
|
import os
|
||||||
|
import modules.path
|
||||||
|
|
||||||
|
from PIL import Image
|
||||||
|
from modules.util import generate_temp_filename
|
||||||
|
|
||||||
|
|
||||||
|
def log(img, dic):
|
||||||
|
date_string, local_temp_filename, only_name = generate_temp_filename(folder=modules.path.temp_outputs_path, extension='png')
|
||||||
|
os.makedirs(os.path.dirname(local_temp_filename), exist_ok=True)
|
||||||
|
Image.fromarray(img).save(local_temp_filename)
|
||||||
|
html_name = os.path.join(os.path.dirname(local_temp_filename), 'log.html')
|
||||||
|
|
||||||
|
if not os.path.exists(html_name):
|
||||||
|
with open(html_name, 'a+') as f:
|
||||||
|
f.write(f"<p>Fooocus Log {date_string} (private)</p>\n")
|
||||||
|
f.write(f"<p>All images do not contain any hidden data.</p>")
|
||||||
|
|
||||||
|
with open(html_name, 'a+') as f:
|
||||||
|
f.write(f"<hr>\n")
|
||||||
|
f.write(f"<p>{only_name}</p>\n")
|
||||||
|
i = 0
|
||||||
|
for k, v in dic:
|
||||||
|
if i < 2:
|
||||||
|
f.write(f"<p>{k}: <b>{v}</b> </p>\n")
|
||||||
|
else:
|
||||||
|
if i % 2 == 0:
|
||||||
|
f.write(f"<p>{k}: <b>{v}</b>, ")
|
||||||
|
else:
|
||||||
|
f.write(f"{k}: <b>{v}</b></p>\n")
|
||||||
|
i += 1
|
||||||
|
f.write(f"<p><img src=\"{local_temp_filename}\" width=512></img></p>\n")
|
||||||
|
|
||||||
|
print(f'Image generated with private log at: {html_name}')
|
||||||
|
|
||||||
|
return
|
||||||
|
|
@ -10,4 +10,4 @@ def generate_temp_filename(folder='./outputs/', extension='png'):
|
||||||
random_number = random.randint(1000, 9999)
|
random_number = random.randint(1000, 9999)
|
||||||
filename = f"{time_string}_{random_number}.{extension}"
|
filename = f"{time_string}_{random_number}.{extension}"
|
||||||
result = os.path.join(folder, date_string, filename)
|
result = os.path.join(folder, date_string, filename)
|
||||||
return os.path.abspath(os.path.realpath(result))
|
return date_string, os.path.abspath(os.path.realpath(result)), filename
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,7 @@
|
||||||
|
### 1.0.32
|
||||||
|
|
||||||
|
* Fooocus private log
|
||||||
|
|
||||||
### 1.0.31
|
### 1.0.31
|
||||||
|
|
||||||
* Fix typo and UI.
|
* Fix typo and UI.
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue