OpenGeodeWeb-Viewer 1.33.1__tar.gz → 1.34.0__tar.gz

{opengeodeweb_viewer-1.33.1 → opengeodeweb_viewer-1.34.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: OpenGeodeWeb-Viewer
-Version: 1.33.1
+Version: 1.34.0
 Summary: OpenGeodeWeb-Viewer is an open source framework that proposes handy python functions and wrappers for the OpenGeode ecosystem
 Author-email: Geode-solutions <team-web@geode-solutions.com>
 Project-URL: Homepage, https://github.com/Geode-solutions/OpenGeodeWeb-Viewer
@@ -22,10 +22,11 @@ Requires-Dist: frozenlist==1.*
 Requires-Dist: idna==3.*
 Requires-Dist: kiwisolver==1.*
 Requires-Dist: matplotlib==3.*
-Requires-Dist: multidict==6.*
+Requires-Dist: msgpack==1.*
+Requires-Dist: multidict==7.*
 Requires-Dist: numpy==2.*
 Requires-Dist: packaging==26.*
-Requires-Dist: pillow==12.*
+Requires-Dist: pillow==13.*
 Requires-Dist: propcache==0.*
 Requires-Dist: pyparsing==3.*
 Requires-Dist: python-dateutil==2.9.0.post0
@@ -33,9 +34,9 @@ Requires-Dist: six==1.*
 Requires-Dist: typing-extensions==4.*
 Requires-Dist: vtk==9.6.2
 Requires-Dist: websocket-client==1.8.0
-Requires-Dist: wslink==1.12.4
+Requires-Dist: wslink==2.6.0
 Requires-Dist: yarl==1.*
-Requires-Dist: opengeodeweb-microservice==1.*,>=1.3.2rc1
+Requires-Dist: opengeodeweb-microservice==1.*,>=1.3.2
 Dynamic: license-file
 
 # OpenGeodeWeb-Viewer

{opengeodeweb_viewer-1.33.1 → opengeodeweb_viewer-1.34.0}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "OpenGeodeWeb-Viewer"
-version = "1.33.1"
+version = "1.34.0"
 dynamic = ["dependencies"]
 authors = [{ name = "Geode-solutions", email = "team-web@geode-solutions.com" }]
 description = "OpenGeodeWeb-Viewer is an open source framework that proposes handy python functions and wrappers for the OpenGeode ecosystem"

{opengeodeweb_viewer-1.33.1 → opengeodeweb_viewer-1.34.0}/requirements.txt

@@ -28,7 +28,9 @@ kiwisolver==1.*
     # via matplotlib
 matplotlib==3.*
     # via vtk
-multidict==6.*
+msgpack==1.*
+    # via wslink
+multidict==7.*
     # via
     #   aiohttp
     #   yarl
@@ -38,7 +40,7 @@ numpy==2.*
     #   matplotlib
 packaging==26.*
     # via matplotlib
-pillow==12.*
+pillow==13.*
     # via matplotlib
 propcache==0.*
     # via
@@ -58,9 +60,9 @@ vtk==9.6.2
     # via -r requirements.in
 websocket-client==1.8.0
     # via -r requirements.in
-wslink==1.12.4
+wslink==2.6.0
     # via -r requirements.in
 yarl==1.*
     # via aiohttp
 
-opengeodeweb-microservice==1.*,>=1.3.2rc1
+opengeodeweb-microservice==1.*,>=1.3.2

{opengeodeweb_viewer-1.33.1 → opengeodeweb_viewer-1.34.0}/src/OpenGeodeWeb_Viewer.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: OpenGeodeWeb-Viewer
-Version: 1.33.1
+Version: 1.34.0
 Summary: OpenGeodeWeb-Viewer is an open source framework that proposes handy python functions and wrappers for the OpenGeode ecosystem
 Author-email: Geode-solutions <team-web@geode-solutions.com>
 Project-URL: Homepage, https://github.com/Geode-solutions/OpenGeodeWeb-Viewer
@@ -22,10 +22,11 @@ Requires-Dist: frozenlist==1.*
 Requires-Dist: idna==3.*
 Requires-Dist: kiwisolver==1.*
 Requires-Dist: matplotlib==3.*
-Requires-Dist: multidict==6.*
+Requires-Dist: msgpack==1.*
+Requires-Dist: multidict==7.*
 Requires-Dist: numpy==2.*
 Requires-Dist: packaging==26.*
-Requires-Dist: pillow==12.*
+Requires-Dist: pillow==13.*
 Requires-Dist: propcache==0.*
 Requires-Dist: pyparsing==3.*
 Requires-Dist: python-dateutil==2.9.0.post0
@@ -33,9 +34,9 @@ Requires-Dist: six==1.*
 Requires-Dist: typing-extensions==4.*
 Requires-Dist: vtk==9.6.2
 Requires-Dist: websocket-client==1.8.0
-Requires-Dist: wslink==1.12.4
+Requires-Dist: wslink==2.6.0
 Requires-Dist: yarl==1.*
-Requires-Dist: opengeodeweb-microservice==1.*,>=1.3.2rc1
+Requires-Dist: opengeodeweb-microservice==1.*,>=1.3.2
 Dynamic: license-file
 
 # OpenGeodeWeb-Viewer

{opengeodeweb_viewer-1.33.1 → opengeodeweb_viewer-1.34.0}/src/OpenGeodeWeb_Viewer.egg-info/requires.txt

@@ -9,10 +9,11 @@ frozenlist==1.*
 idna==3.*
 kiwisolver==1.*
 matplotlib==3.*
-multidict==6.*
+msgpack==1.*
+multidict==7.*
 numpy==2.*
 packaging==26.*
-pillow==12.*
+pillow==13.*
 propcache==0.*
 pyparsing==3.*
 python-dateutil==2.9.0.post0
@@ -20,6 +21,6 @@ six==1.*
 typing-extensions==4.*
 vtk==9.6.2
 websocket-client==1.8.0
-wslink==1.12.4
+wslink==2.6.0
 yarl==1.*
-opengeodeweb-microservice==1.*,>=1.3.2rc1
+opengeodeweb-microservice==1.*,>=1.3.2

{opengeodeweb_viewer-1.33.1 → opengeodeweb_viewer-1.34.0}/src/opengeodeweb_viewer/app.py

@@ -155,7 +155,10 @@ def run_server(server_protocol: type[ServerProtocol] = _Server) -> None:
 
     logger.info("args=%s", args)
     server_protocol.configure(args)
-    # Python 3.14 no longer creates a default event loop, which wslink 1.x expects
+    # Wslink 2 writes its ready message without a trailing newline,
+    # which line-based launchers waiting for it never receive
+    os.environ.setdefault("WSLINK_READY_MSG", "wslink: Starting factory\n")
+    # Python 3.14 no longer creates a default event loop, which wslink expects
     asyncio.set_event_loop(asyncio.new_event_loop())
     server.start_webserver(options=args, protocol=server_protocol)
 

{opengeodeweb_viewer-1.33.1 → opengeodeweb_viewer-1.34.0}/src/opengeodeweb_viewer/rpc/viewer/schemas/take_screenshot.json

@@ -28,7 +28,7 @@
     "type": "object",
     "properties": {
       "blob": {
-        "type": "string"
+        "description": "Image file content, sent as binary"
       }
     },
     "required": [

{opengeodeweb_viewer-1.33.1 → opengeodeweb_viewer-1.34.0}/src/opengeodeweb_viewer/rpc/viewer/schemas/take_screenshot.py

@@ -1,5 +1,6 @@
 from pathlib import Path
 from opengeodeweb_microservice.schemas import Route, load_schema
+from typing import Any
 from dataclasses_json import DataClassJsonMixin
 from opengeodeweb_microservice.schemas import print_dataclass
 from enum import Enum
@@ -26,7 +27,8 @@ class TakeScreenshotResponse(DataClassJsonMixin):
     def __post_init__(self) -> None:
         print_dataclass(self)
 
-    blob: str
+    blob: Any
+    """Image file content, sent as binary"""
 
 
 take_screenshot_route = Route(

{opengeodeweb_viewer-1.33.1 → opengeodeweb_viewer-1.34.0}/src/opengeodeweb_viewer/rpc/viewer/viewer_protocols.py

@@ -160,7 +160,7 @@ class VtkViewerView(VtkView):
 
         file_content = file_path.read_bytes()
 
-        return schemas.TakeScreenshotResponse(blob=self.addAttachment(file_content))
+        return schemas.TakeScreenshotResponse(blob=file_content)
 
     @typed_rpc(viewer_prefix, schemas.update_data_route)
     def update_data(self, params: schemas.UpdateData) -> schemas.UpdateDataResponse:

{opengeodeweb_viewer-1.33.1 → opengeodeweb_viewer-1.34.0}/src/opengeodeweb_viewer/typed_rpc.py

@@ -2,6 +2,7 @@
 import functools
 import os
 from collections.abc import Callable
+from dataclasses import fields
 from typing import Any, Concatenate, Protocol, cast
 
 # Third party imports
@@ -30,6 +31,17 @@ def _drop_none(value: object) -> object:
     return value
 
 
+def _to_payload(result: DataClassJsonMixin) -> dict[str, Any]:
+    payload = cast("dict[str, Any]", _drop_none(result.to_dict(encode_json=True)))
+    # dataclasses_json encodes bytes as a list of ints: keep them as bytes,
+    # wslink (msgpack) sends them as binary
+    for field in fields(result):  # type: ignore[arg-type]
+        value = getattr(result, field.name)
+        if isinstance(value, bytes):
+            payload[field.name] = value
+    return payload
+
+
 def _validate_responses() -> bool:
     return os.environ.get("PYTHON_ENV", "prod").strip().lower() in ("dev", "test")
 
@@ -65,7 +77,7 @@ def typed_rpc[SelfT: Publisher, ParamsT: DataClassJsonMixin, ResponseT: DataClas
                     f"expected {route.response.__name__}"
                 )
                 raise TypeError(msg)
-            payload = cast("dict[str, Any]", _drop_none(result.to_dict(encode_json=True)))
+            payload = _to_payload(result)
             if _validate_responses():
                 validate_response(payload)
             if do_stream:

{opengeodeweb_viewer-1.33.1 → opengeodeweb_viewer-1.34.0}/tests/test_utils_protocols.py

@@ -32,7 +32,9 @@ def test_reset_project_after_import(
     server.call(
         VtkUtilsView.utils_prefix + VtkUtilsView.utils_schemas_dict["import_project"]["rpc"]
     )
-    server.get_response()
+    server.get_result(
+        VtkUtilsView.utils_prefix + VtkUtilsView.utils_schemas_dict["import_project"]["rpc"]
+    )
 
     server.call(
         VtkViewerView.viewer_prefix

{opengeodeweb_viewer-1.33.1 → opengeodeweb_viewer-1.34.0}/tests/test_viewer_protocols.py

@@ -54,12 +54,9 @@ def test_get_point_position(server: ServerMonitor, dataset_factory: Callable[...
         + VtkViewerView.viewer_schemas_dict["get_point_position"]["rpc"],
         [{"x": 0, "y": 0}],
     )
-    response = server.get_response()
-    if response is None:
-        pytest.fail("Response is None from get_point_position")
-    if not isinstance(response, dict) or "result" not in response:
-        pytest.fail(f"No 'result' key in response: {response!r}")
-    result = response["result"]
+    result = server.get_result(
+        VtkViewerView.viewer_prefix + VtkViewerView.viewer_schemas_dict["get_point_position"]["rpc"]
+    )
     if result is None:
         return
     if not isinstance(result, dict):
@@ -90,8 +87,9 @@ def test_take_screenshot(server: ServerMonitor, dataset_factory: Callable[..., s
         ],
     )
 
-    server.get_response()
-    blob = server.get_response()
+    blob = server.get_result(
+        VtkViewerView.viewer_prefix + VtkViewerView.viewer_schemas_dict["take_screenshot"]["rpc"]
+    )["blob"]
     assert type(blob) is bytes
 
     first_image_path = server.test_output_dir / "test.jpg"
@@ -112,10 +110,9 @@ def test_take_screenshot(server: ServerMonitor, dataset_factory: Callable[..., s
         ],
     )
 
-    server.get_response()
-    server.get_response()
-    blob = server.get_response()
-    logger.info("%r", blob)
+    blob = server.get_result(
+        VtkViewerView.viewer_prefix + VtkViewerView.viewer_schemas_dict["take_screenshot"]["rpc"]
+    )["blob"]
     assert type(blob) is bytes
 
     first_image_path = server.test_output_dir / "test.png"
@@ -136,10 +133,9 @@ def test_take_screenshot(server: ServerMonitor, dataset_factory: Callable[..., s
         ],
     )
 
-    server.get_response()
-    server.get_response()
-    blob = server.get_response()
-    logger.info("%r", blob)
+    blob = server.get_result(
+        VtkViewerView.viewer_prefix + VtkViewerView.viewer_schemas_dict["take_screenshot"]["rpc"]
+    )["blob"]
     assert type(blob) is bytes
 
     first_image_path = server.test_output_dir / "test.png"
@@ -157,12 +153,11 @@ def test_picked_ids(server: ServerMonitor, dataset_factory: Callable[..., str])
         VtkViewerView.viewer_prefix + VtkViewerView.viewer_schemas_dict["picked_ids"]["rpc"],
         [{"x": 0, "y": 0, "ids": ["00000000000000000000000123456789"]}],
     )
-    response = server.get_response()
+    response = server.get_rpc_response(
+        VtkViewerView.viewer_prefix + VtkViewerView.viewer_schemas_dict["picked_ids"]["rpc"]
+    )
     logger.info("picked_ids response: %r", response)
-    if response is None:
-        logger.warning("picked_ids returned None response")
-        return
-    if not isinstance(response, dict) or "result" not in response:
+    if "result" not in response:
         logger.warning("No 'result' key in picked_ids response: %r", response)
         return
     result = response["result"]