fix(origin): return absolute icon path from SiloOrigin.icon()

The icon() method returned bare 'silo' which BitmapFactory could not
resolve. Return the absolute path to silo.svg so the C++ side can load
the icon directly.

freecad/dag.py

@@ -1,463 +0,0 @@
-"""DAG extraction engine for FreeCAD documents.
-
-Extracts the feature tree from a FreeCAD document as nodes and edges
-for syncing to the Silo server.  No GUI dependencies -- usable in both
-desktop and headless (``--console``) mode.
-
-Public API
-----------
-classify_type(type_id)          -> Optional[str]
-compute_properties_hash(obj)    -> str
-extract_dag(doc)                -> (nodes, edges)
-"""
-
-import hashlib
-import json
-import math
-from typing import Any, Dict, List, Optional, Set, Tuple
-
-# ---------------------------------------------------------------------------
-# TypeId -> DAG node type mapping
-# ---------------------------------------------------------------------------
-
-_TYPE_MAP: Dict[str, str] = {
-    # Sketch
-    "Sketcher::SketchObject": "sketch",
-    # Sketch-based additive
-    "PartDesign::Pad": "pad",
-    "PartDesign::Revolution": "pad",
-    "PartDesign::AdditivePipe": "pad",
-    "PartDesign::AdditiveLoft": "pad",
-    "PartDesign::AdditiveHelix": "pad",
-    # Sketch-based subtractive
-    "PartDesign::Pocket": "pocket",
-    "PartDesign::Groove": "pocket",
-    "PartDesign::Hole": "pocket",
-    "PartDesign::SubtractivePipe": "pocket",
-    "PartDesign::SubtractiveLoft": "pocket",
-    "PartDesign::SubtractiveHelix": "pocket",
-    # Dress-up
-    "PartDesign::Fillet": "fillet",
-    "PartDesign::Chamfer": "chamfer",
-    "PartDesign::Draft": "chamfer",
-    "PartDesign::Thickness": "chamfer",
-    # Transformations
-    "PartDesign::Mirrored": "pad",
-    "PartDesign::LinearPattern": "pad",
-    "PartDesign::PolarPattern": "pad",
-    "PartDesign::Scaled": "pad",
-    "PartDesign::MultiTransform": "pad",
-    # Boolean
-    "PartDesign::Boolean": "pad",
-    # Additive primitives
-    "PartDesign::AdditiveBox": "pad",
-    "PartDesign::AdditiveCylinder": "pad",
-    "PartDesign::AdditiveSphere": "pad",
-    "PartDesign::AdditiveCone": "pad",
-    "PartDesign::AdditiveEllipsoid": "pad",
-    "PartDesign::AdditiveTorus": "pad",
-    "PartDesign::AdditivePrism": "pad",
-    "PartDesign::AdditiveWedge": "pad",
-    # Subtractive primitives
-    "PartDesign::SubtractiveBox": "pocket",
-    "PartDesign::SubtractiveCylinder": "pocket",
-    "PartDesign::SubtractiveSphere": "pocket",
-    "PartDesign::SubtractiveCone": "pocket",
-    "PartDesign::SubtractiveEllipsoid": "pocket",
-    "PartDesign::SubtractiveTorus": "pocket",
-    "PartDesign::SubtractivePrism": "pocket",
-    "PartDesign::SubtractiveWedge": "pocket",
-    # Containers
-    "PartDesign::Body": "body",
-    "App::Part": "part",
-    "Part::Feature": "part",
-    # Datum / reference
-    "PartDesign::Point": "datum",
-    "PartDesign::Line": "datum",
-    "PartDesign::Plane": "datum",
-    "PartDesign::CoordinateSystem": "datum",
-    "PartDesign::ShapeBinder": "datum",
-    "PartDesign::SubShapeBinder": "datum",
-}
-
-
-def classify_type(type_id: str) -> Optional[str]:
-    """Map a FreeCAD TypeId string to a DAG node type.
-
-    Returns one of ``sketch``, ``pad``, ``pocket``, ``fillet``,
-    ``chamfer``, ``body``, ``part``, ``datum``, or ``None`` if the
-    TypeId is not a recognized feature.
-    """
-    return _TYPE_MAP.get(type_id)
-
-
-# ---------------------------------------------------------------------------
-# Properties hash
-# ---------------------------------------------------------------------------
-
-
-def _safe_float(val: Any) -> Any:
-    """Convert a float to a JSON-safe value, replacing NaN/Infinity with 0."""
-    if isinstance(val, float) and (math.isnan(val) or math.isinf(val)):
-        return 0.0
-    return val
-
-
-def _prop_value(obj: Any, name: str) -> Any:
-    """Safely read ``obj.<name>.Value``, returning *None* on failure."""
-    try:
-        return _safe_float(getattr(obj, name).Value)
-    except Exception:
-        return None
-
-
-def _prop_raw(obj: Any, name: str) -> Any:
-    """Safely read ``obj.<name>``, returning *None* on failure."""
-    try:
-        return getattr(obj, name)
-    except Exception:
-        return None
-
-
-def _link_name(obj: Any, name: str) -> Optional[str]:
-    """Return the ``.Name`` of a linked object property, or *None*."""
-    try:
-        link = getattr(obj, name)
-        if isinstance(link, (list, tuple)):
-            link = link[0]
-        return link.Name if link is not None else None
-    except Exception:
-        return None
-
-
-def _collect_inputs(obj: Any) -> Dict[str, Any]:
-    """Extract the parametric inputs that affect *obj*'s geometry.
-
-    The returned dict is JSON-serialized and hashed to produce the
-    ``properties_hash`` for the DAG node.
-    """
-    tid = obj.TypeId
-    inputs: Dict[str, Any] = {"_type": tid}
-
-    # --- Sketch ---
-    if tid == "Sketcher::SketchObject":
-        inputs["geometry_count"] = _prop_raw(obj, "GeometryCount")
-        inputs["constraint_count"] = _prop_raw(obj, "ConstraintCount")
-        try:
-            inputs["geometry"] = obj.Shape.exportBrepToString()
-        except Exception:
-            pass
-        return inputs
-
-    # --- Extrude (Pad / Pocket) ---
-    if tid in ("PartDesign::Pad", "PartDesign::Pocket"):
-        inputs["length"] = _prop_value(obj, "Length")
-        inputs["type"] = str(_prop_raw(obj, "Type") or "")
-        inputs["reversed"] = _prop_raw(obj, "Reversed")
-        inputs["sketch"] = _link_name(obj, "Profile")
-        return inputs
-
-    # --- Revolution / Groove ---
-    if tid in ("PartDesign::Revolution", "PartDesign::Groove"):
-        inputs["angle"] = _prop_value(obj, "Angle")
-        inputs["type"] = str(_prop_raw(obj, "Type") or "")
-        inputs["reversed"] = _prop_raw(obj, "Reversed")
-        inputs["sketch"] = _link_name(obj, "Profile")
-        return inputs
-
-    # --- Hole ---
-    if tid == "PartDesign::Hole":
-        inputs["diameter"] = _prop_value(obj, "Diameter")
-        inputs["depth"] = _prop_value(obj, "Depth")
-        inputs["threaded"] = _prop_raw(obj, "Threaded")
-        inputs["thread_type"] = str(_prop_raw(obj, "ThreadType") or "")
-        inputs["depth_type"] = str(_prop_raw(obj, "DepthType") or "")
-        inputs["sketch"] = _link_name(obj, "Profile")
-        return inputs
-
-    # --- Pipe / Loft / Helix (additive + subtractive) ---
-    if tid in (
-        "PartDesign::AdditivePipe",
-        "PartDesign::SubtractivePipe",
-        "PartDesign::AdditiveLoft",
-        "PartDesign::SubtractiveLoft",
-        "PartDesign::AdditiveHelix",
-        "PartDesign::SubtractiveHelix",
-    ):
-        inputs["sketch"] = _link_name(obj, "Profile")
-        inputs["spine"] = _link_name(obj, "Spine")
-        return inputs
-
-    # --- Fillet ---
-    if tid == "PartDesign::Fillet":
-        inputs["radius"] = _prop_value(obj, "Radius")
-        return inputs
-
-    # --- Chamfer ---
-    if tid == "PartDesign::Chamfer":
-        inputs["chamfer_type"] = str(_prop_raw(obj, "ChamferType") or "")
-        inputs["size"] = _prop_value(obj, "Size")
-        inputs["size2"] = _prop_value(obj, "Size2")
-        inputs["angle"] = _prop_value(obj, "Angle")
-        return inputs
-
-    # --- Draft ---
-    if tid == "PartDesign::Draft":
-        inputs["angle"] = _prop_value(obj, "Angle")
-        inputs["reversed"] = _prop_raw(obj, "Reversed")
-        return inputs
-
-    # --- Thickness ---
-    if tid == "PartDesign::Thickness":
-        inputs["value"] = _prop_value(obj, "Value")
-        inputs["reversed"] = _prop_raw(obj, "Reversed")
-        inputs["mode"] = str(_prop_raw(obj, "Mode") or "")
-        inputs["join"] = str(_prop_raw(obj, "Join") or "")
-        return inputs
-
-    # --- Mirrored ---
-    if tid == "PartDesign::Mirrored":
-        inputs["mirror_plane"] = _link_name(obj, "MirrorPlane")
-        return inputs
-
-    # --- LinearPattern ---
-    if tid == "PartDesign::LinearPattern":
-        inputs["direction"] = _link_name(obj, "Direction")
-        inputs["reversed"] = _prop_raw(obj, "Reversed")
-        inputs["length"] = _prop_value(obj, "Length")
-        inputs["occurrences"] = _prop_value(obj, "Occurrences")
-        return inputs
-
-    # --- PolarPattern ---
-    if tid == "PartDesign::PolarPattern":
-        inputs["axis"] = _link_name(obj, "Axis")
-        inputs["reversed"] = _prop_raw(obj, "Reversed")
-        inputs["angle"] = _prop_value(obj, "Angle")
-        inputs["occurrences"] = _prop_value(obj, "Occurrences")
-        return inputs
-
-    # --- Scaled ---
-    if tid == "PartDesign::Scaled":
-        inputs["factor"] = _prop_value(obj, "Factor")
-        inputs["occurrences"] = _prop_value(obj, "Occurrences")
-        return inputs
-
-    # --- MultiTransform ---
-    if tid == "PartDesign::MultiTransform":
-        try:
-            inputs["transform_count"] = len(obj.Transformations)
-        except Exception:
-            pass
-        return inputs
-
-    # --- Boolean ---
-    if tid == "PartDesign::Boolean":
-        inputs["type"] = str(_prop_raw(obj, "Type") or "")
-        return inputs
-
-    # --- Primitives (additive) ---
-    if tid in (
-        "PartDesign::AdditiveBox",
-        "PartDesign::SubtractiveBox",
-    ):
-        inputs["length"] = _prop_value(obj, "Length")
-        inputs["width"] = _prop_value(obj, "Width")
-        inputs["height"] = _prop_value(obj, "Height")
-        return inputs
-
-    if tid in (
-        "PartDesign::AdditiveCylinder",
-        "PartDesign::SubtractiveCylinder",
-    ):
-        inputs["radius"] = _prop_value(obj, "Radius")
-        inputs["height"] = _prop_value(obj, "Height")
-        inputs["angle"] = _prop_value(obj, "Angle")
-        return inputs
-
-    if tid in (
-        "PartDesign::AdditiveSphere",
-        "PartDesign::SubtractiveSphere",
-    ):
-        inputs["radius"] = _prop_value(obj, "Radius")
-        return inputs
-
-    if tid in (
-        "PartDesign::AdditiveCone",
-        "PartDesign::SubtractiveCone",
-    ):
-        inputs["radius1"] = _prop_value(obj, "Radius1")
-        inputs["radius2"] = _prop_value(obj, "Radius2")
-        inputs["height"] = _prop_value(obj, "Height")
-        return inputs
-
-    if tid in (
-        "PartDesign::AdditiveEllipsoid",
-        "PartDesign::SubtractiveEllipsoid",
-    ):
-        inputs["radius1"] = _prop_value(obj, "Radius1")
-        inputs["radius2"] = _prop_value(obj, "Radius2")
-        inputs["radius3"] = _prop_value(obj, "Radius3")
-        return inputs
-
-    if tid in (
-        "PartDesign::AdditiveTorus",
-        "PartDesign::SubtractiveTorus",
-    ):
-        inputs["radius1"] = _prop_value(obj, "Radius1")
-        inputs["radius2"] = _prop_value(obj, "Radius2")
-        return inputs
-
-    if tid in (
-        "PartDesign::AdditivePrism",
-        "PartDesign::SubtractivePrism",
-    ):
-        inputs["polygon"] = _prop_raw(obj, "Polygon")
-        inputs["circumradius"] = _prop_value(obj, "Circumradius")
-        inputs["height"] = _prop_value(obj, "Height")
-        return inputs
-
-    if tid in (
-        "PartDesign::AdditiveWedge",
-        "PartDesign::SubtractiveWedge",
-    ):
-        for dim in (
-            "Xmin",
-            "Ymin",
-            "Zmin",
-            "X2min",
-            "Z2min",
-            "Xmax",
-            "Ymax",
-            "Zmax",
-            "X2max",
-            "Z2max",
-        ):
-            inputs[dim.lower()] = _prop_value(obj, dim)
-        return inputs
-
-    # --- Datum / ShapeBinder ---
-    if tid in (
-        "PartDesign::Point",
-        "PartDesign::Line",
-        "PartDesign::Plane",
-        "PartDesign::CoordinateSystem",
-        "PartDesign::ShapeBinder",
-        "PartDesign::SubShapeBinder",
-    ):
-        try:
-            p = obj.Placement
-            inputs["position"] = {
-                "x": _safe_float(p.Base.x),
-                "y": _safe_float(p.Base.y),
-                "z": _safe_float(p.Base.z),
-            }
-            inputs["rotation"] = {
-                "axis_x": _safe_float(p.Rotation.Axis.x),
-                "axis_y": _safe_float(p.Rotation.Axis.y),
-                "axis_z": _safe_float(p.Rotation.Axis.z),
-                "angle": _safe_float(p.Rotation.Angle),
-            }
-        except Exception:
-            pass
-        return inputs
-
-    # --- Body / Part (containers) ---
-    if tid in ("PartDesign::Body", "App::Part", "Part::Feature"):
-        try:
-            inputs["child_count"] = len(obj.Group)
-        except Exception:
-            inputs["child_count"] = 0
-        return inputs
-
-    # --- Fallback ---
-    inputs["label"] = obj.Label
-    return inputs
-
-
-def compute_properties_hash(obj: Any) -> str:
-    """Return a SHA-256 hex digest of *obj*'s parametric inputs.
-
-    The hash is used for memoization -- if a node's inputs haven't
-    changed since the last validation run, re-validation can be skipped.
-    """
-    inputs = _collect_inputs(obj)
-    canonical = json.dumps(inputs, sort_keys=True, default=str)
-    return hashlib.sha256(canonical.encode()).hexdigest()
-
-
-# ---------------------------------------------------------------------------
-# DAG extraction
-# ---------------------------------------------------------------------------
-
-
-def extract_dag(
-    doc: Any,
-) -> Tuple[List[Dict[str, Any]], List[Dict[str, Any]]]:
-    """Walk a FreeCAD document and return ``(nodes, edges)``.
-
-    *nodes* is a list of dicts matching the Silo ``PUT /dag`` payload
-    schema.  *edges* connects dependencies (source) to dependents
-    (target).
-
-    Only objects whose TypeId is recognized by :func:`classify_type`
-    are included.  Edges are limited to pairs where **both** endpoints
-    are included, preventing dangling references to internal objects
-    such as ``App::Origin``.
-    """
-    # Pass 1 -- identify included objects
-    included: Set[str] = set()
-    classified: Dict[str, str] = {}  # obj.Name -> node_type
-
-    for obj in doc.Objects:
-        if not hasattr(obj, "TypeId"):
-            continue
-        node_type = classify_type(obj.TypeId)
-        if node_type is not None:
-            included.add(obj.Name)
-            classified[obj.Name] = node_type
-
-    # Pass 2 -- build nodes and edges
-    nodes: List[Dict[str, Any]] = []
-    edges: List[Dict[str, Any]] = []
-    seen_edges: Set[Tuple[str, str]] = set()
-
-    for obj in doc.Objects:
-        if obj.Name not in included:
-            continue
-
-        nodes.append(
-            {
-                "node_key": obj.Name,
-                "node_type": classified[obj.Name],
-                "properties_hash": compute_properties_hash(obj),
-                "metadata": {
-                    "label": obj.Label,
-                    "type_id": obj.TypeId,
-                },
-            }
-        )
-
-        # Walk dependencies: OutList contains objects this one depends on
-        try:
-            out_list = obj.OutList
-        except Exception:
-            continue
-
-        for dep in out_list:
-            if not hasattr(dep, "Name"):
-                continue
-            if dep.Name not in included:
-                continue
-            edge_key = (dep.Name, obj.Name)
-            if edge_key in seen_edges:
-                continue
-            seen_edges.add(edge_key)
-            edges.append(
-                {
-                    "source_key": dep.Name,
-                    "target_key": obj.Name,
-                    "edge_type": "depends_on",
-                }
-            )
-
-    return nodes, edges

freecad/silo_commands.py

@@ -26,9 +26,7 @@ from silo_client import (
 _PREF_GROUP = "User parameter:BaseApp/Preferences/Mod/KindredSilo"
 
 # Configuration - preferences take priority over env vars
-SILO_PROJECTS_DIR = os.environ.get(
-    "SILO_PROJECTS_DIR", os.path.expanduser("~/projects")
-)
+SILO_PROJECTS_DIR = os.environ.get("SILO_PROJECTS_DIR", os.path.expanduser("~/projects"))
 
 
 # ---------------------------------------------------------------------------
@@ -66,9 +64,7 @@ class FreeCADSiloSettings(SiloSettings):
         param = FreeCAD.ParamGet(_PREF_GROUP)
         return param.GetString("SslCertPath", "")
 
-    def save_auth(
-        self, username: str, role: str = "", source: str = "", token: str = ""
-    ):
+    def save_auth(self, username: str, role: str = "", source: str = "", token: str = ""):
         param = FreeCAD.ParamGet(_PREF_GROUP)
         param.SetString("AuthUsername", username)
         param.SetString("AuthRole", role)
@@ -126,9 +122,7 @@ def _get_ssl_verify() -> bool:
 def _get_ssl_context():
     from silo_client._ssl import build_ssl_context
 
-    return build_ssl_context(
-        _fc_settings.get_ssl_verify(), _fc_settings.get_ssl_cert_path()
-    )
+    return build_ssl_context(_fc_settings.get_ssl_verify(), _fc_settings.get_ssl_cert_path())
 
 
 def _get_auth_headers() -> Dict[str, str]:
@@ -185,9 +179,7 @@ def _fetch_server_mode() -> str:
 # Icon helper
 # ---------------------------------------------------------------------------
 
-_ICON_DIR = os.path.join(
-    os.path.dirname(os.path.abspath(__file__)), "resources", "icons"
-)
+_ICON_DIR = os.path.join(os.path.dirname(os.path.abspath(__file__)), "resources", "icons")
 
 
 def _icon(name):
@@ -214,43 +206,39 @@ def get_projects_dir() -> Path:
 def get_cad_file_path(part_number: str, description: str = "") -> Path:
     """Generate canonical file path for a CAD file.
 
-    Path format: ~/projects/cad/{category_code}_{category_name}/{part_number}_{description}.kc
+    Path format: ~/projects/cad/{category_code}_{category_name}/{part_number}_{description}.FCStd
     """
     category, _ = parse_part_number(part_number)
     folder_name = get_category_folder_name(category)
 
     if description:
-        filename = f"{part_number}_{sanitize_filename(description)}.kc"
+        filename = f"{part_number}_{sanitize_filename(description)}.FCStd"
     else:
-        filename = f"{part_number}.kc"
+        filename = f"{part_number}.FCStd"
 
     return get_projects_dir() / "cad" / folder_name / filename
 
 
 def find_file_by_part_number(part_number: str) -> Optional[Path]:
-    """Find existing CAD file for a part number. Prefers .kc over .FCStd."""
+    """Find existing CAD file for a part number."""
     category, _ = parse_part_number(part_number)
     folder_name = get_category_folder_name(category)
     cad_dir = get_projects_dir() / "cad" / folder_name
 
-    for search_dir in _search_dirs(cad_dir):
-        for ext in ("*.kc", "*.FCStd"):
-            matches = list(search_dir.glob(f"{part_number}{ext[1:]}"))
-            if matches:
-                return matches[0]
+    if cad_dir.exists():
+        matches = list(cad_dir.glob(f"{part_number}*.FCStd"))
+        if matches:
+            return matches[0]
 
-    return None
-
-
-def _search_dirs(category_dir: Path):
-    """Yield the category dir, then all sibling dirs under cad/."""
-    if category_dir.exists():
-        yield category_dir
-    base_cad_dir = category_dir.parent
+    base_cad_dir = get_projects_dir() / "cad"
     if base_cad_dir.exists():
         for subdir in base_cad_dir.iterdir():
-            if subdir.is_dir() and subdir != category_dir:
-                yield subdir
+            if subdir.is_dir():
+                matches = list(subdir.glob(f"{part_number}*.FCStd"))
+                if matches:
+                    return matches[0]
+
+    return None
 
 
 def search_local_files(search_term: str = "", category_filter: str = "") -> list:
@@ -272,9 +260,7 @@ def search_local_files(search_term: str = "", category_filter: str = "") -> list
         if category_filter and category_code.upper() != category_filter.upper():
             continue
 
-        for fcstd_file in sorted(
-            list(category_dir.glob("*.kc")) + list(category_dir.glob("*.FCStd"))
-        ):
+        for fcstd_file in category_dir.glob("*.FCStd"):
             filename = fcstd_file.stem
             parts = filename.split("_", 1)
             part_number = parts[0]
@@ -588,9 +574,7 @@ def handle_kindred_url(url: str):
     parts = [parsed.netloc] + [p for p in parsed.path.split("/") if p]
     if len(parts) >= 2 and parts[0] == "item":
         part_number = parts[1]
-        FreeCAD.Console.PrintMessage(
-            f"Silo: Opening item {part_number} from kindred:// URL\n"
-        )
+        FreeCAD.Console.PrintMessage(f"Silo: Opening item {part_number} from kindred:// URL\n")
         _sync.open_item(part_number)
 
 
@@ -610,9 +594,10 @@ class Silo_Open:
         }
 
     def Activated(self):
