Skip to content

Commit

Permalink
Merge branch 'develop_upstream' into develop
Browse files Browse the repository at this point in the history 
# Conflicts:
#	fooocus_colab.ipynb
#	fooocus_version.py
#	language/en.json
#	modules/async_worker.py
#	requirements_versions.txt
#	update_log.md
#	webui.py
  • Loading branch information
@mashb1t
mashb1t committed Jul 16, 2024
2 parents 27cbca2 + 3a86fa2 commit 88c5088
Show file tree
Hide file tree
Showing 6 changed files with 41 additions and 30 deletions.
2 changes: 1 addition & 1 deletion fooocus_colab.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
},
"outputs": [],
"source": [
"!pip install pygit2==1.12.2\n",
"!pip install pygit2==1.15.1\n",
"%cd /content\n",
"!git clone https://github.com/mashb1t/Fooocus.git\n",
"%cd /content/Fooocus"
Expand Down
2 changes: 1 addition & 1 deletion fooocus_version.py
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version = '2.6.0-rc2 (mashb1t)'
version = '2.6.0-rc3 (mashb1t)'
7 changes: 4 additions & 3 deletions language/en.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"Upscale (1.5x)": "Upscale (1.5x)",
"Upscale (2x)": "Upscale (2x)",
"Upscale (Fast 2x)": "Upscale (Fast 2x)",
"\ud83d\udcd4 Document": "\uD83D\uDCD4 Document",
"\ud83d\udcd4 Documentation": "\uD83D\uDCD4 Documentation",
"Image": "Image",
"Stop At": "Stop At",
"Weight": "Weight",
Expand All @@ -47,8 +47,9 @@
"* \"Inpaint or Outpaint\" is powered by the sampler \"DPMPP Fooocus Seamless 2M SDE Karras Inpaint Sampler\" (beta)": "* \"Inpaint or Outpaint\" is powered by the sampler \"DPMPP Fooocus Seamless 2M SDE Karras Inpaint Sampler\" (beta)",
"Advanced options": "Advanced options",
"Generate mask from image": "Generate mask from image",
"Setting": "Setting",
"Settings": "Settings",
"Style": "Style",
"Styles": "Styles",
"Preset": "Preset",
"Performance": "Performance",
"Speed": "Speed",
Expand Down Expand Up @@ -283,7 +284,7 @@
"Volumetric Lighting": "Volumetric Lighting",
"Watercolor 2": "Watercolor 2",
"Whimsical And Playful": "Whimsical And Playful",
"Model": "Model",
"Models": "Models",
"Base Model (SDXL only)": "Base Model (SDXL only)",
"sd_xl_base_1.0_0.9vae.safetensors": "sd_xl_base_1.0_0.9vae.safetensors",
"bluePencilXL_v009.safetensors": "bluePencilXL_v009.safetensors",
Expand Down
37 changes: 20 additions & 17 deletions requirements_versions.txt
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,24 @@
torchsde==0.2.5
einops==0.4.1
transformers==4.30.2
safetensors==0.3.1
accelerate==0.21.0
pyyaml==6.0
Pillow==9.2.0
scipy==1.9.3
tqdm==4.65.0
psutil==5.9.5
pytorch_lightning==1.9.4
omegaconf==2.2.3
torchsde==0.2.6
einops==0.8.0
transformers==4.42.4
safetensors==0.4.3
accelerate==0.32.1
pyyaml==6.0.1
pillow==10.4.0
scipy==1.14.0
tqdm==4.66.4
psutil==6.0.0
pytorch_lightning==2.3.3
omegaconf==2.3.0
gradio==3.41.2
pygit2==1.12.2
opencv-contrib-python==4.8.0.74
httpx==0.24.1
onnxruntime==1.16.3
timm==0.9.2
pygit2==1.15.1
opencv-contrib-python==4.10.0.84
httpx==0.27.0
onnxruntime==1.18.1
timm==1.0.7
numpy==1.26.4
tokenizers==0.19.1
packaging==24.1
translators==5.9.2
rembg==2.0.57
groundingdino-py==0.4.0
Expand Down
6 changes: 6 additions & 0 deletions update_log.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# [2.6.0-rc3](https://github.com/mashb1t/Fooocus/releases/tag/v2.6.0-rc3)

* Update python dependencies
* Rename tab titles and translations from singular to plural
* Rename document to documentation

# [2.6.0-rc2](https://github.com/mashb1t/Fooocus/releases/tag/v2.6.0-rc2)

* Add hash generation multi-threading support, change `--rebuild-hash-cache` from bool to int (number of CPU cores)
Expand Down
17 changes: 9 additions & 8 deletions webui.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ def skip_clicked(currentTask):
uov_input_image = grh.Image(label='Image', source='upload', type='numpy', show_label=False)
with gr.Column():
uov_method = gr.Radio(label='Upscale or Variation:', choices=flags.uov_list, value=flags.disabled)
gr.HTML('<a href="https://github.com/lllyasviel/Fooocus/discussions/390" target="_blank">\U0001F4D4 Document</a>')
gr.HTML('<a href="https://github.com/lllyasviel/Fooocus/discussions/390" target="_blank">\U0001F4D4 Documentation</a>')
with gr.TabItem(label='Image Prompt') as ip_tab:
with gr.Row():
ip_images = []
Expand Down Expand Up @@ -222,7 +222,7 @@ def skip_clicked(currentTask):
ip_type.change(lambda x: flags.default_parameters[x], inputs=[ip_type], outputs=[ip_stop, ip_weight], queue=False, show_progress=False)
ip_ad_cols.append(ad_col)
ip_advanced = gr.Checkbox(label='Advanced', value=False, container=False)
gr.HTML('* \"Image Prompt\" is powered by Fooocus Image Mixture Engine (v1.0.1). <a href="https://github.com/lllyasviel/Fooocus/discussions/557" target="_blank">\U0001F4D4 Document</a>')
gr.HTML('* \"Image Prompt\" is powered by Fooocus Image Mixture Engine (v1.0.1). <a href="https://github.com/lllyasviel/Fooocus/discussions/557" target="_blank">\U0001F4D4 Documentation</a>')

def ip_advance_checked(x):
return [gr.update(visible=x)] * len(ip_ad_cols) + \
Expand All @@ -246,7 +246,7 @@ def ip_advance_checked(x):
label='Additional Prompt Quick List',
components=[inpaint_additional_prompt],
visible=False)
gr.HTML('* Powered by Fooocus Inpaint Engine <a href="https://github.com/lllyasviel/Fooocus/discussions/414" target="_blank">\U0001F4D4 Document</a>')
gr.HTML('* Powered by Fooocus Inpaint Engine <a href="https://github.com/lllyasviel/Fooocus/discussions/414" target="_blank">\U0001F4D4 Documentation</a>')
example_inpaint_prompts.click(lambda x: x[0], inputs=example_inpaint_prompts, outputs=inpaint_additional_prompt, show_progress=False, queue=False)

with gr.Column(visible=False) as inpaint_mask_generation_col:
Expand Down Expand Up @@ -322,7 +322,7 @@ def generate_mask(image, mask_model, cloth_category, dino_prompt_text, sam_model
value=flags.desc_type_photo)
desc_btn = gr.Button(value='Describe this Image into Prompt')
desc_image_size = gr.Textbox(label='Image Size and Recommended Size', elem_id='desc_image_size', visible=False)
gr.HTML('<a href="https://github.com/lllyasviel/Fooocus/discussions/1363" target="_blank">\U0001F4D4 Document</a>')
gr.HTML('<a href="https://github.com/lllyasviel/Fooocus/discussions/1363" target="_blank">\U0001F4D4 Documentation</a>')

def trigger_show_image_properties(image):
value = modules.util.get_image_size_info(image, modules.flags.sdxl_aspect_ratios)
Expand All @@ -335,7 +335,7 @@ def trigger_show_image_properties(image):
with gr.Row():
with gr.Column():
enhance_input_image = grh.Image(label='Use with Enhance, skips image generation', source='upload', type='numpy')
gr.HTML('<a href="https://github.com/mashb1t/Fooocus/discussions/42" target="_blank">\U0001F4D4 Document</a>')
gr.HTML('<a href="https://github.com/lllyasviel/Fooocus/discussions/3281" target="_blank">\U0001F4D4 Documentation</a>')

with gr.TabItem(label='Metadata') as metadata_tab:
with gr.Column():
Expand Down Expand Up @@ -379,7 +379,8 @@ def trigger_metadata_preview(filepath):
inputs=enhance_uov_processing_order,
outputs=enhance_uov_prompt_type,
queue=False, show_progress=False)
gr.HTML('<a href="https://github.com/mashb1t/Fooocus/discussions/42" target="_blank">\U0001F4D4 Document</a>')
gr.HTML('<a href="https://github.com/lllyasviel/Fooocus/discussions/3281" target="_blank">\U0001F4D4 Documentation</a>')

enhance_ctrls = []
enhance_inpaint_mode_ctrls = []
enhance_inpaint_engine_ctrls = []
Expand Down Expand Up @@ -471,7 +472,7 @@ def trigger_metadata_preview(filepath):
'(default is 0, always processed before any mask invert)')
enhance_mask_invert = gr.Checkbox(label='Invert Mask', value=False)

gr.HTML('<a href="https://github.com/mashb1t/Fooocus/discussions/42" target="_blank">\U0001F4D4 Document</a>')
gr.HTML('<a href="https://github.com/lllyasviel/Fooocus/discussions/3281" target="_blank">\U0001F4D4 Documentation</a>')

enhance_ctrls += [
enhance_enabled,
Expand Down Expand Up @@ -674,7 +675,7 @@ def update_history_link():
sharpness = gr.Slider(label='Image Sharpness', minimum=0.0, maximum=30.0, step=0.001,
value=modules.config.default_sample_sharpness,
info='Higher value means image and texture are sharper.')
gr.HTML('<a href="https://github.com/lllyasviel/Fooocus/discussions/117" target="_blank">\U0001F4D4 Document</a>')
gr.HTML('<a href="https://github.com/lllyasviel/Fooocus/discussions/117" target="_blank">\U0001F4D4 Documentation</a>')
dev_mode = gr.Checkbox(label='Developer Debug Mode', value=False, container=False)

with gr.Column(visible=False) as dev_tools:
Expand Down

0 comments on commit 88c5088

Please sign in to comment.