Merge pull request 'chore: update silo-client pointer to main merge commit' (#48) from fix/silo-client-pointer into main

Reviewed-on: #48

freecad/InitGui.py

@@ -45,6 +45,7 @@ class SiloWorkbench(FreeCADGui.Workbench):
             "Separator",
             "Silo_Info",
             "Silo_BOM",
+            "Silo_Jobs",
         ]
         self.appendToolbar("Silo Origin", self.silo_toolbar_commands, "Unavailable")
 
@@ -52,12 +53,14 @@ class SiloWorkbench(FreeCADGui.Workbench):
         self.menu_commands = [
             "Silo_Info",
             "Silo_BOM",
+            "Silo_Jobs",
             "Silo_TagProjects",
             "Silo_SetStatus",
             "Silo_Rollback",
             "Separator",
             "Silo_Settings",
             "Silo_Auth",
+            "Silo_Runners",
             "Silo_StartPanel",
             "Silo_Diag",
         ]
@@ -103,7 +106,9 @@ def _register_silo_overlay():
             return False
 
     try:
-        FreeCADGui.registerEditingOverlay(
+        from kindred_sdk import register_overlay
+
+        register_overlay(
             "silo",  # overlay id
             ["Silo Origin"],  # toolbar names to append
             _silo_overlay_match,  # match function

freecad/package.xml

@@ -12,4 +12,17 @@
             <subdirectory>./</subdirectory>
         </workbench>
     </content>
+
+    <!-- Kindred Create extensions -->
+    <kindred>
+        <min_create_version>0.1.0</min_create_version>
+        <load_priority>60</load_priority>
+        <pure_python>true</pure_python>
+        <dependencies>
+            <dependency>sdk</dependency>
+        </dependencies>
+        <contexts>
+            <context id="*" action="overlay"/>
+        </contexts>
+    </kindred>
 </package>

freecad/schema_form.py

@@ -10,9 +10,6 @@ backward-compatible :class:`SchemaFormDialog` modal.
 """
 
 import json
-import urllib.error
-import urllib.parse
-import urllib.request
 
 import FreeCAD
 from PySide import QtCore, QtGui, QtWidgets
@@ -267,17 +264,8 @@ class SchemaFormWidget(QtWidgets.QWidget):
 
     def _fetch_properties(self, category: str) -> dict:
         """Fetch merged property definitions for a category."""
-        from silo_commands import _get_api_url, _get_auth_headers, _get_ssl_context
-
-        api_url = _get_api_url().rstrip("/")
-        url = f"{api_url}/schemas/kindred-rd/properties?category={urllib.parse.quote(category)}"
-        req = urllib.request.Request(url, method="GET")
-        req.add_header("Accept", "application/json")
-        for k, v in _get_auth_headers().items():
-            req.add_header(k, v)
         try:
-            resp = urllib.request.urlopen(req, context=_get_ssl_context(), timeout=5)
-            data = json.loads(resp.read().decode("utf-8"))
+            data = self._client.get_property_schema(category=category)
             return data.get("properties", data)
         except Exception as e:
             FreeCAD.Console.PrintWarning(
@@ -287,19 +275,10 @@ class SchemaFormWidget(QtWidgets.QWidget):
 
     def _generate_pn_preview(self, category: str) -> str:
         """Call the server to preview the next part number."""
-        from silo_commands import _get_api_url, _get_auth_headers, _get_ssl_context
+        from silo_commands import _get_schema_name
 
-        api_url = _get_api_url().rstrip("/")
-        url = f"{api_url}/generate-part-number"
-        payload = json.dumps({"schema": "kindred-rd", "category": category}).encode()
-        req = urllib.request.Request(url, data=payload, method="POST")
-        req.add_header("Content-Type", "application/json")
-        req.add_header("Accept", "application/json")
-        for k, v in _get_auth_headers().items():
-            req.add_header(k, v)
         try:
-            resp = urllib.request.urlopen(req, context=_get_ssl_context(), timeout=5)
-            data = json.loads(resp.read().decode("utf-8"))
+            data = self._client.generate_part_number(_get_schema_name(), category)
             return data.get("part_number", "")
         except Exception:
             return ""
@@ -574,8 +553,10 @@ class SchemaFormWidget(QtWidgets.QWidget):
             return
 
         try:
+            from silo_commands import _get_schema_name
+
             result = self._client.create_item(
-                "kindred-rd",
+                _get_schema_name(),
                 data["category"],
                 data["description"],
                 projects=data["projects"],

freecad/silo_origin.py

@@ -30,7 +30,7 @@ class SiloOrigin:
     Key behaviors:
     - Documents are always stored locally (hybrid local-remote model)
     - Database tracks metadata, part numbers, and revision history
-    - MinIO stores revision snapshots for sync/backup
+    - Server stores revision files for sync/backup
     - Identity is tracked by UUID (SiloItemId), displayed as part number
     """
 
@@ -388,9 +388,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)
@@ -567,12 +565,9 @@ def register_silo_origin():
     This should be called during workbench initialization to make
     Silo available as a file origin.
     """
-    origin = get_silo_origin()
-    try:
-        FreeCADGui.addOrigin(origin)
-        FreeCAD.Console.PrintLog("Registered Silo origin\n")
-    except Exception as e:
-        FreeCAD.Console.PrintWarning(f"Could not register Silo origin: {e}\n")
+    from kindred_sdk import register_origin
+
+    register_origin(get_silo_origin())
 
 
 def unregister_silo_origin():
@@ -582,9 +577,7 @@ def unregister_silo_origin():
     """
     global _silo_origin
     if _silo_origin:
-        try:
-            FreeCADGui.removeOrigin(_silo_origin)
-            FreeCAD.Console.PrintLog("Unregistered Silo origin\n")
-        except Exception as e:
-            FreeCAD.Console.PrintWarning(f"Could not unregister Silo origin: {e}\n")
+        from kindred_sdk import unregister_origin
+
+        unregister_origin(_silo_origin)
         _silo_origin = None

freecad/silo_start.py

@@ -19,23 +19,10 @@ from PySide import QtCore, QtGui, QtWidgets
 # ---------------------------------------------------------------------------
 # Catppuccin Mocha palette
 # ---------------------------------------------------------------------------
-_MOCHA = {
-    "base": "#1e1e2e",
-    "mantle": "#181825",
-    "crust": "#11111b",
-    "surface0": "#313244",
-    "surface1": "#45475a",
-    "surface2": "#585b70",
-    "text": "#cdd6f4",
-    "subtext0": "#a6adc8",
-    "subtext1": "#bac2de",
-    "blue": "#89b4fa",
-    "green": "#a6e3a1",
-    "red": "#f38ba8",
-    "peach": "#fab387",
-    "lavender": "#b4befe",
-    "overlay0": "#6c7086",
-}
+# Catppuccin Mocha palette — sourced from kindred-addon-sdk
+from kindred_sdk.theme import get_theme_tokens
+
+_MOCHA = get_theme_tokens()
 
 _PREF_GROUP = "User parameter:BaseApp/Preferences/Mod/KindredSilo"