Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

refactor: metadata parsing #3308

Draft
wants to merge 18 commits into
base: v3.0
Choose a base branch
from
Draft

refactor: metadata parsing #3308

wants to merge 18 commits into from

Conversation

peterschutt
Copy link
Contributor

As spoken about in discord recently, the objective of the litestar.typing module was to have a simple interface to represent types. However, a lot of logic to do with schema constraint parsing has made its way in there, which has been the source of many bugs and hard to follow logic. This bit me again today as the root of a circular import problem.

This PR attempts to move metadata parsing to where it is needed, and where it has the context of the library/framework from where the metadata originates.

WIP - not sure if feasible, but lets see.

Description

Closes

cofin and others added 18 commits March 18, 2024 18:06
In some cases, I've wanted to change the name of the "Application" to show something else instead of "Litestar".  This is usually to make a CLI feel more cohesive and part of a larger application.  In the same vein, I've found cases where I wanted to complete suppress the initial `from_env` or the Rich info table at startup.
---------

Co-authored-by: Janek Nouvertné <25355197+provinzkraut@users.noreply.github.com>
Co-authored-by: Jacob Coffee <jacob@z7x.org>
* refactor: openapi router

This PR refactors the way that we support multiple UIs for OpenAPI.

We add `litestar.openapi.plugins` where `OpenAPIRenderPlugin` is defined, and implementations of that plugin for the frameworks we currently support.

We add `OpenAPIConfig.render_plugins` config option, where a user can explicitly declare a set of plugins for UIs they wish to support.

If a user declares a sub-class of `OpenAPIController` at `OpenAPIConfig.openapi_controller`, then existing behavior is preserved exactly.

However, if no controller is explicitly declared, we invoke the new router-based approach, which should behave identically to the controller based approach (i.e., respect `enabled_endpoints` and `root_schema_site`).

Closes #2541

* docs: start of documentation re-write.

- creates an indexed directory for openapi
- removes the controller docs
- start of docs for plugins

* refactor: move JsonRenderPlugin into private ns

We add the json plugin, and have hardcoded refs to the path that it serves, so best not to make this public API just yet.

* docs: reference docs for plugins

* Revert "refactor: move JsonRenderPlugin into private ns"

This reverts commit 60719aa.

* docs: JsonRenderPlugin undocumented.

* docs: continue plugin docs

* test: run tests for both plugin and controller

Modifies tests where appropriate to run on both the plugin-based approach and the controller based approach.

* Implement default endpoint selection logic.

* Deprecation of OpenAPIController configs

* docs: swagger oauth examples

* Update docs/usage/openapi/ui_plugins.rst

* Update docs/usage/openapi/ui_plugins.rst

* fix: linting

* refactor: don't rely on DI for openapi schema in plugin handler.

* fix(test): there's an extra schema route to serve 404s.

* fix(docs): docstring indent

* fix(lint): remove redundant return

* refactor: plugins receive style tag instead of tag content.

* feat: allow openapi router to be handed to openapi config.

Allows for customization, such as adding guards, middleware, other routes, etc.

