Merge pull request #209 from Geode-solutions/fix/type_ckecker

BotellaA · web-flow · commit aa8a582e4b38 · 2026-01-07T15:05:14.000+01:00
Fix/type ckecker
diff --git a/requirements.txt b/requirements.txt
@@ -60,4 +60,3 @@ werkzeug==3.1.2
     #   flask
     #   flask-cors
 
-opengeodeweb-microservice==1.*,>=1.0.11
diff --git a/src/opengeodeweb_back/geode_functions.py b/src/opengeodeweb_back/geode_functions.py
@@ -7,10 +7,7 @@
 
 # Local application imports
 from .geode_objects import geode_objects
-from .geode_objects.types import (
-    GeodeObjectType,
-    geode_object_type,
-)
+from .geode_objects.types import GeodeObjectType, geode_object_type
 from .geode_objects.geode_object import GeodeObject
 from opengeodeweb_microservice.database.data import Data
 
diff --git a/src/opengeodeweb_back/geode_objects/geode_graph.py b/src/opengeodeweb_back/geode_objects/geode_graph.py
@@ -3,8 +3,6 @@
 
 # Third party imports
 import opengeode as og
-import opengeode_inspector as og_inspector
-import geode_viewables as viewables
 
 # Local application imports
 from .types import GeodeMeshType
diff --git a/src/opengeodeweb_back/geode_objects/geode_grid2d.py b/src/opengeodeweb_back/geode_objects/geode_grid2d.py
@@ -4,10 +4,8 @@
 
 # Third party imports
 import opengeode as og
-import geode_viewables as viewables
 
 # Local application imports
-from .types import GeodeMeshType
 from .geode_mesh import GeodeMesh
 
 
diff --git a/src/opengeodeweb_back/geode_objects/geode_grid3d.py b/src/opengeodeweb_back/geode_objects/geode_grid3d.py
@@ -4,10 +4,8 @@
 
 # Third party imports
 import opengeode as og
-import geode_viewables as viewables
 
 # Local application imports
-from .types import GeodeMeshType
 from .geode_mesh import GeodeMesh
 
 
diff --git a/src/opengeodeweb_back/geode_objects/geode_hybrid_solid3d.py b/src/opengeodeweb_back/geode_objects/geode_hybrid_solid3d.py
@@ -3,7 +3,6 @@
 
 # Third party imports
 import opengeode as og
-import opengeode_inspector as og_inspector
 import geode_viewables as viewables
 
 # Local application imports
diff --git a/src/opengeodeweb_back/geode_objects/geode_implicit_structural_model.py b/src/opengeodeweb_back/geode_objects/geode_implicit_structural_model.py
@@ -4,7 +4,6 @@
 # Third party imports
 import opengeode as og
 import opengeode_geosciences as og_geosciences
-import opengeode_inspector as og_inspector
 import geode_viewables as viewables
 
 # Local application imports
diff --git a/src/opengeodeweb_back/geode_objects/geode_light_regular_grid2d.py b/src/opengeodeweb_back/geode_objects/geode_light_regular_grid2d.py
@@ -3,7 +3,6 @@
 
 # Third party imports
 import opengeode as og
-import opengeode_inspector as og_inspector
 import geode_viewables as viewables
 
 # Local application imports
diff --git a/src/opengeodeweb_back/geode_objects/geode_light_regular_grid3d.py b/src/opengeodeweb_back/geode_objects/geode_light_regular_grid3d.py
@@ -3,7 +3,6 @@
 
 # Third party imports
 import opengeode as og
-import opengeode_inspector as og_inspector
 import geode_viewables as viewables
 
 # Local application imports
diff --git a/src/opengeodeweb_back/geode_objects/geode_mesh.py b/src/opengeodeweb_back/geode_objects/geode_mesh.py
@@ -6,7 +6,7 @@
 import opengeode as og
 
 # Local application imports
-from .types import GeodeObjectType, ViewerType
+from .types import ViewerType
 from .geode_object import GeodeObject
 
 
diff --git a/src/opengeodeweb_back/geode_objects/geode_model.py b/src/opengeodeweb_back/geode_objects/geode_model.py
@@ -1,13 +1,12 @@
 # Standard library imports
 from __future__ import annotations
