Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Batch File upload/ Folder upload. Bulk Enhance #3540

Open
wants to merge 26 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
f1e9a5c
Batch File upload/ Folder upload. Bulk Enhance
ChrisColeTech Aug 18, 2024
ee4f442
remove unused imports
ChrisColeTech Aug 18, 2024
9f535e8
Change to resolve GitHub Advanced Security check
ChrisColeTech Aug 18, 2024
7a0b8ee
Rework Stop/Skip while bulk enhancing
ChrisColeTech Aug 18, 2024
2ab91c9
Update bulk_enhance_helpers.py
ChrisColeTech Aug 19, 2024
ec177f2
Update bulk_enhance_helpers.py
ChrisColeTech Aug 19, 2024
ad18a93
Update async_worker.py
ChrisColeTech Aug 20, 2024
e268cd5
Merge branch 'lllyasviel:main' into dev
ChrisColeTech Aug 20, 2024
83d0935
more code cleanup
ChrisColeTech Aug 20, 2024
3db125a
To resolve github CodeQL warning
ChrisColeTech Aug 20, 2024
4b90d70
Update async_worker.py
ChrisColeTech Aug 21, 2024
67edbf2
Update bulk_enhance_helpers.py
ChrisColeTech Aug 21, 2024
e68d7b5
automatic tkinter installation
ChrisColeTech Aug 22, 2024
1afc7b3
Update tkinter_installer.py
ChrisColeTech Aug 22, 2024
672baf0
Update launch.py
ChrisColeTech Aug 23, 2024
8921ac8
Remove code comments, added backend logic for perf monitor. renamed t…
ChrisColeTech Aug 24, 2024
7722d2c
html front end component for resource monitor
ChrisColeTech Aug 24, 2024
4848427
wired up perf monitor
ChrisColeTech Aug 24, 2024
85429b0
Update launch.py
ChrisColeTech Aug 24, 2024
4c32ebe
final touches on the perf monitor
ChrisColeTech Aug 26, 2024
5774787
perf monitor 2.0 with dragging
ChrisColeTech Aug 29, 2024
f0fa022
fix invisible element
ChrisColeTech Aug 30, 2024
c5a290a
remove unused code
ChrisColeTech Aug 30, 2024
c8d4d2d
Merge branch 'dev' of https://github.com/ChrisColeTech/Fooocus into dev
ChrisColeTech Aug 30, 2024
ce74b6b
speed up animation
ChrisColeTech Aug 30, 2024
eb934c9
Using websockets for resource monitor instead of rest api
ChrisColeTech Sep 1, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
To resolve github CodeQL warning
-To resolve github CodeQL warning
-more code cleanup
  • Loading branch information
ChrisColeTech committed Aug 20, 2024
commit 3db125a206ad22088da6e17ad190dbb00ead90d7
12 changes: 5 additions & 7 deletions modules/async_worker.py
Original file line number Diff line number Diff line change
Expand Up @@ -1839,10 +1839,9 @@ def callback(step, x0, x, total_steps, y):
stop_processing(async_task, processing_start_time)
return

def setup(async_task: AsyncTask, current_task_number):
def setup(async_task: AsyncTask):
base_model_additional_loras = []
current_progress = 0
tasks = []
use_synthetic_refiner = False
if fooocus_expansion in async_task.style_selections:
use_expansion = True
Expand All @@ -1863,11 +1862,10 @@ def setup(async_task: AsyncTask, current_task_number):
clip_vision_path, ip_negative_path, ip_adapter_face_path)
inpaint_worker.current_task = None

loras = async_task.loras
tasks, use_expansion, loras, current_progress = process_prompt(async_task, async_task.prompt, async_task.negative_prompt,
base_model_additional_loras, 1,
async_task.disable_seed_increment, use_expansion, use_style,
use_synthetic_refiner, current_progress, advance_progress=True)
process_prompt(async_task, async_task.prompt, async_task.negative_prompt,
base_model_additional_loras, 1,
async_task.disable_seed_increment, use_expansion, use_style,
use_synthetic_refiner, current_progress, advance_progress=True)
apply_patch_settings(async_task)
return

Expand Down
2 changes: 1 addition & 1 deletion modules/bulk_enhance_helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ def on_input_change(input_path, file_explorer):
# Verify with normalised version of path
input_path = os.path.normpath(os.path.realpath(input_path))

if os.path.isdir(input_path):
if os.path.isdir(os.path.realpath(input_path)):
# Return an empty list if input_path is a directory

Check failure

Code scanning / CodeQL

Uncontrolled data used in path expression

This path depends on a [user-provided value](1).
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was resolved:
ChrisColeTech@b5e73ff

return None, gr.update(visible=True), gr.update(value=True)
else:
Expand Down