geovisio 2.8.1__py3-none-any.whl → 2.10.0__py3-none-any.whl

geovisio/__init__.py

@@ -1,6 +1,6 @@
 """GeoVisio API - Main"""
 
-__version__ = "2.8.1"
+__version__ = "2.10.0"
 
 import os
 from flask import Flask, jsonify, stream_template, send_from_directory, redirect, request, url_for
@@ -54,6 +54,11 @@ LOGGING_CONFIG = {
     },
     "loggers": {
         "PIL": {"handlers": ["stdout", "stderr"], "level": "WARN", "propagate": False},  # lower PIL loggers to only have warnings
+        "watchdog": {
+            "handlers": ["stdout", "stderr"],
+            "level": "WARN",
+            "propagate": False,
+        },  # lower watchdog loggers too (used by flask hot reload)
     },
     "root": {"level": "INFO", "handlers": ["stderr", "stdout"]},
 }

geovisio/config_app.py

@@ -17,10 +17,10 @@ from geovisio.utils.website import Website
 
 
 class ApiSummary(BaseModel):
-    name: Dict[str, str] = {"en": "GeoVisio"}
+    name: Dict[str, str] = {"en": "Panoramax"}
     description: Dict[str, str] = {"en": "The open source photo mapping solution"}
-    logo: HttpUrl = "https://gitlab.com/panoramax/gitlab-profile/-/raw/main/images/logo.svg"
-    color: Color = "#bf360c"
+    logo: HttpUrl = "https://gitlab.com/panoramax/gitlab-profile/-/raw/main/images/panoramax.svg"
+    color: Color = "#5e499c"
     email: EmailStr = "panoramax@panoramax.fr"
     geo_coverage: Dict[str, str] = {"en": "Worldwide\nThe picture can be sent from anywhere in the world."}
 
@@ -29,10 +29,12 @@ class DefaultConfig:
     API_SUMMARY = ApiSummary()
     API_VIEWER_PAGE = "viewer.html"
     API_MAIN_PAGE = "main.html"
-    # we default we keep the session cookie 7 days, users would have to renew their loggin after this
+    # we default we keep the session cookie 7 days, users would have to renew their login after this
     PERMANENT_SESSION_LIFETIME = datetime.timedelta(days=7).total_seconds()
     API_FORCE_AUTH_ON_UPLOAD = False
     PICTURE_PROCESS_DERIVATES_STRATEGY = "ON_DEMAND"
+    PICTURE_PROCESS_NB_RETRIES = 5
+    PICTURE_PROCESS_KEEP_UNBLURRED_PARTS = False
     API_BLUR_URL = None
     PICTURE_PROCESS_THREADS_LIMIT = 1
     DB_CHECK_SCHEMA = True  # If True check the database schema, and do not start the api if not up to date
@@ -51,6 +53,7 @@ class DefaultConfig:
     API_WEBSITE_URL = (
         website.WEBSITE_UNDER_SAME_HOST
     )  # by default we consider that there is a panoramax website on the same host as the API
+    API_REGISTRATION_IS_OPEN = False  # tells that anyone can create an account. Only used for reference in the federation for the moment
 
 
 def read_config(app, test_config):
@@ -92,10 +95,13 @@ def read_config(app, test_config):
         "API_DEFAULT_COLLABORATIVE_METADATA_EDITING",
         "API_ENFORCE_TOS_ACCEPTANCE",
         "API_WEBSITE_URL",
+        "API_REGISTRATION_IS_OPEN",
         # Picture process
         "PICTURE_PROCESS_DERIVATES_STRATEGY",
         "PICTURE_PROCESS_THREADS_LIMIT",
         "PICTURE_PROCESS_REFRESH_CRON",
+        "PICTURE_PROCESS_NB_RETRIES",
+        "PICTURE_PROCESS_KEEP_UNBLURRED_PARTS",
         # OAUTH
         "OAUTH_PROVIDER",
         "OAUTH_OIDC_URL",
@@ -139,7 +145,7 @@ def read_config(app, test_config):
         app.config.update(test_config)
 
     if "API_LOG_LEVEL" in app.config:
-        logging.getLogger("geovisio").setLevel(app.config["API_LOG_LEVEL"].upper())
+        logging.getLogger().setLevel(app.config["API_LOG_LEVEL"].upper())
 
     # Create DB_URL from separated parameters
     if "DB_PORT" in app.config or "DB_HOST" in app.config or "DB_USERNAME" in app.config or "DB_PASSWORD" in app.config:
@@ -165,6 +171,7 @@ def read_config(app, test_config):
         raise Exception(
             f"Unknown picture derivates strategy: '{app.config['PICTURE_PROCESS_DERIVATES_STRATEGY']}'. Please set to one of ON_DEMAND, PREPROCESS"
         )
+    app.config["PICTURE_PROCESS_NB_RETRIES"] = int(app.config["PICTURE_PROCESS_NB_RETRIES"])
 
     # Parse API summary
     if not isinstance(app.config.get("API_SUMMARY"), ApiSummary):
@@ -178,6 +185,8 @@ def read_config(app, test_config):
         except Exception as e:
             raise Exception("Parameter API_SUMMARY is not recognized") from e
 
+    app.config["API_REGISTRATION_IS_OPEN"] = _read_bool(app.config, "API_REGISTRATION_IS_OPEN")
+
     # Checks on front-end related variables
     templateFolder = os.path.join(app.root_path, app.template_folder)
     for pageParam in ["API_MAIN_PAGE", "API_VIEWER_PAGE"]:
@@ -220,6 +229,8 @@ def read_config(app, test_config):
     if not croniter.croniter.is_valid(cron_val):
         raise Exception(f"PICTURE_PROCESS_REFRESH_CRON should be a valid cron syntax, got '{cron_val}'")
 
+    app.config["PICTURE_PROCESS_KEEP_UNBLURRED_PARTS"] = _read_bool(app.config, "PICTURE_PROCESS_KEEP_UNBLURRED_PARTS")
+
     app.config["API_ACCEPT_DUPLICATE"] = _read_bool(app.config, "API_ACCEPT_DUPLICATE")
     app.config["API_ENFORCE_TOS_ACCEPTANCE"] = _read_bool(app.config, "API_ENFORCE_TOS_ACCEPTANCE")
     app.config["API_DEFAULT_COLLABORATIVE_METADATA_EDITING"] = _read_bool(app.config, "API_DEFAULT_COLLABORATIVE_METADATA_EDITING")