Merge remote-tracking branch 'upstream/master' into deploy

Author: ptomasula

pygeoapi/api/__init__.py

@@ -604,6 +604,10 @@ def get_exception(self, status, headers, format_, code,
         else:
             content = to_json(exception, self.pretty_print)
 
+        if status == HTTPStatus.NO_CONTENT:
+            LOGGER.error('HTTP 204 detected, suppressing content')
+            content = ''
+
         return headers, status, content
 
     def get_format_exception(self, request) -> Tuple[dict, int, str]:

pygeoapi/api/processes.py

@@ -50,13 +50,13 @@
 
 from pygeoapi import l10n
 from pygeoapi.api import evaluate_limit
-from pygeoapi.util import (
-    json_serial, render_j2_template, JobStatus, RequestedProcessExecutionMode,
-    to_json, DATETIME_FORMAT)
 from pygeoapi.process.base import (
     JobNotFoundError, JobResultNotFoundError, ProcessorExecuteError
 )
 from pygeoapi.process.manager.base import get_manager, Subscriber
+from pygeoapi.util import (
+    json_serial, render_j2_template, JobStatus, RequestedProcessExecutionMode,
+    to_json, DATETIME_FORMAT)
 
 from . import (
     APIRequest, API, SYSTEM_LOCALE, F_JSON, FORMAT_TYPES, F_HTML, F_JSONLD,
@@ -520,6 +520,14 @@ def execute_process(api: API, request: APIRequest,
     else:
         response2 = response
 
+    if execution_mode == RequestedProcessExecutionMode.respond_async:
+        LOGGER.debug('Asynchronous mode detected, returning statusInfo')
+        response2 = {
+            'id': job_id,
+            'type': 'process',
+            'status': status.value
+        }
+
     return headers, http_status, response2
 
 

pygeoapi/django_/settings.py

@@ -175,3 +175,10 @@
 # Defaults to True in Django
 # https://docs.djangoproject.com/en/3.2/ref/settings/#append-slash
 APPEND_SLASH = not API_RULES.strict_slashes
+
+# CORS: optionally enable from config.
+if PYGEOAPI_CONFIG['server'].get('cors', False):
+    INSTALLED_APPS.append('corsheaders')
+    MIDDLEWARE.insert(0, 'corsheaders.middleware.CorsMiddleware')
+
+    CORS_ORIGIN_ALLOW_ALL = True

pygeoapi/provider/csv_.py

@@ -159,7 +159,7 @@ def _load(self, offset=0, limit=10, resulttype='results',
                     coordinates = None
 
                 feature = {'type': 'Feature'}
-                feature['id'] = row.pop(self.id_field)
+                feature['id'] = row[self.id_field]
                 if not skip_geometry:
                     feature['geometry'] = {
                         'type': 'Point',

pygeoapi/provider/oracle.py

@@ -1070,7 +1070,7 @@ def _response_feature(self, row_data):
                 for (key, value) in row_data.items()
                 if key != "GEOMETRY"
             }
-            feature["id"] = feature["properties"].pop(self.id_field)
+            feature["id"] = feature["properties"][self.id_field]
 
             return feature
         else:

pygeoapi/provider/sensorthings.py

@@ -305,7 +305,7 @@ def _make_feature(self, feature, select_properties=[], skip_geometry=False,
 
         :returns: dict of GeoJSON Feature
         """
-        _ = feature.pop(self.id_field)
+        _ = feature[self.id_field]
         id = f"'{_}'" if isinstance(_, str) else str(_)
         f = {
             'type': 'Feature', 'id': id, 'properties': {}, 'geometry': None

pygeoapi/provider/socrata.py

@@ -138,7 +138,7 @@ def query(self, offset=0, limit=10, resulttype='results',
         params['limit'] = limit
 
         def make_feature(f):
-            f['id'] = f['properties'].pop(self.id_field)
+            f['id'] = f['properties'][self.id_field]
             if skip_geometry:
                 f['geometry'] = None
             return f
@@ -178,7 +178,7 @@ def get(self, identifier, **kwargs):
         LOGGER.debug('Sending query')
         fc = self.client.get(self.resource_id, **params)
         f = fc.get('features').pop()
-        f['id'] = f['properties'].pop(self.id_field)
+        f['id'] = f['properties'][self.id_field]
         return f
 
     def _make_fields(self, select_properties=[]):

pygeoapi/provider/sqlite.py

@@ -162,7 +162,7 @@ def __response_feature(self, row_data, skip_geometry=False):
                 LOGGER.warning('Missing geometry')
 
             feature['properties'] = rd
-            feature['id'] = feature['properties'].pop(self.id_field)
+            feature['id'] = feature['properties'][self.id_field]
 
             return feature
         else:

pygeoapi/starlette_app.py

@@ -33,6 +33,7 @@
 """ Starlette module providing the route paths to the api"""
 
 import asyncio
+from http import HTTPStatus
 import os
 from typing import Callable, Union
 from pathlib import Path
@@ -133,9 +134,10 @@ async def execute_from_starlette(api_function, request: Request, *args,
         headers, status, content = await loop.run_in_executor(
             None, call_api_threadsafe, loop, api_function,
             actual_api, api_request, *args)
-        # NOTE: that gzip currently doesn't work in starlette
-        #       https://github.com/geopython/pygeoapi/issues/1591
-        content = apply_gzip(headers, content)
+        # 204 responses must have an empty body, but gzip
+        # encoding would add gzip metadata, thus we skip
+        if status != HTTPStatus.NO_CONTENT:
+            content = apply_gzip(headers, content)
 
     response = _to_response(headers, status, content)
 

requirements-django.txt

@@ -1,2 +1,3 @@
 Django
+django-cors-headers
 pydantic