geovisio 2.9.0__py3-none-any.whl → 2.11.0__py3-none-any.whl

geovisio/__init__.py

@@ -1,6 +1,6 @@
 """GeoVisio API - Main"""
 
-__version__ = "2.9.0"
+__version__ = "2.11.0"
 
 import os
 from flask import Flask, jsonify, stream_template, send_from_directory, redirect, request, url_for
@@ -31,6 +31,7 @@ from geovisio.web import (
     prepare,
     pages,
     annotations,
+    queryables,
 )
 from geovisio.workers import runner_pictures
 
@@ -54,6 +55,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"]},
 }
@@ -131,6 +137,7 @@ def create_app(test_config=None, app=None):
     app.register_blueprint(prepare.bp)
     app.register_blueprint(pages.bp)
     app.register_blueprint(annotations.bp)
+    app.register_blueprint(queryables.bp)
 
     # Register CLI comands
     app.register_blueprint(admin_cli.bp, cli_group=None)

geovisio/admin_cli/user.py

@@ -6,6 +6,7 @@ from flask.cli import with_appcontext
 from geovisio.utils import db
 from geovisio.utils.auth import AccountRole
 from psycopg.rows import dict_row
+from geovisio.utils.users import delete_user_data
 
 bp = Blueprint("user", __name__)
 
@@ -18,10 +19,11 @@ class Account:
 
 @bp.cli.command("user")
 @click.argument("account_id_or_name")
-@click.option("--set-role", required=True, help="Role you want to give to the account. Must be one of: admin or user")
+@click.option("--set-role", help="Role you want to give to the account. Must be one of: admin or user")
 @click.option("--create", is_flag=True, show_default=True, default=False, help="If provided, create the account if it does not exist")
+@click.option("--delete-data", is_flag=True, show_default=True, default=False, help="If provided, delete all the user's pictures")
 @with_appcontext
-def update_user(account_id_or_name, set_role=None, create=False):
+def update_user(account_id_or_name, set_role=None, create=False, delete_data=False):
     """
     Update some information about a user.
     To identify the account, either the account_id or the account_name must be provided.
@@ -33,6 +35,9 @@ def update_user(account_id_or_name, set_role=None, create=False):
         if set_role is not None:
             update_role(cursor, account, set_role)
 
+        if delete_data:
+            delete_user_data(conn, account)
+
 
 def get_account(cursor, account_id_or_name, create):
     account_id = None

geovisio/config_app.py

@@ -9,7 +9,7 @@ from pydantic import BaseModel, EmailStr
 from pydantic.color import Color
 from pydantic.networks import HttpUrl
 import json
-from flask import Flask, current_app
+from flask import Flask
 
 from geovisio.utils import website
 from geovisio.utils.model_query import get_db_params_and_values
@@ -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,7 +29,7 @@ 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"
@@ -53,7 +53,8 @@ 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
+    API_REGISTRATION_IS_OPEN = False  # tells that anyone can create an account. Used for reference in the federation and to know if we can have a `logged-only` visibility.
+    API_DEFAULT_PICTURE_VISIBILITY = "anyone"
 
 
 def read_config(app, test_config):
@@ -96,6 +97,7 @@ def read_config(app, test_config):
         "API_ENFORCE_TOS_ACCEPTANCE",
         "API_WEBSITE_URL",
         "API_REGISTRATION_IS_OPEN",
+        "API_DEFAULT_PICTURE_VISIBILITY",
         # Picture process
         "PICTURE_PROCESS_DERIVATES_STRATEGY",
         "PICTURE_PROCESS_THREADS_LIMIT",
@@ -145,7 +147,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:
@@ -229,6 +231,10 @@ 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}'")
 
+    default_visibility = app.config["API_DEFAULT_PICTURE_VISIBILITY"]
+    if default_visibility not in ["anyone", "owner-only", "logged-only"]:
+        raise Exception(f"API_DEFAULT_PICTURE_VISIBILITY should be 'anyone', 'owner-only' or 'logged-only', got '{default_visibility}'")
+
     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")
@@ -302,6 +308,7 @@ class DBConfiguration(BaseModel):
     Not all configurations are meant to be persisted in the database"""
 
     collaborative_metadata: Optional[bool] = None
+    default_visibility: Optional[str] = None
 
 
 def persist_config(app: Flask):
@@ -312,13 +319,13 @@ def persist_config(app: Flask):
     """
     from geovisio.utils import db
     from psycopg.rows import class_row
-    from psycopg.sql import SQL, Literal
-    from psycopg.errors import UndefinedTable
+    from psycopg.sql import SQL
+    from psycopg.errors import UndefinedTable, UndefinedColumn
 
-    with db.conn(app) as conn, conn.transaction() as tr, conn.cursor(row_factory=class_row(DBConfiguration)) as cur:
+    with db.conn(app) as conn, conn.transaction(), conn.cursor(row_factory=class_row(DBConfiguration)) as cur:
         try:
-            db_config = cur.execute("SELECT * FROM configurations LIMIT 1").fetchone()
-        except UndefinedTable:
+            db_config = cur.execute("SELECT collaborative_metadata, default_visibility FROM configurations LIMIT 1").fetchone()
+        except (UndefinedTable, UndefinedColumn):
             logging.warning("Database schema has not been updated yet, configuration will not be persisted")
             return
         if not db_config:
@@ -333,6 +340,13 @@ def persist_config(app: Flask):
             logging.warning(
                 "The environment variable `API_DEFAULT_COLLABORATIVE_METADATA_EDITING` has a different value than its value in the database, it will be ignored. Update the `collaborative_metadata` field in the database if you want to change it."
             )
+        default_visibility = app.config["API_DEFAULT_PICTURE_VISIBILITY"]
+        if db_config.default_visibility is None:
+            config_to_persist.default_visibility = default_visibility
+        elif db_config.default_visibility != default_visibility and default_visibility is not None:
+            logging.warning(
+                "The environment variable `API_DEFAULT_PICTURE_VISIBILITY` has a different value than its value in the database, it will be ignored. Update the `default_visibility` field in the database if you want to change it."
+            )
 
         params_as_dict = get_db_params_and_values(config_to_persist)
         fields = params_as_dict.fields_for_set()