ocp-vscode 2.2.2__tar.gz → 2.3.1__tar.gz

{ocp_vscode-2.2.2 → ocp_vscode-2.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ocp_vscode
-Version: 2.2.2
+Version: 2.3.1
 Summary: OCP CAD Viewer for VSCode
 Home-page: https://github.com/bernhard-42/vscode-ocp-cad-viewer
 Author: Bernhard Walter
@@ -17,5 +17,10 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Requires-Python: >=3.9
 License-File: LICENSE
+Requires-Dist: ocp-tessellate<2.4.0,>=2.3.2
+Requires-Dist: requests
+Requires-Dist: ipykernel
+Requires-Dist: orjson
+Requires-Dist: websockets<11.1,>=11.0
 
 An extension to show OCP cad CAD objects (CadQuery, build123d) in VS Code via threejs

{ocp_vscode-2.2.2 → ocp_vscode-2.3.1}/README.md

@@ -185,8 +185,32 @@ You can also use "Library Manager" in the _OCP CAD Viewer_ sidebar to manage the
     -   `reset_camera=Camera.KEEP` will keep position, rotation and panning. However, panning can be problematic. When the next object to be shown is much larger or smaller and the object before was panned, it can happen that nothing is visible (the new object at the pan location is outside of the viewer frustum). OCP CAD Viewer checks whether the bounding box of an object is 2x smaller or larger than the one of the last shown object. If so, it falls back to `Camera.CENTER`. A notification is written to the OCP CAD Viewer output panel.
     -   `reset_camera=Camera.RESET` will ensure that position, rotation and panning will be reset to the initial default
 
+## Development
+
+Testing:
+
+Native tessellator can be set via `NATIVE_TESSELLATOR=1`and Python tessellator via `NATIVE_TESSELLATOR=0`.
+
+When `OCP_VSCODE_PYTEST=1` is set, `show` will not send the tessellated results to the viewer, but return it to the caller for inspection.
+
+A full test cycle consist of:
+
+```bash
+NATIVE_TESSELLATOR=0 OCP_VSCODE_PYTEST=1 pytest -v -s pytests/
+NATIVE_TESSELLATOR=1 OCP_VSCODE_PYTEST=1 pytest -v -s pytests/
+```
+
 ## Changes
 
+v2.3.1
+- Add latest ocp-tessellate to fixed regression with handling instances
+- Make native default if ocp-addons exists
+
+v2.3.0
+- Add newest ocp-tessellate to allow using native tessellator from ocp_addons
+- Fine tune communication to ensure the memory view of buffers will be passed through to javascript for performance
+- Use of the new protocol v3 of three-cad-viewer
+
 v2.2.2
 - Fix regression in measure tools
 

{ocp_vscode-2.2.2 → ocp_vscode-2.3.1}/ocp_vscode/__init__.py

@@ -15,7 +15,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-__version__ = "2.2.2"
+__version__ = "2.3.1"
+
+import os
 
 from .show import *
 from .config import *
@@ -24,3 +26,23 @@ from .comms import *
 from .colors import *
 from .animation import Animation
 from ocp_tessellate.cad_objects import ImageFace
+
+try:
+    from ocp_tessellate.tessellator import (
+        enable_native_tessellator,
+        disable_native_tessellator,
+        is_native_tessellator_enabled,
+    )
+
+    if os.environ.get("NATIVE_TESSELLATOR") == "0":
+        disable_native_tessellator()
+    else:
+        enable_native_tessellator()
+
+    print(
+        "Found and enabled native tessellator.\n"
+        "To disable, call `disable_native_tessellator()`\n"
+        "To enable, call `enable_native_tessellator()`\n"
+    )
+except:
+    pass

{ocp_vscode-2.2.2 → ocp_vscode-2.3.1}/ocp_vscode/comms.py

@@ -20,6 +20,7 @@ from ocp_tessellate.ocp_utils import (
 )
 from .state import get_state, update_state, get_config_file
 
+
 # pylint: disable=unused-import
 try:
     from IPython import get_ipython
@@ -34,6 +35,7 @@ CMD_PORT = 3939
 
 INIT_DONE = False
 
+
 #
 # Send data to the viewer
 #
@@ -58,9 +60,14 @@ __all__ = [
     "set_port",
     "get_port",
     "listener",
+    "is_pytest",
 ]
 
 
+def is_pytest():
+    return os.environ.get("OCP_VSCODE_PYTEST") == "1"
+
+
 def port_check(port):
     """Check whether the port is listening"""
     s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
@@ -85,6 +92,9 @@ def default(obj):
 
 def get_port():
     """Get the port"""
+    if is_pytest():
+        return 3939
+
     if not INIT_DONE:
         find_and_set_port()
         set_connection_file()
@@ -131,12 +141,13 @@ def _send(data, message_type, port=None, timeit=False):
                     result = json.loads(ws.recv())
                 except Exception as ex:  # pylint: disable=broad-except
                     print(ex)
-            try:
-                ws.close()
-            except:  # pylint: disable=bare-except
-                pass
 
-            return result
+            # try:
+            #     ws.close()
+            # except Exception as ex:  # pylint: disable=bare-except
+            #     pass
+
+        return result
 
     except Exception as ex:  # pylint: disable=broad-except
         print(
@@ -278,4 +289,4 @@ def set_connection_file():
     elif not JCONSOLE:
         print("Jupyter console not installed")
     else:
-        print("Jupyter kernel not running")
+        print("Jupyter kernel not running")

{ocp_vscode-2.2.2 → ocp_vscode-2.3.1}/ocp_vscode/config.py

@@ -18,7 +18,7 @@
 
 from enum import Enum
 
-from .comms import send_command, send_config, get_port
+from .comms import send_command, send_config, get_port, is_pytest
 
 __all__ = [
     "workspace_config",
@@ -401,6 +401,10 @@ def ui_filter(conf):
 
 def status(port=None, debug=False):
     """Get viewer status"""
+
+    if is_pytest():
+        return {}
+
     if port is None:
         port = get_port()
     try:
@@ -418,6 +422,16 @@ def status(port=None, debug=False):
 
 def workspace_config(port=None):
     """Get viewer workspace config"""
+
+    if is_pytest():
+        return {
+            "measure_tools": False,
+            "_splash": False,
+            "default_facecolor": (1, 234, 56),
+            "default_thickedgecolor": (123, 45, 6),
+            "default_vertexcolor": (123, 45, 6),
+        }
+
     if port is None:
         port = get_port()
     try:

{ocp_vscode-2.2.2 → ocp_vscode-2.3.1}/ocp_vscode/show.py

@@ -16,7 +16,9 @@
 # limitations under the License.
 #
 
+import os
 import re
+import types
 
 from ocp_tessellate import PartGroup
 from ocp_tessellate.convert import (
@@ -24,7 +26,6 @@ from ocp_tessellate.convert import (
     get_normal_len,
     combined_bb,
     to_assembly,
-    mp_get_results,
     conv,
 )
 from ocp_tessellate.utils import numpy_to_buffer_json, Timer, Color
@@ -40,7 +41,6 @@ from ocp_tessellate.ocp_utils import (
     is_wrapped,
 )
 
-from ocp_tessellate.mp_tessellator import init_pool, keymap, close_pool
 from ocp_tessellate.cad_objects import (
     OCP_PartGroup,
     OCP_Edges,
@@ -50,7 +50,7 @@ from ocp_tessellate.cad_objects import (
 )
 import ocp_tessellate.convert as oc
 
-from .config import (
+from ocp_vscode.config import (
     preset,
     get_changed_config,
     workspace_config,
@@ -61,8 +61,8 @@ from .config import (
     Collapse,
     check_deprecated,
 )
-from .comms import send_backend, send_data
-from .colors import get_colormap, web_to_rgb, BaseColorMap
+from ocp_vscode.comms import send_backend, send_data, is_pytest
+from ocp_vscode.colors import get_colormap, web_to_rgb, BaseColorMap
 
 __all__ = ["show", "show_object", "reset_show", "show_all", "show_clear"]
 
@@ -140,7 +140,7 @@ def _tessellate(
 
     with Timer(timeit, "", "to_assembly", 1):
         changed_config = get_changed_config()
-        part_group = to_assembly(
+        part_group, instances = to_assembly(
             *cad_objs,
             names=names,
             colors=colors,
@@ -199,30 +199,14 @@ def _tessellate(
                 continue
             params[k] = v
 
-    parallel = preset("parallel", params.get("parallel"))
-    if parallel and not any(
-        [isinstance(obj, OCP_PartGroup) for obj in part_group.objects]
-    ):
-        print("parallel only works for assemblies, setting it to False")
-        parallel = False
-        params["parallel"] = False
-
     if kwargs.get("debug") is not None and kwargs["debug"]:
         print("\ntessellation parameters:\n", params)
 
     with Timer(timeit, "", "tessellate", 1):
-        if parallel:
-            init_pool()
-            keymap.reset()
-
         instances, shapes, states, mapping = tessellate_group(
-            part_group, params, progress, params.get("timeit")
+            part_group, instances, params, progress, params.get("timeit")
         )
 
-        if parallel:
-            instances, shapes = mp_get_results(instances, shapes, progress)
-            close_pool()
-
     params["normal_len"] = get_normal_len(
         preset("render_normals", params.get("render_normals")),
         shapes,
@@ -230,7 +214,13 @@ def _tessellate(
     )
 
     with Timer(timeit, "", "bb", 1):
-        bb = combined_bb(shapes).to_dict()
+        bb = combined_bb(shapes)
+        if bb is None:
+            bb = dict(
+                xmin=-1e-6, ymin=-1e-6, zmin=-1e-6, xmax=1e-6, ymax=1e-6, zmax=1e-6
+            )
+        else:
+            bb = bb.to_dict()
 
     # add global bounding box
     shapes["bb"] = bb
@@ -272,14 +262,18 @@ def _convert(
         config["explode"] = kwargs["explode"]
 
     with Timer(timeit, "", "create data obj", 1):
+        if is_pytest():
+            return (instances, shapes, states, config, count_shapes), mapping
+
         return {
             "data": numpy_to_buffer_json(
-                dict(instances=instances, shapes=shapes, states=states)
+                dict(instances=instances, shapes=shapes, states=states),
             ),
             "type": "data",
             "config": config,
             "count": count_shapes,
         }, mapping
+    return result
 
 
 class Progress:
@@ -287,7 +281,7 @@ class Progress:
 
     def __init__(self, levels=None):
         if levels is None:
-            self.levels = ["+", "c", "-"]
+            self.levels = ["+c-*"]
         else:
             self.levels = levels
 
@@ -318,7 +312,7 @@ def show(
     colors=None,
     alphas=None,
     port=None,
-    progress="-+c",
+    progress="-+*c",
     glass=None,
     tools=None,
     measure_tools=None,
@@ -371,7 +365,6 @@ def show(
     render_joints=None,
     show_parent=None,
     show_sketch_local=None,
-    parallel=None,
     helper_scale=None,
     mate_scale=None,  # DEPRECATED
     debug=None,
@@ -388,8 +381,11 @@ def show(
         colors:                  List of colors for the cad_objs. Needs to have the same length as cad_objs
         alphas:                  List of alpha values for the cad_objs. Needs to have the same length as cad_objs
         port:                    The port the viewer listens to. Typically use 'set_port(port)' instead
-        progress:                Show progress of tessellation with None is no progress indicator. (default="-+c")
-                                 for object: "-": is reference, "+": gets tessellated, "c": from cache
+        progress:                Show progress of tessellation with None is no progress indicator. (default="-+*c")
+                                 for object: "-": is reference,
+                                             "+": gets tessellated with Python code,
+                                             "*": gets tessellated with native code,
+                                             "c": from cache
 
     Valid keywords to configure the viewer (**kwargs):
     - UI
@@ -459,7 +455,6 @@ def show(
         render_normals:          Render normals (default=False)
         render_mates:            Render mates for MAssemblies (default=False)
         render_joints:           Render build123d joints (default=False)
-        parallel:                Tessellate objects in parallel (default=False)
         show_parent:             Render parent of faces, edges or vertices as wireframe (default=False)
         show_sketch_local:       In build123d show local sketch in addition to relocate sketch (default=True)
         helper_scale:            Scale of rendered helpers (locations, axis, mates for MAssemblies) (default=1)
@@ -552,6 +547,9 @@ def show(
         else:
             LAST_CALL = "other"
 
+    if is_pytest():
+        return t, mapping
+
     with Timer(timeit, "", "send"):
         send_data(t, port=port, timeit=timeit)
 
@@ -574,7 +572,7 @@ def show_object(
     parent=None,
     clear=False,
     port=None,
-    progress="-+c",
+    progress="-+*c",
     glass=None,
     tools=None,
     measure_tools=None,
@@ -624,7 +622,6 @@ def show_object(
     render_normals=None,
     render_mates=None,
     render_joints=None,
-    parallel=None,
     show_parent=None,
     show_sketch_local=None,
     helper_scale=None,
@@ -646,8 +643,12 @@ def show_object(
         clear:                   In interactice mode, clear the stack of objects to be shown
                                  (typically used for the first object)
         port:                    The port the viewer listens to. Typically use 'set_port(port)' instead
-        progress:                Show progress of tessellation with None is no progress indicator. (default="-+c")
-                                 for object: "-": is reference, "+": gets tessellated, "c": from cache
+        progress:                Show progress of tessellation with None is no progress indicator. (default="-+*c")
+                                 for object: "-": is reference,
+                                             "+": gets tessellated with Python code,
+                                             "*": gets tessellated with native code,
+                                             "c": from cache
+
 
     Valid keywords to configure the viewer (**kwargs):
     - UI
@@ -717,7 +718,6 @@ def show_object(
         render_normals:          Render normals (default=False)
         render_mates:            Render mates for MAssemblies (default=False)
         render_joints:           Render build123d joints (default=False)
-        parallel:                Tessellate objects in parallel (default=False)
         show_parent:             Render parent of faces, edges or vertices as wireframe (default=False)
         show_sketch_local:       In build123d show local sketch in addition to relocate sketch (default=True)
         helper_scale:            Scale of rendered helpers (locations, axis, mates for MAssemblies) (default=1)
@@ -778,44 +778,13 @@ def show_clear():
     send_data(data)
 
 
-def ocp_group(obj, name):
-
-    def to_group(obj, name, group):
-        if isinstance(obj, list):
-            sub_group = OCP_PartGroup([], name=name)
-            for i, el in enumerate(obj):
-                new_obj = to_group(el, f"{name}[{i}]", sub_group)
-                if new_obj is not None:
-                    sub_group.add(new_obj)
-            group.add(sub_group)
-        elif isinstance(obj, dict):
-            sub_group = OCP_PartGroup([], name=name)
-            for name, el in obj.items():
-                new_obj = to_group(el, name, sub_group)
-                if new_obj is not None:
-                    sub_group.add(new_obj)
-            group.add(sub_group)
-        else:
-            if (
-                (is_wrapped(obj) and not obj.__class__.__name__ == "Color")
-                or is_build123d(obj)
-                or is_cadquery(obj)
-            ):
-                new_obj = conv(obj)
-                new_obj.name = name
-                group.add(new_obj)
-            else:
-                ...
-                # print(
-                #     f"show_all: Type {type(obj)} for name {name} cannot be visualized"
-                # )
-
-    group = OCP_PartGroup([], name=name)
-    to_group(obj, name, group)
-    return group.objects[0]
-
-
-def show_all(variables=None, exclude=None, classes=None, _visual_debug=False, **kwargs):
+def show_all(
+    variables=None,
+    exclude=None,
+    classes=None,
+    _visual_debug=False,
+    **kwargs,
+):
     """Show all variables in the current scope"""
     import inspect  # pylint: disable=import-outside-toplevel
 
@@ -840,22 +809,23 @@ def show_all(variables=None, exclude=None, classes=None, _visual_debug=False, **
     names = []
     for name, obj in variables.items():
         if (
+            # ignore classes and ipython and jupyter variables
             isinstance(obj, type)
-            or name in ["_", "__", "___"]
+            or name in exclude + ["_", "__", "___", "_ih", "_oh", "_dh", "Out", "In"]
             or name.startswith("__")
             or re.search("_\\d+", name) is not None
+            # pylint: disable=protected-access
+            or (hasattr(obj, "_obj") and obj._obj is None)
+            or callable(obj)
+            or isinstance(obj, (int, float, str, bool, types.ModuleType))
         ):
-            continue  # ignore classes and jupyter variables
+            continue
+
         if hasattr(obj, "area") and obj.area > 1e99:  # inifinite face
             print(f"infinite face {name} skipped")
             continue
 
-        if name not in exclude and (classes is None or isinstance(obj, tuple(classes))):
-            if (
-                hasattr(obj, "_obj")
-                and obj._obj is None  # pylint: disable=protected-access
-            ):
-                continue
+        if classes is None or isinstance(obj, tuple(classes)):
 
             if hasattr(obj, "locations") and hasattr(obj, "local_locations"):
                 obj = obj.locations
@@ -881,6 +851,7 @@ def show_all(variables=None, exclude=None, classes=None, _visual_debug=False, **
                     and hasattr(obj, "position")
                     and hasattr(obj, "direction")
                 )
+                or isinstance(obj, (list, tuple, dict))
             ):
                 objects.append(obj)
                 names.append(name)
@@ -898,27 +869,25 @@ def show_all(variables=None, exclude=None, classes=None, _visual_debug=False, **
                 objects.append(pg)
                 names.append(name)
 
-            elif isinstance(obj, (list, tuple, dict)):
-                if not name in [
-                    "_ih",
-                    "_oh",
-                    "_dh",
-                    "Out",
-                    "In",
-                ]:  # no IPython dicts and lists
-                    obj = ocp_group(obj, name)
-                    if len(obj.objects) > 0:
-                        objects.append(obj)
-                        obj.name = name
-                        names.append(name)
+            else:
+                print(
+                    f"show_all: Type {type(obj)} for name {name} cannot be visualized"
+                )
 
     if len(objects) > 0:
-        show(
-            *objects,
-            names=names,
-            collapse=Collapse.ROOT,
-            _force_in_debug=_visual_debug,
-            **kwargs,
-        )
+        try:
+            result = show(
+                *objects,
+                names=names,
+                collapse=Collapse.ROOT,
+                _force_in_debug=_visual_debug,
+                **kwargs,
+            )
+            if is_pytest():
+                return result
+        except Exception as ex:  # pylint: disable=broad-exception-caught
+            print("show_all:", ex)
     else:
+        if is_pytest():
+            return None
         show_clear()

{ocp_vscode-2.2.2 → ocp_vscode-2.3.1}/ocp_vscode.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
-Name: ocp-vscode
-Version: 2.2.2
+Name: ocp_vscode
+Version: 2.3.1
 Summary: OCP CAD Viewer for VSCode
 Home-page: https://github.com/bernhard-42/vscode-ocp-cad-viewer
 Author: Bernhard Walter
@@ -17,5 +17,10 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Requires-Python: >=3.9
 License-File: LICENSE
+Requires-Dist: ocp-tessellate<2.4.0,>=2.3.2
+Requires-Dist: requests
+Requires-Dist: ipykernel
+Requires-Dist: orjson
+Requires-Dist: websockets<11.1,>=11.0
 
 An extension to show OCP cad CAD objects (CadQuery, build123d) in VS Code via threejs

{ocp_vscode-2.2.2 → ocp_vscode-2.3.1}/ocp_vscode.egg-info/SOURCES.txt

@@ -18,5 +18,4 @@ ocp_vscode.egg-info/not-zip-safe
 ocp_vscode.egg-info/requires.txt
 ocp_vscode.egg-info/top_level.txt
 test/test_for_backend.py
-test/test_serialisation.py
 test/testextension.py

{ocp_vscode-2.2.2 → ocp_vscode-2.3.1}/ocp_vscode.egg-info/requires.txt

@@ -1,4 +1,4 @@
-ocp-tessellate<2.3.0,>=2.2.2
+ocp-tessellate<2.4.0,>=2.3.2
 requests
 ipykernel
 orjson

{ocp_vscode-2.2.2 → ocp_vscode-2.3.1}/setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 2.2.2
+current_version = 2.3.1
 commit = False
 tag = False
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(?P<release>\D*)(?P<build>\d*)

{ocp_vscode-2.2.2 → ocp_vscode-2.3.1}/setup.py

@@ -2,13 +2,13 @@ from setuptools import setup, find_packages
 
 setup_args = {
     "name": "ocp_vscode",
-    "version": "2.2.2",
+    "version": "2.3.1",
     "description": "OCP CAD Viewer for VSCode",
     "long_description": "An extension to show OCP cad CAD objects (CadQuery, build123d) in VS Code via threejs",
     "include_package_data": True,
     "python_requires": ">=3.9",
     "install_requires": [
-        "ocp-tessellate>=2.2.2,<2.3.0",
+        "ocp-tessellate>=2.3.2,<2.4.0",
         "requests",
         "ipykernel",
         "orjson",

ocp_vscode-2.2.2/test/test_serialisation.py

@@ -1,566 +0,0 @@
-# pylint: disable=missing-class-docstring,missing-function-docstring
-
-import unittest
-import pytest
-import json
-import math
-from OCP.BRepPrimAPI import BRepPrimAPI_MakeBox
-from OCP.BRepFilletAPI import BRepFilletAPI_MakeFillet
-from OCP.gp import gp_Pnt, gp_Vec, gp_Dir
-from ocp_vscode.show import _convert
-from ocp_vscode.backend import ViewerBackend
-from ocp_vscode.comms import default
-from ocp_vscode.build123d import *
-from ocp_tessellate.ocp_utils import get_edges, get_faces, get_vertices
-
-
-class DirectApiTestCase(unittest.TestCase):
-    def assertTupleAlmostEquals(self, first, second, places, msg=None):
-        """Check Tuples"""
-        self.assertEqual(len(second), len(first))
-        for i, j in zip(second, first):
-            self.assertAlmostEqual(i, j, places, msg=msg)
-
-    def assertTupleOfTupleAlmostEquals(self, first, second, places, msg=None):
-        """Check Tuples"""
-        self.assertEqual(len(second), len(first))
-        for i, j in zip(second, first):
-            self.assertTupleAlmostEquals(i, j, places, msg=msg)
-
-    def assertVectorAlmostEquals(self, first, second, places, msg=None):
-        second_vector = Vector(second)
-        self.assertAlmostEqual(first.X, second_vector.X, places, msg=msg)
-        self.assertAlmostEqual(first.Y, second_vector.Y, places, msg=msg)
-        self.assertAlmostEqual(first.Z, second_vector.Z, places, msg=msg)
-
-
-class VectorTests(DirectApiTestCase):
-    def test_tuple(self):
-        vec = Vector(1, 2, 3)
-        vec2 = Vector((1, 2, 3))
-        self.assertTupleAlmostEquals(vec.to_tuple(), (1, 2, 3), 6)
-        self.assertTupleAlmostEquals(vec2.to_tuple(), (1, 2, 3), 6)
-
-    def test_gp_pnt(self):
-        vec = Vector(gp_Pnt(1, 2, 3))
-        self.assertTupleAlmostEquals(vec.to_tuple(), (1, 2, 3), 6)
-
-    def test_gp_vec(self):
-        vec = Vector(gp_Vec(1, 2, 3))
-        self.assertTupleAlmostEquals(vec.to_tuple(), (1, 2, 3), 6)
-
-    def test_gp_dir(self):
-        vec = Vector(gp_Dir(1, 2, 3))
-        norm = math.sqrt(1**2 + 2**2 + 3**2)
-        self.assertTupleAlmostEquals(vec.to_tuple(), (1 / norm, 2 / norm, 3 / norm), 6)
-
-    def test_normalized(self):
-        vec = Vector(gp_Vec(1, 2, 3)).normalized()
-        vec2 = Vector(gp_Dir(1, 2, 3))
-        self.assertTupleAlmostEquals(vec.to_tuple(), vec2.to_tuple(), 6)
-
-    def test_angle(self):
-        vec = Vector(1, 0, 0)
-        self.assertAlmostEqual(vec.get_angle(Vector(0, 1, 0)), 90, 6)
-        self.assertAlmostEqual(vec.get_angle(Vector(1, 1, 0)), 45, 6)
-        self.assertAlmostEqual(vec.get_angle(Vector(1, -1, 0)), 45, 6)
-
-
-class AxisTests(DirectApiTestCase):
-    def test_axis(self):
-        a = Axis()
-        self.assertTupleAlmostEquals(a.position.to_tuple(), (0, 0, 0), 6)
-        self.assertTupleAlmostEquals(a.direction.to_tuple(), (0, 0, 1), 6)
-        b = Axis((1, 2, 3), (4, 5, 6))
-        self.assertTupleAlmostEquals(b.position.to_tuple(), (1, 2, 3), 6)
-        self.assertTupleAlmostEquals(b.direction.to_tuple(), (4, 5, 6), 6)
-
-    def test_axis_x(self):
-        a = Axis.X
-        self.assertTupleAlmostEquals(a.position.to_tuple(), (0, 0, 0), 6)
-        self.assertTupleAlmostEquals(a.direction.to_tuple(), (1, 0, 0), 6)
-
-    def test_axis_y(self):
-        a = Axis.Y
-        self.assertTupleAlmostEquals(a.position.to_tuple(), (0, 0, 0), 6)
-        self.assertTupleAlmostEquals(a.direction.to_tuple(), (0, 1, 0), 6)
-
-    def test_axis_z(self):
-        a = Axis.Z
-        self.assertTupleAlmostEquals(a.position.to_tuple(), (0, 0, 0), 6)
-        self.assertTupleAlmostEquals(a.direction.to_tuple(), (0, 0, 1), 6)
-
-
-class PlaneTests(DirectApiTestCase):
-    def test_face(self):
-        box = BRepPrimAPI_MakeBox(1.0, 2.0, 3.0).Solid()
-        fillet = BRepFilletAPI_MakeFillet(box)
-        for edge in get_edges(box):
-            fillet.Add(0.2, edge)
-        fillet.Build()
-        box = Solid(fillet.Shape())
-
-        faces = box.faces()
-        p = Plane(faces[0])
-
-        self.assertTupleAlmostEquals(p.origin.to_tuple(), (0.0, 1.0, 1.5), 6)
-        self.assertTupleAlmostEquals(p.x_dir.to_tuple(), (0.0, 0.0, 1.0), 6)
-        self.assertTupleAlmostEquals(p.z_dir.to_tuple(), (-1.0, 0.0, 0.0), 6)
-
-        p = Plane(faces[23])
-
-        self.assertTupleAlmostEquals(p.origin.to_tuple(), (1.0, 1.0, 1.5), 6)
-        self.assertTupleAlmostEquals(p.x_dir.to_tuple(), (0.0, 0.0, 1.0), 6)
-        self.assertTupleAlmostEquals(p.z_dir.to_tuple(), (1.0, 0.0, 0.0), 6)
-
-        p = Plane(faces[10])
-
-        self.assertTupleAlmostEquals(p.origin.to_tuple(), (0.5, 1.0, 3), 6)
-        self.assertTupleAlmostEquals(p.x_dir.to_tuple(), (1.0, 0.0, 0), 6)
-        self.assertTupleAlmostEquals(p.z_dir.to_tuple(), (0.0, 0.0, 1.0), 6)
-
-    def test_edge(self):
-        p = Plane(Vector(1, 1, 1), z_dir=(0, 1, 0))
-
-        self.assertTupleAlmostEquals(p.origin.to_tuple(), (1, 1, 1), 6)
-        self.assertTupleAlmostEquals(p.x_dir.to_tuple(), (0, 0, 1), 6)
-        self.assertTupleAlmostEquals(p.z_dir.to_tuple(), (0, 1, 0), 6)
-
-
-class ShapeListTests(DirectApiTestCase):
-    def test_lists(self):
-        box = BRepPrimAPI_MakeBox(1.0, 2.0, 3.0).Solid()
-        fillet = BRepFilletAPI_MakeFillet(box)
-        for edge in get_edges(box):
-            fillet.Add(0.2, edge)
-        fillet.Build()
-        box = Solid(fillet.Shape())
-
-        faces = box.faces()
-        edges = box.edges()
-        vertices = box.vertices()
-
-        self.assertEqual(len(faces), 26)
-        self.assertEqual(len(edges), 48)
-        self.assertEqual(len(vertices), 24)
-
-        self.assertEqual(len(box.edges().filter_by("LINE")), 24)
-        self.assertEqual(len(box.edges().filter_by("CIRCLE")), 24)
-        self.assertEqual(len(box.edges().filter_by("OTHER")), 0)
-
-        self.assertEqual(len(box.faces().filter_by("PLANE")), 6)
-        self.assertEqual(len(box.faces().filter_by("CYLINDER")), 12)
-        self.assertEqual(len(box.faces().filter_by("SPHERE")), 8)
-        self.assertEqual(len(box.faces().filter_by("OTHER")), 0)
-
-
-class ObjectTests(DirectApiTestCase):
-    def test_load(self):
-        box = BRepPrimAPI_MakeBox(1.0, 2.0, 3.0).Solid()
-        _, mapping = _convert(box)
-        data = {"model": mapping}
-        j = json.dumps(data, default=default).encode("utf-8")
-
-        backend = ViewerBackend(9999)
-        backend.load_model(json.loads(j)["model"])
-
-        self.assertEqual(
-            list(backend.model.keys()),
-            [
-                "/Group/Solid",
-                "/Group/Solid/faces/faces_0",
-                "/Group/Solid/faces/faces_1",
-                "/Group/Solid/faces/faces_2",
-                "/Group/Solid/faces/faces_3",
-                "/Group/Solid/faces/faces_4",
-                "/Group/Solid/faces/faces_5",
-                "/Group/Solid/edges/edges_0",
-                "/Group/Solid/edges/edges_1",
-                "/Group/Solid/edges/edges_2",
-                "/Group/Solid/edges/edges_3",
-                "/Group/Solid/edges/edges_4",
-                "/Group/Solid/edges/edges_5",
-                "/Group/Solid/edges/edges_6",
-                "/Group/Solid/edges/edges_7",
-                "/Group/Solid/edges/edges_8",
-                "/Group/Solid/edges/edges_9",
-                "/Group/Solid/edges/edges_10",
-                "/Group/Solid/edges/edges_11",
-                "/Group/Solid/vertices/vertices0",
-                "/Group/Solid/vertices/vertices1",
-                "/Group/Solid/vertices/vertices2",
-                "/Group/Solid/vertices/vertices3",
-                "/Group/Solid/vertices/vertices4",
-                "/Group/Solid/vertices/vertices5",
-                "/Group/Solid/vertices/vertices6",
-                "/Group/Solid/vertices/vertices7",
-            ],
-        )
-        self.assertEqual(
-            [isinstance(v, Face) for k, v in backend.model.items()],
-            [
-                False,
-                True,
-                True,
-                True,
-                True,
-                True,
-                True,
-                False,
-                False,
-                False,
-                False,
-                False,
-                False,
-                False,
-                False,
-                False,
-                False,
-                False,
-                False,
-                False,
-                False,
-                False,
-                False,
-                False,
-                False,
-                False,
-                False,
-            ],
-        )
-        self.assertEqual(
-            [isinstance(v, Edge) for k, v in backend.model.items()],
-            [
-                False,
-                False,
-                False,
-                False,
-                False,
-                False,
-                False,
-                True,
-                True,
-                True,
-                True,
-                True,
-                True,
-                True,
-                True,
-                True,
-                True,
-                True,
-                True,
-                False,
-                False,
-                False,
-                False,
-                False,
-                False,
-                False,
-                False,
-            ],
-        )
-        self.assertEqual(
-            [isinstance(v, Vertex) for k, v in backend.model.items()],
-            [
-                False,
-                False,
-                False,
-                False,
-                False,
-                False,
-                False,
-                False,
-                False,
-                False,
-                False,
-                False,
-                False,
-                False,
-                False,
-                False,
-                False,
-                False,
-                False,
-                True,
-                True,
-                True,
-                True,
-                True,
-                True,
-                True,
-                True,
-            ],
-        )
-        self.assertEqual(
-            [isinstance(v, Compound) for k, v in backend.model.items()],
-            [
-                True,
-                False,
-                False,
-                False,
-                False,
-                False,
-                False,
-                False,
-                False,
-                False,
-                False,
-                False,
-                False,
-                False,
-                False,
-                False,
-                False,
-                False,
-                False,
-                False,
-                False,
-                False,
-                False,
-                False,
-                False,
-                False,
-                False,
-            ],
-        )
-        self.assertEqual(
-            [v.area for k, v in backend.model.items() if isinstance(v, Face)],
-            [6.0, 6.0, 3.0, 3.0, 2.0, 2.0],
-        )
-        self.assertEqual(
-            [v.length for k, v in backend.model.items() if isinstance(v, Edge)],
-            [3.0, 2.0, 3.0, 2.0, 3.0, 2.0, 3.0, 2.0, 1.0, 1.0, 1.0, 1.0],
-        )
-        self.assertEqual(backend.model["/Group/Solid"].volume, 6)
-
-    def test_fillet(self):
-        box = BRepPrimAPI_MakeBox(1.0, 2.0, 3.0).Solid()
-        fillet = BRepFilletAPI_MakeFillet(box)
-        for edge in get_edges(box):
-            fillet.Add(0.2, edge)
-        fillet.Build()
-        box = Solid(fillet.Shape())
-        _, mapping = _convert(box)
-        data = {"model": mapping}
-        j = json.dumps(data, default=default).encode("utf-8")
-
-        backend = ViewerBackend(9999)
-        backend.load_model(json.loads(j)["model"])
-
-        self.assertEqual(
-            [v.geom_type() for k, v in backend.model.items()],
-            [
-                "Solid",
-                "PLANE",
-                "CYLINDER",
-                "CYLINDER",
-                "CYLINDER",
-                "CYLINDER",
-                "SPHERE",
-                "SPHERE",
-                "PLANE",
-                "PLANE",
-                "SPHERE",
-                "PLANE",
-                "SPHERE",
-                "PLANE",
-                "CYLINDER",
-                "CYLINDER",
-                "CYLINDER",
-                "CYLINDER",
-                "CYLINDER",
-                "CYLINDER",
-                "CYLINDER",
-                "CYLINDER",
-                "SPHERE",
-                "SPHERE",
-                "PLANE",
-                "SPHERE",
-                "SPHERE",
-                "LINE",
-                "LINE",
-                "LINE",
-                "LINE",
-                "CIRCLE",
-                "CIRCLE",
-                "LINE",
-                "CIRCLE",
-                "LINE",
-                "CIRCLE",
-                "CIRCLE",
-                "LINE",
-                "CIRCLE",
-                "CIRCLE",
-                "CIRCLE",
-                "LINE",
-                "OTHER",
-                "CIRCLE",
-                "OTHER",
-                "CIRCLE",
-                "LINE",
-                "LINE",
-                "LINE",
-                "LINE",
-                "LINE",
-                "LINE",
-                "OTHER",
-                "CIRCLE",
-                "LINE",
-                "LINE",
-                "LINE",
-                "OTHER",
-                "CIRCLE",
-                "LINE",
-                "LINE",
-                "LINE",
-                "CIRCLE",
-                "CIRCLE",
-                "LINE",
-                "CIRCLE",
-                "CIRCLE",
-                "CIRCLE",
-                "CIRCLE",
-                "LINE",
-                "CIRCLE",
-                "CIRCLE",
-                "CIRCLE",
-                "LINE",
-                "CIRCLE",
-                "LINE",
-                "CIRCLE",
-                "CIRCLE",
-                "OTHER",
-                "OTHER",
-                "OTHER",
-                "OTHER",
-                "Vertex",
-                "Vertex",
-                "Vertex",
-                "Vertex",
-                "Vertex",
-                "Vertex",
-                "Vertex",
-                "Vertex",
-                "Vertex",
-                "Vertex",
-                "Vertex",
-                "Vertex",
-                "Vertex",
-                "Vertex",
-                "Vertex",
-                "Vertex",
-                "Vertex",
-                "Vertex",
-                "Vertex",
-                "Vertex",
-                "Vertex",
-                "Vertex",
-                "Vertex",
-                "Vertex",
-            ],
-        )
-        vec = [v.to_tuple() for v in backend.model.values() if isinstance(v, Vertex)]
-        self.assertTupleOfTupleAlmostEquals(
-            vec,
-            [
-                (-2.7755575615628914e-17, 0.19999999999999998, 0.19999999999999998),
-                (-2.7755575615628914e-17, 0.19999999999999998, 2.8),
-                (-2.7755575615628914e-17, 1.8, 0.19999999999999998),
-                (-2.7755575615628914e-17, 1.8, 2.8),
-                (0.19999999999999998, -2.7755575615628914e-17, 0.19999999999999998),
-                (0.19999999999999998, -2.7755575615628914e-17, 2.8),
-                (0.19999999999999998, 0.19999999999999998, 0.0),
-                (0.19999999999999998, 1.8, 0.0),
-                (0.19999999999999998, 0.19999999999999998, 3.0),
-                (0.19999999999999998, 1.8, 3.0),
-                (0.19999999999999998, 2.0, 0.19999999999999998),
-                (0.19999999999999998, 2.0, 2.8),
-                (0.8, -2.7755575615628914e-17, 0.19999999999999998),
-                (0.8, -2.7755575615628914e-17, 2.8),
-                (0.8, 0.19999999999999998, 0.0),
-                (0.8, 1.8, 0.0),
-                (0.8, 0.19999999999999998, 3.0),
-                (0.8, 1.8, 3.0),
-                (0.8, 2.0, 0.19999999999999998),
-                (0.8, 2.0, 2.8),
-                (1.0, 0.19999999999999998, 0.19999999999999998),
-                (1.0, 0.19999999999999998, 2.8),
-                (1.0, 1.8, 0.19999999999999998),
-                (1.0, 1.8, 2.8),
-            ],
-            6,
-        )
-
-        vec = [
-            (v.radius if v.geom_type() in ["CIRCLE"] else -1, v.length)
-            for v in backend.model.values()
-            if isinstance(v, Edge)
-        ]
-        self.assertTupleOfTupleAlmostEquals(
-            vec,
-            [
-                (-1, 2.5999999999999996),
-                (-1, 1.6),
-                (-1, 1.6),
-                (-1, 2.5999999999999996),
-                (0.2, 0.3141592653589793),
-                (0.2, 0.3141592653589793),
-                (-1, 2.5999999999999996),
-                (0.2, 0.3141592653589793),
-                (-1, 1.6),
-                (0.2, 0.3141592653589793),
-                (0.2, 0.3141592653589793),
-                (-1, 1.6),
-                (0.2, 0.3141592653589793),
-                (0.2, 0.3141592653589793),
-                (0.2, 0.3141592653589793),
-                (-1, 2.5999999999999996),
-                (-1, 1.92367069372179e-17),
-                (0.2, 0.3141592653589793),
-                (-1, 1.92367069372179e-17),
-                (0.2, 0.3141592653589793),
-                (-1, 0.6000000000000001),
-                (-1, 0.6000000000000001),
-                (-1, 2.5999999999999996),
-                (-1, 0.6000000000000001),
-                (-1, 0.6000000000000001),
-                (-1, 1.6),
-                (-1, 1.92367069372179e-17),
-                (0.2, 0.3141592653589793),
-                (-1, 0.6000000000000001),
-                (-1, 0.6000000000000001),
-                (-1, 1.6),
-                (-1, 1.92367069372179e-17),
-                (0.2, 0.3141592653589793),
-                (-1, 0.6000000000000001),
-                (-1, 0.6000000000000001),
-                (-1, 2.5999999999999996),
-                (0.2, 0.3141592653589793),
-                (0.2, 0.3141592653589793),
-                (-1, 2.5999999999999996),
-                (0.2, 0.3141592653589793),
-                (0.2, 0.3141592653589793),
-                (0.2, 0.3141592653589793),
-                (0.2, 0.3141592653589793),
-                (-1, 1.6),
-                (0.2, 0.3141592653589793),
-                (0.2, 0.3141592653589793),
-                (0.2, 0.3141592653589793),
-                (-1, 1.6),
-                (0.2, 0.3141592653589793),
-                (-1, 2.5999999999999996),
-                (0.2, 0.3141592653589793),
-                (0.2, 0.3141592653589793),
-                (-1, 1.92367069372179e-17),
-                (-1, 1.92367069372179e-17),
-                (-1, 1.92367069372179e-17),
-                (-1, 1.92367069372179e-17),
-            ],
-            6,
-        )
-        # vec = [
-        #     (, v.length, v.width, v.area)
-        #     for v in backend.model.values()
-        #     if isinstance(v, Face)
-        # ]