Skip to content

Commit

Permalink
1.5.1
Browse files Browse the repository at this point in the history
  • Loading branch information
zombieyang committed Nov 24, 2024
1 parent 9d3c7ce commit dbb61e0
Show file tree
Hide file tree
Showing 13 changed files with 1,067 additions and 516 deletions.
4 changes: 4 additions & 0 deletions __init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,10 @@ def run_script(cmd, cwd='.'):
from .sdppp_python.sdppp import SDPPP
sdppp = SDPPP()
sdppp.attach_to_comfyui(PromptServer)
from comfy.cli_args import args
if (args.multi_user):
sdppp.extra_server_info['multi_user'] = True


from .sdppp_python.comfy.nodes import define_comfyui_nodes
from .sdppp_python.comfy.nodes_legacy import define_comfyui_nodes_legacy
Expand Down
13 changes: 13 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,16 @@
## [1.5.1] - 2024-11-24
1. optimize: Widget list will now sort by name.
2. optimize: Textarea widget will auto resize.
3. optimize: add a tips for Comfy with `--multi-user` that makes sdppp not able to load workflow. #58
4. fix: `Save` button sometimes would not work.
5. fix: Did not load the lastest workflow content when just enter Edit panel. #57 #58
6. fix: The height and width of ParseLayerInfo was reversed.
7. fix: SDPPP comfy nodes would become smaller after refresh.
8. fix: Cannot get contents when there are multiple instance with same name. #56
9. fix: Did not refresh layer option when just extracted PSD.
10. fix: selected hidden layer will become visible after send to PS. #53


## [1.5.0] - 2024-11-13
1. feature: new node `GetSelection` to replace the `selection_only` option in `GetImageFromPS` Node
2. feature: run workflow directly (work with new ComfyUI's layout).
Expand Down
Binary file modified javascript/plugins/sd-ppp_PS.ccx
Binary file not shown.
2 changes: 1 addition & 1 deletion javascript/sdppp-a1111.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion javascript/sdppp-comfy.js

Large diffs are not rendered by default.

1,532 changes: 1,031 additions & 501 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "sdppp",
"version": "1.5.0",
"version": "1.5.1",
"scripts": {
"watch": "nodemon -w typescripts/src -e mjs,js,jsx,mts,ts,tsx,json,css,html -x node typescripts/src/build.mjs",
"build": "NODE_ENV=production node typescripts/src/build.mjs && bash plugins/package.sh"
Expand Down
2 changes: 1 addition & 1 deletion plugins/photoshop/index.js

Large diffs are not rendered by default.

7 changes: 3 additions & 4 deletions plugins/photoshop/manifest.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"id": "sd-ppp",
"name": "SD-PPP",
"version": "1.5.0",
"version": "1.5.1",
"main": "index.html",
"manifestVersion": 5,
"host": {
Expand All @@ -12,7 +12,6 @@
"enableAlerts": true
},
"requiredPermissions": {
"enableUserInfo": true,
"network": {
"domains": "all"
},
Expand Down Expand Up @@ -45,8 +44,8 @@
"height": 100
},
"maximumSize": {
"width": 1280,
"height": 960
"width": 3440,
"height": 1440
},
"preferredDockedSize": {
"width": 300,
Expand Down
6 changes: 4 additions & 2 deletions plugins/photoshop/styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ sp-slider.sdppp-slider {
}
.sdppp-slider sp-textfield {
position: absolute;
right: 19px;
right: 0;
top: 5px;
width: 40px;
width: 70px;
height: 20px;
text-align: right;
}
Expand Down Expand Up @@ -97,6 +97,8 @@ sp-slider.sdppp-slider {
width: 25%;
margin-right: 8.333%;
height: 100%;
display: flex;
flex-direction: column;
}

.editor-card sp-picker,
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[project]
name = "sd-ppp"
description = "getting/sending picture from/to Photoshop with a simple connection. Make Photoshop become the workspace of your ComfyUI."
version = "1.5.0"
version = "1.5.1"
license = { file = "LICENSE" }

[project.urls]
Expand Down
2 changes: 0 additions & 2 deletions sdppp_python/apis.py
Original file line number Diff line number Diff line change
Expand Up @@ -115,9 +115,7 @@ async def b_workflow_action(sid, payload = {}):
if len(sdppp.page_instances) == 0:
return {"error": "Please connect at least one page instance"}

print('b_workflow_action', payload, payload['sid'])
result = await sdppp.sio.call('b_workflow_action', payload, to=payload['sid'])
print('b_workflow_action result')
return result

@sio.event
Expand Down
9 changes: 7 additions & 2 deletions sdppp_python/sdppp.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ def __init__(self):
self.page_instances = dict()
self.backend_instances = dict()

self.extra_server_info = {}

def attach_to_comfyui(self, PromptServer):
self.sio = socketio.AsyncServer(
async_mode='aiohttp',
Expand Down Expand Up @@ -74,10 +76,13 @@ async def init(sid, payload):
else:
raise socketio.exceptions.ConnectionRefusedError('unknown instance type ' + payload['type'])

return {
"server_type": self.server_type
ret = {
"server_type": self.server_type,
**self.extra_server_info
}

return ret


@sio.event
async def disconnect(sid):
Expand Down

0 comments on commit dbb61e0

Please sign in to comment.