Merge pull request #59 from Geode-solutions/next

Next

Author: JulienChampagnol

.gitignore

@@ -4,3 +4,4 @@ venv
 output
 __pycache__
 .vscode
+uploads

CHANGELOG.md

@@ -2,6 +2,125 @@
 
 
 
+## v3.2.0-rc.10 (2023-12-20)
+
+### Fix
+
+* fix(Package): update pyproject.toml ([`8982a04`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/8982a0450dc3324f229cc039eaa2bd655675675a))
+
+* fix(Package): remove MANIFEST.in & namespace ([`f7981cb`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/f7981cb860cf244c0e0606c3cb60621bc5d34c35))
+
+### Unknown
+
+* Merge branch 'next' of https://github.com/Geode-solutions/OpenGeodeWeb-Back into next ([`ccab4e0`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/ccab4e0ce355e723efea351ec742aaa3363cac27))
+
+
+## v3.2.0-rc.9 (2023-12-20)
+
+### Fix
+
+* fix(Package): test MANIFEST.in ([`0d36b17`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/0d36b175db851ff5a9b8bee96ca1329d3e0c38fc))
+
+### Unknown
+
+* Merge branch 'next' of https://github.com/Geode-solutions/OpenGeodeWeb-Back into next ([`2ee5caf`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/2ee5cafb5288faebfb7698f90c7d86481d7bc728))
+
+
+## v3.2.0-rc.8 (2023-12-20)
+
+### Fix
+
+* fix(Package): revert pyproject.toml ([`982b1a7`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/982b1a78ae352037e3002c31883b38178f297c75))
+
+
+## v3.2.0-rc.7 (2023-12-20)
+
+### Fix
+
+* fix(Package): test namespace
+remove MANIFEST.in ([`798ec45`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/798ec450719f3cf3defa151a00beaffd177adf7d))
+
+
+## v3.2.0-rc.6 (2023-12-20)
+
+### Fix
+
+* fix(Package): include schemas folder ([`3197598`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/3197598f4904e6778d634654ab16848ae53c5aa4))
+
+
+## v3.2.0-rc.5 (2023-12-20)
+
+### Fix
+
+* fix(Package): MANIFEST.in ([`4dfafaf`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/4dfafafbdca4e01a74384a5ca94fc07064a672e2))
+
+
+## v3.2.0-rc.4 (2023-12-20)
+
+### Fix
+
+* fix(Package): upload json ([`9b78361`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/9b78361f66fc5a43e01daa6424af0bf8d42ddebc))
+
+### Unknown
+
+* test ([`98e3457`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/98e3457c3f1f2c33499169bb777220562ebd8fb6))
+
+* fix path ([`3d1076b`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/3d1076b0334f71ceda7fe03ef3f6171da585bdf5))
+
+* test folder path ([`f357f18`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/f357f188375048f6e4a18a9df02bbb0bd396eafe))
+
+
+## v3.2.0-rc.3 (2023-12-20)
+
+### Fix
+
+* fix(Package): include json ([`d6c5e15`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/d6c5e15f77f0a6bcb279d84d23afa0bf9fc72d75))
+
+### Unknown
+
+* Merge pull request #58 from Geode-solutions/include-json
+
+fix(Package): include json ([`94d1d6d`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/94d1d6d86a50d1df751b841176cba9b4fe8ba525))
+
+
+## v3.2.0-rc.2 (2023-12-20)
+
+### Fix
+
+* fix(json files): explicitly export json files ([`678269e`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/678269e9a5fcf9d8737bc00438f38f07d3811807))
+
+### Unknown
+
+* Merge pull request #57 from Geode-solutions/fix/json_imports
+
+fix(json files): explicitly export json files ([`9b754cd`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/9b754cd76ce74758f037d9f52ad94eeb44094810))
+
+
+## v3.2.0-rc.1 (2023-12-20)
+
+### Fix
+
+* fix(tests): update failing tests ([`e70acfe`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/e70acfeda21f2fffc61700f83f34ca7f81829ae0))
+
+### Unknown
+
+* Merge pull request #50 from Geode-solutions/feat/blueprint_routes
+
+Feat/blueprint_routes ([`925db1b`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/925db1b0f6f09011625bdc8a095723008e12ff14))
+
+* update gitignore ([`51c765e`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/51c765e88767aaec216da2f6b67e0016e7fa63bd))
+
+* Merge branch 'feat/blueprint_routes' of https://github.com/Geode-solutions/OpenGeodeWeb-Back into feat/blueprint_routes ([`95be868`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/95be868f13b6dae9dee5d0d5d400f4ca7e5c534d))
+
+* is_loadable ([`bfc6ba5`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/bfc6ba58dc9f4f12e8d58898036faf3f465ff181))
+
+* pull from website-back ([`fd33bc9`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/fd33bc9502f48ebfe7aa5e8a4ab8815b87a3ddb8))
+
+* Merge branch 'master' of https://github.com/Geode-solutions/OpenGeodeWeb-Back into feat/blueprint_routes ([`57ca416`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/57ca41631eb06eb84c612ae5c47c76467e1af809))
+
+*  ([`945e092`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/945e092d88f82c6aa18d99caeb2661ac8135ee76))
+
+
 ## v3.1.0 (2023-12-19)
 
 ### Unknown
