Skip to content

Updates the server/client architecture to allow for remote servers #35

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

Open
InconsolableCellist wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Updates the server/client architecture to allow for remote servers #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
97a7d14
Updating Krita_server.py to support both local and remote plugins
Sep 17, 2022
30cc64d
Unsetting venv in krita.bat to allow for conda
Sep 17, 2022
38d59d0
Merge branch 'master' of https://github.com/sddebz/stable-diffusion-k…
Sep 17, 2022
a5c6643
Updating Krita plugin to work with a remote server
Sep 19, 2022
cd3562b
Removing unnecessary config option
Sep 19, 2022
b3b5fbb
Fixing inpainting
Sep 19, 2022
7d9a15d
Fixing face_restorers code that was accidentally removed, and changin…
Sep 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
114 changes: 91 additions & 23 deletions krita_plugin/krita_diff/krita_diff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,24 @@
import urllib.parse
import urllib.request
import json
from urllib import request, parse

import requests
from krita import *

default_url = "http://127.0.0.1:8000"
# get an OS-sane tmp dir
default_tmp_dir = os.path.join(os.path.expanduser("~"), "tmp")

samplers = ["DDIM", "PLMS", 'k_dpm_2_a', 'k_dpm_2', 'k_euler_a', 'k_euler', 'k_heun', 'k_lms']
samplers_img2img = ["DDIM", 'k_dpm_2_a', 'k_dpm_2', 'k_euler_a', 'k_euler', 'k_heun', 'k_lms']
upscalers = ["None", "Lanczos"]
face_restorers = ["None", "CodeFormer", "GFPGAN"]
realesrgan_models = ['RealESRGAN_x4plus', 'RealESRGAN_x4plus_anime_6B']

MODE_IMG2IMG = 0
MODE_INPAINT = 1
MODE_SD_UPSCALE = 2

class Script(QObject):
def __init__(self):
Expand All @@ -36,6 +45,7 @@ def restore_defaults(self, if_empty=False):
self.set_cfg('png_quality', -1, if_empty)
self.set_cfg('fix_aspect_ratio', True, if_empty)
self.set_cfg('only_full_img_tiling', True, if_empty)
self.set_cfg('tmp_dir', default_tmp_dir, if_empty)
self.set_cfg('face_restorer_model', face_restorers.index("CodeFormer"), if_empty)
self.set_cfg('codeformer_weight', 0.5, if_empty)

Expand Down Expand Up @@ -136,7 +146,7 @@ def txt2img(self):

def img2img(self, path, mask_path, mode):
tiling = self.cfg('txt2img_tiling', bool)
if mode == 2 or (self.cfg("only_full_img_tiling", bool) and self.selection is not None):
if mode == MODE_SD_UPSCALE or (self.cfg("only_full_img_tiling", bool) and self.selection is not None):
tiling = False

params = {
Expand Down Expand Up @@ -258,7 +268,16 @@ def image_to_ba(self, image):
ptr.setsize(image.byteCount())
return QByteArray(ptr.asstring())

def insert_img(self, layer_name, path, visible=True):
def insert_img(self, layer_name, qimage, visible=True):
layer = self.create_layer(layer_name)
ba = self.image_to_ba(qimage)

if not visible:
layer.setVisible(False)
layer.setPixelData(ba, self.x, self.y, self.width, self.height)
print(f"inserted image to layer: {layer}")

def insert_img_from_path(self, layer_name, path, visible=True):
image = QImage()
image.load(path, "PNG")
ba = self.image_to_ba(image)
Expand All @@ -273,43 +292,92 @@ def insert_img(self, layer_name, path, visible=True):
def apply_txt2img(self):
response = self.txt2img()
outputs = response['outputs']
print(f"Getting images: {outputs}")

print(f'Fetching remote images from server. Images: {outputs}')
for i, output in enumerate(outputs):
self.insert_img(f"txt2img {i + 1}: {os.path.basename(output)}", output, i + 1 == len(outputs))
self.clear_temp_images(outputs)
url = self.cfg('base_url', str) + '/result'

data = json.dumps({'file_name': output}).encode('utf-8')
req = urllib.request.Request(url, data=data, headers={'content-type': 'application/json'})
response = urllib.request.urlopen(req)

image = QImage()
image.loadFromData(response.read(), "PNG")

layer = self.create_layer(f"txt2img {i + 1}: {output}")
layer.setPixelData(self.image_to_ba(image), self.x, self.y, self.width, self.height)

self.doc.refreshProjection()

def apply_img2img(self, mode):
path = self.opt['new_img']
mask_path = self.opt['new_img_mask']
self.save_img(path)
if mode == 1:
path = self.cfg('tmp_dir', str) + '/img2img.png'
mask_path = self.cfg('tmp_dir', str) + '/img2img_mask.png'
path_filename = os.path.basename(path)
mask_filename = os.path.basename(mask_path)

if mode == MODE_INPAINT:
print(f'Saving mask locally: {mask_path}')
self.save_img(mask_path, is_mask=True)
self.node.setVisible(False)
self.doc.refreshProjection()
self.save_img(path)

response = requests.request("POST", self.cfg('base_url', str) + '/saveimg', files=[('file',(path_filename,open(path,'rb'),'image/png'))])
if response.status_code != 200:
print(f"Error while uploading image to server: {response.status_code}")
return

response = self.img2img(path, mask_path, mode)
if mode == MODE_INPAINT:
response = requests.request("POST", self.cfg('base_url', str) + '/saveimg', files=[('file',(mask_filename,open(mask_path,'rb'),'image/png'))])
if response.status_code != 200:
print(f"Error while uploading image to server: {response.status_code}")
return

response = self.img2img(path_filename, mask_filename, mode)
outputs = response['outputs']

print(f"Getting images: {outputs}")
layer_name_prefix = "inpaint" if mode == 1 else "sd upscale" if mode == 2 else "img2img"
layer_name_prefix = "inpaint" if mode == MODE_INPAINT else "sd upscale" if mode == MODE_SD_UPSCALE else "img2img"
for i, output in enumerate(outputs):
self.insert_img(f"{layer_name_prefix} {i + 1}: {os.path.basename(output)}", output, i + 1 == len(outputs))
req = urllib.request.Request(url = self.cfg('base_url', str) + '/result',
data=json.dumps({'file_name': os.path.basename(output)}).encode('utf-8'),
headers={'content-type': 'application/json'})
response = urllib.request.urlopen(req)
qimage = QImage()
qimage.loadFromData(response.read(), "PNG")

self.insert_img(f"{layer_name_prefix} {i + 1}: {os.path.basename(output)}", qimage, i + 1 == len(outputs))

if mode == 1:
self.clear_temp_images([path, mask_path, *outputs])
if mode == MODE_INPAINT:
self.clear_temp_images([path, mask_path])
else:
self.clear_temp_images([path, *outputs])
self.clear_temp_images([path])

self.doc.refreshProjection()

def apply_simple_upscale(self):
path = self.opt['new_img']
path = self.cfg('tmp_dir', str) + '/simple_upscale.png'
path_filename = os.path.basename(path)

self.save_img(path)
response = requests.request("POST", self.cfg('base_url', str) + '/saveimg',
files=[('file',(path_filename,open(path,'rb'),'image/png'))])
if response.status_code != 200:
print(f"Error while uploading image to server: {response.status_code}")
return

response = self.simple_upscale(path)
response = self.simple_upscale(path_filename)
output = response['output']
print(f"Getting image: {output}")

self.insert_img(f"upscale: {os.path.basename(output)}", output)
self.clear_temp_images([path, output])
req = urllib.request.Request(url = self.cfg('base_url', str) + '/result',
data=json.dumps({'file_name': os.path.basename(output)}).encode('utf-8'),
headers={'content-type': 'application/json'})
response = urllib.request.urlopen(req)
qimage = QImage()
qimage.loadFromData(response.read(), "PNG")

self.insert_img(f"upscale: {path_filename}", qimage)
self.clear_temp_images([path])
self.doc.refreshProjection()

def create_mask_layer_internal(self):
Expand Down Expand Up @@ -345,22 +413,22 @@ def action_img2img(self):
pass
self.update_config()
self.try_fix_aspect_ratio()
self.apply_img2img(mode=0)
self.apply_img2img(mode=MODE_IMG2IMG)
self.create_mask_layer_workaround()

def action_sd_upscale(self):
if self.working:
pass
self.update_config()
self.apply_img2img(mode=2)
self.apply_img2img(mode=MODE_SD_UPSCALE)
self.create_mask_layer_workaround()

def action_inpaint(self):
if self.working:
pass
self.update_config()
self.try_fix_aspect_ratio()
self.apply_img2img(mode=1)
self.apply_img2img(mode=MODE_INPAINT)

def action_simple_upscale(self):
if self.working:
Expand Down
Loading