umap-project 2.7.3__py3-none-any.whl → 2.8.0__py3-none-any.whl

umap/views.py

@@ -1,7 +1,6 @@
 import io
 import json
 import mimetypes
-import os
 import re
 import socket
 import zipfile
@@ -318,7 +317,11 @@ class TeamMaps(PaginatorMixin, DetailView):
     context_object_name = "current_team"
 
     def get_maps(self):
-        return Map.public.filter(team=self.object).order_by("-modified_at")
+        qs = Map.public
+        user = self.request.user
+        if user.is_authenticated and user in self.object.users.all():
+            qs = Map.objects
+        return qs.filter(team=self.object).order_by("-modified_at")
 
     def get_context_data(self, **kwargs):
         kwargs.update(
@@ -373,6 +376,7 @@ class UserDashboard(PaginatorMixin, DetailView, SearchMixin):
 
     def get_maps(self):
         qs = self.get_search_queryset() or Map.objects.all()
+        qs = qs.exclude(share_status__in=[Map.DELETED, Map.BLOCKED])
         teams = self.object.teams.all()
         qs = (
             qs.filter(owner=self.object)
@@ -452,27 +456,27 @@ showcase = MapsShowCase.as_view()
 
 
 def validate_url(request):
-    assert request.method == "GET"
+    assert request.method == "GET", "Wrong HTTP method"
     url = request.GET.get("url")
-    assert url
+    assert url, "Missing URL"
     try:
         URLValidator(url)
-    except ValidationError:
-        raise AssertionError()
-    assert "HTTP_REFERER" in request.META
+    except ValidationError as err:
+        raise AssertionError(err)
+    assert "HTTP_REFERER" in request.META, "Missing HTTP_REFERER"
     referer = urlparse(request.META.get("HTTP_REFERER"))
     toproxy = urlparse(url)
     local = urlparse(settings.SITE_URL)
-    assert toproxy.hostname
-    assert referer.hostname == local.hostname
-    assert toproxy.hostname != "localhost"
-    assert toproxy.netloc != local.netloc
+    assert toproxy.hostname, "No hostname"
+    assert referer.hostname == local.hostname, f"{referer.hostname} != {local.hostname}"
+    assert toproxy.hostname != "localhost", "Invalid localhost target"
+    assert toproxy.netloc != local.netloc, "Invalid netloc"
     try:
         # clean this when in python 3.4
         ipaddress = socket.gethostbyname(toproxy.hostname)
-    except:
-        raise AssertionError()
-    assert not PRIVATE_IP.match(ipaddress)
+    except Exception as err:
+        raise AssertionError(err)
+    assert not PRIVATE_IP.match(ipaddress), "Private IP"
     return url
 
 
@@ -480,7 +484,8 @@ class AjaxProxy(View):
     def get(self, *args, **kwargs):
         try:
             url = validate_url(self.request)
-        except AssertionError:
+        except AssertionError as err:
+            print(f"AjaxProxy: {err}")
             return HttpResponseBadRequest()
         try:
             ttl = int(self.request.GET.get("ttl"))
@@ -598,29 +603,34 @@ class MapDetailMixin(SessionMixin):
             "tilelayers": TileLayer.get_list(),
             "editMode": self.edit_mode,
             "schema": Map.extra_schema,
-            "umap_id": self.get_umap_id(),
+            "id": self.get_id(),
             "starred": self.is_starred(),
             "licences": dict((l.name, l.json) for l in Licence.objects.all()),
-            "share_statuses": [
-                (i, str(label)) for i, label in Map.SHARE_STATUS if i != Map.BLOCKED
-            ],
             "umap_version": VERSION,
             "featuresHaveOwner": settings.UMAP_DEFAULT_FEATURES_HAVE_OWNERS,
             "websocketEnabled": settings.WEBSOCKET_ENABLED,
             "websocketURI": settings.WEBSOCKET_FRONT_URI,
             "importers": settings.UMAP_IMPORTERS,
+            "defaultLabelKeys": settings.UMAP_LABEL_KEYS,
         }
         created = bool(getattr(self, "object", None))
         if (created and self.object.owner) or (not created and not user.is_anonymous):
-            map_statuses = Map.EDIT_STATUS
+            edit_statuses = Map.EDIT_STATUS
             datalayer_statuses = DataLayer.EDIT_STATUS
+            share_statuses = Map.SHARE_STATUS
         else:
-            map_statuses = AnonymousMapPermissionsForm.STATUS
-            datalayer_statuses = AnonymousDataLayerPermissionsForm.STATUS
-        properties["edit_statuses"] = [(i, str(label)) for i, label in map_statuses]
+            edit_statuses = Map.ANONYMOUS_EDIT_STATUS
+            datalayer_statuses = DataLayer.ANONYMOUS_EDIT_STATUS
+            share_statuses = Map.ANONYMOUS_SHARE_STATUS
+        properties["edit_statuses"] = [(i, str(label)) for i, label in edit_statuses]
         properties["datalayer_edit_statuses"] = [
             (i, str(label)) for i, label in datalayer_statuses
         ]
+        properties["share_statuses"] = [
+            (i, str(label))
+            for i, label in share_statuses
+            if i not in [Map.BLOCKED, Map.DELETED]
+        ]
         if self.get_short_url():
             properties["shortUrl"] = self.get_short_url()
 
@@ -655,7 +665,7 @@ class MapDetailMixin(SessionMixin):
     def edit_mode(self):
         return "advanced"
 
-    def get_umap_id(self):
+    def get_id(self):
         return None
 
     def is_starred(self):
@@ -683,14 +693,9 @@ class PermissionsMixin:
         permissions["edit_status"] = self.object.edit_status
         permissions["share_status"] = self.object.share_status
         if self.object.owner:
-            permissions["owner"] = {
-                "id": self.object.owner.pk,
-                "name": str(self.object.owner),
-                "url": self.object.owner.get_url(),
-            }
+            permissions["owner"] = self.object.owner.get_metadata()
             permissions["editors"] = [
-                {"id": editor.pk, "name": str(editor)}
-                for editor in self.object.editors.all()
+                editor.get_metadata() for editor in self.object.editors.all()
             ]
         if self.object.team:
             permissions["team"] = self.object.team.get_metadata()
@@ -725,6 +730,8 @@ class MapView(MapDetailMixin, PermissionsMixin, DetailView):
         return self.object.get_absolute_url()
 
     def get_datalayers(self):
+        # When initializing datalayers from map, we cannot get the reference version
+        # the normal way, which is from the header X-Reference-Version
         return [dl.metadata(self.request) for dl in self.object.datalayer_set.all()]
 
     @property
@@ -736,7 +743,7 @@ class MapView(MapDetailMixin, PermissionsMixin, DetailView):
             edit_mode = "simple"
         return edit_mode
 
-    def get_umap_id(self):
+    def get_id(self):
         return self.object.pk
 
     def get_short_url(self):
@@ -844,6 +851,17 @@ class MapViewGeoJSON(MapView):
 class MapNew(MapDetailMixin, TemplateView):
     template_name = "umap/map_detail.html"
 
+    def get_map_properties(self):
+        properties = super().get_map_properties()
+        properties["permissions"] = {
+            "edit_status": Map.edit_status.field.default(),
+            "share_status": Map.share_status.field.default(),
+        }
+        if self.request.user.is_authenticated:
+            user = self.request.user
+            properties["permissions"]["owner"] = user.get_metadata()
+        return properties
+
 
 class MapPreview(MapDetailMixin, TemplateView):
     template_name = "umap/map_detail.html"
@@ -1008,7 +1026,7 @@ class MapDelete(DeleteView):
         self.object = self.get_object()
         if not self.object.can_delete(self.request):
             return HttpResponseForbidden(_("Only its owner can delete the map."))
-        self.object.delete()
+        self.object.move_to_trash()
         home_url = reverse("home")
         messages.info(self.request, _("Map successfully deleted."))
         if is_ajax(self.request):
@@ -1103,97 +1121,117 @@ class MapAnonymousEditUrl(RedirectView):
 # ############## #
 
 
-class GZipMixin(object):
-    EXT = ".gz"
+class DataLayerView(BaseDetailView):
+    model = DataLayer
 
     @property
-    def path(self):
-        return Path(self.object.geojson.path)
+    def accepts_gzip(self):
+        return settings.UMAP_GZIP and re_accepts_gzip.search(
+            self.request.META.get("HTTP_ACCEPT_ENCODING", "")
+        )
 
     @property
-    def gzip_path(self):
-        return Path(f"{self.path}{self.EXT}")
-
-    def read_version(self, path):
-        # Remove optional .gz, then .geojson, then return the trailing version from path.
-        return str(path.with_suffix("").with_suffix("")).split("_")[-1]
+    def is_s3(self):
+        return "S3" in settings.STORAGES["data"]["BACKEND"]
 
     @property
-    def version(self):
-        # Prior to 1.3.0 we did not set gzip mtime as geojson mtime,
-        # but we switched from If-Match header to If-Unmodified-Since
-        # and when users accepts gzip their last modified value is the gzip
-        # (when umap is served by nginx and X-Accel-Redirect)
-        # one, so we need to compare with that value in that case.
-        # cf https://github.com/umap-project/umap/issues/1212
-        path = (
-            self.gzip_path
-            if self.accepts_gzip and self.gzip_path.exists()
-            else self.path
-        )
-        return self.read_version(path)
+    def filepath(self):
+        return Path(self.object.geojson.path)
 
     @property
-    def accepts_gzip(self):
-        return settings.UMAP_GZIP and re_accepts_gzip.search(
-            self.request.META.get("HTTP_ACCEPT_ENCODING", "")
-        )
+    def fileurl(self):
+        return self.object.geojson.url
 
+    @property
+    def filedata(self):
+        with self.object.geojson.open("rb") as f:
+            return f.read()
 
-class DataLayerView(GZipMixin, BaseDetailView):
-    model = DataLayer
+    @property
+    def fileversion(self):
+        return self.object.reference_version
 
     def render_to_response(self, context, **response_kwargs):
         response = None
-        path = self.path
         # Generate gzip if needed
-        if self.accepts_gzip:
-            if not self.gzip_path.exists():
-                gzip_file(path, self.gzip_path)
+        if not self.is_s3 and self.accepts_gzip:
+            gzip_path = Path(f"{self.filepath}.gz")
+            if not gzip_path.exists():
+                gzip_file(self.filepath, gzip_path)
 
         if getattr(settings, "UMAP_XSENDFILE_HEADER", None):
             response = HttpResponse()
-            internal_path = str(path).replace(settings.MEDIA_ROOT, "/internal")
+            if self.is_s3:
+                internal_path = f"/s3/{self.fileurl}"
+            else:
+                internal_path = str(self.filepath).replace(
+                    settings.MEDIA_ROOT, "/internal"
+                )
             response[settings.UMAP_XSENDFILE_HEADER] = internal_path
         else:
             # Do not use in production
             # (no gzip/cache-control/If-Modified-Since/If-None-Match)
-            statobj = os.stat(path)
-            with open(path, "rb") as f:
-                # Should not be used in production!
-                response = HttpResponse(f.read(), content_type="application/geo+json")
-            response["X-Datalayer-Version"] = self.version
-            response["Content-Length"] = statobj.st_size
+            data = self.filedata
+            response = HttpResponse(data, content_type="application/geo+json")
+        response["X-Datalayer-Version"] = self.fileversion
         return response
 
 
 class DataLayerVersion(DataLayerView):
     @property
-    def path(self):
-        return Path(settings.MEDIA_ROOT) / self.object.get_version_path(
-            self.kwargs["name"]
-        )
+    def filepath(self):
+        try:
+            return Path(settings.MEDIA_ROOT) / self.object.get_version_path(
+                self.kwargs["ref"]
+            )
+        except ValueError:
+            raise Http404("Invalid version reference")
 
+    @property
+    def fileurl(self):
+        return self.object.get_version_path(self.kwargs["ref"])
 
-class DataLayerCreate(FormLessEditMixin, GZipMixin, CreateView):
+    @property
+    def filedata(self):
+        try:
+            return self.object.get_version(self.kwargs["ref"])
+        except ValueError:
+            raise Http404("Invalid version reference.")
+
+    @property
+    def fileversion(self):
+        return self.kwargs["ref"]
+
+
+class DataLayerCreate(FormLessEditMixin, CreateView):
     model = DataLayer
     form_class = DataLayerForm
 
     def form_valid(self, form):
         form.instance.map = self.kwargs["map_inst"]
+
+        uuid = self.kwargs["pk"]
+        # Check if UUID already exists
+        if DataLayer.objects.filter(uuid=uuid).exists():
+            return HttpResponseBadRequest("UUID already exists")
+
+        form.instance.uuid = uuid
         self.object = form.save()
-        # Simple response with only metadata (including new id)
-        response = simple_json_response(**self.object.metadata(self.request))
-        response["X-Datalayer-Version"] = self.version
+        assert uuid == self.object.uuid
+
+        # Simple response with only metadata
+        data = self.object.metadata(self.request)
+        response = simple_json_response(**data)
+        response["X-Datalayer-Version"] = self.object.reference_version
         return response
 
 
-class DataLayerUpdate(FormLessEditMixin, GZipMixin, UpdateView):
+class DataLayerUpdate(FormLessEditMixin, UpdateView):
     model = DataLayer
     form_class = DataLayerForm
 
     def has_changes_since(self, incoming_version):
-        return incoming_version and self.version != incoming_version
+        return incoming_version and self.object.reference_version != incoming_version
 
     def merge(self, reference_version):
         """
@@ -1205,11 +1243,9 @@ class DataLayerUpdate(FormLessEditMixin, GZipMixin, UpdateView):
 
         # Use the provided info to find the correct version in our storage.
         for version in self.object.versions:
-            name = version["name"]
-            path = Path(settings.MEDIA_ROOT) / self.object.get_version_path(name)
-            if reference_version == self.read_version(path):
-                with open(path) as f:
-                    reference = json.loads(f.read())
+            ref = version["ref"]
+            if reference_version == ref:
+                reference = json.loads(self.object.get_version(ref))
                 break
         else:
             # If the reference document is not found, we can't merge.
@@ -1218,7 +1254,7 @@ class DataLayerUpdate(FormLessEditMixin, GZipMixin, UpdateView):
         incoming = json.loads(self.request.FILES["geojson"].read())
 
         # Latest known version of the data.
-        with open(self.path) as f:
+        with self.object.geojson.open() as f:
             latest = json.loads(f.read())
 
         try:
@@ -1262,7 +1298,7 @@ class DataLayerUpdate(FormLessEditMixin, GZipMixin, UpdateView):
             data["geojson"] = json.loads(self.object.geojson.read().decode())
             self.request.session["needs_reload"] = False
         response = simple_json_response(**data)
-        response["X-Datalayer-Version"] = self.version
+        response["X-Datalayer-Version"] = self.object.reference_version
         return response
 
 

{umap_project-2.7.3.dist-info → umap_project-2.8.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: umap-project
-Version: 2.7.3
+Version: 2.8.0
 Summary: Create maps with OpenStreetMap layers in a minute and embed them in your site.
 Author-email: Yohan Boniface <yb@enix.org>
 Maintainer-email: David Larlet <david@larlet.fr>
@@ -18,39 +18,42 @@ Requires-Python: >=3.10
 Requires-Dist: django-agnocomplete==2.2.0
 Requires-Dist: django-environ==0.11.2
 Requires-Dist: django-probes==1.7.0
-Requires-Dist: django==5.1.2
+Requires-Dist: django==5.1.4
 Requires-Dist: pillow==11.0.0
 Requires-Dist: psycopg==3.2.3
-Requires-Dist: rcssmin==1.1.3
+Requires-Dist: rcssmin==1.2.0
 Requires-Dist: requests==2.32.3
 Requires-Dist: rjsmin==1.2.3
 Requires-Dist: social-auth-app-django==5.4.2
 Requires-Dist: social-auth-core==4.5.4
 Provides-Extra: dev
-Requires-Dist: djlint==1.35.2; extra == 'dev'
+Requires-Dist: djlint==1.36.3; extra == 'dev'
 Requires-Dist: hatch==1.13.0; extra == 'dev'
 Requires-Dist: isort==5.13.2; extra == 'dev'
-Requires-Dist: mkdocs-material==9.5.42; extra == 'dev'
+Requires-Dist: mkdocs-material==9.5.48; extra == 'dev'
 Requires-Dist: mkdocs-static-i18n==1.2.3; extra == 'dev'
 Requires-Dist: mkdocs==1.6.1; extra == 'dev'
-Requires-Dist: pymdown-extensions==10.11.2; extra == 'dev'
-Requires-Dist: ruff==0.7.0; extra == 'dev'
+Requires-Dist: pymdown-extensions==10.12; extra == 'dev'
+Requires-Dist: ruff==0.8.2; extra == 'dev'
 Requires-Dist: vermin==1.6.0; extra == 'dev'
 Provides-Extra: docker
-Requires-Dist: uwsgi==2.0.27; extra == 'docker'
+Requires-Dist: uwsgi==2.0.28; extra == 'docker'
+Provides-Extra: s3
+Requires-Dist: django-storages[s3]==1.14.4; extra == 's3'
 Provides-Extra: sync
-Requires-Dist: channels==4.1.0; extra == 'sync'
+Requires-Dist: channels==4.2.0; extra == 'sync'
 Requires-Dist: daphne==4.1.2; extra == 'sync'
-Requires-Dist: pydantic==2.9.2; extra == 'sync'
+Requires-Dist: pydantic==2.10.3; extra == 'sync'
 Requires-Dist: websockets==13.1; extra == 'sync'
 Provides-Extra: test
 Requires-Dist: factory-boy==3.3.1; extra == 'test'
+Requires-Dist: moto[s3]==5.0.21; extra == 'test'
 Requires-Dist: playwright>=1.39; extra == 'test'
 Requires-Dist: pytest-django==4.9.0; extra == 'test'
-Requires-Dist: pytest-playwright==0.5.2; extra == 'test'
-Requires-Dist: pytest-rerunfailures==14.0; extra == 'test'
+Requires-Dist: pytest-playwright==0.6.2; extra == 'test'
+Requires-Dist: pytest-rerunfailures==15.0; extra == 'test'
 Requires-Dist: pytest-xdist<4,>=3.5.0; extra == 'test'
-Requires-Dist: pytest==8.3.3; extra == 'test'
+Requires-Dist: pytest==8.3.4; extra == 'test'
 Description-Content-Type: text/markdown
 
 # uMap project