goodmap 1.3.0__tar.gz → 1.4.0__tar.gz

{goodmap-1.3.0 → goodmap-1.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: goodmap
-Version: 1.3.0
+Version: 1.4.0
 Summary: Map engine to serve all the people :)
 Author: Krzysztof Kolodzinski
 Author-email: krzysztof.kolodzinski@problematy.pl
@@ -24,7 +24,7 @@ Requires-Dist: gunicorn (>=20.1,<24.0)
 Requires-Dist: humanize (>=4.6.0,<5.0.0)
 Requires-Dist: myst-parser (>=4.0.0,<5.0.0) ; extra == "docs"
 Requires-Dist: numpy (>=2.2.0,<3.0.0)
-Requires-Dist: platzky (>=1.0.0,<2.0.0)
+Requires-Dist: platzky (>=1.3.0,<2.0.0)
 Requires-Dist: pydantic (>=2.7.1,<3.0.0)
 Requires-Dist: pysupercluster-problematy (>=0.7.8,<0.8.0)
 Requires-Dist: scipy (>=1.15.1,<2.0.0)

{goodmap-1.3.0 → goodmap-1.4.0}/goodmap/admin_api.py

@@ -34,7 +34,9 @@ def _clean_model_name(model: Type[Any]) -> str:
 def _handle_location_validation_error(e: LocationValidationError):
     """Handle LocationValidationError and return appropriate response."""
     logger.warning(
-        "Location validation failed",
+        "Location validation failed - uuid: %s, errors: %s",
+        e.uuid,
+        e.validation_errors,
         extra={"uuid": e.uuid, "errors": e.validation_errors},
     )
     return make_response(jsonify({"message": ERROR_INVALID_LOCATION_DATA}), 400)
@@ -126,7 +128,9 @@ def _update_suggestion_handler(database, suggestion_id):
         database.update_suggestion(suggestion_id, status)
     except LocationValidationError as e:
         logger.warning(
-            "Location validation failed in suggestion",
+            "Location validation failed in suggestion - uuid: %s, errors: %s",
+            e.uuid,
+            e.validation_errors,
             extra={"uuid": e.uuid, "errors": e.validation_errors},
         )
         return make_response(jsonify({"message": ERROR_INVALID_LOCATION_DATA}), 400)

{goodmap-1.3.0 → goodmap-1.4.0}/goodmap/core_api.py

@@ -7,7 +7,8 @@ import numpy
 import pysupercluster
 from flask import Blueprint, jsonify, make_response, request
 from flask_babel import gettext
-from platzky.config import LanguagesMapping
+from platzky.attachment import AttachmentProtocol
+from platzky.config import AttachmentConfig, LanguagesMapping
 from spectree import Response, SpecTree
 
 from goodmap.api_models import (
@@ -80,15 +81,21 @@ def core_pages(
     notifier_function,
     csrf_generator,
     location_model,
+    photo_attachment_class: type[AttachmentProtocol],
+    photo_attachment_config: AttachmentConfig,
     feature_flags={},
 ) -> Blueprint:
     core_api_blueprint = Blueprint("api", __name__, url_prefix="/api")
 
-    # Initialize Spectree for API documentation and validation
-    # Use simple naming strategy without hashes for cleaner schema names
-    from typing import Any, Type
+    # Build photo error message from config
+    allowed_ext = ", ".join(sorted(photo_attachment_config.allowed_extensions or []))
+    max_size_mb = photo_attachment_config.max_size / (1024 * 1024)
+    error_invalid_photo = (
+        f"Invalid photo. Allowed formats: {allowed_ext}. Max size: {max_size_mb:.0f}MB."
+    )
 
-    def _clean_model_name(model: Type[Any]) -> str:
+    # Initialize Spectree for API documentation and validation
+    def _clean_model_name(model: type) -> str:
         return model.__name__
 
     spec = SpecTree(
@@ -111,6 +118,9 @@ def core_pages(
         import json as json_lib
 
         try:
+            # Initialize photo attachment (only populated for multipart/form-data)
+            photo_attachment = None
+
             # Handle both multipart/form-data (with file uploads) and JSON
             if request.content_type and request.content_type.startswith("multipart/form-data"):
                 # Parse form data dynamically
@@ -146,8 +156,24 @@ def core_pages(
                         # If not JSON, use as-is (simple string values)
                         suggested_location[key] = value
 
-                # TODO: Handle photo file upload from request.files['photo']
-                # For now, we just ignore it as the backend doesn't store photos yet
+                # Extract and validate photo attachment if present
+                photo_file = request.files.get("photo")
+                if photo_file and photo_file.filename:
+                    photo_content = photo_file.read()
+                    photo_mime = photo_file.content_type or "application/octet-stream"
+
+                    # Validate using configured Attachment class
+                    try:
+                        photo_attachment = photo_attachment_class(
+                            photo_file.filename, photo_content, photo_mime
+                        )
+                    except ValueError as e:
+                        logger.warning(
+                            "Rejected photo: %s",
+                            e,
+                            extra={"photo_filename": photo_file.filename},
+                        )
+                        return make_response(jsonify({"message": error_invalid_photo}), 400)
             else:
                 # Parse JSON data with security checks (depth/size protection)
                 raw_data = request.get_data(as_text=True)
@@ -186,10 +212,18 @@ def core_pages(
             database.add_suggestion(location.model_dump())
             message = gettext("A new location has been suggested with details")
             notifier_message = f"{message}: {json_lib.dumps(suggested_location, indent=2)}"
-            notifier_function(notifier_message)
+            attachments = [photo_attachment] if photo_attachment else None
+            notifier_function(notifier_message, attachments=attachments)
         except LocationValidationError as e:
+            # NOTE: validation_errors includes input values from the location model fields:
+            # - Core fields: position (lat/long), uuid, remark
+            # - Dynamic fields: categories and obligatory_fields configured per deployment
+            # These are geographic/categorical data, NOT PII (no email, phone, names of people).
+            # Safe to log for debugging. If PII fields are ever added to the location model,
+            # strip 'input' from validation_errors before logging.
             logger.warning(
-                "Location validation failed in suggest endpoint",
+                "Location validation failed in suggest endpoint: %s",
+                e.validation_errors,
                 extra={"errors": e.validation_errors},
             )
             return make_response(jsonify({"message": ERROR_INVALID_LOCATION_DATA}), 400)
@@ -371,11 +405,37 @@ def core_pages(
         """
         categories_data = database.get_category_data()
         result = []
+
+        categories_options_help = categories_data.get("categories_options_help", {})
+
         for key, options in categories_data["categories"].items():
-            result.append(
-                {"key": key, "name": gettext(key), "options": make_tuple_translation(options)}
-            )
-        return jsonify({"categories": result})
+            category_entry = {
+                "key": key,
+                "name": gettext(key),
+                "options": make_tuple_translation(options),
+            }
+
+            if feature_flags.get("CATEGORIES_HELP", False):
+                option_help_list = categories_options_help.get(key, [])
+                proper_options_help = []
+                for option in option_help_list:
+                    proper_options_help.append(
+                        {option: gettext(f"categories_options_help_{option}")}
+                    )
+                category_entry["options_help"] = proper_options_help
+
+            result.append(category_entry)
+
+        response = {"categories": result}
+
+        if feature_flags.get("CATEGORIES_HELP", False):
+            categories_help = categories_data.get("categories_help", [])
+            proper_categories_help = []
+            for option in categories_help:
+                proper_categories_help.append({option: gettext(f"categories_help_{option}")})
+            response["categories_help"] = proper_categories_help
+
+        return jsonify(response)
 
     @core_api_blueprint.route("/languages", methods=["GET"])
     @spec.validate()

{goodmap-1.3.0 → goodmap-1.4.0}/goodmap/goodmap.py

@@ -1,11 +1,13 @@
 """Goodmap engine with location management and admin interface."""
 
+import logging
 import os
 
 from flask import Blueprint, redirect, render_template, session
 from flask_wtf.csrf import CSRFProtect, generate_csrf
 from platzky import platzky
-from platzky.config import languages_dict
+from platzky.attachment import create_attachment_class
+from platzky.config import AttachmentConfig, languages_dict
 from platzky.models import CmsModule
 
 from goodmap.admin_api import admin_pages
@@ -17,6 +19,8 @@ from goodmap.db import (
     get_location_obligatory_fields,
 )
 
+logger = logging.getLogger(__name__)
+
 
 def create_app(config_path: str) -> platzky.Engine:
     """Create Goodmap application from YAML configuration file.
@@ -97,12 +101,24 @@ def create_app_from_config(config: GoodmapConfig) -> platzky.Engine:
 
     CSRFProtect(app)
 
+    # Create Attachment class for photo uploads
+    # JPEG-only: universal browser/device support, good compression for location photos,
+    # no transparency needed. PNG/WebP can be added if user demand warrants it.
+    photo_attachment_config = AttachmentConfig(
+        allowed_mime_types=frozenset({"image/jpeg"}),
+        allowed_extensions=frozenset({"jpg", "jpeg"}),
+        max_size=5 * 1024 * 1024,  # 5MB - reasonable for location photos
+    )
+    PhotoAttachment = create_attachment_class(photo_attachment_config)
+
     cp = core_pages(
         app.db,
         languages_dict(config.languages),
         app.notify,
         generate_csrf,
         location_model,
+        photo_attachment_class=PhotoAttachment,
+        photo_attachment_config=photo_attachment_config,
         feature_flags=config.feature_flags,
     )
     app.register_blueprint(cp)

{goodmap-1.3.0 → goodmap-1.4.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "goodmap"
-version = "1.3.0"
+version = "1.4.0"
 description = "Map engine to serve all the people :)"
 authors = ["Krzysztof Kolodzinski <krzysztof.kolodzinski@problematy.pl>"]
 readme = "README.md"
@@ -20,7 +20,7 @@ Flask-WTF = "^1.2.1"
 gql = "^3.4.0"
 aiohttp = "^3.8.4"
 pydantic = "^2.7.1"
-platzky = "^1.0.0"
+platzky = "^1.3.0"
 deprecation = "^2.1.0"
 numpy = "^2.2.0"
 # Using fork because official PyPI version (0.7.7) has outdated numpy setup hack