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.

Sign up for GitHub

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

Jump to bottom

Allow changing folder_paths.base_path via command line argument. #6600

Open
wants to merge 13 commits into
base: master
Choose a base branch
from
Open

Allow changing folder_paths.base_path via command line argument. #6600

wants to merge 13 commits into from
+127 −41

Conversation

webfiltered
Copy link
Collaborator

@webfiltered webfiltered commented Jan 25, 2025 •
edited
Loading

Current

  • The base_path and models_dir properties of folder_paths are set during file import.
  • Many extensions are using these directly.
  • The ComfyUI directory cannot be read-only.

Proposed

  • Add --base-directory command line argument.
  • Refactor folder_paths import code to be re-executable.
    • Default model paths now defined in dictionary.
    • Function that iterates through them.
  • Almost* no change to existing behaviour - new function called on import.
      • The order that custom_nodes and diffusion_models are added to the cache has changed.
    • This minor change can be reverted, but requires workaround code.
  • Default model paths are created using a separate function.
    • Secondary base_paths can be added, allowing all default model paths to be added automatically with one call.
  • Reset the default base_path as early as possible in main code execution.

@webfiltered webfiltered marked this pull request as ready for review January 25, 2025 20:56
@webfiltered
Revert all folder_paths changes.
6b686bd 
Revert "nit - Reorder default_paths back top top of file."

This reverts commit fdfd81a.

Revert "Extend add_model_folder_path for use with built-ins."

This reverts commit a30d74d.

Revert "Reorder to keep default model paths grouped together."

This reverts commit 9c9a853.

Revert "Update type hint to reflect actual usage."

This reverts commit 74325a5.

Revert "Allow default model paths to be re-used with other base paths."

This reverts commit fa3d639.

Revert "Allow complete reset of default directories under a new base_path."

This reverts commit 6e3b261.
@webfiltered
Ensure cache is created before reorder of folder paths.
80abdea
@webfiltered
Allow folder_paths base_path to be customised.
8a29e93
@webfiltered
Update tests to match changes.
87dcae0
wibur0620
wibur0620 reviewed Jan 26, 2025
View reviewed changes
Copy link

@wibur0620 wibur0620 left a comment

Choose a reason for hiding this comment

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

👌

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@wibur0620 wibur0620 wibur0620 left review comments

@yoland68 yoland68 Awaiting requested review from yoland68 yoland68 is a code owner

@robinjhuang robinjhuang Awaiting requested review from robinjhuang robinjhuang is a code owner

@huchenlei huchenlei Awaiting requested review from huchenlei huchenlei is a code owner

@pythongosssss pythongosssss Awaiting requested review from pythongosssss pythongosssss is a code owner

@ltdrdata ltdrdata Awaiting requested review from ltdrdata ltdrdata is a code owner

@Kosinkadink Kosinkadink Awaiting requested review from Kosinkadink Kosinkadink is a code owner

@comfyanonymous comfyanonymous Awaiting requested review from comfyanonymous comfyanonymous is a code owner

At least 2 approving reviews are required to merge this pull request.

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@webfiltered @wibur0620