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

{cpu_loader-0.2.8/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.2.8
+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.2.8 → cpu_loader-0.4.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "cpu-loader"
-version = "0.2.8"
+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"
@@ -53,4 +53,4 @@ package-dir = {"" = "src"}
 packages = ["cpu_loader"]
 
 [tool.setuptools.package-data]
-cpu_loader = ["templates/*.html", "*.c"]
+cpu_loader = ["templates/*.html", "static/*", "*.c"]

{cpu_loader-0.2.8 → 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.2.8 → cpu_loader-0.4.2}/src/cpu_loader/main.py

@@ -2,16 +2,19 @@
 CPU Loader FastAPI Application
 Provides REST API and WebUI for controlling CPU load.
 """
+
 import argparse
 import asyncio
 import logging
 from contextlib import asynccontextmanager
+from pathlib import Path
 from typing import Dict, List, Optional, Set
 
 import psutil
 import uvicorn
 from fastapi import FastAPI, HTTPException, WebSocket, WebSocketDisconnect
-from fastapi.responses import HTMLResponse
+from fastapi.responses import FileResponse, HTMLResponse
+from fastapi.staticfiles import StaticFiles
 from pydantic import BaseModel, Field
 
 from cpu_loader.cpu_loader import CPULoader
@@ -51,6 +54,7 @@ class ThreadsStatusResponse(BaseModel):
 class CPUMetricsResponse(BaseModel):
     total_cpu_percent: float
     per_cpu_percent: List[float]
+    cpu_temperature: Optional[float] = None
 
 
 # Global CPU loader instance, MQTT publisher, and WebSocket connections
@@ -58,6 +62,39 @@ cpu_loader = None
 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"]
+
+        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
 
 
 async def cpu_monitoring_loop():
@@ -74,11 +111,15 @@ async def cpu_monitoring_loop():
             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()
+
             # Prepare message
             message = {
                 "type": "cpu_metrics",
                 "total_cpu_percent": round(total_cpu, 1),
                 "per_cpu_percent": [round(cpu, 1) for cpu in per_cpu],
+                "cpu_temperature": cpu_temp,
             }
 
             # Broadcast to all connected clients
@@ -95,7 +136,7 @@ async def cpu_monitoring_loop():
 
             # Publish to MQTT if enabled
             if mqtt_publisher:
-                mqtt_publisher.publish_cpu_metrics(total_cpu, per_cpu)
+                mqtt_publisher.publish_cpu_metrics(total_cpu, per_cpu, cpu_temp)
 
         except Exception as e:
             logger.error(f"Error in CPU monitoring loop: {e}")
@@ -142,6 +183,21 @@ app = FastAPI(
     lifespan=lifespan,
 )
 
+# Mount static files
+static_path = Path(__file__).parent / "static"
+if static_path.exists():
+    app.mount("/static", StaticFiles(directory=static_path), name="static")
+
+
+@app.get("/favicon.ico")
+async def get_favicon():
+    """Serve the favicon."""
+    favicon_path = Path(__file__).parent / "static" / "favicon.svg"
+    if favicon_path.exists():
+        return FileResponse(favicon_path, media_type="image/svg+xml")
+    else:
+        raise HTTPException(status_code=404, detail="Favicon not found")
+
 
 @app.get("/", response_class=HTMLResponse)
 async def get_webui():
@@ -182,7 +238,10 @@ async def get_cpu_metrics():
     """Get current CPU utilization metrics."""
     per_cpu = psutil.cpu_percent(interval=0.1, percpu=True)
     total_cpu = psutil.cpu_percent(interval=0)
-    return CPUMetricsResponse(total_cpu_percent=total_cpu, per_cpu_percent=per_cpu)
+    cpu_temp = get_cpu_temperature()
+    return CPUMetricsResponse(
+        total_cpu_percent=total_cpu, per_cpu_percent=per_cpu, cpu_temperature=cpu_temp
+    )
 
 
 @app.post("/api/threads")
@@ -266,6 +325,11 @@ def parse_args():
         default=8000,
         help="Port to bind the server to (default: 8000)",
     )
+    parser.add_argument(
+        "--disable-temperature",
+        action="store_true",
+        help="Disable CPU temperature monitoring (useful if temperature sensors are unavailable)",
+    )
 
     # MQTT arguments
     mqtt_group = parser.add_argument_group("MQTT settings")
@@ -300,8 +364,12 @@ def parse_args():
 
 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
+
     # Prepare MQTT arguments (only non-None values)
     mqtt_args = {}
     if args.mqtt_broker_host:

{cpu_loader-0.2.8 → 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,13 +145,19 @@ 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):
+    def publish_cpu_metrics(
+        self,
+        total_cpu_percent: float,
+        per_cpu_percent: list,
+        cpu_temperature: Optional[float] = None,
+    ):
         """
         Publish CPU metrics to MQTT.
 
         Args:
             total_cpu_percent: Total CPU utilization percentage
             per_cpu_percent: List of per-CPU utilization percentages
+            cpu_temperature: CPU temperature in Celsius (optional)
         """
         if not self.connected or not self.client:
             return
@@ -162,6 +169,10 @@ class MQTTPublisher:
                 "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
+
             # Publish to topic
             topic = f"{self.topic_prefix}/cpu_metrics"
             self.client.publish(

cpu_loader-0.4.2/src/cpu_loader/static/favicon.svg

@@ -0,0 +1,38 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
+  <defs>
+    <linearGradient id="cpuGradient" x1="0%" y1="0%" x2="100%" y2="100%">
+      <stop offset="0%" style="stop-color:#667eea;stop-opacity:1" />
+      <stop offset="100%" style="stop-color:#764ba2;stop-opacity:1" />
+    </linearGradient>
+  </defs>
+  <!-- CPU chip outline -->
+  <rect x="4" y="4" width="24" height="24" rx="2" ry="2" fill="url(#cpuGradient)" stroke="#333" stroke-width="1"/>
+  <!-- CPU pins -->
+  <rect x="1" y="8" width="2" height="2" fill="#333"/>
+  <rect x="1" y="12" width="2" height="2" fill="#333"/>
+  <rect x="1" y="16" width="2" height="2" fill="#333"/>
+  <rect x="1" y="20" width="2" height="2" fill="#333"/>
+  <rect x="29" y="8" width="2" height="2" fill="#333"/>
+  <rect x="29" y="12" width="2" height="2" fill="#333"/>
+  <rect x="29" y="16" width="2" height="2" fill="#333"/>
+  <rect x="29" y="20" width="2" height="2" fill="#333"/>
+  <rect x="8" y="1" width="2" height="2" fill="#333"/>
+  <rect x="12" y="1" width="2" height="2" fill="#333"/>
+  <rect x="16" y="1" width="2" height="2" fill="#333"/>
+  <rect x="20" y="1" width="2" height="2" fill="#333"/>
+  <rect x="8" y="29" width="2" height="2" fill="#333"/>
+  <rect x="12" y="29" width="2" height="2" fill="#333"/>
+  <rect x="16" y="29" width="2" height="2" fill="#333"/>
+  <rect x="20" y="29" width="2" height="2" fill="#333"/>
+  <!-- CPU core -->
+  <rect x="8" y="8" width="16" height="16" rx="1" ry="1" fill="rgba(255,255,255,0.2)"/>
+  <!-- Load indicator bars -->
+  <rect x="10" y="12" width="2" height="8" fill="#4CAF50"/>
+  <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"/>
+<<<<<<< HEAD
+</svg>
+=======
+</svg>
+>>>>>>> 0b500ee (feat: add CPU temperature monitoring and update related UI components)

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

@@ -214,6 +214,15 @@
                     <div class="cpu-bar total" id="total-cpu-bar" style="width: 0%"></div>
                 </div>
             </div>
+            <div class="cpu-bar-container" id="cpu-temperature-container" style="display: none;">
+                <div class="cpu-bar-label">
+                    <span><strong>🌡️ CPU Temperature</strong></span>
+                    <span id="cpu-temperature-value">-</span>
+                </div>
+                <div class="cpu-bar-wrapper">
+                    <div class="cpu-bar" id="cpu-temperature-bar" style="width: 0%; background: linear-gradient(90deg, #2196F3 0%, #4CAF50 25%, #FFC107 60%, #FF5722 85%, #B71C1C 100%);"></div>
+                </div>
+            </div>
             <div id="per-cpu-bars"></div>
         </div>
 
@@ -274,6 +283,20 @@
             document.getElementById('total-cpu-value').textContent = `${totalCpu}%`;
             document.getElementById('total-cpu-bar').style.width = `${totalCpu}%`;
 
+            // Update CPU temperature if available
+            if (data.cpu_temperature !== null && data.cpu_temperature !== undefined) {
+                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}%`;
+            }
+
             // Update per-CPU bars
             const perCpuContainer = document.getElementById('per-cpu-bars');
             if (data.per_cpu_percent.length !== numCPUs) {

{cpu_loader-0.2.8 → 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.2.8
+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.2.8 → cpu_loader-0.4.2}/src/cpu_loader.egg-info/SOURCES.txt

@@ -16,4 +16,5 @@ src/cpu_loader.egg-info/dependency_links.txt
 src/cpu_loader.egg-info/entry_points.txt
 src/cpu_loader.egg-info/requires.txt
 src/cpu_loader.egg-info/top_level.txt
+src/cpu_loader/static/favicon.svg
 src/cpu_loader/templates/index.html