From 979874e80bea009fe686c559fbf93ca474ea1e22 Mon Sep 17 00:00:00 2001
From: Konie <guofengzuo@hotmail.com>
Date: Tue, 19 Dec 2023 10:03:37 +0800
Subject: [PATCH] Merge for Fooocus v2.1.852

---
 README.md                           | 2 +-
 cog.yaml                            | 1 -
 fooocusapi/repositories_versions.py | 4 ++--
 fooocusapi/worker.py                | 6 ++++--
 requirements.txt                    | 1 -
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 51ca041..d89f455 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 
 FastAPI powered API for [Fooocus](https://github.com/lllyasviel/Fooocus)
 
-Currently loaded Fooocus version: 2.1.837
+Currently loaded Fooocus version: 2.1.852
 
 ### Run with Replicate
 Now you can use Fooocus-API by Replicate, the model is in [konieshadow/fooocus-api](https://replicate.com/konieshadow/fooocus-api).
diff --git a/cog.yaml b/cog.yaml
index 840230f..befb47d 100644
--- a/cog.yaml
+++ b/cog.yaml
@@ -26,7 +26,6 @@ build:
     - "scipy==1.9.3"
     - "tqdm==4.64.1"
     - "psutil==5.9.5"
-    - "numpy==1.23.5"
     - "pytorch_lightning==1.9.4"
     - "omegaconf==2.2.3"
     - "pygit2==1.12.2"
diff --git a/fooocusapi/repositories_versions.py b/fooocusapi/repositories_versions.py
index 05281bc..f14d3a0 100644
--- a/fooocusapi/repositories_versions.py
+++ b/fooocusapi/repositories_versions.py
@@ -1,5 +1,5 @@
 import os
 
-fooocus_version = '2.1.837'
+fooocus_version = '2.1.852'
 fooocus_commit_hash = os.environ.get(
-    'FOOOCUS_COMMIT_HASH', "28b07cd658806c204a51de9c6ff20d0bbe2da041")
+    'FOOOCUS_COMMIT_HASH', "7a6b46f363d0f3797d263bfdf00bd16e315da02a")
diff --git a/fooocusapi/worker.py b/fooocusapi/worker.py
index ecfc13c..b2ab7f2 100644
--- a/fooocusapi/worker.py
+++ b/fooocusapi/worker.py
@@ -47,6 +47,7 @@ def process_generate(async_task: QueueTask, params: ImageGenerationParams) -> Li
     from modules.upscaler import perform_upscale
     from extras.expansion import safe_str
     from modules.sdxl_styles import apply_style, fooocus_expansion, apply_wildcards
+    import fooocus_version
 
     outputs = TaskOutputs(async_task)
     results = []
@@ -793,11 +794,12 @@ def callback(step, x0, x, total_steps, y):
                         ('Refiner Switch', refiner_switch),
                         ('Sampler', sampler_name),
                         ('Scheduler', scheduler_name),
-                        ('Seed', task['task_seed'])
+                        ('Seed', task['task_seed']),
                     ]
                     for n, w in loras:
                         if n != 'None':
-                            d.append((f'LoRA [{n}] weight', w))
+                            d.append((f'LoRA', f'{n} : {w}'))
+                    d.append(('Version', 'v' + fooocus_version.version))
                     log(x, d)
                 
                 # Fooocus async_worker.py code end
diff --git a/requirements.txt b/requirements.txt
index 9f21d6d..5b12d46 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,7 +8,6 @@ Pillow==9.2.0
 scipy==1.9.3
 tqdm==4.64.1
 psutil==5.9.5
-numpy==1.23.5
 pytorch_lightning==1.9.4
 omegaconf==2.2.3
 pygit2==1.12.2