updated vendored openapi_schema_pydantic / correct oai false negative

validation

Author: Nementon

openapi_python_client/schema/openapi_schema_pydantic/README.md

@@ -1,5 +1,8 @@
 Everything in this directory (including the rest of this file after this paragraph) is a vendored copy of [openapi-schem-pydantic](https://github.com/kuimono/openapi-schema-pydantic) and is licensed under the LICENSE file in this directory.
 
+Included vendored version is the [following](https://github.com/kuimono/openapi-schema-pydantic/commit/0836b429086917feeb973de3367a7ac4c2b3a665)
+Small patches has been applied to it.
+
 ## Alias
 
 Due to the reserved words in python and pydantic,

openapi_python_client/schema/openapi_schema_pydantic/__init__.py

@@ -38,32 +38,34 @@
     "XML",
 ]
 
-from .components import Components
-from .contact import Contact
-from .discriminator import Discriminator
-from .encoding import Encoding
-from .example import Example
-from .external_documentation import ExternalDocumentation
-from .header import Header
+
+from .open_api import OpenAPI
 from .info import Info
+from .contact import Contact
 from .license import License
-from .link import Link
-from .media_type import MediaType
-from .oauth_flow import OAuthFlow
-from .oauth_flows import OAuthFlows
-from .open_api import OpenAPI
+from .server import Server
+from .server_variable import ServerVariable
+from .components import Components
+from .paths import Paths
+from .path_item import PathItem
 from .operation import Operation
+from .external_documentation import ExternalDocumentation
 from .parameter import Parameter
-from .path_item import PathItem
-from .paths import Paths
-from .reference import Reference
 from .request_body import RequestBody
-from .response import Response
+from .media_type import MediaType
+from .encoding import Encoding
 from .responses import Responses
-from .schema import Schema
-from .security_requirement import SecurityRequirement
-from .security_scheme import SecurityScheme
-from .server import Server
-from .server_variable import ServerVariable
+from .response import Response
+from .callback import Callback
+from .example import Example
+from .link import Link
+from .header import Header
 from .tag import Tag
+from .reference import Reference
+from .schema import Schema
+from .discriminator import Discriminator
 from .xml import XML
+from .security_scheme import SecurityScheme
+from .oauth_flows import OAuthFlows
+from .oauth_flow import OAuthFlow
+from .security_requirement import SecurityRequirement

openapi_python_client/schema/openapi_schema_pydantic/callback.py

@@ -0,0 +1,20 @@
+from typing import Dict
+
+
+Callback = Dict[str, "PathItem"]
+"""
+A map of possible out-of band callbacks related to the parent operation.
+Each value in the map is a [Path Item Object](#pathItemObject)
+that describes a set of requests that may be initiated by the API provider and the expected responses.
+The key value used to identify the path item object is an expression, evaluated at runtime,
+that identifies a URL to use for the callback operation.
+"""
+
+"""Patterned Fields"""
+
+# {expression}: 'PathItem' = ...
+"""
+A Path Item Object used to define a callback request and expected responses.
+
+A [complete example](../examples/v3.0/callback-example.yaml) is available.
+"""

openapi_python_client/schema/openapi_schema_pydantic/components.py

@@ -1,7 +1,8 @@
 from typing import Dict, Optional, Union
 
-from pydantic import BaseModel
+from pydantic import BaseModel, Extra
 
+from .callback import Callback
 from .example import Example
 from .header import Header
 from .link import Link
@@ -44,7 +45,11 @@ class Components(BaseModel):
     links: Optional[Dict[str, Union[Link, Reference]]] = None
     """An object to hold reusable [Link Objects](#linkObject)."""
 
+    callbacks: Optional[Dict[str, Union[Callback, Reference]]] = None
+    """An object to hold reusable [Callback Objects](#callbackObject)."""
+
     class Config:
+        extra = Extra.forbid
         schema_extra = {
             "examples": [
                 {

openapi_python_client/schema/openapi_schema_pydantic/contact.py

@@ -1,6 +1,6 @@
 from typing import Optional
 
-from pydantic import AnyUrl, BaseModel
+from pydantic import AnyUrl, BaseModel, Extra
 
 
 class Contact(BaseModel):
@@ -26,6 +26,7 @@ class Contact(BaseModel):
     """
 
     class Config:
+        extra = Extra.forbid
         schema_extra = {
             "examples": [
                 {"name": "API Support", "url": "http://www.example.com/support", "email": "[email protected]"}

openapi_python_client/schema/openapi_schema_pydantic/discriminator.py

@@ -1,6 +1,6 @@
 from typing import Dict, Optional
 
-from pydantic import BaseModel
+from pydantic import BaseModel, Extra
 
 
 class Discriminator(BaseModel):
@@ -14,7 +14,7 @@ class Discriminator(BaseModel):
     When using the discriminator, _inline_ schemas will not be considered.
     """
 
-    propertyName: str
+    propertyName: str = ...
     """
     **REQUIRED**. The name of the property in the payload that will hold the discriminator value.
     """
@@ -25,6 +25,7 @@ class Discriminator(BaseModel):
     """
 
     class Config:
+        extra = Extra.forbid
         schema_extra = {
             "examples": [
                 {

openapi_python_client/schema/openapi_schema_pydantic/encoding.py

@@ -1,6 +1,6 @@
-from typing import Dict, Optional
+from typing import Dict, Optional, Union
 
-from pydantic import BaseModel
+from pydantic import BaseModel, Extra
 
 from .reference import Reference
 
@@ -12,28 +12,28 @@ class Encoding(BaseModel):
     """
     The Content-Type for encoding a specific property.
     Default value depends on the property type:
-
+    
     - for `string` with `format` being `binary` – `application/octet-stream`;
     - for other primitive types – `text/plain`;
     - for `object` - `application/json`;
     - for `array` – the default is defined based on the inner type.
-
+    
     The value can be a specific media type (e.g. `application/json`), a wildcard media type (e.g. `image/*`),
     or a comma-separated list of the two types.
     """
 
-    headers: Optional[Dict[str, Reference]] = None
+    headers: Optional[Dict[str, Union["Header", Reference]]] = None
     """
     A map allowing additional information to be provided as headers, for example `Content-Disposition`.
-
+    
     `Content-Type` is described separately and SHALL be ignored in this section.
     This property SHALL be ignored if the request body media type is not a `multipart`.
     """
 
     style: Optional[str] = None
     """
     Describes how a specific property value will be serialized depending on its type.
-
+    
     See [Parameter Object](#parameterObject) for details on the [`style`](#parameterStyle) property.
     The behavior follows the same values as `query` parameters, including default values.
     This property SHALL be ignored if the request body media type is not `application/x-www-form-urlencoded`.
@@ -43,7 +43,7 @@ class Encoding(BaseModel):
     """
     When this is true, property values of type `array` or `object` generate separate parameters
     for each value of the array, or key-value-pair of the map.
-
+    
     For other types of properties this property has no effect.
     When [`style`](#encodingStyle) is `form`, the default value is `true`.
     For all other styles, the default value is `false`.
@@ -60,6 +60,7 @@ class Encoding(BaseModel):
     """
 
     class Config:
+        extra = Extra.forbid
         schema_extra = {
             "examples": [
                 {

openapi_python_client/schema/openapi_schema_pydantic/example.py

@@ -1,6 +1,6 @@
 from typing import Any, Optional
 
-from pydantic import BaseModel
+from pydantic import BaseModel, Extra
 
 
 class Example(BaseModel):
@@ -28,11 +28,12 @@ class Example(BaseModel):
     """
     A URL that points to the literal example.
     This provides the capability to reference examples that cannot easily be included in JSON or YAML documents.
-
+    
     The `value` field and `externalValue` field are mutually exclusive.
     """
 
     class Config:
+        extra = Extra.forbid
         schema_extra = {
             "examples": [
                 {"summary": "A foo example", "value": {"foo": "bar"}},

openapi_python_client/schema/openapi_schema_pydantic/external_documentation.py

@@ -1,6 +1,6 @@
 from typing import Optional
 
-from pydantic import AnyUrl, BaseModel
+from pydantic import AnyUrl, BaseModel, Extra
 
 
 class ExternalDocumentation(BaseModel):
@@ -12,11 +12,12 @@ class ExternalDocumentation(BaseModel):
     [CommonMark syntax](https://spec.commonmark.org/) MAY be used for rich text representation.
     """
 
-    url: AnyUrl
+    url: AnyUrl = ...
     """
     **REQUIRED**. The URL for the target documentation.
     Value MUST be in the format of a URL.
     """
 
     class Config:
+        extra = Extra.forbid
         schema_extra = {"examples": [{"description": "Find more info here", "url": "https://example.com"}]}

openapi_python_client/schema/openapi_schema_pydantic/header.py

@@ -1,4 +1,4 @@
-from pydantic import Field
+from pydantic import Extra, Field
 
 from ..parameter_location import ParameterLocation
 from .parameter import Parameter
@@ -18,6 +18,7 @@ class Header(Parameter):
     param_in = Field(default=ParameterLocation.HEADER, const=True, alias="in")
 
     class Config:
+        extra = Extra.forbid
         allow_population_by_field_name = True
         schema_extra = {
             "examples": [