* Enable back UbuntuGIS to get GDAL 3.8.x.
* Update to latest Jammy base image.
* Add software-properties-common to Build dependencies so it gets removed on cleanup.
* Add Admin API
- Create `admin.py` to serve as Admin API Core
- Create `flask_admin.py` to create flask blueprint for admin API
- Consolidate configuration getter
- Add Pathlib serializing
- Add docker example
* Add integration tests
- Amend admin example to allow writing to configuration. If FS is read only admin API does not work. Returns a 500 and logs `OSError: [Errno 30] Read-only file system: '/pygeoapi/local.config.yml' `
* Preserve env variables in configuration
* Use common accessor functions
- Use common configuration accessor methods for Django and Starlette
* GET returns raw config file
Return configuration with environment variables preserved on GET requests
* Safeguard env variables for root cfg view
"bind": {
"host": "localhost",
"port": "6000"
}
->
"bind": {
"host": "${HOST}",
"port": "${PORT}"
}
* Simplify admin HTML imports
- Use jinja recursion to expand the configuration
- Remove vue from templates
* Create admin API documentation
* Use render_item_value in admin template
* Add Admin API
- Create `admin.py` to serve as Admin API Core
- Create `flask_admin.py` to create flask blueprint for admin API
- Consolidate configuration getter
- Add Pathlib serializing
- Add docker example
* Update GitHub Actions deployment
* Update admin entrypoint
Update admin entrypoint to align with upstream pygeoapi implementation
* Make requested changes
Co-Authored-By: Tom Kralidis <tomkralidis@gmail.com>
* Amend test url
Co-Authored-By: Tom Kralidis <tomkralidis@gmail.com>
* Fix Admin CI tests
* Add PUT and PATCH for root configuration
- Add put and patch for root configuration
- Add CI tests for PUT and PATCH of root
* Update OpenAPI document wording
* Update entrypoint.sh
Replace tabs with spaces
* Remove unused step
Error from rebasing. Admin API tests are moved to their own job.
* Use jsonpatch
- Use debian supported packaging
- Use custom merge function
* Move test data location
* Create Starlette and Django app
- Fold flask_admin.py into flask_app.py
Co-Authored-By: Tom Kralidis <tomkralidis@gmail.com>
* Make requirements-admin.txt
Move admin dependencies to requirements-admin.txt
* Delete guiblock.html
* Update test count for STAC
Update expected test count for addt'l admin test data
* Relegate config warning to config.py
* Move admin tests out of example
* Delete admin docker example
* Update admin-api.rst
* Update pygeoapi-config-0.x.yml
* Update configuration.rst
* Update config.py
* Update admin.py
* Update admin.py
---------
Co-authored-by: Tom Kralidis <tomkralidis@gmail.com>
* docker: upgrade ubuntu version
Upgrade rhe ubuntu version used in the main Dockerfile to latest stable version `20.04`
* Update Dockerfile
amended ubuntu version 20 -> 22
but then the following error:
```
0 added, 0 removed; done.
Running hooks in /etc/ca-certificates/update.d...
done.
Processing triggers for dbus (1.12.20-2ubuntu4.1) ...
gpg: error running '/usr/bin/gpg-agent': probably not installed
gpg: failed to start agent '/usr/bin/gpg-agent': Configuration error
gpg: can't connect to the agent: Configuration error
Traceback (most recent call last):
File "/usr/lib/python3/dist-packages/softwareproperties/shortcuthandler.py", line 423, in add_key
PPA publishes dbgsym, you may need to include 'main/debug' component
Repository: 'deb https://ppa.launchpadcontent.net/ubuntugis/ubuntugis-unstable/ubuntu/ jammy main'
Description:
Unstable releases of Ubuntu GIS packages. These releases are more bleeding edge and while generally they should work well, they dont receive the same amount of quality assurance as our stable releases do.
More info: https://launchpad.net/~ubuntugis/+archive/ubuntu/ubuntugis-unstable
Adding repository.
Adding deb entry to /etc/apt/sources.list.d/ubuntugis-ubuntu-ubuntugis-unstable-jammy.list
Adding disabled deb-src entry to /etc/apt/sources.list.d/ubuntugis-ubuntu-ubuntugis-unstable-jammy.list
Adding key to /etc/apt/trusted.gpg.d/ubuntugis-ubuntu-ubuntugis-unstable.gpg with fingerprint 6B827C12C2D425E227EDCA75089EBE08314DF160
subprocess.run(cmd.split(), check=True, input=keys)
File "/usr/lib/python3.10/subprocess.py", line 524, in run
raise CalledProcessError(retcode, process.args,
subprocess.CalledProcessError: Command '['gpg', '-q', '--no-options', '--no-default-keyring', '--batch', '--keyring', '/etc/apt/trusted.gpg.d/ubuntugis-ubuntu-ubuntugis-unstable.gpg', '--homedir', '/tmp/tmpjlr98185', '--import']' returned non-zero exit status 2.
During handling of the above exception, another exception occurred:
Traceback (most recent call last):
File "/usr/bin/add-apt-repository", line 364, in <module>
sys.exit(0 if addaptrepo.main() else 1)
File "/usr/bin/add-apt-repository", line 357, in main
shortcut.add()
File "/usr/lib/python3/dist-packages/softwareproperties/shortcuthandler.py", line 222, in add
self.add_key()
File "/usr/lib/python3/dist-packages/softwareproperties/shortcuthandler.py", line 425, in add_key
raise ShortcutException(e)
softwareproperties.shortcuthandler.ShortcutException: Command '['gpg', '-q', '--no-options', '--no-default-keyring', '--batch', '--keyring', '/etc/apt/trusted.gpg.d/ubuntugis-ubuntu-ubuntugis-unstable.gpg', '--homedir', '/tmp/tmpjlr98185', '--import']' returned non-zero exit status 2.
````
Removing the ubuntugis PPA build without error - is ubuntugis a requirements? probably Jammy has up-to-date packages for pygeoapi dependencies
* Update Dockerfile
removing ubuntugis PPA
* Update Dockerfile
adding `python3-pytest` and `python3-pyld` dependencies
* Update Dockerfile
* Update Dockerfile
* fixing docker environment with suggested changes
* replace ubuntu version with codename
* Update .dockerignore
* Update Dockerfile
* Update Dockerfile
* Update Dockerfile
* Update entrypoint.sh
skip the SensorThings and other tests that require a local server
Co-authored-by: Just van den Broecke <just@justobjects.nl>
* Add pygeofilter, unpin psycopg2
* Add pygeofilter SQLAlchemy query demo
* Add note about primary key
* Add todos to script
* Make script generic
* Add (commented out) PostgreSQL provider hotosm_bdi_waterways to config
* Update to use local test database
* Return result as dictionary
* Pass GEOM_FIELD as variable
* Add offset and limt, fix two names
* Implement order by
* Use function for cql query
* Add cql query block to query and test
* Link up to db engine
* Convert WKB geometry to GeoJSON
* Add shapely as explicit dependency
* Add tests for CQL queries
* Add test using CROSSES with LINESTRING
* Uncomment Docker PostGIS test layer
* First pass at wiring up API
The CQL is read from the request but the parser fails to convert to
AST.
* Turn logging to DEBUG
Example query
http://localhost:5000/collections/hot_osm_waterways/items?cql=%27osm_id%20BETWEEN%2080800000%20AND%2080900000%20AND%20name%20IS%20NULL%27
* Create dedicated pygeoapi-config.yml for testing PostgreSQL
* Add test for PostgreSQL CQL
* Return 400 for bad CQL
* Tidy up old files
* Bring API error type tests together
* Only reflect the table of interest
* Add pygeofilter to requirements
* Remove local setup_env.sh from .gitignore
* Remove lark exception handling
* Remove lark codes from tests, docstring change
* Split cql test into good and error
* Rename cql parameter to filter
* Add optional filter-lang parameter with test
* Initial changes
* Rename cql text parser
* Use CQL-JSON POST for PostgreSQL query
* Refactor to get data early and handle errors
* Add error tests for CQL-JSON PostgreSQL
* Add tests for prev/next and provider instantiation
* As filter-lang is set the block in not needed
* Clarify test fixtures
* Use filterq only in all CQL calls
* Make engine and table_model attributes of provider
* Handle different instantiation failures
* Use SQLAlchemy for get_fields()
* Minor doc edits
* Use SQLAlchemy for get()
* Simplify _sqlalchemy_to_feature
* Store database parameters in dedicated function
* Strip out non-SQLAlchemy code
* Add draft query() based on CQL filters
* Add property filtering to query()
* Implement select_properties and skip_geometry
* Implement bbox filter
* Implement properties subset defined in config
* Clean up materialized view test
We only need to test the fields that are present to be sure that the
view has been accessed, so other checks have been removed.
* Flake8 fixes and tidy up
* Add combined test for CQL with bbox and properties
* Create sessions directly where required
* Add Engine store to allow connection reuse
* Replace cql_ast with filterq
* Tidy up tests by using fixture for api
* Add authors
* Use Session() as context manager
A session requires a connection to the database, as provided by the
SQLAlchemy engine. When the session goes out of scope, e.g. at exit
from the function when it was used, it should be garbage collected and
the connection freed. However, during load testing it was found that
this wasn't happening. This commit uses a context manager pattern to
start the session, which ensures that the session is closed at the end
of the `with` block.
* Return fields type as {'type': ...}
* Cache the table_model with the engine
Generating the table_model by "reflecting" the database is expensive but
the resulting model doesn't change. If we cache the table_model with
the engine we save on a round-trip to the database and speed up response
time.
* Use separate stores for Engine and table_models
Using a combined store based on both engine and table_model meant that
a pygeoapi serving multiple tables on the same database would maintain
a connection pool for each table. This could eventually saturate the
number of available connections. This commit separates the store into
two parts.
* Update documentation with example
* Manage or post items based on POST content type
* ghcr build action
* only ghcr job
* run criteria edit
* Update README.md
* job = main
* remove success requirememt
* add tag
* tags: bgs-cql
* Update main.yml
* Update README.md
* remove binary
* update
* Update actions to latest versions
* Dockerfile refactor
* Dockerfile refactor
* restore dockerhub
* fix pygeoif version
* # 3.6 test & dockerhub ref
* Pin pygeoif version to less than 1
* Replace psycopg-binary with psycopg
* Split Docker build into sections
* Pin click version >7,<=8
* Add further cql examples
* Update workflows to match GeoPython repo
* update flake python version
* Unquote PostgreSQL column names
* Update container workflow uses versions
* flake8 use python version 3.7
* Use pre ping to get db connection
* Test that properties are set in provider
* Amendments as requested by @tomkralidis
* Correction
* Fix reviewed changes in api code
Co-authored-by: Colin Blackburn <colb@bgs.ac.uk>
Co-authored-by: KoalaGeo <eddlewis85@gmail.com>
Co-authored-by: Edd <edlew@bgs.ac.uk>
Co-authored-by: Colin Blackburn <ximenesuk@users.noreply.github.com>
* add process manager
* process manager updating
* control connectivity from inside manager
* missing method on execute_process function signature
* adds tinydb depenedency for requirements-provider
* adds some processes tests
* process manager under server config, not a process
* additional html rendering for jobs and processes
* fixes typo in docstring
* complete html templating for jobs and processes
* considers timezone when formatting processing start/end datetimes
* expanded locales; locale and tz environment variables
* makes environment TZ a global from pygeoapi/__init__.py
* don't redefine built-in format
* adds placeholder values in process form if given as examples
* placeholder in form handles null example
* changes to process progress update
* updates and changes to processing web UI
* adds python3-distutils dep, and env changes for TZs and locales
* adds tinydb dependency for processes
* Adds libpq-dev and related deps for processing - should eventually be reconciled
* minor margin change
* fix bug in postJob.js that prevented results from displaying
* move process elements around to economise on space
* adds second, complex process
* post data may be bytes
* make external process example
* adds redis process manager (may be moved to third-party plugin eventually)
* reintroduce default async processing; refactoring managers; improving sync/async processing ui
* throw pygeoapi ManagerExecuteError, not redis exception
* adds test for async-execute
* restores original test host
* separates async execute handler function
* adds support for file uploads as processing inputs
* adds endpoint for file download as process output
* naming consistency
* Fix job submission form in case server url is relative (#549)
`new URL()` fails if the first argument isn't a complete url
* Implement job deletion in UI, api and tinydb
* Also allow deletion from job list
The UI could be fancier by reloading the page or just removing the
deleted job right away, but I don't want to start building that now.
* Delete output file when deleting a job
* typo in test case
* move delete button in job view
* remove Dockerfile changes (cf #470)
* removes some docs/source*.rst absent in master
* fixes whitespace
* fixes pip installs
* removes more locale-specific content, cf 70
* fixes duplicate app following merge
* removes redis as default plugin
* removes ENV_TZ, cf #407
* fix typo
* fixes syntax error
* process execution test cleanup
* Fix format detection in execute_process (#589)
Before, html was always selected.
* remove db files in code directories, fix flake8, specific functionality
* remove interactive capabilities in lieu of Swagger
* Add basic openapi documentation for job detail endpoint (#590)
It's somewhat superficial still, e.g. jobId is missing as
proper parameter in the UI.
* Show elapsed time for currently running jobs (#591)
* flake8, jobs workflow
* update docs, DB path in test config
* more code cleanup
* manager workflow cleanup
* add default dummy manager
* update docs
* fix routes
* fixed per comments
* fix per comments
* fix per comments
* fix travis
* simply describe process logic
* simplify describe process logic
Co-authored-by: Tom Kralidis <tomkralidis@gmail.com>
Co-authored-by: Jorge de Jesus <jorge.jesus@gmail.com>
Co-authored-by: totycro <bernhard.mallinger@eox.at>
Co-authored-by: Richard Law <richard.law@cartoncloud.com.au>
Before, any file change in the repo would cause a reinstall of all
dependencies.
This commit splits the dockerfile in 2 phases:
First the files relevant for installation are added and all dependencies
are installed. Then the actual source code is added.
This way, rebuilding after sources have been changes takes a few seconds
rather than minutes.
* Bump gdal to v3
* Fix query duplicates with bbox for PG
* Add backward compatibility for axis order
* Move travis to bionic dist
Fix gdal version 3 on travis by pinning latest ubuntu unstable release
Fix ubuntugis sources on travis
Remove pinned python gdal version
Add mongodb start
Enable mongod service
Fix package name
Install mongo from official community repos
Add mongo enable and start commands
* Fix wrong axis mapping strategy
Add author
* Move base image to bullseye for docker build
* Fix remaining unchanged places for #364
* Make image size smaller
* Add docker build and cite tests
Fix python version
Move steps after docker build elsewhere
Fix uppercase characters
Fix internal port
Daemonize the run process
* Check logs and run test command from the entrypoint
* Remove the execution of mongo tests for test command
Remove the execution of mongo tests for test command
Fix failed command
* Add delay and move build to install step
Remove grep command for now
Use single quote
Angelos Tzotsos