Fix for batch_size
Finalize work how to get batch_size so we can put number of images in your RPC :)pull/1/head
Edesak
parent
cd573f3b91
commit
85e65c82b6
|
|
@ -2,11 +2,11 @@ import gradio as gr
|
|||
from modules import script_callbacks
|
||||
from modules import ui
|
||||
from modules import shared
|
||||
from modules.txt2img import get_batch_size
|
||||
# from modules.txt2img import get_batch_size WIP
|
||||
import threading
|
||||
import time
|
||||
import os
|
||||
|
||||
from modules.processing import StableDiffusionProcessing
|
||||
|
||||
github_link = "https://github.com/davehornik/sd-discordRPC"
|
||||
|
||||
|
|
@ -14,19 +14,20 @@ enable_dynamic_status = True
|
|||
|
||||
|
||||
def start_rpc():
|
||||
print('Running Discord Rich Presence Extension by https://github.com/davehornik, version 1.0.0')
|
||||
print(f'Bug reporting -> {github_link}')
|
||||
print('[Discord-RPC] Running Discord Rich Presence Extension by https://github.com/davehornik, version 1.0.0')
|
||||
print(f'[Discord-RPC] Bug reporting -> {github_link}')
|
||||
|
||||
# Check if the required packages are installed, and install them if necessary
|
||||
from launch import is_installed, run_pip
|
||||
if not is_installed("pypresence"):
|
||||
print("Installing missing 'pypresence' module and its dependencies,")
|
||||
print("In case of module error after the installation, restart webui.")
|
||||
print("[Discord-RPC] Installing missing 'pypresence' module and its dependencies,")
|
||||
print("[Discord-RPC] In case of module error after the installation, restart webui.")
|
||||
run_pip("install pypresence", "pypresence")
|
||||
|
||||
if enable_dynamic_status:
|
||||
print("Remember that it uses multithreading, so there may occur cases when the whole program freezes")
|
||||
print("In such cases close the webui, go to the 'extensions' folder and remove the plugin")
|
||||
print(
|
||||
"[Discord-RPC] Remember that it uses multithreading, so there may occur cases when the whole program freezes")
|
||||
print("[Discord-RPC] In such cases close the webui, go to the 'extensions' folder and remove the plugin")
|
||||
|
||||
checkpoint_info = shared.sd_model.sd_checkpoint_info
|
||||
model_name = os.path.basename(checkpoint_info.filename)
|
||||
|
|
@ -38,50 +39,20 @@ def start_rpc():
|
|||
rpc = pypresence.Presence(client_id)
|
||||
rpc.connect()
|
||||
|
||||
|
||||
time_c=time.time()
|
||||
time_c = time.time()
|
||||
rpc.update(
|
||||
state="Waiting for the start" if enable_dynamic_status else "Dynamic Status - *WIP*",
|
||||
details=model_name,
|
||||
large_image="unknown" if enable_dynamic_status else "auto",
|
||||
start=time_c
|
||||
)
|
||||
)
|
||||
|
||||
def RPC_thread(rpc):
|
||||
print('RPC thread on bg starting')
|
||||
while True:
|
||||
rpc.update()
|
||||
|
||||
def state_watcher_thread():
|
||||
reset_time = False
|
||||
while True:
|
||||
|
||||
checkpoint_info = shared.sd_model.sd_checkpoint_info
|
||||
model_name = os.path.basename(checkpoint_info.filename)
|
||||
if shared.state.job_count == 0:
|
||||
if reset_time == False:
|
||||
time_c = time.time()
|
||||
reset_time= True
|
||||
|
||||
rpc.update(large_image="a1111", details=model_name,
|
||||
state="Idle", start=time_c)
|
||||
else:
|
||||
if reset_time == True:
|
||||
time_c = time.time()
|
||||
reset_time= False
|
||||
|
||||
rpc.update(large_image="a1111_gen", details=model_name,
|
||||
state=f'Total batch of {shared.state.job_count*get_batch_size()} image/s', start=time_c)
|
||||
time.sleep(2) # update once per two seconds
|
||||
#print(get_batch_size())
|
||||
|
||||
rpc_watcher = threading.Thread(target=RPC_thread, args=(rpc,), daemon=True)
|
||||
state_watcher = threading.Thread(target=state_watcher_thread, daemon=True)
|
||||
state_watcher = threading.Thread(target=state_watcher_thread, args=(rpc,), daemon=True)
|
||||
state_watcher.start()
|
||||
rpc_watcher.start()
|
||||
|
||||
if enable_dynamic_status:
|
||||
print("If everyhing is okey, it should be working already. Make sure u got Game Activity enabled in Discord.")
|
||||
print(
|
||||
"[Discord-RPC] If everyhing is okey, it should be working already. Make sure u got Game Activity enabled in Discord.")
|
||||
|
||||
|
||||
def on_ui_tabs():
|
||||
|
|
@ -89,4 +60,49 @@ def on_ui_tabs():
|
|||
return []
|
||||
|
||||
|
||||
def state_watcher_thread(rpc):
|
||||
reset_time = False
|
||||
batch_size_r = False
|
||||
batch_size = 0
|
||||
|
||||
while True:
|
||||
|
||||
checkpoint_info = shared.sd_model.sd_checkpoint_info
|
||||
model_name = os.path.basename(checkpoint_info.filename)
|
||||
if shared.state.job_count == 0:
|
||||
|
||||
if reset_time == False:
|
||||
time_c = time.time()
|
||||
reset_time = True
|
||||
|
||||
if batch_size_r == True:
|
||||
batch_size_r = False
|
||||
batch_size = 0
|
||||
rpc.update(large_image="a1111", details=model_name,
|
||||
state="Idle", start=time_c)
|
||||
else:
|
||||
|
||||
if reset_time == True:
|
||||
time_c = time.time()
|
||||
reset_time = False
|
||||
if batch_size_r == False:
|
||||
batch_size = get_batch_size()
|
||||
if batch_size != 0:
|
||||
batch_size_r = True
|
||||
rpc.update(large_image="a1111_gen", details=model_name,
|
||||
state=f'Total batch of {shared.state.job_count*batch_size} image/s', start=time_c)
|
||||
|
||||
time.sleep(2) # update once per two seconds
|
||||
|
||||
|
||||
script_callbacks.on_ui_tabs(on_ui_tabs)
|
||||
|
||||
|
||||
def get_batch_size():
|
||||
|
||||
if shared.state.current_latent != None:
|
||||
x = shared.state.current_latent.size()
|
||||
x = x[0]
|
||||
return x
|
||||
else:
|
||||
return 0
|
||||
Loading…
Reference in New Issue