Merge pull request #205 from Geode-solutions/geode-objects-redesign

Geode objects redesign

Author: BotellaA

.vscode/settings.json

@@ -8,6 +8,6 @@
         "--config-file=mypy.ini"
     ],
     "mypy-type-checker.interpreter": [
-        "${workspaceFolder}/venv/bin/python"
+        "${workspaceFolder}/../../.venv/bin/python"
     ]
 }

opengeodeweb_back_schemas.json

@@ -213,7 +213,7 @@
       ],
       "type": "object",
       "properties": {
-        "input_geode_object": {
+        "geode_object_type": {
           "type": "string",
           "minLength": 1
         },
@@ -223,7 +223,7 @@
         }
       },
       "required": [
-        "input_geode_object",
+        "geode_object_type",
         "filename"
       ],
       "additionalProperties": false
@@ -283,7 +283,7 @@
       ],
       "type": "object",
       "properties": {
-        "input_geode_object": {
+        "geode_object_type": {
           "type": "string",
           "minLength": 1
         },
@@ -293,7 +293,7 @@
         }
       },
       "required": [
-        "input_geode_object",
+        "geode_object_type",
         "filename"
       ],
       "additionalProperties": false
@@ -321,14 +321,14 @@
           "type": "string",
           "minLength": 1
         },
-        "input_geode_object": {
+        "geode_object_type": {
           "type": "string",
           "minLength": 1
         }
       },
       "required": [
         "filename",
-        "input_geode_object"
+        "geode_object_type"
       ],
       "additionalProperties": false
     },
@@ -351,13 +351,13 @@
       ],
       "type": "object",
       "properties": {
-        "input_geode_object": {
+        "geode_object_type": {
           "type": "string",
           "minLength": 1
         }
       },
       "required": [
-        "input_geode_object"
+        "geode_object_type"
       ],
       "additionalProperties": false
     },
@@ -369,7 +369,7 @@
       ],
       "type": "object",
       "properties": {
-        "input_geode_object": {
+        "geode_object_type": {
           "type": "string",
           "minLength": 1
         },
@@ -379,7 +379,7 @@
         }
       },
       "required": [
-        "input_geode_object",
+        "geode_object_type",
         "filename"
       ],
       "additionalProperties": false
@@ -406,6 +406,24 @@
       ],
       "additionalProperties": false
     },
+    "cell_attribute_names": {
+      "$id": "opengeodeweb_back/cell_attribute_names",
+      "route": "/cell_attribute_names",
+      "methods": [
+        "POST"
+      ],
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "string",
+          "minLength": 1
+        }
+      },
+      "required": [
+        "id"
+      ],
+      "additionalProperties": false
+    },
     "allowed_objects": {
       "$id": "opengeodeweb_back/allowed_objects",
       "route": "/allowed_objects",
@@ -417,17 +435,10 @@
         "filename": {
           "type": "string",
           "minLength": 1
-        },
-        "supported_feature": {
-          "type": [
-            "string",
-            "null"
-          ]
         }
       },
       "required": [
-        "filename",
-        "supported_feature"
+        "filename"
       ],
       "additionalProperties": false
     },
@@ -438,17 +449,8 @@
         "POST"
       ],
       "type": "object",
-      "properties": {
-        "supported_feature": {
-          "type": [
-            "string",
-            "null"
-          ]
-        }
-      },
-      "required": [
-        "supported_feature"
-      ],
+      "properties": {},
+      "required": [],
       "additionalProperties": false
     }
   }

requirements.in

@@ -1,7 +1,7 @@
-opengeode-core==15.30.2
+opengeode-core==15.30.4
 opengeode-io==7.4.6
 opengeode-inspector==6.8.6
-opengeode-geosciences==9.5.4
+opengeode-geosciences==9.5.5
 opengeode-geosciencesio==5.8.6
 geode-common==33.11.3
 geode-viewables==3.3.2

requirements.txt

@@ -31,7 +31,7 @@ markupsafe>=3
     #   flask
     #   jinja2
     #   werkzeug
-opengeode-core==15.30.2
+opengeode-core==15.30.4
     # via
     #   -r requirements.in
     #   geode-common
@@ -40,7 +40,7 @@ opengeode-core==15.30.2
     #   opengeode-geosciencesio
     #   opengeode-inspector
     #   opengeode-io
-opengeode-geosciences==9.5.4
+opengeode-geosciences==9.5.5
     # via
     #   -r requirements.in
     #   geode-viewables
@@ -60,4 +60,3 @@ werkzeug==3.1.2
     #   flask
     #   flask-cors
 
-opengeodeweb-microservice==1.*,>=1.0.9

src/opengeodeweb_back/app.py

@@ -2,7 +2,6 @@
 
 import argparse
 import os
-import time
 from typing import Any
 import flask
 import flask_cors  # type: ignore
@@ -36,8 +35,13 @@
 
 
 @app.before_request
-def before_request() -> None:
+def before_request() -> flask.Response | None:
+    if flask.request.method == "OPTIONS":
+        response = flask.make_response()
+        response.headers["Access-Control-Allow-Methods"] = "GET,POST,PUT,DELETE,OPTIONS"
+        return response
     utils_functions.before_request(flask.current_app)
+    return None
 
 
 @app.teardown_request
@@ -68,13 +72,14 @@ def teardown_request(exception: BaseException | None) -> None:
 
 
 @app.errorhandler(HTTPException)
-def errorhandler(e: HTTPException) -> tuple[dict[str, Any], int] | Response:
-    return utils_functions.handle_exception(e)
+def errorhandler(exception: HTTPException) -> tuple[dict[str, Any], int] | Response:
+    return utils_functions.handle_exception(exception)
 
 
 @app.errorhandler(Exception)
-def handle_generic_exception(e: Exception) -> Response:
-    return flask.make_response({"error": str(e)}, 500)
+def handle_generic_exception(exception: Exception) -> Response:
+    print("\033[91mError:\033[0m \033[91m" + str(exception) + "\033[0m", flush=True)
+    return flask.make_response({"description": str(exception)}, 500)
 
 
 @app.route(