Compare commits
No commits in common. "5fb07155373d281e2c1dd20c2b49d0e67b4ad832" and "553a2a59f610c3a2fa7a3de0e0c0bc4e68a76217" have entirely different histories.
5fb0715537
...
553a2a59f6
6 changed files with 1 additions and 31 deletions
|
@ -21,7 +21,4 @@ IMAGE_GENERATION_ENDPOINT="http://127.0.0.1:7860/sdapi/v1/txt2img"
|
|||
IMAGE_GENERATION_BACKEND="sdwui" # openai or sdwui or localai
|
||||
IMAGE_GENERATION_SIZE="512x512"
|
||||
IMAGE_FORMAT="webp"
|
||||
SDWUI_STEPS=20
|
||||
SDWUI_SAMPLER_NAME="Euler a"
|
||||
SDWUI_CFG_SCALE=7
|
||||
TIMEOUT=120.0
|
||||
|
|
|
@ -1,11 +1,4 @@
|
|||
# Changelog
|
||||
|
||||
## 1.5.2
|
||||
- Expose more stable diffusion webui api parameters
|
||||
|
||||
## 1.5.1
|
||||
- fix: set timeout not work in image generation
|
||||
|
||||
## 1.5.0
|
||||
- Fix localai v2.0+ image generation
|
||||
- Fallback to gpt-3.5-turbo when caculate tokens using custom model
|
||||
|
|
|
@ -21,9 +21,6 @@
|
|||
"image_generation_endpoint": "http://localai:8080/v1/images/generations",
|
||||
"image_generation_backend": "localai",
|
||||
"image_generation_size": "512x512",
|
||||
"sdwui_steps": 20,
|
||||
"sdwui_sampler_name": "Euler a",
|
||||
"sdwui_cfg_scale": 7,
|
||||
"image_format": "webp",
|
||||
"timeout": 120.0
|
||||
}
|
||||
|
|
12
src/bot.py
12
src/bot.py
|
@ -70,9 +70,6 @@ class Bot:
|
|||
image_generation_backend: Optional[str] = None,
|
||||
image_generation_size: Optional[str] = None,
|
||||
image_format: Optional[str] = None,
|
||||
sdwui_steps: Optional[int] = None,
|
||||
sdwui_sampler_name: Optional[str] = None,
|
||||
sdwui_cfg_scale: Optional[float] = None,
|
||||
timeout: Union[float, None] = None,
|
||||
):
|
||||
if homeserver is None or user_id is None or device_id is None:
|
||||
|
@ -141,10 +138,6 @@ class Bot:
|
|||
self.image_generation_width = self.image_generation_size.split("x")[0]
|
||||
self.image_generation_height = self.image_generation_size.split("x")[1]
|
||||
|
||||
self.sdwui_steps = sdwui_steps
|
||||
self.sdwui_sampler_name = sdwui_sampler_name
|
||||
self.sdwui_cfg_scale = sdwui_cfg_scale
|
||||
|
||||
self.timeout: float = timeout or 120.0
|
||||
|
||||
self.base_path = Path(os.path.dirname(__file__)).parent
|
||||
|
@ -1368,16 +1361,13 @@ class Bot:
|
|||
self.image_generation_endpoint,
|
||||
prompt,
|
||||
self.image_generation_backend,
|
||||
timeout=self.timeout,
|
||||
timeount=self.timeout,
|
||||
api_key=self.openai_api_key,
|
||||
output_path=self.base_path / "images",
|
||||
n=1,
|
||||
size=self.image_generation_size,
|
||||
width=self.image_generation_width,
|
||||
height=self.image_generation_height,
|
||||
steps=self.sdwui_steps,
|
||||
sampler_name=self.sdwui_sampler_name,
|
||||
cfg_scale=self.sdwui_cfg_scale,
|
||||
image_format=self.image_format,
|
||||
)
|
||||
# send image
|
||||
|
|
|
@ -48,7 +48,6 @@ async def get_images(
|
|||
json={
|
||||
"prompt": prompt,
|
||||
"sampler_name": kwargs.get("sampler_name", "Euler a"),
|
||||
"cfg_scale": kwargs.get("cfg_scale", 7),
|
||||
"batch_size": kwargs.get("n", 1),
|
||||
"steps": kwargs.get("steps", 20),
|
||||
"width": kwargs.get("width", 512),
|
||||
|
|
|
@ -45,9 +45,6 @@ async def main():
|
|||
image_generation_endpoint=config.get("image_generation_endpoint"),
|
||||
image_generation_backend=config.get("image_generation_backend"),
|
||||
image_generation_size=config.get("image_generation_size"),
|
||||
sdwui_steps=config.get("sdwui_steps"),
|
||||
sdwui_sampler_name=config.get("sdwui_sampler_name"),
|
||||
sdwui_cfg_scale=config.get("sdwui_cfg_scale"),
|
||||
image_format=config.get("image_format"),
|
||||
timeout=config.get("timeout"),
|
||||
)
|
||||
|
@ -81,9 +78,6 @@ async def main():
|
|||
image_generation_endpoint=os.environ.get("IMAGE_GENERATION_ENDPOINT"),
|
||||
image_generation_backend=os.environ.get("IMAGE_GENERATION_BACKEND"),
|
||||
image_generation_size=os.environ.get("IMAGE_GENERATION_SIZE"),
|
||||
sdwui_steps=int(os.environ.get("SDWUI_STEPS", 20)),
|
||||
sdwui_sampler_name=os.environ.get("SDWUI_SAMPLER_NAME"),
|
||||
sdwui_cfg_scale=float(os.environ.get("SDWUI_CFG_SCALE", 7)),
|
||||
image_format=os.environ.get("IMAGE_FORMAT"),
|
||||
timeout=float(os.environ.get("TIMEOUT", 120.0)),
|
||||
)
|
||||
|
|
Loading…
Reference in a new issue