Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

API design rule support #1152

Merged
merged 3 commits into from Apr 4, 2023
Merged

API design rule support #1152

merged 3 commits into from Apr 4, 2023

Conversation

GeoSander
Copy link
Contributor

@GeoSander GeoSander commented Feb 20, 2023

Overview

This PR adds an optional api_rules object to the server section of the pygeoapi configuration (YAML). For an example, please check the updated documentation here. Explanation about the available options can be found here.

The suggested changes affect the API at the highest level (Flask, Starlette, Django). Because the current tests only test the lower level methods in api.py but not the routes leading towards them, I have added a mock client for Flask and Starlette so we can test API rule adherence or any routing-related things for that matter.

Note that I have also replaced the @app.route() decorators in favor of Route() in starlette_app.py. This technique was deprecated anyway (it is not even documented anymore in the current Starlette docs) and it proved harder to build in the API rule logic like that.

Related Issue / Discussion

This PR relates to issue #1134, which contains the rationale behind this change.

Additional Information

Since this work is part of a funded tender in which Geonovum emphasized that it was very important to them that the work would be incorporated into the core, and also because the suggested changes are optional and non-disruptive, we hope that the community is willing to approve this PR.

Contributions and Licensing

(as per https://github.com/geopython/pygeoapi/blob/master/CONTRIBUTING.md#contributions-and-licensing)

  • I'd like to contribute feature "API design rule support" to pygeoapi. I confirm that my contributions to pygeoapi will be compatible with the pygeoapi license guidelines at the time of contribution.
  • I have already previously agreed to the pygeoapi Contributions and Licensing Guidelines.

@GeoSander GeoSander added the enhancement New feature or request label Feb 20, 2023
@GeoSander GeoSander self-assigned this Feb 20, 2023
@GeoSander GeoSander changed the title Support API design rule adherence API design rule support Feb 21, 2023
@GeoSander GeoSander marked this pull request as ready for review February 21, 2023 13:50
pygeoapi/util.py Outdated Show resolved Hide resolved
Copy link
Member

@tomkralidis tomkralidis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See change requests. Adding @francbartoli given the significant changes to starlette.

docs/source/configuration.rst Show resolved Hide resolved
pygeoapi/config.py Outdated Show resolved Hide resolved
@GeoSander
Copy link
Contributor Author

Thanks for looking @tomkralidis.
As for the "significant changes to Starlette" (@francbartoli), it's really not that significant except for the changes that were also done for Flask and Django. I mostly refactored the routing to follow a more fashionable approach, so I could better fit in the actual changes I needed to do.

docs/source/configuration.rst Show resolved Hide resolved
docs/source/configuration.rst Show resolved Hide resolved
pygeoapi/models/config.py Outdated Show resolved Hide resolved
tests/pygeoapi-test-config-apirules.yml Outdated Show resolved Hide resolved
tests/util.py Outdated Show resolved Hide resolved
@GeoSander
Copy link
Contributor Author

Thanks for reviewing @francbartoli!

requirements-dev.txt Show resolved Hide resolved
@GeoSander
Copy link
Contributor Author

GeoSander commented Mar 13, 2023

Hi @tomkralidis / @francbartoli, I added the final changes (Starlette mock client, more tests) as per your request.

For Starlette, I ran into an interesting problem. Flask has a strict_slashes=True setting, which will prevent it from redirecting (308) to the URL without a trailing slash if the user added one and throws a 404 instead. Exactly what I needed. Starlette however has the redirect_slashes setting, but that only prevents the redirection (307) from happening and does not enforce strictness: adding a trailing slash will simply result in a 200 most of the time, and in some cases it still redirected anyway...

So I have now added a middleware class that tackles this problem. Note that the middleware is only installed when the strict_slashes API rule applies.

Please review at your earliest convenience. @justb4 and I officially have a deadline this Friday, but if merging cannot be achieved before that time, I guess we could merge it to some temporary project branch instead.

@GeoSander
Copy link
Contributor Author

Changed behavior of landing page requests according to OGC spec here if the strict_slashes API rule is in effect. For the landing page only, having a trailing slash is actually preferred (or mandatory even).
Note that this actually contradicts the Dutch API Design Rules as discussed here, which simply states that trailing slashes are never allowed.

@GeoSander
Copy link
Contributor Author

GeoSander commented Mar 28, 2023

Update: rebased again to incorporate latest changes to collection_items route in starlette_app.py (added OPTIONS HTTP method).

- Change config model
- Change Flask, Starlette, and Django apps for API rule adherence
- Add Flask and Starlette mock clients to test API rule adherence
- Add get_base_url() util function to replace all config['server']['url'] refs
- Ensure that any internal links have URL prefixes if needed
- Add tests and update docs
@tomkralidis tomkralidis merged commit 41f3bd8 into geopython:master Apr 4, 2023
2 checks passed
justb4 added a commit that referenced this pull request Apr 4, 2023
justb4 added a commit that referenced this pull request Apr 4, 2023
tomkralidis pushed a commit that referenced this pull request Apr 11, 2023
* OGC API - Features Part 2 (groundwork+CRS-BBOX) from PR #1155 - contributes to issue #1128

* #1128 provide conformance class for OAPIF Part 2 in /conformance page

* #1128 bitten by flake8...

* #1128 configurability CRS Feature Providers with syntax, defaults and tests

* #1128 configurability CRS Feature Providers refine for default values

* #1128 display supported CRSs in HTML Collection template

* #1128 config, mmetadata and tests for storageCRS and storageCrsCoordinateEpoch

* #1128 WIP for bbox-crs parameter support

* #1128 utility function and tests for default/mandatory supprted CRS list

* #1128 default supported CRS adaptation to OAPIF Part 2 standard

* #1128 grr flake8 whitespace

* #1128 start adding full API tests OGR for bbox-crs and crs parms

* #1128 fix flake8

* #1128 fix flake8 - install GDAL in workflow main for OGR tests

* #1128 fix flake8 - install GDAL in workflow main for OGR tests - need pip package?

* #1128 fix flake8 - install GDAL in workflow main for OGR tests - using libgdal-dev gdal-bin

* #1128 fix SensorThings test for main.yml Workflow

* #1128 fix SensorThings test for main.yml Workflow nr 2

* #1128 make all OGR tests working again

* #1128 make all OGR tests working again - flake8

* #1128 make all OGR tests working again - GeoSolutions WFS bbox

* #1128 #1155 add documentation for OGC OAPIF Part 2 CRS CRS BBOX support

* #1128 #1155 refine documentation for OGC OAPIF Part 2 CRS CRS BBOX support

* #1128 #1155 refine documentation to align with #1149

* #1128 #1155 rework from review OAS and pygeoapi config schema

* #1128 #1155 minor: compile Re for CRS URI only once as global var

* #1128 merge in changes from PR #1173 - fix missing import

* WIP Ogcapi features part 2 - Support for crs query parameter (#1149)

* feat(ogcapi_features_crs): start implementing crs support from ogcapi features part2

* Pass input and output CRSs WKT instead of crs transformation object

* fix longs lines and blank lines

* fix typo

* fix import for type annotation not supported by python version

* fix variable visibility in local scope

* fix tabs/spaces indentations

* Add support for the crs parameter to OGRProvider

* make flake8 happy

* Make crs transformation mechanism more consistent between PostgreSQL and OGR providers

* test(util): add two test functions in util.py

New functions: test_get_crs_from_uri and test_get_transform_from_crs

* fix too long lines...

* Update get_crs_from_uri and corresponding test function

* fix(get_crs_from_uri): make the error more explicit in if wrong crs uri format

* flake8 again...

* Keep support for source_srs/target_srs in config for OGRProvider

* revert changes made to pygeoapi-config-0.x.yml, overlap with PR 1155

* test: add test data and update test config file

* Extract 'crs' and 'storage_crs' and provider level instead of collection level

* feat(crs): new decorator to support coordinates transformation of feature collections

* feat(crs): 'crs' query parameter for CSVProvider

* test(crs): add tests for 'crs' query parameter

* test: update number of collections in test_describe_collections

* test: update number of collections in test_filter_dict_by_key_value

* fix(crs_transform): change the crs transformation decorator

Change the logic of the decorator so that it works for both functions that
return FeatureCollections and for functions tha return single Features.

* test: add tests for get_collection_item end-point with 'crs' parameter

* fix(test_get_collection_item_crs): id as path parameter, not query parameter

* test: unpack coordinates to create point geometry

* feat(crs): add suuport for crs query parameter for all providers of type 'feature'

* docs(crs): add documentation to illustrate use of 'crs' query parameters

* docs(crs): more data access examples

* fix typo and add new line

* refactor: specify None as default value for crs_transform_out parameter in _sqlalchemy_to_feature method

* changes for PR 1149, test_api and style formatting

* CRS84 as default crs also for test_get_collection_items_crs

* test(crs): test coordinates transformation implementation of PostgreSQLProvider

* test(crs): move tests to test_postgresql_provider

* fix test function calls

* change test to ensure returned features are the same

* add json format to request object

* test(crs): test coordinates transformation implementation of OGRProvider

* refactor(crs): make more compact get_collection_item and get_collection_items

Define two new static methods in API class, to create crs_transform_wkt and
setting content-crs header. These methods can be re-used in both
get_collection_item and get_collection_items methods and removes code
duplication.

---------

Co-authored-by: Just van den Broecke <just@justobjects.nl>

* #1178 fix flake8 error

* #1178 use EPSG:28992 i.s.o. 32631 - fix unit test OGR Shapefile

* #1174 use CRS-compliant Axis ordering for crs support

* #1174 fix and honour CRS 4258disable native CRS Transform in OGR Provider - Axis ordering not honoured...

* #1174 remove ADR tests rom test_util.py

* #1174 enable native CRS transform again in OGR Provider

* #1174 enable native CRS transform again in OGR Provider - fix config

* #1174 remove support for source/target_srs in OGRProvider - enforce transforms always based on storageCRS

* #1174 fix tests Postgresql Provider for Transforms

* #1174 fix tests Postgresql Provider for Transforms

* #1174 add tests for OGR Transformation and Axis Order

* #1174 Suppress potential axis-swapping in OGR ExportToJSON

* #1174 minor fix test - unassign spatialref before setgeom infeat

* #1174 minor fix test - unassign spatialref before setgeom infeat - flake8

* #1174 solve CI WFS test failures with GDAL HTTP config options

* #1174 bbox and bbox-crs defs local in openapi.py for CITE validators

* #1174 merge master - #1152 #1203 etc

* #1174 small doc changes

* #1174 move GeomObject typedef to beginning of util.py

* #1174 added debug logging in transform Decorator func

---------

Co-authored-by: Mathieu Tachon <92298764+MTachon@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants