Merge pull request #97 from jetjodh/patch-1

fixed import for new version of fooocus
mrhan1993 · Dec 19, 2023 · e9c70ec · e9c70ec
2 parents 7584dd7 + 20cbe08
commit e9c70ec
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/fooocusapi/worker.py b/fooocusapi/worker.py
@@ -45,7 +45,7 @@ def process_generate(async_task: QueueTask, params: ImageGenerationParams) -> Li
     from modules.util import remove_empty_str, resize_image, HWC3, set_image_shape_ceil, get_image_shape_ceil, get_shape_ceil, resample_image
     from modules.private_logger import log
     from modules.upscaler import perform_upscale
-    from modules.expansion import safe_str
+    from extras.expansion import safe_str
     from modules.sdxl_styles import apply_style, fooocus_expansion, apply_wildcards
 
     outputs = TaskOutputs(async_task)
@@ -501,7 +501,7 @@ def yield_result(_, imgs, tasks):
 
             if direct_return:
                 d = [('Upscale (Fast)', '2x')]
-                log(uov_input_image, d, single_line_number=1)
+                log(uov_input_image, d)
                 return yield_result(async_task, uov_input_image, tasks)
 
             tiled = True
@@ -798,7 +798,7 @@ def callback(step, x0, x, total_steps, y):
                     for n, w in loras:
                         if n != 'None':
                             d.append((f'LoRA [{n}] weight', w))
-                    log(x, d, single_line_number=3)
+                    log(x, d)
 
                 # Fooocus async_worker.py code end