GPU keys to list (#1694)

timmo001 · May 19, 2022 · b82f950 · b82f950
1 parent aae2bf6
commit b82f950
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 6 deletions.
diff --git a/backend/systembridgebackend/modules/gpu/update.py b/backend/systembridgebackend/modules/gpu/update.py
@@ -117,8 +117,10 @@ async def update_temperature(
 
     async def update_all_data(self) -> None:
         """Update data"""
+        gpu_list = []
         for gpu_name in self._gpu.get_gpus(self._database):
             gpu_key = make_key(gpu_name)
+            gpu_list.append(gpu_key)
             await asyncio.gather(
                 *[
                     self.update_name(gpu_key, gpu_name),
@@ -134,3 +136,4 @@ async def update_all_data(self) -> None:
                     self.update_temperature(gpu_key),
                 ]
             )
+        self._database.write("gpu", "gpus", str(gpu_list))
diff --git a/connector/systembridgeconnector/models/display.py b/connector/systembridgeconnector/models/display.py
@@ -25,5 +25,5 @@ class Display(BaseModel):
     class Config:
         extra = Extra.allow
 
-    displays: list
+    displays: list[str]
     last_updated: LastUpdated = Field(..., description="Last updated")
diff --git a/connector/systembridgeconnector/models/gpu.py b/connector/systembridgeconnector/models/gpu.py
@@ -6,6 +6,17 @@
 from pydantic import BaseModel, Extra, Field
 
 
+class LastUpdated(BaseModel):
+    """
+    Last updated
+    """
+
+    class Config:
+        extra = Extra.allow
+
+    gpus: float
+
+
 class Gpu(BaseModel):
     """
     GPU
@@ -14,4 +25,5 @@ class Gpu(BaseModel):
     class Config:
         extra = Extra.allow
 
-    last_updated: dict[str, float] = Field(..., description="Last updated")
+    gpus: list[str]
+    last_updated: LastUpdated = Field(..., description="Last updated")
diff --git a/schemas/data/display.json b/schemas/data/display.json
@@ -20,5 +20,5 @@
     }
   },
   "additionalProperties": {},
-  "required": ["last_updated"]
+  "required": ["displays", "last_updated"]
 }
diff --git a/schemas/data/gpu.json b/schemas/data/gpu.json
@@ -3,14 +3,22 @@
   "type": "object",
   "description": "GPU",
   "properties": {
+    "gpus": {
+      "type": "array"
+    },
     "last_updated": {
       "type": "object",
       "description": "Last updated",
+      "properties": {
+        "gpus": {
+          "type": "number"
+        }
+      },
       "additionalProperties": {
         "type": "number"
       }
     }
   },
   "additionalProperties": {},
-  "required": ["last_updated"]
+  "required": ["gpus", "last_updated"]
 }
diff --git a/shared/systembridgeshared/models/display.py b/shared/systembridgeshared/models/display.py
@@ -25,5 +25,5 @@ class Display(BaseModel):
     class Config:
         extra = Extra.allow
 
-    displays: list
+    displays: list[str]
     last_updated: LastUpdated = Field(..., description="Last updated")
diff --git a/shared/systembridgeshared/models/gpu.py b/shared/systembridgeshared/models/gpu.py
@@ -6,6 +6,17 @@
 from pydantic import BaseModel, Extra, Field
 
 
+class LastUpdated(BaseModel):
+    """
+    Last updated
+    """
+
+    class Config:
+        extra = Extra.allow
+
+    gpus: float
+
+
 class Gpu(BaseModel):
     """
     GPU
@@ -14,4 +25,5 @@ class Gpu(BaseModel):
     class Config:
         extra = Extra.allow
 
-    last_updated: dict[str, float] = Field(..., description="Last updated")
+    gpus: list[str]
+    last_updated: LastUpdated = Field(..., description="Last updated")