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.

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

web view batch images #75

Merged
merged 9 commits into from
Sep 4, 2023
Merged

web view batch images #75

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
651f453
multiple images
Pythongor Jul 28, 2023
dd5c898
multiple images and info in viewer
Pythongor Aug 2, 2023
28d9b55
actualize MD
Pythongor Aug 2, 2023
1aa075e
MD fixes
Pythongor Aug 3, 2023
1b5d64a
fix config paths in web app
Pythongor Aug 3, 2023
6930bb6
fix multiple mode memoization
Pythongor Aug 7, 2023
4258eb8
tiling and more
Pythongor Aug 13, 2023
e630d17
Merge branch 'main' of https://github.com/Pythongor/SdPaint
Pythongor Aug 13, 2023
b1e3b39
readme update
Pythongor Aug 15, 2023
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
Prev Previous commit
Next Next commit
tiling and more
  • Loading branch information
@Pythongor
Pythongor committed Aug 13, 2023
commit 4258eb85aeffca4e7db8a2d2c252b9865e87a27f
10 changes: 6 additions & 4 deletions scripts/views/WebView/app.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import json
import os
import requests
import threading

Expand Down Expand Up @@ -41,33 +40,35 @@ def send_request(data):
info = json.loads(response["info"])
input_image = data["config"]["controlnet_units"][0]["input_image"]
info["input_image"] = input_image
info["with_tiling"] = data["config"]["tiling"]
response["info"] = json.dumps(info)
sd_response = response
state.server["busy"] = False


@app.get('/config')
async def root():
with open('./controlnet.json', 'r') as f:
with open(state.control_net["config_file"], 'r') as f:
return json.load(f)


@app.post('/config')
async def root(data: Request):
data = await data.json()
with open('./controlnet.json', 'r') as f:
with open(state.control_net["config_file"], 'r') as f:
json_data = json.load(f)
json_data["prompt"] = data["prompt"]
json_data["negative_prompt"] = data["negative_prompt"]
json_data["seed"] = data["seed"]
json_data["steps"] = data["steps"]
json_data["cfg_scale"] = data["cfg_scale"]
json_data["batch_size"] = data["batch_size"]
json_data["tiling"] = data["tiling"]
json_data["width"] = data["width"]
json_data["height"] = data["height"]
json_data["controlnet_units"][0]["module"] = data["module"]
json_data["controlnet_units"][0]["model"] = data["model"]
with open('./controlnet.json', 'w') as f:
with open(state.control_net["config_file"], 'w') as f:
f.write(json.dumps(json_data, indent=4))


Expand Down Expand Up @@ -104,6 +105,7 @@ async def root(data: Request):
state["main_json_data"]["width"] = data["config"]["width"]
state["main_json_data"]["height"] = data["config"]["height"]
state["main_json_data"]["batch_size"] = data["config"]["batch_size"]
state["main_json_data"]["tiling"] = data["config"]["tiling"]
t = threading.Thread(target=send_request, args=[data])
t.start()

Expand Down
2 changes: 1 addition & 1 deletion scripts/views/WebView/build/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="./favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="SdPaint - Painting with Stable Diffusion"/><link rel="apple-touch-icon" href="./logo192.png"/><title>SdPaint</title><script defer="defer" src="./static/js/main.js"></script><link href="./static/css/main.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="./favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="SdPaint - Painting with Stable Diffusion"/><link rel="apple-touch-icon" href="./logo192.png"/><link rel="manifest" href="./manifest.json"/><title>SdPaint</title><script defer="defer" src="./static/js/main.js"></script><link href="./static/css/main.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
25 changes: 25 additions & 0 deletions scripts/views/WebView/build/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"short_name": "React App",
"name": "Create React App Sample",
"icons": [
{
"src": "favicon.ico",
"sizes": "64x64 32x32 24x24 16x16",
"type": "image/x-icon"
},
{
"src": "logo192.png",
"type": "image/png",
"sizes": "192x192"
},
{
"src": "logo512.png",
"type": "image/png",
"sizes": "512x512"
}
],
"start_url": ".",
"display": "standalone",
"theme_color": "#000000",
"background_color": "#ffffff"
}
2 changes: 1 addition & 1 deletion scripts/views/WebView/build/static/css/main.css
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion scripts/views/WebView/build/static/css/main.css.map
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion scripts/views/WebView/build/static/js/main.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion scripts/views/WebView/build/static/js/main.js.map
View file
Open in desktop

Large diffs are not rendered by default.