django-gisserver 1.3.0__py3-none-any.whl → 1.4.0__py3-none-any.whl

gisserver/queries/adhoc.py

@@ -5,6 +5,7 @@ such as the "FILTER", "BBOX" and "RESOURCEID" parameters.
 
 These definitions follow the WFS spec.
 """
+
 from __future__ import annotations
 
 import logging
@@ -95,9 +96,7 @@ class AdhocQuery(QueryExpression):
                 if id_type_names:
                     # Only test when the RESOURCEID has a typename.id format
                     # Otherwise, this breaks the CITE RESOURCEID=test-UUID parameter.
-                    kvp_type_names = {
-                        feature_type.name for feature_type in params["typeNames"]
-                    }
+                    kvp_type_names = {feature_type.name for feature_type in params["typeNames"]}
                     if not kvp_type_names.issuperset(id_type_names):
                         raise InvalidParameterValue(
                             "resourceID",
@@ -133,9 +132,7 @@ class AdhocQuery(QueryExpression):
     def get_type_names(self):
         return self.typeNames
 
-    def compile_query(
-        self, feature_type: FeatureType, using=None
-    ) -> fes20.CompiledQuery:
+    def compile_query(self, feature_type: FeatureType, using=None) -> fes20.CompiledQuery:
         """Return our internal CompiledQuery object that can be applied to the queryset."""
         if self.filter:
             # Generate the internal query object from the <fes:Filter>

gisserver/queries/base.py

@@ -69,9 +69,7 @@ class QueryExpression:
             results=[
                 # Include empty feature collections,
                 # so the selected feature types are still known.
-                SimpleFeatureCollection(
-                    feature_type=ft, queryset=qs.none(), start=0, stop=0
-                )
+                SimpleFeatureCollection(feature_type=ft, queryset=qs.none(), start=0, stop=0)
                 for ft, qs in querysets
             ],
             number_matched=sum(qs.count() for ft, qs in querysets),
@@ -139,9 +137,7 @@ class QueryExpression:
             f"{self.__class__.__name__}.get_type_names() should be implemented."
         )
 
-    def compile_query(
-        self, feature_type: FeatureType, using=None
-    ) -> fes20.CompiledQuery:
+    def compile_query(self, feature_type: FeatureType, using=None) -> fes20.CompiledQuery:
         """Define the compiled query that filters the queryset.
 
         Subclasses need to define this method, unless

gisserver/queries/stored.py

@@ -2,6 +2,7 @@
 
 These definitions follow the WFS spec.
 """
+
 from __future__ import annotations
 
 from dataclasses import dataclass
@@ -131,9 +132,7 @@ class StoredQueryParameter(Parameter):
     """Special parameter parsing for the 'STOREDQUERY_ID' parameter"""
 
     def __init__(self):
-        super().__init__(
-            name="STOREDQUERY_ID", parser=stored_query_registry.resolve_query
-        )
+        super().__init__(name="STOREDQUERY_ID", parser=stored_query_registry.resolve_query)
 
     def value_from_query(self, KVP: dict):
         """Customize the request parsing to read custom parameters too."""
@@ -199,9 +198,7 @@ class GetFeatureById(StoredQuery):
 
         return collection
 
-    def compile_query(
-        self, feature_type: FeatureType, using=None
-    ) -> fes20.CompiledQuery:
+    def compile_query(self, feature_type: FeatureType, using=None) -> fes20.CompiledQuery:
         """Create the internal query object that will be applied to the queryset."""
         compiler = fes20.CompiledQuery(feature_type=feature_type)
         compiler.add_lookups(Q(pk=self.id), type_name=self.type_name)

gisserver/types.py

@@ -1,6 +1,6 @@
 """Internal XSD type definitions.
 
-These types are the internal schema definition on which all output is generated.
+These types are the internal schema definition, and the foundation for all output generation.
 
 The end-users of this library typically create a WFS feature type definition by using
 the :class:~gisserver.features.FeatureType` / :class:`~gisserver.features.FeatureField` classes.
@@ -23,6 +23,7 @@ Each XMLSchema node defines it's "data type" as either:
 
 Custom field types could also generate these field types.
 """
+
 from __future__ import annotations
 
 import operator
@@ -30,6 +31,7 @@ import re
 from dataclasses import dataclass, field
 from decimal import Decimal as D
 from enum import Enum
+from functools import cached_property
 from typing import TYPE_CHECKING
 
 from django.conf import settings
@@ -42,7 +44,6 @@ from django.db.models.fields.related import (  # Django 2 imports
     RelatedField,
 )
 from django.utils import dateparse
-from django.utils.functional import cached_property
 
 from gisserver.exceptions import ExternalParsingError, OperationProcessingFailed
 from gisserver.geometries import CRS, WGS84  # noqa: F401 / for backwards compatibility
@@ -146,7 +147,7 @@ class XsdTypes(XsdAnyType, Enum):
     gYear = "gYear"
     hexBinary = "hexBinary"
     base64Binary = "base64Binary"
-    token = "token"
+    token = "token"  # noqa: S105
     language = "language"
 
     # Types that contain a GML value as member:
@@ -193,9 +194,7 @@ class XsdTypes(XsdAnyType, Enum):
         try:
             return TYPES_TO_PYTHON[self]
         except KeyError:
-            raise NotImplementedError(
-                f'Casting to "{self}" is not implemented.'
-            ) from None
+            raise NotImplementedError(f'Casting to "{self}" is not implemented.') from None
 
     def to_python(self, raw_value):
         """Convert a raw string value to this type representation"""
@@ -219,7 +218,9 @@ def _init_types_to_python():
     global TYPES_TO_PYTHON
     from gisserver.parsers import values  # avoid cyclic import
 
-    as_is = lambda v: v
+    def as_is(v):
+        return v
+
     TYPES_TO_PYTHON = {
         XsdTypes.date: dateparse.parse_date,
         XsdTypes.dateTime: values.parse_iso_datetime,
@@ -300,29 +301,40 @@ class XsdNode:
         model_attribute: str,
         field: models.Field | ForeignObjectRel | None,
     ):
-        """Select the most efficient read function to retrieves the value."""
-        if field is None:
-            # No model field, can only use getattr(). The attrgetter function has
-            # built-in support for traversing model attributes with dots.
-            return operator.attrgetter(model_attribute)
-        elif isinstance(field, ForeignObjectRel):
-            # Special handling, has no value_from_object()
+        """Select the most efficient read function to retrieves the value.
+
+        Since reading a value can be called like 150000+ times, this is heavily optimized.
+
+        This attempts to use ``operator.attrgetter()`` whenever possible,
+        since this will be much faster than using ``getattr()``.
+        The custom ``value_from_object()`` is fully supported too.
+        """
+        if field is None or isinstance(field, ForeignObjectRel):
+            # No model field, can only use getattr(). The attrgetter() function is both faster,
+            # and has built-in support for traversing model attributes with dots.
             return operator.attrgetter(model_attribute)
-        elif "." not in model_attribute:
-            # Shortcut, can just use Django's value_from_object.
-            # This allows Django fields to override the object retrieval.
-            # Not using value_to_string() as different output formats may serialize differently.
-            return field.value_from_object
-        else:
-            # Need to traverse foreign key relations before using value_from_objec().
+
+        if field.value_from_object.__func__ is models.Field.value_from_object:
+            # No custom value_from_object(), this can be fully emulated with attrgetter() too.
+            # Still allow the final node to have a custom attname,
+            # # which is what Field.value_from_object() does.
             names = model_attribute.split(".")
+            names[-1] = field.attname
+            return operator.attrgetter(".".join(names))
+
+        if "." not in model_attribute:
+            # Single level, use the custom value_from_object() directly.
+            return field.value_from_object
+
+        # Need to traverse the related field path, and use value_from_object() on the final object.
+        names = model_attribute.split(".")
+        get_related_instance = operator.attrgetter(".".join(names[:-1]))
 
-            def _related_get_value_from_object(instance):
-                for name in names[:-1]:
-                    instance = getattr(instance, name)
-                return field.value_from_object(instance)
+        def _related_get_value_from_object(instance):
+            related_instance = get_related_instance(instance)
+            return field.value_from_object(related_instance)
 
-            return _related_get_value_from_object
+        return _related_get_value_from_object
 
     @cached_property
     def is_geometry(self) -> bool:
@@ -397,13 +409,13 @@ class XsdNode:
                     value = value.all()
                 return value
             else:
-                # Support value_from_object() on custom fields.
-                return self.format_value(self._valuegetter(instance))
+                # the _valuegetter() supports value_from_object() on custom fields.
+                return self._valuegetter(instance)
         except (AttributeError, ObjectDoesNotExist):
             # E.g. Django foreign keys that point to a non-existing member.
             return None
 
-    def format_value(self, value):
+    def format_raw_value(self, value):
         """Allow to apply some final transformations on a value.
         This is mainly used to support @gml:id which includes a prefix.
         """
@@ -426,9 +438,7 @@ class XsdNode:
                 code=e.code,
             ) from e
         except (ValueError, TypeError) as e:
-            raise ValidationError(
-                f"Invalid data for the '{self.name}' property: {e}"
-            ) from e
+            raise ValidationError(f"Invalid data for the '{self.name}' property: {e}") from e
 
         return raw_value
 
@@ -493,9 +503,7 @@ class XsdElement(XsdNode):
         source: models.Field | ForeignObjectRel | None = None,
         model_attribute: str | None = None,
     ):
-        super().__init__(
-            name, type, prefix=prefix, source=source, model_attribute=model_attribute
-        )
+        super().__init__(name, type, prefix=prefix, source=source, model_attribute=model_attribute)
         self.nillable = nillable
         self.min_occurs = min_occurs
         self.max_occurs = max_occurs
@@ -560,9 +568,7 @@ class XsdAttribute(XsdNode):
         source: models.Field | ForeignObjectRel | None = None,
         model_attribute: str | None = None,
     ):
-        super().__init__(
-            name, type, prefix=prefix, source=source, model_attribute=model_attribute
-        )
+        super().__init__(name, type, prefix=prefix, source=source, model_attribute=model_attribute)
         self.use = use
 
 
@@ -579,16 +585,14 @@ class GmlIdAttribute(XsdAttribute):
         source: models.Field | ForeignObjectRel | None = None,
         model_attribute="pk",
     ):
-        super().__init__(
-            prefix="gml", name="id", source=source, model_attribute=model_attribute
-        )
+        super().__init__(prefix="gml", name="id", source=source, model_attribute=model_attribute)
         object.__setattr__(self, "type_name", type_name)
 
     def get_value(self, instance: models.Model):
         pk = super().get_value(instance)  # handle dotted-name notations
         return f"{self.type_name}.{pk}"
 
-    def format_value(self, value):
+    def format_raw_value(self, value):
         """Format the value as retrieved from the database."""
         return f"{self.type_name}.{value}"
 
@@ -671,7 +675,7 @@ class XsdComplexType(XsdAnyType):
 
     Typically, this maps into a Django model, with each element pointing to a model field.
 
-    The complex can hold multiple :class:`XsdElement` and :class:`XsdAttribute`
+    A complex type can hold multiple :class:`XsdElement` and :class:`XsdAttribute`
     nodes as children, composing an object. The elements themselves can point
     to a complex type themselves, to create a nested class structure.
     That also allows embedding models with their relations into a single response.
@@ -719,6 +723,17 @@ class XsdComplexType(XsdAnyType):
     def is_complex_type(self):
         return True  # a property to avoid being used as field.
 
+    @cached_property
+    def all_elements(self) -> list[XsdElement]:
+        """All elements, including inherited elements."""
+        if self.base.is_complex_type:
+            # Add all base class members, in their correct ordering
+            # By having these as XsdElement objects instead of hard-coded writes,
+            # the query/filter logic also works for these elements.
+            return self.base.elements + self.elements
+        else:
+            return self.elements
+
     @cached_property
     def geometry_elements(self) -> list[XsdElement]:
         """Shortcut to get all geometry elements"""
@@ -890,9 +905,7 @@ class XPathMatch(ORMPath):
         if "[" in self.query:
             # If there is an element[@attr=...]/field tag,
             # the build_...() logic should return a Q() object.
-            raise NotImplementedError(
-                f"Complex XPath queries are not supported yet: {self.query}"
-            )
+            raise NotImplementedError(f"Complex XPath queries are not supported yet: {self.query}")
 
     @cached_property
     def orm_path(self) -> str:

gisserver/views.py

@@ -1,12 +1,12 @@
 """The view layer parses the request, and dispatches it to an operation."""
+
 from __future__ import annotations
 
 import re
 from urllib.parse import urlencode
 
-from django.core.exceptions import ImproperlyConfigured
+from django.core.exceptions import ImproperlyConfigured, SuspiciousOperation
 from django.core.exceptions import PermissionDenied as Django_PermissionDenied
-from django.core.exceptions import SuspiciousOperation
 from django.http import HttpResponse
 from django.shortcuts import render
 from django.views import View
@@ -86,6 +86,8 @@ class GISView(View):
                 status=exc.status_code,
                 reason=exc.reason,
             )
+        else:
+            return None
 
     def get(self, request, *args, **kwargs):
         """Entry point to handle HTTP GET requests.
@@ -129,9 +131,7 @@ class GISView(View):
         """Render the index page."""
         # Not using the whole TemplateResponseMixin config with configurable parameters.
         # If this really needs more configuration, overriding is likely just as easy.
-        return render(
-            self.request, self.get_index_template_names(), self.get_index_context_data()
-        )
+        return render(self.request, self.get_index_template_names(), self.get_index_context_data())
 
     def get_index_context_data(self, **kwargs):
         """Provide the context data for the index page."""
@@ -143,8 +143,7 @@ class GISView(View):
         base_qs = {
             key: value
             for key, value in self.request.GET.items()
-            if key.upper()
-            not in ("SERVICE", "REQUEST", "VERSION", "OUTPUTFORMAT", "TYPENAMES")
+            if key.upper() not in ("SERVICE", "REQUEST", "VERSION", "OUTPUTFORMAT", "TYPENAMES")
         }
         base_query = urlencode(base_qs) + "&" if base_qs else ""
 
@@ -173,9 +172,7 @@ class GISView(View):
 
         if self.index_template_name:
             # Allow the same substitutions for a manually configured template.
-            return [
-                self.index_template_name.format(service=service, version=self.version)
-            ]
+            return [self.index_template_name.format(service=service, version=self.version)]
         else:
             return [
                 f"gisserver/{service}/{self.version}/index.html",

django_gisserver-1.3.0.dist-info/RECORD

@@ -1,54 +0,0 @@
-gisserver/__init__.py,sha256=BfdKG3T6jfPrJ5AF8bDHgTsS70jBTw-Eg3IjeDKAlPQ,40
-gisserver/conf.py,sha256=DC3TNBhA2kcLxTwmzhmrW5Noiv2QsPQms_EAAZLtO-4,2108
-gisserver/db.py,sha256=4NSxzwCLsTON2wrLBKZweg6kOlZelV4fzdsrMGpC7V8,5329
-gisserver/exceptions.py,sha256=kf6o-Vk9CrAAcjk4uGlQVvXnuYOBVks4pcQly3pKRPU,4596
-gisserver/features.py,sha256=XKLs0WrrT-7Hwc2ByUYuOMOInzFONP9KpfGS065mIKI,32232
-gisserver/geometries.py,sha256=PEmYKV8yw1fjwL6ortc1w72UOByRHz88NDEyPuO3qFo,12619
-gisserver/types.py,sha256=dfybev3kq1IO3jaIy9uETOqHwqQOzEG94fKEbQB-AEQ,34202
-gisserver/views.py,sha256=Z55WA8Qc5OpP0ONPMPGqs-66w0ZR9XpDs9fJ8toqda4,13252
-gisserver/operations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-gisserver/operations/base.py,sha256=XFW9Y9oOHzdPou3cfZQ2UWCZbDba23MBydbN6owfomc,17012
-gisserver/operations/wfs20.py,sha256=J54vnxEE_8Myz5uwnjltElun_H1MvKQNeWZNjIWiDF4,18635
-gisserver/output/__init__.py,sha256=kWdJHxKtQNKK4Bld8uNdVqk3cjgpiagBL_FlMjsbjQc,1950
-gisserver/output/base.py,sha256=W4017N2qlEuPCbXLl17SQUVfTpTZphiSURd75NR9Hac,7954
-gisserver/output/buffer.py,sha256=Jqw94wa1YFcKbFB9ZLiYx2L0TRD1MDZNLF5te3QBqgU,1542
-gisserver/output/csv.py,sha256=sVj1U1dVkMqm-cwjGbnDg-YLQL1QcRMXyH6LqgC7tN4,6179
-gisserver/output/geojson.py,sha256=a8A628p1PEF-fmKdm3CrGDyCRPZdukMZRNzjiqDosWY,11217
-gisserver/output/gml32.py,sha256=_IN5ehNLGPk5z3euIxavukjYsoHn6liPqY__Ge7LpjY,26894
-gisserver/output/results.py,sha256=JdOznMx1xDxSmekMWW5YyF_muzrJXd6DVy0qqs2ewKI,9224
-gisserver/output/utils.py,sha256=fMUPnAKXiT5IX3GlO0amZKzd_8ixNG_g1lgmZ3aNyGo,6113
-gisserver/output/xmlschema.py,sha256=JVYx5ZXeIt4v8HLsEcRg5dR9WcrOREctlGaHcn31rEw,4603
-gisserver/parsers/__init__.py,sha256=g72D8EtR-QkhcemzY5-Qty-nhHPKza83Sz3KZm8bfq0,290
-gisserver/parsers/base.py,sha256=-XI2_ryoZ8tOIgckp71eEiJDoLxCXN2fQK8yY6gKNJ0,4864
-gisserver/parsers/tags.py,sha256=NyJhbt-U2zTewfhghH4LRslTaDK2UOq9Vgk83pWfJh0,3553
-gisserver/parsers/values.py,sha256=YtkP2QFkV6T8vOWcze7b5goydXgzYuwMIjuMFdGRrA4,1038
-gisserver/parsers/fes20/__init__.py,sha256=l8OutRicZ8E2cpyFtJj6wTFNArYoFaLiXABGyZYyKvQ,624
-gisserver/parsers/fes20/expressions.py,sha256=aweq4NnFvbkqe5Ba5zazvkMkpoBZqI0jNeDAG2QYqJE,9747
-gisserver/parsers/fes20/filters.py,sha256=HBiGh_4Ddw3rY5TKxHtXFnkJe_80fbtVvfmR_QVM52Q,3507
-gisserver/parsers/fes20/functions.py,sha256=GWiOmixNXqP2NvZ70GBnRAjqILwpfYKJggVc-LhnsyY,8726
-gisserver/parsers/fes20/identifiers.py,sha256=KRkYj-fWJUZJlde7GY8uG2Ii5f5DERodXbaJMBQg2TQ,2863
-gisserver/parsers/fes20/operators.py,sha256=eZu9Wx2ZTTKpy61FiA3XmO6RzRBhRw78Gxmy69vOmiY,23601
-gisserver/parsers/fes20/query.py,sha256=_jWNfVEiis_JwJwOshPwqRTecm6zJ8Dm5CKssDiKtio,10083
-gisserver/parsers/fes20/sorting.py,sha256=jBz52eaY0-JS6q16D2eGCA5IvvjwlQv3oHsxEFqYsH0,2176
-gisserver/parsers/gml/__init__.py,sha256=4t15m7VxqgOOAh9ybAVEISiZyKaDL4xyBEJfPCil6eA,1462
-gisserver/parsers/gml/base.py,sha256=ct2bl5Q2P9gDtXg4gJcsm02cmc6fiv_x3n0R6IgJfW8,1065
-gisserver/parsers/gml/geometries.py,sha256=cgV3WogA7LyC_H_NF7dGoGLvLdQRACG6AlThRkX_jhU,3171
-gisserver/queries/__init__.py,sha256=HI_J_kv60fc7wYaaNLz7_yeLz-9Y1Q_p7PDmMa2sIiw,892
-gisserver/queries/adhoc.py,sha256=gVgi7cel0pjQo8AyiDOd53qHpFSZxCnXDuMP4N1IXSw,7146
-gisserver/queries/base.py,sha256=-vf6bufYbTDq41PBjoV7N7R9sdPBPta8tKIBVrUY1Nc,5943
-gisserver/queries/stored.py,sha256=ncxiDo-kc5v4WKyPTAd4uOnyFPN-y1N9SW6Zg1Xazvg,7095
-gisserver/static/gisserver/index.css,sha256=fiQuCMuiWUhhrNQD6bbUJaX5vH5OpG9qgPdELPB8cpI,163
-gisserver/templates/gisserver/index.html,sha256=yliku8jDqAOcenkbe1YnvJBnuS13MvzzsoDV8sQZ3GM,866
-gisserver/templates/gisserver/service_description.html,sha256=3EHLnQx27_nTDZFD2RH6E10EWnTN90s1DGuEj9PeBrg,993
-gisserver/templates/gisserver/wfs/feature_field.html,sha256=H5LsTAxGVGQqEpOZdEUTszQmFAZSpB9ggRJUsTdjYnw,538
-gisserver/templates/gisserver/wfs/feature_type.html,sha256=pIfa1cMsTlNIrzNiEOaq9LjzzF7_vZ9C7eN6KDBLOHE,788
-gisserver/templates/gisserver/wfs/2.0.0/describe_stored_queries.xml,sha256=4Hxw1kCnxfWXTVPbHf8IW9_qiSeIEtnxHK6z6TS3-zA,1041
-gisserver/templates/gisserver/wfs/2.0.0/get_capabilities.xml,sha256=KKrI0YYQqZWtTOyOkm-ZHuNyfwipdx0i0N8p7fggPU8,8675
-gisserver/templates/gisserver/wfs/2.0.0/list_stored_queries.xml,sha256=CIBVQrKXmGMQ6BKbX4_0ru4lXtWnW5EIgHUbIi1V0Vc,636
-gisserver/templatetags/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-gisserver/templatetags/gisserver_tags.py,sha256=RFGqEj-EQi9FrJiFJ7HHAQqlU4fDKVKTtZrPNwURXgA,204
-django_gisserver-1.3.0.dist-info/LICENSE,sha256=HyVuytGSiAUQ6ErWBHTqt1iSGHhLmlC8fO7jTCuR8dU,16725
-django_gisserver-1.3.0.dist-info/METADATA,sha256=N9SdE0qRO4HBR8MW1XiTo45KOvPeFWTA_k3p0q_iH5s,5834
-django_gisserver-1.3.0.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-django_gisserver-1.3.0.dist-info/top_level.txt,sha256=8zFCEMmkpixE4TPiOAlxSq3PD2EXvAeFKwG4yZoIIOQ,10
-django_gisserver-1.3.0.dist-info/RECORD,,

gisserver/output/buffer.py

@@ -1,64 +0,0 @@
-"""Output buffering, to write data in chunks.
-
-This builds on top of StringIO/BytesIO to write data and regularly flush it.
-"""
-from __future__ import annotations
-
-import io
-from typing import Generic, TypeVar
-
-V = TypeVar("V", str, bytes)
-
-
-class BaseBuffer(Generic[V]):
-    """Fast buffer to write data in chunks.
-    This avoids performing too many yields in the output writing.
-    Especially for GeoJSON, that slows down the response times.
-    """
-
-    buffer_class = None
-
-    def __init__(self, chunk_size=8192):
-        self.data = self.buffer_class()
-        self.chunk_size = chunk_size
-
-    def is_full(self):
-        # Calling data.seek() is faster than doing self.size += len(value)
-        # because each integer increment is a new object allocation.
-        return self.data.tell() >= self.chunk_size
-
-    def write(self, value: V):
-        if value is None:
-            return
-        self.data.write(value)
-
-    def flush(self) -> V:
-        """Empty the buffer and return it."""
-        data = self.getvalue()
-        self.clear()
-        return data
-
-    def getvalue(self) -> V:
-        return self.data.getvalue()
-
-    def clear(self):
-        self.data.seek(0)
-        self.data.truncate(0)
-
-
-class BytesBuffer(BaseBuffer[bytes]):
-    """Collect the data as bytes."""
-
-    buffer_class = io.BytesIO
-
-    def __bytes__(self):
-        return self.getvalue()
-
-
-class StringBuffer(BaseBuffer[str]):
-    """Collect the data as string"""
-
-    buffer_class = io.StringIO
-
-    def __str__(self):
-        return self.getvalue()