perf(installomator): gracefully handle problematic labels (#28)

Author: liquidz00

src/patcher/cli.py

@@ -1,6 +1,7 @@
 import asyncio
 import inspect
 import sys
+import warnings
 from pathlib import Path
 from typing import Optional, Tuple, Union
 
@@ -16,7 +17,7 @@
 from .client.ui_manager import UIConfigManager
 from .utils.animation import Animation
 from .utils.data_manager import DataManager
-from .utils.exceptions import APIResponseError, PatcherError
+from .utils.exceptions import APIResponseError, InstallomatorWarning, PatcherError
 from .utils.logger import LogMe, PatcherLog
 
 DATE_FORMATS = {
@@ -30,8 +31,6 @@
 # Context settings to enable both ``-h`` and ``--help`` for help output
 CONTEXT_SETTINGS = dict(help_option_names=["-h", "--help"])
 
-sys.excepthook = PatcherLog.custom_excepthook  # Log unhandled exceptions
-
 
 def setup_logging(debug: bool) -> None:
     """Configures global logging based on the debug flag."""
@@ -85,6 +84,15 @@ def initialize_cache(cache_dir: Path) -> None:
         return
 
 
+def warning_format(message, category, filename, lineno, file=None, line=None):
+    return f"{category.__name__}: {message}\n"
+
+
+sys.excepthook = PatcherLog.custom_excepthook  # Log unhandled exceptions
+warnings.simplefilter("always", InstallomatorWarning)  # Show warnings in CLI
+warnings.formatwarning = warning_format
+
+
 # Entry
 @click.group(context_settings=CONTEXT_SETTINGS, options_metavar="<options>")
 @click.version_option(version=__version__)

src/patcher/models/label.py

@@ -1,6 +1,6 @@
 from typing import Any, Dict
 
-from pydantic import field_validator
+from pydantic import Field, field_validator
 
 from ..utils.exceptions import PatcherError
 from . import Model
@@ -39,7 +39,7 @@ class Label(Model):
 
     name: str
     type: str
-    expectedTeamID: str
+    expectedTeamID: str = Field(..., description="Expected Team ID (must be exactly 10 characters)")
     installomatorLabel: str  # fragmentName - ".sh"
     downloadURL: str
 
@@ -70,13 +70,25 @@ def __str__(self):
 
     @field_validator("type", mode="before")
     def validate_type(cls, v):
-        allowed_types = ["dmg", "pkg", "zip", "tbz", "pkgInDmg", "pkgInZip", "appInDmgInZip"]
+        allowed_types = [
+            "dmg",
+            "pkg",
+            "zip",
+            "tbz",
+            "pkgInDmg",
+            "pkgInZip",
+            "appInDmgInZip",
+            "appindmg",
+            "bz2",
+        ]
         if v not in allowed_types:
             raise PatcherError(f"Type must be one of {allowed_types}", type=v)
         return v
 
     @field_validator("expectedTeamID", mode="before")
     def validate_team_id(cls, v):
+        if v in "Software Update":
+            return v  # Apple software/tools
         if len(v) != 10:
             raise PatcherError("expectedTeamID must be a 10-character string", team_id=v)
         return v

src/patcher/utils/exceptions.py

@@ -48,3 +48,9 @@ class TokenError(PatcherError):
     """Raised when there is an error fetching, saving or retrieving a bearer token from Jamf API."""
 
     pass
+
+
+class InstallomatorWarning(Warning):
+    """Custom warning to indicate Installomator-related issues."""
+
+    pass

src/patcher/utils/installomator.py

@@ -2,6 +2,7 @@
 import fnmatch
 import json
 import re
+import warnings
 from pathlib import Path
 from typing import Any, Dict, List, Optional
 
@@ -13,9 +14,11 @@
 from ..models.fragment import Fragment
 from ..models.label import Label
 from ..models.patch import PatchTitle
-from .exceptions import APIResponseError, PatcherError, ShellCommandError
+from .exceptions import APIResponseError, InstallomatorWarning, PatcherError, ShellCommandError
 from .logger import LogMe
 
+IGNORED_TEAMS = ["Frydendal", "Media", "LL3KBL2M3A"]  # "LL3KBL2M3A" - lcadvancedvpnclient
+
 
 class Installomator:
     def __init__(self, concurrency: Optional[int] = 5):
@@ -149,20 +152,28 @@ async def _build_labels(self) -> List[Label]:
         for file_path in self.label_path.glob("*.sh"):
             content = file_path.read_text()
             fragment_dict = self._parse(content)
+
+            expected_team_id = fragment_dict.get("expectedTeamID")
+            if expected_team_id in IGNORED_TEAMS:
+                self.log.warning(
+                    f"Skipping label {file_path.stem} (ignored Team ID: {expected_team_id})"
+                )
+                warnings.warn(
+                    f"⚠️  Skipping {file_path.stem} due to ignored Team ID.",
+                    InstallomatorWarning,
+                )
+                continue  # skip this label entirely
+
             try:
                 label = Label.from_dict(
                     fragment_dict, installomatorLabel=file_path.stem.split(".")[0]
                 )
                 labels.append(label)
-            except ValueError as e:
-                raise PatcherError(
-                    "Failed to create Label object from fragment.",
-                    fragment=file_path.name,
-                    error_msg=str(e),
+            except ValidationError as e:
+                self.log.warning(
+                    f"Skipping invalid Installomator label: {file_path.name} due to validation error: {e}"
                 )
-
-        # Cache labels
-        self._labels = labels
+                continue  # Skip problematic label but continue
 
         return labels