OpenGeodeWeb-Back 6.9.2rc2__tar.gz → 6.9.3__tar.gz

{opengeodeweb_back-6.9.2rc2/src/OpenGeodeWeb_Back.egg-info → opengeodeweb_back-6.9.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: OpenGeodeWeb-Back
-Version: 6.9.2rc2
+Version: 6.9.3
 Summary: OpenGeodeWeb-Back is an open source framework that proposes handy python functions and wrappers for the OpenGeode ecosystem
 Author-email: Geode-solutions <team-web@geode-solutions.com>
 Project-URL: Homepage, https://github.com/Geode-solutions/OpenGeodeWeb-Back
@@ -16,16 +16,17 @@ Requires-Dist: blinker>=1
 Requires-Dist: click>=8
 Requires-Dist: flask[async]>=3
 Requires-Dist: flask-cors==6.0.2
-Requires-Dist: geode-common==33.21.6
-Requires-Dist: geode-viewables==3.3.8
+Requires-Dist: geode-common==33.24.2
+Requires-Dist: geode-viewables==3.4.0
 Requires-Dist: itsdangerous>=2
 Requires-Dist: jinja2>=3
 Requires-Dist: markupsafe>=3
-Requires-Dist: opengeode-core==17.0.2
-Requires-Dist: opengeode-geosciences==9.5.14
-Requires-Dist: opengeode-geosciencesio==5.8.14
-Requires-Dist: opengeode-inspector==6.8.22
-Requires-Dist: opengeode-io==7.6.4
+Requires-Dist: opengeode-core==17.3.7
+Requires-Dist: opengeode-geosciences==9.6.0
+Requires-Dist: opengeode-geosciencesio==5.9.0
+Requires-Dist: opengeode-inspector==6.11.6
+Requires-Dist: opengeode-inspector-geosciences==1.1.0
+Requires-Dist: opengeode-io==7.7.0
 Requires-Dist: werkzeug==3.1.8
 Requires-Dist: opengeodeweb-microservice==1.*,>=1.1.3
 Dynamic: license-file

{opengeodeweb_back-6.9.2rc2 → opengeodeweb_back-6.9.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "OpenGeodeWeb-Back"
-version = "6.9.2-rc.2"
+version = "6.9.3"
 dynamic = ["dependencies"]
 authors = [{ name = "Geode-solutions", email = "team-web@geode-solutions.com" }]
 description = "OpenGeodeWeb-Back is an open source framework that proposes handy python functions and wrappers for the OpenGeode ecosystem"

{opengeodeweb_back-6.9.2rc2 → opengeodeweb_back-6.9.3}/requirements.txt

@@ -16,11 +16,11 @@ flask[async]>=3
     #   flask-cors
 flask-cors==6.0.2
     # via -r requirements.in
-geode-common==33.21.6
+geode-common==33.24.2
     # via
     #   -r requirements.in
     #   geode-viewables
-geode-viewables==3.3.8
+geode-viewables==3.4.0
     # via -r requirements.in
 itsdangerous>=2
     # via flask
@@ -31,7 +31,7 @@ markupsafe>=3
     #   flask
     #   jinja2
     #   werkzeug
-opengeode-core==17.0.2
+opengeode-core==17.3.7
     # via
     #   -r requirements.in
     #   geode-common
@@ -39,17 +39,23 @@ opengeode-core==17.0.2
     #   opengeode-geosciences
     #   opengeode-geosciencesio
     #   opengeode-inspector
+    #   opengeode-inspector-geosciences
     #   opengeode-io
-opengeode-geosciences==9.5.14
+opengeode-geosciences==9.6.0
     # via
     #   -r requirements.in
     #   geode-viewables
     #   opengeode-geosciencesio
-opengeode-geosciencesio==5.8.14
+    #   opengeode-inspector-geosciences
+opengeode-geosciencesio==5.9.0
     # via -r requirements.in
-opengeode-inspector==6.8.22
+opengeode-inspector==6.11.6
+    # via
+    #   -r requirements.in
+    #   opengeode-inspector-geosciences
+opengeode-inspector-geosciences==1.1.0
     # via -r requirements.in
-opengeode-io==7.6.4
+opengeode-io==7.7.0
     # via
     #   -r requirements.in
     #   geode-viewables

{opengeodeweb_back-6.9.2rc2 → opengeodeweb_back-6.9.3/src/OpenGeodeWeb_Back.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: OpenGeodeWeb-Back
-Version: 6.9.2rc2
+Version: 6.9.3
 Summary: OpenGeodeWeb-Back is an open source framework that proposes handy python functions and wrappers for the OpenGeode ecosystem
 Author-email: Geode-solutions <team-web@geode-solutions.com>
 Project-URL: Homepage, https://github.com/Geode-solutions/OpenGeodeWeb-Back
@@ -16,16 +16,17 @@ Requires-Dist: blinker>=1
 Requires-Dist: click>=8
 Requires-Dist: flask[async]>=3
 Requires-Dist: flask-cors==6.0.2
-Requires-Dist: geode-common==33.21.6
-Requires-Dist: geode-viewables==3.3.8
+Requires-Dist: geode-common==33.24.2
+Requires-Dist: geode-viewables==3.4.0
 Requires-Dist: itsdangerous>=2
 Requires-Dist: jinja2>=3
 Requires-Dist: markupsafe>=3
-Requires-Dist: opengeode-core==17.0.2
-Requires-Dist: opengeode-geosciences==9.5.14
-Requires-Dist: opengeode-geosciencesio==5.8.14
-Requires-Dist: opengeode-inspector==6.8.22
-Requires-Dist: opengeode-io==7.6.4
+Requires-Dist: opengeode-core==17.3.7
+Requires-Dist: opengeode-geosciences==9.6.0
+Requires-Dist: opengeode-geosciencesio==5.9.0
+Requires-Dist: opengeode-inspector==6.11.6
+Requires-Dist: opengeode-inspector-geosciences==1.1.0
+Requires-Dist: opengeode-io==7.7.0
 Requires-Dist: werkzeug==3.1.8
 Requires-Dist: opengeodeweb-microservice==1.*,>=1.1.3
 Dynamic: license-file

opengeodeweb_back-6.9.3/src/OpenGeodeWeb_Back.egg-info/requires.txt

@@ -0,0 +1,18 @@
+asgiref>=3
+blinker>=1
+click>=8
+flask[async]>=3
+flask-cors==6.0.2
+geode-common==33.24.2
+geode-viewables==3.4.0
+itsdangerous>=2
+jinja2>=3
+markupsafe>=3
+opengeode-core==17.3.7
+opengeode-geosciences==9.6.0
+opengeode-geosciencesio==5.9.0
+opengeode-inspector==6.11.6
+opengeode-inspector-geosciences==1.1.0
+opengeode-io==7.7.0
+werkzeug==3.1.8
+opengeodeweb-microservice==1.*,>=1.1.3

{opengeodeweb_back-6.9.2rc2 → opengeodeweb_back-6.9.3}/src/opengeodeweb_back/app.py

@@ -87,105 +87,92 @@ def register_ogw_back_blueprints(app: flask.Flask) -> None:
 
 
 def run_server(app: Flask) -> None:
+    pre_parser = argparse.ArgumentParser(add_help=False)
+    pre_parser.add_argument("-d", "--debug", action="store_true", default=False)
+    pre_parser.add_argument("-pfp", "--project_folder_path", type=str)
+    pre_args, _ = pre_parser.parse_known_args()
+
+    if pre_args.project_folder_path is None:
+        raise ValueError("project_folder_path must be provided")
+    project_folder_path = os.path.abspath(pre_args.project_folder_path)
+
+    if pre_args.debug:
+        app.config.from_object(app_config.DevConfig(project_folder_path))
+    else:
+        app.config.from_object(app_config.ProdConfig(project_folder_path))
+
     parser = argparse.ArgumentParser(
         prog="OpenGeodeWeb-Back", description="Backend server for OpenGeodeWeb"
     )
     parser.add_argument(
-        "--host",
-        type=str,
-        help="Host to run on",
+        "--host", default=app.config.get("HOST"), type=str, help="Host to run on"
     )
     parser.add_argument(
         "-p",
         "--port",
+        default=app.config.get("PORT"),
         type=str,
         help="Port to listen on",
     )
     parser.add_argument(
         "-d",
         "--debug",
-        default=app.config.get("FLASK_DEBUG"),
-        help="Whether to run in debug mode",
+        default=pre_args.debug,
         action="store_true",
+        help="Whether to run in debug mode",
     )
     parser.add_argument(
         "-pfp",
         "--project_folder_path",
+        default=project_folder_path,
         type=str,
         help="Path to the folder where the project is stored",
     )
     parser.add_argument(
         "-dfp",
         "--data_folder_path",
+        default=app.config.get("DATA_FOLDER_PATH"),
         type=str,
         help="Path to the folder where the data is stored",
     )
     parser.add_argument(
         "-ufp",
         "--upload_folder_path",
+        default=app.config.get("UPLOAD_FOLDER_PATH"),
         type=str,
         help="Path to the folder where uploads are stored",
     )
     parser.add_argument(
         "-origins",
         "--allowed_origins",
+        default=app.config.get("ORIGINS"),
         nargs="+",
         help="Origins that are allowed to connect to the server",
     )
     parser.add_argument(
         "-t",
         "--timeout",
+        default=app.config.get("MINUTES_BEFORE_TIMEOUT"),
+        type=int,
         help="Number of minutes before the server times out",
     )
-    args, _ = parser.parse_known_args()
-
-    if args.project_folder_path is None:
-        raise ValueError("project_folder_path must be provided")
-    else:
-        args.project_folder_path = os.path.abspath(args.project_folder_path)
-
-    if args.debug:
-        app.config.from_object(app_config.DevConfig(args.project_folder_path))
-    else:
-        app.config.from_object(app_config.ProdConfig(args.project_folder_path))
-
-    if args.host is not None:
-        app.config.update(HOST=args.host)
-    else:
-        args.host = app.config.get("HOST")
-
-    if args.port is not None:
-        app.config.update(PORT=args.port)
-    else:
-        args.port = app.config.get("PORT")
-
-    if args.debug is not None:
-        app.config.update(FLASK_DEBUG=args.debug)
-    else:
-        args.debug = app.config.get("FLASK_DEBUG")
-
-    if args.data_folder_path is not None:
-        app.config.update(DATA_FOLDER_PATH=args.data_folder_path)
-    else:
-        args.data_folder_path = app.config.get("DATA_FOLDER_PATH")
+    args = parser.parse_args()
 
-    if args.upload_folder_path is not None:
-        app.config.update(UPLOAD_FOLDER_PATH=args.upload_folder_path)
-    else:
-        args.upload_folder_path = app.config.get("UPLOAD_FOLDER_PATH")
-
-    if args.allowed_origins is not None:
-        app.config.update(ALLOWED_ORIGINS=args.allowed_origins)
-    else:
-        args.allowed_origins = app.config.get("ALLOWED_ORIGINS")
-
-    if args.timeout is not None:
-        app.config.update(MINUTES_BEFORE_TIMEOUT=args.timeout)
-    else:
-        args.timeout = app.config.get("MINUTES_BEFORE_TIMEOUT")
+    args.project_folder_path = os.path.abspath(args.project_folder_path)
 
     print(f"{args=}", flush=True)
 
+    app.config.update(
+        HOST=args.host,
+        PORT=args.port,
+        FLASK_DEBUG=args.debug,
+        PROJECT_FOLDER_PATH=args.project_folder_path,
+        DATA_FOLDER_PATH=args.data_folder_path,
+        UPLOAD_FOLDER_PATH=args.upload_folder_path,
+        ALLOWED_ORIGINS=args.allowed_origins,
+        MINUTES_BEFORE_TIMEOUT=args.timeout,
+    )
+
     db_filename = app.config.get("DATABASE_FILENAME")
     if not isinstance(db_filename, str):
         raise TypeError(

opengeodeweb_back-6.9.2rc2/src/OpenGeodeWeb_Back.egg-info/requires.txt

@@ -1,17 +0,0 @@
-asgiref>=3
-blinker>=1
-click>=8
-flask[async]>=3
-flask-cors==6.0.2
-geode-common==33.21.6
-geode-viewables==3.3.8
-itsdangerous>=2
-jinja2>=3
-markupsafe>=3
-opengeode-core==17.0.2
-opengeode-geosciences==9.5.14
-opengeode-geosciencesio==5.8.14
-opengeode-inspector==6.8.22
-opengeode-io==7.6.4
-werkzeug==3.1.8
-opengeodeweb-microservice==1.*,>=1.1.3