cpu-loader 0.3.0__tar.gz → 0.4.2__tar.gz

{cpu_loader-0.3.0/src/cpu_loader.egg-info → cpu_loader-0.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cpu-loader
-Version: 0.3.0
+Version: 0.4.2
 Summary: A tool to generate CPU load on a system with runtime configuration through a WebUI and REST API
 Author-email: the78mole <the78mole@users.noreply.github.com>
 License: MIT License

{cpu_loader-0.3.0 → cpu_loader-0.4.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "cpu-loader"
-version = "0.3.0"
+version = "0.4.2"
 description = "A tool to generate CPU load on a system with runtime configuration through a WebUI and REST API"
 readme = "README.md"
 requires-python = ">=3.8"

{cpu_loader-0.3.0 → cpu_loader-0.4.2}/src/cpu_loader/cpu_loader.py

@@ -3,6 +3,7 @@ CPU Loader Module
 Provides CPU load generation with controllable load per thread.
 Uses a C extension for efficient CPU load generation.
 """
+
 import multiprocessing
 from typing import Dict
 

{cpu_loader-0.3.0 → cpu_loader-0.4.2}/src/cpu_loader/main.py

@@ -2,6 +2,7 @@
 CPU Loader FastAPI Application
 Provides REST API and WebUI for controlling CPU load.
 """
+
 import argparse
 import asyncio
 import logging
@@ -12,7 +13,7 @@ from typing import Dict, List, Optional, Set
 import psutil
 import uvicorn
 from fastapi import FastAPI, HTTPException, WebSocket, WebSocketDisconnect
-from fastapi.responses import HTMLResponse, FileResponse
+from fastapi.responses import FileResponse, HTMLResponse
 from fastapi.staticfiles import StaticFiles
 from pydantic import BaseModel, Field
 
@@ -62,36 +63,37 @@ mqtt_publisher: Optional[MQTTPublisher] = None
 websocket_connections: Set[WebSocket] = set()
 monitoring_task = None
 temperature_monitoring_enabled = True
+temperature_monitoring_enabled = True
 
 
 def get_cpu_temperature() -> Optional[float]:
     """Get CPU temperature if available and enabled."""
     if not temperature_monitoring_enabled:
         return None
-    
+
     try:
         # Try to get CPU temperature using psutil
         temperatures = psutil.sensors_temperatures()
-        
+
         # Common temperature sensor names to check
-        temp_names = ['coretemp', 'cpu_thermal', 'acpi', 'k8temp', 'k10temp']
-        
+        temp_names = ["coretemp", "cpu_thermal", "acpi", "k8temp", "k10temp"]
+
         for temp_name in temp_names:
             if temp_name in temperatures:
                 # Get the first temperature reading
                 temp_list = temperatures[temp_name]
                 if temp_list:
                     return round(temp_list[0].current, 1)
-        
+
         # If no specific sensor found, try the first available
         for sensor_name, temp_list in temperatures.items():
             if temp_list:
                 return round(temp_list[0].current, 1)
-                
+
     except (AttributeError, OSError, ImportError):
         # Temperature monitoring not available on this system
         pass
-    
+
     return None
 
 
@@ -108,7 +110,7 @@ async def cpu_monitoring_loop():
             # Get CPU metrics (non-blocking after first call)
             per_cpu = psutil.cpu_percent(interval=None, percpu=True)
             total_cpu = sum(per_cpu) / len(per_cpu) if per_cpu else 0.0
-            
+
             # Get CPU temperature if available
             cpu_temp = get_cpu_temperature()
 
@@ -238,9 +240,7 @@ async def get_cpu_metrics():
     total_cpu = psutil.cpu_percent(interval=0)
     cpu_temp = get_cpu_temperature()
     return CPUMetricsResponse(
-        total_cpu_percent=total_cpu, 
-        per_cpu_percent=per_cpu,
-        cpu_temperature=cpu_temp
+        total_cpu_percent=total_cpu, per_cpu_percent=per_cpu, cpu_temperature=cpu_temp
     )
 
 
@@ -366,7 +366,7 @@ def run():
     """Entry point for the CPU Loader application."""
     global temperature_monitoring_enabled
     args = parse_args()
-    
+
     # Set temperature monitoring based on CLI argument
     temperature_monitoring_enabled = not args.disable_temperature
 

{cpu_loader-0.3.0 → cpu_loader-0.4.2}/src/cpu_loader/mqtt_publisher.py

@@ -2,6 +2,7 @@
 MQTT Publisher Module
 Publishes CPU load control settings and metrics to MQTT broker.
 """
+
 import json
 import logging
 import os
@@ -144,7 +145,12 @@ class MQTTPublisher:
         except Exception as e:
             logger.error(f"Failed to publish load settings: {e}")
 
-    def publish_cpu_metrics(self, total_cpu_percent: float, per_cpu_percent: list, cpu_temperature: Optional[float] = None):
+    def publish_cpu_metrics(
+        self,
+        total_cpu_percent: float,
+        per_cpu_percent: list,
+        cpu_temperature: Optional[float] = None,
+    ):
         """
         Publish CPU metrics to MQTT.
 
@@ -162,7 +168,7 @@ class MQTTPublisher:
                 "total_cpu_percent": round(total_cpu_percent, 1),
                 "per_cpu_percent": [round(cpu, 1) for cpu in per_cpu_percent],
             }
-            
+
             # Add temperature if available
             if cpu_temperature is not None:
                 payload["cpu_temperature"] = cpu_temperature

{cpu_loader-0.3.0 → cpu_loader-0.4.2}/src/cpu_loader/static/favicon.svg

@@ -31,4 +31,8 @@
   <rect x="13" y="14" width="2" height="6" fill="#FFC107"/>
   <rect x="16" y="10" width="2" height="10" fill="#F44336"/>
   <rect x="19" y="16" width="2" height="4" fill="#2196F3"/>
-</svg>
+<<<<<<< HEAD
+</svg>
+=======
+</svg>
+>>>>>>> 0b500ee (feat: add CPU temperature monitoring and update related UI components)

{cpu_loader-0.3.0 → cpu_loader-0.4.2}/src/cpu_loader/templates/index.html

@@ -288,10 +288,10 @@
                 const tempContainer = document.getElementById('cpu-temperature-container');
                 const tempValue = document.getElementById('cpu-temperature-value');
                 const tempBar = document.getElementById('cpu-temperature-bar');
-                
+
                 tempContainer.style.display = 'block';
                 tempValue.textContent = `${data.cpu_temperature}°C`;
-                
+
                 // Scale temperature (0-100°C -> 0-100%)
                 const tempPercent = Math.min(100, Math.max(0, data.cpu_temperature));
                 tempBar.style.width = `${tempPercent}%`;

{cpu_loader-0.3.0 → cpu_loader-0.4.2/src/cpu_loader.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cpu-loader
-Version: 0.3.0
+Version: 0.4.2
 Summary: A tool to generate CPU load on a system with runtime configuration through a WebUI and REST API
 Author-email: the78mole <the78mole@users.noreply.github.com>
 License: MIT License