mirror of
https://github.com/ParisNeo/lollms.git
synced 2025-04-13 22:02:56 +00:00
Update lollms_sd.py
This commit is contained in:
parent
b738b52560
commit
b163a26061
@ -301,12 +301,6 @@ class LollmsSD(LollmsTTI):
|
||||
"value": None,
|
||||
"help": "The password for authentication, if required by the service."
|
||||
},
|
||||
{
|
||||
"name": "auto_sd_base_url",
|
||||
"type": "str",
|
||||
"value": None,
|
||||
"help": "The base URL for the Auto SD service. If not provided, a default or local URL will be used."
|
||||
},
|
||||
{
|
||||
"name": "local_service",
|
||||
"type": "bool",
|
||||
@ -339,14 +333,14 @@ class LollmsSD(LollmsTTI):
|
||||
root_dir = lollms_paths.personal_path
|
||||
|
||||
# Store the path to the script
|
||||
if service_config.auto_sd_base_url is None:
|
||||
self.service_config.base_url = "http://127.0.0.1:7860"
|
||||
if service_config.local_service and service_config.start_service_at_startup:
|
||||
if service_config.auto_sd_base_url is None:
|
||||
self.service_config.base_url = "http://127.0.0.1:7860"
|
||||
if not LollmsSD.verify(app):
|
||||
install_sd(app)
|
||||
if not LollmsSD.verify(app):
|
||||
install_sd(app)
|
||||
|
||||
|
||||
self.service_config.base_url = self.service_config.base_url+"/sdapi/v1"
|
||||
self.sd_base_url = self.service_config.base_url+"/sdapi/v1"
|
||||
shared_folder = root_dir/"shared"
|
||||
self.sd_folder = shared_folder / "auto_sd"
|
||||
self.output_dir = root_dir / "outputs/sd"
|
||||
@ -363,7 +357,7 @@ class LollmsSD(LollmsTTI):
|
||||
ASCIIColors.red(" Forked from Auto1111's Stable diffusion api")
|
||||
ASCIIColors.red(" Integration in lollms by ParisNeo using mix1009's sdwebuiapi ")
|
||||
|
||||
if not self.wait_for_service(1,False) and service_config.auto_sd_base_url is None:
|
||||
if not self.wait_for_service(1,False) and service_config.local_service and service_config.start_service_at_startup:
|
||||
ASCIIColors.info("Loading lollms_sd")
|
||||
os.environ['SD_WEBUI_RESTARTING'] = '1' # To forbid sd webui from showing on the browser automatically
|
||||
# Launch the Flask service using the appropriate script for the platform
|
||||
@ -722,7 +716,7 @@ class LollmsSD(LollmsTTI):
|
||||
# payload["alwayson_scripts"]["ControlNet"] = {"args": []}
|
||||
|
||||
return self.post_and_get_api_result(
|
||||
f"{self.service_config.base_url}/txt2img", payload, use_async
|
||||
f"{self.sd_base_url}/txt2img", payload, use_async
|
||||
)
|
||||
|
||||
def post_and_get_api_result(self, url, json, use_async):
|
||||
@ -863,7 +857,7 @@ class LollmsSD(LollmsTTI):
|
||||
# payload["alwayson_scripts"]["ControlNet"] = {"args": []}
|
||||
|
||||
return self.post_and_get_api_result(
|
||||
f"{self.service_config.base_url}/img2img", payload, use_async
|
||||
f"{self.sd_base_url}/img2img", payload, use_async
|
||||
)
|
||||
|
||||
def extra_single_image(
|
||||
@ -902,7 +896,7 @@ class LollmsSD(LollmsTTI):
|
||||
}
|
||||
|
||||
return self.post_and_get_api_result(
|
||||
f"{self.service_config.base_url}/extra-single-image", payload, use_async
|
||||
f"{self.sd_base_url}/extra-single-image", payload, use_async
|
||||
)
|
||||
|
||||
def extra_batch_images(
|
||||
@ -953,7 +947,7 @@ class LollmsSD(LollmsTTI):
|
||||
}
|
||||
|
||||
return self.post_and_get_api_result(
|
||||
f"{self.service_config.base_url}/extra-batch-images", payload, use_async
|
||||
f"{self.sd_base_url}/extra-batch-images", payload, use_async
|
||||
)
|
||||
|
||||
# XXX 500 error (2022/12/26)
|
||||
@ -962,7 +956,7 @@ class LollmsSD(LollmsTTI):
|
||||
"image": b64_img(image),
|
||||
}
|
||||
|
||||
response = self.session.post(url=f"{self.service_config.base_url}/png-info", json=payload)
|
||||
response = self.session.post(url=f"{self.sd_base_url}/png-info", json=payload)
|
||||
return self._to_api_result(response)
|
||||
|
||||
"""
|
||||
@ -975,104 +969,104 @@ class LollmsSD(LollmsTTI):
|
||||
"model": model,
|
||||
}
|
||||
|
||||
response = self.session.post(url=f"{self.service_config.base_url}/interrogate", json=payload)
|
||||
response = self.session.post(url=f"{self.sd_base_url}/interrogate", json=payload)
|
||||
return self._to_api_result(response)
|
||||
|
||||
def interrupt(self):
|
||||
response = self.session.post(url=f"{self.service_config.base_url}/interrupt")
|
||||
response = self.session.post(url=f"{self.sd_base_url}/interrupt")
|
||||
return response.json()
|
||||
|
||||
def skip(self):
|
||||
response = self.session.post(url=f"{self.service_config.base_url}/skip")
|
||||
response = self.session.post(url=f"{self.sd_base_url}/skip")
|
||||
return response.json()
|
||||
|
||||
def get_options(self):
|
||||
response = self.session.get(url=f"{self.service_config.base_url}/options")
|
||||
response = self.session.get(url=f"{self.sd_base_url}/options")
|
||||
return response.json()
|
||||
|
||||
def set_options(self, options):
|
||||
response = self.session.post(url=f"{self.service_config.base_url}/options", json=options)
|
||||
response = self.session.post(url=f"{self.sd_base_url}/options", json=options)
|
||||
return response.json()
|
||||
|
||||
def get_cmd_flags(self):
|
||||
response = self.session.get(url=f"{self.service_config.base_url}/cmd-flags")
|
||||
response = self.session.get(url=f"{self.sd_base_url}/cmd-flags")
|
||||
return response.json()
|
||||
|
||||
def get_progress(self):
|
||||
response = self.session.get(url=f"{self.service_config.base_url}/progress")
|
||||
response = self.session.get(url=f"{self.sd_base_url}/progress")
|
||||
return response.json()
|
||||
|
||||
def get_cmd_flags(self):
|
||||
response = self.session.get(url=f"{self.service_config.base_url}/cmd-flags")
|
||||
response = self.session.get(url=f"{self.sd_base_url}/cmd-flags")
|
||||
return response.json()
|
||||
|
||||
def get_samplers(self):
|
||||
response = self.session.get(url=f"{self.service_config.base_url}/samplers")
|
||||
response = self.session.get(url=f"{self.sd_base_url}/samplers")
|
||||
return response.json()
|
||||
|
||||
def get_sd_vae(self):
|
||||
response = self.session.get(url=f"{self.service_config.base_url}/sd-vae")
|
||||
response = self.session.get(url=f"{self.sd_base_url}/sd-vae")
|
||||
return response.json()
|
||||
|
||||
def get_upscalers(self):
|
||||
response = self.session.get(url=f"{self.service_config.base_url}/upscalers")
|
||||
response = self.session.get(url=f"{self.sd_base_url}/upscalers")
|
||||
return response.json()
|
||||
|
||||
def get_latent_upscale_modes(self):
|
||||
response = self.session.get(url=f"{self.service_config.base_url}/latent-upscale-modes")
|
||||
response = self.session.get(url=f"{self.sd_base_url}/latent-upscale-modes")
|
||||
return response.json()
|
||||
|
||||
def get_loras(self):
|
||||
response = self.session.get(url=f"{self.service_config.base_url}/loras")
|
||||
response = self.session.get(url=f"{self.sd_base_url}/loras")
|
||||
return response.json()
|
||||
|
||||
def get_sd_models(self):
|
||||
response = self.session.get(url=f"{self.service_config.base_url}/sd-models")
|
||||
response = self.session.get(url=f"{self.sd_base_url}/sd-models")
|
||||
return response.json()
|
||||
|
||||
def get_hypernetworks(self):
|
||||
response = self.session.get(url=f"{self.service_config.base_url}/hypernetworks")
|
||||
response = self.session.get(url=f"{self.sd_base_url}/hypernetworks")
|
||||
return response.json()
|
||||
|
||||
def get_face_restorers(self):
|
||||
response = self.session.get(url=f"{self.service_config.base_url}/face-restorers")
|
||||
response = self.session.get(url=f"{self.sd_base_url}/face-restorers")
|
||||
return response.json()
|
||||
|
||||
def get_realesrgan_models(self):
|
||||
response = self.session.get(url=f"{self.service_config.base_url}/realesrgan-models")
|
||||
response = self.session.get(url=f"{self.sd_base_url}/realesrgan-models")
|
||||
return response.json()
|
||||
|
||||
def get_prompt_styles(self):
|
||||
response = self.session.get(url=f"{self.service_config.base_url}/prompt-styles")
|
||||
response = self.session.get(url=f"{self.sd_base_url}/prompt-styles")
|
||||
return response.json()
|
||||
|
||||
def get_artist_categories(self): # deprecated ?
|
||||
response = self.session.get(url=f"{self.service_config.base_url}/artist-categories")
|
||||
response = self.session.get(url=f"{self.sd_base_url}/artist-categories")
|
||||
return response.json()
|
||||
|
||||
def get_artists(self): # deprecated ?
|
||||
response = self.session.get(url=f"{self.service_config.base_url}/artists")
|
||||
response = self.session.get(url=f"{self.sd_base_url}/artists")
|
||||
return response.json()
|
||||
|
||||
def refresh_checkpoints(self):
|
||||
response = self.session.post(url=f"{self.service_config.base_url}/refresh-checkpoints")
|
||||
response = self.session.post(url=f"{self.sd_base_url}/refresh-checkpoints")
|
||||
return response.json()
|
||||
|
||||
def get_scripts(self):
|
||||
response = self.session.get(url=f"{self.service_config.base_url}/scripts")
|
||||
response = self.session.get(url=f"{self.sd_base_url}/scripts")
|
||||
return response.json()
|
||||
|
||||
def get_embeddings(self):
|
||||
response = self.session.get(url=f"{self.service_config.base_url}/embeddings")
|
||||
response = self.session.get(url=f"{self.sd_base_url}/embeddings")
|
||||
return response.json()
|
||||
|
||||
def get_memory(self):
|
||||
response = self.session.get(url=f"{self.service_config.base_url}/memory")
|
||||
response = self.session.get(url=f"{self.sd_base_url}/memory")
|
||||
return response.json()
|
||||
|
||||
def get_endpoint(self, endpoint, baseurl):
|
||||
if baseurl:
|
||||
return f"{self.service_config.base_url}/{endpoint}"
|
||||
return f"{self.sd_base_url}/{endpoint}"
|
||||
else:
|
||||
from urllib.parse import urlparse, urlunparse
|
||||
|
||||
@ -1178,7 +1172,7 @@ class LollmsSD(LollmsTTI):
|
||||
return thread
|
||||
|
||||
def wait_for_service(self, max_retries = 50, show_warning=True):
|
||||
url = f"{self.service_config.base_url}/internal/ping"
|
||||
url = f"{self.sd_base_url}/internal/ping"
|
||||
# Adjust this value as needed
|
||||
retries = 0
|
||||
|
||||
@ -1505,7 +1499,7 @@ class ControlNetInterface:
|
||||
save_folder=None,
|
||||
script_name=""
|
||||
):
|
||||
url = f"{self.service_config.base_url}/sdapi/v1/txt2img"
|
||||
url = f"{self.sd_base_url}/sdapi/v1/txt2img"
|
||||
|
||||
if styles is None:
|
||||
styles = []
|
||||
@ -1607,7 +1601,7 @@ class ControlNetInterface:
|
||||
save_folder=None,
|
||||
script_name=""
|
||||
):
|
||||
url = f"{self.service_config.base_url}/sdapi/v1/img2img"
|
||||
url = f"{self.sd_base_url}/sdapi/v1/img2img"
|
||||
|
||||
if styles is None:
|
||||
styles = []
|
||||
|
Loading…
x
Reference in New Issue
Block a user