Remove usage metric in macOS and dry run functionality

pyudisk/config.py

@@ -93,10 +93,6 @@ class EnvConfig(BaseSettings):
 
     """
 
-    dry_run: bool = False
-    sample_partitions: str = "partitions.json"
-    sample_dump: str = "dump.txt"
-
     smart_lib: FilePath = get_smart_lib()
     disk_lib: FilePath = get_disk_lib()
     metrics: Metric | List[Metric] = Field(default_factory=list)
@@ -122,14 +118,6 @@ class EnvConfig(BaseSettings):
     report_dir: str | DirectoryPath = "report"
     report_file: str = Field("disk_report_%m-%d-%Y_%I:%M_%p.html", pattern=r".*\.html$")
 
-    # noinspection PyMethodParameters
-    @field_validator("smart_lib", mode="before")
-    def validate_udisk_lib(cls, value: str) -> str:
-        """Validates the disk library path only when DRY_RUN is set to false."""
-        if os.environ.get("DRY_RUN", "false") == "true":
-            return __file__
-        return value
-
     # noinspection PyMethodParameters
     @field_validator("metrics", mode="after")
     def validate_metrics(cls, value: Metric | List[Metric]) -> List[Metric]:

pyudisk/main.py

@@ -15,7 +15,6 @@
 from .logger import LOGGER
 from .models import SystemPartitions, darwin, linux
 from .notification import notification_service, send_report
-from .support import humanize_usage_metrics, load_dump, load_partitions
 from .util import size_converter, standard
 
 
@@ -29,12 +28,8 @@ def get_partitions(env: EnvConfig) -> Generator[sdiskpart]:
         sdiskpart:
         Yields the partition datastructure.
     """
-    if env.dry_run:
-        partitions = load_partitions(filename=env.sample_partitions)
-    else:
-        partitions = psutil.disk_partitions()
     system_partitions = SystemPartitions()
-    for partition in partitions:
+    for partition in psutil.disk_partitions():
         if (
             not any(
                 partition.mountpoint.startswith(mnt)
@@ -55,17 +50,13 @@ def get_smart_metrics(env: EnvConfig) -> str:
         str:
         Returns the output from disk util dump.
     """
-    if env.dry_run:
-        text = load_dump(filename=env.sample_dump)
-    else:
-        try:
-            output = subprocess.check_output(f"{env.smart_lib} dump", shell=True)
-        except subprocess.CalledProcessError as error:
-            result = error.output.decode(encoding="UTF-8").strip()
-            LOGGER.error(f"[{error.returncode}]: {result}\n")
-            return ""
-        text = output.decode(encoding="UTF-8")
-    return text
+    try:
+        output = subprocess.check_output(f"{env.smart_lib} dump", shell=True)
+    except subprocess.CalledProcessError as error:
+        result = error.output.decode(encoding="UTF-8").strip()
+        LOGGER.error(f"[{error.returncode}]: {result}\n")
+        return ""
+    return output.decode(encoding="UTF-8")
 
 
 def parse_drives(input_data: str) -> Dict[str, Any]:
@@ -108,15 +99,15 @@ def parse_drives(input_data: str) -> Dict[str, Any]:
 
 def parse_block_devices(
     env: EnvConfig, input_data: str
-) -> Dict[sdiskpart, Dict[str, str]]:
+) -> Dict[str, List[Dict[str, str]]]:
     """Parses block_devices' information from the dump into a datastructure.
 
     Args:
         env: Environment variables configuration.
         input_data: Smart metrics dump.
 
     Returns:
-        Dict[sdiskpart, str]:
+        Dict[str, List[Dict[str, str]]]:
         Returns a dictionary of block_devices' metrics as key-value pairs.
     """
     block_devices = {}
@@ -184,10 +175,10 @@ def parse_block_devices(
                 block_devices[block][key] = val
     block_devices_updated = {}
     for _, value in block_devices.items():
-        if block_devices_updated.get(value['Drive']):
-            block_devices_updated[value['Drive']].append(value)
+        if block_devices_updated.get(value["Drive"]):
+            block_devices_updated[value["Drive"]].append(value)
         else:
-            block_devices_updated[value['Drive']] = [value]
+            block_devices_updated[value["Drive"]] = [value]
     return block_devices_updated
 
 
@@ -298,12 +289,6 @@ def get_smart_metrics_macos(
             "device", darwin.Device(name=device_id, info_name=device_id).model_dump()
         )
         output["model_name"] = output.get("model_name", device_info.get("name"))
-        if len(mountpoints) == 1:
-            output["usage"] = humanize_usage_metrics(psutil.disk_usage(mountpoints[0]))
-        else:
-            # This will occur only when the disk retrieval falls back to partitions or the disk path itself
-            # In both cases, the mountpoint can be assumed as root (/)
-            output["usage"] = humanize_usage_metrics(psutil.disk_usage("/"))
         output["mountpoints"] = mountpoints
         return output
     except ValidationError as error:
@@ -341,7 +326,7 @@ def smart_metrics(env: EnvConfig) -> Generator[linux.Disk | darwin.Disk]:
         LOGGER.warning(
             f"Number of block devices [{len(block_devices)}] is less than the number of drives [{len(drives)}]"
         )
-        device_names = set(v["Drive"] for v in block_devices.values())
+        device_names = set(block_devices.keys())
         drive_names = set(drives.keys())
         diff = (
             drive_names - device_names
@@ -362,11 +347,11 @@ def smart_metrics(env: EnvConfig) -> Generator[linux.Disk | darwin.Disk]:
     for drive, data in drives.items():
         if block_data := block_devices.get(drive):
             data["Partition"] = block_data
-            yield linux.Disk(id=drive, model=data.get("Info", {}).get("Model", ""), **data)
-        else:
-            raise ValueError(
-                f"{drive} not found in {drives.keys()}"
+            yield linux.Disk(
+                id=drive, model=data.get("Info", {}).get("Model", ""), **data
             )
+        else:
+            raise ValueError(f"{drive} not found in {drives.keys()}")
 
 
 def generate_html(
@@ -434,8 +419,6 @@ def generate_report(**kwargs) -> str:
     return report_file
 
 
-# todo: Remove monitoring features all together
-
 def monitor_disk(env: EnvConfig) -> Generator[linux.Disk]:
     """Monitors disk attributes based on the configuration.
 

pyudisk/models/__init__.py

@@ -3,15 +3,6 @@
 from pydantic import BaseModel, Field
 
 
-class Usage(BaseModel):
-    """Disk partition's usage information."""
-
-    Total: str
-    Used: str
-    Free: str
-    Percent: int | float
-
-
 class SystemPartitions(BaseModel):
     """System partitions' mountpoints and fstypes."""
 

pyudisk/models/darwin.py

@@ -2,8 +2,6 @@
 
 from pydantic import BaseModel
 
-from . import Usage
-
 
 class Message(BaseModel):
     """Log message with severity level.
@@ -470,8 +468,6 @@ class Disk(BaseModel):
     ata_smart_error_log: Optional[ATASummary] = None
     ata_smart_self_test_log: Optional[ATAStandard] = None
     ata_smart_selective_self_test_log: Optional[ATASmartSelectiveSelfTestLog] = None
-    # todo: Remove usage for macOS - usage should be mountpoint specific (if mounted)
-    usage: Optional[Usage] = None
     mountpoints: List[str] = None
 
     class Config:

pyudisk/models/linux.py

@@ -3,8 +3,6 @@
 
 from pydantic import BaseModel, field_validator
 
-from . import Usage
-
 try:
     from enum import StrEnum
 except ImportError: