diff --git a/requirements.txt b/requirements.txt index 2dfb9026..08d64bdf 100644 --- 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 index afcd2e1c..fb884f6c 100644 --- 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 index cd12775c..7c79f1c6 100644 --- 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 index 75cb1a0d..f7d592ea 100644 --- 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 index bf4a441a..91458c96 100644 --- 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 index 8a22d9be..f9921935 100644 --- 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 index 0df5a5b6..45900daa 100644 --- 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 index 5a345707..4e7de6a9 100644 --- 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 index e342907b..2854cf89 100644 --- 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 index 6680eca4..68b7512f 100644 --- 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 index 8715c8f3..394f0d80 100644 --- 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 index 8c44ef45..580a846c 100644 --- 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 index 6ff30f5a..884866d8 100644 --- 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 index 48438d53..2ba68194 100644 --- 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 index 140dd324..40232d2d 100644 --- 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 index 1cd24e52..846ae7ac 100644 --- 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 index 6aef8db7..de131c78 100644 --- 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 index a848673b..af35be7f 100644 --- 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 index 7842bcc8..d7112035 100644 --- 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 index 74b28fc8..e81466b4 100644 --- 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 index dd49135e..199846f9 100644 --- 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 index d064f885..8468c7b0 100644 --- 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 index d1b95f02..15bf2e53 100644 --- 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 index 8363cd38..14e448c2 100644 --- 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 index b34d6487..d5c998f8 100644 --- 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 index 0cf9028f..98d623ac 100644 --- 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 index b648ac92..e69de29b 100644 --- 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 index 4f2108d1..81e1c4cf 100644 --- 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 index ab052745..5d18349b 100644 --- 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