Add "supports" flags for API and APIRequest, lazy load OGC API - Joins conformance

Author: GeoSander

pygeoapi/api/__init__.py

@@ -226,6 +226,7 @@ def __init__(self, request, supported_locales):
 
         # Set multipart/form-data using from_* factory methods
         self._form = {}
+        self._supports_formdata = True
 
         # Get path info
         if hasattr(request, 'scope'):
@@ -264,7 +265,7 @@ async def from_starlette(cls, request, supported_locales) -> 'APIRequest':
         """
         api_req = cls(request, supported_locales)
         api_req._data = await request.body()
-        async for key, value in cls._formdata_starlette(request):
+        async for key, value in cls._formdata_starlette(api_req, request):
             LOGGER.debug(f"Setting form field '{key}'")
             if key in api_req._form:
                 LOGGER.debug(f"Skipping duplicate form field '{key}'")
@@ -308,10 +309,12 @@ def _formdata_django(request):
                                   BytesIO(file_obj.read()))
 
     @staticmethod
-    async def _formdata_starlette(request):
+    async def _formdata_starlette(api_req: 'APIRequest', request):
         """ Normalize Starlette/FastAPI form data (async). """
 
         if python_multipart is None:
+            # Set flag so other methods know multipart/form-data is unavailable
+            api_req._supports_formdata = False
             LOGGER.debug('python_multipart is not installed: ' +
                          'skipping async multipart/form-data')
             return
@@ -429,6 +432,15 @@ def form(self) -> dict:
         """Returns the Request form data dict (multipart/form-data)"""
         return self._form
 
+    @property
+    def supports_formdata(self) -> bool:
+        """
+        Returns True if the request supports multipart/form-data.
+        This is unavailable for Starlette/FastAPI if python-multipart
+        is not installed.
+        """
+        return self._supports_formdata
+
     @property
     def params(self) -> dict:
         """Returns the Request query parameters dict"""
@@ -626,6 +638,7 @@ def __init__(self, config: dict, openapi: dict) -> Self | None:
             # build reference cache of join tables already/still on the server
             self.supports_joins = joins_api.init(config)
         else:
+            # Set flag so other methods know OGC API - Joins is unavailable
             self.supports_joins = False
 
         CHARSET[0] = config['server'].get('encoding', 'utf-8')
@@ -897,10 +910,12 @@ def conformance(api: API, request: APIRequest) -> Tuple[dict, int, str]:
                         apis_dict[provider['type']].CONFORMANCE_CLASSES)
                 if provider['type'] == 'feature':
                     conformance_list.extend(
-                        apis_dict['itemtypes'].CONFORMANCE_CLASSES_FEATURES)  # noqa
-                    # If there are features, we can also support joins
-                    conformance_list.extend(
-                        apis_dict['joins'].CONFORMANCE_CLASSES)
+                        apis_dict['itemtypes'].CONFORMANCE_CLASSES_FEATURES)
+                    # If it's an OGC API - Features provider and joins is
+                    # supported, we can also add conformance classes for it
+                    if api.supports_joins:
+                        conformance_list.extend(
+                            apis_dict['joins'].CONFORMANCE_CLASSES)
                 if provider['type'] == 'record':
                     conformance_list.extend(
                         apis_dict['itemtypes'].CONFORMANCE_CLASSES_RECORDS)

pygeoapi/api/joins.py

@@ -850,7 +850,12 @@ def create_join(api: API, request: APIRequest,
     headers, collections, dataset = _prepare(api, request, dataset)
 
     if not api.supports_joins:
-        msg = f'Joins not supported by this API instance'
+        msg = 'OGC API - Joins is not available on this instance'
+        return _server_error(api, request, headers, msg)
+
+    if not request.supports_formdata:
+        # i.e. python-multipart library is not installed for Starlette
+        msg = 'multipart/form-data requests are not supported on this instance'
         return _server_error(api, request, headers, msg)
 
     if dataset not in collections: