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

Add /api/ to all rest call paths

Browse Source
This commit is contained in:
Brett Williams
2022-12-07 12:30:44 -08:00
parent 0bf2eaac76
commit 7a3fed1960
4 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
lib/job_server.py
View File

@@ -20,12 +20,12 @@ logger = logging.getLogger()
server = Flask(__name__)
@server.get('/jobs')
@server.get('/api/jobs')
def jobs_json():
return [x.json_safe_copy() for x in RenderQueue.job_queue]
@server.get('/jobs/<status_val>')
@server.get('/api/jobs/<status_val>')
def filtered_jobs_json(status_val):
state = string_to_status(status_val)
jobs = [x.json_safe_copy() for x in RenderQueue.jobs_with_status(state)]
@@ -35,7 +35,7 @@ def filtered_jobs_json(status_val):
return f'Cannot find jobs with status {status_val}', 400
@server.get('/job_status/<job_id>')
@server.get('/api/job_status/<job_id>')
def get_job_status(job_id):
found_job = RenderQueue.job_with_id(job_id)
if found_job:
@@ -44,7 +44,7 @@ def get_job_status(job_id):
return f'Cannot find job with ID {job_id}', 400
@server.get('/file_list/<job_id>')
@server.get('/api/file_list/<job_id>')
def get_file_list(job_id):
found_job = RenderQueue.job_with_id(job_id)
if found_job:
@@ -54,7 +54,7 @@ def get_file_list(job_id):
return f'Cannot find job with ID {job_id}', 400
@server.route('/download_all/<job_id>')
@server.route('/api/download_all/<job_id>')
def download_all(job_id):
zip_filename = None
@@ -81,26 +81,26 @@ def download_all(job_id):
return f'Cannot find job with ID {job_id}', 400
@server.post('/register_client')
@server.post('/api/register_client')
def register_client():
client_hostname = request.values['hostname']
x = RenderQueue.register_client(client_hostname)
return "Success" if x else "Fail"
@server.post('/unregister_client')
@server.post('/api/unregister_client')
def unregister_client():
client_hostname = request.values['hostname']
x = RenderQueue.unregister_client(client_hostname)
return "Success" if x else "Fail"
@server.get('/clients')
@server.get('/api/clients')
def render_clients():
return RenderQueue.render_clients
@server.get('/full_status')
@server.get('/api/full_status')
def full_status():
full_results = {'timestamp': datetime.now().isoformat(), 'servers': {}}
@@ -127,7 +127,7 @@ def full_status():
return full_results
@server.get('/snapshot')
@server.get('/api/snapshot')
def snapshot():
server_status = RenderQueue.status()
server_jobs = [x.json_safe_copy() for x in RenderQueue.job_queue]
@@ -135,7 +135,7 @@ def snapshot():
return server_data
@server.post('/add_job')
@server.post('/api/add_job')
def add_job_handler():
try:
@@ -259,7 +259,7 @@ def add_job(job_params, remove_job_dir_on_failure=False):
return {'error': err_msg, 'code': 400}
@server.get('/cancel_job')
@server.get('/api/cancel_job')
def cancel_job():
job_id = request.args.get('id', None)
confirm = request.args.get('confirm', False)
@@ -277,18 +277,18 @@ def cancel_job():
return 'job not found', 400
@server.get('/clear_history')
@server.get('/api/clear_history')
def clear_history():
RenderQueue.clear_history()
return 'success'
@server.route('/status')
@server.route('/api/status')
def status():
return RenderQueue.status()
@server.get('/renderer_info')
@server.get('/api/renderer_info')
def renderer_info():
renderer_data = {}
for r in RenderWorkerFactory.supported_renderers():
@@ -317,5 +317,5 @@ def post_job_to_server(input_path, job_list, client, server_port=8080):
job_files = {'file': (os.path.basename(input_path), open(input_path, 'rb'), 'application/octet-stream'),
'json': (None, json.dumps(job_list), 'application/json')}
req = requests.post(f'http://{client}:{server_port}/add_job', files=job_files)
req = requests.post(f'http://{client}:{server_port}/api/add_job', files=job_files)
return req