Merge pull request #15 from Geode-solutions/fix/dependencies

Fix/dependencies

Author: JulienChampagnol

COPYLEFT

@@ -2,3 +2,4 @@
 
 VTK: BSD-3-Clause
 Copyright (c) 2008-Present Ken Martin, Will Schroeder, Bill Lorensen.
+CC Attribution 2014-present Borgen

generate_schemas.js

@@ -2,7 +2,6 @@ const fs = require("fs");
 const path = require("path");
 const glob = require("glob");
 const process = require("process");
-const { log } = require("console");
 
 const findDirectoryPath = (targetDirectoryName) => {
   const pathToCheck = path.join(process.cwd(), targetDirectoryName);

requirements.in

@@ -1,2 +1,4 @@
-wslink
-numpy
+jsonschema
+numpy
+vtk
+wslink

requirements.txt

@@ -1,32 +1,74 @@
 #
-# This file is autogenerated by pip-compile with Python 3.10
+# This file is autogenerated by pip-compile with Python 3.9
 # by the following command:
 #
 #    pip-compile requirements.in
 #
-aiohttp==3.8.5
+aiohttp==3.9.3
     # via wslink
 aiosignal==1.3.1
     # via aiohttp
 async-timeout==4.0.3
     # via aiohttp
-attrs==23.1.0
-    # via aiohttp
-charset-normalizer==3.2.0
-    # via aiohttp
-frozenlist==1.4.0
+attrs==23.2.0
+    # via
+    #   aiohttp
+    #   jsonschema
+    #   referencing
+contourpy==1.2.0
+    # via matplotlib
+cycler==0.12.1
+    # via matplotlib
+fonttools==4.49.0
+    # via matplotlib
+frozenlist==1.4.1
     # via
     #   aiohttp
     #   aiosignal
-idna==3.4
+idna==3.6
     # via yarl
-multidict==6.0.4
+importlib-resources==6.1.2
+    # via matplotlib
+jsonschema==4.21.1
+    # via -r requirements.in
+jsonschema-specifications==2023.12.1
+    # via jsonschema
+kiwisolver==1.4.5
+    # via matplotlib
+matplotlib==3.8.3
+    # via vtk
+multidict==6.0.5
     # via
     #   aiohttp
     #   yarl
-numpy==1.25.2
+numpy==1.26.4
+    # via
+    #   -r requirements.in
+    #   contourpy
+    #   matplotlib
+packaging==23.2
+    # via matplotlib
+pillow==10.2.0
+    # via matplotlib
+pyparsing==3.1.2
+    # via matplotlib
+python-dateutil==2.9.0.post0
+    # via matplotlib
+referencing==0.33.0
+    # via
+    #   jsonschema
+    #   jsonschema-specifications
+rpds-py==0.18.0
+    # via
+    #   jsonschema
+    #   referencing
+six==1.16.0
+    # via python-dateutil
+vtk==9.3.0
     # via -r requirements.in
-wslink==1.11.1
+wslink==1.12.4
     # via -r requirements.in
-yarl==1.9.2
+yarl==1.9.4
     # via aiohttp
+zipp==3.17.0
+    # via importlib-resources

src/opengeodeweb_viewer/vtk_protocol.py

@@ -214,7 +214,7 @@ def get_point_position(self, params):
         return {"x": ppos[0], "y": ppos[1], "z": ppos[2]}
 
     @exportRpc(reset_json["rpc"])
-    def reset(self):
+    def reset(self, params):
         validate_schemas(params, reset_json)
         renderWindow = self.getView("-1")
         renderWindow.GetRenderers().GetFirstRenderer().RemoveAllViewProps()

src/opengeodeweb_viewer/vtkw_server.py

@@ -78,9 +78,10 @@ def initialize(self):
 
 
 if __name__ == "__main__":
-    if os.path.isfile("./.env"):
-        basedir = os.path.abspath(os.path.dirname(__file__))
-        dotenv.load_dotenv(os.path.join(basedir, ".env"))
+    basedir = os.path.abspath(os.path.dirname(__file__))
+    dot_env_path = os.path.join(basedir, "../../.env")
+    if os.path.isfile(dot_env_path):
+        dotenv.load_dotenv(dot_env_path)
     PYTHON_ENV = os.environ.get("PYTHON_ENV", default="prod").strip().lower()
     if PYTHON_ENV == "prod":
         config.prod_config()