* feat: add `scalar` schema ui (#2906)

* Update litestar/openapi/plugins.py

Co-authored-by: Jacob Coffee <jacob@z7x.org>

* Update litestar/openapi/plugins.py

Co-authored-by: Jacob Coffee <jacob@z7x.org>

* Update litestar/openapi/plugins.py

Co-authored-by: Jacob Coffee <jacob@z7x.org>

* Update litestar/openapi/config.py

Co-authored-by: Jacob Coffee <jacob@z7x.org>

* Update litestar/openapi/config.py

Co-authored-by: Jacob Coffee <jacob@z7x.org>

* fix: update deprecation version

* fix: use GH repo for scalar links

* fix: update default scalar version

* fix: scalar plugin style attribute render.

Plugins expect that the style value is already wrapped in `<style>` tags.

* fix: serve default static files via jsdeliver

* fix: docstring syntax

* fix: removes custom repr

Can always add if there's a need for it, but we aren't using it.

* docs: another pass

* fix: style

* fix: test for updated build openapi plugin example

* fix: absolute paths for openapi.json

Resolves #3047 for the openapi router case.

* refactor: simplify scalar plugin.

* fix: linting

* Update litestar/_openapi/plugin.py

* refactor: test app to use scalar ui plugin

* fix: plugin customization example

Version arg is ignored if `js_url` is provided.

* fix: remove unnecessary kwargs

Removes passing default values to plugin kwargs in examples.

* fix: grammar error

* feat: make OpenAPIRenderPlugin an ABC

Abstract on `render()` method.

* fix: correct referenced lines

Referenced LoC in example had drifted.

* fix: more small docs corrections

* chore: remove dup spec of enabled endpoints.

* fix: simplify test.

---------

Co-authored-by: Jacob Coffee <jacob@z7x.org>
* Enable DTO codegen backend by default
* Update docs
* feat: Added precedence of CLI parameters over envs

* Update docs/usage/cli.rst

Co-authored-by: Peter Schutt <peter.github@proton.me>

* Remove redundant LitestarEnv fields and fix tests

* Update docs/usage/cli.rst

* Update litestar/cli/commands/core.py

* Update docs/usage/cli.rst

* Update docs/usage/cli.rst

* Update litestar/cli/commands/core.py

---------

Co-authored-by: kedod <kedod>
Co-authored-by: Peter Schutt <peter.github@proton.me>
Co-authored-by: Jacob Coffee <jacob@z7x.org>
* feat: Support `schema_extra` in `Parameter` and `Body` (#3022)

This adds sort of a backdoor for modifying the generated OpenAPI spec.

The value is given as `dict[str, Any]` where the key must match with the
keyword parameter name in `Schema`. The values are used to override items in
the generated `Schema` object, so they must be in correct types (ie. not in
dictionary/json format).

The values are added at main level, without recursive merging (because we're
adjusting `Schema` object and not a dictionary). Recursive merge would be much
more work.

Chose not to implement the same for `ResponseSpec` because response models are
generated as schema components, while `ResponseSpec` can be locally different.
Handling the logic of creating new components when `schema_extra` is passed in
`ResponseSpec` would be extra effort, and isn't probably as important as being
able to adjust the inbound parameters, which are actually validated (and for
which the documentation is even more important, than for the response).

* Update litestar/params.py

Co-authored-by: Jacob Coffee <jacob@z7x.org>

* Update litestar/params.py

Co-authored-by: Jacob Coffee <jacob@z7x.org>

* Update litestar/params.py

Co-authored-by: Jacob Coffee <jacob@z7x.org>

---------

Co-authored-by: Jacob Coffee <jacob@z7x.org>
Adds deprecated directives for the deprecated parameters of the config.

Adds some cross-references.
* feat: add typevar expansion #3240

* chore: resolve all PR suggestion #3242

* chore: resolve import formatting

* chore: resolve import formatting
* adding draft for security exclusion docs

* adding section to security toctree

* Update docs/usage/security/excluding-and-including-endpoints.rst

* Update docs/usage/security/excluding-and-including-endpoints.rst

* Update docs/usage/security/excluding-and-including-endpoints.rst

---------

Co-authored-by: Jacob Coffee <jacob@z7x.org>
* feat: Add LITESTAR_ prefix for web concurrency env option

* Replace depacrated with versionchanged directive

* Change wc option description

* Remove depracation warning

---------

Co-authored-by: kedod <kedod>
This PR aims to change our approach of parsing schema metadata from an indiscriminate ducktype approach to a deliberate approach with situational awareness.

For parameter declarations, we should only parse schema metadata from instances of `KwargDefinition` and sub-types.

For model parsing, including dataclasses, typeddict and 3rd party modelling libraries, we should only parse metadata according to that modelling libraries supported methods of constraint delivery.

For #3202
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

9 participants