-        from open_search import OpenItemWidget
         from PySide import QtGui, QtWidgets
 
+        from open_search import OpenItemWidget
+
         mw = FreeCADGui.getMainWindow()
         mdi = mw.findChild(QtWidgets.QMdiArea)
         if not mdi:
@@ -658,6 +643,7 @@ class Silo_New:
 
     def Activated(self):
         from PySide import QtGui, QtWidgets
+
         from schema_form import SchemaFormWidget
 
         mw = FreeCADGui.getMainWindow()
@@ -697,9 +683,7 @@ class Silo_New:
                         },
                     )
                     obj.Label = part_number
-                    _sync.save_to_canonical_path(
-                        FreeCAD.ActiveDocument, force_rename=True
-                    )
+                    _sync.save_to_canonical_path(FreeCAD.ActiveDocument, force_rename=True)
                 else:
                     _sync.create_document_for_item(result, save=True)
 
@@ -780,9 +764,7 @@ class Silo_Save:
 
         # Try to upload to MinIO
         try:
-            result = _client._upload_file(
-                part_number, str(file_path), properties, "Auto-save"
-            )
+            result = _client._upload_file(part_number, str(file_path), properties, "Auto-save")
 
             new_rev = result["revision_number"]
             FreeCAD.Console.PrintMessage(f"Uploaded as revision {new_rev}\n")
@@ -815,9 +797,7 @@ class Silo_Commit:
 
         obj = get_tracked_object(doc)
         if not obj:
-            FreeCAD.Console.PrintError(
-                "No tracked object. Use 'New' to register first.\n"
-            )
+            FreeCAD.Console.PrintError("No tracked object. Use 'New' to register first.\n")
             return
 
         part_number = obj.SiloPartNumber
@@ -834,9 +814,7 @@ class Silo_Commit:
             if not file_path:
                 return
 
-            result = _client._upload_file(
-                part_number, str(file_path), properties, comment
-            )
+            result = _client._upload_file(part_number, str(file_path), properties, comment)
 
             new_rev = result["revision_number"]
             FreeCAD.Console.PrintMessage(f"Committed revision {new_rev}: {comment}\n")
@@ -885,9 +863,7 @@ def _check_pull_conflicts(part_number, local_path, doc=None):
             server_updated = item.get("updated_at", "")
             if server_updated:
                 # Parse ISO format timestamp
-                server_dt = datetime.datetime.fromisoformat(
-                    server_updated.replace("Z", "+00:00")
-                )
+                server_dt = datetime.datetime.fromisoformat(server_updated.replace("Z", "+00:00"))
                 if server_dt > local_mtime:
                     conflicts.append("Server version is newer than local file.")
         except Exception:
@@ -917,9 +893,7 @@ class SiloPullDialog:
         # Revision table
         self._table = QtGui.QTableWidget()
         self._table.setColumnCount(5)
-        self._table.setHorizontalHeaderLabels(
-            ["Rev", "Date", "Comment", "Status", "File"]
-        )
+        self._table.setHorizontalHeaderLabels(["Rev", "Date", "Comment", "Status", "File"])
         self._table.setSelectionBehavior(QtGui.QAbstractItemView.SelectRows)
         self._table.setSelectionMode(QtGui.QAbstractItemView.SingleSelection)
         self._table.setEditTriggers(QtGui.QAbstractItemView.NoEditTriggers)
@@ -991,67 +965,6 @@ class SiloPullDialog:
         return None
 
 
-def _pull_dependencies(part_number, progress_callback=None):
-    """Recursively pull all BOM children that have files on the server.
-
-    Returns list of (part_number, dest_path) tuples for successfully pulled files.
-    Skips children that already exist locally.
-    """
-    pulled = []
-    try:
-        bom = _client.get_bom(part_number)
-    except Exception as e:
-        FreeCAD.Console.PrintWarning(f"Could not fetch BOM for {part_number}: {e}\n")
-        return pulled
-
-    for entry in bom:
-        child_pn = entry.get("child_part_number")
-        if not child_pn:
-            continue
-
-        # Skip if already exists locally
-        existing = find_file_by_part_number(child_pn)
-        if existing and existing.exists():
-            FreeCAD.Console.PrintMessage(
-                f"  {child_pn}: already exists at {existing}\n"
-            )
-            # Still recurse — this child may itself be an assembly with missing deps
-            _pull_dependencies(child_pn, progress_callback)
-            continue
-
-        # Check if this child has a file on the server
-        try:
-            latest = _client.latest_file_revision(child_pn)
-        except Exception:
-            latest = None
-
-        if not latest or not latest.get("file_key"):
-            FreeCAD.Console.PrintMessage(f"  {child_pn}: no file on server, skipping\n")
-            continue
-
-        # Determine destination path
-        child_desc = entry.get("child_description", "")
-        dest_path = get_cad_file_path(child_pn, child_desc)
-        dest_path.parent.mkdir(parents=True, exist_ok=True)
-
-        rev_num = latest["revision_number"]
-        FreeCAD.Console.PrintMessage(f"  Pulling {child_pn} rev {rev_num}...\n")
-
-        try:
-            ok = _client._download_file(
-                child_pn, rev_num, str(dest_path), progress_callback=progress_callback
-            )
-            if ok:
-                pulled.append((child_pn, dest_path))
-        except Exception as e:
-            FreeCAD.Console.PrintWarning(f"  Failed to pull {child_pn}: {e}\n")
-
-        # Recurse into child (it may be a sub-assembly)
-        _pull_dependencies(child_pn, progress_callback)
-
-    return pulled
-
-
 class Silo_Pull:
     """Download from MinIO / sync from database."""
 
@@ -1094,18 +1007,14 @@ class Silo_Pull:
 
         if not has_any_file:
             if existing_local:
-                FreeCAD.Console.PrintMessage(
-                    f"Opening existing local file: {existing_local}\n"
-                )
+                FreeCAD.Console.PrintMessage(f"Opening existing local file: {existing_local}\n")
                 FreeCAD.openDocument(str(existing_local))
             else:
                 try:
                     item = _client.get_item(part_number)
                     new_doc = _sync.create_document_for_item(item, save=True)
                     if new_doc:
-                        FreeCAD.Console.PrintMessage(
-                            f"Created local file for {part_number}\n"
-                        )
+                        FreeCAD.Console.PrintMessage(f"Created local file for {part_number}\n")
                     else:
                         QtGui.QMessageBox.warning(
                             None,
@@ -1183,19 +1092,6 @@ class Silo_Pull:
 
         FreeCAD.Console.PrintMessage(f"Pulled revision {rev_num} of {part_number}\n")
 
-        # Pull assembly dependencies before opening so links resolve
-        if item.get("item_type") == "assembly":
-            progress.setLabelText(f"Pulling dependencies for {part_number}...")
-            progress.setValue(0)
-            progress.show()
-            dep_pulled = _pull_dependencies(part_number, progress_callback=on_progress)
-            progress.setValue(100)
-            progress.close()
-            if dep_pulled:
-                FreeCAD.Console.PrintMessage(
-                    f"Pulled {len(dep_pulled)} dependency file(s)\n"
-                )
-
         # Close existing document if open, then reopen
         if doc and doc.FileName == str(dest_path):
             FreeCAD.closeDocument(doc.Name)
@@ -1249,9 +1145,7 @@ class Silo_Push:
                             server_dt = datetime.fromisoformat(
                                 server_time_str.replace("Z", "+00:00")
                             )
-                            local_dt = datetime.fromtimestamp(
-                                local_mtime, tz=timezone.utc
-                            )
+                            local_dt = datetime.fromtimestamp(local_mtime, tz=timezone.utc)
                             if local_dt > server_dt:
                                 unuploaded.append(lf)
                         else:
@@ -1264,9 +1158,7 @@ class Silo_Push:
                 pass  # Not in DB, skip
 
         if not unuploaded:
-            QtGui.QMessageBox.information(
-                None, "Push", "All local files are already uploaded."
-            )
+            QtGui.QMessageBox.information(None, "Push", "All local files are already uploaded.")
             return
 
         msg = f"Found {len(unuploaded)} files to upload:\n\n"
@@ -1284,9 +1176,7 @@ class Silo_Push:
 
         uploaded = 0
         for item in unuploaded:
-            result = _sync.upload_file(
-                item["part_number"], item["path"], "Synced from local"
-            )
+            result = _sync.upload_file(item["part_number"], item["path"], "Synced from local")
             if result:
                 uploaded += 1
 
@@ -1335,7 +1225,9 @@ class Silo_Info:
             msg = f"<h3>{part_number}</h3>"
             msg += f"<p><b>Type:</b> {item.get('item_type', '-')}</p>"
             msg += f"<p><b>Description:</b> {item.get('description', '-')}</p>"
-            msg += f"<p><b>Projects:</b> {', '.join(project_codes) if project_codes else 'None'}</p>"
+            msg += (
+                f"<p><b>Projects:</b> {', '.join(project_codes) if project_codes else 'None'}</p>"
+            )
             msg += f"<p><b>Current Revision:</b> {item.get('current_revision', 1)}</p>"
             msg += f"<p><b>Local Revision:</b> {getattr(obj, 'SiloRevision', '-')}</p>"
 
@@ -1401,9 +1293,7 @@ class Silo_TagProjects:
         try:
             # Get current projects for item
             current_projects = _client.get_item_projects(part_number)
-            current_codes = {
-                p.get("code", "") for p in current_projects if p.get("code")
-            }
+            current_codes = {p.get("code", "") for p in current_projects if p.get("code")}
 
             # Get all available projects
             all_projects = _client.get_projects()
@@ -1514,9 +1404,7 @@ class Silo_Rollback:
             dialog.setMinimumHeight(300)
             layout = QtGui.QVBoxLayout(dialog)
 
-            label = QtGui.QLabel(
-                f"Select a revision to rollback to (current: Rev {current_rev}):"
-            )
+            label = QtGui.QLabel(f"Select a revision to rollback to (current: Rev {current_rev}):")
             layout.addWidget(label)
 
             # Revision table
@@ -1531,12 +1419,8 @@ class Silo_Rollback:
             for i, rev in enumerate(prev_revisions):
                 table.setItem(i, 0, QtGui.QTableWidgetItem(str(rev["revision_number"])))
                 table.setItem(i, 1, QtGui.QTableWidgetItem(rev.get("status", "draft")))
-                table.setItem(
-                    i, 2, QtGui.QTableWidgetItem(rev.get("created_at", "")[:10])
-                )
-                table.setItem(
-                    i, 3, QtGui.QTableWidgetItem(rev.get("comment", "") or "")
-                )
+                table.setItem(i, 2, QtGui.QTableWidgetItem(rev.get("created_at", "")[:10]))
+                table.setItem(i, 3, QtGui.QTableWidgetItem(rev.get("comment", "") or ""))
 
             table.resizeColumnsToContents()
             layout.addWidget(table)
@@ -1562,9 +1446,7 @@ class Silo_Rollback:
             def on_rollback():
                 selected = table.selectedItems()
                 if not selected:
-                    QtGui.QMessageBox.warning(
-                        dialog, "Rollback", "Please select a revision"
-                    )
+                    QtGui.QMessageBox.warning(dialog, "Rollback", "Please select a revision")
                     return
                 selected_rev[0] = int(table.item(selected[0].row(), 0).text())
                 dialog.accept()
@@ -1662,9 +1544,7 @@ class Silo_SetStatus:
             # Update status
             _client.update_revision(part_number, rev_num, status=status)
 
-            FreeCAD.Console.PrintMessage(
-                f"Updated Rev {rev_num} status to '{status}'\n"
-            )
+            FreeCAD.Console.PrintMessage(f"Updated Rev {rev_num} status to '{status}'\n")
             QtGui.QMessageBox.information(
                 None, "Status Updated", f"Revision {rev_num} status set to '{status}'"
             )
@@ -1728,9 +1608,7 @@ class Silo_Settings:
         ssl_checkbox.setChecked(param.GetBool("SslVerify", True))
         layout.addWidget(ssl_checkbox)
 
-        ssl_hint = QtGui.QLabel(
-            "Disable only for internal servers with self-signed certificates."
-        )
+        ssl_hint = QtGui.QLabel("Disable only for internal servers with self-signed certificates.")
         ssl_hint.setWordWrap(True)
         ssl_hint.setStyleSheet("color: #888; font-size: 11px;")
         layout.addWidget(ssl_hint)
@@ -1763,7 +1641,7 @@ class Silo_Settings:
             path, _ = QtGui.QFileDialog.getOpenFileName(
                 dialog,
                 "Select CA Certificate",
-                os.path.dirname(cert_input.text()) or os.path.expanduser("~"),
+                os.path.dirname(cert_input.text()) or "/etc/ssl/certs",
                 "Certificates (*.pem *.crt *.cer);;All Files (*)",
             )
             if path:
@@ -2007,9 +1885,7 @@ class Silo_BOM:
 
         wu_table = QtGui.QTableWidget()
         wu_table.setColumnCount(5)
-        wu_table.setHorizontalHeaderLabels(
-            ["Parent Part Number", "Type", "Qty", "Unit", "Ref Des"]
-        )
+        wu_table.setHorizontalHeaderLabels(["Parent Part Number", "Type", "Qty", "Unit", "Ref Des"])
         wu_table.setSelectionBehavior(QtGui.QAbstractItemView.SelectRows)
         wu_table.setSelectionMode(QtGui.QAbstractItemView.SingleSelection)
         wu_table.setEditTriggers(QtGui.QAbstractItemView.NoEditTriggers)
@@ -2038,16 +1914,12 @@ class Silo_BOM:
                 bom_table.setItem(
                     row, 1, QtGui.QTableWidgetItem(entry.get("child_description", ""))
                 )
-                bom_table.setItem(
-                    row, 2, QtGui.QTableWidgetItem(entry.get("rel_type", ""))
-                )
+                bom_table.setItem(row, 2, QtGui.QTableWidgetItem(entry.get("rel_type", "")))
                 qty = entry.get("quantity")
                 bom_table.setItem(
                     row, 3, QtGui.QTableWidgetItem(str(qty) if qty is not None else "")
                 )
-                bom_table.setItem(
-                    row, 4, QtGui.QTableWidgetItem(entry.get("unit") or "")
-                )
+                bom_table.setItem(row, 4, QtGui.QTableWidgetItem(entry.get("unit") or ""))
                 ref_des = entry.get("reference_designators") or []
                 bom_table.setItem(row, 5, QtGui.QTableWidgetItem(", ".join(ref_des)))
                 bom_table.setItem(
@@ -2069,16 +1941,12 @@ class Silo_BOM:
                 wu_table.setItem(
                     row, 0, QtGui.QTableWidgetItem(entry.get("parent_part_number", ""))
                 )
-                wu_table.setItem(
-                    row, 1, QtGui.QTableWidgetItem(entry.get("rel_type", ""))
-                )
+                wu_table.setItem(row, 1, QtGui.QTableWidgetItem(entry.get("rel_type", "")))
                 qty = entry.get("quantity")
                 wu_table.setItem(
                     row, 2, QtGui.QTableWidgetItem(str(qty) if qty is not None else "")
                 )
-                wu_table.setItem(
-                    row, 3, QtGui.QTableWidgetItem(entry.get("unit") or "")
-                )
+                wu_table.setItem(row, 3, QtGui.QTableWidgetItem(entry.get("unit") or ""))
                 ref_des = entry.get("reference_designators") or []
                 wu_table.setItem(row, 4, QtGui.QTableWidgetItem(", ".join(ref_des)))
             wu_table.resizeColumnsToContents()
@@ -2131,9 +1999,7 @@ class Silo_BOM:
                 try:
                     qty = float(qty_text)
                 except ValueError:
-                    QtGui.QMessageBox.warning(
-                        dialog, "BOM", "Quantity must be a number."
-                    )
+                    QtGui.QMessageBox.warning(dialog, "BOM", "Quantity must be a number.")
                     return
 
             unit = unit_input.text().strip() or None
@@ -2212,9 +2078,7 @@ class Silo_BOM:
                 try:
                     new_qty = float(qty_text)
                 except ValueError:
-                    QtGui.QMessageBox.warning(
-                        dialog, "BOM", "Quantity must be a number."
-                    )
+                    QtGui.QMessageBox.warning(dialog, "BOM", "Quantity must be a number.")
                     return
 
             new_unit = unit_input.text().strip() or None
@@ -2238,9 +2102,7 @@ class Silo_BOM:
                 )
                 load_bom()
             except Exception as exc:
-                QtGui.QMessageBox.warning(
-                    dialog, "BOM", f"Failed to update entry:\n{exc}"
-                )
+                QtGui.QMessageBox.warning(dialog, "BOM", f"Failed to update entry:\n{exc}")
 
         def on_remove():
             selected = bom_table.selectedItems()
@@ -2266,9 +2128,7 @@ class Silo_BOM:
                 _client.delete_bom_entry(part_number, child_pn)
                 load_bom()
             except Exception as exc:
-                QtGui.QMessageBox.warning(
-                    dialog, "BOM", f"Failed to remove entry:\n{exc}"
-                )
+                QtGui.QMessageBox.warning(dialog, "BOM", f"Failed to remove entry:\n{exc}")
 
         add_btn.clicked.connect(on_add)
         edit_btn.clicked.connect(on_edit)
@@ -2307,9 +2167,7 @@ class SiloEventListener(QtCore.QThread):
 
     item_updated = QtCore.Signal(str)  # part_number
     revision_created = QtCore.Signal(str, int)  # part_number, revision
-    connection_status = QtCore.Signal(
-        str, int, str
-    )  # (status, retry_count, error_message)
+    connection_status = QtCore.Signal(str, int, str)  # (status, retry_count, error_message)
     server_mode_changed = QtCore.Signal(str)  # "normal" / "read-only" / "degraded"
 
     _MAX_RETRIES = 10
@@ -2383,9 +2241,7 @@ class SiloEventListener(QtCore.QThread):
         req = urllib.request.Request(url, headers=headers, method="GET")
 
         try:
-            self._response = urllib.request.urlopen(
-                req, context=_get_ssl_context(), timeout=90
-            )
+            self._response = urllib.request.urlopen(req, context=_get_ssl_context(), timeout=90)
         except urllib.error.HTTPError as e:
             if e.code in (404, 501):
                 raise _SSEUnsupported()
@@ -2666,9 +2522,7 @@ class SiloAuthDockWidget:
             self._sse_label.setToolTip("")
             FreeCAD.Console.PrintMessage("Silo: SSE connected\n")
         elif status == "disconnected":
-            self._sse_label.setText(
-                f"Reconnecting ({retry}/{SiloEventListener._MAX_RETRIES})..."
-            )
+            self._sse_label.setText(f"Reconnecting ({retry}/{SiloEventListener._MAX_RETRIES})...")
             self._sse_label.setStyleSheet("font-size: 11px; color: #FF9800;")
             self._sse_label.setToolTip(error or "Connection lost")
             FreeCAD.Console.PrintWarning(
@@ -2678,9 +2532,7 @@ class SiloAuthDockWidget:
             self._sse_label.setText("Disconnected")
             self._sse_label.setStyleSheet("font-size: 11px; color: #F44336;")
             self._sse_label.setToolTip(error or "Max retries reached")
-            FreeCAD.Console.PrintError(
-                f"Silo: SSE gave up after {retry} retries: {error}\n"
-            )
+            FreeCAD.Console.PrintError(f"Silo: SSE gave up after {retry} retries: {error}\n")
         elif status == "unsupported":
             self._sse_label.setText("Not available")
             self._sse_label.setStyleSheet("font-size: 11px; color: #888;")
@@ -2722,14 +2574,10 @@ class SiloAuthDockWidget:
         self._refresh_activity_panel()
 
     def _on_remote_revision(self, part_number, revision):
-        FreeCAD.Console.PrintMessage(
-            f"Silo: New revision {revision} for {part_number}\n"
-        )
+        FreeCAD.Console.PrintMessage(f"Silo: New revision {revision} for {part_number}\n")
         mw = FreeCADGui.getMainWindow()
         if mw is not None:
-            mw.statusBar().showMessage(
-                f"Silo: {part_number} rev {revision} available", 5000
-            )
+            mw.statusBar().showMessage(f"Silo: {part_number} rev {revision} available", 5000)
         self._refresh_activity_panel()
 
     def _refresh_activity_panel(self):
@@ -2795,9 +2643,7 @@ class SiloAuthDockWidget:
                     rev_part = f" \u2013 Rev {rev_num}" if rev_num else ""
                     date_part = f" \u2013 {updated}" if updated else ""
                     local_badge = " \u25cf local" if pn in local_pns else ""
-                    line1 = (
-                        f"{pn} \u2013 {desc_display}{rev_part}{date_part}{local_badge}"
-                    )
+                    line1 = f"{pn} \u2013 {desc_display}{rev_part}{date_part}{local_badge}"
 
                     if comment:
                         line1 += f'\n  "{comment}"'
@@ -3253,9 +3099,7 @@ class Silo_StartPanel:
         dock = QtGui.QDockWidget("Silo", mw)
         dock.setObjectName("SiloStartPanel")
         dock.setWidget(content.widget)
-        dock.setAllowedAreas(
-            QtCore.Qt.LeftDockWidgetArea | QtCore.Qt.RightDockWidgetArea
-        )
+        dock.setAllowedAreas(QtCore.Qt.LeftDockWidgetArea | QtCore.Qt.RightDockWidgetArea)
         mw.addDockWidget(QtCore.Qt.LeftDockWidgetArea, dock)
 
     def IsActive(self):
@@ -3289,9 +3133,7 @@ class _DiagWorker(QtCore.QThread):
             self.result.emit("DNS", False, "no hostname in URL")
             return
         try:
-            addrs = socket.getaddrinfo(
-                hostname, None, socket.AF_UNSPEC, socket.SOCK_STREAM
-            )
+            addrs = socket.getaddrinfo(hostname, None, socket.AF_UNSPEC, socket.SOCK_STREAM)
             first_ip = addrs[0][4][0] if addrs else "?"
             self.result.emit("DNS", True, f"{hostname} -> {first_ip}")
         except socket.gaierror as e:

freecad/silo_origin.py

@@ -9,6 +9,8 @@ delegating operations to the established Silo infrastructure while
 providing the standardized origin interface.
 """
 
+import os
+
 import FreeCAD
 import FreeCADGui
 from silo_commands import (
@@ -61,8 +63,10 @@ class SiloOrigin:
         return self._nickname
 
     def icon(self) -> str:
-        """Return icon name for BitmapFactory."""
-        return "silo"
+        """Return icon path for BitmapFactory."""
+        return os.path.join(
+            os.path.dirname(os.path.abspath(__file__)), "resources", "icons", "silo.svg"
+        )
 
     def type(self) -> int:
         """Return origin type (OriginType.PLM = 1)."""
@@ -388,9 +392,7 @@ class SiloOrigin:
 
             # Upload to Silo
             properties = collect_document_properties(doc)
-            _client._upload_file(
-                obj.SiloPartNumber, str(file_path), properties, comment=""
-            )
+            _client._upload_file(obj.SiloPartNumber, str(file_path), properties, comment="")
 
             # Clear modified flag (Modified is on Gui.Document, not App.Document)
             gui_doc = FreeCADGui.getDocument(doc.Name)