goodmap 1.1.13__tar.gz → 1.2.0__tar.gz

{goodmap-1.1.13 → goodmap-1.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: goodmap
-Version: 1.1.13
+Version: 1.2.0
 Summary: Map engine to serve all the people :)
 Author: Krzysztof Kolodzinski
 Author-email: krzysztof.kolodzinski@problematy.pl
@@ -18,10 +18,9 @@ Requires-Dist: Flask-WTF (>=1.2.1,<2.0.0)
 Requires-Dist: PyYAML (>=6.0,<7.0)
 Requires-Dist: aiohttp (>=3.8.4,<4.0.0)
 Requires-Dist: deprecation (>=2.1.0,<3.0.0)
-Requires-Dist: flask-restx (>=1.3.0,<2.0.0)
 Requires-Dist: google-cloud-storage (>=2.7.0,<3.0.0)
 Requires-Dist: gql (>=3.4.0,<4.0.0)
-Requires-Dist: gunicorn (>=20.1.0,<21.0.0)
+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)
@@ -29,6 +28,7 @@ Requires-Dist: platzky (>=1.0.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)
+Requires-Dist: spectree (>=2.0.1,<3.0.0)
 Requires-Dist: sphinx (>=8.0.0,<9.0.0) ; extra == "docs"
 Requires-Dist: sphinx-rtd-theme (>=3.0.0,<4.0.0) ; extra == "docs"
 Requires-Dist: tomli (>=2.0.0,<3.0.0) ; extra == "docs"
@@ -137,4 +137,5 @@ You can find examples of working configuration and database in `examples/` direc
 - `mongo_e2e_test_config.yml` - MongoDB configuration example
 
 
+# final test
 

{goodmap-1.1.13 → goodmap-1.2.0}/README.md

@@ -101,3 +101,4 @@ You can find examples of working configuration and database in `examples/` direc
 - `mongo_e2e_test_config.yml` - MongoDB configuration example
 
 
+# final test

goodmap-1.2.0/goodmap/api_models.py

@@ -0,0 +1,105 @@
+"""Pydantic models for API request/response validation.
+
+This module defines request and response models for the Goodmap REST API.
+These models are used by Spectree for automatic OpenAPI schema generation
+and request/response validation.
+"""
+
+from typing import Literal
+
+from pydantic import BaseModel, Field
+
+
+class LocationReportRequest(BaseModel):
+    """Request model for reporting a location issue."""
+
+    id: str = Field(..., description="Location UUID to report")
+    description: str = Field(..., min_length=1, description="Description of the problem")
+
+
+class LocationReportResponse(BaseModel):
+    """Response model for location report submission."""
+
+    message: str = Field(..., description="Success message")
+
+
+class SuggestionStatusRequest(BaseModel):
+    """Request model for updating suggestion status."""
+
+    status: Literal["accepted", "rejected"] = Field(
+        ..., description="Status to set for the suggestion"
+    )
+
+
+class ReportUpdateRequest(BaseModel):
+    """Request model for updating a report's status and priority."""
+
+    status: Literal["resolved", "rejected"] | None = Field(
+        None, description="New status for the report"
+    )
+    priority: Literal["critical", "high", "medium", "low"] | None = Field(
+        None, description="New priority for the report"
+    )
+
+
+class VersionResponse(BaseModel):
+    """Response model for version endpoint."""
+
+    backend: str = Field(..., description="Backend version")
+
+
+class CSRFTokenResponse(BaseModel):
+    """Response model for CSRF token endpoint (deprecated)."""
+
+    csrf_token: str = Field(..., description="CSRF token")
+
+
+class PaginationParams(BaseModel):
+    """Common pagination and filtering parameters."""
+
+    page: int | None = Field(None, ge=1, description="Page number (1-indexed)")
+    per_page: int | None = Field(None, ge=1, le=100, description="Items per page")
+    sort_by: str | None = Field(None, description="Field to sort by")
+    sort_order: Literal["asc", "desc"] | None = Field(None, description="Sort direction")
+
+
+class ClusteringParams(BaseModel):
+    """Parameters for clustering request."""
+
+    zoom: int = Field(7, ge=0, le=16, description="Map zoom level for clustering")
+
+
+class ErrorResponse(BaseModel):
+    """Standard error response."""
+
+    message: str = Field(..., description="Error message")
+    error: str | None = Field(None, description="Detailed error information")
+
+
+class SuccessResponse(BaseModel):
+    """Standard success response."""
+
+    message: str = Field(..., description="Success message")
+
+
+class BasicLocationInfo(BaseModel):
+    """Basic location information (uuid + position)."""
+
+    uuid: str = Field(..., description="Location UUID")
+    position: tuple[float, float] = Field(
+        ..., description="Location coordinates as (latitude, longitude)"
+    )
+    remark: bool = Field(False, description="Whether location has a remark")
+
+
+class ClusterInfo(BaseModel):
+    """Cluster information for map display."""
+
+    uuid: str | None = Field(None, description="Location UUID (None for multi-point clusters)")
+    position: tuple[float, float] = Field(..., description="Cluster center coordinates")
+    count: int = Field(..., description="Number of locations in cluster")
+
+
+# Note: Full location model is dynamically created from LocationBase
+# and cannot be statically defined here. API endpoints will use the
+# dynamically created location_model passed to core_pages() function.

{goodmap-1.1.13 → goodmap-1.2.0}/goodmap/core.py

@@ -1,9 +1,20 @@
+"""Core data filtering and sorting utilities for location queries."""
+
 from typing import Any, Dict, List
 
 # TODO move filtering to db site
 
 
 def does_fulfill_requirement(entry, requirements):
+    """Check if an entry fulfills all category requirements.
+
+    Args:
+        entry: Location data entry to check
+        requirements: List of (category, values) tuples to match
+
+    Returns:
+        bool: True if entry matches all non-empty requirements
+    """
     matches = []
     for category, values in requirements:
         if not values:
@@ -13,6 +24,15 @@ def does_fulfill_requirement(entry, requirements):
 
 
 def sort_by_distance(data: List[Dict[str, Any]], query_params: Dict[str, List[str]]):
+    """Sort locations by distance from query coordinates.
+
+    Args:
+        data: List of location dictionaries
+        query_params: Query parameters containing 'lat' and 'lon'
+
+    Returns:
+        List[Dict[str, Any]]: Sorted data (or original if no coordinates provided)
+    """
     try:
         if "lat" in query_params and "lon" in query_params:
             lat = float(query_params["lat"][0])
@@ -25,6 +45,15 @@ def sort_by_distance(data: List[Dict[str, Any]], query_params: Dict[str, List[st
 
 
 def limit(data, query_params):
+    """Limit number of results based on query parameter.
+
+    Args:
+        data: List of data to limit
+        query_params: Query parameters containing optional 'limit'
+
+    Returns:
+        Limited data (or original if no limit specified)
+    """
     try:
         if "limit" in query_params:
             limit = int(query_params["limit"][0])
@@ -36,6 +65,16 @@ def limit(data, query_params):
 
 
 def get_queried_data(all_data, categories, query_params):
+    """Filter, sort, and limit location data based on query parameters.
+
+    Args:
+        all_data: Complete list of location data
+        categories: Available categories for filtering
+        query_params: Query parameters for filtering, sorting, and limiting
+
+    Returns:
+        Filtered, sorted, and limited location data
+    """
     requirements = []
     for key in categories.keys():
         requirements.append((key, query_params.get(key)))