Automatically update version to 0.9.7

Don't add location-like objects to Compound()

.github/renovate.json5

@@ -6,13 +6,9 @@
   ],
   "automerge": true,
   "automergeType": "branch",
-  "schedule": [
+  "schedule": [ "* * * * 0,6" ],
-    "before 3am on Saturday"
-  ],
   "lockFileMaintenance": {
     "enabled": true,
-    "schedule": [
+    "schedule": [ "* * * * 0,6" ]
-      "before 3am on Saturday"
-    ]
   }
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "yet-another-cad-viewer",
-  "version": "0.9.5",
+  "version": "0.9.7",
   "description": "",
   "license": "MIT",
   "private": true,
@@ -22,7 +22,7 @@
     "@jamescoyle/vue-icon": "^0.1.2",
     "@mdi/js": "^7.4.47",
     "@mdi/svg": "^7.4.47",
-    "three": "^0.175.0",
+    "three": "^0.178.0",
     "three-mesh-bvh": "^0.9.0",
     "three-orientation-gizmo": "https://github.com/jrj2211/three-orientation-gizmo",
     "vue": "^3.5.13",
@@ -31,17 +31,17 @@
   "devDependencies": {
     "@tsconfig/node20": "^20.1.4",
     "@types/node": "^22.9.3",
-    "@types/three": "^0.175.0",
+    "@types/three": "^0.178.0",
-    "@vitejs/plugin-vue": "^5.2.0",
+    "@vitejs/plugin-vue": "^6.0.0",
-    "@vitejs/plugin-vue-jsx": "^4.1.0",
+    "@vitejs/plugin-vue-jsx": "^5.0.0",
     "@vue/tsconfig": "^0.7.0",
     "buffer": "^5.5.0||^6.0.0",
-    "commander": "^13.0.0",
+    "commander": "^14.0.0",
     "generate-license-file": "^4.0.0",
-    "npm-run-all2": "^7.0.1",
+    "npm-run-all2": "^8.0.0",
     "terser": "^5.36.0",
     "typescript": "~5.8.0",
-    "vite": "^6.0.0",
+    "vite": "^7.0.0",
-    "vue-tsc": "^2.1.10"
+    "vue-tsc": "^3.0.0"
   }
 }

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "yacv-server"
-version = "0.9.5"
+version = "0.9.7"
 description = "Yet Another CAD Viewer (server)"
 authors = ["Yeicor <4929005+Yeicor@users.noreply.github.com>"]
 license = "MIT"

yacv_server/cad.py

@@ -77,8 +77,8 @@ def get_shape(obj: CADLike, error: bool = True) -> Optional[CADCoreLike]:
             if len(shapes_raw_filtered) > 0:  # Continue if we found at least one shape
                 # Sorting is required to improve hashcode consistency
                 shapes_raw_filtered_sorted = sorted(shapes_raw_filtered, key=lambda x: _hashcode(x))
-                # Build a single compound shape
+                # Build a single compound shape (skip locations/axes here, they can't be in a Compound)
-                shapes_bd = [Compound(shape) for shape in shapes_raw_filtered_sorted if shape is not None]
+                shapes_bd = [Compound(shape) for shape in shapes_raw_filtered_sorted if shape is not None and not isinstance(shape, TopLoc_Location)]
                 return get_shape(Compound(shapes_bd), error)
         except TypeError:
             pass

yacv_server/yacv.py

@@ -382,19 +382,30 @@ def _preprocess_cad(obj: CADLike, **kwargs) -> CADCoreLike:
     return obj
 
 
-_find_var_name_count = 0
+_obj_name_counts = {}
-
 
 def _find_var_name(obj: any, avoid_levels: int = 2) -> str:
     """A hacky way to get a stable name for an object that may change over time"""
-    global _find_var_name_count
+
+    # Build123d objects have a "label" property, CadQuery Assembly's have "name"
+    for f in ('label', 'name'):
+        if hasattr(obj, f):
+            v = getattr(obj, f)
+            if v != '':
+                return v;
+
+    # Otherwise walk up our stack to see if there's a local variable that points to it
     obj_shape = get_shape(obj, error=False) or obj
     for frame in inspect.stack()[avoid_levels:]:
         for key, value in frame.frame.f_locals.items():
             if get_shape(value, error=False) is obj_shape:
                 return key
-    _find_var_name_count += 1
+
-    return 'unknown_var_' + str(_find_var_name_count)
+    # Last resort, name it for its type with a disambiguating number
+    global _obj_name_counts
+    t = obj.__class__.__name__
+    _obj_name_counts[t] = 1 if t not in _obj_name_counts else _obj_name_counts[t] + 1
+    return t + str(_obj_name_counts[t])
 
 
 def sizeof_fmt(num, suffix="B"):