script

Author: JulienChampagnol

.github/workflows/CD.yml

@@ -2,7 +2,7 @@ name: CD
 
 on:
   push:
-    branches: [master, next, json_import_viewer]
+    branches: [master, next]
 
 jobs:
   build:

.gitignore

@@ -8,3 +8,5 @@ __pycache__/
 /node_modules
 latest_logs
 schemas.json
+build
+*.egg-info

pyproject.toml

@@ -23,6 +23,9 @@ classifiers = [
 "Homepage" = "https://github.com/Geode-solutions/OpenGeodeWeb-Viewer"
 "Bug Tracker" = "https://github.com/Geode-solutions/OpenGeodeWeb-Viewer/issues"
 
+[project.scripts]
+opengeodeweb_viewer-start = "opengeodeweb_viewer.vtkw_server:run_server"
+
 [tool.setuptools.dynamic]
 dependencies = {file = ["requirements.txt"]}
 

src/tests/conftest.py

@@ -115,11 +115,10 @@ class Starter(ProcessStarter):
 
             # command to start process
             args = [
-                "python3",
-                str(self.root_path / server_path),
+                "opengeodeweb_viewer-start",
             ]
 
-        return Path(server_path).name, Starter, ServerMonitor
+        return "vtkw_server", Starter, ServerMonitor
 
 
 ROOT_PATH = Path(__file__).parent.parent.absolute()

src/tests/test_protocol.py

@@ -6,100 +6,100 @@ def test_create_visualization(server):
     assert server.compare_image(3, "create_visualization.jpeg") == True
 
 
-# def test_reset_camera(server):
-#     server.call("reset_camera")
-#     assert server.compare_image(3, "reset_camera.jpeg") == True
+def test_reset_camera(server):
+    server.call("reset_camera")
+    assert server.compare_image(3, "reset_camera.jpeg") == True
 
 
-# def test_create_object_pipeline(server):
-#     server.call("create_object_pipeline", [{"id": "123456", "file_name": "hat.vtp"}])
-#     assert server.compare_image(3, "create_object_pipeline.jpeg") == True
+def test_create_object_pipeline(server):
+    server.call("create_object_pipeline", [{"id": "123456", "file_name": "hat.vtp"}])
+    assert server.compare_image(3, "create_object_pipeline.jpeg") == True
 
 
-# def test_delete_object_pipeline(server):
-#     server.call("create_object_pipeline", [{"id": "123456789", "file_name": "hat.vtp"}])
-#     assert server.compare_image(3, "create_object_pipeline.jpeg") == True
+def test_delete_object_pipeline(server):
+    server.call("create_object_pipeline", [{"id": "123456789", "file_name": "hat.vtp"}])
+    assert server.compare_image(3, "create_object_pipeline.jpeg") == True
 
-#     server.call("delete_object_pipeline", [{"id": "123456789"}])
-#     assert server.compare_image(3, "delete_object_pipeline.jpeg") == True
+    server.call("delete_object_pipeline", [{"id": "123456789"}])
+    assert server.compare_image(3, "delete_object_pipeline.jpeg") == True
 
 
-# def test_toggle_object_visibility(server):
-#     server.call("create_object_pipeline", [{"id": "123456789", "file_name": "hat.vtp"}])
-#     assert server.compare_image(3, "create_object_pipeline.jpeg") == True
+def test_toggle_object_visibility(server):
+    server.call("create_object_pipeline", [{"id": "123456789", "file_name": "hat.vtp"}])
+    assert server.compare_image(3, "create_object_pipeline.jpeg") == True
 
-#     server.call("toggle_object_visibility", [{"id": "123456789", "is_visible": False}])
-#     assert server.compare_image(3, "toggle_object_visibility_1.jpeg") == True
+    server.call("toggle_object_visibility", [{"id": "123456789", "is_visible": False}])
+    assert server.compare_image(3, "toggle_object_visibility_1.jpeg") == True
 
-#     server.call("toggle_object_visibility", [{"id": "123456789", "is_visible": True}])
-#     assert server.compare_image(3, "toggle_object_visibility_2.jpeg") == True
+    server.call("toggle_object_visibility", [{"id": "123456789", "is_visible": True}])
+    assert server.compare_image(3, "toggle_object_visibility_2.jpeg") == True
 
 
-# def test_apply_textures(server):
+def test_apply_textures(server):
 
-#     server.call(
-#         "create_object_pipeline",
-#         [{"id": "123456789", "file_name": "hat.vtp"}],
-#     )
-#     assert server.compare_image(3, "create_object_pipeline.jpeg") == True
+    server.call(
+        "create_object_pipeline",
+        [{"id": "123456789", "file_name": "hat.vtp"}],
+    )
+    assert server.compare_image(3, "create_object_pipeline.jpeg") == True
 
-#     server.call(
-#         "apply_textures",
-#         [
-#             {
-#                 "id": "123456789",
-#                 "textures": [
-#                     {
-#                         "texture_name": "lambert2SG",
-#                         "texture_file_name": "hat_lambert2SG.vti",
-#                     }
-#                 ],
-#             }
-#         ],
-#     )
-#     assert server.compare_image(3, "apply_textures.jpeg") == True
+    server.call(
+        "apply_textures",
+        [
+            {
+                "id": "123456789",
+                "textures": [
+                    {
+                        "texture_name": "lambert2SG",
+                        "texture_file_name": "hat_lambert2SG.vti",
+                    }
+                ],
+            }
+        ],
+    )
+    assert server.compare_image(3, "apply_textures.jpeg") == True
 
 
-# def test_get_point_position(server):
+def test_get_point_position(server):
 
-#     server.call(
-#         "create_object_pipeline",
-#         [{"id": "123456789", "file_name": "hat.vtp"}],
-#     )
-#     assert server.compare_image(3, "create_object_pipeline.jpeg") == True
+    server.call(
+        "create_object_pipeline",
+        [{"id": "123456789", "file_name": "hat.vtp"}],
+    )
+    assert server.compare_image(3, "create_object_pipeline.jpeg") == True
 
-#     server.call("get_point_position", [{"x": 0, "y": 0}])
-#     response = server.get_response()
-#     assert "x" in response["result"]
-#     assert "y" in response["result"]
-#     assert "z" in response["result"]
-#     x = response["result"]["x"]
-#     y = response["result"]["y"]
-#     z = response["result"]["z"]
-#     assert type(x) is float
-#     assert type(y) is float
-#     assert type(z) is float
+    server.call("get_point_position", [{"x": 0, "y": 0}])
+    response = server.get_response()
+    assert "x" in response["result"]
+    assert "y" in response["result"]
+    assert "z" in response["result"]
+    x = response["result"]["x"]
+    y = response["result"]["y"]
+    z = response["result"]["z"]
+    assert type(x) is float
+    assert type(y) is float
+    assert type(z) is float
 
 
-# def test_toggle_edge_visibility(server):
+def test_toggle_edge_visibility(server):
 
-#     server.call(
-#         "create_object_pipeline",
-#         [{"id": "123456789", "file_name": "hat.vtp"}],
-#     )
-#     assert server.compare_image(3, "create_object_pipeline.jpeg") == True
+    server.call(
+        "create_object_pipeline",
+        [{"id": "123456789", "file_name": "hat.vtp"}],
+    )
+    assert server.compare_image(3, "create_object_pipeline.jpeg") == True
 
-#     server.call("toggle_edge_visibility", [{"id": "123456789", "visibility": True}])
-#     assert server.compare_image(3, "toggle_edge_visibility.jpeg") == True
+    server.call("toggle_edge_visibility", [{"id": "123456789", "visibility": True}])
+    assert server.compare_image(3, "toggle_edge_visibility.jpeg") == True
 
 
-# def test_set_color(server):
+def test_set_color(server):
 
-#     server.call(
-#         "create_object_pipeline",
-#         [{"id": "123456789", "file_name": "hat.vtp"}],
-#     )
-#     assert server.compare_image(3, "create_object_pipeline.jpeg") == True
+    server.call(
+        "create_object_pipeline",
+        [{"id": "123456789", "file_name": "hat.vtp"}],
+    )
+    assert server.compare_image(3, "create_object_pipeline.jpeg") == True
 
-#     server.call("set_color", [{"id": "123456789", "red": 50, "green": 2, "blue": 250}])
-#     assert server.compare_image(3, "set_color.jpeg") == True
+    server.call("set_color", [{"id": "123456789", "red": 50, "green": 2, "blue": 250}])
+    assert server.compare_image(3, "set_color.jpeg") == True