fix: cpu load moved to left, adds thread count (#143)

Vadi's request to move cpu load makes a lot of sense. I add thread count to fill the space.
Haidra-Org · Mar 27, 2023 · 9cc159d · 9cc159d
1 parent 5c8d379
commit 9cc159d
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/worker/ui.py b/worker/ui.py
@@ -415,10 +415,10 @@ def get_cpu_usage(self):
     def print_status(self):
         # This is the design template: (80 columns)
         # ╔═AIDream-01══════════════════════════════════════════════════════════════════╗
-        # ║ Uptime: 0:14:35       Jobs Completed: 6             Performance: 0.3 MPS    ║
-        # ║ Models: 174           Kudos Per Hour: 5283        Jobs Per Hour: 524966     ║
-        # ║                             Warnings: 9999               Errors: 100        ║
-        # ║                             Free RAM: 2 GB (99%)       CPU Load: 99% (99%)  ║
+        # ║   Uptime: 0:14:35     Jobs Completed: 6             Performance: 0.3 MPS    ║
+        # ║   Models: 174         Kudos Per Hour: 5283        Jobs Per Hour: 524966     ║
+        # ║  Threads: 3                 Warnings: 9999               Errors: 100        ║
+        # ║ CPU Load: 99% (99%)         Free RAM: 2 GB (99%)                            ║
         # ╟─NVIDIA GeForce RTX 3090─────────────────────────────────────────────────────╢
         # ║   Load: 100% (90%)        VRAM Total: 24576MiB        Fan Speed: 100%       ║
         # ║   Temp: 100C (58C)         VRAM Used: 16334MiB          PCI Gen: 5          ║
@@ -434,7 +434,7 @@ def print_status(self):
         # ╙─────────────────────────────────────────────────────────────────────────────╜
 
         # Define three colums centres
-        col_left = 10
+        col_left = 12
         col_mid = self.width // 2
         col_right = self.width - 12
 
@@ -457,14 +457,15 @@ def label(y, x, label):
 
         label(row_local + 1, col_left, "Uptime:")
         label(row_local + 2, col_left, "Models:")
+        label(row_local + 3, col_left, "Threads:")
+        label(row_local + 4, col_left, "CPU Load:")
         label(row_local + 1, col_mid, "Jobs Completed:")
         label(row_local + 2, col_mid, "Kudos Per Hour:")
         label(row_local + 3, col_mid, "Warnings:")
         label(row_local + 4, col_mid, "Free RAM:")
         label(row_local + 1, col_right, "Performance:")
         label(row_local + 2, col_right, "Jobs Per Hour:")
         label(row_local + 3, col_right, "Errors:")
-        label(row_local + 4, col_right, "CPU Load:")
 
         label(row_gpu + 1, col_left, "Load:")
         label(row_gpu + 2, col_left, "Temp:")
@@ -494,7 +495,7 @@ def label(y, x, label):
         self.print(self.main, row_local + 2, col_mid, f"{self.kudos_per_hour}")
         self.print(self.main, row_local + 2, col_right, f"{self.jobs_per_hour}")
 
-        # self.print(self.main, row_local+3, col_left, f"")
+        self.print(self.main, row_local + 3, col_left, f"{self.threads}")
         self.print(self.main, row_local + 3, col_mid, f"{self.warning_count}")
         self.print(self.main, row_local + 3, col_right, f"{self.error_count}")
 
@@ -509,9 +510,8 @@ def label(y, x, label):
                 curses.beep()
             ram_colour = curses.color_pair(TerminalUI.COLOUR_RED)
 
-        # self.print(self.main, row_local+3, col_left, f"")
+        self.print(self.main, row_local + 4, col_left, f"{self.get_cpu_usage()}")
         self.print(self.main, row_local + 4, col_mid, f"{self.get_free_ram()}", ram_colour)
-        self.print(self.main, row_local + 4, col_right, f"{self.get_cpu_usage()}")
 
         gpu = self.gpu.get_info()
         if gpu: