Merge pull request #64 from Geode-solutions/fix/update_ecosystem

Fix/update ecosystem

Author: JulienChampagnol

app.py

@@ -1,4 +1,5 @@
 """ Packages """
+
 import os
 
 import flask

config.py

@@ -1,4 +1,5 @@
 """ Flask configuration """
+
 import os
 
 

requirements.txt

@@ -1,5 +1,5 @@
 #
-# 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
@@ -14,18 +14,20 @@ blinker==1.7.0
     # via flask
 click==8.1.7
     # via flask
-flask[async]==3.0.0
+colorama==0.4.6
+    # via click
+flask[async]==3.0.1
     # via
     #   -r requirements.in
     #   flask-cors
 flask-cors==4.0.0
     # via -r requirements.in
-geode-background==7.6.1
+geode-background==7.7.0
     # via
     #   geode-explicit
     #   geode-implicit
     #   geode-simplex
-geode-common==30.0.12
+geode-common==30.1.1
     # via
     #   -r requirements.in
     #   geode-background
@@ -34,38 +36,40 @@ geode-common==30.0.12
     #   geode-numerics
     #   geode-simplex
     #   geode-viewables
-geode-conversion==5.1.8
+geode-conversion==5.2.0
     # via
     #   geode-explicit
     #   geode-implicit
-geode-explicit==4.3.11
+geode-explicit==4.4.1
     # via
     #   -r requirements.in
     #   geode-implicit
-geode-implicit==2.5.5
+geode-implicit==2.6.0
     # via -r requirements.in
-geode-numerics==4.2.5
+geode-numerics==4.3.0
     # via
     #   -r requirements.in
     #   geode-implicit
     #   geode-simplex
-geode-simplex==6.3.4
+geode-simplex==6.5.0
     # via -r requirements.in
 geode-viewables==2.2.0
     # via -r requirements.in
+importlib-metadata==7.0.1
+    # via flask
 itsdangerous==2.1.2
     # via flask
 jinja2==3.1.3
     # via flask
-jsonschema==4.21.0
+jsonschema==4.21.1
     # via -r requirements.in
 jsonschema-specifications==2023.12.1
     # via jsonschema
-markupsafe==2.1.3
+markupsafe==2.1.4
     # via
     #   jinja2
     #   werkzeug
-opengeode-core==14.12.1
+opengeode-core==14.13.1
     # via
     #   -r requirements.in
     #   geode-background
@@ -80,27 +84,28 @@ opengeode-core==14.12.1
     #   opengeode-geosciencesio
     #   opengeode-inspector
     #   opengeode-io
-opengeode-geosciences==7.3.4
+opengeode-geosciences==7.4.0
     # via
     #   -r requirements.in
     #   geode-implicit
     #   geode-viewables
     #   opengeode-geosciencesio
-opengeode-geosciencesio==4.5.5
+opengeode-geosciencesio==4.6.0
     # via
     #   -r requirements.in
     #   geode-implicit
-opengeode-inspector==4.0.5
+opengeode-inspector==4.0.6
     # via
     #   -r requirements.in
     #   geode-explicit
     #   geode-implicit
-opengeode-io==6.3.0
+opengeode-io==6.4.0
     # via
     #   -r requirements.in
     #   geode-implicit
     #   geode-viewables
-referencing==0.32.1
+    #   opengeode-geosciencesio
+referencing==0.33.0
     # via
     #   jsonschema
     #   jsonschema-specifications
@@ -114,3 +119,5 @@ werkzeug==3.0.1
     # via
     #   -r requirements.in
     #   flask
+zipp==3.17.0
+    # via importlib-metadata

src/opengeodeweb_back/inspector_functions.py

@@ -13,9 +13,9 @@ def json_return(Result_list: list):
     for result in Result_list:
         json_temp = {
             "value": result.value,
-            "children": result.children
-            if result.is_leaf
-            else json_return(result.children),
+            "children": (
+                result.children if result.is_leaf else json_return(result.children)
+            ),
             "is_leaf": result.is_leaf,
             "route": result.route,
             "sentence": result.sentence if result.sentence != None else result.route,

src/opengeodeweb_back/routes/schemas/allowed_files.json

@@ -1,20 +1,12 @@
 {
-  "$id": "/allowed_files",
   "route": "/allowed_files",
-  "methods": [
-    "POST"
-  ],
+  "methods": ["POST"],
   "type": "object",
   "properties": {
     "key": {
-      "type": [
-        "string",
-        "null"
-      ]
+      "type": ["string", "null"]
     }
   },
-  "required": [
-    "key"
-  ],
+  "required": ["key"],
   "additionalProperties": false
-}
+}

src/opengeodeweb_back/routes/schemas/allowed_objects.json

@@ -1,5 +1,4 @@
 {
-  "$id": "/tools/allowed_objects",
   "route": "/allowed_objects",
   "methods": ["POST"],
   "type": "object",

src/opengeodeweb_back/routes/schemas/geode_objects_and_output_extensions.json

@@ -1,9 +1,6 @@
 {
-  "$id": "/tools/geode_objects_and_output_extensions",
   "route": "/geode_objects_and_output_extensions",
-  "methods": [
-    "POST"
-  ],
+  "methods": ["POST"],
   "type": "object",
   "properties": {
     "input_geode_object": {
@@ -13,9 +10,6 @@
       "type": "string"
     }
   },
-  "required": [
-    "input_geode_object",
-    "filename"
-  ],
+  "required": ["input_geode_object", "filename"],
   "additionalProperties": false
-}
+}

src/opengeodeweb_back/routes/schemas/geographic_coordinate_systems.json

@@ -1,17 +1,12 @@
 {
-  "$id": "/tools/geographic_coordinate_systems",
   "route": "/geographic_coordinate_systems",
-  "methods": [
-    "POST"
-  ],
+  "methods": ["POST"],
   "type": "object",
   "properties": {
     "input_geode_object": {
       "type": "string"
     }
   },
-  "required": [
-    "input_geode_object"
-  ],
+  "required": ["input_geode_object"],
   "additionalProperties": false
-}
+}

src/opengeodeweb_back/routes/schemas/missing_files.json

@@ -1,5 +1,4 @@
 {
-  "$id": "/tools/missing_files",
   "route": "/missing_files",
   "methods": ["POST"],
   "type": "object",

src/opengeodeweb_back/routes/schemas/upload_file.json

@@ -1,15 +1,11 @@
 {
-    "$id": "/tools/upload_file",
-    "route": "/upload_file",
-    "methods": [
-        "OPTIONS",
-        "PUT"
-    ],
-    "type": "object",
-    "properties": {
-        "filename": {
-            "type": "string"
-        }
-    },
-    "additionalProperties": false
-}
+  "route": "/upload_file",
+  "methods": ["OPTIONS", "PUT"],
+  "type": "object",
+  "properties": {
+    "filename": {
+      "type": "string"
+    }
+  },
+  "additionalProperties": false
+}