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

Update UI To Use New Model Manager #3548

Merged
merged 29 commits into from
Jun 22, 2023
Merged

Update UI To Use New Model Manager #3548

merged 29 commits into from
Jun 22, 2023

Conversation

blessedcoolant
Copy link
Collaborator

@blessedcoolant blessedcoolant commented Jun 17, 2023 •
edited
Loading

PR for the Model Manager UI work related to 3.0

[DONE]

  • Update ModelType Config names to be specific so that the front end can parse them correctly.
  • Rebuild frontend schema to reflect these changes.
  • Update Linear UI Text To Image and Image to Image to work with the new model loader.
  • Updated the ModelInput component in the Node Editor to work with the new changes.

[TODO REMEMBER]

  • Add proper types for ModelLoaderType in ModelSelect.tsx

[TODO]

  • Everything else.

psychedelicious
psychedelicious requested changes Jun 18, 2023
View reviewed changes
invokeai/frontend/web/src/services/thunks/model.ts Outdated Show resolved Hide resolved
invokeai/frontend/web/src/app/store/enhancers/reduxRemember/unserialize.ts Outdated Show resolved Hide resolved
invokeai/frontend/web/src/features/system/store/models/sd1PipelineModelSlice.ts Outdated Show resolved Hide resolved
invokeai/frontend/web/src/features/system/store/models/sd2PipelineModelSlice.ts Outdated Show resolved Hide resolved
invokeai/frontend/web/src/features/system/store/models/sd1PipelineModelSlice.ts Outdated Show resolved Hide resolved
invokeai/frontend/web/src/features/system/store/models/sd2PipelineModelSlice.ts Outdated Show resolved Hide resolved
invokeai/frontend/web/src/features/system/store/modelsPersistDenylist.ts Outdated Show resolved Hide resolved
invokeai/frontend/web/src/services/thunks/model.ts Outdated Show resolved Hide resolved
invokeai/frontend/web/src/services/thunks/model.ts Outdated Show resolved Hide resolved
invokeai/frontend/web/src/app/store/enhancers/reduxRemember/serialize.ts Outdated Show resolved Hide resolved
@psychedelicious
Copy link
Collaborator

After playing around a bit with the code, we may want to change the model manager list_models() types to make it easier to consume this data:

def list_models(self, model_type: ModelType) -> list[Model]:

@StAlKeR7779 StAlKeR7779 mentioned this pull request Jun 20, 2023
Merged
blessedcoolant and others added 27 commits June 22, 2023 16:40
@blessedcoolant @psychedelicious
chore: Update model config type names
9838dda
@blessedcoolant @psychedelicious
chore: Rebuild API
663f493
@blessedcoolant @psychedelicious
fix: Update missing name types to new names
bf0d5f4
@StAlKeR7779 @psychedelicious
Generate config names for openapi
01d1760
@blessedcoolant @psychedelicious
chore: Rebuild API with new Model API names
e374211
@blessedcoolant @psychedelicious
wip: Add 2.x Models to the Model List
f8d7477
@StAlKeR7779 @psychedelicious
Add name, base_mode, type fields to model info
ef83a2f
@blessedcoolant @psychedelicious
chore: Rebuild API - base_model and type added
d2f3500
@blessedcoolant @StAlKeR7779 @psychedelicious
fix: 2.1 models breaking generation
727293d 
Co-Authored-By: StAlKeR7779 <[email protected]>
@blessedcoolant @psychedelicious
feat: Enable 2.x Model Generation in Linear UI
4847212
@blessedcoolant @psychedelicious
wip: Move Model Selector to own file
604cc1a
@blessedcoolant @psychedelicious
cleanup: Updated model slice names to be more descriptive
0c36162 
Basically updated all slices to be more descriptive in their names. Did so in order to make sure theres good naming scheme available for secondary models.
@blessedcoolant @psychedelicious
feat: Port Schedulers to Mantine
6bdf68d
@blessedcoolant @psychedelicious
revert: getModels to receivedModels
e48528b
@blessedcoolant @psychedelicious
fix: Unserialization key issue
7033071
@blessedcoolant @psychedelicious
fix: Remove type from Model type name
6256be4
@blessedcoolant @psychedelicious
Revert "feat: Port Schedulers to Mantine"
c4c3c96 
This reverts commit e0c105f.
@blessedcoolant @psychedelicious
fix: Adjust the Schedular select width
6c98700 
So the long names do not get cut off.
@blessedcoolant @psychedelicious
tweal: UI colors
d3dec59
@StAlKeR7779 @psychedelicious
Remove default model logic
aceadac
@StAlKeR7779 @psychedelicious
Rename format to model_format(still named format when work with config)
e4dc9c5
@StAlKeR7779 @psychedelicious
Update model format field to use enums
da566b5
@StAlKeR7779 @psychedelicious
Set model type to const value in openapi schema, add model format enu…
21245a0 
…ms to model schema(as they not not referenced in case of Literal definition)
@psychedelicious
feat(models): update model manager service & route to return list of …
b937b7d 
…models
@psychedelicious
feat(nodes): add sd_model_loader node
42a59aa 
Loads any pipeline model.

Also introduced is `PipelineModelField`, which includes a model name and base model.
@psychedelicious
chore(ui): regen api client
3722cdf
@psychedelicious
tidy(nodes): rename sd_model_loader to pipeline_model_loader
1bc1707 
this is more accurate bc it can do eg kandinsky also
@psychedelicious
chore(ui): regen api client
2a178f5
@psychedelicious
feat(ui): initial implementation of model loading
339e7ce 
- Update model listing code to use `rtk-query`
- Update all graph generation to use new `pipeline_model_loader` node
@blessedcoolant blessedcoolant marked this pull request as ready for review June 22, 2023 08:40
@blessedcoolant blessedcoolant changed the title (wip): Model Manager UI v3.0 Update UI To Use New Model Manager Jun 22, 2023
@blessedcoolant blessedcoolant merged commit 22c337b into invoke-ai:main Jun 22, 2023
3 of 9 checks passed
@blessedcoolant blessedcoolant deleted the model-manager-ui-30 branch July 8, 2023 10:00
hipsterusername added a commit that referenced this pull request Jul 31, 2023
@hipsterusername
ONNX Support (#3562)
81654da 
Note: this branch based on #3548, not on main

While find out what needs to be done to implement onnx, found that I can
do draft of it pretty quickly, so... here it is)
Supports LoRA and TI.
As example - cat with sadcatmeme lora:

![image](https://github.com/invoke-ai/InvokeAI/assets/7768370/dbd1a5df-0629-4741-94b3-8e09f4b4d5a3)

![image](https://github.com/invoke-ai/InvokeAI/assets/7768370/d918836c-fdc7-43c0-aa81-dde9182f2e0f)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@psychedelicious psychedelicious psychedelicious approved these changes

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

@damian0815 damian0815 Awaiting requested review from damian0815

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

@JPPhoto JPPhoto Awaiting requested review from JPPhoto

@GreggHelt2 GreggHelt2 Awaiting requested review from GreggHelt2

@StAlKeR7779 StAlKeR7779 Awaiting requested review from StAlKeR7779

@Kyle0654 Kyle0654 Awaiting requested review from Kyle0654

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

Successfully merging this pull request may close these issues.
3 participants
@blessedcoolant @psychedelicious @StAlKeR7779