Skip to content

rename *job* to *event* in remote_control.py #6

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
picobyte wants to merge 1 commit into
base: main
Choose a base branch
from
Open

rename *job* to *event* in remote_control.py #6

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 10 additions & 10 deletions nodes/remote_control.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ def INPUT_TYPES(s):
}

RETURN_TYPES = ("IMAGE",)
FUNCTION = "get_remote_job"
FUNCTION = "get_remote_event"
CATEGORY = "remote"

def wait_for_job(self,remote_url,job_id):
def wait_for_event(self,remote_url,event_id):
url = remote_url + "history"

image_data = None
Expand All @@ -42,15 +42,15 @@ def wait_for_job(self,remote_url,job_id):
time.sleep(0.5)
continue
for i,d in data.items():
if d["prompt"][3].get("job_id") == job_id:
if d["prompt"][3].get("event_id") == event_id:
image_data = d["outputs"][list(d["outputs"].keys())[-1]].get("images")
time.sleep(0.5)
return image_data

# remote_info can be none, but the node shouldn't exist at that point
def get_remote_job(self, final_image, remote_info):
def get_remote_event(self, final_image, remote_info):
images = []
for i in self.wait_for_job(remote_info["remote_url"],remote_info["job_id"]):
for i in self.wait_for_event(remote_info["remote_url"],remote_info["event_id"]):
img_url = f"{remote_info['remote_url']}view?filename={i['filename']}&subfolder={i['subfolder']}&type={i['type']}"

ir = requests.get(img_url, stream=True)
Expand Down Expand Up @@ -110,9 +110,9 @@ def get_max_batch_size(prompt):
return bs

if enabled == "false":
return (seed,{"remote_url":None,"job_id":None,})
return (seed,{"remote_url":None,"event_id":None,})
elif enabled == "remote":
return (seed+node_id*get_max_batch_size(prompt),{"remote_url":None,"job_id":None,})
return (seed+node_id*get_max_batch_size(prompt),{"remote_url":None,"event_id":None,})

new_prompt = deepcopy(prompt)
to_del = []
Expand Down Expand Up @@ -171,14 +171,14 @@ def recursive_node_deletion(start_node):
for i in to_del:
del new_prompt[i]

job_id = f"netdist-{time.time()}"
event_id = f"netdist-{time.time()}"
data = {
"prompt": new_prompt,
"client_id": "netdist",
"extra_data": {
"job_id": job_id,
"event_id": event_id,
}
}
ar = requests.post(remote_url+"prompt", json=data)
ar.raise_for_status()
return (seed,{"remote_url":remote_url,"job_id":job_id})
return (seed,{"remote_url":remote_url,"event_id":event_id})