Update app.py

app.py

@@ -18,6 +18,11 @@ oauth2_scheme = OAuth2PasswordBearer(tokenUrl="token")
 # Hugging Face secret token from environment variables
 VALID_TOKEN = os.environ.get("SECRET_TOKEN")
 
+# Constants to represent the limits for the container resources
+MAX_CPU_CORES = 2  # vCPUs
+MAX_MEMORY_GB = 16  # GB
+MAX_DISK_GB = 50  # GB
+
 # Helper function to calculate the size of a directory
 def get_directory_size(directory: Path) -> int:
     total_size = 0
@@ -40,33 +45,31 @@ def health_check(token: str = Depends(get_current_token)):
         "status": "healthy"
     }
 
-# System metrics endpoint: CPU, RAM, and disk usage for uploads folder (in GB and percentage of 50GB limit)
+# System metrics endpoint: CPU, RAM, and disk usage for uploads folder relative to 2 vCPUs, 16GB RAM, and 50GB disk
 @app.get("/metrics")
 def get_metrics(token: str = Depends(get_current_token)):
-    # CPU percentage (rounded to the nearest whole number)
-    cpu_percent = round(psutil.cpu_percent(interval=1))
+    # CPU percentage relative to 2 vCPUs
+    cpu_percent = round((psutil.cpu_percent(interval=1) / 100) * MAX_CPU_CORES, 2)
 
-    # Memory stats in GB
+    # Memory usage relative to 16GB of RAM
     memory = psutil.virtual_memory()
-    memory_total_gb = memory.total / (1024 ** 3)
-    memory_available_gb = memory.available / (1024 ** 3)
+    memory_used_gb = (memory.total - memory.available) / (1024 ** 3)
+    memory_usage_percent = (memory_used_gb / MAX_MEMORY_GB) * 100
 
-    # Disk stats for uploads directory
+    # Disk usage for uploads directory relative to 50GB storage
     uploads_size_bytes = get_directory_size(UPLOAD_DIRECTORY)
     uploads_size_gb = uploads_size_bytes / (1024 ** 3)
-    uploads_percent = (uploads_size_gb / 50) * 100  # Assuming 50GB total space limit
+    uploads_usage_percent = (uploads_size_gb / MAX_DISK_GB) * 100
 
     return {
-        "cpu_percent": cpu_percent,  # Rounded CPU percentage
+        "cpu_usage_cores": cpu_percent,  # Relative CPU usage as cores (out of 2 vCPUs)
         "memory": {
-            "total_gb": round(memory_total_gb, 2),
-            "available_gb": round(memory_available_gb, 2),
-            "percent": memory.percent
+            "used_gb": round(memory_used_gb, 2),
+            "used_percent_of_16gb": round(memory_usage_percent, 2)
         },
         "disk": {
             "uploads_folder_size_gb": round(uploads_size_gb, 2),
-            "uploads_usage_percent_of_50gb": round(uploads_percent, 2),
-            "total_space_gb": 50
+            "uploads_usage_percent_of_50gb": round(uploads_usage_percent, 2)
         }
     }