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

DO NOT MERGE #6497

Closed
wants to merge 59 commits into from
Closed

DO NOT MERGE #6497

wants to merge 59 commits into from

Conversation

psychedelicious
Copy link
Collaborator

Summary

Related Issues / Discussions

QA Instructions

Merge Plan

Checklist

  • The PR has a short but descriptive title, suitable for a changelog
  • Tests added / updated (if applicable)
  • Documentation added / updated (if applicable)

Lincoln Stein and others added 30 commits April 3, 2024 23:26
add simplified model manager install API to InvocationContext
9cc1f20
@lstein
add simplified model manager install API to InvocationContext
af1b57a
add invocation_context.load_ckpt_from_url() method
df5ebdb
fix merge conflicts
3a26c7b
port dw_openpose, depth_anything, and lama processors to new model do…
41b909c 
…wnload scheme
change names of convert and download caches and add migration script
3ddd7ce
@lstein
add simplified model manager install API to InvocationContext
34438ce
@lstein
add invocation_context.load_ckpt_from_url() method
c140d3b
@lstein
port dw_openpose, depth_anything, and lama processors to new model do…
3ead827 
…wnload scheme
@lstein
change names of convert and download caches and add migration script
fa6efac
Merge branch 'lstein/feat/simple-mm2-api' of github.com:invoke-ai/Inv…
f055e1e 
…okeAI into lstein/feat/simple-mm2-api
Merge branch 'main' into lstein/feat/simple-mm2-api
f1e79d5
fix merge conflicts with main
470a399
@lstein
Merge branch 'main' into lstein/feat/simple-mm2-api
34cdfc6
Address change requests in first round of PR reviews.
d72f272 
Pending:

- Move model install calls into model manager and create passthrus in invocation_context.
- Consider splitting load_model_from_url() into a call to get the path and a call to load the path.
refactor load_ckpt_from_url()
70903ef
Merge branch 'main' into lstein/feat/simple-mm2-api
bb04f49
make download and convert cache keys safe for filename length
a26667d
support VRAM caching of dict models that lack to()
7c39929
@lstein
Merge branch 'main' into lstein/feat/simple-mm2-api
f65c7e2
fix safe_filename() on windows
57c8314
@psychedelicious
feat(backend): lift managed model loading out of lama class
fcb071f
@psychedelicious
feat(backend): lift managed model loading out of depthanything class
1fe90c3
@lstein
Merge branch 'main' into lstein/feat/simple-mm2-api
49c84cd
@lstein
Merge branch 'main' into lstein/feat/simple-mm2-api
3b64e7a
fix ruff error
38df6f3
refactor DWOpenPose and add type hints
e9a2005
@lstein
Merge branch 'main' into lstein/feat/simple-mm2-api
8e5e9b5
@lstein
move access token regex matching into download queue
f211c95
@lstein
bad implementation of diffusers folder download
b48d4a0
lstein and others added 16 commits June 2, 2024 09:45
@lstein
Merge branch 'main' into lstein/feat/simple-mm2-api
2276f32
@psychedelicious
tidy(app): remove unnecessary changes in invocation_context
132bbf3 
- Any mypy issues are a misconfiguration of mypy
- Use simple conditionals instead of ternaries
- Consistent & standards-compliant docstring formatting
- Use `dict` instead of `typing.Dict`
@psychedelicious
docs(app): simplify docstring in invocation_context
e3a70e5
@psychedelicious
tidy(mm): move load_model_from_url from mm to invocation context
b124440
@psychedelicious
tidy(nodes): cnet processors
ccdecf2 
- Set `self._context=context` instead of changing the type signature of `run_processor`
- Tidy a few typing things
@psychedelicious
tidy(nodes): infill
521f907 
- Set `self._context=context` instead of passing it as an arg
@psychedelicious
feat(download): add type for callback_name
6cc6a45 
Just a bit of typo protection in lieu of full type safety for these methods, which is difficult due to the typing of `DownloadEventHandler`.
@psychedelicious
tidy(mm): minor formatting
c58ac1e
@psychedelicious
tidy(download): _download_job -> _multifile_job
aa9695e
@psychedelicious
tidy(mm): pass enum member instead of string
9941325
@psychedelicious
tidy(mm): remove extraneous docstring
c7f22b6 
It's inherited from the ABC.
@psychedelicious
docs(mm): add comment in move_model_to_device
e7513f6
@psychedelicious
chore: ruff
a9962fd
@psychedelicious
add support for generic loading of diffusers directories
f81b8bc
@psychedelicious
ruff fixes
9f93796
@psychedelicious
replace load_and_cache_model() with load_remote_model() and load_loca…
dc13493 
…l_odel()
@github-actions github-actions bot added api python PRs that change python files invocations PRs that change invocations backend PRs that change backend files services PRs that change app services python-tests PRs that change python tests docs PRs that change docs labels Jun 7, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

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

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

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

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

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

Assignees
No one assigned
Labels
api backend PRs that change backend files docs PRs that change docs invocations PRs that change invocations python PRs that change python files python-tests PRs that change python tests services PRs that change app services
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@psychedelicious @lstein