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

fix: modify create_output_panel output to match object returned #950

Conversation

jarrodpan
Copy link
Contributor

@jarrodpan jarrodpan commented Mar 3, 2024

Ever since this commit AUTOMATIC1111/stable-diffusion-webui@501993e#diff-7825c63da20059aa9e36a44157ab1a6b36a02bd71c01f5f30ea5d028320ef263R240

the signature of create_output_panel has been a class object which can not be iterated, however ui_right.py expects an iterable.

This PR fixes the issue in a similar style to https://github.com/hako-mikan/sd-webui-supermerger/pull/323/files

fixes #949 #948 #934

@jarrodpan jarrodpan marked this pull request as ready for review March 3, 2024 12:38
@jarrodpan
Copy link
Contributor Author

@walteryoung
Copy link

Confirmed that this fixed the issue locally for me. Thanks

@viking1304
Copy link
Contributor

This only partially works on my computer. Clicking on the Generate button does nothing. 🤷🏻‍♂️

But, as soon as I added a new _interrupting element and the handler, everything started to work.

interrupting = gr.Button('Interrupting...', elem_id=f"{id_part}_interrupting", elem_classes="generate-box-interrupting", tooltip="Interrupting generation...")
interrupting.click(
  fn=lambda: state.interrupt(),
  inputs=[],
  outputs=[],
)

I am on A1111 1.8.0

commit bef51aed032c0aaa5cfd80445bc4cf0d85b408b5 (HEAD -> master, tag: v1.8.0, origin/master, origin/HEAD)
Merge: cf2772fa 13984857
Author: AUTOMATIC1111 <16777216c@gmail.com>
Date:   Sat Mar 2 07:03:13 2024 +0300

    Merge branch 'release_candidate'

@walteryoung
Copy link

This only partially works on my computer. Clicking on the Generate button does nothing. 🤷🏻‍♂️

But, as soon as I added a new _interrupting element and the handler, everything started to work.

interrupting = gr.Button('Interrupting...', elem_id=f"{id_part}_interrupting", elem_classes="generate-box-interrupting", tooltip="Interrupting generation...")
interrupting.click(
  fn=lambda: state.interrupt(),
  inputs=[],
  outputs=[],
)

I am on A1111 1.8.0

commit bef51aed032c0aaa5cfd80445bc4cf0d85b408b5 (HEAD -> master, tag: v1.8.0, origin/master, origin/HEAD)
Merge: cf2772fa 13984857
Author: AUTOMATIC1111 <16777216c@gmail.com>
Date:   Sat Mar 2 07:03:13 2024 +0300

    Merge branch 'release_candidate'

@viking1304 What lines do you add the interrupting code on?

@viking1304
Copy link
Contributor

viking1304 commented Mar 3, 2024

@walteryoung I am not sure I understood your question correctly.

If it was about what my code was based on, then this A1111 commit
If your question was where to put it, here it is.

@viking1304
Copy link
Contributor

@jarrodpan please merge my pull request for buttons

@jarrodpan
Copy link
Contributor Author

@jarrodpan please merge my pull request for buttons

Thanks for this, I can confirm i had the same issue and your changes work, i'll merge them into this PR.

@rewbs rewbs merged commit 33c0f03 into deforum-art:automatic1111-webui Mar 4, 2024
@rewbs
Copy link
Contributor

rewbs commented Mar 4, 2024

Thanks! I had fixed this for Forge in https://github.com/deforum-art/sd-forge-deforum but didn't realise it also applied to recent a1111 versions.

@viking1304 viking1304 mentioned this pull request Mar 4, 2024
3 tasks
@kylewetton
Copy link

Are you sure object_panel has gallery as an option?


*** Error executing callback ui_tabs_callback for C:\Users\krwet\stable-diffusion-webui\extensions\sd-webui-deforum\scripts\deforum.py
    Traceback (most recent call last):
      File "C:\Users\krwet\stable-diffusion-webui\modules\script_callbacks.py", line 166, in ui_tabs_callback
        res += c.callback() or []
      File "C:\Users\krwet\stable-diffusion-webui\extensions\sd-webui-deforum\scripts\deforum_helpers\ui_right.py", line 101, in on_ui_tabs
        deforum_gallery = output_panel.gallery
    AttributeError: 'tuple' object has no attribute 'gallery'

---

@viking1304
Copy link
Contributor

@kylewetton you need to update a1111 to 1.8.0 and then to update deforum, and everyting should work

@andyxr
Copy link
Contributor

andyxr commented Mar 6, 2024

So, we ready to release this onto the world? People need... :-)

@andyxr
Copy link
Contributor

andyxr commented Mar 6, 2024

Ah it's been merged. I'm obviously having a bad hair day!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Bug]: Deforum tab not showing - Error loading script: deforum_api.py
7 participants