Merge branch 'main' into add-parseerror-detail

Author: dbanty

.github/workflows/release-dry-run.yml

@@ -13,14 +13,8 @@ jobs:
         with:
           fetch-depth: 0
           token: ${{ secrets.PAT }}
-      - uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: stable
-      - uses: Swatinem/rust-cache@v1
       - name: Install Knope
-        uses: actions-rs/cargo@v1
+        uses: knope-dev/action@v1
         with:
-          command: install
-          args: knope
+          version: 0.4.3
       - run: knope release --dry-run

.github/workflows/release.yml

@@ -17,16 +17,10 @@ jobs:
           git_user_signingkey: true
           git_commit_gpgsign: true
           git_push_gpgsign: false
-      - uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: stable
-      - uses: Swatinem/rust-cache@v1
       - name: Install Knope
-        uses: actions-rs/cargo@v1
+        uses: knope-dev/action@v1
         with:
-          command: install
-          args: knope
+          version: 0.4.3
       - name: Bump Version & Create GitHub Release
         run: knope release
         env:

CONTRIBUTING.md

@@ -32,7 +32,7 @@
 
 ## Creating a Pull Request
 
-Once you've written the code and run the checks, the next step is to create a pull request against the `main` branch of this repository. This repository uses [conventional commits] squashed on each PR, then uses [Dobby] to auto-generate CHANGELOG.md entries for release. So the title of your PR should be in the format of a conventional commit written in plain english as it will end up in the CHANGELOG. Some example PR titles:
+Once you've written the code and run the checks, the next step is to create a pull request against the `main` branch of this repository. This repository uses [conventional commits] squashed on each PR, then uses [Knope] to auto-generate CHANGELOG.md entries for release. So the title of your PR should be in the format of a conventional commit written in plain english as it will end up in the CHANGELOG. Some example PR titles:
 
 - feat: Support for `allOf` in OpenAPI documents (closes #123).
 - refactor!: Removed support for Python 3.5
@@ -45,4 +45,4 @@ Once your PR is created, a series of automated checks should run. If any of them
 As soon as possible, your PR will be reviewed. If there are any changes requested there will likely be a bit of back and forth. Once this process is done, your changes will be merged into main and included in the next release. If you need your changes available on PyPI by a certain time, please mention it in the PR, and we'll do our best to accommodate.
 
 [Conventional Commits]: https://www.conventionalcommits.org/en/v1.0.0/
-[Dobby]: https://triaxtec.github.io/dobby/introduction.html
+[Knope]: https://knope-dev.github.io/knope/

end_to_end_tests/custom-templates-golden-record/my_test_api_client/api/tests/__init__.py

@@ -3,6 +3,7 @@
 import types
 
 from . import (
+    callback_test,
     defaults_tests_defaults_post,
     get_basic_list_of_booleans,
     get_basic_list_of_floats,
@@ -14,6 +15,7 @@
     no_response_tests_no_response_get,
     octet_stream_tests_octet_stream_get,
     post_form_data,
+    post_form_data_inline,
     post_tests_json_body_string,
     test_inline_objects,
     token_with_cookie_auth_token_with_cookie_get,
@@ -66,6 +68,13 @@ def post_form_data(cls) -> types.ModuleType:
         """
         return post_form_data
 
+    @classmethod
+    def post_form_data_inline(cls) -> types.ModuleType:
+        """
+        Post form data (inline schema)
+        """
+        return post_form_data_inline
+
     @classmethod
     def upload_file_tests_upload_post(cls) -> types.ModuleType:
         """
@@ -142,3 +151,10 @@ def token_with_cookie_auth_token_with_cookie_get(cls) -> types.ModuleType:
         Test optional cookie parameters
         """
         return token_with_cookie_auth_token_with_cookie_get
+
+    @classmethod
+    def callback_test(cls) -> types.ModuleType:
+        """
+        Try sending a request related to a callback
+        """
+        return callback_test

end_to_end_tests/golden-record/my_test_api_client/api/location/get_location_header_types.py

@@ -3,6 +3,8 @@
 import httpx
 
 from ...client import Client
+from ...models.get_location_header_types_int_enum_header import GetLocationHeaderTypesIntEnumHeader
+from ...models.get_location_header_types_string_enum_header import GetLocationHeaderTypesStringEnumHeader
 from ...types import UNSET, Response, Unset
 
 
@@ -13,6 +15,8 @@ def _get_kwargs(
     string_header: Union[Unset, str] = UNSET,
     number_header: Union[Unset, float] = UNSET,
     integer_header: Union[Unset, int] = UNSET,
+    int_enum_header: Union[Unset, GetLocationHeaderTypesIntEnumHeader] = UNSET,
+    string_enum_header: Union[Unset, GetLocationHeaderTypesStringEnumHeader] = UNSET,
 ) -> Dict[str, Any]:
     url = "{}/location/header/types".format(client.base_url)
 
@@ -31,6 +35,12 @@ def _get_kwargs(
     if not isinstance(integer_header, Unset):
         headers["Integer-Header"] = str(integer_header)
 
+    if not isinstance(int_enum_header, Unset):
+        headers["Int-Enum-Header"] = str(int_enum_header)
+
+    if not isinstance(string_enum_header, Unset):
+        headers["String-Enum-Header"] = str(string_enum_header)
+
     return {
         "method": "get",
         "url": url,
@@ -56,13 +66,17 @@ def sync_detailed(
     string_header: Union[Unset, str] = UNSET,
     number_header: Union[Unset, float] = UNSET,
     integer_header: Union[Unset, int] = UNSET,
+    int_enum_header: Union[Unset, GetLocationHeaderTypesIntEnumHeader] = UNSET,
+    string_enum_header: Union[Unset, GetLocationHeaderTypesStringEnumHeader] = UNSET,
 ) -> Response[Any]:
     """
     Args:
         boolean_header (Union[Unset, bool]):
         string_header (Union[Unset, str]):
         number_header (Union[Unset, float]):
         integer_header (Union[Unset, int]):
+        int_enum_header (Union[Unset, GetLocationHeaderTypesIntEnumHeader]):
+        string_enum_header (Union[Unset, GetLocationHeaderTypesStringEnumHeader]):
 
     Returns:
         Response[Any]
@@ -74,6 +88,8 @@ def sync_detailed(
         string_header=string_header,
         number_header=number_header,
         integer_header=integer_header,
+        int_enum_header=int_enum_header,
+        string_enum_header=string_enum_header,
     )
 
     response = httpx.request(
@@ -91,13 +107,17 @@ async def asyncio_detailed(
     string_header: Union[Unset, str] = UNSET,
     number_header: Union[Unset, float] = UNSET,
     integer_header: Union[Unset, int] = UNSET,
+    int_enum_header: Union[Unset, GetLocationHeaderTypesIntEnumHeader] = UNSET,
+    string_enum_header: Union[Unset, GetLocationHeaderTypesStringEnumHeader] = UNSET,
 ) -> Response[Any]:
     """
     Args:
         boolean_header (Union[Unset, bool]):
         string_header (Union[Unset, str]):
         number_header (Union[Unset, float]):
         integer_header (Union[Unset, int]):
+        int_enum_header (Union[Unset, GetLocationHeaderTypesIntEnumHeader]):
+        string_enum_header (Union[Unset, GetLocationHeaderTypesStringEnumHeader]):
 
     Returns:
         Response[Any]
@@ -109,6 +129,8 @@ async def asyncio_detailed(
         string_header=string_header,
         number_header=number_header,
         integer_header=integer_header,
+        int_enum_header=int_enum_header,
+        string_enum_header=string_enum_header,
     )
 
     async with httpx.AsyncClient(verify=client.verify_ssl) as _client:

end_to_end_tests/golden-record/my_test_api_client/api/tests/callback_test.py

@@ -0,0 +1,152 @@
+from typing import Any, Dict, Optional, Union, cast
+
+import httpx
+
+from ...client import Client
+from ...models.a_model import AModel
+from ...models.http_validation_error import HTTPValidationError
+from ...types import Response
+
+
+def _get_kwargs(
+    *,
+    client: Client,
+    json_body: AModel,
+) -> Dict[str, Any]:
+    url = "{}/tests/callback".format(client.base_url)
+
+    headers: Dict[str, str] = client.get_headers()
+    cookies: Dict[str, Any] = client.get_cookies()
+
+    json_json_body = json_body.to_dict()
+
+    return {
+        "method": "post",
+        "url": url,
+        "headers": headers,
+        "cookies": cookies,
+        "timeout": client.get_timeout(),
+        "json": json_json_body,
+    }
+
+
+def _parse_response(*, response: httpx.Response) -> Optional[Union[Any, HTTPValidationError]]:
+    if response.status_code == 200:
+        response_200 = cast(Any, response.json())
+        return response_200
+    if response.status_code == 422:
+        response_422 = HTTPValidationError.from_dict(response.json())
+
+        return response_422
+    return None
+
+
+def _build_response(*, response: httpx.Response) -> Response[Union[Any, HTTPValidationError]]:
+    return Response(
+        status_code=response.status_code,
+        content=response.content,
+        headers=response.headers,
+        parsed=_parse_response(response=response),
+    )
+
+
+def sync_detailed(
+    *,
+    client: Client,
+    json_body: AModel,
+) -> Response[Union[Any, HTTPValidationError]]:
+    """Path with callback
+
+     Try sending a request related to a callback
+
+    Args:
+        json_body (AModel): A Model for testing all the ways custom objects can be used
+
+    Returns:
+        Response[Union[Any, HTTPValidationError]]
+    """
+
+    kwargs = _get_kwargs(
+        client=client,
+        json_body=json_body,
+    )
+
+    response = httpx.request(
+        verify=client.verify_ssl,
+        **kwargs,
+    )
+
+    return _build_response(response=response)
+
+
+def sync(
+    *,
+    client: Client,
+    json_body: AModel,
+) -> Optional[Union[Any, HTTPValidationError]]:
+    """Path with callback
+
+     Try sending a request related to a callback
+
+    Args:
+        json_body (AModel): A Model for testing all the ways custom objects can be used
+
+    Returns:
+        Response[Union[Any, HTTPValidationError]]
+    """
+
+    return sync_detailed(
+        client=client,
+        json_body=json_body,
+    ).parsed
+
+
+async def asyncio_detailed(
+    *,
+    client: Client,
+    json_body: AModel,
+) -> Response[Union[Any, HTTPValidationError]]:
+    """Path with callback
+
+     Try sending a request related to a callback
+
+    Args:
+        json_body (AModel): A Model for testing all the ways custom objects can be used
+
+    Returns:
+        Response[Union[Any, HTTPValidationError]]
+    """
+
+    kwargs = _get_kwargs(
+        client=client,
+        json_body=json_body,
+    )
+
+    async with httpx.AsyncClient(verify=client.verify_ssl) as _client:
+        response = await _client.request(**kwargs)
+
+    return _build_response(response=response)
+
+
+async def asyncio(
+    *,
+    client: Client,
+    json_body: AModel,
+) -> Optional[Union[Any, HTTPValidationError]]:
+    """Path with callback
+
+     Try sending a request related to a callback
+
+    Args:
+        json_body (AModel): A Model for testing all the ways custom objects can be used
+
+    Returns:
+        Response[Union[Any, HTTPValidationError]]
+    """
+
+    return (
+        await asyncio_detailed(
+            client=client,
+            json_body=json_body,
+        )
+    ).parsed

end_to_end_tests/golden-record/my_test_api_client/api/tests/post_form_data.py

@@ -41,7 +41,7 @@ def sync_detailed(
     client: Client,
     form_data: AFormData,
 ) -> Response[Any]:
-    """Post from data
+    """Post form data
 
      Post form data
 
@@ -67,7 +67,7 @@ async def asyncio_detailed(
     client: Client,
     form_data: AFormData,
 ) -> Response[Any]:
-    """Post from data
+    """Post form data
 
      Post form data