@@ -81,6 +200,17 @@ Revert "Feat/is loadable" ([`d0f03a7`](https://github.com/Geode-solution
 
 BREAKING CHANGE : arg extension -> file_absolute_path ([`4af7868`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/4af78686c761c1abba86a02df39fc9a75e40e151))
 
+* feat(dependencies): ass flask-cors ([`35e5c30`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/35e5c30455d117e99325a21722b3fe82ce054df9))
+
+* feat(routes): add tests ([`28df816`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/28df816d3c3c1e9456dac092ea94da63d45c43f5))
+
+* feat(routes): add new blueprint with refactored routes ([`210ec38`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/210ec3876283d8aa2c8408fa4b7a5dab6a41894d))
+
+* feat(flask): add flask app & config
+edit pytest config ([`15ad3cf`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/15ad3cfe42dcad747acdf470aae9d102a9e2c90d))
+
+* feat(routes): add schemas ([`3afc79f`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/3afc79f6c82960163cbc18c771cfbb3b55e24e0c))
+
 ### Unknown
 
 * Merge pull request #49 from Geode-solutions/feat/is_loadable
@@ -89,6 +219,15 @@ Feat/is loadable ([`3ee5c1e`](https://github.com/Geode-solutions/OpenGeodeWeb-Ba
 
 * update requirements ([`9066879`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/9066879e7b037794bbded4184fdb29765261ebc7))
 
+* integrate upload_file changes
+route now takes each file one by one ([`2b2807f`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/2b2807febceda5a8268533a3ed20e2da10f29cd2))
+
+* tests ([`3129fe8`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/3129fe83af3ef605ec4ca5ee974eb9897df6f247))
+
+* move data ([`e8fba7c`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/e8fba7c8e87fd62050029b1af7eb0dc612ab47af))
+
+* update dependencies ([`6bfba1d`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/6bfba1dd22ee4f9c98c74b2b8d18653e246d66d8))
+
 * Merge branch 'next' of https://github.com/Geode-solutions/OpenGeodeWeb-Back into feat/is_loadable ([`2de6600`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/2de66004cc3acf735017f7aa41d985af9871bad3))
 
 * update tests & deps ([`4fc793c`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/4fc793cdc1f791f30266706bfc05493f0ef87978))

app.py

@@ -0,0 +1,54 @@
+""" Packages """
+import os
+
+import flask
+import flask_cors
+from werkzeug.exceptions import HTTPException
+
+from werkzeug.exceptions import HTTPException
+
+from src.opengeodeweb_back.routes import blueprint_routes
+
+
+""" Global config """
+app = flask.Flask(__name__)
+
+""" Config variables """
+FLASK_DEBUG = True if os.environ.get("FLASK_DEBUG", default=None) == "True" else False
+
+if FLASK_DEBUG == False:
+    app.config.from_object("config.ProdConfig")
+else:
+    app.config.from_object("config.DevConfig")
+
+
+PORT = int(app.config.get("PORT"))
+ORIGINS = app.config.get("ORIGINS")
+SSL = app.config.get("SSL")
+
+flask_cors.CORS(app, origins=ORIGINS)
+app.register_blueprint(
+    blueprint_routes.routes,
+    url_prefix="/",
+    name="blueprint_routes",
+)
+
+
+@app.errorhandler(HTTPException)
+def handle_exception(e):
+    response = e.get_response()
+    response.data = flask.json.dumps(
+        {
+            "code": e.code,
+            "name": e.name,
+            "description": e.description,
+        }
+    )
+    response.content_type = "application/json"
+    return response
+
+
+# ''' Main '''
+if __name__ == "__main__":
+    print(f"Python is running in {FLASK_DEBUG} mode")
+    app.run(debug=FLASK_DEBUG, host="0.0.0.0", port=PORT, ssl_context=SSL)

config.py

@@ -0,0 +1,29 @@
+""" Flask configuration """
+import os
+
+
+class Config(object):
+    FLASK_DEBUG = os.environ.get("FLASK_DEBUG", default=False)
+    ID = os.environ.get("ID", default=None)
+    PORT = "5000"
+    CORS_HEADERS = "Content-Type"
+    UPLOAD_FOLDER = "./uploads"
+    WORKFLOWS_DATA_FOLDER = "./data_workflows/"
+    LOCK_FOLDER = "./lock/"
+    TIME_FOLDER = "./time/"
+
+
+class ProdConfig(Config):
+    SSL = None
+    ORIGINS = ["*"]
+    MINUTES_BEFORE_TIMEOUT = "5"
+    SECONDS_BETWEEN_SHUTDOWNS = "150"
+    DATA_FOLDER = "/data/"
+
+
+class DevConfig(Config):
+    SSL = None
+    ORIGINS = "http://localhost:3000"
+    MINUTES_BEFORE_TIMEOUT = "1000"
+    SECONDS_BETWEEN_SHUTDOWNS = "60"
+    DATA_FOLDER = "./data/"

pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "OpenGeodeWeb-Back"
-version = "3.1.0"
+version = "3.2.0-rc.10"
 dynamic = ["dependencies"]
 authors = [
   { name="Geode-solutions", email="[email protected]" },
@@ -26,6 +26,12 @@ classifiers = [
 [tool.setuptools.dynamic]
 dependencies = {file = ["requirements.txt"]}
 
+[tool.setuptools.packages.find]
+where = ["src"]
+
+[tool.setuptools.package-data]
+"opengeodeweb_back.routes.schemas" = ["*.json"]
+
 [tool.semantic_release]
 version_toml = [
     "pyproject.toml:project.version",

requirements.in

@@ -10,5 +10,6 @@ geode-explicit
 geode-implicit
 geode-common
 jsonschema
-flask[async]
+Flask[async]
+Flask-Cors
 werkzeug

requirements.txt

@@ -17,6 +17,10 @@ click==8.1.7
 colorama==0.4.6
     # via click
 flask[async]==3.0.0
+    # via
+    #   -r requirements.in
+    #   flask-cors
+flask-cors==4.0.0
     # via -r requirements.in
 geode-background==7.4.9
     # via

src/opengeodeweb_back/geode_functions.py

@@ -1,16 +1,15 @@
 # Standard library imports
-import base64
 import os
 import time
 import threading
 import uuid
+import zipfile
 
 # Third party imports
 import flask
 import opengeode_geosciences as og_gs
 import opengeode as og
 import pkg_resources
-import werkzeug
 from jsonschema import validate
 from jsonschema.exceptions import ValidationError
 
@@ -311,7 +310,7 @@ def send_file(upload_folder, saved_files, new_file_name):
         mimetype = "application/octet-binary"
     else:
         mimetype = "application/zip"
-        new_file_name = strict_file_name + ".zip"
+        new_file_name = os.path.splitext(new_file_name)[0] + ".zip"
         with zipfile.ZipFile(os.path.join(upload_folder, new_file_name), "w") as zipObj:
             for saved_file_path in saved_files:
                 zipObj.write(