Upstream pygeoapi

Update requirements.txt

Support trailing slashes

Add Geopandas

Update Dockerfile

Amend rebase

Use pypi release for pygeoapi plugins

Fix FileSystem Provider (#10)

* Amend FS provider

* fix flake8

* Skip failing tests

Add SitemapGenerator

Add PsuedoCount Postgres provider plugin name

Add pyeoapi-plugins

Author: webb-ben

.github/workflows/containers.yml

@@ -9,7 +9,10 @@ on:
   workflow_run:
     workflows: ["Build"]
     types: [completed]
-    branches: [master]
+    branches: [latest]
+  push:
+    branches:
+      - latest
 
 env:
   DOCKER_REPOSITORY: ${{ secrets.DOCKER_REPOSITORY || 'geopython/pygeoapi' }}
@@ -36,8 +39,8 @@ jobs:
       - name: Log in to Docker Hub
         uses: docker/[email protected]
         with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Log in to the Container registry
         uses: docker/[email protected]
@@ -66,7 +69,7 @@ jobs:
             ghcr.io/${{ github.repository }}
           tags: |
             type=semver,pattern={{version}}
-            type=raw,value=latest,enable=${{ endsWith(github.ref, github.event.repository.default_branch) }}
+            type=raw,value=latest
 
       - name: Build and push Docker images
         uses: docker/[email protected]

.github/workflows/main.yml

@@ -115,6 +115,7 @@ jobs:
         docker run -d --name oracledb -e ORACLE_PWD=oracle -v ${{ github.workspace }}/tests/data/oracle/init-db:/opt/oracle/scripts/startup -p 1521:1521 container-registry.oracle.com/database/express:21.3.0-xe
     - name: Install requirements 📦
       run: |
+        pip3 install git+https://github.com/cgs-earth/pygeoapi-plugins.git
         pip3 install -r requirements.txt
         pip3 install -r requirements-admin.txt
         pip3 install -r requirements-starlette.txt

Dockerfile

@@ -128,7 +128,8 @@ RUN \
 
 ADD requirements-docker.txt requirements-admin.txt /pygeoapi/
 # Install remaining pygeoapi deps
-RUN python3 -m pip install --no-cache-dir -r requirements-docker.txt \
+RUN python3 -m pip install --no-cache-dir https://github.com/cgs-earth/pygeoapi-plugins/archive/refs/heads/master.zip \
+    && python3 -m pip install --no-cache-dir -r requirements-docker.txt \
     && python3 -m pip install --no-cache-dir -r requirements-admin.txt
 
 

pygeoapi/flask_app.py

@@ -217,8 +217,8 @@ def get_tilematrix_sets():
     return execute_from_flask(tiles_api.tilematrixsets, request)
 
 
-@BLUEPRINT.route('/collections')
-@BLUEPRINT.route('/collections/<path:collection_id>')
+@BLUEPRINT.route('/collections/')
+@BLUEPRINT.route('/collections/<path:collection_id>/')
 def collections(collection_id=None):
     """
     OGC API collections endpoint
@@ -260,7 +260,7 @@ def collection_queryables(collection_id=None):
                               collection_id)
 
 
-@BLUEPRINT.route('/collections/<path:collection_id>/items',
+@BLUEPRINT.route('/collections/<path:collection_id>/items/',
                  methods=['GET', 'POST', 'OPTIONS'],
                  provide_automatic_options=False)
 @BLUEPRINT.route('/collections/<path:collection_id>/items/<path:item_id>',

pygeoapi/plugin.py

@@ -70,15 +70,23 @@
         'WMSFacade': 'pygeoapi.provider.wms_facade.WMSFacadeProvider',
         'WMTSFacade': 'pygeoapi.provider.wmts_facade.WMTSFacadeProvider',
         'xarray': 'pygeoapi.provider.xarray_.XarrayProvider',
-        'xarray-edr': 'pygeoapi.provider.xarray_edr.XarrayEDRProvider'
+        'xarray-edr': 'pygeoapi.provider.xarray_edr.XarrayEDRProvider',
+        'CKAN': 'pygeoapi_plugins.provider.ckan.CKANProvider',
+        'FileSystemXML': 'pygeoapi_plugins.provider.filesystem_xml.FileSystemXMLProvider',  # noqa: E501
+        'GeoPandas': 'pygeoapi_plugins.provider.geopandas_.GeoPandasProvider', # noqa
+        'MVT-PostgreSQL': 'pygeoapi_plugins.provider.mvt_postgresql.MVTPostgreSQLProvider_',  # noqa: E501
+        'PsuedoPostgreSQL': 'pygeoapi_plugins.provider.postgresql.PseudoPostgreSQLProvider', # noqa
+        'SPARQL': 'pygeoapi_plugins.provider.sparql.SPARQLProvider'
     },
     'formatter': {
         'CSV': 'pygeoapi.formatter.csv_.CSVFormatter'
     },
     'process': {
         'HelloWorld': 'pygeoapi.process.hello_world.HelloWorldProcessor',
         'ShapelyFunctions': 'pygeoapi.process.shapely_functions.ShapelyFunctionsProcessor',  # noqa: E501
-        'Echo': 'pygeoapi.process.echo.EchoProcessor'
+        'Echo': 'pygeoapi.process.echo.EchoProcessor',
+        'Intersector': 'pygeoapi_plugins.process.intersect.IntersectionProcessor', # noqa
+        'SitemapGenerator': 'pygeoapi_plugins.process.sitemap.SitemapProcessor', # noqa
     },
     'process_manager': {
         'Dummy': 'pygeoapi.process.manager.dummy.DummyManager',

pygeoapi/util.py

@@ -318,7 +318,7 @@ def file_modified_iso8601(filepath: Path) -> str:
     """
 
     return datetime.fromtimestamp(
-        os.path.getctime(filepath)).strftime('%Y-%m-%dT%H:%M:%SZ')
+        os.path.getmtime(filepath)).strftime('%Y-%m-%dT%H:%M:%SZ')
 
 
 def human_size(nbytes: int) -> str:

requirements-docker.txt

@@ -7,3 +7,4 @@ sodapy
 s3fs<=2023.6.0
 Flask>=2.2.0
 Flask-Cors
+pygeoapi-plugins

requirements.txt

@@ -4,7 +4,8 @@ filelock
 Flask
 jinja2
 jsonschema
-pydantic
+pydantic>2.0
+pygeoapi-plugins
 pygeofilter
 pygeoif
 pyproj