Merge pull request #90 from Geode-solutions/next

Next

Author: JulienChampagnol

.gitignore

@@ -1,5 +1,5 @@
 .pytest_cache
-data
+./data
 dist
 venv
 output

CHANGELOG.md

@@ -1,5 +1,43 @@
 # CHANGELOG
 
+## v5.0.0-rc.1 (2024-08-19)
+
+### Breaking
+
+* feat(ping route): updates LAST_PING_TIME
+
+BREAKING CHANGE: functions moved to utils_functions.py ([`bcb01de`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/bcb01ded807d2d8dfbca98dce209e5e13830aa40))
+
+### Chore
+
+* chore(deps): update ([`191bfbf`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/191bfbfca0d16aacef152429deccb091f0d60e23))
+
+### Unknown
+
+* Merge pull request #89 from Geode-solutions/feat/ping_route
+
+Feat/ping route ([`35cf6e6`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/35cf6e6a8b92ff28128d8dab10c93c458541515c))
+
+* Apply prepare changes ([`284b98b`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/284b98b64b209344ec5277cf34d782a475a52738))
+
+* cleanup Closes #83 ([`5e18763`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/5e187635380b0298ea36b10bd71733b5b946e0ac))
+
+* fix tests & gloabl app_config ([`e247204`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/e247204a2d75c8c050f53b3b7d0eb00ee80765b0))
+
+* Merge branch 'next' into feat/ping_route ([`e4c6644`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/e4c66440d7cbf4803080b357a42377bb5246dd10))
+
+* Merge pull request #88 from Geode-solutions/chore/update_ecosystem
+
+Chore/update ecosystem ([`1676c23`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/1676c239a68cc4115136452df209b6a87ce18fc3))
+
+* test.pl file ([`84696d1`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/84696d1a314f53ef5d8a1a20866cddaddc652b7a))
+
+* test ([`e8eb151`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/e8eb1514fe53c5be45e67f2943c5b433838efd6f))
+
+* update tests ([`326c3a9`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/326c3a9de028a5d1bdd2f42c26edf3c7227b55cf))
+
+*  ([`a98eb92`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/a98eb920912bc2d8d87b36bd2139e79be3ef6c74))
+
 ## v4.3.1 (2024-07-17)
 
 ### Unknown

app.py

@@ -7,7 +7,8 @@
 from werkzeug.exceptions import HTTPException
 
 from src.opengeodeweb_back.routes import blueprint_routes
-from src.opengeodeweb_back.geode_functions import handle_exception
+from src.opengeodeweb_back.utils_functions import handle_exception
+from src.opengeodeweb_back import app_config
 
 
 """ Global config """
@@ -17,12 +18,11 @@
 FLASK_DEBUG = True if os.environ.get("FLASK_DEBUG", default=None) == "True" else False
 
 if FLASK_DEBUG == False:
-    app.config.from_object("config.ProdConfig")
+    app.config.from_object(app_config.ProdConfig)
 else:
-    app.config.from_object("config.DevConfig")
+    app.config.from_object(app_config.DevConfig)
 
-
-PORT = int(app.config.get("PORT"))
+PORT = int(app.config.get("DEFAULT_PORT"))
 ORIGINS = app.config.get("ORIGINS")
 SSL = app.config.get("SSL")
 

