Compare commits
37 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 6c4dcb18bb | |||
| 4445137d55 | |||
| 57870d12a4 | |||
| 7a3fe8ec0c | |||
| 757d47e1c0 | |||
| 59a51ba4a7 | |||
| 55223e32e2 | |||
| 6a478e14d7 | |||
| 57d77cc48a | |||
| c225f66fb7 | |||
| 47de6f2f6f | |||
| 8dbf3fe984 | |||
| 1c3fba6e54 | |||
| c4379dc6a7 | |||
| 6b38a3b6c1 | |||
| 464a518ae5 | |||
| 15c67891c6 | |||
| 917ccd1f56 | |||
| fd099998ea | |||
| a6e24e20c3 | |||
| 6608e0050c | |||
| 68b0dda0b9 | |||
| f81795d745 | |||
| caa397b906 | |||
| faf81e7b6d | |||
| 74fcd47047 | |||
| 02b72c466e | |||
| 10deea826d | |||
| bbdc37a45e | |||
| eba228a114 | |||
| ee4789776a | |||
| 22853b87c7 | |||
| d39764d383 | |||
| 60e266fe99 | |||
| 1f190744cd | |||
| 9f14114520 | |||
| c85acee405 |
+5
-1
@@ -1,6 +1,8 @@
|
|||||||
[run]
|
[run]
|
||||||
source = drf_yasg
|
source = drf_yasg
|
||||||
branch = True
|
branch = True
|
||||||
|
parallel = true
|
||||||
|
disable_warnings = module-not-measured
|
||||||
|
|
||||||
[report]
|
[report]
|
||||||
# Regexes for lines to exclude from consideration
|
# Regexes for lines to exclude from consideration
|
||||||
@@ -14,6 +16,7 @@ exclude_lines =
|
|||||||
|
|
||||||
# Don't complain if tests don't hit defensive assertion code:
|
# Don't complain if tests don't hit defensive assertion code:
|
||||||
raise AssertionError
|
raise AssertionError
|
||||||
|
raise ImproperlyConfigured
|
||||||
raise TypeError
|
raise TypeError
|
||||||
raise NotImplementedError
|
raise NotImplementedError
|
||||||
warnings.warn
|
warnings.warn
|
||||||
@@ -28,7 +31,8 @@ exclude_lines =
|
|||||||
raise SwaggerGenerationError
|
raise SwaggerGenerationError
|
||||||
|
|
||||||
ignore_errors = True
|
ignore_errors = True
|
||||||
precision = 0
|
precision = 2
|
||||||
|
show_missing = True
|
||||||
|
|
||||||
[paths]
|
[paths]
|
||||||
source =
|
source =
|
||||||
|
|||||||
+3
-2
@@ -1,4 +1,7 @@
|
|||||||
node_modules/
|
node_modules/
|
||||||
|
testproj/db.sqlite3
|
||||||
|
testproj/staticfiles
|
||||||
|
.vscode/
|
||||||
|
|
||||||
# Created by .ignore support plugin (hsz.mobi)
|
# Created by .ignore support plugin (hsz.mobi)
|
||||||
### Python template
|
### Python template
|
||||||
@@ -156,5 +159,3 @@ com_crashlytics_export_strings.xml
|
|||||||
crashlytics.properties
|
crashlytics.properties
|
||||||
crashlytics-build.properties
|
crashlytics-build.properties
|
||||||
fabric.properties
|
fabric.properties
|
||||||
|
|
||||||
testproj/db\.sqlite3
|
|
||||||
|
|||||||
Generated
+2
-2
@@ -4,7 +4,7 @@
|
|||||||
<facet type="django" name="Django">
|
<facet type="django" name="Django">
|
||||||
<configuration>
|
<configuration>
|
||||||
<option name="rootFolder" value="$MODULE_DIR$/testproj" />
|
<option name="rootFolder" value="$MODULE_DIR$/testproj" />
|
||||||
<option name="settingsModule" value="testproj/settings.py" />
|
<option name="settingsModule" value="testproj/settings/local.py" />
|
||||||
<option name="manageScript" value="manage.py" />
|
<option name="manageScript" value="manage.py" />
|
||||||
<option name="environment" value="<map/>" />
|
<option name="environment" value="<map/>" />
|
||||||
<option name="doNotUseTestRunner" value="false" />
|
<option name="doNotUseTestRunner" value="false" />
|
||||||
@@ -32,4 +32,4 @@
|
|||||||
<option name="projectConfiguration" value="py.test" />
|
<option name="projectConfiguration" value="py.test" />
|
||||||
<option name="PROJECT_TEST_RUNNER" value="py.test" />
|
<option name="PROJECT_TEST_RUNNER" value="py.test" />
|
||||||
</component>
|
</component>
|
||||||
</module>
|
</module>
|
||||||
|
|||||||
+46
-35
@@ -1,56 +1,33 @@
|
|||||||
language: python
|
language: python
|
||||||
cache: pip
|
cache: pip
|
||||||
|
|
||||||
python:
|
python:
|
||||||
- '2.7'
|
- '2.7'
|
||||||
- '3.4'
|
- '3.4'
|
||||||
- '3.5'
|
- '3.5'
|
||||||
- '3.6'
|
- '3.6'
|
||||||
- '3.7-dev'
|
|
||||||
|
|
||||||
env:
|
env:
|
||||||
- DRF=3.7
|
- DRF=3.7
|
||||||
|
|
||||||
install:
|
|
||||||
- pip install -r requirements/ci.txt
|
|
||||||
|
|
||||||
before_script:
|
|
||||||
- coverage erase
|
|
||||||
|
|
||||||
script:
|
|
||||||
- tox
|
|
||||||
|
|
||||||
after_success:
|
|
||||||
- codecov
|
|
||||||
|
|
||||||
branches:
|
|
||||||
only:
|
|
||||||
- master
|
|
||||||
- /^release\/.*$/
|
|
||||||
- /^v?\d+\.\d+(\.\d+)?(-?\S+)?$/
|
|
||||||
|
|
||||||
notifications:
|
|
||||||
email:
|
|
||||||
on_success: always
|
|
||||||
on_failure: always
|
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
fast_finish: true
|
|
||||||
|
|
||||||
include:
|
include:
|
||||||
- stage: test
|
- stage: test
|
||||||
|
python: '3.6'
|
||||||
|
env: DRF=master
|
||||||
|
-
|
||||||
python: '3.5'
|
python: '3.5'
|
||||||
env: TOXENV=docs
|
env: TOXENV=docs
|
||||||
-
|
-
|
||||||
python: '2.7'
|
python: '2.7'
|
||||||
env: TOXENV=flake8
|
env: TOXENV=lint
|
||||||
-
|
|
||||||
python: '3.6'
|
|
||||||
env: DRF=master
|
|
||||||
|
|
||||||
- stage: publish
|
- stage: publish
|
||||||
python: '3.6'
|
python: '3.6'
|
||||||
|
before_script: skip
|
||||||
script: skip
|
script: skip
|
||||||
env:
|
after_success: skip
|
||||||
|
env:
|
||||||
deploy: &pypi
|
deploy: &pypi
|
||||||
provider: pypi
|
provider: pypi
|
||||||
user: cvijdea
|
user: cvijdea
|
||||||
@@ -58,13 +35,47 @@ jobs:
|
|||||||
secure: 54DvknusZ7uHlo9IJxgbNDVKYrwaScyuOZyAGZPb/PTUj8WroQZtp1bFOrAtzfcM4ctIIoLWVzmSwrxypmU4hNif2ZvJ8Vo2PnVh9G6wQ2fD2FN+kFBYczBNrzW5xhjJ53OiTYy/zzHgzxC/sp+hB4sibWl0v69PGU5v6oyBltOWZLXYpqMA6fINt62XDVwuNHVKAo1T/yoeJMQKeCKYAx8QOtve9/qcl5Td/OOM6z42hX5+q3N7RgkCFLl0KopwaPwBaL1Z3Bn+aUhiIUdrRrdigY329QtNXoa/VRBNvUSAwbvecShmgl3c9HigL2ZWmtmHaXda6YCdqmbVfSHSEDsn4AwhZ3A9WblbRtuBwP79YKiE+4BLmgLlGGA4IrAKr3woe+078q/bGqBzmeDd+jt72hhibzD5B96zo4tSNksSxSJGwMYH988fBN/ppynrzRvO0sR/THwpb0r42era8tRd3ZVBefloVas/nQZZs4+zMYoO0fbaLDXdkfaxsF5/X6WkwTYjbI3tdapUT6lYXwi1eKUM1ZGsfKpuq0lFa3qxevYBKveWStQwGyJz1KhVUHbo3OrA3U6q9yoqpzhcZBhzGAPSgumi+EkBUj69cymlYkmqXVBn4VnWsdeFefNYE6Kvh/HJEDPDaWSNgfVLN9xWVqJqM7QiWA351W9dRZA=
|
secure: 54DvknusZ7uHlo9IJxgbNDVKYrwaScyuOZyAGZPb/PTUj8WroQZtp1bFOrAtzfcM4ctIIoLWVzmSwrxypmU4hNif2ZvJ8Vo2PnVh9G6wQ2fD2FN+kFBYczBNrzW5xhjJ53OiTYy/zzHgzxC/sp+hB4sibWl0v69PGU5v6oyBltOWZLXYpqMA6fINt62XDVwuNHVKAo1T/yoeJMQKeCKYAx8QOtve9/qcl5Td/OOM6z42hX5+q3N7RgkCFLl0KopwaPwBaL1Z3Bn+aUhiIUdrRrdigY329QtNXoa/VRBNvUSAwbvecShmgl3c9HigL2ZWmtmHaXda6YCdqmbVfSHSEDsn4AwhZ3A9WblbRtuBwP79YKiE+4BLmgLlGGA4IrAKr3woe+078q/bGqBzmeDd+jt72hhibzD5B96zo4tSNksSxSJGwMYH988fBN/ppynrzRvO0sR/THwpb0r42era8tRd3ZVBefloVas/nQZZs4+zMYoO0fbaLDXdkfaxsF5/X6WkwTYjbI3tdapUT6lYXwi1eKUM1ZGsfKpuq0lFa3qxevYBKveWStQwGyJz1KhVUHbo3OrA3U6q9yoqpzhcZBhzGAPSgumi+EkBUj69cymlYkmqXVBn4VnWsdeFefNYE6Kvh/HJEDPDaWSNgfVLN9xWVqJqM7QiWA351W9dRZA=
|
||||||
on:
|
on:
|
||||||
tags: true
|
tags: true
|
||||||
distributions: sdist
|
distributions: "sdist bdist_wheel"
|
||||||
|
|
||||||
allow_failures:
|
allow_failures:
|
||||||
- env: TOXENV=flake8
|
- env: TOXENV=lint
|
||||||
- env: DRF=master
|
- env: DRF=master
|
||||||
- python: '3.7-dev'
|
|
||||||
|
fast_finish: true
|
||||||
|
|
||||||
|
install:
|
||||||
|
- pip install -r requirements/ci.txt
|
||||||
|
|
||||||
|
before_script:
|
||||||
|
- coverage erase
|
||||||
|
- |
|
||||||
|
[[ -z "$TOXENV" ]] && REPORT_COVERAGE="yes" || REPORT_COVERAGE="no";
|
||||||
|
echo "Reporting coverage: ${REPORT_COVERAGE}"
|
||||||
|
- |
|
||||||
|
[[ -z "$TOXENV" && ! -z "$DRF" && "$DRF" != "master" ]] && USE_DETOX="yes" || USE_DETOX="no";
|
||||||
|
echo "Using detox: ${USE_DETOX}"
|
||||||
|
|
||||||
|
script:
|
||||||
|
- 'if [[ "$USE_DETOX" == "yes" ]]; then detox; else tox; fi'
|
||||||
|
|
||||||
|
after_success:
|
||||||
|
- coverage combine
|
||||||
|
- 'if [[ "$REPORT_COVERAGE" == "yes" ]]; then coverage report; fi'
|
||||||
|
- 'if [[ "$REPORT_COVERAGE" == "yes" ]]; then codecov; fi'
|
||||||
|
|
||||||
|
branches:
|
||||||
|
only:
|
||||||
|
- master
|
||||||
|
- /^release\/.*$/
|
||||||
|
- /^v?\d+\.\d+(\.\d+)?(-?\S+)?$/
|
||||||
|
|
||||||
stages:
|
stages:
|
||||||
- test
|
- test
|
||||||
- publish
|
- name: publish
|
||||||
|
if: tag IS present
|
||||||
|
|
||||||
|
|
||||||
|
notifications:
|
||||||
|
email:
|
||||||
|
on_success: always
|
||||||
|
on_failure: always
|
||||||
|
|||||||
+49
-17
@@ -27,45 +27,55 @@ Pull requests
|
|||||||
|
|
||||||
You want to contribute some code? Great! Here are a few steps to get you started:
|
You want to contribute some code? Great! Here are a few steps to get you started:
|
||||||
|
|
||||||
#. Fork the repository on GitHub
|
#. **Fork the repository on GitHub**
|
||||||
#. Clone your fork and create a branch for the code you want to add
|
#. **Clone your fork and create a branch for the code you want to add**
|
||||||
#. Create a new virtualenv and install the package in development mode
|
#. **Create a new virtualenv and install the package in development mode**
|
||||||
|
|
||||||
.. code:: console
|
.. code:: console
|
||||||
|
|
||||||
$ virtualenv venv
|
$ virtualenv venv
|
||||||
$ source venv/bin/activate
|
$ source venv/bin/activate
|
||||||
(venv) $ pip install -e .[validation]
|
(venv) $ pip install -e .[validation]
|
||||||
(venv) $ pip install -rrequirements/dev.txt -rrequirements/test.txt
|
(venv) $ pip install -rrequirements/dev.txt "Django>=1.11.7"
|
||||||
|
|
||||||
#. Make your changes and check them against the test project
|
#. **Make your changes and check them against the test project**
|
||||||
|
|
||||||
.. code:: console
|
.. code:: console
|
||||||
|
|
||||||
(venv) $ cd testproj
|
(venv) $ cd testproj
|
||||||
(venv) $ python manage.py migrate
|
(venv) $ python manage.py migrate
|
||||||
(venv) $ cat createsuperuser.py | python manage.py shell
|
(venv) $ python manage.py shell -c "import createsuperuser"
|
||||||
(venv) $ python manage.py runserver
|
(venv) $ python manage.py runserver
|
||||||
(venv) $ curl localhost:8000/swagger.yaml
|
(venv) $ firefox localhost:8000/swagger/
|
||||||
|
|
||||||
#. Update the tests if necessary
|
#. **Update the tests if necessary**
|
||||||
|
|
||||||
You can find them in the ``tests`` directory.
|
You can find them in the ``tests`` directory.
|
||||||
|
|
||||||
If your change modifies the expected schema output, you should download the new generated ``swagger.yaml``, diff it
|
If your change modifies the expected schema output, you should regenerate the reference schema at
|
||||||
against the old reference output in ``tests/reference.yaml``, and replace it after checking that no unexpected
|
``tests/reference.yaml``:
|
||||||
changes appeared.
|
|
||||||
|
|
||||||
#. Run tests. The project is setup to use tox and pytest for testing
|
|
||||||
|
|
||||||
.. code:: console
|
.. code:: console
|
||||||
|
|
||||||
|
(venv) $ cd testproj
|
||||||
|
(venv) $ python manage.py generate_swagger ../tests/reference.yaml --overwrite --user admin --url http://test.local:8002/
|
||||||
|
|
||||||
|
After checking the git diff to verify that no unexpected changes appeared, you should commit the new
|
||||||
|
``reference.yaml`` together with your changes.
|
||||||
|
|
||||||
|
#. **Run tests. The project is setup to use tox and pytest for testing**
|
||||||
|
|
||||||
|
.. code:: console
|
||||||
|
|
||||||
|
# (optional) sort imports with isort and check flake8 linting
|
||||||
|
(venv) $ isort --apply
|
||||||
|
(venv) $ flake8 src/drf_yasg testproj tests setup.py
|
||||||
# run tests in the current environment, faster than tox
|
# run tests in the current environment, faster than tox
|
||||||
(venv) $ pytest --cov
|
(venv) $ pytest --cov
|
||||||
# (optional) run tests for other python versions in separate environments
|
# (optional) run tests for other python versions in separate environments
|
||||||
(venv) $ tox
|
(venv) $ tox
|
||||||
|
|
||||||
#. Update documentation
|
#. **Update documentation**
|
||||||
|
|
||||||
If the change modifies behaviour or adds new features, you should update the documentation and ``README.rst``
|
If the change modifies behaviour or adds new features, you should update the documentation and ``README.rst``
|
||||||
accordingly. Documentation is written in reStructuredText and built using Sphinx. You can find the sources in the
|
accordingly. Documentation is written in reStructuredText and built using Sphinx. You can find the sources in the
|
||||||
@@ -77,10 +87,32 @@ You want to contribute some code? Great! Here are a few steps to get you started
|
|||||||
|
|
||||||
(venv) $ tox -e docs
|
(venv) $ tox -e docs
|
||||||
|
|
||||||
#. Push your branch and submit a pull request to the master branch on GitHub
|
#. **Push your branch and submit a pull request to the master branch on GitHub**
|
||||||
|
|
||||||
Incomplete/Work In Progress pull requests are encouraged, because they allow you to get feedback and help more
|
Incomplete/Work In Progress pull requests are encouraged, because they allow you to get feedback and help more
|
||||||
easily.
|
easily.
|
||||||
|
|
||||||
#. Your code must pass all the required travis jobs before it is merged. As of now, this includes running on
|
#. **Your code must pass all the required travis jobs before it is merged**
|
||||||
Python 2.7, 3.4, 3.5 and 3.6, and building the docs succesfully.
|
|
||||||
|
As of now, this consists of running on Python 2.7, 3.4, 3.5 and 3.6, and building the docs succesfully.
|
||||||
|
|
||||||
|
******************
|
||||||
|
Maintainer's notes
|
||||||
|
******************
|
||||||
|
|
||||||
|
Release checklist
|
||||||
|
=================
|
||||||
|
|
||||||
|
* update ``docs/changelog.rst`` with changes since the latest tag
|
||||||
|
* commit & tag the release
|
||||||
|
* push using ``git push --follow-tags``
|
||||||
|
* verify that `Travis`_ has built the tag and succesfully published the release to PyPI
|
||||||
|
* publish release notes `on GitHub`_
|
||||||
|
* start the `ReadTheDocs build`_ if it has not already started
|
||||||
|
* deploy the live demo `on Heroku`_
|
||||||
|
|
||||||
|
|
||||||
|
.. _Travis: https://travis-ci.org/axnsan12/drf-yasg/builds
|
||||||
|
.. _on GitHub: https://github.com/axnsan12/drf-yasg/releases
|
||||||
|
.. _ReadTheDocs build: https://readthedocs.org/projects/drf-yasg/builds/
|
||||||
|
.. _on Heroku: https://dashboard.heroku.com/pipelines/412d1cae-6a95-4f5e-810b-94869133f36a
|
||||||
|
|||||||
@@ -0,0 +1,2 @@
|
|||||||
|
release: python testproj/manage.py migrate && python testproj/manage.py shell -c "import createsuperuser"
|
||||||
|
web: gunicorn --chdir testproj testproj.wsgi --log-file -
|
||||||
+136
-100
@@ -15,26 +15,37 @@ Compatible with
|
|||||||
- **Django**: 1.11, 2.0
|
- **Django**: 1.11, 2.0
|
||||||
- **Python**: 2.7, 3.4, 3.5, 3.6
|
- **Python**: 2.7, 3.4, 3.5, 3.6
|
||||||
|
|
||||||
**Source**: https://github.com/axnsan12/drf-yasg/
|
Resources:
|
||||||
|
|
||||||
**Documentation**: https://drf-yasg.readthedocs.io/en/latest/
|
* **Source**: https://github.com/axnsan12/drf-yasg/
|
||||||
|
* **Documentation**: https://drf-yasg.readthedocs.io/
|
||||||
|
* **Changelog**: https://drf-yasg.readthedocs.io/en/stable/changelog.html
|
||||||
|
* **Live demo**: https://drf-yasg-demo.herokuapp.com/
|
||||||
|
|
||||||
|
.. image:: https://www.herokucdn.com/deploy/button.svg
|
||||||
|
:target: https://heroku.com/deploy?template=https://github.com/axnsan12/drf-yasg
|
||||||
|
:alt: heroku deploy button
|
||||||
|
|
||||||
********
|
********
|
||||||
Features
|
Features
|
||||||
********
|
********
|
||||||
|
|
||||||
- full support for nested Serializers and Schemas
|
- full support for nested Serializers and Schemas
|
||||||
- response schemas and descriptions
|
- response schemas and descriptions
|
||||||
- model definitions compatible with codegen tools
|
- model definitions compatible with codegen tools
|
||||||
- customization hooks at all points in the spec generation process
|
- customization hooks at all points in the spec generation process
|
||||||
- JSON and YAML format for spec
|
- JSON and YAML format for spec
|
||||||
- bundles latest version of
|
- bundles latest version of
|
||||||
`swagger-ui <https://github.com/swagger-api/swagger-ui>`__ and
|
`swagger-ui <https://github.com/swagger-api/swagger-ui>`_ and
|
||||||
`redoc <https://github.com/Rebilly/ReDoc>`__ for viewing the generated documentation
|
`redoc <https://github.com/Rebilly/ReDoc>`_ for viewing the generated documentation
|
||||||
- schema view is cacheable out of the box
|
- schema view is cacheable out of the box
|
||||||
- generated Swagger schema can be automatically validated by
|
- generated Swagger schema can be automatically validated by
|
||||||
`swagger-spec-validator <https://github.com/Yelp/swagger_spec_validator>`__ or
|
`swagger-spec-validator <https://github.com/Yelp/swagger_spec_validator>`_ or
|
||||||
`flex <https://github.com/pipermerriam/flex>`__
|
`flex <https://github.com/pipermerriam/flex>`_
|
||||||
|
- supports Django REST Framework API versioning
|
||||||
|
|
||||||
|
+ ``URLPathVersioning`` and ``NamespaceVersioning`` are supported
|
||||||
|
+ ``HostnameVersioning``, ``AcceptHeaderVersioning`` and ``QueryParameterVersioning`` are not currently supported
|
||||||
|
|
||||||
.. figure:: https://raw.githubusercontent.com/axnsan12/drf-yasg/1.0.2/screenshots/redoc-nested-response.png
|
.. figure:: https://raw.githubusercontent.com/axnsan12/drf-yasg/1.0.2/screenshots/redoc-nested-response.png
|
||||||
:width: 100%
|
:width: 100%
|
||||||
@@ -94,42 +105,42 @@ In ``settings.py``:
|
|||||||
|
|
||||||
.. code:: python
|
.. code:: python
|
||||||
|
|
||||||
INSTALLED_APPS = [
|
INSTALLED_APPS = [
|
||||||
...
|
...
|
||||||
'drf_yasg',
|
'drf_yasg',
|
||||||
...
|
...
|
||||||
]
|
]
|
||||||
|
|
||||||
In ``urls.py``:
|
In ``urls.py``:
|
||||||
|
|
||||||
.. code:: python
|
.. code:: python
|
||||||
|
|
||||||
...
|
...
|
||||||
from drf_yasg.views import get_schema_view
|
from drf_yasg.views import get_schema_view
|
||||||
from drf_yasg import openapi
|
from drf_yasg import openapi
|
||||||
|
|
||||||
...
|
...
|
||||||
|
|
||||||
schema_view = get_schema_view(
|
schema_view = get_schema_view(
|
||||||
openapi.Info(
|
openapi.Info(
|
||||||
title="Snippets API",
|
title="Snippets API",
|
||||||
default_version='v1',
|
default_version='v1',
|
||||||
description="Test description",
|
description="Test description",
|
||||||
terms_of_service="https://www.google.com/policies/terms/",
|
terms_of_service="https://www.google.com/policies/terms/",
|
||||||
contact=openapi.Contact(email="contact@snippets.local"),
|
contact=openapi.Contact(email="contact@snippets.local"),
|
||||||
license=openapi.License(name="BSD License"),
|
license=openapi.License(name="BSD License"),
|
||||||
),
|
),
|
||||||
validators=['ssv', 'flex'],
|
validators=['flex', 'ssv'],
|
||||||
public=True,
|
public=True,
|
||||||
permission_classes=(permissions.AllowAny,),
|
permission_classes=(permissions.AllowAny,),
|
||||||
)
|
)
|
||||||
|
|
||||||
urlpatterns = [
|
urlpatterns = [
|
||||||
url(r'^swagger(?P<format>.json|.yaml)$', schema_view.without_ui(cache_timeout=None), name='schema-json'),
|
url(r'^swagger(?P<format>.json|.yaml)$', schema_view.without_ui(cache_timeout=None), name='schema-json'),
|
||||||
url(r'^swagger/$', schema_view.with_ui('swagger', cache_timeout=None), name='schema-swagger-ui'),
|
url(r'^swagger/$', schema_view.with_ui('swagger', cache_timeout=None), name='schema-swagger-ui'),
|
||||||
url(r'^redoc/$', schema_view.with_ui('redoc', cache_timeout=None), name='schema-redoc'),
|
url(r'^redoc/$', schema_view.with_ui('redoc', cache_timeout=None), name='schema-redoc'),
|
||||||
...
|
...
|
||||||
]
|
]
|
||||||
|
|
||||||
This exposes 4 cached, validated and publicly available endpoints:
|
This exposes 4 cached, validated and publicly available endpoints:
|
||||||
|
|
||||||
@@ -145,12 +156,13 @@ This exposes 4 cached, validated and publicly available endpoints:
|
|||||||
a. ``get_schema_view`` parameters
|
a. ``get_schema_view`` parameters
|
||||||
---------------------------------
|
---------------------------------
|
||||||
|
|
||||||
- ``info`` - Required. Swagger API Info object
|
- ``info`` - Swagger API Info object; if omitted, defaults to ``DEFAULT_INFO``
|
||||||
- ``url`` - API base url; if left blank will be deduced from the location the view is served at
|
- ``url`` - API base url; if left blank will be deduced from the location the view is served at
|
||||||
- ``patterns`` - passed to SchemaGenerator
|
- ``patterns`` - passed to SchemaGenerator
|
||||||
- ``urlconf`` - passed to SchemaGenerator
|
- ``urlconf`` - passed to SchemaGenerator
|
||||||
- ``public`` - if False, includes only endpoints the current user has access to
|
- ``public`` - if False, includes only endpoints the current user has access to
|
||||||
- ``validators`` - a list of validator names to apply on the generated schema; allowed values are ``flex``, ``ssv``
|
- ``validators`` - a list of validator names to apply on the generated schema; allowed values are ``flex``, ``ssv``
|
||||||
|
- ``generator_class`` - schema generator class to use; should be a subclass of ``OpenAPISchemaGenerator``
|
||||||
- ``authentication_classes`` - authentication classes for the schema view itself
|
- ``authentication_classes`` - authentication classes for the schema view itself
|
||||||
- ``permission_classes`` - permission classes for the schema view itself
|
- ``permission_classes`` - permission classes for the schema view itself
|
||||||
|
|
||||||
@@ -166,10 +178,9 @@ b. ``SchemaView`` options
|
|||||||
but with optional caching
|
but with optional caching
|
||||||
- you can, of course, call :python:`as_view` as usual
|
- you can, of course, call :python:`as_view` as usual
|
||||||
|
|
||||||
All of the first 3 methods take two optional arguments,
|
All of the first 3 methods take two optional arguments, ``cache_timeout`` and ``cache_kwargs``; if present,
|
||||||
``cache_timeout`` and ``cache_kwargs``; if present, these are passed on
|
these are passed on to Django’s :python:`cached_page` decorator in order to enable caching on the resulting view.
|
||||||
to Django’s :python:`cached_page` decorator in order to enable caching on the
|
See `3. Caching`_.
|
||||||
resulting view. See `3. Caching`_.
|
|
||||||
|
|
||||||
----------------------------------------------
|
----------------------------------------------
|
||||||
c. ``SWAGGER_SETTINGS`` and ``REDOC_SETTINGS``
|
c. ``SWAGGER_SETTINGS`` and ``REDOC_SETTINGS``
|
||||||
@@ -180,62 +191,67 @@ The possible settings and their default values are as follows:
|
|||||||
|
|
||||||
.. code:: python
|
.. code:: python
|
||||||
|
|
||||||
SWAGGER_SETTINGS = {
|
SWAGGER_SETTINGS = {
|
||||||
# default inspector classes, see advanced documentation
|
# default inspector classes, see advanced documentation
|
||||||
'DEFAULT_AUTO_SCHEMA_CLASS': 'drf_yasg.inspectors.SwaggerAutoSchema',
|
'DEFAULT_AUTO_SCHEMA_CLASS': 'drf_yasg.inspectors.SwaggerAutoSchema',
|
||||||
'DEFAULT_FIELD_INSPECTORS': [
|
'DEFAULT_FIELD_INSPECTORS': [
|
||||||
'drf_yasg.inspectors.CamelCaseJSONFilter',
|
'drf_yasg.inspectors.CamelCaseJSONFilter',
|
||||||
'drf_yasg.inspectors.ReferencingSerializerInspector',
|
'drf_yasg.inspectors.ReferencingSerializerInspector',
|
||||||
'drf_yasg.inspectors.RelatedFieldInspector',
|
'drf_yasg.inspectors.RelatedFieldInspector',
|
||||||
'drf_yasg.inspectors.ChoiceFieldInspector',
|
'drf_yasg.inspectors.ChoiceFieldInspector',
|
||||||
'drf_yasg.inspectors.FileFieldInspector',
|
'drf_yasg.inspectors.FileFieldInspector',
|
||||||
'drf_yasg.inspectors.DictFieldInspector',
|
'drf_yasg.inspectors.DictFieldInspector',
|
||||||
'drf_yasg.inspectors.SimpleFieldInspector',
|
'drf_yasg.inspectors.SimpleFieldInspector',
|
||||||
'drf_yasg.inspectors.StringDefaultFieldInspector',
|
'drf_yasg.inspectors.StringDefaultFieldInspector',
|
||||||
],
|
],
|
||||||
'DEFAULT_FILTER_INSPECTORS': [
|
'DEFAULT_FILTER_INSPECTORS': [
|
||||||
'drf_yasg.inspectors.CoreAPICompatInspector',
|
'drf_yasg.inspectors.CoreAPICompatInspector',
|
||||||
],
|
],
|
||||||
'DEFAULT_PAGINATOR_INSPECTORS': [
|
'DEFAULT_PAGINATOR_INSPECTORS': [
|
||||||
'drf_yasg.inspectors.DjangoRestResponsePagination',
|
'drf_yasg.inspectors.DjangoRestResponsePagination',
|
||||||
'drf_yasg.inspectors.CoreAPICompatInspector',
|
'drf_yasg.inspectors.CoreAPICompatInspector',
|
||||||
],
|
],
|
||||||
|
|
||||||
'USE_SESSION_AUTH': True, # add Django Login and Django Logout buttons, CSRF token to swagger UI page
|
# default api Info if none is otherwise given; should be an import string to an openapi.Info object
|
||||||
'LOGIN_URL': getattr(django.conf.settings, 'LOGIN_URL', None), # URL for the login button
|
'DEFAULT_INFO': None,
|
||||||
'LOGOUT_URL': getattr(django.conf.settings, 'LOGOUT_URL', None), # URL for the logout button
|
# default API url if none is otherwise given
|
||||||
|
'DEFAULT_API_URL': None,
|
||||||
|
|
||||||
# Swagger security definitions to include in the schema;
|
'USE_SESSION_AUTH': True, # add Django Login and Django Logout buttons, CSRF token to swagger UI page
|
||||||
# see https://github.com/OAI/OpenAPI-Specification/blob/master/versions/2.0.md#security-definitions-object
|
'LOGIN_URL': getattr(django.conf.settings, 'LOGIN_URL', None), # URL for the login button
|
||||||
'SECURITY_DEFINITIONS': {
|
'LOGOUT_URL': getattr(django.conf.settings, 'LOGOUT_URL', None), # URL for the logout button
|
||||||
'basic': {
|
|
||||||
'type': 'basic'
|
|
||||||
}
|
|
||||||
},
|
|
||||||
|
|
||||||
# url to an external Swagger validation service; defaults to 'http://online.swagger.io/validator/'
|
# Swagger security definitions to include in the schema;
|
||||||
# set to None to disable the schema validation badge in the UI
|
# see https://github.com/OAI/OpenAPI-Specification/blob/master/versions/2.0.md#security-definitions-object
|
||||||
'VALIDATOR_URL': '',
|
'SECURITY_DEFINITIONS': {
|
||||||
|
'basic': {
|
||||||
|
'type': 'basic'
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
# swagger-ui configuration settings, see https://github.com/swagger-api/swagger-ui/blob/112bca906553a937ac67adc2e500bdeed96d067b/docs/usage/configuration.md#parameters
|
# url to an external Swagger validation service; defaults to 'http://online.swagger.io/validator/'
|
||||||
'OPERATIONS_SORTER': None,
|
# set to None to disable the schema validation badge in the UI
|
||||||
'TAGS_SORTER': None,
|
'VALIDATOR_URL': '',
|
||||||
'DOC_EXPANSION': 'list',
|
|
||||||
'DEEP_LINKING': False,
|
# swagger-ui configuration settings, see https://github.com/swagger-api/swagger-ui/blob/112bca906553a937ac67adc2e500bdeed96d067b/docs/usage/configuration.md#parameters
|
||||||
'SHOW_EXTENSIONS': True,
|
'OPERATIONS_SORTER': None,
|
||||||
'DEFAULT_MODEL_RENDERING': 'model',
|
'TAGS_SORTER': None,
|
||||||
'DEFAULT_MODEL_DEPTH': 3,
|
'DOC_EXPANSION': 'list',
|
||||||
}
|
'DEEP_LINKING': False,
|
||||||
|
'SHOW_EXTENSIONS': True,
|
||||||
|
'DEFAULT_MODEL_RENDERING': 'model',
|
||||||
|
'DEFAULT_MODEL_DEPTH': 3,
|
||||||
|
}
|
||||||
|
|
||||||
.. code:: python
|
.. code:: python
|
||||||
|
|
||||||
REDOC_SETTINGS = {
|
REDOC_SETTINGS = {
|
||||||
# ReDoc UI configuration settings, see https://github.com/Rebilly/ReDoc#redoc-tag-attributes
|
# ReDoc UI configuration settings, see https://github.com/Rebilly/ReDoc#redoc-tag-attributes
|
||||||
'LAZY_RENDERING': True,
|
'LAZY_RENDERING': True,
|
||||||
'HIDE_HOSTNAME': False,
|
'HIDE_HOSTNAME': False,
|
||||||
'EXPAND_RESPONSES': 'all',
|
'EXPAND_RESPONSES': 'all',
|
||||||
'PATH_IN_MIDDLE': False,
|
'PATH_IN_MIDDLE': False,
|
||||||
}
|
}
|
||||||
|
|
||||||
3. Caching
|
3. Caching
|
||||||
==========
|
==========
|
||||||
@@ -246,16 +262,16 @@ caching the schema view in-memory, with some sane defaults:
|
|||||||
* caching is enabled by the `cache_page <https://docs.djangoproject.com/en/1.11/topics/cache/#the-per-view-cache>`__
|
* caching is enabled by the `cache_page <https://docs.djangoproject.com/en/1.11/topics/cache/#the-per-view-cache>`__
|
||||||
decorator, using the default Django cache backend, can be changed using the ``cache_kwargs`` argument
|
decorator, using the default Django cache backend, can be changed using the ``cache_kwargs`` argument
|
||||||
* HTTP caching of the response is blocked to avoid confusing situations caused by being shown stale schemas
|
* HTTP caching of the response is blocked to avoid confusing situations caused by being shown stale schemas
|
||||||
* if `public` is set to ``False`` on the SchemaView, the cached schema varies on the ``Cookie`` and ``Authorization``
|
* the cached schema varies on the ``Cookie`` and ``Authorization`` HTTP headers to enable filtering of visible endpoints
|
||||||
HTTP headers to enable filtering of visible endpoints according to the authentication credentials of each user; note
|
according to the authentication credentials of each user; note that this means that every user accessing the schema
|
||||||
that this means that every user accessing the schema will have a separate schema cached in memory.
|
will have a separate schema cached in memory.
|
||||||
|
|
||||||
4. Validation
|
4. Validation
|
||||||
=============
|
=============
|
||||||
|
|
||||||
Given the numerous methods to manually customzie the generated schema, it makes sense to validate the result to ensure
|
Given the numerous methods to manually customzie the generated schema, it makes sense to validate the result to ensure
|
||||||
it still conforms to OpenAPI 2.0. To this end, validation is provided at the generation point using python swagger
|
it still conforms to OpenAPI 2.0. To this end, validation is provided at the generation point using python swagger
|
||||||
libraries, and can be activated by passing :python:`validators=['ssv', 'flex']` to ``get_schema_view``; if the generated
|
libraries, and can be activated by passing :python:`validators=['flex', 'ssv']` to ``get_schema_view``; if the generated
|
||||||
schema is not valid, a :python:`SwaggerValidationError` is raised by the handling codec.
|
schema is not valid, a :python:`SwaggerValidationError` is raised by the handling codec.
|
||||||
|
|
||||||
**Warning:** This internal validation can slow down your server.
|
**Warning:** This internal validation can slow down your server.
|
||||||
@@ -329,6 +345,26 @@ You can use the specification outputted by this library together with
|
|||||||
|
|
||||||
See the github page linked above for more details.
|
See the github page linked above for more details.
|
||||||
|
|
||||||
|
.. _readme-testproj:
|
||||||
|
|
||||||
|
6. Example project
|
||||||
|
==================
|
||||||
|
|
||||||
|
For additional usage examples, you can take a look at the test project in the ``testproj`` directory:
|
||||||
|
|
||||||
|
.. code:: console
|
||||||
|
|
||||||
|
$ git clone https://github.com/axnsan12/drf-yasg.git
|
||||||
|
$ cd drf-yasg
|
||||||
|
$ virtualenv venv
|
||||||
|
$ source venv/bin/activate
|
||||||
|
(venv) $ cd testproj
|
||||||
|
(venv) $ pip install -r requirements.txt
|
||||||
|
(venv) $ python manage.py migrate
|
||||||
|
(venv) $ python manage.py shell -c "import createsuperuser"
|
||||||
|
(venv) $ python manage.py runserver
|
||||||
|
(venv) $ firefox localhost:8000/swagger/
|
||||||
|
|
||||||
**********
|
**********
|
||||||
Background
|
Background
|
||||||
**********
|
**********
|
||||||
|
|||||||
@@ -0,0 +1,17 @@
|
|||||||
|
{
|
||||||
|
"name": "drf-yasg Demo app",
|
||||||
|
"description": "A demonstrative app using https://github.com/axnsan12/drf-yasg",
|
||||||
|
"repository": "https://github.com/axnsan12/drf-yasg",
|
||||||
|
"logo": "https://swaggerhub.com/wp-content/uploads/2017/10/Swagger-Icon.svg",
|
||||||
|
"keywords": [
|
||||||
|
"django",
|
||||||
|
"django-rest-framework",
|
||||||
|
"swagger",
|
||||||
|
"openapi"
|
||||||
|
],
|
||||||
|
"env": {
|
||||||
|
"DJANGO_SETTINGS_MODULE": "testproj.settings.heroku",
|
||||||
|
"DJANGO_SECRET_KEY": "m76=^#=z7xv5^(o%4dv9w7+1_c)y2m6)1ogjx%s@9$1^nupry="
|
||||||
|
},
|
||||||
|
"success_url": "/"
|
||||||
|
}
|
||||||
@@ -2,6 +2,39 @@
|
|||||||
Changelog
|
Changelog
|
||||||
#########
|
#########
|
||||||
|
|
||||||
|
*********
|
||||||
|
**1.2.0**
|
||||||
|
*********
|
||||||
|
|
||||||
|
- **ADDED:** ``basePath`` is now generated by taking into account the ``SCRIPT_NAME`` variable and the
|
||||||
|
longest common prefix of API urls (:issue:`37`, :pr:`42`)
|
||||||
|
- **IMPROVED:** removed inline scripts and styles from bundled HTML templates to increase CSP compatibility
|
||||||
|
- **IMPROVED:** improved validation errors and added more assertion sanity checks (:issue:`37`, :issue:`40`)
|
||||||
|
- **IMPROVED:** improved handling of NamespaceVersioning by excluding endpoints of differing versions
|
||||||
|
(i.e. when accesing the schema view for v1, v2 endpoints will not be included in swagger)
|
||||||
|
|
||||||
|
*********
|
||||||
|
**1.1.3**
|
||||||
|
*********
|
||||||
|
|
||||||
|
- **FIXED:** schema view cache will now always ``Vary`` on the ``Cookie`` and ``Authentication`` (the
|
||||||
|
``Vary`` header was previously only added if ``public`` was set to ``True``) - this fixes issues related to Django
|
||||||
|
authentication in ``swagger-ui`` and ``CurrentUserDefault`` values in the schema
|
||||||
|
|
||||||
|
*********
|
||||||
|
**1.1.2**
|
||||||
|
*********
|
||||||
|
|
||||||
|
- **IMPROVED:** updated ``swagger-ui`` to version 3.8.1
|
||||||
|
- **IMPROVED:** removed some unneeded static files
|
||||||
|
|
||||||
|
*********
|
||||||
|
**1.1.1**
|
||||||
|
*********
|
||||||
|
|
||||||
|
- **ADDED:** :ref:`generate_swagger management command <management-command>`
|
||||||
|
(:issue:`29`, :pr:`31`, thanks to :ghuser:`beaugunderson`)
|
||||||
|
- **FIXED:** fixed improper generation of ``\Z`` regex tokens - will now be repalced by ``$``
|
||||||
|
|
||||||
*********
|
*********
|
||||||
**1.1.0**
|
**1.1.0**
|
||||||
|
|||||||
+1
-3
@@ -199,15 +199,13 @@ nitpick_ignore = [
|
|||||||
('py:obj', 'APIView'),
|
('py:obj', 'APIView'),
|
||||||
]
|
]
|
||||||
|
|
||||||
# TODO: inheritance aliases in sphinx 1.7
|
|
||||||
|
|
||||||
# even though the package should be already installed, the sphinx build on RTD
|
# even though the package should be already installed, the sphinx build on RTD
|
||||||
# for some reason needs the sources dir to be in the path in order for viewcode to work
|
# for some reason needs the sources dir to be in the path in order for viewcode to work
|
||||||
sys.path.insert(0, os.path.abspath('../src'))
|
sys.path.insert(0, os.path.abspath('../src'))
|
||||||
|
|
||||||
# activate the Django testproj to be able to succesfully import drf_yasg
|
# activate the Django testproj to be able to succesfully import drf_yasg
|
||||||
sys.path.insert(0, os.path.abspath('../testproj'))
|
sys.path.insert(0, os.path.abspath('../testproj'))
|
||||||
os.putenv('DJANGO_SETTINGS_MODULE', 'testproj.settings')
|
os.putenv('DJANGO_SETTINGS_MODULE', 'testproj.settings.local')
|
||||||
|
|
||||||
from django.conf import settings # noqa: E402
|
from django.conf import settings # noqa: E402
|
||||||
|
|
||||||
|
|||||||
+45
-10
@@ -127,7 +127,39 @@ This section describes where information is sourced from when using the default
|
|||||||
* *descriptions* for :class:`.Operation`\ s, :class:`.Parameter`\ s and :class:`.Schema`\ s are picked up from
|
* *descriptions* for :class:`.Operation`\ s, :class:`.Parameter`\ s and :class:`.Schema`\ s are picked up from
|
||||||
docstrings and ``help_text`` attributes in the same manner as the `default DRF SchemaGenerator
|
docstrings and ``help_text`` attributes in the same manner as the `default DRF SchemaGenerator
|
||||||
<http://www.django-rest-framework.org/api-guide/schemas/#schemas-as-documentation>`_
|
<http://www.django-rest-framework.org/api-guide/schemas/#schemas-as-documentation>`_
|
||||||
|
* .. _custom-spec-base-url:
|
||||||
|
|
||||||
|
The base URL for the API consists of three values - the ``host``, ``schemes`` and ``basePath`` attributes
|
||||||
|
* The host name and scheme are determined, in descending order of priority:
|
||||||
|
|
||||||
|
+ from the ``url`` argument passed to :func:`.get_schema_view` (more specifically, to the underlying
|
||||||
|
:class:`.OpenAPISchemaGenerator`)
|
||||||
|
+ from the :ref:`DEFAULT_API_URL setting <default-swagger-settings>`
|
||||||
|
+ inferred from the request made to the schema endpoint
|
||||||
|
|
||||||
|
For example, an url of ``https://www.example.com:8080/some/path`` will populate the ``host`` and ``schemes``
|
||||||
|
attributes with ``www.example.com:8080`` and ``['https']``, respectively. The path component will be ignored.
|
||||||
|
* The base path is determined as the concatenation of two variables:
|
||||||
|
|
||||||
|
#. the `SCRIPT_NAME`_ wsgi environment variable; this is set, for example, when serving the site from a
|
||||||
|
sub-path using web server url rewriting
|
||||||
|
|
||||||
|
.. Tip::
|
||||||
|
|
||||||
|
The Django `FORCE_SCRIPT_NAME`_ setting can be used to override the `SCRIPT_NAME`_ or set it when it's
|
||||||
|
missing from the environment.
|
||||||
|
|
||||||
|
#. the longest common path prefix of all the urls in your API - see :meth:`.determine_path_prefix`
|
||||||
|
|
||||||
|
* When using API versioning with ``NamespaceVersioning`` or ``URLPathVersioning``, versioned endpoints that do not
|
||||||
|
match the version used to access the ``SchemaView`` will be excluded from the endpoint list - for example,
|
||||||
|
``/api/v1.0/endpoint`` will be shown when viewing ``/api/v1.0/swagger/``, while ``/api/v2.0/endpoint`` will not
|
||||||
|
|
||||||
|
Other versioning schemes are not presently supported.
|
||||||
|
|
||||||
|
|
||||||
|
.. versionadded:: 1.2
|
||||||
|
Base path and versioning support.
|
||||||
|
|
||||||
.. _custom-spec-swagger-auto-schema:
|
.. _custom-spec-swagger-auto-schema:
|
||||||
|
|
||||||
@@ -138,7 +170,7 @@ The ``@swagger_auto_schema`` decorator
|
|||||||
You can use the :func:`@swagger_auto_schema <.swagger_auto_schema>` decorator on view functions to override
|
You can use the :func:`@swagger_auto_schema <.swagger_auto_schema>` decorator on view functions to override
|
||||||
some properties of the generated :class:`.Operation`. For example, in a ``ViewSet``,
|
some properties of the generated :class:`.Operation`. For example, in a ``ViewSet``,
|
||||||
|
|
||||||
.. code:: python
|
.. code-block:: python
|
||||||
|
|
||||||
@swagger_auto_schema(operation_description="partial_update description override", responses={404: 'slug not found'})
|
@swagger_auto_schema(operation_description="partial_update description override", responses={404: 'slug not found'})
|
||||||
def partial_update(self, request, *args, **kwargs):
|
def partial_update(self, request, *args, **kwargs):
|
||||||
@@ -153,7 +185,7 @@ Where you can use the :func:`@swagger_auto_schema <.swagger_auto_schema>` decora
|
|||||||
* for function based ``@api_view``\ s, because the same view can handle multiple methods, and thus represent multiple
|
* for function based ``@api_view``\ s, because the same view can handle multiple methods, and thus represent multiple
|
||||||
operations, you have to add the decorator multiple times if you want to override different operations:
|
operations, you have to add the decorator multiple times if you want to override different operations:
|
||||||
|
|
||||||
.. code:: python
|
.. code-block:: python
|
||||||
|
|
||||||
test_param = openapi.Parameter('test', openapi.IN_QUERY, description="test manual param", type=openapi.TYPE_BOOLEAN)
|
test_param = openapi.Parameter('test', openapi.IN_QUERY, description="test manual param", type=openapi.TYPE_BOOLEAN)
|
||||||
user_response = openapi.Response('response description', UserSerializer)
|
user_response = openapi.Response('response description', UserSerializer)
|
||||||
@@ -169,7 +201,7 @@ Where you can use the :func:`@swagger_auto_schema <.swagger_auto_schema>` decora
|
|||||||
* for class based ``APIView``, ``GenericAPIView`` and non-``ViewSet`` derivatives, you have to decorate the respective
|
* for class based ``APIView``, ``GenericAPIView`` and non-``ViewSet`` derivatives, you have to decorate the respective
|
||||||
method of each operation:
|
method of each operation:
|
||||||
|
|
||||||
.. code:: python
|
.. code-block:: python
|
||||||
|
|
||||||
class UserList(APIView):
|
class UserList(APIView):
|
||||||
@swagger_auto_schema(responses={200: UserSerializer(many=True)})
|
@swagger_auto_schema(responses={200: UserSerializer(many=True)})
|
||||||
@@ -186,7 +218,7 @@ Where you can use the :func:`@swagger_auto_schema <.swagger_auto_schema>` decora
|
|||||||
respond to multiple HTTP methods and thus have multiple operations that must be decorated separately:
|
respond to multiple HTTP methods and thus have multiple operations that must be decorated separately:
|
||||||
|
|
||||||
|
|
||||||
.. code:: python
|
.. code-block:: python
|
||||||
|
|
||||||
class ArticleViewSet(viewsets.ModelViewSet):
|
class ArticleViewSet(viewsets.ModelViewSet):
|
||||||
# method or 'methods' can be skipped because the list_route only handles a single method (GET)
|
# method or 'methods' can be skipped because the list_route only handles a single method (GET)
|
||||||
@@ -214,7 +246,7 @@ Where you can use the :func:`@swagger_auto_schema <.swagger_auto_schema>` decora
|
|||||||
If you want to customize the generation of a method you are not implementing yourself, you can use
|
If you want to customize the generation of a method you are not implementing yourself, you can use
|
||||||
``swagger_auto_schema`` in combination with Django's ``method_decorator``:
|
``swagger_auto_schema`` in combination with Django's ``method_decorator``:
|
||||||
|
|
||||||
.. code:: python
|
.. code-block:: python
|
||||||
|
|
||||||
@method_decorator(name='list', decorator=swagger_auto_schema(
|
@method_decorator(name='list', decorator=swagger_auto_schema(
|
||||||
operation_description="description from swagger_auto_schema via method_decorator"
|
operation_description="description from swagger_auto_schema via method_decorator"
|
||||||
@@ -229,7 +261,7 @@ Where you can use the :func:`@swagger_auto_schema <.swagger_auto_schema>` decora
|
|||||||
You can go even further and directly decorate the result of ``as_view``, in the same manner you would
|
You can go even further and directly decorate the result of ``as_view``, in the same manner you would
|
||||||
override an ``@api_view`` as described above:
|
override an ``@api_view`` as described above:
|
||||||
|
|
||||||
.. code:: python
|
.. code-block:: python
|
||||||
|
|
||||||
decorated_login_view = \
|
decorated_login_view = \
|
||||||
swagger_auto_schema(
|
swagger_auto_schema(
|
||||||
@@ -256,7 +288,7 @@ Serializer ``Meta`` nested class
|
|||||||
|
|
||||||
You can define some per-serializer options by adding a ``Meta`` class to your serializer, e.g.:
|
You can define some per-serializer options by adding a ``Meta`` class to your serializer, e.g.:
|
||||||
|
|
||||||
.. code:: python
|
.. code-block:: python
|
||||||
|
|
||||||
class WhateverSerializer(Serializer):
|
class WhateverSerializer(Serializer):
|
||||||
...
|
...
|
||||||
@@ -288,7 +320,7 @@ class-level attribute named ``swagger_schema`` on the view class, or
|
|||||||
|
|
||||||
For example, to generate all operation IDs as camel case, you could do:
|
For example, to generate all operation IDs as camel case, you could do:
|
||||||
|
|
||||||
.. code:: python
|
.. code-block:: python
|
||||||
|
|
||||||
from inflection import camelize
|
from inflection import camelize
|
||||||
|
|
||||||
@@ -331,7 +363,7 @@ For customizing behavior related to specific field, serializer, filter or pagina
|
|||||||
A :class:`~.inspectors.FilterInspector` that adds a description to all ``DjangoFilterBackend`` parameters could be
|
A :class:`~.inspectors.FilterInspector` that adds a description to all ``DjangoFilterBackend`` parameters could be
|
||||||
implemented like so:
|
implemented like so:
|
||||||
|
|
||||||
.. code:: python
|
.. code-block:: python
|
||||||
|
|
||||||
class DjangoFilterDescriptionInspector(CoreAPICompatInspector):
|
class DjangoFilterDescriptionInspector(CoreAPICompatInspector):
|
||||||
def get_filter_parameters(self, filter_backend):
|
def get_filter_parameters(self, filter_backend):
|
||||||
@@ -357,7 +389,7 @@ implemented like so:
|
|||||||
A second example, of a :class:`~.inspectors.FieldInspector` that removes the ``title`` attribute from all generated
|
A second example, of a :class:`~.inspectors.FieldInspector` that removes the ``title`` attribute from all generated
|
||||||
:class:`.Schema` objects:
|
:class:`.Schema` objects:
|
||||||
|
|
||||||
.. code:: python
|
.. code-block:: python
|
||||||
|
|
||||||
class NoSchemaTitleInspector(FieldInspector):
|
class NoSchemaTitleInspector(FieldInspector):
|
||||||
def process_result(self, result, method_name, obj, **kwargs):
|
def process_result(self, result, method_name, obj, **kwargs):
|
||||||
@@ -398,3 +430,6 @@ A second example, of a :class:`~.inspectors.FieldInspector` that removes the ``t
|
|||||||
This means that you should generally avoid view or method-specific ``FieldInspector``\ s if you are dealing with
|
This means that you should generally avoid view or method-specific ``FieldInspector``\ s if you are dealing with
|
||||||
references (a.k.a named models), because you can never know which view will be the first to generate the schema
|
references (a.k.a named models), because you can never know which view will be the first to generate the schema
|
||||||
for a given serializer.
|
for a given serializer.
|
||||||
|
|
||||||
|
.. _SCRIPT_NAME: https://www.python.org/dev/peps/pep-0333/#environ-variables
|
||||||
|
.. _FORCE_SCRIPT_NAME: https://docs.djangoproject.com/en/2.0/ref/settings/#force-script-name
|
||||||
|
|||||||
+53
-1
@@ -2,6 +2,7 @@
|
|||||||
Serving the schema
|
Serving the schema
|
||||||
##################
|
##################
|
||||||
|
|
||||||
|
|
||||||
************************************************
|
************************************************
|
||||||
``get_schema_view`` and the ``SchemaView`` class
|
``get_schema_view`` and the ``SchemaView`` class
|
||||||
************************************************
|
************************************************
|
||||||
@@ -14,7 +15,7 @@ in the README for a usage example.
|
|||||||
|
|
||||||
You can also subclass :class:`.SchemaView` by extending the return value of :func:`.get_schema_view`, e.g.:
|
You can also subclass :class:`.SchemaView` by extending the return value of :func:`.get_schema_view`, e.g.:
|
||||||
|
|
||||||
.. code:: python
|
.. code-block:: python
|
||||||
|
|
||||||
SchemaView = get_schema_view(info, ...)
|
SchemaView = get_schema_view(info, ...)
|
||||||
|
|
||||||
@@ -33,3 +34,54 @@ codec and the view.
|
|||||||
|
|
||||||
You can use your custom renderer classes as kwargs to :meth:`.SchemaView.as_cached_view` or by subclassing
|
You can use your custom renderer classes as kwargs to :meth:`.SchemaView.as_cached_view` or by subclassing
|
||||||
:class:`.SchemaView`.
|
:class:`.SchemaView`.
|
||||||
|
|
||||||
|
.. _management-command:
|
||||||
|
|
||||||
|
******************
|
||||||
|
Management command
|
||||||
|
******************
|
||||||
|
|
||||||
|
.. versionadded:: 1.1.1
|
||||||
|
|
||||||
|
If you only need a swagger spec file in YAML or JSON format, you can use the ``generate_swagger`` management command
|
||||||
|
to get it without having to start the web server:
|
||||||
|
|
||||||
|
.. code-block:: console
|
||||||
|
|
||||||
|
$ python manage.py generate_swagger swagger.json
|
||||||
|
|
||||||
|
See the command help for more advanced options:
|
||||||
|
|
||||||
|
.. code-block:: console
|
||||||
|
|
||||||
|
$ python manage.py generate_swagger --help
|
||||||
|
usage: manage.py generate_swagger [-h] [--version] [-v {0,1,2,3}]
|
||||||
|
... more options ...
|
||||||
|
|
||||||
|
|
||||||
|
.. Note::
|
||||||
|
|
||||||
|
The :ref:`DEFAULT_INFO <default-swagger-settings>` setting must be defined when using the ``generate_swagger``
|
||||||
|
command. For example, the :ref:`README quickstart <readme-quickstart>` code could be modified as such:
|
||||||
|
|
||||||
|
In ``settings.py``:
|
||||||
|
|
||||||
|
.. code-block:: python
|
||||||
|
|
||||||
|
SWAGGER_SETTINGS = {
|
||||||
|
'DEFAULT_INFO': 'import.path.to.urls.api_info',
|
||||||
|
}
|
||||||
|
|
||||||
|
In ``urls.py``:
|
||||||
|
|
||||||
|
.. code-block:: python
|
||||||
|
|
||||||
|
api_info = openapi.Info(
|
||||||
|
title="Snippets API",
|
||||||
|
... other arguments ...
|
||||||
|
)
|
||||||
|
|
||||||
|
schema_view = get_schema_view(
|
||||||
|
# the info argument is no longer needed here as it will be picked up from DEFAULT_INFO
|
||||||
|
... other arguments ...
|
||||||
|
)
|
||||||
|
|||||||
+29
-2
@@ -15,7 +15,7 @@ Example:
|
|||||||
|
|
||||||
**settings.py**
|
**settings.py**
|
||||||
|
|
||||||
.. code:: python
|
.. code-block:: python
|
||||||
|
|
||||||
SWAGGER_SETTINGS = {
|
SWAGGER_SETTINGS = {
|
||||||
'SECURITY_DEFINITIONS': {
|
'SECURITY_DEFINITIONS': {
|
||||||
@@ -91,6 +91,30 @@ Paginator inspectors given to :func:`@swagger_auto_schema <.swagger_auto_schema>
|
|||||||
:class:`'drf_yasg.inspectors.CoreAPICompatInspector' <.inspectors.CoreAPICompatInspector>`, |br| \
|
:class:`'drf_yasg.inspectors.CoreAPICompatInspector' <.inspectors.CoreAPICompatInspector>`, |br| \
|
||||||
``]``
|
``]``
|
||||||
|
|
||||||
|
Swagger document attributes
|
||||||
|
===========================
|
||||||
|
|
||||||
|
.. _default-swagger-settings:
|
||||||
|
|
||||||
|
DEFAULT_INFO
|
||||||
|
------------
|
||||||
|
|
||||||
|
An import string to an :class:`.openapi.Info` object. This will be used when running the ``generate_swagger``
|
||||||
|
management command, or if no ``info`` argument is passed to ``get_schema_view``.
|
||||||
|
|
||||||
|
**Default**: :python:`None`
|
||||||
|
|
||||||
|
DEFAULT_API_URL
|
||||||
|
---------------
|
||||||
|
|
||||||
|
A string representing the default API URL. This will be used to populate the ``host`` and ``schemes`` attributes
|
||||||
|
of the Swagger document if no API URL is otherwise provided. The Django `FORCE_SCRIPT_NAME`_ setting can be used for
|
||||||
|
providing an API mount point prefix.
|
||||||
|
|
||||||
|
See also: :ref:`documentation on base URL construction <custom-spec-base-url>`
|
||||||
|
|
||||||
|
**Default**: :python:`None`
|
||||||
|
|
||||||
Authorization
|
Authorization
|
||||||
=============
|
=============
|
||||||
|
|
||||||
@@ -124,7 +148,7 @@ See https://github.com/OAI/OpenAPI-Specification/blob/master/versions/2.0.md#sec
|
|||||||
|
|
||||||
**Default**:
|
**Default**:
|
||||||
|
|
||||||
.. code:: python
|
.. code-block:: python
|
||||||
|
|
||||||
'basic': {
|
'basic': {
|
||||||
'type': 'basic'
|
'type': 'basic'
|
||||||
@@ -253,3 +277,6 @@ PATH_IN_MIDDLE
|
|||||||
|
|
||||||
**Default**: :python:`False` |br|
|
**Default**: :python:`False` |br|
|
||||||
*Maps to attribute*: ``path-in-middle-panel``
|
*Maps to attribute*: ``path-in-middle-panel``
|
||||||
|
|
||||||
|
|
||||||
|
.. _FORCE_SCRIPT_NAME: https://docs.djangoproject.com/en/2.0/ref/settings/#force-script-name
|
||||||
|
|||||||
Generated
+3
-3
@@ -312,9 +312,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"swagger-ui-dist": {
|
"swagger-ui-dist": {
|
||||||
"version": "3.8.0",
|
"version": "3.9.0",
|
||||||
"resolved": "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-3.8.0.tgz",
|
"resolved": "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-3.9.0.tgz",
|
||||||
"integrity": "sha1-BHfLOagE7a6Wx+COskDNWagEt3U="
|
"integrity": "sha1-eWXZZ6ds74tFWo0M2ROA/2Ss2RM="
|
||||||
},
|
},
|
||||||
"tiny-emitter": {
|
"tiny-emitter": {
|
||||||
"version": "2.0.2",
|
"version": "2.0.2",
|
||||||
|
|||||||
+1
-1
@@ -2,6 +2,6 @@
|
|||||||
"name": "drf-yasg",
|
"name": "drf-yasg",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"redoc": "^1.19.3",
|
"redoc": "^1.19.3",
|
||||||
"swagger-ui-dist": "^3.8.0"
|
"swagger-ui-dist": "^3.9.0"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,2 @@
|
|||||||
|
.[validation]
|
||||||
|
-r requirements/heroku.txt
|
||||||
@@ -4,3 +4,9 @@ openapi_codec>=1.3.2
|
|||||||
ruamel.yaml>=0.15.34
|
ruamel.yaml>=0.15.34
|
||||||
inflection>=0.3.1
|
inflection>=0.3.1
|
||||||
future>=0.16.0
|
future>=0.16.0
|
||||||
|
six>=1.11.0
|
||||||
|
uritemplate>=3.0.0
|
||||||
|
|
||||||
|
djangorestframework>=3.7.0
|
||||||
|
Django>=1.11.7,<2.0; python_version <= "2.7"
|
||||||
|
Django>=1.11.7; python_version >= "3.4"
|
||||||
|
|||||||
+3
-2
@@ -1,4 +1,5 @@
|
|||||||
# requirements for CI test suite
|
# requirements for the CI test runner
|
||||||
-r dev.txt
|
|
||||||
tox-travis>=0.10
|
tox-travis>=0.10
|
||||||
codecov>=2.0.9
|
codecov>=2.0.9
|
||||||
|
|
||||||
|
-r tox.txt
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
# requirements for local development
|
# requirements for local development to be installed via pip install -r requirements/dev.txt
|
||||||
tox>=2.9.1
|
-r tox.txt
|
||||||
tox-battery>=0.5
|
-r test.txt
|
||||||
|
-r lint.txt
|
||||||
|
|
||||||
# do not unpin this (see setup.py)
|
tox-battery>=0.5
|
||||||
setuptools_scm==1.15.6
|
|
||||||
|
|||||||
@@ -1,6 +1,8 @@
|
|||||||
Sphinx==1.6.5
|
# used by the 'docs' tox env for building the documentation
|
||||||
sphinx_rtd_theme==0.2.4
|
Sphinx>=1.6.5
|
||||||
Pillow==4.3.0
|
sphinx_rtd_theme>=0.2.4
|
||||||
readme_renderer==17.2
|
Pillow>=4.3.0
|
||||||
|
readme_renderer>=17.2
|
||||||
|
|
||||||
Django==2.0
|
Django>=2.0,<2.1
|
||||||
|
djangorestframework_camel_case>=0.2.0
|
||||||
|
|||||||
@@ -0,0 +1,5 @@
|
|||||||
|
# requirements necessary when deploying the test project to heroku
|
||||||
|
-r testproj.txt
|
||||||
|
psycopg2>=2.7.3
|
||||||
|
gunicorn>=19.7.1
|
||||||
|
whitenoise>=3.3.1
|
||||||
@@ -0,0 +1,4 @@
|
|||||||
|
# used by the 'lint' tox env for linting via flake8
|
||||||
|
isort>=4.2
|
||||||
|
flake8>=3.5.0
|
||||||
|
flake8-isort>=2.3
|
||||||
@@ -0,0 +1,4 @@
|
|||||||
|
# needed to build the package setup_requires in setup.py
|
||||||
|
|
||||||
|
# do not unpin this (see setup.py)
|
||||||
|
setuptools_scm==1.15.6
|
||||||
@@ -1,15 +1,10 @@
|
|||||||
# pytest runner + plugins
|
# requirements for running the tests via pytest
|
||||||
pytest>=2.9
|
pytest>=2.9
|
||||||
pytest-pythonpath>=0.7.1
|
pytest-pythonpath>=0.7.1
|
||||||
pytest-cov>=2.5.1
|
pytest-cov>=2.5.1
|
||||||
|
pytest-xdist>=1.22.0
|
||||||
# latest pip version of pytest-django is more than a year old and does not support Django 2.0
|
# latest pip version of pytest-django is more than a year old and does not support Django 2.0
|
||||||
git+https://github.com/pytest-dev/pytest-django.git@94cccb956435dd7a719606744ee7608397e1eafb
|
git+https://github.com/pytest-dev/pytest-django.git@94cccb956435dd7a719606744ee7608397e1eafb
|
||||||
datadiff==2.0.0
|
datadiff==2.0.0
|
||||||
|
|
||||||
# test project requirements
|
-r testproj.txt
|
||||||
Pillow>=4.3.0
|
|
||||||
pygments>=2.2.0
|
|
||||||
django-cors-headers>=2.1.0
|
|
||||||
django-filter>=1.1.0,<2.0; python_version == "2.7"
|
|
||||||
django-filter>=1.1.0; python_version >= "3.4"
|
|
||||||
djangorestframework-camel-case>=0.2.0
|
|
||||||
|
|||||||
@@ -0,0 +1,9 @@
|
|||||||
|
# test project requirements
|
||||||
|
Pillow>=4.3.0
|
||||||
|
pygments>=2.2.0
|
||||||
|
django-cors-headers>=2.1.0
|
||||||
|
django-filter>=1.1.0,<2.0; python_version == "2.7"
|
||||||
|
django-filter>=1.1.0; python_version >= "3.4"
|
||||||
|
djangorestframework-camel-case>=0.2.0
|
||||||
|
dj-database-url>=0.4.2
|
||||||
|
user_agents>=1.1.0
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
# requirements for building and running tox
|
||||||
|
tox>=2.9.1
|
||||||
|
detox>=0.11
|
||||||
|
|
||||||
|
-r setup.txt
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
python-3.6.4
|
||||||
@@ -1,13 +1,25 @@
|
|||||||
#!/usr/bin/env python
|
#!/usr/bin/env python
|
||||||
# -*- coding: utf-8 -*-
|
# -*- coding: utf-8 -*-
|
||||||
|
import distutils.core
|
||||||
import io
|
import io
|
||||||
import os
|
import os
|
||||||
|
import random
|
||||||
|
import string
|
||||||
import sys
|
import sys
|
||||||
from setuptools import setup, find_packages
|
from setuptools import find_packages, setup
|
||||||
import distutils.core
|
|
||||||
|
|
||||||
requirements_setup = ['setuptools_scm==1.15.6']
|
|
||||||
|
def read_req(req_file):
|
||||||
|
with open(os.path.join('requirements', req_file)) as req:
|
||||||
|
return [line.strip() for line in req.readlines() if line.strip() and not line.strip().startswith('#')]
|
||||||
|
|
||||||
|
|
||||||
|
with io.open('README.rst', encoding='utf-8') as readme:
|
||||||
|
description = readme.read()
|
||||||
|
|
||||||
|
requirements = read_req('base.txt')
|
||||||
|
requirements_setup = read_req('setup.txt')
|
||||||
|
requirements_validation = read_req('validation.txt')
|
||||||
|
|
||||||
|
|
||||||
def _install_setup_requires(attrs):
|
def _install_setup_requires(attrs):
|
||||||
@@ -22,14 +34,14 @@ def _install_setup_requires(attrs):
|
|||||||
dist.fetch_build_eggs(dist.setup_requires)
|
dist.fetch_build_eggs(dist.setup_requires)
|
||||||
|
|
||||||
|
|
||||||
if 'sdist' in sys.argv:
|
try:
|
||||||
try:
|
# try to install setuptools_scm before setuptools does it, otherwise our monkey patch below will come too early
|
||||||
# try to install setuptools_scm before setuptools does it, otherwise our monkey patch below will come too early
|
# (setuptools_scm adds find_files hooks into setuptools on install)
|
||||||
# (setuptools_scm adds find_files hooks into setuptools on install)
|
_install_setup_requires({'setup_requires': requirements_setup})
|
||||||
_install_setup_requires({'setup_requires': requirements_setup})
|
except Exception:
|
||||||
except Exception:
|
pass
|
||||||
pass
|
|
||||||
|
|
||||||
|
if 'sdist' in sys.argv:
|
||||||
try:
|
try:
|
||||||
# see https://github.com/pypa/setuptools_scm/issues/190, setuptools_scm includes ALL versioned files from
|
# see https://github.com/pypa/setuptools_scm/issues/190, setuptools_scm includes ALL versioned files from
|
||||||
# the git repo into the sdist by default, and there is no easy way to provide an opt-out;
|
# the git repo into the sdist by default, and there is no easy way to provide an opt-out;
|
||||||
@@ -41,21 +53,22 @@ if 'sdist' in sys.argv:
|
|||||||
except ImportError:
|
except ImportError:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
try:
|
||||||
|
# this is a workaround for being able to install the package from source without working from a git checkout
|
||||||
|
# it is needed for building succesfully on Heroku
|
||||||
|
from setuptools_scm import get_version
|
||||||
|
|
||||||
def read_req(req_file):
|
version = get_version()
|
||||||
with open(os.path.join('requirements', req_file)) as req:
|
version_kwargs = {'use_scm_version': True}
|
||||||
return [line for line in req.readlines() if line and not line.isspace()]
|
except LookupError:
|
||||||
|
if 'sdist' in sys.argv or 'bdist_wheel' in sys.argv:
|
||||||
|
raise
|
||||||
|
|
||||||
|
rnd = ''.join(random.choice(string.ascii_lowercase + string.digits) for _ in range(16))
|
||||||
with io.open('README.rst', encoding='utf-8') as readme:
|
version_kwargs = {'version': '0.0.0.dummy+' + rnd}
|
||||||
description = readme.read()
|
|
||||||
|
|
||||||
requirements = ['djangorestframework>=3.7.0'] + read_req('base.txt')
|
|
||||||
requirements_validation = read_req('validation.txt')
|
|
||||||
|
|
||||||
setup(
|
setup(
|
||||||
name='drf-yasg',
|
name='drf-yasg',
|
||||||
use_scm_version=True,
|
|
||||||
packages=find_packages('src'),
|
packages=find_packages('src'),
|
||||||
package_dir={'': 'src'},
|
package_dir={'': 'src'},
|
||||||
include_package_data=True,
|
include_package_data=True,
|
||||||
@@ -72,6 +85,7 @@ setup(
|
|||||||
author_email='cristi@cvjd.me',
|
author_email='cristi@cvjd.me',
|
||||||
keywords='drf django django-rest-framework schema swagger openapi codegen swagger-codegen '
|
keywords='drf django django-rest-framework schema swagger openapi codegen swagger-codegen '
|
||||||
'documentation drf-yasg django-rest-swagger drf-openapi',
|
'documentation drf-yasg django-rest-swagger drf-openapi',
|
||||||
|
python_requires=">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*",
|
||||||
classifiers=[
|
classifiers=[
|
||||||
'Intended Audience :: Developers',
|
'Intended Audience :: Developers',
|
||||||
'License :: OSI Approved :: BSD License',
|
'License :: OSI Approved :: BSD License',
|
||||||
@@ -91,4 +105,5 @@ setup(
|
|||||||
'Topic :: Documentation',
|
'Topic :: Documentation',
|
||||||
'Topic :: Software Development :: Code Generators',
|
'Topic :: Software Development :: Code Generators',
|
||||||
],
|
],
|
||||||
|
**version_kwargs
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
# coding=utf-8
|
# coding=utf-8
|
||||||
from pkg_resources import get_distribution, DistributionNotFound
|
from pkg_resources import DistributionNotFound, get_distribution
|
||||||
|
|
||||||
__author__ = """Cristi V."""
|
__author__ = """Cristi V."""
|
||||||
__email__ = 'cristi@cvjd.me'
|
__email__ = 'cristi@cvjd.me'
|
||||||
|
|||||||
@@ -22,6 +22,9 @@ SWAGGER_DEFAULTS = {
|
|||||||
'drf_yasg.inspectors.CoreAPICompatInspector',
|
'drf_yasg.inspectors.CoreAPICompatInspector',
|
||||||
],
|
],
|
||||||
|
|
||||||
|
'DEFAULT_INFO': None,
|
||||||
|
'DEFAULT_API_URL': None,
|
||||||
|
|
||||||
'USE_SESSION_AUTH': True,
|
'USE_SESSION_AUTH': True,
|
||||||
'SECURITY_DEFINITIONS': {
|
'SECURITY_DEFINITIONS': {
|
||||||
'basic': {
|
'basic': {
|
||||||
@@ -53,6 +56,7 @@ IMPORT_STRINGS = [
|
|||||||
'DEFAULT_FIELD_INSPECTORS',
|
'DEFAULT_FIELD_INSPECTORS',
|
||||||
'DEFAULT_FILTER_INSPECTORS',
|
'DEFAULT_FILTER_INSPECTORS',
|
||||||
'DEFAULT_PAGINATOR_INSPECTORS',
|
'DEFAULT_PAGINATOR_INSPECTORS',
|
||||||
|
'DEFAULT_INFO',
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
+16
-8
@@ -1,9 +1,10 @@
|
|||||||
|
from future.utils import raise_from
|
||||||
|
|
||||||
import copy
|
import copy
|
||||||
import json
|
import json
|
||||||
from collections import OrderedDict
|
from collections import OrderedDict
|
||||||
|
|
||||||
from coreapi.compat import force_bytes
|
from coreapi.compat import force_bytes
|
||||||
from future.utils import raise_from
|
|
||||||
from ruamel import yaml
|
from ruamel import yaml
|
||||||
|
|
||||||
from . import openapi
|
from . import openapi
|
||||||
@@ -11,22 +12,22 @@ from .app_settings import swagger_settings
|
|||||||
from .errors import SwaggerValidationError
|
from .errors import SwaggerValidationError
|
||||||
|
|
||||||
|
|
||||||
def _validate_flex(spec, codec):
|
def _validate_flex(spec):
|
||||||
from flex.core import parse as validate_flex
|
from flex.core import parse as validate_flex
|
||||||
from flex.exceptions import ValidationError
|
from flex.exceptions import ValidationError
|
||||||
try:
|
try:
|
||||||
validate_flex(spec)
|
validate_flex(spec)
|
||||||
except ValidationError as ex:
|
except ValidationError as ex:
|
||||||
raise_from(SwaggerValidationError(str(ex), 'flex', spec, codec), ex)
|
raise_from(SwaggerValidationError(str(ex)), ex)
|
||||||
|
|
||||||
|
|
||||||
def _validate_swagger_spec_validator(spec, codec):
|
def _validate_swagger_spec_validator(spec):
|
||||||
from swagger_spec_validator.validator20 import validate_spec as validate_ssv
|
from swagger_spec_validator.validator20 import validate_spec as validate_ssv
|
||||||
from swagger_spec_validator.common import SwaggerValidationError as SSVErr
|
from swagger_spec_validator.common import SwaggerValidationError as SSVErr
|
||||||
try:
|
try:
|
||||||
validate_ssv(spec)
|
validate_ssv(spec)
|
||||||
except SSVErr as ex:
|
except SSVErr as ex:
|
||||||
raise_from(SwaggerValidationError(str(ex), 'swagger_spec_validator', spec, codec), ex)
|
raise_from(SwaggerValidationError(str(ex)), ex)
|
||||||
|
|
||||||
|
|
||||||
#:
|
#:
|
||||||
@@ -60,10 +61,17 @@ class _OpenAPICodec(object):
|
|||||||
raise TypeError('Expected a `openapi.Swagger` instance')
|
raise TypeError('Expected a `openapi.Swagger` instance')
|
||||||
|
|
||||||
spec = self.generate_swagger_object(document)
|
spec = self.generate_swagger_object(document)
|
||||||
|
errors = {}
|
||||||
for validator in self.validators:
|
for validator in self.validators:
|
||||||
# validate a deepcopy of the spec to prevent the validator from messing with it
|
try:
|
||||||
# for example, swagger_spec_validator adds an x-scope property to all references
|
# validate a deepcopy of the spec to prevent the validator from messing with it
|
||||||
VALIDATORS[validator](copy.deepcopy(spec), self)
|
# for example, swagger_spec_validator adds an x-scope property to all references
|
||||||
|
VALIDATORS[validator](copy.deepcopy(spec))
|
||||||
|
except SwaggerValidationError as e:
|
||||||
|
errors[validator] = str(e)
|
||||||
|
|
||||||
|
if errors:
|
||||||
|
raise SwaggerValidationError("spec validation failed", errors, spec, self)
|
||||||
return force_bytes(self._dump_dict(spec))
|
return force_bytes(self._dump_dict(spec))
|
||||||
|
|
||||||
def encode_error(self, err):
|
def encode_error(self, err):
|
||||||
|
|||||||
@@ -3,9 +3,9 @@ class SwaggerError(Exception):
|
|||||||
|
|
||||||
|
|
||||||
class SwaggerValidationError(SwaggerError):
|
class SwaggerValidationError(SwaggerError):
|
||||||
def __init__(self, msg, validator_name, spec, source_codec, *args):
|
def __init__(self, msg, errors=None, spec=None, source_codec=None, *args):
|
||||||
super(SwaggerValidationError, self).__init__(msg, *args)
|
super(SwaggerValidationError, self).__init__(msg, *args)
|
||||||
self.validator_name = validator_name
|
self.errors = errors
|
||||||
self.spec = spec
|
self.spec = spec
|
||||||
self.source_codec = source_codec
|
self.source_codec = source_codec
|
||||||
|
|
||||||
|
|||||||
+124
-43
@@ -1,24 +1,107 @@
|
|||||||
|
import logging
|
||||||
import re
|
import re
|
||||||
from collections import defaultdict, OrderedDict
|
from collections import OrderedDict, defaultdict
|
||||||
|
|
||||||
import uritemplate
|
import uritemplate
|
||||||
|
from coreapi.compat import urlparse
|
||||||
from django.utils.encoding import force_text
|
from django.utils.encoding import force_text
|
||||||
from rest_framework import versioning
|
from rest_framework import versioning
|
||||||
from rest_framework.schemas.generators import SchemaGenerator, EndpointEnumerator as _EndpointEnumerator
|
from rest_framework.compat import URLPattern, URLResolver, get_original_route
|
||||||
|
from rest_framework.schemas.generators import EndpointEnumerator as _EndpointEnumerator
|
||||||
|
from rest_framework.schemas.generators import SchemaGenerator, endpoint_ordering
|
||||||
from rest_framework.schemas.inspectors import get_pk_description
|
from rest_framework.schemas.inspectors import get_pk_description
|
||||||
|
|
||||||
|
from drf_yasg.errors import SwaggerGenerationError
|
||||||
|
|
||||||
from . import openapi
|
from . import openapi
|
||||||
from .app_settings import swagger_settings
|
from .app_settings import swagger_settings
|
||||||
from .inspectors.field import get_queryset_field, get_basic_type_info
|
from .inspectors.field import get_basic_type_info, get_queryset_field
|
||||||
from .openapi import ReferenceResolver
|
from .openapi import ReferenceResolver
|
||||||
|
|
||||||
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
PATH_PARAMETER_RE = re.compile(r'{(?P<parameter>\w+)}')
|
PATH_PARAMETER_RE = re.compile(r'{(?P<parameter>\w+)}')
|
||||||
|
|
||||||
|
|
||||||
class EndpointEnumerator(_EndpointEnumerator):
|
class EndpointEnumerator(_EndpointEnumerator):
|
||||||
|
def __init__(self, patterns=None, urlconf=None, request=None):
|
||||||
|
super(EndpointEnumerator, self).__init__(patterns, urlconf)
|
||||||
|
self.request = request
|
||||||
|
|
||||||
def get_path_from_regex(self, path_regex):
|
def get_path_from_regex(self, path_regex):
|
||||||
|
if path_regex.endswith(')'):
|
||||||
|
logger.warning("url pattern does not end in $ ('%s') - unexpected things might happen")
|
||||||
return self.unescape_path(super(EndpointEnumerator, self).get_path_from_regex(path_regex))
|
return self.unescape_path(super(EndpointEnumerator, self).get_path_from_regex(path_regex))
|
||||||
|
|
||||||
|
def should_include_endpoint(self, path, callback, app_name='', namespace='', url_name=None):
|
||||||
|
if not super(EndpointEnumerator, self).should_include_endpoint(path, callback):
|
||||||
|
return False
|
||||||
|
|
||||||
|
version = getattr(self.request, 'version', None)
|
||||||
|
versioning_class = getattr(callback.cls, 'versioning_class', None)
|
||||||
|
if versioning_class is not None and issubclass(versioning_class, versioning.NamespaceVersioning):
|
||||||
|
if version and version not in namespace.split(':'):
|
||||||
|
return False
|
||||||
|
|
||||||
|
return True
|
||||||
|
|
||||||
|
def replace_version(self, path, callback):
|
||||||
|
"""If ``request.version`` is not ``None`` and `callback` uses ``URLPathVersioning``, this function replaces
|
||||||
|
the ``version`` parameter in `path` with the actual version.
|
||||||
|
|
||||||
|
:param str path: the templated path
|
||||||
|
:param callback: the view callback
|
||||||
|
:rtype: str
|
||||||
|
"""
|
||||||
|
versioning_class = getattr(callback.cls, 'versioning_class', None)
|
||||||
|
if versioning_class is not None and issubclass(versioning_class, versioning.URLPathVersioning):
|
||||||
|
version = getattr(self.request, 'version', None)
|
||||||
|
if version:
|
||||||
|
version_param = getattr(versioning_class, 'version_param', 'version')
|
||||||
|
version_param = '{%s}' % version_param
|
||||||
|
if version_param not in path:
|
||||||
|
logger.info("view %s uses URLPathVersioning but URL %s has no param %s"
|
||||||
|
% (callback.cls, path, version_param))
|
||||||
|
path = path.replace(version_param, version)
|
||||||
|
|
||||||
|
return path
|
||||||
|
|
||||||
|
def get_api_endpoints(self, patterns=None, prefix='', app_name=None, namespace=None):
|
||||||
|
"""
|
||||||
|
Return a list of all available API endpoints by inspecting the URL conf.
|
||||||
|
|
||||||
|
Copied entirely from super.
|
||||||
|
"""
|
||||||
|
if patterns is None:
|
||||||
|
patterns = self.patterns
|
||||||
|
|
||||||
|
api_endpoints = []
|
||||||
|
|
||||||
|
for pattern in patterns:
|
||||||
|
path_regex = prefix + get_original_route(pattern)
|
||||||
|
if isinstance(pattern, URLPattern):
|
||||||
|
path = self.get_path_from_regex(path_regex)
|
||||||
|
callback = pattern.callback
|
||||||
|
url_name = pattern.name
|
||||||
|
if self.should_include_endpoint(path, callback, app_name or '', namespace or '', url_name):
|
||||||
|
path = self.replace_version(path, callback)
|
||||||
|
for method in self.get_allowed_methods(callback):
|
||||||
|
endpoint = (path, method, callback)
|
||||||
|
api_endpoints.append(endpoint)
|
||||||
|
|
||||||
|
elif isinstance(pattern, URLResolver):
|
||||||
|
nested_endpoints = self.get_api_endpoints(
|
||||||
|
patterns=pattern.url_patterns,
|
||||||
|
prefix=path_regex,
|
||||||
|
app_name="%s:%s" % (app_name, pattern.app_name) if app_name else pattern.app_name,
|
||||||
|
namespace="%s:%s" % (namespace, pattern.namespace) if namespace else pattern.namespace
|
||||||
|
)
|
||||||
|
api_endpoints.extend(nested_endpoints)
|
||||||
|
|
||||||
|
api_endpoints = sorted(api_endpoints, key=endpoint_ordering)
|
||||||
|
|
||||||
|
return api_endpoints
|
||||||
|
|
||||||
def unescape(self, s):
|
def unescape(self, s):
|
||||||
"""Unescape all backslash escapes from `s`.
|
"""Unescape all backslash escapes from `s`.
|
||||||
|
|
||||||
@@ -29,8 +112,8 @@ class EndpointEnumerator(_EndpointEnumerator):
|
|||||||
return re.sub(r'\\(.)', r'\1', s)
|
return re.sub(r'\\(.)', r'\1', s)
|
||||||
|
|
||||||
def unescape_path(self, path):
|
def unescape_path(self, path):
|
||||||
"""Remove backslashes from all path components outside {parameters}. This is needed because
|
"""Remove backslashe escapes from all path components outside {parameters}. This is needed because
|
||||||
Django>=2.0 ``path()``/``RoutePattern`` aggresively escapes all non-parameter path components.
|
``simplify_regex`` does not handle this correctly - note however that this implementation is
|
||||||
|
|
||||||
**NOTE:** this might destructively affect some url regex patterns that contain metacharacters (e.g. \w, \d)
|
**NOTE:** this might destructively affect some url regex patterns that contain metacharacters (e.g. \w, \d)
|
||||||
outside path parameter groups; if you are in this category, God help you
|
outside path parameter groups; if you are in this category, God help you
|
||||||
@@ -59,12 +142,19 @@ class OpenAPISchemaGenerator(object):
|
|||||||
"""
|
"""
|
||||||
endpoint_enumerator_class = EndpointEnumerator
|
endpoint_enumerator_class = EndpointEnumerator
|
||||||
|
|
||||||
def __init__(self, info, version, url=None, patterns=None, urlconf=None):
|
def __init__(self, info, version='', url=None, patterns=None, urlconf=None):
|
||||||
"""
|
"""
|
||||||
|
|
||||||
:param .Info info: information about the API
|
:param .Info info: information about the API
|
||||||
:param str version: API version string, takes preedence over the version in `info`
|
:param str version: API version string; if omitted, `info.default_version` will be used
|
||||||
:param str url: API
|
:param str url: API scheme, host and port; if ``None`` is passed and ``DEFAULT_API_URL`` is not set, the url
|
||||||
|
will be inferred from the request made against the schema view, so you should generally not need to set
|
||||||
|
this parameter explicitly; if the empty string is passed, no host and scheme will be emitted
|
||||||
|
|
||||||
|
If `url` is not ``None`` or the empty string, it must be a scheme-absolute uri (i.e. starting with http://
|
||||||
|
or https://), and any path component is ignored;
|
||||||
|
|
||||||
|
See also: :ref:`documentation on base URL construction <custom-spec-base-url>`
|
||||||
:param patterns: if given, only these patterns will be enumerated for inclusion in the API spec
|
:param patterns: if given, only these patterns will be enumerated for inclusion in the API spec
|
||||||
:param urlconf: if patterns is not given, use this urlconf to enumerate patterns;
|
:param urlconf: if patterns is not given, use this urlconf to enumerate patterns;
|
||||||
if not given, the default urlconf is used
|
if not given, the default urlconf is used
|
||||||
@@ -72,6 +162,15 @@ class OpenAPISchemaGenerator(object):
|
|||||||
self._gen = SchemaGenerator(info.title, url, info.get('description', ''), patterns, urlconf)
|
self._gen = SchemaGenerator(info.title, url, info.get('description', ''), patterns, urlconf)
|
||||||
self.info = info
|
self.info = info
|
||||||
self.version = version
|
self.version = version
|
||||||
|
if url is None and swagger_settings.DEFAULT_API_URL is not None:
|
||||||
|
url = swagger_settings.DEFAULT_API_URL
|
||||||
|
|
||||||
|
if url:
|
||||||
|
parsed_url = urlparse.urlparse(url)
|
||||||
|
if parsed_url.scheme not in ('http', 'https') or not parsed_url.netloc:
|
||||||
|
raise SwaggerGenerationError("`url` must be an absolute HTTP(S) url")
|
||||||
|
if parsed_url.path:
|
||||||
|
logger.warning("path component of api base URL %s is ignored; use FORCE_SCRIPT_NAME instead" % url)
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def url(self):
|
def url(self):
|
||||||
@@ -88,17 +187,16 @@ class OpenAPISchemaGenerator(object):
|
|||||||
:rtype: openapi.Swagger
|
:rtype: openapi.Swagger
|
||||||
"""
|
"""
|
||||||
endpoints = self.get_endpoints(request)
|
endpoints = self.get_endpoints(request)
|
||||||
endpoints = self.replace_version(endpoints, request)
|
|
||||||
components = ReferenceResolver(openapi.SCHEMA_DEFINITIONS)
|
components = ReferenceResolver(openapi.SCHEMA_DEFINITIONS)
|
||||||
paths = self.get_paths(endpoints, components, request, public)
|
paths, prefix = self.get_paths(endpoints, components, request, public)
|
||||||
|
|
||||||
url = self.url
|
url = self.url
|
||||||
if not url and request is not None:
|
if url is None and request is not None:
|
||||||
url = request.build_absolute_uri()
|
url = request.build_absolute_uri()
|
||||||
|
|
||||||
return openapi.Swagger(
|
return openapi.Swagger(
|
||||||
info=self.info, paths=paths,
|
info=self.info, paths=paths,
|
||||||
_url=url, _version=self.version, **dict(components)
|
_url=url, _prefix=prefix, _version=self.version, **dict(components)
|
||||||
)
|
)
|
||||||
|
|
||||||
def create_view(self, callback, method, request=None):
|
def create_view(self, callback, method, request=None):
|
||||||
@@ -119,30 +217,6 @@ class OpenAPISchemaGenerator(object):
|
|||||||
setattr(view_method.__func__, '_swagger_auto_schema', overrides)
|
setattr(view_method.__func__, '_swagger_auto_schema', overrides)
|
||||||
return view
|
return view
|
||||||
|
|
||||||
def replace_version(self, endpoints, request):
|
|
||||||
"""If ``request.version`` is not ``None``, replace the version parameter in the path of any endpoints using
|
|
||||||
``URLPathVersioning`` as a versioning class.
|
|
||||||
|
|
||||||
:param dict endpoints: endpoints as returned by :meth:`.get_endpoints`
|
|
||||||
:param Request request: the request made against the schema view
|
|
||||||
:return: endpoints with modified paths
|
|
||||||
"""
|
|
||||||
version = getattr(request, 'version', None)
|
|
||||||
if version is None:
|
|
||||||
return endpoints
|
|
||||||
|
|
||||||
new_endpoints = {}
|
|
||||||
for path, endpoint in endpoints.items():
|
|
||||||
view_cls = endpoint[0]
|
|
||||||
versioning_class = getattr(view_cls, 'versioning_class', None)
|
|
||||||
version_param = getattr(versioning_class, 'version_param', 'version')
|
|
||||||
if versioning_class is not None and issubclass(versioning_class, versioning.URLPathVersioning):
|
|
||||||
path = path.replace('{%s}' % version_param, version)
|
|
||||||
|
|
||||||
new_endpoints[path] = endpoint
|
|
||||||
|
|
||||||
return new_endpoints
|
|
||||||
|
|
||||||
def get_endpoints(self, request):
|
def get_endpoints(self, request):
|
||||||
"""Iterate over all the registered endpoints in the API and return a fake view with the right parameters.
|
"""Iterate over all the registered endpoints in the API and return a fake view with the right parameters.
|
||||||
|
|
||||||
@@ -150,7 +224,7 @@ class OpenAPISchemaGenerator(object):
|
|||||||
:return: {path: (view_class, list[(http_method, view_instance)])
|
:return: {path: (view_class, list[(http_method, view_instance)])
|
||||||
:rtype: dict
|
:rtype: dict
|
||||||
"""
|
"""
|
||||||
enumerator = self.endpoint_enumerator_class(self._gen.patterns, self._gen.urlconf)
|
enumerator = self.endpoint_enumerator_class(self._gen.patterns, self._gen.urlconf, request=request)
|
||||||
endpoints = enumerator.get_api_endpoints()
|
endpoints = enumerator.get_api_endpoints()
|
||||||
|
|
||||||
view_paths = defaultdict(list)
|
view_paths = defaultdict(list)
|
||||||
@@ -206,14 +280,16 @@ class OpenAPISchemaGenerator(object):
|
|||||||
:param ReferenceResolver components: resolver/container for Swagger References
|
:param ReferenceResolver components: resolver/container for Swagger References
|
||||||
:param Request request: the request made against the schema view; can be None
|
:param Request request: the request made against the schema view; can be None
|
||||||
:param bool public: if True, all endpoints are included regardless of access through `request`
|
:param bool public: if True, all endpoints are included regardless of access through `request`
|
||||||
:rtype: openapi.Paths
|
:returns: the :class:`.Paths` object and the longest common path prefix, as a 2-tuple
|
||||||
|
:rtype: tuple[openapi.Paths,str]
|
||||||
"""
|
"""
|
||||||
if not endpoints:
|
if not endpoints:
|
||||||
return openapi.Paths(paths={})
|
return openapi.Paths(paths={}), ''
|
||||||
|
|
||||||
|
prefix = self.determine_path_prefix(list(endpoints.keys())) or ''
|
||||||
|
assert '{' not in prefix, "base path cannot be templated in swagger 2.0"
|
||||||
|
|
||||||
prefix = self.determine_path_prefix(list(endpoints.keys()))
|
|
||||||
paths = OrderedDict()
|
paths = OrderedDict()
|
||||||
|
|
||||||
for path, (view_cls, methods) in sorted(endpoints.items()):
|
for path, (view_cls, methods) in sorted(endpoints.items()):
|
||||||
operations = {}
|
operations = {}
|
||||||
for method, view in methods:
|
for method, view in methods:
|
||||||
@@ -223,9 +299,14 @@ class OpenAPISchemaGenerator(object):
|
|||||||
operations[method.lower()] = self.get_operation(view, path, prefix, method, components, request)
|
operations[method.lower()] = self.get_operation(view, path, prefix, method, components, request)
|
||||||
|
|
||||||
if operations:
|
if operations:
|
||||||
paths[path] = self.get_path_item(path, view_cls, operations)
|
# since the common prefix is used as the API basePath, it must be stripped
|
||||||
|
# from individual paths when writing them into the swagger document
|
||||||
|
path_suffix = path[len(prefix):]
|
||||||
|
if not path_suffix.startswith('/'):
|
||||||
|
path_suffix = '/' + path_suffix
|
||||||
|
paths[path_suffix] = self.get_path_item(path, view_cls, operations)
|
||||||
|
|
||||||
return openapi.Paths(paths=paths)
|
return openapi.Paths(paths=paths), prefix
|
||||||
|
|
||||||
def get_operation(self, view, path, prefix, method, components, request):
|
def get_operation(self, view, path, prefix, method, components, request):
|
||||||
"""Get an :class:`.Operation` for the given API endpoint (path, method). This method delegates to
|
"""Get an :class:`.Operation` for the given API endpoint (path, method). This method delegates to
|
||||||
|
|||||||
@@ -1,17 +1,13 @@
|
|||||||
|
from ..app_settings import swagger_settings
|
||||||
from .base import (
|
from .base import (
|
||||||
BaseInspector, ViewInspector, FilterInspector, PaginatorInspector,
|
BaseInspector, FieldInspector, FilterInspector, NotHandled, PaginatorInspector, SerializerInspector, ViewInspector
|
||||||
FieldInspector, SerializerInspector, NotHandled
|
|
||||||
)
|
)
|
||||||
from .field import (
|
from .field import (
|
||||||
InlineSerializerInspector, ReferencingSerializerInspector, RelatedFieldInspector, SimpleFieldInspector,
|
CamelCaseJSONFilter, ChoiceFieldInspector, DictFieldInspector, FileFieldInspector, InlineSerializerInspector,
|
||||||
FileFieldInspector, ChoiceFieldInspector, DictFieldInspector, StringDefaultFieldInspector,
|
ReferencingSerializerInspector, RelatedFieldInspector, SimpleFieldInspector, StringDefaultFieldInspector
|
||||||
CamelCaseJSONFilter
|
|
||||||
)
|
|
||||||
from .query import (
|
|
||||||
CoreAPICompatInspector, DjangoRestResponsePagination
|
|
||||||
)
|
)
|
||||||
|
from .query import CoreAPICompatInspector, DjangoRestResponsePagination
|
||||||
from .view import SwaggerAutoSchema
|
from .view import SwaggerAutoSchema
|
||||||
from ..app_settings import swagger_settings
|
|
||||||
|
|
||||||
# these settings must be accesed only after definig/importing all the classes in this module to avoid ImportErrors
|
# these settings must be accesed only after definig/importing all the classes in this module to avoid ImportErrors
|
||||||
ViewInspector.field_inspectors = swagger_settings.DEFAULT_FIELD_INSPECTORS
|
ViewInspector.field_inspectors = swagger_settings.DEFAULT_FIELD_INSPECTORS
|
||||||
|
|||||||
@@ -3,8 +3,7 @@ import logging
|
|||||||
|
|
||||||
from django.utils.encoding import force_text
|
from django.utils.encoding import force_text
|
||||||
from rest_framework import serializers
|
from rest_framework import serializers
|
||||||
from rest_framework.utils import json, encoders
|
from rest_framework.utils import encoders, json
|
||||||
from rest_framework.viewsets import GenericViewSet
|
|
||||||
|
|
||||||
from .. import openapi
|
from .. import openapi
|
||||||
from ..utils import is_list_view
|
from ..utils import is_list_view
|
||||||
@@ -182,7 +181,7 @@ class FieldInspector(BaseInspector):
|
|||||||
|
|
||||||
- arguments specified by the ``kwargs`` parameter of :meth:`._get_partial_types`
|
- arguments specified by the ``kwargs`` parameter of :meth:`._get_partial_types`
|
||||||
- ``instance_kwargs`` passed to the constructor function
|
- ``instance_kwargs`` passed to the constructor function
|
||||||
- ``title``, ``description``, ``required``, ``default`` and ``read_only`` inferred from the field,
|
- ``title``, ``description``, ``required`` and ``default`` inferred from the field,
|
||||||
where appropriate
|
where appropriate
|
||||||
|
|
||||||
If ``existing_object`` is not ``None``, it is updated instead of creating a new object.
|
If ``existing_object`` is not ``None``, it is updated instead of creating a new object.
|
||||||
@@ -233,11 +232,6 @@ class FieldInspector(BaseInspector):
|
|||||||
if default is not None:
|
if default is not None:
|
||||||
instance_kwargs['default'] = default
|
instance_kwargs['default'] = default
|
||||||
|
|
||||||
if 'read_only' not in instance_kwargs and swagger_object_type == openapi.Schema:
|
|
||||||
# TODO: read_only is only relevant for schema `properties` - should not be generated in other cases
|
|
||||||
if field.read_only:
|
|
||||||
instance_kwargs['read_only'] = True
|
|
||||||
|
|
||||||
instance_kwargs.setdefault('title', title)
|
instance_kwargs.setdefault('title', title)
|
||||||
instance_kwargs.setdefault('description', description)
|
instance_kwargs.setdefault('description', description)
|
||||||
instance_kwargs.update(kwargs)
|
instance_kwargs.update(kwargs)
|
||||||
@@ -327,9 +321,6 @@ class ViewInspector(BaseInspector):
|
|||||||
if self.method.lower() not in ["get", "delete"]:
|
if self.method.lower() not in ["get", "delete"]:
|
||||||
return False
|
return False
|
||||||
|
|
||||||
if not isinstance(self.view, GenericViewSet):
|
|
||||||
return True
|
|
||||||
|
|
||||||
return is_list_view(self.path, self.method, self.view)
|
return is_list_view(self.path, self.method, self.view)
|
||||||
|
|
||||||
def get_filter_parameters(self):
|
def get_filter_parameters(self):
|
||||||
@@ -351,10 +342,7 @@ class ViewInspector(BaseInspector):
|
|||||||
|
|
||||||
:rtype: bool
|
:rtype: bool
|
||||||
"""
|
"""
|
||||||
if not hasattr(self.view, 'paginator'):
|
if not getattr(self.view, 'paginator', None):
|
||||||
return False
|
|
||||||
|
|
||||||
if self.view.paginator is None:
|
|
||||||
return False
|
return False
|
||||||
|
|
||||||
if self.method.lower() != 'get':
|
if self.method.lower() != 'get':
|
||||||
|
|||||||
@@ -6,10 +6,10 @@ from django.db import models
|
|||||||
from rest_framework import serializers
|
from rest_framework import serializers
|
||||||
from rest_framework.settings import api_settings as rest_framework_settings
|
from rest_framework.settings import api_settings as rest_framework_settings
|
||||||
|
|
||||||
from .base import NotHandled, SerializerInspector, FieldInspector
|
|
||||||
from .. import openapi
|
from .. import openapi
|
||||||
from ..errors import SwaggerGenerationError
|
from ..errors import SwaggerGenerationError
|
||||||
from ..utils import filter_none
|
from ..utils import filter_none
|
||||||
|
from .base import FieldInspector, NotHandled, SerializerInspector
|
||||||
|
|
||||||
|
|
||||||
class InlineSerializerInspector(SerializerInspector):
|
class InlineSerializerInspector(SerializerInspector):
|
||||||
@@ -63,11 +63,18 @@ class InlineSerializerInspector(SerializerInspector):
|
|||||||
def make_schema_definition():
|
def make_schema_definition():
|
||||||
properties = OrderedDict()
|
properties = OrderedDict()
|
||||||
required = []
|
required = []
|
||||||
for key, value in serializer.fields.items():
|
for property_name, child in serializer.fields.items():
|
||||||
key = self.get_property_name(key)
|
property_name = self.get_property_name(property_name)
|
||||||
properties[key] = self.probe_field_inspectors(value, ChildSwaggerType, use_references)
|
prop_kwargs = {
|
||||||
if value.required:
|
'read_only': child.read_only or None
|
||||||
required.append(key)
|
}
|
||||||
|
prop_kwargs = filter_none(prop_kwargs)
|
||||||
|
|
||||||
|
properties[property_name] = self.probe_field_inspectors(
|
||||||
|
child, ChildSwaggerType, use_references, **prop_kwargs
|
||||||
|
)
|
||||||
|
if child.required:
|
||||||
|
required.append(property_name)
|
||||||
|
|
||||||
return SwaggerType(
|
return SwaggerType(
|
||||||
type=openapi.TYPE_OBJECT,
|
type=openapi.TYPE_OBJECT,
|
||||||
@@ -211,7 +218,14 @@ def find_regex(regex_field):
|
|||||||
regex_validator = validator
|
regex_validator = validator
|
||||||
|
|
||||||
# regex_validator.regex should be a compiled re object...
|
# regex_validator.regex should be a compiled re object...
|
||||||
return getattr(getattr(regex_validator, 'regex', None), 'pattern', None)
|
pattern = getattr(getattr(regex_validator, 'regex', None), 'pattern', None)
|
||||||
|
if pattern:
|
||||||
|
# attempt some basic cleanup to remove regex constructs not supported by JavaScript
|
||||||
|
# -- swagger uses javascript-style regexes - see https://github.com/swagger-api/swagger-editor/issues/1601
|
||||||
|
if pattern.endswith('\\Z') or pattern.endswith('\\z'):
|
||||||
|
pattern = pattern[:-2] + '$'
|
||||||
|
|
||||||
|
return pattern
|
||||||
|
|
||||||
|
|
||||||
numeric_fields = (serializers.IntegerField, serializers.FloatField, serializers.DecimalField)
|
numeric_fields = (serializers.IntegerField, serializers.FloatField, serializers.DecimalField)
|
||||||
@@ -423,6 +437,7 @@ try:
|
|||||||
from djangorestframework_camel_case.render import camelize
|
from djangorestframework_camel_case.render import camelize
|
||||||
except ImportError: # pragma: no cover
|
except ImportError: # pragma: no cover
|
||||||
class CamelCaseJSONFilter(FieldInspector):
|
class CamelCaseJSONFilter(FieldInspector):
|
||||||
|
"""Converts property names to camelCase if ``djangorestframework_camel_case`` is used."""
|
||||||
pass
|
pass
|
||||||
else:
|
else:
|
||||||
def camelize_string(s):
|
def camelize_string(s):
|
||||||
@@ -444,9 +459,13 @@ else:
|
|||||||
return schema_or_ref
|
return schema_or_ref
|
||||||
|
|
||||||
class CamelCaseJSONFilter(FieldInspector):
|
class CamelCaseJSONFilter(FieldInspector):
|
||||||
|
"""Converts property names to camelCase if ``CamelCaseJSONParser`` or ``CamelCaseJSONRenderer`` are used."""
|
||||||
|
|
||||||
def is_camel_case(self):
|
def is_camel_case(self):
|
||||||
return any(issubclass(parser, CamelCaseJSONParser) for parser in self.view.parser_classes) \
|
return (
|
||||||
or any(issubclass(renderer, CamelCaseJSONRenderer) for renderer in self.view.renderer_classes)
|
any(issubclass(parser, CamelCaseJSONParser) for parser in self.view.parser_classes) or
|
||||||
|
any(issubclass(renderer, CamelCaseJSONRenderer) for renderer in self.view.renderer_classes)
|
||||||
|
)
|
||||||
|
|
||||||
def process_result(self, result, method_name, obj, **kwargs):
|
def process_result(self, result, method_name, obj, **kwargs):
|
||||||
if isinstance(result, openapi.Schema.OR_REF) and self.is_camel_case():
|
if isinstance(result, openapi.Schema.OR_REF) and self.is_camel_case():
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
from collections import OrderedDict
|
from collections import OrderedDict
|
||||||
|
|
||||||
import coreschema
|
import coreschema
|
||||||
from rest_framework.pagination import CursorPagination, PageNumberPagination, LimitOffsetPagination
|
from rest_framework.pagination import CursorPagination, LimitOffsetPagination, PageNumberPagination
|
||||||
|
|
||||||
from .base import PaginatorInspector, FilterInspector
|
|
||||||
from .. import openapi
|
from .. import openapi
|
||||||
|
from .base import FilterInspector, PaginatorInspector
|
||||||
|
|
||||||
|
|
||||||
class CoreAPICompatInspector(PaginatorInspector, FilterInspector):
|
class CoreAPICompatInspector(PaginatorInspector, FilterInspector):
|
||||||
|
|||||||
@@ -4,10 +4,10 @@ from rest_framework.request import is_form_media_type
|
|||||||
from rest_framework.schemas import AutoSchema
|
from rest_framework.schemas import AutoSchema
|
||||||
from rest_framework.status import is_success
|
from rest_framework.status import is_success
|
||||||
|
|
||||||
from .base import ViewInspector
|
|
||||||
from .. import openapi
|
from .. import openapi
|
||||||
from ..errors import SwaggerGenerationError
|
from ..errors import SwaggerGenerationError
|
||||||
from ..utils import force_serializer_instance, no_body, is_list_view, param_list_to_odict, guess_response_status
|
from ..utils import force_serializer_instance, guess_response_status, is_list_view, no_body, param_list_to_odict
|
||||||
|
from .base import ViewInspector
|
||||||
|
|
||||||
|
|
||||||
class SwaggerAutoSchema(ViewInspector):
|
class SwaggerAutoSchema(ViewInspector):
|
||||||
@@ -162,9 +162,7 @@ class SwaggerAutoSchema(ViewInspector):
|
|||||||
|
|
||||||
default_status = guess_response_status(method)
|
default_status = guess_response_status(method)
|
||||||
default_schema = ''
|
default_schema = ''
|
||||||
if method == 'post':
|
if method in ('get', 'post', 'put', 'patch'):
|
||||||
default_schema = self.get_request_serializer() or self.get_view_serializer()
|
|
||||||
elif method in ('get', 'put', 'patch'):
|
|
||||||
default_schema = self.get_request_serializer() or self.get_view_serializer()
|
default_schema = self.get_request_serializer() or self.get_view_serializer()
|
||||||
|
|
||||||
default_schema = default_schema or ''
|
default_schema = default_schema or ''
|
||||||
|
|||||||
@@ -0,0 +1,134 @@
|
|||||||
|
import json
|
||||||
|
import logging
|
||||||
|
import os
|
||||||
|
from collections import OrderedDict
|
||||||
|
|
||||||
|
from django.contrib.auth.models import User
|
||||||
|
from django.core.exceptions import ImproperlyConfigured
|
||||||
|
from django.core.management.base import BaseCommand
|
||||||
|
from rest_framework.test import APIRequestFactory, force_authenticate
|
||||||
|
from rest_framework.views import APIView
|
||||||
|
|
||||||
|
from ... import openapi
|
||||||
|
from ...app_settings import swagger_settings
|
||||||
|
from ...codecs import OpenAPICodecJson, OpenAPICodecYaml
|
||||||
|
from ...generators import OpenAPISchemaGenerator
|
||||||
|
|
||||||
|
|
||||||
|
class Command(BaseCommand):
|
||||||
|
help = 'Write the Swagger schema to disk in JSON or YAML format.'
|
||||||
|
|
||||||
|
def add_arguments(self, parser):
|
||||||
|
parser.add_argument(
|
||||||
|
'output_file', metavar='output-file',
|
||||||
|
nargs='?',
|
||||||
|
default='-',
|
||||||
|
type=str,
|
||||||
|
help='Output path for generated swagger document, or "-" for stdout.'
|
||||||
|
)
|
||||||
|
parser.add_argument(
|
||||||
|
'-o', '--overwrite',
|
||||||
|
default=False, action='store_true',
|
||||||
|
help='Overwrite the output file if it already exists. '
|
||||||
|
'Default behavior is to stop if the output file exists.'
|
||||||
|
)
|
||||||
|
parser.add_argument(
|
||||||
|
'-f', '--format', dest='format',
|
||||||
|
default='', choices=('json', 'yaml'),
|
||||||
|
type=str,
|
||||||
|
help='Output format. If not given, it is guessed from the output file extension and defaults to json.'
|
||||||
|
)
|
||||||
|
parser.add_argument(
|
||||||
|
'-u', '--url', dest='api_url',
|
||||||
|
default='',
|
||||||
|
type=str,
|
||||||
|
help='Base API URL - sets the host and scheme attributes of the generated document.'
|
||||||
|
)
|
||||||
|
parser.add_argument(
|
||||||
|
'-m', '--mock-request', dest='mock',
|
||||||
|
default=False, action='store_true',
|
||||||
|
help='Use a mock request when generating the swagger schema. This is useful if your views or serializers'
|
||||||
|
'depend on context from a request in order to function.'
|
||||||
|
)
|
||||||
|
parser.add_argument(
|
||||||
|
'--user', dest='user',
|
||||||
|
default='',
|
||||||
|
help='Username of an existing user to use for mocked authentication. This option implies --mock-request.'
|
||||||
|
)
|
||||||
|
parser.add_argument(
|
||||||
|
'-p', '--private',
|
||||||
|
default=False, action="store_true",
|
||||||
|
help='Hides endpoints not accesible to the target user. If --user is not given, only shows endpoints that '
|
||||||
|
'are accesible to unauthenticated users.\n'
|
||||||
|
'This has the same effect as passing public=False to get_schema_view() or '
|
||||||
|
'OpenAPISchemaGenerator.get_schema().\n'
|
||||||
|
'This option implies --mock-request.'
|
||||||
|
)
|
||||||
|
|
||||||
|
def write_schema(self, schema, stream, format):
|
||||||
|
if format == 'json':
|
||||||
|
codec = OpenAPICodecJson(validators=[])
|
||||||
|
swagger_json = codec.encode(schema)
|
||||||
|
swagger_json = json.loads(swagger_json.decode('utf-8'), object_pairs_hook=OrderedDict)
|
||||||
|
pretty_json = json.dumps(swagger_json, indent=4, ensure_ascii=True)
|
||||||
|
stream.write(pretty_json)
|
||||||
|
elif format == 'yaml':
|
||||||
|
codec = OpenAPICodecYaml(validators=[])
|
||||||
|
swagger_yaml = codec.encode(schema).decode('utf-8')
|
||||||
|
# YAML is already pretty!
|
||||||
|
stream.write(swagger_yaml)
|
||||||
|
else: # pragma: no cover
|
||||||
|
raise ValueError("unknown format %s" % format)
|
||||||
|
|
||||||
|
def get_mock_request(self, url, format, user=None):
|
||||||
|
factory = APIRequestFactory()
|
||||||
|
|
||||||
|
request = factory.get(url + '/swagger.' + format)
|
||||||
|
if user is not None:
|
||||||
|
force_authenticate(request, user=user)
|
||||||
|
request = APIView().initialize_request(request)
|
||||||
|
return request
|
||||||
|
|
||||||
|
def handle(self, output_file, overwrite, format, api_url, mock, user, private, *args, **options):
|
||||||
|
# disable logs of WARNING and below
|
||||||
|
logging.disable(logging.WARNING)
|
||||||
|
|
||||||
|
info = getattr(swagger_settings, 'DEFAULT_INFO', None)
|
||||||
|
if not isinstance(info, openapi.Info):
|
||||||
|
raise ImproperlyConfigured(
|
||||||
|
'settings.SWAGGER_SETTINGS["DEFAULT_INFO"] should be an '
|
||||||
|
'import string pointing to an openapi.Info object'
|
||||||
|
)
|
||||||
|
|
||||||
|
if not format:
|
||||||
|
if os.path.splitext(output_file)[1] in ('.yml', '.yaml'):
|
||||||
|
format = 'yaml'
|
||||||
|
format = format or 'json'
|
||||||
|
|
||||||
|
api_url = api_url or swagger_settings.DEFAULT_API_URL
|
||||||
|
|
||||||
|
user = User.objects.get(username=user) if user else None
|
||||||
|
mock = mock or private or (user is not None)
|
||||||
|
if mock and not api_url:
|
||||||
|
raise ImproperlyConfigured(
|
||||||
|
'--mock-request requires an API url; either provide '
|
||||||
|
'the --url argument or set the DEFAULT_API_URL setting'
|
||||||
|
)
|
||||||
|
|
||||||
|
request = self.get_mock_request(api_url, format, user) if mock else None
|
||||||
|
|
||||||
|
generator = OpenAPISchemaGenerator(
|
||||||
|
info=info,
|
||||||
|
url=api_url
|
||||||
|
)
|
||||||
|
schema = generator.get_schema(request=request, public=not private)
|
||||||
|
|
||||||
|
if output_file == '-':
|
||||||
|
self.write_schema(schema, self.stdout, format)
|
||||||
|
else:
|
||||||
|
# normally this would be easily done with open(mode='x'/'w'),
|
||||||
|
# but python 2 is a pain in the ass as usual
|
||||||
|
flags = os.O_CREAT | os.O_WRONLY
|
||||||
|
flags = flags | (os.O_TRUNC if overwrite else os.O_EXCL)
|
||||||
|
with os.fdopen(os.open(output_file, flags), "w") as stream:
|
||||||
|
self.write_schema(schema, stream, format)
|
||||||
@@ -13,7 +13,7 @@ class SwaggerExceptionMiddleware(object):
|
|||||||
|
|
||||||
def process_exception(self, request, exception):
|
def process_exception(self, request, exception):
|
||||||
if isinstance(exception, SwaggerValidationError):
|
if isinstance(exception, SwaggerValidationError):
|
||||||
err = {'errors': {exception.validator_name: str(exception)}}
|
err = {'errors': exception.errors, 'message': str(exception)}
|
||||||
codec = exception.source_codec
|
codec = exception.source_codec
|
||||||
if isinstance(codec, _OpenAPICodec):
|
if isinstance(codec, _OpenAPICodec):
|
||||||
err = codec.encode_error(err)
|
err = codec.encode_error(err)
|
||||||
|
|||||||
+62
-11
@@ -2,6 +2,7 @@ import re
|
|||||||
from collections import OrderedDict
|
from collections import OrderedDict
|
||||||
|
|
||||||
from coreapi.compat import urlparse
|
from coreapi.compat import urlparse
|
||||||
|
from django.urls import get_script_prefix
|
||||||
from inflection import camelize
|
from inflection import camelize
|
||||||
|
|
||||||
from .utils import filter_none
|
from .utils import filter_none
|
||||||
@@ -210,11 +211,13 @@ class Info(SwaggerDict):
|
|||||||
|
|
||||||
|
|
||||||
class Swagger(SwaggerDict):
|
class Swagger(SwaggerDict):
|
||||||
def __init__(self, info=None, _url=None, _version=None, paths=None, definitions=None, **extra):
|
def __init__(self, info=None, _url=None, _prefix=None, _version=None, paths=None, definitions=None, **extra):
|
||||||
"""Root Swagger object.
|
"""Root Swagger object.
|
||||||
|
|
||||||
:param .Info info: info object
|
:param .Info info: info object
|
||||||
:param str _url: URL used for guessing the API host, scheme and basepath
|
:param str _url: URL used for setting the API host and scheme
|
||||||
|
:param str _prefix: api path prefix to use in setting basePath; this will be appended to the wsgi
|
||||||
|
SCRIPT_NAME prefix or Django's FORCE_SCRIPT_NAME if applicable
|
||||||
:param str _version: version string to override Info
|
:param str _version: version string to override Info
|
||||||
:param .Paths paths: paths object
|
:param .Paths paths: paths object
|
||||||
:param dict[str,.Schema] definitions: named models
|
:param dict[str,.Schema] definitions: named models
|
||||||
@@ -226,16 +229,39 @@ class Swagger(SwaggerDict):
|
|||||||
|
|
||||||
if _url:
|
if _url:
|
||||||
url = urlparse.urlparse(_url)
|
url = urlparse.urlparse(_url)
|
||||||
if url.netloc:
|
assert url.netloc and url.scheme, "if given, url must have both schema and netloc"
|
||||||
self.host = url.netloc
|
self.host = url.netloc
|
||||||
if url.scheme:
|
self.schemes = [url.scheme]
|
||||||
self.schemes = [url.scheme]
|
|
||||||
self.base_path = '/'
|
|
||||||
|
|
||||||
|
self.base_path = self.get_base_path(get_script_prefix(), _prefix)
|
||||||
self.paths = paths
|
self.paths = paths
|
||||||
self.definitions = filter_none(definitions)
|
self.definitions = filter_none(definitions)
|
||||||
self._insert_extras__()
|
self._insert_extras__()
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def get_base_path(cls, script_prefix, api_prefix):
|
||||||
|
"""Determine an appropriate value for ``basePath`` based on the SCRIPT_NAME and the api common prefix.
|
||||||
|
|
||||||
|
:param str script_prefix: script prefix as defined by django ``get_script_prefix``
|
||||||
|
:param str api_prefix: api common prefix
|
||||||
|
:return: joined base path
|
||||||
|
"""
|
||||||
|
# avoid double slash when joining script_name with api_prefix
|
||||||
|
if script_prefix and script_prefix.endswith('/'):
|
||||||
|
script_prefix = script_prefix[:-1]
|
||||||
|
if not api_prefix.startswith('/'):
|
||||||
|
api_prefix = '/' + api_prefix
|
||||||
|
|
||||||
|
base_path = script_prefix + api_prefix
|
||||||
|
|
||||||
|
# ensure that the base path has a leading slash and no trailing slash
|
||||||
|
if base_path and base_path.endswith('/'):
|
||||||
|
base_path = base_path[:-1]
|
||||||
|
if not base_path.startswith('/'):
|
||||||
|
base_path = '/' + base_path
|
||||||
|
|
||||||
|
return base_path
|
||||||
|
|
||||||
|
|
||||||
class Paths(SwaggerDict):
|
class Paths(SwaggerDict):
|
||||||
def __init__(self, paths, **extra):
|
def __init__(self, paths, **extra):
|
||||||
@@ -321,11 +347,15 @@ class Items(SwaggerDict):
|
|||||||
self.pattern = pattern
|
self.pattern = pattern
|
||||||
self.items = items
|
self.items = items
|
||||||
self._insert_extras__()
|
self._insert_extras__()
|
||||||
|
if items and type != TYPE_ARRAY:
|
||||||
|
raise AssertionError("items can only be used when type is array")
|
||||||
|
if pattern and type != TYPE_STRING:
|
||||||
|
raise AssertionError("pattern can only be used when type is string")
|
||||||
|
|
||||||
|
|
||||||
class Parameter(SwaggerDict):
|
class Parameter(SwaggerDict):
|
||||||
def __init__(self, name, in_, description=None, required=None, schema=None,
|
def __init__(self, name, in_, description=None, required=None, schema=None,
|
||||||
type=None, format=None, enum=None, pattern=None, items=None, **extra):
|
type=None, format=None, enum=None, pattern=None, items=None, default=None, **extra):
|
||||||
"""Describe parameters accepted by an :class:`.Operation`. Each parameter should be a unique combination of
|
"""Describe parameters accepted by an :class:`.Operation`. Each parameter should be a unique combination of
|
||||||
(`name`, `in_`). ``body`` and ``form`` parameters in the same operation are mutually exclusive.
|
(`name`, `in_`). ``body`` and ``form`` parameters in the same operation are mutually exclusive.
|
||||||
|
|
||||||
@@ -339,6 +369,7 @@ class Parameter(SwaggerDict):
|
|||||||
:param list enum: restrict possible values
|
:param list enum: restrict possible values
|
||||||
:param str pattern: pattern if type is ``string``
|
:param str pattern: pattern if type is ``string``
|
||||||
:param .Items items: only valid if `type` is ``array``
|
:param .Items items: only valid if `type` is ``array``
|
||||||
|
:param default: default value if the parameter is not provided; must conform to parameter type
|
||||||
"""
|
"""
|
||||||
super(Parameter, self).__init__(**extra)
|
super(Parameter, self).__init__(**extra)
|
||||||
if (not schema and not type) or (schema and type):
|
if (not schema and not type) or (schema and type):
|
||||||
@@ -354,6 +385,18 @@ class Parameter(SwaggerDict):
|
|||||||
self.pattern = pattern
|
self.pattern = pattern
|
||||||
self.items = items
|
self.items = items
|
||||||
self._insert_extras__()
|
self._insert_extras__()
|
||||||
|
if self['in'] == IN_PATH:
|
||||||
|
# path parameters must always be required
|
||||||
|
assert required is not False, "path parameter cannot be optional"
|
||||||
|
self.required = True
|
||||||
|
if self['in'] != IN_BODY and schema is not None:
|
||||||
|
raise AssertionError("schema can only be applied to a body Parameter, not %s" % type)
|
||||||
|
if (format or enum or pattern or default) and not type:
|
||||||
|
raise AssertionError("[format, enum, pattern, default] can only be applied to non-body Parameter")
|
||||||
|
if items and type != TYPE_ARRAY:
|
||||||
|
raise AssertionError("items can only be used when type is array")
|
||||||
|
if pattern and type != TYPE_STRING:
|
||||||
|
raise AssertionError("pattern can only be used when type is string")
|
||||||
|
|
||||||
|
|
||||||
class Schema(SwaggerDict):
|
class Schema(SwaggerDict):
|
||||||
@@ -381,9 +424,9 @@ class Schema(SwaggerDict):
|
|||||||
super(Schema, self).__init__(**extra)
|
super(Schema, self).__init__(**extra)
|
||||||
if required is True or required is False:
|
if required is True or required is False:
|
||||||
# common error
|
# common error
|
||||||
raise AssertionError(
|
raise AssertionError("the `requires` attribute of schema must be an "
|
||||||
"the `requires` attribute of schema must be an array of required properties, not a boolean!")
|
"array of required property names, not a boolean!")
|
||||||
assert type is not None, "type is required!"
|
assert type, "type is required!"
|
||||||
self.title = title
|
self.title = title
|
||||||
self.description = description
|
self.description = description
|
||||||
self.required = filter_none(required)
|
self.required = filter_none(required)
|
||||||
@@ -397,6 +440,14 @@ class Schema(SwaggerDict):
|
|||||||
self.read_only = read_only
|
self.read_only = read_only
|
||||||
self.default = default
|
self.default = default
|
||||||
self._insert_extras__()
|
self._insert_extras__()
|
||||||
|
if (properties or (additional_properties is not None)) and type != TYPE_OBJECT:
|
||||||
|
raise AssertionError("only object Schema can have properties")
|
||||||
|
if (format or enum or pattern) and type in (TYPE_OBJECT, TYPE_ARRAY):
|
||||||
|
raise AssertionError("[format, enum, pattern] can only be applied to primitive Schema")
|
||||||
|
if items and type != TYPE_ARRAY:
|
||||||
|
raise AssertionError("items can only be used when type is array")
|
||||||
|
if pattern and type != TYPE_STRING:
|
||||||
|
raise AssertionError("pattern can only be used when type is string")
|
||||||
|
|
||||||
|
|
||||||
class _Ref(SwaggerDict):
|
class _Ref(SwaggerDict):
|
||||||
|
|||||||
@@ -2,14 +2,14 @@ from django.shortcuts import render, resolve_url
|
|||||||
from rest_framework.renderers import BaseRenderer
|
from rest_framework.renderers import BaseRenderer
|
||||||
from rest_framework.utils import json
|
from rest_framework.utils import json
|
||||||
|
|
||||||
from .app_settings import swagger_settings, redoc_settings
|
from .app_settings import redoc_settings, swagger_settings
|
||||||
from .codecs import OpenAPICodecJson, VALIDATORS, OpenAPICodecYaml
|
from .codecs import VALIDATORS, OpenAPICodecJson, OpenAPICodecYaml
|
||||||
|
|
||||||
|
|
||||||
class _SpecRenderer(BaseRenderer):
|
class _SpecRenderer(BaseRenderer):
|
||||||
"""Base class for text renderers. Handles encoding and validation."""
|
"""Base class for text renderers. Handles encoding and validation."""
|
||||||
charset = None
|
charset = None
|
||||||
validators = ['ssv', 'flex']
|
validators = []
|
||||||
codec_class = None
|
codec_class = None
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
@@ -117,3 +117,11 @@ class ReDocRenderer(_UIRenderer):
|
|||||||
"""
|
"""
|
||||||
template = 'drf-yasg/redoc.html'
|
template = 'drf-yasg/redoc.html'
|
||||||
format = 'redoc'
|
format = 'redoc'
|
||||||
|
|
||||||
|
|
||||||
|
class ReDocAlphaRenderer(_UIRenderer):
|
||||||
|
"""Renders a ReDoc web interface for schema browisng.
|
||||||
|
Also requires :class:`.OpenAPIRenderer` as an available renderer on the same view.
|
||||||
|
"""
|
||||||
|
template = 'drf-yasg/redoc-alpha.html'
|
||||||
|
format = 'redoc'
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
@@ -0,0 +1,48 @@
|
|||||||
|
"use strict";
|
||||||
|
|
||||||
|
var currentPath = window.location.protocol + "//" + window.location.host + window.location.pathname;
|
||||||
|
var specURL = currentPath + '?format=openapi';
|
||||||
|
var redoc = document.createElement("redoc");
|
||||||
|
redoc.setAttribute("spec-url", specURL);
|
||||||
|
|
||||||
|
var redocSettings = JSON.parse(document.getElementById('redoc-settings').innerHTML);
|
||||||
|
if (redocSettings.lazyRendering) {
|
||||||
|
redoc.setAttribute("lazy-rendering", '');
|
||||||
|
}
|
||||||
|
if (redocSettings.pathInMiddle) {
|
||||||
|
redoc.setAttribute("path-in-middle-panel", '');
|
||||||
|
}
|
||||||
|
if (redocSettings.hideHostname) {
|
||||||
|
redoc.setAttribute("hide-hostname", '');
|
||||||
|
}
|
||||||
|
redoc.setAttribute("expand-responses", redocSettings.expandResponses);
|
||||||
|
document.body.appendChild(redoc);
|
||||||
|
|
||||||
|
function hideEmptyVersion() {
|
||||||
|
// 'span.api-info-version' is for redoc 1.x, 'div.api-info span' is for redoc 2-alpha
|
||||||
|
var apiVersion = document.querySelector('span.api-info-version') || document.querySelector('div.api-info span');
|
||||||
|
if (!apiVersion) {
|
||||||
|
console.log("WARNING: could not find API versionString element (span.api-info-version)");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
var versionString = apiVersion.innerText;
|
||||||
|
if (versionString) {
|
||||||
|
// trim spaces and surrounding ()
|
||||||
|
versionString = versionString.replace(/ /g,'');
|
||||||
|
versionString = versionString.replace(/(^\()|(\)$)/g,'');
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!versionString) {
|
||||||
|
// hide version element if empty
|
||||||
|
apiVersion.classList.add("hidden");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (document.querySelector('span.api-info-version') || document.querySelector('div.api-info span')) {
|
||||||
|
hideEmptyVersion();
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
insertionQ('span.api-info-version').every(hideEmptyVersion);
|
||||||
|
insertionQ('div.api-info span').every(hideEmptyVersion);
|
||||||
|
}
|
||||||
@@ -0,0 +1,77 @@
|
|||||||
|
html {
|
||||||
|
box-sizing: border-box;
|
||||||
|
overflow: -moz-scrollbars-vertical;
|
||||||
|
overflow-y: scroll;
|
||||||
|
}
|
||||||
|
|
||||||
|
*,
|
||||||
|
*:before,
|
||||||
|
*:after {
|
||||||
|
box-sizing: inherit;
|
||||||
|
}
|
||||||
|
|
||||||
|
body {
|
||||||
|
margin: 0;
|
||||||
|
padding: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
body.swagger-body {
|
||||||
|
background: #fafafa;
|
||||||
|
}
|
||||||
|
|
||||||
|
#django-session-auth {
|
||||||
|
margin-right: 8px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.hidden {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
#django-session-auth > div {
|
||||||
|
display: inline-block;
|
||||||
|
}
|
||||||
|
|
||||||
|
#django-session-auth .btn.authorize {
|
||||||
|
padding: 10px 23px;
|
||||||
|
}
|
||||||
|
|
||||||
|
#django-session-auth .btn.authorize a {
|
||||||
|
color: #49cc90;
|
||||||
|
text-decoration: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
#django-session-auth .hello {
|
||||||
|
margin-right: 5px;
|
||||||
|
}
|
||||||
|
|
||||||
|
#django-session-auth .hello .django-session {
|
||||||
|
font-weight: bold;
|
||||||
|
}
|
||||||
|
|
||||||
|
.label {
|
||||||
|
display: inline;
|
||||||
|
padding: .2em .6em .3em;
|
||||||
|
font-weight: 700;
|
||||||
|
line-height: 1;
|
||||||
|
color: #fff;
|
||||||
|
text-align: center;
|
||||||
|
white-space: nowrap;
|
||||||
|
vertical-align: baseline;
|
||||||
|
border-radius: .25em;
|
||||||
|
}
|
||||||
|
|
||||||
|
.label-primary {
|
||||||
|
background-color: #337ab7;
|
||||||
|
}
|
||||||
|
|
||||||
|
.divider {
|
||||||
|
margin-right: 8px;
|
||||||
|
background: #16222c44;
|
||||||
|
width: 2px;
|
||||||
|
}
|
||||||
|
|
||||||
|
svg.swagger-defs {
|
||||||
|
position: absolute;
|
||||||
|
width: 0;
|
||||||
|
height: 0;
|
||||||
|
}
|
||||||
@@ -1,22 +0,0 @@
|
|||||||
# Swagger UI Dist
|
|
||||||
[](http://badge.fury.io/js/swagger-ui-dist)
|
|
||||||
|
|
||||||
# API
|
|
||||||
|
|
||||||
This module, `swagger-ui-dist`, exposes Swagger-UI's entire dist folder as a dependency-free npm module.
|
|
||||||
Use `swagger-ui` instead, if you'd like to have npm install dependencies for you.
|
|
||||||
|
|
||||||
`SwaggerUIBundle` and `SwaggerUIStandalonePreset` can be imported:
|
|
||||||
```javascript
|
|
||||||
import { SwaggerUIBundle, SwaggerUIStandalonePreset } from "swagger-ui-dist"
|
|
||||||
```
|
|
||||||
|
|
||||||
To get an absolute path to this directory for static file serving, use the exported `getAbsoluteFSPath` method:
|
|
||||||
|
|
||||||
```javascript
|
|
||||||
const swaggerUiAssetPath = require("swagger-ui-dist").getAbsoluteFSPath()
|
|
||||||
|
|
||||||
// then instantiate server that serves files from the swaggerUiAssetPath
|
|
||||||
```
|
|
||||||
|
|
||||||
For anything else, check the [Swagger-UI](https://github.com/swagger-api/swagger-ui) repository.
|
|
||||||
@@ -1,95 +0,0 @@
|
|||||||
<!-- HTML for static distribution bundle build -->
|
|
||||||
<!DOCTYPE html>
|
|
||||||
<html lang="en">
|
|
||||||
<head>
|
|
||||||
<meta charset="UTF-8">
|
|
||||||
<title>Swagger UI</title>
|
|
||||||
<link href="https://fonts.googleapis.com/css?family=Open+Sans:400,700|Source+Code+Pro:300,600|Titillium+Web:400,600,700" rel="stylesheet">
|
|
||||||
<link rel="stylesheet" type="text/css" href="./swagger-ui.css" >
|
|
||||||
<link rel="icon" type="image/png" href="./favicon-32x32.png" sizes="32x32" />
|
|
||||||
<link rel="icon" type="image/png" href="./favicon-16x16.png" sizes="16x16" />
|
|
||||||
<style>
|
|
||||||
html
|
|
||||||
{
|
|
||||||
box-sizing: border-box;
|
|
||||||
overflow: -moz-scrollbars-vertical;
|
|
||||||
overflow-y: scroll;
|
|
||||||
}
|
|
||||||
*,
|
|
||||||
*:before,
|
|
||||||
*:after
|
|
||||||
{
|
|
||||||
box-sizing: inherit;
|
|
||||||
}
|
|
||||||
|
|
||||||
body {
|
|
||||||
margin:0;
|
|
||||||
background: #fafafa;
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
</head>
|
|
||||||
|
|
||||||
<body>
|
|
||||||
|
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" style="position:absolute;width:0;height:0">
|
|
||||||
<defs>
|
|
||||||
<symbol viewBox="0 0 20 20" id="unlocked">
|
|
||||||
<path d="M15.8 8H14V5.6C14 2.703 12.665 1 10 1 7.334 1 6 2.703 6 5.6V6h2v-.801C8 3.754 8.797 3 10 3c1.203 0 2 .754 2 2.199V8H4c-.553 0-1 .646-1 1.199V17c0 .549.428 1.139.951 1.307l1.197.387C5.672 18.861 6.55 19 7.1 19h5.8c.549 0 1.428-.139 1.951-.307l1.196-.387c.524-.167.953-.757.953-1.306V9.199C17 8.646 16.352 8 15.8 8z"></path>
|
|
||||||
</symbol>
|
|
||||||
|
|
||||||
<symbol viewBox="0 0 20 20" id="locked">
|
|
||||||
<path d="M15.8 8H14V5.6C14 2.703 12.665 1 10 1 7.334 1 6 2.703 6 5.6V8H4c-.553 0-1 .646-1 1.199V17c0 .549.428 1.139.951 1.307l1.197.387C5.672 18.861 6.55 19 7.1 19h5.8c.549 0 1.428-.139 1.951-.307l1.196-.387c.524-.167.953-.757.953-1.306V9.199C17 8.646 16.352 8 15.8 8zM12 8H8V5.199C8 3.754 8.797 3 10 3c1.203 0 2 .754 2 2.199V8z"/>
|
|
||||||
</symbol>
|
|
||||||
|
|
||||||
<symbol viewBox="0 0 20 20" id="close">
|
|
||||||
<path d="M14.348 14.849c-.469.469-1.229.469-1.697 0L10 11.819l-2.651 3.029c-.469.469-1.229.469-1.697 0-.469-.469-.469-1.229 0-1.697l2.758-3.15-2.759-3.152c-.469-.469-.469-1.228 0-1.697.469-.469 1.228-.469 1.697 0L10 8.183l2.651-3.031c.469-.469 1.228-.469 1.697 0 .469.469.469 1.229 0 1.697l-2.758 3.152 2.758 3.15c.469.469.469 1.229 0 1.698z"/>
|
|
||||||
</symbol>
|
|
||||||
|
|
||||||
<symbol viewBox="0 0 20 20" id="large-arrow">
|
|
||||||
<path d="M13.25 10L6.109 2.58c-.268-.27-.268-.707 0-.979.268-.27.701-.27.969 0l7.83 7.908c.268.271.268.709 0 .979l-7.83 7.908c-.268.271-.701.27-.969 0-.268-.269-.268-.707 0-.979L13.25 10z"/>
|
|
||||||
</symbol>
|
|
||||||
|
|
||||||
<symbol viewBox="0 0 20 20" id="large-arrow-down">
|
|
||||||
<path d="M17.418 6.109c.272-.268.709-.268.979 0s.271.701 0 .969l-7.908 7.83c-.27.268-.707.268-.979 0l-7.908-7.83c-.27-.268-.27-.701 0-.969.271-.268.709-.268.979 0L10 13.25l7.418-7.141z"/>
|
|
||||||
</symbol>
|
|
||||||
|
|
||||||
|
|
||||||
<symbol viewBox="0 0 24 24" id="jump-to">
|
|
||||||
<path d="M19 7v4H5.83l3.58-3.59L8 6l-6 6 6 6 1.41-1.41L5.83 13H21V7z"/>
|
|
||||||
</symbol>
|
|
||||||
|
|
||||||
<symbol viewBox="0 0 24 24" id="expand">
|
|
||||||
<path d="M10 18h4v-2h-4v2zM3 6v2h18V6H3zm3 7h12v-2H6v2z"/>
|
|
||||||
</symbol>
|
|
||||||
|
|
||||||
</defs>
|
|
||||||
</svg>
|
|
||||||
|
|
||||||
<div id="swagger-ui"></div>
|
|
||||||
|
|
||||||
<script src="./swagger-ui-bundle.js"> </script>
|
|
||||||
<script src="./swagger-ui-standalone-preset.js"> </script>
|
|
||||||
<script>
|
|
||||||
window.onload = function() {
|
|
||||||
|
|
||||||
// Build a system
|
|
||||||
const ui = SwaggerUIBundle({
|
|
||||||
url: "http://petstore.swagger.io/v2/swagger.json",
|
|
||||||
dom_id: '#swagger-ui',
|
|
||||||
deepLinking: true,
|
|
||||||
presets: [
|
|
||||||
SwaggerUIBundle.presets.apis,
|
|
||||||
SwaggerUIStandalonePreset
|
|
||||||
],
|
|
||||||
plugins: [
|
|
||||||
SwaggerUIBundle.plugins.DownloadUrl
|
|
||||||
],
|
|
||||||
layout: "StandaloneLayout"
|
|
||||||
})
|
|
||||||
|
|
||||||
window.ui = ui
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
</body>
|
|
||||||
|
|
||||||
</html>
|
|
||||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@@ -1 +0,0 @@
|
|||||||
{"version":3,"sources":[],"names":[],"mappings":"","file":"swagger-ui.css","sourceRoot":""}
|
|
||||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@@ -0,0 +1,70 @@
|
|||||||
|
"use strict";
|
||||||
|
var currentPath = window.location.protocol + "//" + window.location.host + window.location.pathname;
|
||||||
|
var specURL = currentPath + '?format=openapi';
|
||||||
|
|
||||||
|
function patchSwaggerUi() {
|
||||||
|
var authWrapper = document.querySelector('.auth-wrapper');
|
||||||
|
var authorizeButton = document.querySelector('.auth-wrapper .authorize');
|
||||||
|
var djangoSessionAuth = document.querySelector('#django-session-auth');
|
||||||
|
if (document.querySelector('.auth-wrapper #django-session-auth')) {
|
||||||
|
console.log("WARNING: session auth already patched; skipping patchSwaggerUi()");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
authWrapper.insertBefore(djangoSessionAuth, authorizeButton);
|
||||||
|
djangoSessionAuth.classList.remove("hidden");
|
||||||
|
|
||||||
|
var divider = document.createElement("div");
|
||||||
|
divider.classList.add("divider");
|
||||||
|
authWrapper.insertBefore(divider, authorizeButton);
|
||||||
|
}
|
||||||
|
|
||||||
|
function initSwaggerUi() {
|
||||||
|
if (window.ui) {
|
||||||
|
console.log("WARNING: skipping initSwaggerUi() because window.ui is already defined");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
var swaggerConfig = {
|
||||||
|
url: specURL,
|
||||||
|
dom_id: '#swagger-ui',
|
||||||
|
displayOperationId: true,
|
||||||
|
displayRequestDuration: true,
|
||||||
|
presets: [
|
||||||
|
SwaggerUIBundle.presets.apis,
|
||||||
|
SwaggerUIStandalonePreset
|
||||||
|
],
|
||||||
|
plugins: [
|
||||||
|
SwaggerUIBundle.plugins.DownloadUrl
|
||||||
|
],
|
||||||
|
layout: "StandaloneLayout",
|
||||||
|
filter: true,
|
||||||
|
requestInterceptor: function(request) {
|
||||||
|
var headers = request.headers || {};
|
||||||
|
var csrftoken = document.querySelector("[name=csrfmiddlewaretoken]");
|
||||||
|
if (csrftoken) {
|
||||||
|
headers["X-CSRFToken"] = csrftoken.value;
|
||||||
|
}
|
||||||
|
return request;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
var swaggerSettings = JSON.parse(document.getElementById('swagger-settings').innerHTML);
|
||||||
|
|
||||||
|
for (var p in swaggerSettings) {
|
||||||
|
if (swaggerSettings.hasOwnProperty(p)) {
|
||||||
|
swaggerConfig[p] = swaggerSettings[p];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
window.ui = SwaggerUIBundle(swaggerConfig);
|
||||||
|
}
|
||||||
|
|
||||||
|
window.onload = function () {
|
||||||
|
initSwaggerUi();
|
||||||
|
};
|
||||||
|
|
||||||
|
if (document.querySelector('.auth-wrapper .authorize')) {
|
||||||
|
patchSwaggerUi();
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
insertionQ('.auth-wrapper .authorize').every(patchSwaggerUi);
|
||||||
|
}
|
||||||
@@ -0,0 +1,18 @@
|
|||||||
|
{% load static %}
|
||||||
|
<!DOCTYPE html>
|
||||||
|
<html>
|
||||||
|
<head>
|
||||||
|
<title>{{ title }}</title>
|
||||||
|
<meta charset="utf-8"/>
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
|
|
||||||
|
<link rel="stylesheet" type="text/css" href="{% static 'drf-yasg/style.css' %}"/>
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<script id="redoc-settings" type="application/json">{{ redoc_settings | safe }}</script>
|
||||||
|
|
||||||
|
<script src="{% static 'drf-yasg/insQ.min.js' %}"></script>
|
||||||
|
<script src="{% static 'drf-yasg/redoc-init.js' %}"> </script>
|
||||||
|
<script src="{% static 'drf-yasg/redoc-alpha/redoc.standalone.js' %}"> </script>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
@@ -5,39 +5,14 @@
|
|||||||
<title>{{ title }}</title>
|
<title>{{ title }}</title>
|
||||||
<meta charset="utf-8"/>
|
<meta charset="utf-8"/>
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
<style>
|
|
||||||
body {
|
<link rel="stylesheet" type="text/css" href="{% static 'drf-yasg/style.css' %}"/>
|
||||||
margin: 0;
|
|
||||||
padding: 0;
|
|
||||||
}
|
|
||||||
{% if not request.version %}
|
|
||||||
span.api-info-version {
|
|
||||||
display: none;
|
|
||||||
}
|
|
||||||
{% endif %}
|
|
||||||
</style>
|
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<script>
|
<script id="redoc-settings" type="application/json">{{ redoc_settings | safe }}</script>
|
||||||
var currentPath = window.location.protocol + "//" + window.location.host + window.location.pathname;
|
|
||||||
var specURL = currentPath + '?format=openapi';
|
|
||||||
var redoc = document.createElement("redoc");
|
|
||||||
redoc.setAttribute("spec-url", specURL);
|
|
||||||
|
|
||||||
var redocSettings = {};
|
<script src="{% static 'drf-yasg/insQ.min.js' %}"></script>
|
||||||
redocSettings = {{ redoc_settings | safe }};
|
<script src="{% static 'drf-yasg/redoc-init.js' %}"> </script>
|
||||||
if (redocSettings.lazyRendering) {
|
<script src="{% static 'drf-yasg/redoc/redoc.min.js' %}"></script>
|
||||||
redoc.setAttribute("lazy-rendering", '');
|
|
||||||
}
|
|
||||||
if (redocSettings.pathInMiddle) {
|
|
||||||
redoc.setAttribute("path-in-middle-panel", '');
|
|
||||||
}
|
|
||||||
if (redocSettings.hideHostname) {
|
|
||||||
redoc.setAttribute("hide-hostname", '');
|
|
||||||
}
|
|
||||||
redoc.setAttribute("expand-responses", redocSettings.expandResponses);
|
|
||||||
document.body.appendChild(redoc);
|
|
||||||
</script>
|
|
||||||
<script src="{% static 'drf-yasg/redoc/redoc.min.js' %}"> </script>
|
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|||||||
@@ -5,88 +5,18 @@
|
|||||||
<head>
|
<head>
|
||||||
<meta charset="UTF-8">
|
<meta charset="UTF-8">
|
||||||
<title>{{ title }}</title>
|
<title>{{ title }}</title>
|
||||||
<link
|
|
||||||
href="https://fonts.googleapis.com/css?family=Open+Sans:400,700|Source+Code+Pro:300,600|Titillium+Web:400,600,700"
|
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Open+Sans:400,700|Source+Code+Pro:300,600|Titillium+Web:400,600,700">
|
||||||
rel="stylesheet">
|
<link rel="stylesheet" type="text/css" href="{% static 'drf-yasg/style.css' %}"/>
|
||||||
<link rel="stylesheet" type="text/css" href="{% static 'drf-yasg/swagger-ui-dist/swagger-ui.css' %}">
|
<link rel="stylesheet" type="text/css" href="{% static 'drf-yasg/swagger-ui-dist/swagger-ui.css' %}">
|
||||||
<link rel="icon" type="image/png" href="{% static 'drf-yasg/swagger-ui-dist/favicon-32x32.png' %}"
|
<link rel="icon" type="image/png" href="{% static 'drf-yasg/swagger-ui-dist/favicon-32x32.png' %}" sizes="32x32"/>
|
||||||
sizes="32x32"/>
|
<link rel="icon" type="image/png" href="{% static 'drf-yasg/swagger-ui-dist/favicon-16x16.png' %}" sizes="16x16"/>
|
||||||
<link rel="icon" type="image/png" href="{% static 'drf-yasg/swagger-ui-dist/favicon-16x16.png' %}"
|
|
||||||
sizes="16x16"/>
|
|
||||||
<style>
|
|
||||||
html {
|
|
||||||
box-sizing: border-box;
|
|
||||||
overflow: -moz-scrollbars-vertical;
|
|
||||||
overflow-y: scroll;
|
|
||||||
}
|
|
||||||
|
|
||||||
*,
|
|
||||||
*:before,
|
|
||||||
*:after {
|
|
||||||
box-sizing: inherit;
|
|
||||||
}
|
|
||||||
|
|
||||||
body {
|
|
||||||
margin: 0;
|
|
||||||
background: #fafafa;
|
|
||||||
}
|
|
||||||
|
|
||||||
#django-session-auth {
|
|
||||||
margin-right: 8px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.hidden {
|
|
||||||
display: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
#django-session-auth > div {
|
|
||||||
display: inline-block;
|
|
||||||
}
|
|
||||||
|
|
||||||
#django-session-auth .btn.authorize {
|
|
||||||
padding: 10px 23px;
|
|
||||||
}
|
|
||||||
|
|
||||||
#django-session-auth .btn.authorize a {
|
|
||||||
color: #49cc90;
|
|
||||||
text-decoration: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
#django-session-auth .hello {
|
|
||||||
margin-right: 5px;
|
|
||||||
}
|
|
||||||
|
|
||||||
#django-session-auth .hello .django-session {
|
|
||||||
font-weight: bold;
|
|
||||||
}
|
|
||||||
|
|
||||||
.label {
|
|
||||||
display: inline;
|
|
||||||
padding: .2em .6em .3em;
|
|
||||||
font-weight: 700;
|
|
||||||
line-height: 1;
|
|
||||||
color: #fff;
|
|
||||||
text-align: center;
|
|
||||||
white-space: nowrap;
|
|
||||||
vertical-align: baseline;
|
|
||||||
border-radius: .25em;
|
|
||||||
}
|
|
||||||
|
|
||||||
.label-primary {
|
|
||||||
background-color: #337ab7;
|
|
||||||
}
|
|
||||||
|
|
||||||
.divider {
|
|
||||||
margin-right: 8px;
|
|
||||||
background: #16222c44;
|
|
||||||
width: 2px;
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
</head>
|
</head>
|
||||||
|
|
||||||
<body>
|
<body class="swagger-body">
|
||||||
|
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" style="position:absolute;width:0;height:0">
|
<svg class="swagger-defs" xmlns="http://www.w3.org/2000/svg">
|
||||||
<defs>
|
<defs>
|
||||||
<symbol viewBox="0 0 20 20" id="unlocked">
|
<symbol viewBox="0 0 20 20" id="unlocked">
|
||||||
<path
|
<path
|
||||||
@@ -128,73 +58,13 @@
|
|||||||
<div id="swagger-ui"></div>
|
<div id="swagger-ui"></div>
|
||||||
<div id="spec-error" class="hidden alert alert-danger"></div>
|
<div id="spec-error" class="hidden alert alert-danger"></div>
|
||||||
|
|
||||||
<script>
|
|
||||||
"use strict";
|
|
||||||
var currentPath = window.location.protocol + "//" + window.location.host + window.location.pathname;
|
|
||||||
var specURL = currentPath + '?format=openapi';
|
|
||||||
|
|
||||||
function patchSwaggerUi() {
|
<script id="swagger-settings" type="application/json">{{ swagger_settings | safe }}</script>
|
||||||
var authWrapper = document.querySelector('.auth-wrapper');
|
|
||||||
var authorizeButton = document.querySelector('.auth-wrapper .authorize');
|
|
||||||
var djangoSessionAuth = document.querySelector('#django-session-auth');
|
|
||||||
if (document.querySelector('.auth-wrapper #django-session-auth')) {
|
|
||||||
console.log("session auth already patched");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
authWrapper.insertBefore(djangoSessionAuth, authorizeButton);
|
|
||||||
djangoSessionAuth.classList.remove("hidden");
|
|
||||||
|
|
||||||
var divider = document.createElement("div");
|
|
||||||
divider.classList.add("divider");
|
|
||||||
authWrapper.insertBefore(divider, authorizeButton);
|
|
||||||
}
|
|
||||||
|
|
||||||
function initSwaggerUi() {
|
|
||||||
var swaggerConfig = {
|
|
||||||
url: specURL,
|
|
||||||
dom_id: '#swagger-ui',
|
|
||||||
displayOperationId: true,
|
|
||||||
displayRequestDuration: true,
|
|
||||||
presets: [
|
|
||||||
SwaggerUIBundle.presets.apis,
|
|
||||||
SwaggerUIStandalonePreset
|
|
||||||
],
|
|
||||||
plugins: [
|
|
||||||
SwaggerUIBundle.plugins.DownloadUrl
|
|
||||||
],
|
|
||||||
layout: "StandaloneLayout",
|
|
||||||
filter: true,
|
|
||||||
requestInterceptor: function(request) {
|
|
||||||
var headers = request.headers || {};
|
|
||||||
var csrftoken = document.querySelector("[name=csrfmiddlewaretoken]");
|
|
||||||
if (csrftoken) {
|
|
||||||
headers["X-CSRFToken"] = csrftoken.value;
|
|
||||||
}
|
|
||||||
return request;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
var swaggerSettings = {};
|
|
||||||
swaggerSettings = {{ swagger_settings | safe }};
|
|
||||||
console.log(swaggerSettings);
|
|
||||||
for (var p in swaggerSettings) {
|
|
||||||
if (swaggerSettings.hasOwnProperty(p)) {
|
|
||||||
swaggerConfig[p] = swaggerSettings[p];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
window.ui = SwaggerUIBundle(swaggerConfig);
|
|
||||||
}
|
|
||||||
|
|
||||||
window.onload = function () {
|
|
||||||
insertionQ('.auth-wrapper .authorize').every(patchSwaggerUi);
|
|
||||||
initSwaggerUi();
|
|
||||||
};
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<script src="{% static 'drf-yasg/swagger-ui-dist/swagger-ui-bundle.js' %}"></script>
|
<script src="{% static 'drf-yasg/swagger-ui-dist/swagger-ui-bundle.js' %}"></script>
|
||||||
<script src="{% static 'drf-yasg/swagger-ui-dist/swagger-ui-standalone-preset.js' %}"></script>
|
<script src="{% static 'drf-yasg/swagger-ui-dist/swagger-ui-standalone-preset.js' %}"></script>
|
||||||
<script src="{% static 'drf-yasg/insQ.min.js' %}"></script>
|
<script src="{% static 'drf-yasg/insQ.min.js' %}"></script>
|
||||||
|
<script src="{% static 'drf-yasg/swagger-ui-init.js' %}"></script>
|
||||||
|
|
||||||
<div id="django-session-auth" class="hidden">
|
<div id="django-session-auth" class="hidden">
|
||||||
{% if USE_SESSION_AUTH %}
|
{% if USE_SESSION_AUTH %}
|
||||||
|
|||||||
+40
-31
@@ -2,8 +2,9 @@ import inspect
|
|||||||
import logging
|
import logging
|
||||||
from collections import OrderedDict
|
from collections import OrderedDict
|
||||||
|
|
||||||
from rest_framework import status, serializers
|
from rest_framework import serializers, status
|
||||||
from rest_framework.mixins import RetrieveModelMixin, DestroyModelMixin, UpdateModelMixin
|
from rest_framework.mixins import DestroyModelMixin, RetrieveModelMixin, UpdateModelMixin
|
||||||
|
from rest_framework.views import APIView
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
@@ -41,7 +42,7 @@ def swagger_auto_schema(method=None, methods=None, auto_schema=None, request_bod
|
|||||||
the `manual_parameters` argument.
|
the `manual_parameters` argument.
|
||||||
|
|
||||||
If a ``Serializer`` class or instance is given, it will be automatically converted into a :class:`.Schema`
|
If a ``Serializer`` class or instance is given, it will be automatically converted into a :class:`.Schema`
|
||||||
used as a ``body`` :class:`.Parameter`, or into a list of ``form`` :class:`.Parameter`\ s, as appropriate.
|
used as a ``body`` :class:`.Parameter`, or into a list of ``form`` :class:`.Parameter`\ s, as appropriate.
|
||||||
|
|
||||||
:param .Serializer query_serializer: if you use a ``Serializer`` to parse query parameters, you can pass it here
|
:param .Serializer query_serializer: if you use a ``Serializer`` to parse query parameters, you can pass it here
|
||||||
and have :class:`.Parameter` objects be generated automatically from it.
|
and have :class:`.Parameter` objects be generated automatically from it.
|
||||||
@@ -85,6 +86,7 @@ def swagger_auto_schema(method=None, methods=None, auto_schema=None, request_bod
|
|||||||
"""
|
"""
|
||||||
|
|
||||||
def decorator(view_method):
|
def decorator(view_method):
|
||||||
|
assert not any(hm in extra_overrides for hm in APIView.http_method_names), "HTTP method names not allowed here"
|
||||||
data = {
|
data = {
|
||||||
'auto_schema': auto_schema,
|
'auto_schema': auto_schema,
|
||||||
'request_body': request_body,
|
'request_body': request_body,
|
||||||
@@ -97,48 +99,55 @@ def swagger_auto_schema(method=None, methods=None, auto_schema=None, request_bod
|
|||||||
'paginator_inspectors': list(paginator_inspectors) if paginator_inspectors else None,
|
'paginator_inspectors': list(paginator_inspectors) if paginator_inspectors else None,
|
||||||
'field_inspectors': list(field_inspectors) if field_inspectors else None,
|
'field_inspectors': list(field_inspectors) if field_inspectors else None,
|
||||||
}
|
}
|
||||||
data = {k: v for k, v in data.items() if v is not None}
|
data = filter_none(data)
|
||||||
data.update(extra_overrides)
|
data.update(extra_overrides)
|
||||||
|
if not data: # pragma: no cover
|
||||||
|
# no overrides to set, no use in doing more work
|
||||||
|
return
|
||||||
|
|
||||||
# if the method is a detail_route or list_route, it will have a bind_to_methods attribute
|
# if the method is a detail_route or list_route, it will have a bind_to_methods attribute
|
||||||
bind_to_methods = getattr(view_method, 'bind_to_methods', [])
|
bind_to_methods = getattr(view_method, 'bind_to_methods', [])
|
||||||
# if the method is actually a function based view (@api_view), it will have a 'cls' attribute
|
# if the method is actually a function based view (@api_view), it will have a 'cls' attribute
|
||||||
view_cls = getattr(view_method, 'cls', None)
|
view_cls = getattr(view_method, 'cls', None)
|
||||||
http_method_names = getattr(view_cls, 'http_method_names', [])
|
http_method_names = [m for m in getattr(view_cls, 'http_method_names', []) if hasattr(view_cls, m)]
|
||||||
if bind_to_methods or http_method_names:
|
|
||||||
|
available_methods = http_method_names + bind_to_methods
|
||||||
|
existing_data = getattr(view_method, '_swagger_auto_schema', {})
|
||||||
|
|
||||||
|
_methods = methods
|
||||||
|
if methods or method:
|
||||||
|
assert bool(methods) != bool(method), "specify either method or methods"
|
||||||
|
assert not isinstance(methods, str), "`methods` expects to receive a list of methods;" \
|
||||||
|
" use `method` for a single argument"
|
||||||
|
if method:
|
||||||
|
_methods = [method.lower()]
|
||||||
|
else:
|
||||||
|
_methods = [mth.lower() for mth in methods]
|
||||||
|
assert all(mth in available_methods for mth in _methods), "http method not bound to view"
|
||||||
|
assert not any(mth in existing_data for mth in _methods), "http method defined multiple times"
|
||||||
|
|
||||||
|
if available_methods:
|
||||||
# detail_route, list_route or api_view
|
# detail_route, list_route or api_view
|
||||||
assert bool(http_method_names) != bool(bind_to_methods), "this should never happen"
|
assert bool(http_method_names) != bool(bind_to_methods), "this should never happen"
|
||||||
available_methods = http_method_names + bind_to_methods
|
|
||||||
existing_data = getattr(view_method, '_swagger_auto_schema', {})
|
|
||||||
|
|
||||||
if http_method_names:
|
|
||||||
_route = "api_view"
|
|
||||||
else:
|
|
||||||
_route = "detail_route" if view_method.detail else "list_route"
|
|
||||||
|
|
||||||
_methods = methods
|
|
||||||
if len(available_methods) > 1:
|
if len(available_methods) > 1:
|
||||||
assert methods or method, \
|
assert _methods, \
|
||||||
"on multi-method %s, you must specify swagger_auto_schema on a per-method basis " \
|
"on multi-method api_view, detail_route or list_route, you must specify swagger_auto_schema on " \
|
||||||
"using one of the `method` or `methods` arguments" % _route
|
"a per-method basis using one of the `method` or `methods` arguments"
|
||||||
assert bool(methods) != bool(method), "specify either method or methods"
|
|
||||||
assert not isinstance(methods, str), "`methods` expects to receive a list of methods;" \
|
|
||||||
" use `method` for a single argument"
|
|
||||||
if method:
|
|
||||||
_methods = [method.lower()]
|
|
||||||
else:
|
|
||||||
_methods = [mth.lower() for mth in methods]
|
|
||||||
assert not any(mth in existing_data for mth in _methods), "method defined multiple times"
|
|
||||||
assert all(mth in available_methods for mth in _methods), "method not bound to %s" % _route
|
|
||||||
|
|
||||||
existing_data.update((mth.lower(), data) for mth in _methods)
|
|
||||||
else:
|
else:
|
||||||
existing_data[available_methods[0]] = data
|
# for a single-method view we assume that single method as the decorator target
|
||||||
|
_methods = _methods or available_methods
|
||||||
|
|
||||||
|
assert not any(hasattr(getattr(view_cls, mth, None), '_swagger_auto_schema') for mth in _methods), \
|
||||||
|
"swagger_auto_schema applied twice to method"
|
||||||
|
assert not any(mth in existing_data for mth in _methods), "swagger_auto_schema applied twice to method"
|
||||||
|
existing_data.update((mth.lower(), data) for mth in _methods)
|
||||||
view_method._swagger_auto_schema = existing_data
|
view_method._swagger_auto_schema = existing_data
|
||||||
else:
|
else:
|
||||||
assert method is None and methods is None, \
|
assert not _methods, \
|
||||||
"the methods argument should only be specified when decorating a detail_route or list_route; you " \
|
"the methods argument should only be specified when decorating a detail_route or list_route; you " \
|
||||||
"should also ensure that you put the swagger_auto_schema decorator AFTER (above) the _route decorator"
|
"should also ensure that you put the swagger_auto_schema decorator AFTER (above) the _route decorator"
|
||||||
|
assert not existing_data, "swagger_auto_schema applied twice to method"
|
||||||
view_method._swagger_auto_schema = data
|
view_method._swagger_auto_schema = data
|
||||||
|
|
||||||
return view_method
|
return view_method
|
||||||
@@ -166,7 +175,7 @@ def is_list_view(path, method, view):
|
|||||||
# a detail_route is surely not a list route
|
# a detail_route is surely not a list route
|
||||||
return False
|
return False
|
||||||
|
|
||||||
# for APIView, if it's a detail view it can't also be a list view
|
# for GenericAPIView, if it's a detail view it can't also be a list view
|
||||||
if isinstance(view, (RetrieveModelMixin, UpdateModelMixin, DestroyModelMixin)):
|
if isinstance(view, (RetrieveModelMixin, UpdateModelMixin, DestroyModelMixin)):
|
||||||
return False
|
return False
|
||||||
|
|
||||||
|
|||||||
+12
-11
@@ -10,15 +10,17 @@ from rest_framework.response import Response
|
|||||||
from rest_framework.settings import api_settings
|
from rest_framework.settings import api_settings
|
||||||
from rest_framework.views import APIView
|
from rest_framework.views import APIView
|
||||||
|
|
||||||
|
from .app_settings import swagger_settings
|
||||||
from .generators import OpenAPISchemaGenerator
|
from .generators import OpenAPISchemaGenerator
|
||||||
from .renderers import (
|
from .renderers import (
|
||||||
SwaggerJSONRenderer, SwaggerYAMLRenderer, SwaggerUIRenderer, ReDocRenderer, OpenAPIRenderer,
|
OpenAPIRenderer, ReDocAlphaRenderer, ReDocRenderer, SwaggerJSONRenderer, SwaggerUIRenderer, SwaggerYAMLRenderer
|
||||||
)
|
)
|
||||||
|
|
||||||
SPEC_RENDERERS = (SwaggerYAMLRenderer, SwaggerJSONRenderer, OpenAPIRenderer)
|
SPEC_RENDERERS = (SwaggerYAMLRenderer, SwaggerJSONRenderer, OpenAPIRenderer)
|
||||||
UI_RENDERERS = {
|
UI_RENDERERS = {
|
||||||
'swagger': (SwaggerUIRenderer, ReDocRenderer),
|
'swagger': (SwaggerUIRenderer, ReDocRenderer),
|
||||||
'redoc': (ReDocRenderer, SwaggerUIRenderer),
|
'redoc': (ReDocRenderer, SwaggerUIRenderer),
|
||||||
|
'redoc-alpha': (ReDocAlphaRenderer, ReDocRenderer, SwaggerUIRenderer)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -46,18 +48,17 @@ def deferred_never_cache(view_func):
|
|||||||
return _wrapped_view_func
|
return _wrapped_view_func
|
||||||
|
|
||||||
|
|
||||||
def get_schema_view(info, url=None, patterns=None, urlconf=None, public=False, validators=None,
|
def get_schema_view(info=None, url=None, patterns=None, urlconf=None, public=False, validators=None,
|
||||||
generator_class=OpenAPISchemaGenerator,
|
generator_class=OpenAPISchemaGenerator,
|
||||||
authentication_classes=api_settings.DEFAULT_AUTHENTICATION_CLASSES,
|
authentication_classes=api_settings.DEFAULT_AUTHENTICATION_CLASSES,
|
||||||
permission_classes=api_settings.DEFAULT_PERMISSION_CLASSES):
|
permission_classes=api_settings.DEFAULT_PERMISSION_CLASSES):
|
||||||
"""
|
"""Create a SchemaView class with default renderers and generators.
|
||||||
Create a SchemaView class with default renderers and generators.
|
|
||||||
|
|
||||||
:param .Info info: Required. Swagger API Info object
|
:param .Info info: information about the API; if omitted, defaults to :ref:`DEFAULT_INFO <default-swagger-settings>`
|
||||||
:param str url: API base url; if left blank will be deduced from the location the view is served at
|
:param str url: same as :class:`.OpenAPISchemaGenerator`
|
||||||
:param patterns: passed to SchemaGenerator
|
:param patterns: same as :class:`.OpenAPISchemaGenerator`
|
||||||
:param urlconf: passed to SchemaGenerator
|
:param urlconf: same as :class:`.OpenAPISchemaGenerator`
|
||||||
:param bool public: if False, includes only endpoints the current user has access to
|
:param bool public: if False, includes only the endpoints that are accesible by the user viewing the schema
|
||||||
:param list validators: a list of validator names to apply; allowed values are ``flex``, ``ssv``
|
:param list validators: a list of validator names to apply; allowed values are ``flex``, ``ssv``
|
||||||
:param type generator_class: schema generator class to use; should be a subclass of :class:`.OpenAPISchemaGenerator`
|
:param type generator_class: schema generator class to use; should be a subclass of :class:`.OpenAPISchemaGenerator`
|
||||||
:param tuple authentication_classes: authentication classes for the schema view itself
|
:param tuple authentication_classes: authentication classes for the schema view itself
|
||||||
@@ -69,6 +70,7 @@ def get_schema_view(info, url=None, patterns=None, urlconf=None, public=False, v
|
|||||||
_generator_class = generator_class
|
_generator_class = generator_class
|
||||||
_auth_classes = authentication_classes
|
_auth_classes = authentication_classes
|
||||||
_perm_classes = permission_classes
|
_perm_classes = permission_classes
|
||||||
|
info = info or swagger_settings.DEFAULT_INFO
|
||||||
validators = validators or []
|
validators = validators or []
|
||||||
_spec_renderers = tuple(renderer.with_validators(validators) for renderer in SPEC_RENDERERS)
|
_spec_renderers = tuple(renderer.with_validators(validators) for renderer in SPEC_RENDERERS)
|
||||||
|
|
||||||
@@ -94,8 +96,7 @@ def get_schema_view(info, url=None, patterns=None, urlconf=None, public=False, v
|
|||||||
|
|
||||||
Arguments described in :meth:`.as_cached_view`.
|
Arguments described in :meth:`.as_cached_view`.
|
||||||
"""
|
"""
|
||||||
if not cls.public:
|
view = vary_on_headers('Cookie', 'Authorization')(view)
|
||||||
view = vary_on_headers('Cookie', 'Authorization')(view)
|
|
||||||
view = cache_page(cache_timeout, **cache_kwargs)(view)
|
view = cache_page(cache_timeout, **cache_kwargs)(view)
|
||||||
view = deferred_never_cache(view) # disable in-browser caching
|
view = deferred_never_cache(view) # disable in-browser caching
|
||||||
return view
|
return view
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
|
from django.utils.translation import ugettext_lazy as _
|
||||||
from rest_framework import serializers
|
from rest_framework import serializers
|
||||||
|
|
||||||
from articles.models import Article
|
from articles.models import Article
|
||||||
from django.utils.translation import ugettext_lazy as _
|
|
||||||
|
|
||||||
|
|
||||||
class ArticleSerializer(serializers.ModelSerializer):
|
class ArticleSerializer(serializers.ModelSerializer):
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ from articles import serializers
|
|||||||
from articles.models import Article
|
from articles.models import Article
|
||||||
from drf_yasg import openapi
|
from drf_yasg import openapi
|
||||||
from drf_yasg.app_settings import swagger_settings
|
from drf_yasg.app_settings import swagger_settings
|
||||||
from drf_yasg.inspectors import SwaggerAutoSchema, FieldInspector, CoreAPICompatInspector, NotHandled
|
from drf_yasg.inspectors import CoreAPICompatInspector, FieldInspector, NotHandled, SwaggerAutoSchema
|
||||||
from drf_yasg.utils import swagger_auto_schema
|
from drf_yasg.utils import swagger_auto_schema
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,15 @@
|
|||||||
from django.contrib.auth.models import User
|
from __future__ import print_function
|
||||||
|
|
||||||
User.objects.filter(username='admin').delete()
|
from django.contrib.auth.models import User
|
||||||
User.objects.create_superuser('admin', 'admin@admin.admin', 'passwordadmin')
|
from django.db.utils import IntegrityError
|
||||||
|
|
||||||
|
username = 'admin'
|
||||||
|
email = 'admin@admin.admin'
|
||||||
|
password = 'passwordadmin'
|
||||||
|
|
||||||
|
try:
|
||||||
|
User.objects.create_superuser(username, email, password)
|
||||||
|
except IntegrityError:
|
||||||
|
print("User '%s <%s>' already exists" % (username, email))
|
||||||
|
else:
|
||||||
|
print("Created superuser '%s <%s>' with password '%s'" % (username, email, password))
|
||||||
|
|||||||
+1
-1
@@ -3,7 +3,7 @@ import os
|
|||||||
import sys
|
import sys
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "testproj.settings")
|
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "testproj.settings.local")
|
||||||
try:
|
try:
|
||||||
from django.core.management import execute_from_command_line
|
from django.core.management import execute_from_command_line
|
||||||
except ImportError:
|
except ImportError:
|
||||||
|
|||||||
@@ -0,0 +1,2 @@
|
|||||||
|
..[validation]
|
||||||
|
-r ../requirements/testproj.txt
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
from django.contrib.auth import get_user_model
|
from django.contrib.auth import get_user_model
|
||||||
from rest_framework import serializers
|
from rest_framework import serializers
|
||||||
|
|
||||||
from snippets.models import Snippet, LANGUAGE_CHOICES, STYLE_CHOICES
|
from snippets.models import LANGUAGE_CHOICES, STYLE_CHOICES, Snippet
|
||||||
|
|
||||||
|
|
||||||
class LanguageSerializer(serializers.Serializer):
|
class LanguageSerializer(serializers.Serializer):
|
||||||
|
|||||||
@@ -3,7 +3,9 @@ from djangorestframework_camel_case.render import CamelCaseJSONRenderer
|
|||||||
from inflection import camelize
|
from inflection import camelize
|
||||||
from rest_framework import generics
|
from rest_framework import generics
|
||||||
|
|
||||||
|
from drf_yasg import openapi
|
||||||
from drf_yasg.inspectors import SwaggerAutoSchema
|
from drf_yasg.inspectors import SwaggerAutoSchema
|
||||||
|
from drf_yasg.utils import swagger_auto_schema
|
||||||
from snippets.models import Snippet
|
from snippets.models import Snippet
|
||||||
from snippets.serializers import SnippetSerializer
|
from snippets.serializers import SnippetSerializer
|
||||||
|
|
||||||
@@ -53,6 +55,14 @@ class SnippetDetail(generics.RetrieveUpdateDestroyAPIView):
|
|||||||
"""patch method docstring"""
|
"""patch method docstring"""
|
||||||
return super(SnippetDetail, self).patch(request, *args, **kwargs)
|
return super(SnippetDetail, self).patch(request, *args, **kwargs)
|
||||||
|
|
||||||
|
@swagger_auto_schema(manual_parameters=[
|
||||||
|
openapi.Parameter(
|
||||||
|
name='id', in_=openapi.IN_PATH,
|
||||||
|
type=openapi.TYPE_INTEGER,
|
||||||
|
description="path parameter override",
|
||||||
|
required=True
|
||||||
|
)
|
||||||
|
])
|
||||||
def delete(self, request, *args, **kwargs):
|
def delete(self, request, *args, **kwargs):
|
||||||
"""delete method docstring"""
|
"""delete method docstring"""
|
||||||
return super(SnippetDetail, self).patch(request, *args, **kwargs)
|
return super(SnippetDetail, self).patch(request, *args, **kwargs)
|
||||||
|
|||||||
@@ -1,16 +1,7 @@
|
|||||||
import os
|
import os
|
||||||
|
|
||||||
# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
|
# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
|
||||||
BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
|
BASE_DIR = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
|
||||||
|
|
||||||
# Quick-start development settings - unsuitable for production
|
|
||||||
# See https://docs.djangoproject.com/en/1.11/howto/deployment/checklist/
|
|
||||||
|
|
||||||
# SECURITY WARNING: keep the secret key used in production secret!
|
|
||||||
SECRET_KEY = '!z1yj(9uz)zk0gg@5--j)bc4h^i!8))r^dezco8glf190e0&#p'
|
|
||||||
|
|
||||||
# SECURITY WARNING: don't run with debug turned on in production!
|
|
||||||
DEBUG = True
|
|
||||||
|
|
||||||
ALLOWED_HOSTS = [
|
ALLOWED_HOSTS = [
|
||||||
'127.0.0.1',
|
'127.0.0.1',
|
||||||
@@ -69,16 +60,6 @@ TEMPLATES = [
|
|||||||
|
|
||||||
WSGI_APPLICATION = 'testproj.wsgi.application'
|
WSGI_APPLICATION = 'testproj.wsgi.application'
|
||||||
|
|
||||||
# Database
|
|
||||||
# https://docs.djangoproject.com/en/1.11/ref/settings/#databases
|
|
||||||
|
|
||||||
DATABASES = {
|
|
||||||
'default': {
|
|
||||||
'ENGINE': 'django.db.backends.sqlite3',
|
|
||||||
'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
# Password validation
|
# Password validation
|
||||||
# https://docs.djangoproject.com/en/1.11/ref/settings/#auth-password-validators
|
# https://docs.djangoproject.com/en/1.11/ref/settings/#auth-password-validators
|
||||||
|
|
||||||
@@ -97,16 +78,21 @@ AUTH_PASSWORD_VALIDATORS = [
|
|||||||
},
|
},
|
||||||
]
|
]
|
||||||
|
|
||||||
|
# Django Rest Framework
|
||||||
|
|
||||||
REST_FRAMEWORK = {
|
REST_FRAMEWORK = {
|
||||||
'DEFAULT_PERMISSION_CLASSES': (
|
'DEFAULT_PERMISSION_CLASSES': (
|
||||||
'rest_framework.permissions.IsAuthenticated',
|
'rest_framework.permissions.IsAuthenticated',
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# drf-yasg
|
||||||
|
|
||||||
SWAGGER_SETTINGS = {
|
SWAGGER_SETTINGS = {
|
||||||
'LOGIN_URL': '/admin/login',
|
'LOGIN_URL': '/admin/login',
|
||||||
'LOGOUT_URL': '/admin/logout',
|
'LOGOUT_URL': '/admin/logout',
|
||||||
'VALIDATOR_URL': 'http://localhost:8189',
|
|
||||||
|
'DEFAULT_INFO': 'testproj.urls.swagger_info'
|
||||||
}
|
}
|
||||||
|
|
||||||
# Internationalization
|
# Internationalization
|
||||||
@@ -126,9 +112,14 @@ USE_TZ = True
|
|||||||
# https://docs.djangoproject.com/en/1.11/howto/static-files/
|
# https://docs.djangoproject.com/en/1.11/howto/static-files/
|
||||||
|
|
||||||
STATIC_URL = '/static/'
|
STATIC_URL = '/static/'
|
||||||
|
STATIC_ROOT = os.path.join(BASE_DIR, 'staticfiles')
|
||||||
|
|
||||||
|
# Testing
|
||||||
|
|
||||||
TEST_RUNNER = 'testproj.runner.PytestTestRunner'
|
TEST_RUNNER = 'testproj.runner.PytestTestRunner'
|
||||||
|
|
||||||
|
# Logging configuration
|
||||||
|
|
||||||
LOGGING = {
|
LOGGING = {
|
||||||
'version': 1,
|
'version': 1,
|
||||||
'disable_existing_loggers': True,
|
'disable_existing_loggers': True,
|
||||||
@@ -0,0 +1,35 @@
|
|||||||
|
import dj_database_url
|
||||||
|
|
||||||
|
from .base import * # noqa: F403
|
||||||
|
|
||||||
|
DEBUG = True
|
||||||
|
|
||||||
|
ALLOWED_HOSTS.append('.herokuapp.com')
|
||||||
|
|
||||||
|
SECRET_KEY = os.getenv('DJANGO_SECRET_KEY')
|
||||||
|
assert SECRET_KEY, 'DJANGO_SECRET_KEY environment variable must be set'
|
||||||
|
|
||||||
|
SESSION_COOKIE_SECURE = True
|
||||||
|
CSRF_COOKIE_SECURE = True
|
||||||
|
|
||||||
|
SECURE_BROWSER_XSS_FILTER = True
|
||||||
|
SECURE_CONTENT_TYPE_NOSNIFF = True
|
||||||
|
X_FRAME_OPTIONS = 'DENY'
|
||||||
|
|
||||||
|
# Simplified static file serving.
|
||||||
|
# https://warehouse.python.org/project/whitenoise/
|
||||||
|
|
||||||
|
STATICFILES_STORAGE = 'whitenoise.storage.CompressedManifestStaticFilesStorage'
|
||||||
|
MIDDLEWARE.insert(0, 'whitenoise.middleware.WhiteNoiseMiddleware')
|
||||||
|
|
||||||
|
# Database
|
||||||
|
# https://docs.djangoproject.com/en/1.11/ref/settings/#databases
|
||||||
|
|
||||||
|
DATABASES = {
|
||||||
|
'default': dj_database_url.config(conn_max_age=600)
|
||||||
|
}
|
||||||
|
|
||||||
|
SILENCED_SYSTEM_CHECKS = [
|
||||||
|
'security.W004', # SECURE_HSTS_SECONDS
|
||||||
|
'security.W008', # SECURE_SSL_REDIRECT
|
||||||
|
]
|
||||||
@@ -0,0 +1,24 @@
|
|||||||
|
import os
|
||||||
|
|
||||||
|
import dj_database_url
|
||||||
|
|
||||||
|
from .base import * # noqa: F403
|
||||||
|
|
||||||
|
SWAGGER_SETTINGS.update({'VALIDATOR_URL': 'http://localhost:8189'})
|
||||||
|
|
||||||
|
# Database
|
||||||
|
# https://docs.djangoproject.com/en/1.11/ref/settings/#databases
|
||||||
|
|
||||||
|
db_path = os.path.join(BASE_DIR, 'db.sqlite3')
|
||||||
|
DATABASES = {
|
||||||
|
'default': dj_database_url.parse('sqlite:///' + db_path)
|
||||||
|
}
|
||||||
|
|
||||||
|
# Quick-start development settings - unsuitable for production
|
||||||
|
# See https://docs.djangoproject.com/en/1.11/howto/deployment/checklist/
|
||||||
|
|
||||||
|
# SECURITY WARNING: keep the secret key used in production secret!
|
||||||
|
SECRET_KEY = '!z1yj(9uz)zk0gg@5--j)bc4h^i!8))r^dezco8glf190e0&#p'
|
||||||
|
|
||||||
|
# SECURITY WARNING: don't run with debug turned on in production!
|
||||||
|
DEBUG = True
|
||||||
@@ -1,20 +1,29 @@
|
|||||||
from django.conf.urls import url, include
|
import user_agents
|
||||||
|
from django.conf.urls import include, url
|
||||||
from django.contrib import admin
|
from django.contrib import admin
|
||||||
|
from django.shortcuts import redirect
|
||||||
from rest_framework import permissions
|
from rest_framework import permissions
|
||||||
from rest_framework.decorators import api_view
|
from rest_framework.decorators import api_view
|
||||||
|
|
||||||
from drf_yasg import openapi
|
from drf_yasg import openapi
|
||||||
from drf_yasg.views import get_schema_view
|
from drf_yasg.views import get_schema_view
|
||||||
|
|
||||||
|
swagger_info = openapi.Info(
|
||||||
|
title="Snippets API",
|
||||||
|
default_version='v1',
|
||||||
|
description="""This is a demo project for the [drf-yasg](https://github.com/axnsan12/drf-yasg) Django Rest Framework library.
|
||||||
|
|
||||||
|
The `swagger-ui` view can be found [here](/cached/swagger).
|
||||||
|
The `ReDoc` view can be found [here](/cached/redoc).
|
||||||
|
The swagger YAML document can be found [here](/cached/swagger.yaml).
|
||||||
|
|
||||||
|
You can log in using the pre-existing `admin` user with password `passwordadmin`.""", # noqa
|
||||||
|
terms_of_service="https://www.google.com/policies/terms/",
|
||||||
|
contact=openapi.Contact(email="contact@snippets.local"),
|
||||||
|
license=openapi.License(name="BSD License"),
|
||||||
|
)
|
||||||
|
|
||||||
SchemaView = get_schema_view(
|
SchemaView = get_schema_view(
|
||||||
openapi.Info(
|
|
||||||
title="Snippets API",
|
|
||||||
default_version='v1',
|
|
||||||
description="Test description",
|
|
||||||
terms_of_service="https://www.google.com/policies/terms/",
|
|
||||||
contact=openapi.Contact(email="contact@snippets.local"),
|
|
||||||
license=openapi.License(name="BSD License"),
|
|
||||||
),
|
|
||||||
validators=['ssv', 'flex'],
|
validators=['ssv', 'flex'],
|
||||||
public=True,
|
public=True,
|
||||||
permission_classes=(permissions.AllowAny,),
|
permission_classes=(permissions.AllowAny,),
|
||||||
@@ -26,14 +35,29 @@ def plain_view(request):
|
|||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
||||||
|
def root_redirect(request):
|
||||||
|
user_agent_string = request.META.get('HTTP_USER_AGENT', '')
|
||||||
|
user_agent = user_agents.parse(user_agent_string)
|
||||||
|
|
||||||
|
if user_agent.is_mobile:
|
||||||
|
schema_view = 'cschema-redoc'
|
||||||
|
else:
|
||||||
|
schema_view = 'cschema-swagger-ui'
|
||||||
|
|
||||||
|
return redirect(schema_view, permanent=True)
|
||||||
|
|
||||||
|
|
||||||
urlpatterns = [
|
urlpatterns = [
|
||||||
url(r'^swagger(?P<format>.json|.yaml)$', SchemaView.without_ui(cache_timeout=0), name='schema-json'),
|
url(r'^swagger(?P<format>.json|.yaml)$', SchemaView.without_ui(cache_timeout=0), name='schema-json'),
|
||||||
url(r'^swagger/$', SchemaView.with_ui('swagger', cache_timeout=0), name='schema-swagger-ui'),
|
url(r'^swagger/$', SchemaView.with_ui('swagger', cache_timeout=0), name='schema-swagger-ui'),
|
||||||
url(r'^redoc/$', SchemaView.with_ui('redoc', cache_timeout=0), name='schema-redoc'),
|
url(r'^redoc/$', SchemaView.with_ui('redoc', cache_timeout=0), name='schema-redoc'),
|
||||||
|
url(r'^redoc-alpha/$', SchemaView.with_ui('redoc-alpha', cache_timeout=0), name='schema-redoc-alpha'),
|
||||||
url(r'^cached/swagger(?P<format>.json|.yaml)$', SchemaView.without_ui(cache_timeout=None), name='cschema-json'),
|
url(r'^cached/swagger(?P<format>.json|.yaml)$', SchemaView.without_ui(cache_timeout=None), name='cschema-json'),
|
||||||
url(r'^cached/swagger/$', SchemaView.with_ui('swagger', cache_timeout=None), name='cschema-swagger-ui'),
|
url(r'^cached/swagger/$', SchemaView.with_ui('swagger', cache_timeout=None), name='cschema-swagger-ui'),
|
||||||
url(r'^cached/redoc/$', SchemaView.with_ui('redoc', cache_timeout=None), name='cschema-redoc'),
|
url(r'^cached/redoc/$', SchemaView.with_ui('redoc', cache_timeout=None), name='cschema-redoc'),
|
||||||
|
|
||||||
|
url(r'^$', root_redirect),
|
||||||
|
|
||||||
url(r'^admin/', admin.site.urls),
|
url(r'^admin/', admin.site.urls),
|
||||||
url(r'^snippets/', include('snippets.urls')),
|
url(r'^snippets/', include('snippets.urls')),
|
||||||
url(r'^articles/', include('articles.urls')),
|
url(r'^articles/', include('articles.urls')),
|
||||||
|
|||||||
@@ -2,6 +2,6 @@ import os
|
|||||||
|
|
||||||
from django.core.wsgi import get_wsgi_application
|
from django.core.wsgi import get_wsgi_application
|
||||||
|
|
||||||
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "testproj.settings")
|
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "testproj.settings.local")
|
||||||
|
|
||||||
application = get_wsgi_application()
|
application = get_wsgi_application()
|
||||||
|
|||||||
@@ -6,8 +6,8 @@ from rest_framework.response import Response
|
|||||||
from rest_framework.views import APIView
|
from rest_framework.views import APIView
|
||||||
|
|
||||||
from drf_yasg import openapi
|
from drf_yasg import openapi
|
||||||
from drf_yasg.utils import swagger_auto_schema, no_body
|
from drf_yasg.utils import no_body, swagger_auto_schema
|
||||||
from users.serializers import UserSerializerrr, UserListQuerySerializer
|
from users.serializers import UserListQuerySerializer, UserSerializerrr
|
||||||
|
|
||||||
|
|
||||||
class UserList(APIView):
|
class UserList(APIView):
|
||||||
|
|||||||
+21
-4
@@ -4,12 +4,13 @@ import os
|
|||||||
from collections import OrderedDict
|
from collections import OrderedDict
|
||||||
|
|
||||||
import pytest
|
import pytest
|
||||||
|
from datadiff.tools import assert_equal
|
||||||
from django.contrib.auth.models import User
|
from django.contrib.auth.models import User
|
||||||
from rest_framework.test import APIRequestFactory
|
from rest_framework.test import APIRequestFactory
|
||||||
from rest_framework.views import APIView
|
from rest_framework.views import APIView
|
||||||
|
|
||||||
from drf_yasg import openapi, codecs
|
from drf_yasg import codecs, openapi
|
||||||
from drf_yasg.codecs import yaml_sane_load
|
from drf_yasg.codecs import yaml_sane_dump, yaml_sane_load
|
||||||
from drf_yasg.generators import OpenAPISchemaGenerator
|
from drf_yasg.generators import OpenAPISchemaGenerator
|
||||||
|
|
||||||
|
|
||||||
@@ -46,8 +47,8 @@ def swagger(mock_schema_request):
|
|||||||
|
|
||||||
|
|
||||||
@pytest.fixture
|
@pytest.fixture
|
||||||
def swagger_dict(swagger):
|
def swagger_dict(swagger, codec_json):
|
||||||
json_bytes = codec_json().encode(swagger)
|
json_bytes = codec_json.encode(swagger)
|
||||||
return json.loads(json_bytes.decode('utf-8'), object_pairs_hook=OrderedDict)
|
return json.loads(json_bytes.decode('utf-8'), object_pairs_hook=OrderedDict)
|
||||||
|
|
||||||
|
|
||||||
@@ -63,6 +64,22 @@ def validate_schema(db):
|
|||||||
return validate_schema
|
return validate_schema
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.fixture
|
||||||
|
def compare_schemas():
|
||||||
|
def compare_schemas(schema1, schema2):
|
||||||
|
schema1 = OrderedDict(schema1)
|
||||||
|
schema2 = OrderedDict(schema2)
|
||||||
|
ignore = ['info', 'host', 'schemes', 'basePath', 'securityDefinitions']
|
||||||
|
for attr in ignore:
|
||||||
|
schema1.pop(attr, None)
|
||||||
|
schema2.pop(attr, None)
|
||||||
|
|
||||||
|
# print diff between YAML strings because it's prettier
|
||||||
|
assert_equal(yaml_sane_dump(schema1, binary=False), yaml_sane_dump(schema2, binary=False))
|
||||||
|
|
||||||
|
return compare_schemas
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture
|
@pytest.fixture
|
||||||
def swagger_settings(settings):
|
def swagger_settings(settings):
|
||||||
swagger_settings = copy.deepcopy(settings.SWAGGER_SETTINGS)
|
swagger_settings = copy.deepcopy(settings.SWAGGER_SETTINGS)
|
||||||
|
|||||||
+12
-4
@@ -1,7 +1,11 @@
|
|||||||
swagger: '2.0'
|
swagger: '2.0'
|
||||||
info:
|
info:
|
||||||
title: Snippets API
|
title: Snippets API
|
||||||
description: Test description
|
description: "This is a demo project for the [drf-yasg](https://github.com/axnsan12/drf-yasg)\
|
||||||
|
\ Django Rest Framework library.\n\nThe `swagger-ui` view can be found [here](/cached/swagger).\
|
||||||
|
\ \nThe `ReDoc` view can be found [here](/cached/redoc). \nThe swagger YAML\
|
||||||
|
\ document can be found [here](/cached/swagger.yaml). \n\nYou can log in using\
|
||||||
|
\ the pre-existing `admin` user with password `passwordadmin`."
|
||||||
termsOfService: https://www.google.com/policies/terms/
|
termsOfService: https://www.google.com/policies/terms/
|
||||||
contact:
|
contact:
|
||||||
email: contact@snippets.local
|
email: contact@snippets.local
|
||||||
@@ -335,7 +339,12 @@ paths:
|
|||||||
delete:
|
delete:
|
||||||
operationId: snippetsDelete
|
operationId: snippetsDelete
|
||||||
description: delete method docstring
|
description: delete method docstring
|
||||||
parameters: []
|
parameters:
|
||||||
|
- name: id
|
||||||
|
in: path
|
||||||
|
description: path parameter override
|
||||||
|
required: true
|
||||||
|
type: integer
|
||||||
responses:
|
responses:
|
||||||
'204':
|
'204':
|
||||||
description: ''
|
description: ''
|
||||||
@@ -1108,8 +1117,7 @@ definitions:
|
|||||||
items:
|
items:
|
||||||
type: string
|
type: string
|
||||||
format: slug
|
format: slug
|
||||||
pattern: ^[-a-zA-Z0-9_]+\Z
|
pattern: ^[-a-zA-Z0-9_]+$
|
||||||
readOnly: true
|
|
||||||
readOnly: true
|
readOnly: true
|
||||||
uniqueItems: true
|
uniqueItems: true
|
||||||
securityDefinitions:
|
securityDefinitions:
|
||||||
|
|||||||
@@ -0,0 +1,92 @@
|
|||||||
|
from six import StringIO
|
||||||
|
|
||||||
|
import json
|
||||||
|
import os
|
||||||
|
import random
|
||||||
|
import string
|
||||||
|
import tempfile
|
||||||
|
from collections import OrderedDict
|
||||||
|
|
||||||
|
import pytest
|
||||||
|
from django.contrib.auth.models import User
|
||||||
|
from django.core.management import call_command
|
||||||
|
|
||||||
|
from drf_yasg.codecs import yaml_sane_load
|
||||||
|
|
||||||
|
|
||||||
|
def call_generate_swagger(output_file='-', overwrite=False, format='', api_url='',
|
||||||
|
mock=False, user='', private=False, **kwargs):
|
||||||
|
out = StringIO()
|
||||||
|
call_command(
|
||||||
|
'generate_swagger', stdout=out,
|
||||||
|
output_file=output_file, overwrite=overwrite, format=format,
|
||||||
|
api_url=api_url, mock=mock, user=user, private=private,
|
||||||
|
**kwargs
|
||||||
|
)
|
||||||
|
return out.getvalue()
|
||||||
|
|
||||||
|
|
||||||
|
def test_reference_schema(db, reference_schema):
|
||||||
|
User.objects.create_superuser('admin', 'admin@admin.admin', 'blabla')
|
||||||
|
|
||||||
|
output = call_generate_swagger(format='yaml', api_url='http://test.local:8002/', user='admin')
|
||||||
|
output_schema = yaml_sane_load(output)
|
||||||
|
assert output_schema == reference_schema
|
||||||
|
|
||||||
|
|
||||||
|
def test_non_public(db):
|
||||||
|
output = call_generate_swagger(format='yaml', api_url='http://test.local:8002/', private=True)
|
||||||
|
output_schema = yaml_sane_load(output)
|
||||||
|
assert len(output_schema['paths']) == 0
|
||||||
|
|
||||||
|
|
||||||
|
def test_no_mock(db):
|
||||||
|
output = call_generate_swagger()
|
||||||
|
output_schema = json.loads(output, object_pairs_hook=OrderedDict)
|
||||||
|
assert len(output_schema['paths']) > 0
|
||||||
|
|
||||||
|
|
||||||
|
def silentremove(filename):
|
||||||
|
try:
|
||||||
|
os.remove(filename)
|
||||||
|
except OSError:
|
||||||
|
pass
|
||||||
|
|
||||||
|
|
||||||
|
def test_file_output(db):
|
||||||
|
prefix = os.path.join(tempfile.gettempdir(), tempfile.gettempprefix())
|
||||||
|
name = ''.join(random.choice(string.ascii_lowercase + string.digits) for _ in range(8))
|
||||||
|
yaml_file = prefix + name + '.yaml'
|
||||||
|
json_file = prefix + name + '.json'
|
||||||
|
other_file = prefix + name + '.txt'
|
||||||
|
|
||||||
|
try:
|
||||||
|
# when called with output file nothing should be written to stdout
|
||||||
|
assert call_generate_swagger(output_file=yaml_file) == ''
|
||||||
|
assert call_generate_swagger(output_file=json_file) == ''
|
||||||
|
assert call_generate_swagger(output_file=other_file) == ''
|
||||||
|
|
||||||
|
with pytest.raises(OSError):
|
||||||
|
# a second call should fail because file exists
|
||||||
|
call_generate_swagger(output_file=yaml_file)
|
||||||
|
|
||||||
|
# a second call with overwrite should still succeed
|
||||||
|
assert call_generate_swagger(output_file=json_file, overwrite=True) == ''
|
||||||
|
|
||||||
|
with open(yaml_file) as f:
|
||||||
|
content = f.read()
|
||||||
|
# YAML is a superset of JSON - that means we have to check that
|
||||||
|
# the file is really YAML and not just JSON parsed by the YAML parser
|
||||||
|
with pytest.raises(ValueError):
|
||||||
|
json.loads(content)
|
||||||
|
output_yaml = yaml_sane_load(content)
|
||||||
|
with open(json_file) as f:
|
||||||
|
output_json = json.load(f, object_pairs_hook=OrderedDict)
|
||||||
|
with open(other_file) as f:
|
||||||
|
output_other = json.load(f, object_pairs_hook=OrderedDict)
|
||||||
|
|
||||||
|
assert output_yaml == output_json == output_other
|
||||||
|
finally:
|
||||||
|
silentremove(yaml_file)
|
||||||
|
silentremove(json_file)
|
||||||
|
silentremove(other_file)
|
||||||
@@ -1,21 +1,13 @@
|
|||||||
|
import json
|
||||||
from collections import OrderedDict
|
from collections import OrderedDict
|
||||||
|
|
||||||
from datadiff.tools import assert_equal
|
from drf_yasg import openapi
|
||||||
|
from drf_yasg.generators import OpenAPISchemaGenerator
|
||||||
from drf_yasg.codecs import yaml_sane_dump
|
from drf_yasg.inspectors import FieldInspector, FilterInspector, PaginatorInspector, SerializerInspector
|
||||||
from drf_yasg.inspectors import FieldInspector, SerializerInspector, PaginatorInspector, FilterInspector
|
|
||||||
|
|
||||||
|
|
||||||
def test_reference_schema(swagger_dict, reference_schema):
|
def test_reference_schema(swagger_dict, reference_schema, compare_schemas):
|
||||||
swagger_dict = OrderedDict(swagger_dict)
|
compare_schemas(swagger_dict, reference_schema)
|
||||||
reference_schema = OrderedDict(reference_schema)
|
|
||||||
ignore = ['info', 'host', 'schemes', 'basePath', 'securityDefinitions']
|
|
||||||
for attr in ignore:
|
|
||||||
swagger_dict.pop(attr, None)
|
|
||||||
reference_schema.pop(attr, None)
|
|
||||||
|
|
||||||
# print diff between YAML strings because it's prettier
|
|
||||||
assert_equal(yaml_sane_dump(swagger_dict, binary=False), yaml_sane_dump(reference_schema, binary=False))
|
|
||||||
|
|
||||||
|
|
||||||
class NoOpFieldInspector(FieldInspector):
|
class NoOpFieldInspector(FieldInspector):
|
||||||
@@ -34,13 +26,23 @@ class NoOpPaginatorInspector(PaginatorInspector):
|
|||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
||||||
def test_noop_inspectors(swagger_settings, swagger_dict, reference_schema):
|
def test_noop_inspectors(swagger_settings, mock_schema_request, codec_json, reference_schema, compare_schemas):
|
||||||
from drf_yasg import app_settings
|
from drf_yasg import app_settings
|
||||||
|
|
||||||
def set_inspectors(inspectors, setting_name):
|
def set_inspectors(inspectors, setting_name):
|
||||||
|
inspectors = [__name__ + '.' + inspector.__name__ for inspector in inspectors]
|
||||||
swagger_settings[setting_name] = inspectors + app_settings.SWAGGER_DEFAULTS[setting_name]
|
swagger_settings[setting_name] = inspectors + app_settings.SWAGGER_DEFAULTS[setting_name]
|
||||||
|
|
||||||
set_inspectors([NoOpFieldInspector, NoOpSerializerInspector], 'DEFAULT_FIELD_INSPECTORS')
|
set_inspectors([NoOpFieldInspector, NoOpSerializerInspector], 'DEFAULT_FIELD_INSPECTORS')
|
||||||
set_inspectors([NoOpFilterInspector], 'DEFAULT_FILTER_INSPECTORS')
|
set_inspectors([NoOpFilterInspector], 'DEFAULT_FILTER_INSPECTORS')
|
||||||
set_inspectors([NoOpPaginatorInspector], 'DEFAULT_PAGINATOR_INSPECTORS')
|
set_inspectors([NoOpPaginatorInspector], 'DEFAULT_PAGINATOR_INSPECTORS')
|
||||||
test_reference_schema(swagger_dict, reference_schema)
|
|
||||||
|
generator = OpenAPISchemaGenerator(
|
||||||
|
info=openapi.Info(title="Test generator", default_version="v1"),
|
||||||
|
version="v2",
|
||||||
|
)
|
||||||
|
swagger = generator.get_schema(mock_schema_request, True)
|
||||||
|
|
||||||
|
json_bytes = codec_json.encode(swagger)
|
||||||
|
swagger_dict = json.loads(json_bytes.decode('utf-8'), object_pairs_hook=OrderedDict)
|
||||||
|
compare_schemas(swagger_dict, reference_schema)
|
||||||
|
|||||||
@@ -3,8 +3,9 @@ from collections import OrderedDict
|
|||||||
|
|
||||||
import pytest
|
import pytest
|
||||||
|
|
||||||
from drf_yasg import openapi, codecs
|
from drf_yasg import codecs, openapi
|
||||||
from drf_yasg.codecs import yaml_sane_load
|
from drf_yasg.codecs import yaml_sane_load
|
||||||
|
from drf_yasg.errors import SwaggerGenerationError
|
||||||
from drf_yasg.generators import OpenAPISchemaGenerator
|
from drf_yasg.generators import OpenAPISchemaGenerator
|
||||||
|
|
||||||
|
|
||||||
@@ -46,14 +47,23 @@ def test_yaml_and_json_match(codec_yaml, codec_json, swagger):
|
|||||||
|
|
||||||
|
|
||||||
def test_basepath_only(mock_schema_request):
|
def test_basepath_only(mock_schema_request):
|
||||||
|
with pytest.raises(SwaggerGenerationError):
|
||||||
|
generator = OpenAPISchemaGenerator(
|
||||||
|
info=openapi.Info(title="Test generator", default_version="v1"),
|
||||||
|
version="v2",
|
||||||
|
url='/basepath/',
|
||||||
|
)
|
||||||
|
|
||||||
|
generator.get_schema(mock_schema_request, public=True)
|
||||||
|
|
||||||
|
|
||||||
|
def test_no_netloc(mock_schema_request):
|
||||||
generator = OpenAPISchemaGenerator(
|
generator = OpenAPISchemaGenerator(
|
||||||
info=openapi.Info(title="Test generator", default_version="v1"),
|
info=openapi.Info(title="Test generator", default_version="v1"),
|
||||||
version="v2",
|
version="v2",
|
||||||
url='/basepath/',
|
url='',
|
||||||
)
|
)
|
||||||
|
|
||||||
swagger = generator.get_schema(mock_schema_request, public=True)
|
swagger = generator.get_schema(mock_schema_request, public=True)
|
||||||
assert 'host' not in swagger
|
assert 'host' not in swagger and 'schemes' not in swagger
|
||||||
assert 'schemes' not in swagger
|
|
||||||
assert swagger['basePath'] == '/' # base path is not implemented for now
|
|
||||||
assert swagger['info']['version'] == 'v2'
|
assert swagger['info']['version'] == 'v2'
|
||||||
|
|||||||
@@ -52,10 +52,7 @@ def test_caching(client, validate_schema):
|
|||||||
prev_schema = None
|
prev_schema = None
|
||||||
|
|
||||||
for i in range(3):
|
for i in range(3):
|
||||||
_validate_ui_schema_view(client, '/cached/redoc/', 'redoc/redoc.min.js')
|
_validate_text_schema_view(client, validate_schema, '/cached/swagger.yaml', yaml_sane_load)
|
||||||
_validate_text_schema_view(client, validate_schema, '/cached/redoc/?format=openapi', json.loads)
|
|
||||||
_validate_ui_schema_view(client, '/cached/swagger/', 'swagger-ui-dist/swagger-ui-bundle.js')
|
|
||||||
_validate_text_schema_view(client, validate_schema, '/cached/swagger/?format=openapi', json.loads)
|
|
||||||
|
|
||||||
json_schema = client.get('/cached/swagger.json')
|
json_schema = client.get('/cached/swagger.json')
|
||||||
assert json_schema.status_code == 200
|
assert json_schema.status_code == 200
|
||||||
|
|||||||
+15
-18
@@ -4,24 +4,25 @@ from drf_yasg.codecs import yaml_sane_load
|
|||||||
|
|
||||||
|
|
||||||
def _get_versioned_schema(prefix, client, validate_schema):
|
def _get_versioned_schema(prefix, client, validate_schema):
|
||||||
response = client.get(prefix + 'swagger.yaml')
|
response = client.get(prefix + '/swagger.yaml')
|
||||||
assert response.status_code == 200
|
assert response.status_code == 200
|
||||||
swagger = yaml_sane_load(response.content.decode('utf-8'))
|
swagger = yaml_sane_load(response.content.decode('utf-8'))
|
||||||
|
assert swagger['basePath'] == prefix
|
||||||
validate_schema(swagger)
|
validate_schema(swagger)
|
||||||
assert prefix + 'snippets/' in swagger['paths']
|
assert '/snippets/' in swagger['paths']
|
||||||
return swagger
|
return swagger
|
||||||
|
|
||||||
|
|
||||||
def _check_v1(swagger, prefix):
|
def _check_v1(swagger):
|
||||||
assert swagger['info']['version'] == '1.0'
|
assert swagger['info']['version'] == '1.0'
|
||||||
versioned_post = swagger['paths'][prefix + 'snippets/']['post']
|
versioned_post = swagger['paths']['/snippets/']['post']
|
||||||
assert versioned_post['responses']['201']['schema']['$ref'] == '#/definitions/Snippet'
|
assert versioned_post['responses']['201']['schema']['$ref'] == '#/definitions/Snippet'
|
||||||
assert 'v2field' not in swagger['definitions']['Snippet']['properties']
|
assert 'v2field' not in swagger['definitions']['Snippet']['properties']
|
||||||
|
|
||||||
|
|
||||||
def _check_v2(swagger, prefix):
|
def _check_v2(swagger):
|
||||||
assert swagger['info']['version'] == '2.0'
|
assert swagger['info']['version'] == '2.0'
|
||||||
versioned_post = swagger['paths'][prefix + 'snippets/']['post']
|
versioned_post = swagger['paths']['/snippets/']['post']
|
||||||
assert versioned_post['responses']['201']['schema']['$ref'] == '#/definitions/SnippetV2'
|
assert versioned_post['responses']['201']['schema']['$ref'] == '#/definitions/SnippetV2'
|
||||||
assert 'v2field' in swagger['definitions']['SnippetV2']['properties']
|
assert 'v2field' in swagger['definitions']['SnippetV2']['properties']
|
||||||
v2field = swagger['definitions']['SnippetV2']['properties']['v2field']
|
v2field = swagger['definitions']['SnippetV2']['properties']['v2field']
|
||||||
@@ -30,27 +31,23 @@ def _check_v2(swagger, prefix):
|
|||||||
|
|
||||||
@pytest.mark.urls('urlconfs.url_versioning')
|
@pytest.mark.urls('urlconfs.url_versioning')
|
||||||
def test_url_v1(client, validate_schema):
|
def test_url_v1(client, validate_schema):
|
||||||
prefix = '/versioned/url/v1.0/'
|
swagger = _get_versioned_schema('/versioned/url/v1.0', client, validate_schema)
|
||||||
swagger = _get_versioned_schema(prefix, client, validate_schema)
|
_check_v1(swagger)
|
||||||
_check_v1(swagger, prefix)
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.urls('urlconfs.url_versioning')
|
@pytest.mark.urls('urlconfs.url_versioning')
|
||||||
def test_url_v2(client, validate_schema):
|
def test_url_v2(client, validate_schema):
|
||||||
prefix = '/versioned/url/v2.0/'
|
swagger = _get_versioned_schema('/versioned/url/v2.0', client, validate_schema)
|
||||||
swagger = _get_versioned_schema(prefix, client, validate_schema)
|
_check_v2(swagger)
|
||||||
_check_v2(swagger, prefix)
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.urls('urlconfs.ns_versioning')
|
@pytest.mark.urls('urlconfs.ns_versioning')
|
||||||
def test_ns_v1(client, validate_schema):
|
def test_ns_v1(client, validate_schema):
|
||||||
prefix = '/versioned/ns/v1.0/'
|
swagger = _get_versioned_schema('/versioned/ns/v1.0', client, validate_schema)
|
||||||
swagger = _get_versioned_schema(prefix, client, validate_schema)
|
_check_v1(swagger)
|
||||||
_check_v1(swagger, prefix)
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.urls('urlconfs.ns_versioning')
|
@pytest.mark.urls('urlconfs.ns_versioning')
|
||||||
def test_ns_v2(client, validate_schema):
|
def test_ns_v2(client, validate_schema):
|
||||||
prefix = '/versioned/ns/v2.0/'
|
swagger = _get_versioned_schema('/versioned/ns/v2.0', client, validate_schema)
|
||||||
swagger = _get_versioned_schema(prefix, client, validate_schema)
|
_check_v2(swagger)
|
||||||
_check_v2(swagger, prefix)
|
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
from django.conf.urls import url
|
from django.conf.urls import include, url
|
||||||
from django.conf.urls import include
|
|
||||||
from rest_framework import permissions
|
from rest_framework import permissions
|
||||||
|
|
||||||
import testproj.urls
|
import testproj.urls
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ from django.conf.urls import url
|
|||||||
from rest_framework import fields
|
from rest_framework import fields
|
||||||
|
|
||||||
from snippets.serializers import SnippetSerializer
|
from snippets.serializers import SnippetSerializer
|
||||||
|
|
||||||
from .ns_version1 import SnippetList as SnippetListV1
|
from .ns_version1 import SnippetList as SnippetListV1
|
||||||
|
|
||||||
|
|
||||||
@@ -16,7 +17,7 @@ class SnippetListV2(SnippetListV1):
|
|||||||
serializer_class = SnippetSerializerV2
|
serializer_class = SnippetSerializerV2
|
||||||
|
|
||||||
|
|
||||||
app_name = 'test_ns_versioning'
|
app_name = '2.0'
|
||||||
|
|
||||||
urlpatterns = [
|
urlpatterns = [
|
||||||
url(r"^$", SnippetListV2.as_view())
|
url(r"^$", SnippetListV2.as_view())
|
||||||
|
|||||||
@@ -1,7 +1,8 @@
|
|||||||
from django.conf.urls import url, include
|
from django.conf.urls import include, url
|
||||||
from rest_framework import versioning
|
from rest_framework import versioning
|
||||||
|
|
||||||
from testproj.urls import SchemaView
|
from testproj.urls import SchemaView
|
||||||
|
|
||||||
from . import ns_version1, ns_version2
|
from . import ns_version1, ns_version2
|
||||||
|
|
||||||
VERSION_PREFIX_NS = r"^versioned/ns/"
|
VERSION_PREFIX_NS = r"^versioned/ns/"
|
||||||
@@ -18,7 +19,7 @@ schema_patterns = [
|
|||||||
|
|
||||||
urlpatterns = [
|
urlpatterns = [
|
||||||
url(VERSION_PREFIX_NS + r"v1.0/snippets/", include(ns_version1, namespace='1.0')),
|
url(VERSION_PREFIX_NS + r"v1.0/snippets/", include(ns_version1, namespace='1.0')),
|
||||||
url(VERSION_PREFIX_NS + r"v2.0/snippets/", include(ns_version2, namespace='2.0')),
|
url(VERSION_PREFIX_NS + r"v2.0/snippets/", include(ns_version2)),
|
||||||
url(VERSION_PREFIX_NS + r'v1.0/', include((schema_patterns, '1.0'))),
|
url(VERSION_PREFIX_NS + r'v1.0/', include((schema_patterns, '1.0'))),
|
||||||
url(VERSION_PREFIX_NS + r'v2.0/', include((schema_patterns, '2.0'))),
|
url(VERSION_PREFIX_NS + r'v2.0/', include((schema_patterns, '2.0'))),
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
from django.conf.urls import url
|
from django.conf.urls import url
|
||||||
from rest_framework import generics, versioning, fields
|
from rest_framework import fields, generics, versioning
|
||||||
|
|
||||||
from snippets.models import Snippet
|
from snippets.models import Snippet
|
||||||
from snippets.serializers import SnippetSerializer
|
from snippets.serializers import SnippetSerializer
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
[tox]
|
[tox]
|
||||||
envlist =
|
envlist =
|
||||||
py27-drf37,
|
py27-django111-drf37,
|
||||||
py{34,35,36,37}-drf37,
|
py{34,35,36}-django{111,20}-drf37,
|
||||||
py36-drfmaster,
|
py36-drfmaster,
|
||||||
flake8, docs
|
lint, docs
|
||||||
|
|
||||||
[travis:env]
|
[travis:env]
|
||||||
DRF =
|
DRF =
|
||||||
@@ -12,33 +12,29 @@ DRF =
|
|||||||
|
|
||||||
[testenv]
|
[testenv]
|
||||||
deps =
|
deps =
|
||||||
|
django111: Django>=1.11,<2.0
|
||||||
|
django20: Django>=2.0,<2.1
|
||||||
|
|
||||||
drf37: djangorestframework>=3.7.3,<3.8
|
drf37: djangorestframework>=3.7.3,<3.8
|
||||||
|
|
||||||
# py27 is tested with Django <2.0 (Django 2.0 no longer supports python 2)
|
# test with the latest build of Django and django-rest-framework to get early warning of compatibility issues
|
||||||
py27: Django>=1.11,<2.0
|
|
||||||
|
|
||||||
# main testing configurations
|
|
||||||
py{34,35,36,37}-drf37: Django>=1.11,<2.1
|
|
||||||
|
|
||||||
# py3 with the latest build of Django and django-rest-framework to get early warning of compatibility issues
|
|
||||||
drfmaster: https://github.com/encode/django-rest-framework/archive/master.tar.gz
|
drfmaster: https://github.com/encode/django-rest-framework/archive/master.tar.gz
|
||||||
drfmaster: https://github.com/django/django/archive/master.tar.gz
|
drfmaster: https://github.com/django/django/archive/master.tar.gz
|
||||||
|
|
||||||
# other dependencies
|
# other dependencies
|
||||||
-rrequirements/base.txt
|
|
||||||
-rrequirements/validation.txt
|
-rrequirements/validation.txt
|
||||||
-rrequirements/test.txt
|
-rrequirements/test.txt
|
||||||
|
|
||||||
commands =
|
commands =
|
||||||
pytest --cov-config .coveragerc --cov-append --cov {posargs}
|
pytest --cov --cov-config .coveragerc --cov-append --cov-report="" {posargs}
|
||||||
|
|
||||||
[testenv:py36-drfmaster]
|
[testenv:py36-drfmaster]
|
||||||
pip_pre = True
|
pip_pre = True
|
||||||
|
|
||||||
[testenv:flake8]
|
[testenv:lint]
|
||||||
skip_install = true
|
skip_install = true
|
||||||
deps =
|
deps =
|
||||||
flake8
|
-rrequirements/lint.txt
|
||||||
commands =
|
commands =
|
||||||
flake8 src/drf_yasg testproj tests setup.py
|
flake8 src/drf_yasg testproj tests setup.py
|
||||||
|
|
||||||
@@ -47,12 +43,31 @@ deps =
|
|||||||
-rrequirements/docs.txt
|
-rrequirements/docs.txt
|
||||||
commands =
|
commands =
|
||||||
python setup.py check --restructuredtext --metadata --strict
|
python setup.py check --restructuredtext --metadata --strict
|
||||||
sphinx-build -WnEa -b html docs docs\_build\html
|
sphinx-build -WnEa -b html docs docs/_build/html
|
||||||
|
|
||||||
[pytest]
|
[pytest]
|
||||||
DJANGO_SETTINGS_MODULE = testproj.settings
|
DJANGO_SETTINGS_MODULE = testproj.settings.local
|
||||||
python_paths = testproj
|
python_paths = testproj
|
||||||
|
addopts = -n 3
|
||||||
|
|
||||||
[flake8]
|
[flake8]
|
||||||
max-line-length = 120
|
max-line-length = 120
|
||||||
exclude = **/migrations/*
|
exclude = **/migrations/*
|
||||||
|
ignore = F405
|
||||||
|
|
||||||
|
[isort]
|
||||||
|
skip = .eggs,.tox,docs,env,venv
|
||||||
|
skip_glob = **/migrations/*
|
||||||
|
not_skip = __init__.py
|
||||||
|
atomic = true
|
||||||
|
multi_line_output = 5
|
||||||
|
line_length = 120
|
||||||
|
known_future_library = future,six
|
||||||
|
known_standard_library =
|
||||||
|
collections,copy,distutils,functools,inspect,io,json,logging,operator,os,pkg_resources,re,setuptools,sys,
|
||||||
|
types,warnings
|
||||||
|
known_third_party =
|
||||||
|
coreapi,coreschema,datadiff,dj_database_url,django,django_filters,djangorestframework_camel_case,flex,gunicorn,
|
||||||
|
inflection,pygments,pytest,rest_framework,ruamel,setuptools_scm,swagger_spec_validator,uritemplate,user_agents,
|
||||||
|
whitenoise
|
||||||
|
known_first_party = drf_yasg,testproj,articles,snippets,users,urlconfs
|
||||||
|
|||||||
+9
-4
@@ -1,7 +1,12 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
set -e
|
set -ev
|
||||||
|
|
||||||
npm update
|
npm update
|
||||||
cp node_modules/redoc/dist/redoc.min.js src/drf_yasg/static/drf-yasg/redoc/redoc.min.js
|
npm install -g --prefix ./node_modules/redoc-alpha redoc@latest
|
||||||
|
|
||||||
|
cp node_modules/redoc/dist/redoc.min.js src/drf_yasg/static/drf-yasg/redoc/
|
||||||
|
cp node_modules/redoc-alpha/node_modules/redoc/bundles/redoc.standalone.js src/drf_yasg/static/drf-yasg/redoc-alpha/
|
||||||
cp -r node_modules/swagger-ui-dist src/drf_yasg/static/drf-yasg/
|
cp -r node_modules/swagger-ui-dist src/drf_yasg/static/drf-yasg/
|
||||||
rm -f src/drf_yasg/static/drf-yasg/swagger-ui-dist/package.json src/drf_yasg/static/drf-yasg/swagger-ui-dist/.npmignore
|
pushd src/drf_yasg/static/drf-yasg/swagger-ui-dist/ >/dev/null
|
||||||
|
rm -f package.json .npmignore README.md
|
||||||
|
rm -f index.html *.map
|
||||||
|
popd >/dev/null
|
||||||
|
|||||||
Reference in New Issue
Block a user