temporarily rename models.py->pmodels.py due to conflicting with webui import of its own models.py, change job_timeout default back to 3 and make persistent, UI comp. for job timeout shows wrong default value

Author: papuSpartan

scripts/spartan/UI.py

@@ -81,6 +81,7 @@ def save_btn(self, thin_client_mode, job_timeout):
         job_timeout = int(job_timeout)
         self.world.job_timeout = job_timeout
         logger.debug(f"job timeout is now {job_timeout} seconds")
+        self.world.save_config()
 
     def save_worker_btn(self, label, address, port, tls, disabled):
         """creates or updates the worker selected in the worker config tab"""

scripts/spartan/Worker.py

@@ -20,7 +20,7 @@
 except ImportError:  # webui 95821f0132f5437ef30b0dbcac7c51e55818c18f and newer
     from modules.initialize_util import gradio_server_name
     server_name = gradio_server_name()
-from .models import Worker_Model
+from .pmodels import Worker_Model
 
 
 class InvalidWorkerResponse(Exception):

scripts/spartan/World.py

@@ -18,7 +18,7 @@
 import modules.shared as shared
 from .Worker import Worker, State
 from .shared import logger, warmup_samples
-from .models import Config_Model, Benchmark_Payload
+from .pmodels import Config_Model, Benchmark_Payload
 from . import shared as sh
 
 
@@ -79,7 +79,7 @@ def __init__(self, initial_payload, verify_remotes: bool = True):
         self.total_batch_size: int = 0
         self._workers: List[Worker] = [self.master_worker]
         self.jobs: List[Job] = []
-        self.job_timeout: int = 6  # seconds
+        self.job_timeout: int = 3  # seconds
         self.initialized: bool = False
         self.verify_remotes = verify_remotes
         self.initial_payload = copy.copy(initial_payload)
@@ -544,6 +544,7 @@ def load_config(self):
             self.add_worker(**fields)
 
         sh.benchmark_payload = Benchmark_Payload(**config.benchmark_payload)
+        self.job_timeout = config.job_timeout
 
         logger.debug("config loaded")
 
@@ -554,7 +555,8 @@ def save_config(self):
 
         config = Config_Model(
             workers=[{worker.label: worker.model.dict()} for worker in self._workers],
-            benchmark_payload=sh.benchmark_payload
+            benchmark_payload=sh.benchmark_payload,
+            job_timeout=self.job_timeout
         )
 
         with open(self.config_path, 'w+') as config_file:

scripts/spartan/models.py scripts/spartan/pmodels.pyscripts/spartan/models.py renamed to scripts/spartan/pmodels.py

@@ -10,7 +10,7 @@ class Benchmark_Payload(BaseModel):
     batch_size: int = Field(default=1)
 
 class Worker_Model(BaseModel):
-    avg_ipm: float | None = Field(
+    avg_ipm: Optional[float] = Field(
         title='Average Speed',
         description='the speed of a device measured in ipm(images per minute)',
         ge=0
@@ -35,4 +35,5 @@ class Config_Model(BaseModel):
     benchmark_payload: Dict = Field(
         default=Benchmark_Payload,
         description='the payload used when benchmarking a node'
-    )
+    )
+    job_timeout: Optional[int] = Field(default=3)