diff --git a/.openapi-generator/VERSION b/.openapi-generator/VERSION index 758bb9c..5f84a81 100644 --- a/.openapi-generator/VERSION +++ b/.openapi-generator/VERSION @@ -1 +1 @@ -7.10.0 +7.12.0 diff --git a/README.md b/README.md index d100203..fcf99f0 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ This Python package is automatically generated by the [OpenAPI Generator](https: - API version: 0.0.1 - Package version: 0.3.0 -- Generator version: 7.10.0 +- Generator version: 7.12.0 - Build package: org.openapitools.codegen.languages.PythonClientCodegen ## Requirements. diff --git a/codex_api_client/api_client.py b/codex_api_client/api_client.py index bc029bb..81c60f8 100644 --- a/codex_api_client/api_client.py +++ b/codex_api_client/api_client.py @@ -517,7 +517,7 @@ def parameters_to_url_query(self, params, collection_formats): if k in collection_formats: collection_format = collection_formats[k] if collection_format == 'multi': - new_params.extend((k, str(value)) for value in v) + new_params.extend((k, quote(str(value))) for value in v) else: if collection_format == 'ssv': delimiter = ' ' diff --git a/codex_api_client/configuration.py b/codex_api_client/configuration.py index 30bd507..9689365 100644 --- a/codex_api_client/configuration.py +++ b/codex_api_client/configuration.py @@ -18,7 +18,7 @@ from logging import FileHandler import multiprocessing import sys -from typing import Any, ClassVar, Dict, List, Literal, Optional, TypedDict +from typing import Any, ClassVar, Dict, List, Literal, Optional, TypedDict, Union from typing_extensions import NotRequired, Self import urllib3 @@ -160,6 +160,8 @@ class Configuration: :param ssl_ca_cert: str - the path to a file of concatenated CA certificates in PEM format. :param retries: Number of retries for API requests. + :param ca_cert_data: verify the peer using concatenated CA certificate data + in PEM (str) or DER (bytes) format. """ @@ -173,13 +175,14 @@ def __init__( username: Optional[str]=None, password: Optional[str]=None, access_token: Optional[str]=None, - server_index: Optional[int]=None, + server_index: Optional[int]=None, server_variables: Optional[ServerVariablesT]=None, server_operation_index: Optional[Dict[int, int]]=None, server_operation_variables: Optional[Dict[int, ServerVariablesT]]=None, ignore_operation_servers: bool=False, ssl_ca_cert: Optional[str]=None, retries: Optional[int] = None, + ca_cert_data: Optional[Union[str, bytes]] = None, *, debug: Optional[bool] = None, ) -> None: @@ -257,6 +260,10 @@ def __init__( self.ssl_ca_cert = ssl_ca_cert """Set this to customize the certificate file to verify the peer. """ + self.ca_cert_data = ca_cert_data + """Set this to verify the peer using PEM (str) or DER (bytes) + certificate data. + """ self.cert_file = None """client certificate file """ diff --git a/codex_api_client/exceptions.py b/codex_api_client/exceptions.py index 0fba30a..c493202 100644 --- a/codex_api_client/exceptions.py +++ b/codex_api_client/exceptions.py @@ -150,6 +150,13 @@ def from_response( if http_resp.status == 404: raise NotFoundException(http_resp=http_resp, body=body, data=data) + # Added new conditions for 409 and 422 + if http_resp.status == 409: + raise ConflictException(http_resp=http_resp, body=body, data=data) + + if http_resp.status == 422: + raise UnprocessableEntityException(http_resp=http_resp, body=body, data=data) + if 500 <= http_resp.status <= 599: raise ServiceException(http_resp=http_resp, body=body, data=data) raise ApiException(http_resp=http_resp, body=body, data=data) @@ -188,6 +195,16 @@ class ServiceException(ApiException): pass +class ConflictException(ApiException): + """Exception for HTTP 409 Conflict.""" + pass + + +class UnprocessableEntityException(ApiException): + """Exception for HTTP 422 Unprocessable Entity.""" + pass + + def render_path(path_to_item): """Returns a string representation of a path""" result = "" diff --git a/codex_api_client/rest.py b/codex_api_client/rest.py index 2136460..c42103f 100644 --- a/codex_api_client/rest.py +++ b/codex_api_client/rest.py @@ -76,6 +76,7 @@ def __init__(self, configuration) -> None: "ca_certs": configuration.ssl_ca_cert, "cert_file": configuration.cert_file, "key_file": configuration.key_file, + "ca_cert_data": configuration.ca_cert_data, } if configuration.assert_hostname is not None: pool_args['assert_hostname'] = ( diff --git a/docs/MarketplaceApi.md b/docs/MarketplaceApi.md index 0ecc66a..069b6bc 100644 --- a/docs/MarketplaceApi.md +++ b/docs/MarketplaceApi.md @@ -562,7 +562,9 @@ No authorization required Updates availability -The new parameters will be only considered for new requests. Existing Requests linked to this Availability will continue as is. +The new parameters will be only considered for new requests. +Existing Requests linked to this Availability will continue as is. + ### Example diff --git a/docs/NodeApi.md b/docs/NodeApi.md index 40424b5..f08bfdc 100644 --- a/docs/NodeApi.md +++ b/docs/NodeApi.md @@ -14,7 +14,9 @@ Method | HTTP request | Description Connect to a peer -If `addrs` param is supplied, it will be used to dial the peer, otherwise the `peerId` is used to invoke peer discovery, if it succeeds the returned addresses will be used to dial. +If `addrs` param is supplied, it will be used to dial the peer, otherwise the `peerId` is used +to invoke peer discovery, if it succeeds the returned addresses will be used to dial. + ### Example diff --git a/openapitools.json b/openapitools.json index f8d07ce..6f7db3e 100644 --- a/openapitools.json +++ b/openapitools.json @@ -2,6 +2,6 @@ "$schema": "./node_modules/@openapitools/openapi-generator-cli/config.schema.json", "spaces": 2, "generator-cli": { - "version": "7.10.0" + "version": "7.12.0" } } diff --git a/pyproject.toml b/pyproject.toml index a92277a..e49d9e0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -12,7 +12,7 @@ include = ["codex_api_client/py.typed"] [tool.poetry.dependencies] python = "^3.8" -urllib3 = ">= 1.25.3 < 3.0.0" +urllib3 = ">= 1.25.3, < 3.0.0" python-dateutil = ">= 2.8.2" pydantic = ">= 2" typing-extensions = ">= 4.7.1" diff --git a/setup.py b/setup.py index 2ce315d..967131d 100644 --- a/setup.py +++ b/setup.py @@ -46,4 +46,4 @@ List of endpoints and interfaces available to Codex API users """, # noqa: E501 package_data={"codex_api_client": ["py.typed"]}, -) +) \ No newline at end of file