Skip to content

Commit e5dd23a

Browse files
committed
Placeholder
1 parent 59bc8e7 commit e5dd23a

File tree

2 files changed

+22
-20
lines changed

2 files changed

+22
-20
lines changed

pyninja/monitor/resources.py

+11-9
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import shutil
88
import subprocess
99
import time
10+
from collections.abc import Generator
1011
from datetime import datetime, timedelta
1112
from typing import Any, Dict, List
1213

@@ -183,26 +184,27 @@ async def get_system_metrics() -> Dict[str, dict]:
183184

184185

185186
@cache.timed_cache(60)
186-
def disk_utils_metrics() -> List[Dict[str, int | str | float | dict]]:
187-
"""Placeholder for future metrics."""
188-
from pyudisk.main import EnvConfig, smart_metrics
189-
from pyudisk.util import kelvin_to_fahrenheit
187+
def pyudisk_metrics() -> Generator[Dict[str, int | str | float | dict]]:
188+
"""Retrieves metrics from PyUdisk library.
190189
191-
return [
192-
{
190+
Returns:
191+
192+
"""
193+
from pyudisk import util, smart_metrics, EnvConfig
194+
195+
for disk in smart_metrics(EnvConfig()):
196+
yield {
193197
**{
194198
"Model": disk.Info.Model,
195199
"Mountpoint": str(disk.Partition.MountPoints),
196-
"Temperature": f"{kelvin_to_fahrenheit(disk.Attributes.SmartTemperature)} °F",
200+
"Temperature": f"{util.kelvin_to_fahrenheit(disk.Attributes.SmartTemperature)} °F / {util.kelvin_to_celsius(disk.Attributes.SmartTemperature)} °C",
197201
"Bad Sectors": disk.Attributes.SmartNumBadSectors,
198202
"Timestamp": datetime.fromtimestamp(
199203
disk.Attributes.SmartUpdated
200204
).strftime("%Y-%m-%d %H:%M:%S"),
201205
},
202206
**disk.Usage.model_dump(),
203207
}
204-
for disk in smart_metrics(EnvConfig())
205-
]
206208

207209

208210
async def system_resources() -> Dict[str, dict]:

requirements.txt

+11-11
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
click==8.1.7
2-
docker==7.1.0
3-
fastapi==0.112.0
4-
Jinja2==3.1.4
5-
psutil==6.0.0
6-
pydantic==2.8.2
7-
pydantic-settings==2.4.0
8-
python-multipart==0.0.16
9-
PyYaml==6.0.2
10-
requests
11-
uvicorn[standard]==0.30.5
1+
click==8.1.*
2+
docker==7.1.*
3+
fastapi==0.112.*
4+
Jinja2==3.1.*
5+
psutil==6.0.*
6+
pydantic==2.8.*
7+
pydantic-settings==2.4.*
8+
python-multipart==0.0.*
9+
PyYaml==6.0.*
10+
requests==2.32.*
11+
uvicorn[standard]==0.30.*

0 commit comments

Comments
 (0)