-from abc import ABC, abstractmethod
-from typing import Literal, Any, get_args, cast
+from abc import abstractmethod
 
 # Third party imports
 import opengeode as og
 
 # Local application imports
-from .types import GeodeObjectType, GeodeModelType, ViewerType
+from .types import ViewerType
 from .geode_object import GeodeObject
 
 ComponentRegistry = dict[og.ComponentType, list[og.uuid]]
diff --git a/src/opengeodeweb_back/geode_objects/geode_object.py b/src/opengeodeweb_back/geode_objects/geode_object.py
@@ -1,7 +1,7 @@
 # Standard library imports
 from __future__ import annotations
 from abc import ABC, abstractmethod
-from typing import Literal, Any, get_args, cast
+from typing import Any
 
 # Third party imports
 import opengeode as og
diff --git a/src/opengeodeweb_back/geode_objects/geode_polygonal_surface2d.py b/src/opengeodeweb_back/geode_objects/geode_polygonal_surface2d.py
@@ -3,7 +3,6 @@
 
 # Third party imports
 import opengeode as og
-import opengeode_inspector as og_inspector
 import geode_viewables as viewables
 
 # Local application imports
diff --git a/src/opengeodeweb_back/geode_objects/geode_polygonal_surface3d.py b/src/opengeodeweb_back/geode_objects/geode_polygonal_surface3d.py
@@ -3,7 +3,6 @@
 
 # Third party imports
 import opengeode as og
-import opengeode_inspector as og_inspector
 import geode_viewables as viewables
 
 # Local application imports
diff --git a/src/opengeodeweb_back/geode_objects/geode_polyhedral_solid3d.py b/src/opengeodeweb_back/geode_objects/geode_polyhedral_solid3d.py
@@ -3,7 +3,6 @@
 
 # Third party imports
 import opengeode as og
-import opengeode_inspector as og_inspector
 import geode_viewables as viewables
 
 # Local application imports
diff --git a/src/opengeodeweb_back/geode_objects/geode_raster_image2d.py b/src/opengeodeweb_back/geode_objects/geode_raster_image2d.py
@@ -3,7 +3,6 @@
 
 # Third party imports
 import opengeode as og
-import opengeode_inspector as og_inspector
 import geode_viewables as viewables
 
 # Local application imports
diff --git a/src/opengeodeweb_back/geode_objects/geode_raster_image3d.py b/src/opengeodeweb_back/geode_objects/geode_raster_image3d.py
@@ -3,7 +3,6 @@
 
 # Third party imports
 import opengeode as og
-import opengeode_inspector as og_inspector
 import geode_viewables as viewables
 
 # Local application imports
diff --git a/src/opengeodeweb_back/geode_objects/geode_section.py b/src/opengeodeweb_back/geode_objects/geode_section.py
@@ -8,7 +8,7 @@
 import geode_viewables as viewables
 
 # Local application imports
-from .types import GeodeModelType, ViewerType
+from .types import GeodeModelType
 from .geode_model import GeodeModel, ComponentRegistry
 
 
diff --git a/src/opengeodeweb_back/geode_objects/geode_solid_mesh3d.py b/src/opengeodeweb_back/geode_objects/geode_solid_mesh3d.py
@@ -5,10 +5,8 @@
 import opengeode as og
 import opengeode_geosciences as og_geosciences
 import opengeode_inspector as og_inspector
-import geode_viewables as viewables
 
 # Local application imports
-from .types import GeodeMeshType
 from .geode_vertex_set import GeodeVertexSet
 
 
diff --git a/src/opengeodeweb_back/geode_objects/geode_structural_model.py b/src/opengeodeweb_back/geode_objects/geode_structural_model.py
@@ -4,7 +4,6 @@
 # Third party imports
 import opengeode as og
 import opengeode_geosciences as og_geosciences
-import opengeode_inspector as og_inspector
 import geode_viewables as viewables
 
 # Local application imports
