From 2eb8e266caf6e3020bb0958eca2d0a639882aff9 Mon Sep 17 00:00:00 2001 From: JulienChampagnol Date: Wed, 1 Oct 2025 15:46:37 +0200 Subject: [PATCH 01/17] fix(Kill): kill rpc --- .gitignore | 4 +-- package-lock.json | 15 ++++---- pyproject.toml | 1 + requirements.txt | 36 ++++++------------- src/opengeodeweb_viewer/rpc/schemas/kill.json | 7 ++++ .../rpc/utils_protocols.py | 26 ++++++++++++++ src/opengeodeweb_viewer/vtkw_server.py | 2 ++ 7 files changed, 57 insertions(+), 34 deletions(-) create mode 100644 src/opengeodeweb_viewer/rpc/schemas/kill.json create mode 100644 src/opengeodeweb_viewer/rpc/utils_protocols.py diff --git a/.gitignore b/.gitignore index 87258e8..8d3da5d 100644 --- a/.gitignore +++ b/.gitignore @@ -6,9 +6,9 @@ __pycache__/ .env /node_modules latest_logs -schemas.json build /src/tests/tests_output/ *.egg-info .coverage* -.mypy_cache \ No newline at end of file +.mypy_cache +opengeodeweb_viewer_schemas.json \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index f426912..e7c8650 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,16 +9,19 @@ "version": "0.0.0", "license": "MIT", "dependencies": { - "@geode/opengeodeweb-back": "latest" + "@geode/opengeodeweb-microservice": "latest" } }, - "node_modules/@geode/opengeodeweb-back": { - "version": "5.10.0-rc.1", - "resolved": "https://registry.npmjs.org/@geode/opengeodeweb-back/-/opengeodeweb-back-5.10.0-rc.1.tgz", - "integrity": "sha512-yMTyMM+CA3YJu+VecZWxqIOEd3h9Vf4aCdNk8zYQOu/VDh8fdcOFyh9bclmhMrNQQc3hbBgvCqpebLjxxRri/w==", + "node_modules/@geode/opengeodeweb-microservice": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@geode/opengeodeweb-microservice/-/opengeodeweb-microservice-1.0.0.tgz", + "integrity": "sha512-+btAWjHecfqGAZlM/UElwlAREPtLLGsJQr1+ELqS4yZU9A4RkFliCNFkV1jmZNyBEj0QsHZzirD63/rgMj8MOw==", "license": "MIT", "dependencies": { "glob": "^11.0.3" + }, + "bin": { + "ogw-generate-schemas": "generate_schemas.js" } }, "node_modules/@isaacs/balanced-match": { @@ -496,4 +499,4 @@ } } } -} \ No newline at end of file +} diff --git a/pyproject.toml b/pyproject.toml index e04df9d..3053b58 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -37,6 +37,7 @@ dependencies = {file = ["requirements.txt"]} where = ["src"] [tool.setuptools.package-data] +"opengeodeweb_viewer.rpc.schemas" = ["*.json"] "opengeodeweb_viewer.rpc.generic.schemas" = ["*.json"] "opengeodeweb_viewer.rpc.mesh.schemas" = ["*.json"] "opengeodeweb_viewer.rpc.mesh.points.schemas" = ["*.json"] diff --git a/requirements.txt b/requirements.txt index 55efa4d..ecc9ba0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile with Python 3.12 # by the following command: # -# pip-compile --output-file=requirements.txt --pre requirements-internal.in requirements.in +# pip-compile --cert=None --client-cert=None --index-url=None --output-file=requirements.txt --pip-args=None requirements-internal.in requirements.in # aiohappyeyeballs==2.6.1 # via aiohttp @@ -13,19 +13,13 @@ aiosignal==1.4.0 attrs==25.3.0 # via aiohttp blinker==1.9.0 - # via - # flask - # opengeodeweb-microservice + # via flask click==8.3.0 - # via - # flask - # opengeodeweb-microservice + # via flask fastjsonschema==2.21.1 # via opengeodeweb-microservice flask==3.1.2 - # via - # flask-sqlalchemy - # opengeodeweb-microservice + # via flask-sqlalchemy flask-sqlalchemy==3.1.1 # via opengeodeweb-microservice frozenlist==1.7.0 @@ -33,30 +27,23 @@ frozenlist==1.7.0 # aiohttp # aiosignal greenlet==3.2.4 - # via - # opengeodeweb-microservice - # sqlalchemy + # via sqlalchemy idna==3.10 # via yarl itsdangerous==2.2.0 - # via - # flask - # opengeodeweb-microservice + # via flask jinja2==3.1.6 - # via - # flask - # opengeodeweb-microservice -markupsafe==3.0.2 + # via flask +markupsafe==3.0.3 # via # flask # jinja2 - # opengeodeweb-microservice # werkzeug multidict==6.6.4 # via # aiohttp # yarl -opengeodeweb-microservice==1.*,>=1.0.1rc1 +opengeodeweb-microservice==1.0.0 # via -r requirements-internal.in propcache==0.3.2 # via @@ -69,14 +56,11 @@ sqlalchemy==2.0.43 typing-extensions==4.15.0 # via # aiosignal - # opengeodeweb-microservice # sqlalchemy websocket-client==1.8.0 # via -r requirements.in werkzeug==3.1.3 - # via - # flask - # opengeodeweb-microservice + # via flask wslink==1.12.4 # via -r requirements.in yarl==1.20.1 diff --git a/src/opengeodeweb_viewer/rpc/schemas/kill.json b/src/opengeodeweb_viewer/rpc/schemas/kill.json new file mode 100644 index 0000000..c27f3d3 --- /dev/null +++ b/src/opengeodeweb_viewer/rpc/schemas/kill.json @@ -0,0 +1,7 @@ +{ + "rpc": "kill", + "type": "object", + "properties": {}, + "required": [], + "additionalProperties": false +} \ No newline at end of file diff --git a/src/opengeodeweb_viewer/rpc/utils_protocols.py b/src/opengeodeweb_viewer/rpc/utils_protocols.py new file mode 100644 index 0000000..84acb63 --- /dev/null +++ b/src/opengeodeweb_viewer/rpc/utils_protocols.py @@ -0,0 +1,26 @@ +# Standard library imports +import os + +# Third party imports +import vtk +from wslink import register as exportRpc + +# Local application imports +from opengeodeweb_viewer.utils_functions import get_schemas_dict, validate_schema +from opengeodeweb_viewer.vtk_protocol import VtkView + + +class VtkUtilsView(VtkView): + mesh_prefix = "opengeodeweb_viewer.utils" + mesh_schemas_dict = get_schemas_dict( + os.path.join(os.path.dirname(__file__), "schemas") + ) + + def __init__(self) -> None: + super().__init__() + + @exportRpc(mesh_prefix + mesh_schemas_dict["kill"]["rpc"]) + def kill(self, params) -> None: + validate_schema(params, self.mesh_schemas_dict["kill"], self.mesh_prefix) + print("Manual viewer kill, shutting down...", flush=True) + os._exit(0) diff --git a/src/opengeodeweb_viewer/vtkw_server.py b/src/opengeodeweb_viewer/vtkw_server.py index 35135a9..36c263e 100644 --- a/src/opengeodeweb_viewer/vtkw_server.py +++ b/src/opengeodeweb_viewer/vtkw_server.py @@ -37,6 +37,7 @@ VtkModelBlocksView, ) from .rpc.generic.generic_protocols import VtkGenericView +from .rpc.utils_protocols import VtkUtilsView # ============================================================================= @@ -78,6 +79,7 @@ def initialize(self): model_protocols = VtkModelView() vtk_view = VtkView() self.registerVtkWebProtocol(vtk_view) + self.registerVtkWebProtocol(VtkUtilsView()) self.registerVtkWebProtocol(VtkViewerView()) self.registerVtkWebProtocol(mesh_protocols) self.registerVtkWebProtocol(VtkMeshPointsView()) From 7470c34c95e717d18a122fdf29e31e0bea8b938b Mon Sep 17 00:00:00 2001 From: JulienChampagnol Date: Thu, 2 Oct 2025 09:26:51 +0200 Subject: [PATCH 02/17] remove utils suffix --- src/opengeodeweb_viewer/rpc/utils_protocols.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/opengeodeweb_viewer/rpc/utils_protocols.py b/src/opengeodeweb_viewer/rpc/utils_protocols.py index 84acb63..8639880 100644 --- a/src/opengeodeweb_viewer/rpc/utils_protocols.py +++ b/src/opengeodeweb_viewer/rpc/utils_protocols.py @@ -11,7 +11,7 @@ class VtkUtilsView(VtkView): - mesh_prefix = "opengeodeweb_viewer.utils" + mesh_prefix = "opengeodeweb_viewer." mesh_schemas_dict = get_schemas_dict( os.path.join(os.path.dirname(__file__), "schemas") ) @@ -20,7 +20,6 @@ def __init__(self) -> None: super().__init__() @exportRpc(mesh_prefix + mesh_schemas_dict["kill"]["rpc"]) - def kill(self, params) -> None: - validate_schema(params, self.mesh_schemas_dict["kill"], self.mesh_prefix) + def kill(self) -> None: print("Manual viewer kill, shutting down...", flush=True) os._exit(0) From 0b89bdeefc88e7389517e506a26fcbcc1357264f Mon Sep 17 00:00:00 2001 From: JulienChampagnol Date: Thu, 2 Oct 2025 09:54:08 +0200 Subject: [PATCH 03/17] import cleanup --- src/opengeodeweb_viewer/rpc/utils_protocols.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/opengeodeweb_viewer/rpc/utils_protocols.py b/src/opengeodeweb_viewer/rpc/utils_protocols.py index 8639880..c67b36d 100644 --- a/src/opengeodeweb_viewer/rpc/utils_protocols.py +++ b/src/opengeodeweb_viewer/rpc/utils_protocols.py @@ -2,11 +2,10 @@ import os # Third party imports -import vtk from wslink import register as exportRpc # Local application imports -from opengeodeweb_viewer.utils_functions import get_schemas_dict, validate_schema +from opengeodeweb_viewer.utils_functions import get_schemas_dict from opengeodeweb_viewer.vtk_protocol import VtkView From c1881e2dde52dbfd2bbaf680bb42784505fc1662 Mon Sep 17 00:00:00 2001 From: JulienChampagnol <91873154+JulienChampagnol@users.noreply.github.com> Date: Thu, 2 Oct 2025 08:33:01 +0000 Subject: [PATCH 04/17] Apply prepare changes --- requirements.txt | 49 ++++++++++++++---------------------------------- 1 file changed, 14 insertions(+), 35 deletions(-) diff --git a/requirements.txt b/requirements.txt index 8dcfaf5..81fb5ba 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile with Python 3.12 # by the following command: # -# pip-compile --cert=None --client-cert=None --index-url=None --output-file=requirements.txt --pip-args=None requirements-internal.in requirements.in +# pip-compile --output-file=./requirements.txt --pre ./requirements.in # aiohappyeyeballs==2.*,>=2.6.1 # via aiohttp @@ -12,43 +12,30 @@ aiosignal==1.*,>=1.4.0 # via aiohttp attrs==25.*,>=25.3.0 # via aiohttp -blinker==1.9.0 - # via flask -click==8.3.0 - # via flask -fastjsonschema==2.21.1 - # via opengeodeweb-microservice -flask==3.1.2 - # via flask-sqlalchemy -flask-sqlalchemy==3.1.1 - # via opengeodeweb-microservice +contourpy==1.*,>=1.3.3 + # via matplotlib +cycler==0.*,>=0.12.1 + # via matplotlib fonttools==4.*,>=4.60.1 # via matplotlib frozenlist==1.*,>=1.7.0 # via # aiohttp # aiosignal -greenlet==3.2.4 - # via sqlalchemy idna==3.10 # via yarl -itsdangerous==2.2.0 - # via flask -jinja2==3.1.6 - # via flask -markupsafe==3.0.3 - # via - # flask - # jinja2 - # werkzeug +kiwisolver==1.4.10rc0 + # via matplotlib matplotlib==3.*,>=3.10.6 # via vtk multidict==6.*,>=6.6.4 # via # aiohttp # yarl -opengeodeweb-microservice==1.0.0 - # via -r requirements-internal.in +numpy==2.*,>=2.3.3 + # via + # contourpy + # matplotlib packaging==25.0 # via matplotlib pillow==11.*,>=11.3.0 @@ -57,26 +44,18 @@ propcache==0.*,>=0.3.2 # via # aiohttp # yarl -pyparsing==3.*,>=3.3.0a1 +pyparsing==3.3.0a1 # via matplotlib -python-dateutil==2.9.*,>=2.9.0.post0 +python-dateutil==2.9.0.post0 # via matplotlib six==1.*,>=1.17.0 # via python-dateutil -sqlalchemy==2.*,>=2.0.43 - # via - # flask-sqlalchemy - # opengeodeweb-microservice typing-extensions==4.*,>=4.15.0 - # via - # aiosignal - # sqlalchemy + # via aiosignal vtk==9.5.2 # via -r requirements.in websocket-client==1.*,>=1.8.0 # via -r requirements.in -werkzeug==3.1.3 - # via flask wslink==1.12.4 # via -r requirements.in yarl==1.*,>=1.20.1 From 522ea5c76364dfd7c2f45cab6b5f484c4201c5f5 Mon Sep 17 00:00:00 2001 From: JulienChampagnol Date: Thu, 2 Oct 2025 12:13:29 +0200 Subject: [PATCH 05/17] mypy --- src/opengeodeweb_viewer/rpc/utils_protocols.py | 2 +- src/opengeodeweb_viewer/utils_functions.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/opengeodeweb_viewer/rpc/utils_protocols.py b/src/opengeodeweb_viewer/rpc/utils_protocols.py index ccd814e..9ce4e04 100644 --- a/src/opengeodeweb_viewer/rpc/utils_protocols.py +++ b/src/opengeodeweb_viewer/rpc/utils_protocols.py @@ -2,7 +2,7 @@ import os # Third party imports -from wslink import register as exportRpc +from wslink import register as exportRpc # type: ignore # Local application imports from opengeodeweb_viewer.utils_functions import get_schemas_dict diff --git a/src/opengeodeweb_viewer/utils_functions.py b/src/opengeodeweb_viewer/utils_functions.py index edf3163..84b12c9 100644 --- a/src/opengeodeweb_viewer/utils_functions.py +++ b/src/opengeodeweb_viewer/utils_functions.py @@ -9,7 +9,7 @@ # Local application imports -def get_schemas_dict(path): +def get_schemas_dict(path: str) -> object: json_files = os.listdir(path) schemas_dict = {} for json_file in json_files: From b88c111b4db26c8bdc9d9a33e875c06754baee98 Mon Sep 17 00:00:00 2001 From: JulienChampagnol Date: Thu, 2 Oct 2025 12:17:32 +0200 Subject: [PATCH 06/17] VtkView # type: ignore --- src/opengeodeweb_viewer/vtk_protocol.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/opengeodeweb_viewer/vtk_protocol.py b/src/opengeodeweb_viewer/vtk_protocol.py index 44dd12a..b81d559 100644 --- a/src/opengeodeweb_viewer/vtk_protocol.py +++ b/src/opengeodeweb_viewer/vtk_protocol.py @@ -8,7 +8,7 @@ # Local application imports -class VtkView(vtk_protocols.vtkWebProtocol): +class VtkView(vtk_protocols.vtkWebProtocol): # type: ignore def __init__(self): super().__init__() self.DATA_FOLDER_PATH = os.getenv("DATA_FOLDER_PATH") From 473f26c536d687afa50c8c341d6291fefe9d7f04 Mon Sep 17 00:00:00 2001 From: JulienChampagnol Date: Thu, 2 Oct 2025 12:25:48 +0200 Subject: [PATCH 07/17] test --- src/opengeodeweb_viewer/rpc/utils_protocols.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/opengeodeweb_viewer/rpc/utils_protocols.py b/src/opengeodeweb_viewer/rpc/utils_protocols.py index 9ce4e04..5537a89 100644 --- a/src/opengeodeweb_viewer/rpc/utils_protocols.py +++ b/src/opengeodeweb_viewer/rpc/utils_protocols.py @@ -15,10 +15,10 @@ class VtkUtilsView(VtkView): # type: ignore os.path.join(os.path.dirname(__file__), "schemas") ) - def __init__(self) -> None: + def __init__(self) -> None: # type: ignore super().__init__() @exportRpc(ogw_prefix + ogw_schemas_dict["kill"]["rpc"]) - def kill(self) -> None: + def kill(self) -> None: # type: ignore print("Manual viewer kill, shutting down...", flush=True) os._exit(0) From 0030e48b1ea8354e298b3498d540a226ea31c758 Mon Sep 17 00:00:00 2001 From: JulienChampagnol Date: Thu, 2 Oct 2025 12:31:33 +0200 Subject: [PATCH 08/17] test --- src/opengeodeweb_viewer/rpc/utils_protocols.py | 2 +- src/opengeodeweb_viewer/vtk_protocol.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/opengeodeweb_viewer/rpc/utils_protocols.py b/src/opengeodeweb_viewer/rpc/utils_protocols.py index 5537a89..7190fb0 100644 --- a/src/opengeodeweb_viewer/rpc/utils_protocols.py +++ b/src/opengeodeweb_viewer/rpc/utils_protocols.py @@ -9,7 +9,7 @@ from opengeodeweb_viewer.vtk_protocol import VtkView -class VtkUtilsView(VtkView): # type: ignore +class VtkUtilsView(VtkView): ogw_prefix = "opengeodeweb_viewer." ogw_schemas_dict = get_schemas_dict( os.path.join(os.path.dirname(__file__), "schemas") diff --git a/src/opengeodeweb_viewer/vtk_protocol.py b/src/opengeodeweb_viewer/vtk_protocol.py index b81d559..3e9e952 100644 --- a/src/opengeodeweb_viewer/vtk_protocol.py +++ b/src/opengeodeweb_viewer/vtk_protocol.py @@ -9,7 +9,7 @@ class VtkView(vtk_protocols.vtkWebProtocol): # type: ignore - def __init__(self): + def __init__(self) -> None: super().__init__() self.DATA_FOLDER_PATH = os.getenv("DATA_FOLDER_PATH") self.DataReader = vtk.vtkXMLPolyDataReader() From 6f3f0b535f0880090c19ea19815878452ed71dfc Mon Sep 17 00:00:00 2001 From: JulienChampagnol Date: Thu, 2 Oct 2025 13:43:51 +0200 Subject: [PATCH 09/17] test --- src/opengeodeweb_viewer/rpc/utils_protocols.py | 8 ++++---- src/opengeodeweb_viewer/vtk_protocol.py | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/opengeodeweb_viewer/rpc/utils_protocols.py b/src/opengeodeweb_viewer/rpc/utils_protocols.py index 7190fb0..6eface9 100644 --- a/src/opengeodeweb_viewer/rpc/utils_protocols.py +++ b/src/opengeodeweb_viewer/rpc/utils_protocols.py @@ -6,19 +6,19 @@ # Local application imports from opengeodeweb_viewer.utils_functions import get_schemas_dict -from opengeodeweb_viewer.vtk_protocol import VtkView +from opengeodeweb_viewer.vtk_protocol import VtkView # type: ignore -class VtkUtilsView(VtkView): +class VtkUtilsView(VtkView): # type: ignore ogw_prefix = "opengeodeweb_viewer." ogw_schemas_dict = get_schemas_dict( os.path.join(os.path.dirname(__file__), "schemas") ) - def __init__(self) -> None: # type: ignore + def __init__(self) -> None: super().__init__() @exportRpc(ogw_prefix + ogw_schemas_dict["kill"]["rpc"]) - def kill(self) -> None: # type: ignore + def kill(self) -> None: print("Manual viewer kill, shutting down...", flush=True) os._exit(0) diff --git a/src/opengeodeweb_viewer/vtk_protocol.py b/src/opengeodeweb_viewer/vtk_protocol.py index 3e9e952..44dd12a 100644 --- a/src/opengeodeweb_viewer/vtk_protocol.py +++ b/src/opengeodeweb_viewer/vtk_protocol.py @@ -8,8 +8,8 @@ # Local application imports -class VtkView(vtk_protocols.vtkWebProtocol): # type: ignore - def __init__(self) -> None: +class VtkView(vtk_protocols.vtkWebProtocol): + def __init__(self): super().__init__() self.DATA_FOLDER_PATH = os.getenv("DATA_FOLDER_PATH") self.DataReader = vtk.vtkXMLPolyDataReader() From d6c1df60c52d0ab2f12de32e4078b98a047820b4 Mon Sep 17 00:00:00 2001 From: JulienChampagnol Date: Thu, 2 Oct 2025 13:51:11 +0200 Subject: [PATCH 10/17] test --- src/opengeodeweb_viewer/vtk_protocol.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/opengeodeweb_viewer/vtk_protocol.py b/src/opengeodeweb_viewer/vtk_protocol.py index 44dd12a..a124b6c 100644 --- a/src/opengeodeweb_viewer/vtk_protocol.py +++ b/src/opengeodeweb_viewer/vtk_protocol.py @@ -3,14 +3,14 @@ # Third party imports import vtk -from vtk.web import protocols as vtk_protocols +from vtk.web import protocols as vtk_protocols # type: ignore # Local application imports -class VtkView(vtk_protocols.vtkWebProtocol): - def __init__(self): - super().__init__() +class VtkView(vtk_protocols.vtkWebProtocol): # type: ignore + def __init__(self) -> None: + super().__init__() # type: ignore self.DATA_FOLDER_PATH = os.getenv("DATA_FOLDER_PATH") self.DataReader = vtk.vtkXMLPolyDataReader() self.ImageReader = vtk.vtkXMLImageDataReader() From dbd683f836a8d575bef7493b96691ea750c4086c Mon Sep 17 00:00:00 2001 From: JulienChampagnol Date: Thu, 2 Oct 2025 13:59:19 +0200 Subject: [PATCH 11/17] test --- src/opengeodeweb_viewer/rpc/utils_protocols.py | 2 +- src/opengeodeweb_viewer/vtk_protocol.py | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/opengeodeweb_viewer/rpc/utils_protocols.py b/src/opengeodeweb_viewer/rpc/utils_protocols.py index 6eface9..5325b17 100644 --- a/src/opengeodeweb_viewer/rpc/utils_protocols.py +++ b/src/opengeodeweb_viewer/rpc/utils_protocols.py @@ -9,7 +9,7 @@ from opengeodeweb_viewer.vtk_protocol import VtkView # type: ignore -class VtkUtilsView(VtkView): # type: ignore +class VtkUtilsView(VtkView): ogw_prefix = "opengeodeweb_viewer." ogw_schemas_dict = get_schemas_dict( os.path.join(os.path.dirname(__file__), "schemas") diff --git a/src/opengeodeweb_viewer/vtk_protocol.py b/src/opengeodeweb_viewer/vtk_protocol.py index a124b6c..a4f4867 100644 --- a/src/opengeodeweb_viewer/vtk_protocol.py +++ b/src/opengeodeweb_viewer/vtk_protocol.py @@ -7,10 +7,12 @@ # Local application imports +# mypy: allow-untyped-defs -class VtkView(vtk_protocols.vtkWebProtocol): # type: ignore - def __init__(self) -> None: - super().__init__() # type: ignore + +class VtkView(vtk_protocols.vtkWebProtocol): + def __init__(self): + super().__init__() self.DATA_FOLDER_PATH = os.getenv("DATA_FOLDER_PATH") self.DataReader = vtk.vtkXMLPolyDataReader() self.ImageReader = vtk.vtkXMLImageDataReader() From 0f54c47f75f0f0caef31cd1d0a8bb207c266c94b Mon Sep 17 00:00:00 2001 From: JulienChampagnol Date: Thu, 2 Oct 2025 14:05:31 +0200 Subject: [PATCH 12/17] test --- src/opengeodeweb_viewer/rpc/utils_protocols.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/opengeodeweb_viewer/rpc/utils_protocols.py b/src/opengeodeweb_viewer/rpc/utils_protocols.py index 5325b17..1511565 100644 --- a/src/opengeodeweb_viewer/rpc/utils_protocols.py +++ b/src/opengeodeweb_viewer/rpc/utils_protocols.py @@ -1,12 +1,13 @@ +# type: ignore # Standard library imports import os # Third party imports -from wslink import register as exportRpc # type: ignore +from wslink import register as exportRpc # Local application imports from opengeodeweb_viewer.utils_functions import get_schemas_dict -from opengeodeweb_viewer.vtk_protocol import VtkView # type: ignore +from opengeodeweb_viewer.vtk_protocol import VtkView class VtkUtilsView(VtkView): From 95e665056c22c4f222a7ce324ee871a9c6e5e4d1 Mon Sep 17 00:00:00 2001 From: JulienChampagnol Date: Thu, 2 Oct 2025 14:19:23 +0200 Subject: [PATCH 13/17] test --- src/opengeodeweb_viewer/vtkw_server.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/opengeodeweb_viewer/vtkw_server.py b/src/opengeodeweb_viewer/vtkw_server.py index 36c263e..d4d203d 100644 --- a/src/opengeodeweb_viewer/vtkw_server.py +++ b/src/opengeodeweb_viewer/vtkw_server.py @@ -37,7 +37,7 @@ VtkModelBlocksView, ) from .rpc.generic.generic_protocols import VtkGenericView -from .rpc.utils_protocols import VtkUtilsView +from .rpc.utils_protocols import VtkUtilsView # type: ignore # ============================================================================= From 626ee821ec447da9ff73ef227c05d1fd2b4ef282 Mon Sep 17 00:00:00 2001 From: JulienChampagnol Date: Thu, 2 Oct 2025 16:49:11 +0200 Subject: [PATCH 14/17] requirements.txt --- requirements.txt | 73 ++++++++++++++++++++++++++++++++++-------------- 1 file changed, 52 insertions(+), 21 deletions(-) diff --git a/requirements.txt b/requirements.txt index 81fb5ba..e73283c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,61 +2,92 @@ # This file is autogenerated by pip-compile with Python 3.12 # by the following command: # -# pip-compile --output-file=./requirements.txt --pre ./requirements.in +# pip-compile --output-file=requirements.txt requirements-internal.in requirements.in # -aiohappyeyeballs==2.*,>=2.6.1 +aiohappyeyeballs==2.6.1 # via aiohttp -aiohttp==3.*,>=3.12.15 +aiohttp==3.12.15 # via wslink -aiosignal==1.*,>=1.4.0 +aiosignal==1.4.0 # via aiohttp -attrs==25.*,>=25.3.0 +attrs==25.3.0 # via aiohttp -contourpy==1.*,>=1.3.3 +blinker==1.9.0 + # via flask +click==8.3.0 + # via flask +contourpy==1.3.3 # via matplotlib -cycler==0.*,>=0.12.1 +cycler==0.12.1 # via matplotlib -fonttools==4.*,>=4.60.1 +fastjsonschema==2.21.1 + # via opengeodeweb-microservice +flask==3.1.2 + # via flask-sqlalchemy +flask-sqlalchemy==3.1.1 + # via opengeodeweb-microservice +fonttools==4.60.1 # via matplotlib -frozenlist==1.*,>=1.7.0 +frozenlist==1.7.0 # via # aiohttp # aiosignal +greenlet==3.2.4 + # via sqlalchemy idna==3.10 # via yarl -kiwisolver==1.4.10rc0 +itsdangerous==2.2.0 + # via flask +jinja2==3.1.6 + # via flask +kiwisolver==1.4.9 # via matplotlib -matplotlib==3.*,>=3.10.6 +markupsafe==3.0.3 + # via + # flask + # jinja2 + # werkzeug +matplotlib==3.10.6 # via vtk -multidict==6.*,>=6.6.4 +multidict==6.6.4 # via # aiohttp # yarl -numpy==2.*,>=2.3.3 +numpy==2.3.3 # via # contourpy # matplotlib +opengeodeweb-microservice==1.0.0 + # via -r requirements-internal.in packaging==25.0 # via matplotlib -pillow==11.*,>=11.3.0 +pillow==11.3.0 # via matplotlib -propcache==0.*,>=0.3.2 +propcache==0.3.2 # via # aiohttp # yarl -pyparsing==3.3.0a1 +pyparsing==3.2.5 # via matplotlib python-dateutil==2.9.0.post0 # via matplotlib -six==1.*,>=1.17.0 +six==1.17.0 # via python-dateutil -typing-extensions==4.*,>=4.15.0 - # via aiosignal +sqlalchemy==2.0.43 + # via + # flask-sqlalchemy + # opengeodeweb-microservice +typing-extensions==4.15.0 + # via + # aiosignal + # sqlalchemy vtk==9.5.2 # via -r requirements.in -websocket-client==1.*,>=1.8.0 +websocket-client==1.8.0 # via -r requirements.in +werkzeug==3.1.3 + # via flask wslink==1.12.4 # via -r requirements.in -yarl==1.*,>=1.20.1 +yarl==1.20.1 # via aiohttp From 364b16bec5ba247351cfded267f3f8b94c8556de Mon Sep 17 00:00:00 2001 From: JulienChampagnol <91873154+JulienChampagnol@users.noreply.github.com> Date: Fri, 3 Oct 2025 07:18:20 +0000 Subject: [PATCH 15/17] Apply prepare changes --- requirements.txt | 49 ++---------------------------------------------- 1 file changed, 2 insertions(+), 47 deletions(-) diff --git a/requirements.txt b/requirements.txt index c3e893a..89d6679 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile with Python 3.12 # by the following command: # -# pip-compile --output-file=requirements.txt requirements-internal.in requirements.in +# pip-compile --output-file=./requirements.txt --pre ./requirements.in # aiohappyeyeballs~=2.0 # via aiohttp @@ -12,53 +12,20 @@ aiosignal~=1.0 # via aiohttp attrs~=25.0 # via aiohttp -blinker~=1.0 - # via - # flask - # opengeodeweb-microservice -click~=8.0 - # via - # flask - # opengeodeweb-microservice contourpy~=1.0 # via matplotlib cycler~=0.0 # via matplotlib -fastjsonschema~=2.0 - # via opengeodeweb-microservice -flask~=3.0 - # via - # flask-sqlalchemy - # opengeodeweb-microservice -flask-sqlalchemy==3.1.1 - # via opengeodeweb-microservice fonttools~=4.0 # via matplotlib frozenlist~=1.0 # via # aiohttp # aiosignal -greenlet~=3.0 - # via - # opengeodeweb-microservice - # sqlalchemy idna~=3.0 # via yarl -itsdangerous~=2.0 - # via - # flask - # opengeodeweb-microservice -jinja2~=3.0 - # via - # flask - # opengeodeweb-microservice kiwisolver~=1.0 # via matplotlib -markupsafe~=3.0 - # via - # flask - # jinja2 - # werkzeug matplotlib~=3.0 # via vtk multidict~=6.0 @@ -69,8 +36,6 @@ numpy~=2.0 # via # contourpy # matplotlib -opengeodeweb-microservice==1.0.1rc3 - # via -r requirements-internal.in packaging~=25.0 # via matplotlib pillow~=11.0 @@ -85,22 +50,12 @@ python-dateutil==2.9.0.post0 # via matplotlib six~=1.0 # via python-dateutil -sqlalchemy~=2.0 - # via - # flask-sqlalchemy - # opengeodeweb-microservice typing-extensions==4.15.0 - # via - # aiosignal - # sqlalchemy + # via aiosignal vtk~=9.0 # via -r requirements.in websocket-client==1.8.0 # via -r requirements.in -werkzeug~=3.0 - # via - # flask - # opengeodeweb-microservice wslink~=1.0 # via -r requirements.in yarl~=1.0 From b00e5907b811c489b88747676d679868bf20af8f Mon Sep 17 00:00:00 2001 From: JulienChampagnol <91873154+JulienChampagnol@users.noreply.github.com> Date: Fri, 3 Oct 2025 08:36:12 +0000 Subject: [PATCH 16/17] Apply prepare changes --- requirements.txt | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/requirements.txt b/requirements.txt index 50b2483..07cde6d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -16,14 +16,6 @@ contourpy~=1.0 # via matplotlib cycler~=0.0 # via matplotlib -fastjsonschema~=2.0 - # via opengeodeweb-microservice -flask~=3.0 - # via - # flask-sqlalchemy - # opengeodeweb-microservice -flask-sqlalchemy~=3.0 - # via opengeodeweb-microservice fonttools~=4.0 # via matplotlib frozenlist~=1.0 @@ -44,8 +36,6 @@ numpy~=2.0 # via # contourpy # matplotlib -opengeodeweb-microservice~=1.0 - # via -r requirements-internal.in packaging~=25.0 # via matplotlib pillow~=11.0 @@ -60,23 +50,12 @@ python-dateutil==2.9.0.post0 # via matplotlib six~=1.0 # via python-dateutil -sqlalchemy~=2.0 - # via - # flask-sqlalchemy - # opengeodeweb-microservice typing-extensions~=4.0 - # via - # aiosignal - # opengeodeweb-microservice - # sqlalchemy + # via aiosignal vtk==9.5.2 # via -r requirements.in websocket-client~=1.0 # via -r requirements.in -werkzeug~=3.0 - # via - # flask - # opengeodeweb-microservice wslink==1.12.4 # via -r requirements.in yarl~=1.0 From 70734eff005fd4c55902fec3ec98b1f52e95b78c Mon Sep 17 00:00:00 2001 From: BotellaA <3213882+BotellaA@users.noreply.github.com> Date: Thu, 9 Oct 2025 12:49:17 +0000 Subject: [PATCH 17/17] Apply prepare changes --- requirements.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index b3bd081..b751634 100644 --- a/requirements.txt +++ b/requirements.txt @@ -61,4 +61,3 @@ wslink==1.12.4 yarl==1.22.0 # via aiohttp -opengeodeweb-microservice~=1.0