config.py

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "OpenGeodeWeb-Back"
-version = "4.3.1"
+version = "5.0.0-rc.1"
 dynamic = ["dependencies"]
 authors = [
   { name="Geode-solutions", email="[email protected]" },

pyproject.toml

@@ -1,12 +1,12 @@
 #
-# This file is autogenerated by pip-compile with Python 3.11
+# This file is autogenerated by pip-compile with Python 3.10
 # by the following command:
 #
 #    pip-compile requirements.in
 #
 asgiref==3.8.1
     # via flask
-attrs==23.2.0
+attrs==24.2.0
     # via
     #   jsonschema
     #   referencing
@@ -20,52 +20,55 @@ flask[async]==3.0.3
     #   flask-cors
 flask-cors==4.0.1
     # via -r requirements.in
-geode-background==7.12.0
+geode-background==8.1.1
     # via
     #   geode-explicit
     #   geode-implicit
     #   geode-simplex
-geode-common==31.2.1
+geode-common==32.0.8
     # via
     #   -r requirements.in
     #   geode-background
+    #   geode-conversion
     #   geode-explicit
     #   geode-implicit
     #   geode-numerics
     #   geode-simplex
     #   geode-viewables
-geode-conversion==5.4.1
+geode-conversion==6.0.3
     # via
     #   geode-explicit
     #   geode-implicit
-geode-explicit==4.8.3
+geode-explicit==6.0.1
     # via
     #   -r requirements.in
     #   geode-implicit
-geode-implicit==2.8.7
+geode-implicit==3.1.1
     # via -r requirements.in
-geode-numerics==4.4.0
+geode-numerics==5.0.2
     # via
     #   -r requirements.in
     #   geode-implicit
     #   geode-simplex
-geode-simplex==6.8.3
-    # via -r requirements.in
-geode-viewables==2.2.3
+geode-simplex==8.2.1
+    # via
+    #   -r requirements.in
+    #   geode-implicit
+geode-viewables==3.0.0
     # via -r requirements.in
 itsdangerous==2.2.0
     # via flask
 jinja2==3.1.4
     # via flask
-jsonschema==4.22.0
+jsonschema==4.23.0
     # via -r requirements.in
 jsonschema-specifications==2023.12.1
     # via jsonschema
 markupsafe==2.1.5
     # via
     #   jinja2
     #   werkzeug
-opengeode-core==14.21.3
+opengeode-core==15.2.1
     # via
     #   -r requirements.in
     #   geode-background
@@ -80,23 +83,23 @@ opengeode-core==14.21.3
     #   opengeode-geosciencesio
     #   opengeode-inspector
     #   opengeode-io
-opengeode-geosciences==7.7.0
+opengeode-geosciences==8.0.0
     # via
     #   -r requirements.in
     #   geode-implicit
     #   geode-viewables
     #   opengeode-geosciencesio
-opengeode-geosciencesio==4.7.7
+opengeode-geosciencesio==5.0.1
     # via
     #   -r requirements.in
     #   geode-implicit
-opengeode-inspector==5.1.4
+opengeode-inspector==6.0.0
     # via
     #   -r requirements.in
     #   geode-explicit
     #   geode-implicit
     #   geode-simplex
-opengeode-io==6.5.1
+opengeode-io==7.0.1
     # via
     #   -r requirements.in
     #   geode-implicit
@@ -106,10 +109,12 @@ referencing==0.35.1
     # via
     #   jsonschema
     #   jsonschema-specifications
-rpds-py==0.18.1
+rpds-py==0.20.0
     # via
     #   jsonschema
     #   referencing
+typing-extensions==4.12.2
+    # via asgiref
 werkzeug==3.0.3
     # via
     #   -r requirements.in

requirements.txt

@@ -0,0 +1,33 @@
+# Standard library imports
+import os
+import time
+
+# Third party imports
+# Local application imports
+
+
+class Config(object):
+    FLASK_DEBUG = os.environ.get("FLASK_DEBUG", default=False)
+    DEFAULT_PORT = "5000"
+    CORS_HEADERS = "Content-Type"
+    UPLOAD_FOLDER = "./uploads"
+    DESKTOP_APP = False
+    REQUEST_COUNTER = 0
+    LAST_REQUEST_TIME = time.time()
+    LAST_PING_TIME = time.time()
+
+
+class ProdConfig(Config):
+    SSL = None
+    ORIGINS = ""
+    MINUTES_BEFORE_TIMEOUT = "1"
+    SECONDS_BETWEEN_SHUTDOWNS = "10"
+    DATA_FOLDER_PATH = "/data/"
+
+
+class DevConfig(Config):
+    SSL = None
+    ORIGINS = "*"
+    MINUTES_BEFORE_TIMEOUT = "1"
+    SECONDS_BETWEEN_SHUTDOWNS = "10"
+    DATA_FOLDER_PATH = "./data/"