diff --git a/src/opengeodeweb_back/geode_objects/geode_surface_mesh2d.py b/src/opengeodeweb_back/geode_objects/geode_surface_mesh2d.py
@@ -5,10 +5,8 @@
 import opengeode as og
 import opengeode_geosciences as og_geosciences
 import opengeode_inspector as og_inspector
-import geode_viewables as viewables
 
 # Local application imports
-from .types import GeodeMeshType
 from .geode_vertex_set import GeodeVertexSet
 
 
diff --git a/src/opengeodeweb_back/geode_objects/geode_surface_mesh3d.py b/src/opengeodeweb_back/geode_objects/geode_surface_mesh3d.py
@@ -5,10 +5,8 @@
 import opengeode as og
 import opengeode_geosciences as og_geosciences
 import opengeode_inspector as og_inspector
-import geode_viewables as viewables
 
 # Local application imports
-from .types import GeodeMeshType
 from .geode_vertex_set import GeodeVertexSet
 
 
diff --git a/src/opengeodeweb_back/geode_objects/geode_tetrahedral_solid3d.py b/src/opengeodeweb_back/geode_objects/geode_tetrahedral_solid3d.py
@@ -3,7 +3,6 @@
 
 # Third party imports
 import opengeode as og
-import opengeode_inspector as og_inspector
 import geode_viewables as viewables
 
 # Local application imports
diff --git a/src/opengeodeweb_back/geode_objects/geode_triangulated_surface2d.py b/src/opengeodeweb_back/geode_objects/geode_triangulated_surface2d.py
@@ -3,7 +3,6 @@
 
 # Third party imports
 import opengeode as og
-import opengeode_inspector as og_inspector
 import geode_viewables as viewables
 
 # Local application imports
diff --git a/src/opengeodeweb_back/geode_objects/geode_triangulated_surface3d.py b/src/opengeodeweb_back/geode_objects/geode_triangulated_surface3d.py
@@ -3,7 +3,6 @@
 
 # Third party imports
 import opengeode as og
-import opengeode_inspector as og_inspector
 import geode_viewables as viewables
 
 # Local application imports
diff --git a/src/opengeodeweb_back/geode_objects/geode_vertex_set.py b/src/opengeodeweb_back/geode_objects/geode_vertex_set.py
@@ -3,11 +3,9 @@
 
 # Third party imports
 import opengeode as og
-import opengeode_inspector as og_inspector
-import geode_viewables as viewables
 
 # Local application imports
-from .types import GeodeMeshType, ViewerType
+from .types import GeodeMeshType
 from .geode_mesh import GeodeMesh
 
 
diff --git a/src/opengeodeweb_back/py.typed b/src/opengeodeweb_back/py.typed
@@ -1 +0,0 @@
-partial
diff --git a/src/opengeodeweb_back/routes/blueprint_routes.py b/src/opengeodeweb_back/routes/blueprint_routes.py
@@ -64,6 +64,8 @@ def upload_file() -> flask.Response:
         os.makedirs(UPLOAD_FOLDER, exist_ok=True)
 
     file = flask.request.files["file"]
+    if file.filename is None:
+        flask.abort(400, "Filename is required")
     filename = werkzeug.utils.secure_filename(os.path.basename(file.filename))
     file.save(os.path.join(UPLOAD_FOLDER, filename))
     return flask.make_response({"message": "File uploaded"}, 201)
diff --git a/src/opengeodeweb_back/routes/models/blueprint_models.py b/src/opengeodeweb_back/routes/models/blueprint_models.py
@@ -27,6 +27,7 @@ def uuid_to_flat_index() -> flask.Response:
         flask.abort(500, "Failed to read viewable file")
     uuid_to_flat_index = {}
     current_index = 0
+    assert root is not None
     for elem in root.iter():
         if "uuid" in elem.attrib and elem.tag == "DataSet":
             uuid_to_flat_index[elem.attrib["uuid"]] = current_index

Original file line number	Diff line number	Diff line change
`@@ -60,4 +60,3 @@ werkzeug==3.1.2`
`60`	`60`	`# flask`
`61`	`61`	`# flask-cors`
`62`	`62`
`63`		`-opengeodeweb-microservice==1.*,>=1.0.11`