brett/Zordon
1
0
Fork 0
mirror of https://github.com/blw1138/Zordon.git synced 2025-12-17 16:58:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use local_paths when submitting jobs to localhost

Browse Source
This commit is contained in:
Brett Williams
2023-06-15 20:45:46 -05:00
parent 79ff451af8
commit 0080cdb371
3 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/server/api_server.py
View File

@@ -286,7 +286,7 @@ def add_job_handler():
# initial handling of raw data
try:
if request.is_json:
jobs_list = [request.json]
jobs_list = [request.json] if not isinstance(request.json, list) else request.json
elif request.form.get('json', None):
jobs_list = json.loads(request.form['json'])
else:
@@ -313,7 +313,7 @@ def add_job_handler():
logger.debug(f"Incoming new job request: {jobs_list}")
uploaded_project = request.files.get('file', None)
project_url = jobs_list[0].get('url', None)
input_path = jobs_list[0].get('input_path', None)
local_path = jobs_list[0].get('local_path', None)
renderer = jobs_list[0].get('renderer')
downloaded_file_url = None
@@ -329,8 +329,8 @@ def add_job_handler():
err_msg = f"Error downloading file: {e}"
logger.error(err_msg)
return err_msg, 406
elif input_path and os.path.exists(input_path):
referred_name = os.path.basename(input_path)
elif local_path and os.path.exists(local_path):
referred_name = os.path.basename(local_path)
else:
return "Cannot find any valid project paths", 400
@@ -351,9 +351,9 @@ def add_job_handler():
loaded_project_local_path = os.path.join(upload_dir, referred_name)
shutil.move(downloaded_file_url, loaded_project_local_path)
logger.info(f"Download complete for {loaded_project_local_path.split(server.config['UPLOAD_FOLDER'])[-1]}")
elif input_path:
elif local_path:
loaded_project_local_path = os.path.join(upload_dir, referred_name)
shutil.copy(input_path, loaded_project_local_path)
shutil.copy(local_path, loaded_project_local_path)
logger.info(f"Import complete for {loaded_project_local_path.split(server.config['UPLOAD_FOLDER'])[-1]}")
# process uploaded zip files
@@ -492,7 +492,7 @@ def create_subjobs(worker, job_data, project_path):
logger.debug(f"Posting subjob with frames {subjob['start_frame']}-"
f"{subjob['end_frame']} to {server_hostname}")
post_results = RenderServerProxy(server_hostname).post_job_to_server(
input_path=project_path, job_list=[subjob])
file_path=project_path, job_list=[subjob])
if post_results.ok:
submission_results[server_hostname] = post_results.json()[0]
else: