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

Moved logic of "post_prompt" endpoint to sub-function, allowed custom "prompt_id" #6129

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+41 −33
Open

Moved logic of "post_prompt" endpoint to sub-function, allowed custom "prompt_id" #6129

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d6edc2c
refactor: moved logic of "post_prompt" endpoint to sub-function
bigcat88 Dec 20, 2024
1741ad5
added ability to specify custom "prompt_id"
bigcat88 Dec 24, 2024
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
74 changes: 41 additions & 33 deletions server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -613,39 +613,12 @@ async def get_queue(request):
@routes.post("/prompt")
async def post_prompt(request):
logging.info("got prompt")
json_data = await request.json()
json_data = self.trigger_on_prompt(json_data)

if "number" in json_data:
number = float(json_data['number'])
else:
number = self.number
if "front" in json_data:
if json_data['front']:
number = -number

self.number += 1

if "prompt" in json_data:
prompt = json_data["prompt"]
valid = execution.validate_prompt(prompt)
extra_data = {}
if "extra_data" in json_data:
extra_data = json_data["extra_data"]

if "client_id" in json_data:
extra_data["client_id"] = json_data["client_id"]
if valid[0]:
prompt_id = str(uuid.uuid4())
outputs_to_execute = valid[2]
self.prompt_queue.put((number, prompt_id, prompt, extra_data, outputs_to_execute))
response = {"prompt_id": prompt_id, "number": number, "node_errors": valid[3]}
return web.json_response(response)
else:
logging.warning("invalid prompt: {}".format(valid[1]))
return web.json_response({"error": valid[1], "node_errors": valid[3]}, status=400)
else:
return web.json_response({"error": "no prompt", "node_errors": []}, status=400)
result = self.put_prompt_in_queue(await request.json())
if "error" in result:
if result.get("node_errors"):
logging.warning("invalid prompt: {}".format(result["error"]))
return web.json_response(result, status=400)
return web.json_response(result)

@routes.post("/queue")
async def post_queue(request):
Expand Down Expand Up @@ -690,6 +663,41 @@ async def post_history(request):

return web.Response(status=200)

def put_prompt_in_queue(self, json_data):
json_data = self.trigger_on_prompt(json_data)

if "number" in json_data:
number = float(json_data['number'])
else:
number = self.number
if "front" in json_data:
if json_data['front']:
number = -number

self.number += 1

if "prompt" in json_data:
prompt = json_data["prompt"]
valid = execution.validate_prompt(prompt)
extra_data = {}
if "extra_data" in json_data:
extra_data = json_data["extra_data"]

if "client_id" in json_data:
extra_data["client_id"] = json_data["client_id"]
if valid[0]:
if "prompt_id" in json_data:
prompt_id = json_data["prompt_id"]
else:
prompt_id = str(uuid.uuid4())
outputs_to_execute = valid[2]
self.prompt_queue.put((number, prompt_id, prompt, extra_data, outputs_to_execute))
return {"prompt_id": prompt_id, "number": number, "node_errors": valid[3]}
else:
return {"error": valid[1], "node_errors": valid[3]}
else:
return {"error": "no prompt", "node_errors": []}

async def setup(self):
timeout = aiohttp.ClientTimeout(total=None) # no timeout
self.client_session = aiohttp.ClientSession(timeout=timeout)
Expand Down
Loading