Rename RenderJob to ScheduledJob

lib/render_queue.py

@@ -7,7 +7,7 @@ from datetime import datetime
 import psutil
 import requests
 
-from .render_job import RenderJob
+from .scheduled_job import ScheduledJob
 from .render_workers.render_worker import RenderStatus
 
 logger = logging.getLogger()
@@ -95,7 +95,7 @@ class RenderQueue:
 
                 for job in saved_state.get('jobs', []):
                     try:
-                        render_job = RenderJob(renderer=job['renderer'], input_path=job['worker']['input_path'],
+                        render_job = ScheduledJob(renderer=job['renderer'], input_path=job['worker']['input_path'],
                                                   output_path=job['worker']['output_path'], args=job['worker']['args'],
                                                   priority=job['priority'], client=job['client'])
 

lib/scheduled_job.py

@@ -12,7 +12,7 @@ from .render_workers.render_worker import RenderStatus, RenderWorkerFactory
 logger = logging.getLogger()
 
 
-class RenderJob:
+class ScheduledJob:
 
     # Get file hash on bg thread
     def __get_file_hash(self):

lib/server/job_server.py

@@ -16,7 +16,7 @@ import yaml
 from flask import Flask, request, render_template, send_file, after_this_request, Response, redirect, url_for, abort
 from werkzeug.utils import secure_filename
 
-from lib.render_job import RenderJob
+from lib.scheduled_job import ScheduledJob
 from lib.render_queue import RenderQueue, JobNotFoundError
 from lib.render_workers.render_worker import RenderWorkerFactory, string_to_status, RenderStatus
 from lib.utilities.server_helper import post_job_to_server, generate_thumbnail_for_job
@@ -309,7 +309,7 @@ def add_job(job_params, remove_job_dir_on_failure=False):
     if client == RenderQueue.host_name:
         logger.info(f"Creating job locally - {name if name else input_path}")
         try:
-            render_job = RenderJob(renderer, input_path, output_path, args, priority, job_owner, client,
+            render_job = ScheduledJob(renderer, input_path, output_path, args, priority, job_owner, client,
                                       notify=False, custom_id=custom_id, name=name)
             RenderQueue.add_to_render_queue(render_job, force_start=force_start)
             return render_job.json()