Merge pull request #15 from unity-sds/129-arbitrary-parameters

Conform more closely to OGC Processes API spec

.github/workflows/unit_tests.yml

@@ -18,8 +18,8 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install -e ".[test]"
+        pip install -e "app/.[test]"
 
     - name: Run unit tests
       run: |
-        pytest -vv
+        pytest -vv app/tests

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "ogcapi-processes"]
 	path = ogcapi-processes
-	url = https://github.com/opengeospatial/ogcapi-processes
+	url = https://github.com/drewm-jpl/ogcapi-processes

Dockerfile

@@ -7,12 +7,13 @@ RUN apt-get update && apt-get install -y git gcc libpq-dev
 # Copy the current directory contents into the container at /app
 COPY ./app /app
 
+WORKDIR /app
+
 # Install any needed packages specified in requirements.txt
-COPY pyproject.toml .
 RUN pip install .
 
 # Make port 80 available to the world outside this container
 EXPOSE 80
 
 # Run app.py when the container launches
-CMD ["uvicorn", "app.main:app", "--host", "0.0.0.0", "--port", "80"]
+CMD ["uvicorn", "unity_sps_ogc_processes_api.main:app", "--host", "0.0.0.0", "--port", "80"]

app/.flake8

@@ -0,0 +1,3 @@
+[flake8]
+max-line-length = 88
+exclude = .git,__pycache__,__init__.py,.mypy_cache,.pytest_cache,.venv

app/.gitignore

@@ -0,0 +1,138 @@
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+*.py,cover
+.hypothesis/
+.pytest_cache/
+cover/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+db.sqlite3-journal
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+.pybuilder/
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# IPython
+profile_default/
+ipython_config.py
+
+# pyenv
+#   For a library or package, you might want to ignore these files since the code is
+#   intended to run in multiple environments; otherwise, check them in:
+# .python-version
+
+# pipenv
+#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
+#   However, in case of collaboration, if having platform-specific dependencies or dependencies
+#   having no cross-platform support, pipenv may install dependencies that don't work, or not
+#   install all needed dependencies.
+#Pipfile.lock
+
+# PEP 582; used by e.g. github.com/David-OConnor/pyflow
+__pypackages__/
+
+# Celery stuff
+celerybeat-schedule
+celerybeat.pid
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/
+
+# pytype static type analyzer
+.pytype/
+
+# Cython debug symbols
+cython_debug/

app/.openapi-generator-ignore

@@ -0,0 +1,23 @@
+# OpenAPI Generator Ignore
+# Generated by openapi-generator https://github.com/openapitools/openapi-generator
+
+# Use this file to prevent files from being overwritten by the generator.
+# The patterns follow closely to .gitignore or .dockerignore.
+
+# As an example, the C# client generator defines ApiClient.cs.
+# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line:
+#ApiClient.cs
+
+# You can match any string of characters against a directory, file or extension with a single asterisk (*):
+#foo/*/qux
+# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
+
+# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
+#foo/**/qux
+# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
+
+# You can also negate patterns with an exclamation (!).
+# For example, you can ignore all files in a docs folder with the file extension .md:
+#docs/*.md
+# Then explicitly reverse the ignore rule for a single file:
+#!docs/README.md

app/.openapi-generator/FILES

@@ -0,0 +1,130 @@
+.flake8
+.gitignore
+.openapi-generator-ignore
+Dockerfile
+README.md
+docker-compose.yaml
+openapi.yaml
+pyproject.toml
+requirements.txt
+setup.cfg
+src/openapi_server/impl/__init__.py
+src/unity_sps_ogc_processes_api/apis/__init__.py
+src/unity_sps_ogc_processes_api/apis/api_api.py
+src/unity_sps_ogc_processes_api/apis/api_api_base.py
+src/unity_sps_ogc_processes_api/apis/conformance_api.py
+src/unity_sps_ogc_processes_api/apis/conformance_api_base.py
+src/unity_sps_ogc_processes_api/apis/dru_api.py
+src/unity_sps_ogc_processes_api/apis/dru_api_base.py
+src/unity_sps_ogc_processes_api/apis/jobs_api.py
+src/unity_sps_ogc_processes_api/apis/jobs_api_base.py
+src/unity_sps_ogc_processes_api/apis/landing_page_api.py
+src/unity_sps_ogc_processes_api/apis/landing_page_api_base.py
+src/unity_sps_ogc_processes_api/apis/processes_api.py
+src/unity_sps_ogc_processes_api/apis/processes_api_base.py
+src/unity_sps_ogc_processes_api/main.py
+src/unity_sps_ogc_processes_api/models/__init__.py
+src/unity_sps_ogc_processes_api/models/bbox.py
+src/unity_sps_ogc_processes_api/models/bbox1.py
+src/unity_sps_ogc_processes_api/models/bbox_def_crs.py
+src/unity_sps_ogc_processes_api/models/bbox_processes.py
+src/unity_sps_ogc_processes_api/models/collection_info.py
+src/unity_sps_ogc_processes_api/models/collection_info_data_type.py
+src/unity_sps_ogc_processes_api/models/collections.py
+src/unity_sps_ogc_processes_api/models/conf_classes.py
+src/unity_sps_ogc_processes_api/models/crs.py
+src/unity_sps_ogc_processes_api/models/crs_one_of.py
+src/unity_sps_ogc_processes_api/models/crs_one_of_one_of.py
+src/unity_sps_ogc_processes_api/models/crs_one_of_one_of1.py
+src/unity_sps_ogc_processes_api/models/crs_one_of_one_of2.py
+src/unity_sps_ogc_processes_api/models/data_type.py
+src/unity_sps_ogc_processes_api/models/description_type.py
+src/unity_sps_ogc_processes_api/models/enumeration.py
+src/unity_sps_ogc_processes_api/models/exception.py
+src/unity_sps_ogc_processes_api/models/execute.py
+src/unity_sps_ogc_processes_api/models/execute200_response.py
+src/unity_sps_ogc_processes_api/models/execute200_response1.py
+src/unity_sps_ogc_processes_api/models/execute_workflows.py
+src/unity_sps_ogc_processes_api/models/execute_workflows1.py
+src/unity_sps_ogc_processes_api/models/execution_unit.py
+src/unity_sps_ogc_processes_api/models/execution_unit_config.py
+src/unity_sps_ogc_processes_api/models/extent.py
+src/unity_sps_ogc_processes_api/models/extent_spatial.py
+src/unity_sps_ogc_processes_api/models/extent_spatial_grid_inner.py
+src/unity_sps_ogc_processes_api/models/extent_spatial_grid_inner_coordinates_inner.py
+src/unity_sps_ogc_processes_api/models/extent_spatial_grid_inner_resolution.py
+src/unity_sps_ogc_processes_api/models/extent_temporal.py
+src/unity_sps_ogc_processes_api/models/extent_temporal_grid.py
+src/unity_sps_ogc_processes_api/models/extent_temporal_grid_resolution.py
+src/unity_sps_ogc_processes_api/models/extent_uad.py
+src/unity_sps_ogc_processes_api/models/extra_models.py
+src/unity_sps_ogc_processes_api/models/feature_collection.py
+src/unity_sps_ogc_processes_api/models/fields_modifiers.py
+src/unity_sps_ogc_processes_api/models/fields_modifiers_properties.py
+src/unity_sps_ogc_processes_api/models/format.py
+src/unity_sps_ogc_processes_api/models/format_schema.py
+src/unity_sps_ogc_processes_api/models/geo_json_feature.py
+src/unity_sps_ogc_processes_api/models/geo_json_feature_geometry.py
+src/unity_sps_ogc_processes_api/models/geo_json_feature_id.py
+src/unity_sps_ogc_processes_api/models/geo_json_line_string.py
+src/unity_sps_ogc_processes_api/models/geo_json_multi_line_string.py
+src/unity_sps_ogc_processes_api/models/geo_json_multi_point.py
+src/unity_sps_ogc_processes_api/models/geo_json_multi_polygon.py
+src/unity_sps_ogc_processes_api/models/geo_json_point.py
+src/unity_sps_ogc_processes_api/models/geo_json_polygon.py
+src/unity_sps_ogc_processes_api/models/inline_or_ref_data.py
+src/unity_sps_ogc_processes_api/models/inline_or_ref_data1.py
+src/unity_sps_ogc_processes_api/models/inline_or_ref_data_workflows.py
+src/unity_sps_ogc_processes_api/models/input.py
+src/unity_sps_ogc_processes_api/models/input_collection.py
+src/unity_sps_ogc_processes_api/models/input_description.py
+src/unity_sps_ogc_processes_api/models/input_description_all_of_max_occurs.py
+src/unity_sps_ogc_processes_api/models/input_parameterized.py
+src/unity_sps_ogc_processes_api/models/input_process.py
+src/unity_sps_ogc_processes_api/models/input_value.py
+src/unity_sps_ogc_processes_api/models/input_value1.py
+src/unity_sps_ogc_processes_api/models/input_value_no_object.py
+src/unity_sps_ogc_processes_api/models/input_value_no_object1.py
+src/unity_sps_ogc_processes_api/models/input_value_no_object_workflows.py
+src/unity_sps_ogc_processes_api/models/input_value_workflows.py
+src/unity_sps_ogc_processes_api/models/input_workflows.py
+src/unity_sps_ogc_processes_api/models/input_workflows1.py
+src/unity_sps_ogc_processes_api/models/job_control_options.py
+src/unity_sps_ogc_processes_api/models/job_list.py
+src/unity_sps_ogc_processes_api/models/landing_page.py
+src/unity_sps_ogc_processes_api/models/link.py
+src/unity_sps_ogc_processes_api/models/metadata.py
+src/unity_sps_ogc_processes_api/models/metadata_one_of.py
+src/unity_sps_ogc_processes_api/models/metadata_one_of1.py
+src/unity_sps_ogc_processes_api/models/metadata_one_of1_value.py
+src/unity_sps_ogc_processes_api/models/model_schema.py
+src/unity_sps_ogc_processes_api/models/ogcapppkg.py
+src/unity_sps_ogc_processes_api/models/ogcapppkg_array_inner.py
+src/unity_sps_ogc_processes_api/models/ogcapppkg_execution_unit.py
+src/unity_sps_ogc_processes_api/models/output.py
+src/unity_sps_ogc_processes_api/models/output_description.py
+src/unity_sps_ogc_processes_api/models/output_workflows.py
+src/unity_sps_ogc_processes_api/models/output_workflows1.py
+src/unity_sps_ogc_processes_api/models/process.py
+src/unity_sps_ogc_processes_api/models/process_list.py
+src/unity_sps_ogc_processes_api/models/process_summary.py
+src/unity_sps_ogc_processes_api/models/processes_list.py
+src/unity_sps_ogc_processes_api/models/qualified_input_value.py
+src/unity_sps_ogc_processes_api/models/qualified_input_value1.py
+src/unity_sps_ogc_processes_api/models/qualified_input_value_workflows.py
+src/unity_sps_ogc_processes_api/models/reference.py
+src/unity_sps_ogc_processes_api/models/schema1.py
+src/unity_sps_ogc_processes_api/models/schema_one_of.py
+src/unity_sps_ogc_processes_api/models/schema_one_of_additional_properties.py
+src/unity_sps_ogc_processes_api/models/static_indicator.py
+src/unity_sps_ogc_processes_api/models/status_code.py
+src/unity_sps_ogc_processes_api/models/status_info.py
+src/unity_sps_ogc_processes_api/models/subscriber.py
+src/unity_sps_ogc_processes_api/security_api.py
+tests/conftest.py
+tests/test_api_api.py
+tests/test_conformance_api.py
+tests/test_dru_api.py
+tests/test_jobs_api.py
+tests/test_landing_page_api.py
+tests/test_processes_api.py

app/.openapi-generator/VERSION

@@ -0,0 +1 @@
+7.7.0

app/Dockerfile

@@ -0,0 +1,30 @@
+FROM python:3.7 AS builder
+
+WORKDIR /usr/src/app
+
+RUN python3 -m venv /venv
+ENV PATH="/venv/bin:$PATH"
+
+RUN pip install --upgrade pip
+
+COPY . .
+RUN pip install --no-cache-dir .
+
+
+FROM python:3.7 AS test_runner
+WORKDIR /tmp
+COPY --from=builder /venv /venv
+COPY --from=builder /usr/src/app/tests tests
+ENV PATH=/venv/bin:$PATH
+
+# install test dependencies
+RUN pip install pytest
+
+# run tests
+RUN pytest tests
+
+
+FROM python:3.7 AS service
+WORKDIR /root/app/site-packages
+COPY --from=test_runner /venv /venv
+ENV PATH=/venv/bin:$PATH