kgess-mirror/cloudflare-python
1
0
Fork 0
mirror of https://github.com/cloudflare/cloudflare-python.git synced 2026-01-16 23:01:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

feat: update via SDK Studio (#100)

Browse source
This commit is contained in:
stainless-app[bot] 2024-03-08 17:57:02 +00:00
parent a8e61f2e7a
commit 30a3982bc9
1252 changed files with 11264 additions and 49447 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1973
api.md
View file

File diff suppressed because it is too large Load diff

6
src/cloudflare/_client.py
View file

@ -335,7 +335,8 @@ class Cloudflare(SyncAPIClient):
return {
**super().default_headers,
"X-Stainless-Async": "false",
"x-auth-email": self.api_email if self.api_email is not None else Omit(),
"X-Auth-Key": self.api_key if self.api_key is not None else Omit(),
"X-Auth-Email": self.api_email if self.api_email is not None else Omit(),
**self._custom_headers,
}
@ -745,7 +746,8 @@ class AsyncCloudflare(AsyncAPIClient):
return {
**super().default_headers,
"X-Stainless-Async": f"async:{get_async_library()}",
"x-auth-email": self.api_email if self.api_email is not None else Omit(),
"X-Auth-Key": self.api_key if self.api_key is not None else Omit(),
"X-Auth-Email": self.api_email if self.api_email is not None else Omit(),
**self._custom_headers,
}

10
src/cloudflare/resources/addressing/address_maps/address_maps.py
View file

@ -48,8 +48,8 @@ from ...._base_client import (
make_request_options,
)
from ....types.addressing import (
AddressingAddressMaps,
AddressMapGetResponse,
AddressMapEditResponse,
AddressMapListResponse,
AddressMapCreateResponse,
AddressMapDeleteResponse,
@ -239,7 +239,7 @@ class AddressMaps(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> AddressMapEditResponse:
) -> AddressingAddressMaps:
"""
Modify properties of an address map owned by the account.
@ -289,7 +289,7 @@ class AddressMaps(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[AddressMapEditResponse], ResultWrapper[AddressMapEditResponse]),
cast_to=cast(Type[AddressingAddressMaps], ResultWrapper[AddressingAddressMaps]),
)
def get(
@ -516,7 +516,7 @@ class AsyncAddressMaps(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> AddressMapEditResponse:
) -> AddressingAddressMaps:
"""
Modify properties of an address map owned by the account.
@ -566,7 +566,7 @@ class AsyncAddressMaps(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[AddressMapEditResponse], ResultWrapper[AddressMapEditResponse]),
cast_to=cast(Type[AddressingAddressMaps], ResultWrapper[AddressingAddressMaps]),
)
async def get(

19
src/cloudflare/resources/addressing/prefixes/bgp/bindings.py
View file

@ -24,10 +24,9 @@ from ....._base_client import (
make_request_options,
)
from .....types.addressing.prefixes.bgp import (
BindingGetResponse,
BindingListResponse,
BindingCreateResponse,
BindingDeleteResponse,
AddressingServiceBinding,
binding_create_params,
)
@ -56,7 +55,7 @@ class Bindings(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> BindingCreateResponse:
) -> AddressingServiceBinding:
"""
Creates a new Service Binding, routing traffic to IPs within the given CIDR to a
service running on Cloudflare's network. **Note:** This API may only be used on
@ -100,7 +99,7 @@ class Bindings(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[BindingCreateResponse], ResultWrapper[BindingCreateResponse]),
cast_to=cast(Type[AddressingServiceBinding], ResultWrapper[AddressingServiceBinding]),
)
def list(
@ -219,7 +218,7 @@ class Bindings(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> BindingGetResponse:
) -> AddressingServiceBinding:
"""
Fetch a single Service Binding
@ -253,7 +252,7 @@ class Bindings(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[BindingGetResponse], ResultWrapper[BindingGetResponse]),
cast_to=cast(Type[AddressingServiceBinding], ResultWrapper[AddressingServiceBinding]),
)
@ -279,7 +278,7 @@ class AsyncBindings(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> BindingCreateResponse:
) -> AddressingServiceBinding:
"""
Creates a new Service Binding, routing traffic to IPs within the given CIDR to a
service running on Cloudflare's network. **Note:** This API may only be used on
@ -323,7 +322,7 @@ class AsyncBindings(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[BindingCreateResponse], ResultWrapper[BindingCreateResponse]),
cast_to=cast(Type[AddressingServiceBinding], ResultWrapper[AddressingServiceBinding]),
)
async def list(
@ -442,7 +441,7 @@ class AsyncBindings(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> BindingGetResponse:
) -> AddressingServiceBinding:
"""
Fetch a single Service Binding
@ -476,7 +475,7 @@ class AsyncBindings(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[BindingGetResponse], ResultWrapper[BindingGetResponse]),
cast_to=cast(Type[AddressingServiceBinding], ResultWrapper[AddressingServiceBinding]),
)

23
src/cloudflare/resources/addressing/prefixes/bgp/prefixes.py
View file

@ -23,12 +23,7 @@ from ....._wrappers import ResultWrapper
from ....._base_client import (
make_request_options,
)
from .....types.addressing.prefixes.bgp import (
PrefixGetResponse,
PrefixEditResponse,
PrefixListResponse,
prefix_edit_params,
)
from .....types.addressing.prefixes.bgp import PrefixListResponse, AddressingIpamBGPPrefixes, prefix_edit_params
__all__ = ["Prefixes", "AsyncPrefixes"]
@ -103,7 +98,7 @@ class Prefixes(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> PrefixEditResponse:
) -> AddressingIpamBGPPrefixes:
"""
Update the properties of a BGP Prefix, such as the on demand advertisement
status (advertised or withdrawn).
@ -139,7 +134,7 @@ class Prefixes(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[PrefixEditResponse], ResultWrapper[PrefixEditResponse]),
cast_to=cast(Type[AddressingIpamBGPPrefixes], ResultWrapper[AddressingIpamBGPPrefixes]),
)
def get(
@ -154,7 +149,7 @@ class Prefixes(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> PrefixGetResponse:
) -> AddressingIpamBGPPrefixes:
"""
Retrieve a single BGP Prefix according to its identifier
@ -188,7 +183,7 @@ class Prefixes(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[PrefixGetResponse], ResultWrapper[PrefixGetResponse]),
cast_to=cast(Type[AddressingIpamBGPPrefixes], ResultWrapper[AddressingIpamBGPPrefixes]),
)
@ -262,7 +257,7 @@ class AsyncPrefixes(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> PrefixEditResponse:
) -> AddressingIpamBGPPrefixes:
"""
Update the properties of a BGP Prefix, such as the on demand advertisement
status (advertised or withdrawn).
@ -298,7 +293,7 @@ class AsyncPrefixes(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[PrefixEditResponse], ResultWrapper[PrefixEditResponse]),
cast_to=cast(Type[AddressingIpamBGPPrefixes], ResultWrapper[AddressingIpamBGPPrefixes]),
)
async def get(
@ -313,7 +308,7 @@ class AsyncPrefixes(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> PrefixGetResponse:
) -> AddressingIpamBGPPrefixes:
"""
Retrieve a single BGP Prefix according to its identifier
@ -347,7 +342,7 @@ class AsyncPrefixes(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[PrefixGetResponse], ResultWrapper[PrefixGetResponse]),
cast_to=cast(Type[AddressingIpamBGPPrefixes], ResultWrapper[AddressingIpamBGPPrefixes]),
)

10
src/cloudflare/resources/addressing/prefixes/delegations.py
View file

@ -25,8 +25,8 @@ from ...._base_client import (
)
from ....types.addressing.prefixes import (
DelegationListResponse,
DelegationCreateResponse,
DelegationDeleteResponse,
AddressingIpamDelegations,
delegation_create_params,
)
@ -55,7 +55,7 @@ class Delegations(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> DelegationCreateResponse:
) -> AddressingIpamDelegations:
"""
Create a new account delegation for a given IP prefix.
@ -96,7 +96,7 @@ class Delegations(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[DelegationCreateResponse], ResultWrapper[DelegationCreateResponse]),
cast_to=cast(Type[AddressingIpamDelegations], ResultWrapper[AddressingIpamDelegations]),
)
def list(
@ -215,7 +215,7 @@ class AsyncDelegations(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> DelegationCreateResponse:
) -> AddressingIpamDelegations:
"""
Create a new account delegation for a given IP prefix.
@ -256,7 +256,7 @@ class AsyncDelegations(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[DelegationCreateResponse], ResultWrapper[DelegationCreateResponse]),
cast_to=cast(Type[AddressingIpamDelegations], ResultWrapper[AddressingIpamDelegations]),
)
async def list(

28
src/cloudflare/resources/addressing/prefixes/prefixes.py
View file

@ -41,11 +41,9 @@ from ...._base_client import (
make_request_options,
)
from ....types.addressing import (
PrefixGetResponse,
PrefixEditResponse,
PrefixListResponse,
PrefixCreateResponse,
PrefixDeleteResponse,
AddressingIpamPrefixes,
prefix_edit_params,
prefix_create_params,
)
@ -83,7 +81,7 @@ class Prefixes(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> PrefixCreateResponse:
) -> AddressingIpamPrefixes:
"""
Add a new prefix under the account.
@ -123,7 +121,7 @@ class Prefixes(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[PrefixCreateResponse], ResultWrapper[PrefixCreateResponse]),
cast_to=cast(Type[AddressingIpamPrefixes], ResultWrapper[AddressingIpamPrefixes]),
)
def list(
@ -226,7 +224,7 @@ class Prefixes(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> PrefixEditResponse:
) -> AddressingIpamPrefixes:
"""
Modify the description for a prefix owned by the account.
@ -259,7 +257,7 @@ class Prefixes(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[PrefixEditResponse], ResultWrapper[PrefixEditResponse]),
cast_to=cast(Type[AddressingIpamPrefixes], ResultWrapper[AddressingIpamPrefixes]),
)
def get(
@ -273,7 +271,7 @@ class Prefixes(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> PrefixGetResponse:
) -> AddressingIpamPrefixes:
"""
List a particular prefix owned by the account.
@ -303,7 +301,7 @@ class Prefixes(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[PrefixGetResponse], ResultWrapper[PrefixGetResponse]),
cast_to=cast(Type[AddressingIpamPrefixes], ResultWrapper[AddressingIpamPrefixes]),
)
@ -337,7 +335,7 @@ class AsyncPrefixes(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> PrefixCreateResponse:
) -> AddressingIpamPrefixes:
"""
Add a new prefix under the account.
@ -377,7 +375,7 @@ class AsyncPrefixes(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[PrefixCreateResponse], ResultWrapper[PrefixCreateResponse]),
cast_to=cast(Type[AddressingIpamPrefixes], ResultWrapper[AddressingIpamPrefixes]),
)
async def list(
@ -480,7 +478,7 @@ class AsyncPrefixes(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> PrefixEditResponse:
) -> AddressingIpamPrefixes:
"""
Modify the description for a prefix owned by the account.
@ -513,7 +511,7 @@ class AsyncPrefixes(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[PrefixEditResponse], ResultWrapper[PrefixEditResponse]),
cast_to=cast(Type[AddressingIpamPrefixes], ResultWrapper[AddressingIpamPrefixes]),
)
async def get(
@ -527,7 +525,7 @@ class AsyncPrefixes(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> PrefixGetResponse:
) -> AddressingIpamPrefixes:
"""
List a particular prefix owned by the account.
@ -557,7 +555,7 @@ class AsyncPrefixes(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[PrefixGetResponse], ResultWrapper[PrefixGetResponse]),
cast_to=cast(Type[AddressingIpamPrefixes], ResultWrapper[AddressingIpamPrefixes]),
)

10
src/cloudflare/resources/alerting/v3/destinations/webhooks.py
View file

@ -24,7 +24,7 @@ from ....._base_client import (
make_request_options,
)
from .....types.alerting.v3.destinations import (
WebhookGetResponse,
AaaWebhooks,
WebhookListResponse,
WebhookCreateResponse,
WebhookDeleteResponse,
@ -267,7 +267,7 @@ class Webhooks(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> WebhookGetResponse:
) -> AaaWebhooks:
"""
Get details for a single webhooks destination.
@ -297,7 +297,7 @@ class Webhooks(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[WebhookGetResponse], ResultWrapper[WebhookGetResponse]),
cast_to=cast(Type[AaaWebhooks], ResultWrapper[AaaWebhooks]),
)
@ -532,7 +532,7 @@ class AsyncWebhooks(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> WebhookGetResponse:
) -> AaaWebhooks:
"""
Get details for a single webhooks destination.
@ -562,7 +562,7 @@ class AsyncWebhooks(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[WebhookGetResponse], ResultWrapper[WebhookGetResponse]),
cast_to=cast(Type[AaaWebhooks], ResultWrapper[AaaWebhooks]),
)

14
src/cloudflare/resources/alerting/v3/histories.py
View file

@ -22,7 +22,7 @@ from ...._base_client import (
AsyncPaginator,
make_request_options,
)
from ....types.alerting.v3 import HistoryListResponse, history_list_params
from ....types.alerting.v3 import AaaHistory, history_list_params
__all__ = ["Histories", "AsyncHistories"]
@ -50,7 +50,7 @@ class Histories(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> SyncV4PagePaginationArray[HistoryListResponse]:
) -> SyncV4PagePaginationArray[AaaHistory]:
"""Gets a list of history records for notifications sent to an account.
The records
@ -82,7 +82,7 @@ class Histories(SyncAPIResource):
raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
return self._get_api_list(
f"/accounts/{account_id}/alerting/v3/history",
page=SyncV4PagePaginationArray[HistoryListResponse],
page=SyncV4PagePaginationArray[AaaHistory],
options=make_request_options(
extra_headers=extra_headers,
extra_query=extra_query,
@ -98,7 +98,7 @@ class Histories(SyncAPIResource):
history_list_params.HistoryListParams,
),
),
model=HistoryListResponse,
model=AaaHistory,
)
@ -125,7 +125,7 @@ class AsyncHistories(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> AsyncPaginator[HistoryListResponse, AsyncV4PagePaginationArray[HistoryListResponse]]:
) -> AsyncPaginator[AaaHistory, AsyncV4PagePaginationArray[AaaHistory]]:
"""Gets a list of history records for notifications sent to an account.
The records
@ -157,7 +157,7 @@ class AsyncHistories(AsyncAPIResource):
raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
return self._get_api_list(
f"/accounts/{account_id}/alerting/v3/history",
page=AsyncV4PagePaginationArray[HistoryListResponse],
page=AsyncV4PagePaginationArray[AaaHistory],
options=make_request_options(
extra_headers=extra_headers,
extra_query=extra_query,
@ -173,7 +173,7 @@ class AsyncHistories(AsyncAPIResource):
history_list_params.HistoryListParams,
),
),
model=HistoryListResponse,
model=AaaHistory,
)

10
src/cloudflare/resources/alerting/v3/policies.py
View file

@ -25,7 +25,7 @@ from ...._base_client import (
make_request_options,
)
from ....types.alerting.v3 import (
PolicyGetResponse,
AaaPolicies,
PolicyListResponse,
PolicyCreateResponse,
PolicyDeleteResponse,
@ -407,7 +407,7 @@ class Policies(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> PolicyGetResponse:
) -> AaaPolicies:
"""
Get details for a single policy.
@ -437,7 +437,7 @@ class Policies(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[PolicyGetResponse], ResultWrapper[PolicyGetResponse]),
cast_to=cast(Type[AaaPolicies], ResultWrapper[AaaPolicies]),
)
@ -811,7 +811,7 @@ class AsyncPolicies(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> PolicyGetResponse:
) -> AaaPolicies:
"""
Get details for a single policy.
@ -841,7 +841,7 @@ class AsyncPolicies(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[PolicyGetResponse], ResultWrapper[PolicyGetResponse]),
cast_to=cast(Type[AaaPolicies], ResultWrapper[AaaPolicies]),
)

10
src/cloudflare/resources/available_plans.py
View file

@ -6,7 +6,7 @@ from typing import Type, Optional, cast
import httpx
from ..types import AvailablePlanGetResponse, AvailablePlanListResponse
from ..types import AvailablePlanListResponse, BillSubsAPIAvailableRatePlan
from .._types import NOT_GIVEN, Body, Query, Headers, NotGiven
from .._compat import cached_property
from .._resource import SyncAPIResource, AsyncAPIResource
@ -83,7 +83,7 @@ class AvailablePlans(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> AvailablePlanGetResponse:
) -> BillSubsAPIAvailableRatePlan:
"""
Details of the available plan that the zone can subscribe to.
@ -113,7 +113,7 @@ class AvailablePlans(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[AvailablePlanGetResponse], ResultWrapper[AvailablePlanGetResponse]),
cast_to=cast(Type[BillSubsAPIAvailableRatePlan], ResultWrapper[BillSubsAPIAvailableRatePlan]),
)
@ -176,7 +176,7 @@ class AsyncAvailablePlans(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> AvailablePlanGetResponse:
) -> BillSubsAPIAvailableRatePlan:
"""
Details of the available plan that the zone can subscribe to.
@ -206,7 +206,7 @@ class AsyncAvailablePlans(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[AvailablePlanGetResponse], ResultWrapper[AvailablePlanGetResponse]),
cast_to=cast(Type[BillSubsAPIAvailableRatePlan], ResultWrapper[BillSubsAPIAvailableRatePlan]),
)

20
src/cloudflare/resources/brand_protection.py
View file

@ -7,8 +7,8 @@ from typing import Type, cast
import httpx
from ..types import (
BrandProtectionSubmitResponse,
BrandProtectionURLInfoResponse,
IntelPhishingURLInfo,
IntelPhishingURLSubmit,
brand_protection_submit_params,
brand_protection_url_info_params,
)
@ -53,7 +53,7 @@ class BrandProtection(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> BrandProtectionSubmitResponse:
) -> IntelPhishingURLSubmit:
"""
Submit suspicious URL for scanning
@ -82,7 +82,7 @@ class BrandProtection(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[BrandProtectionSubmitResponse], ResultWrapper[BrandProtectionSubmitResponse]),
cast_to=cast(Type[IntelPhishingURLSubmit], ResultWrapper[IntelPhishingURLSubmit]),
)
def url_info(
@ -97,7 +97,7 @@ class BrandProtection(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> BrandProtectionURLInfoResponse:
) -> IntelPhishingURLInfo:
"""
Get results for a URL scan
@ -130,7 +130,7 @@ class BrandProtection(SyncAPIResource):
),
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[BrandProtectionURLInfoResponse], ResultWrapper[BrandProtectionURLInfoResponse]),
cast_to=cast(Type[IntelPhishingURLInfo], ResultWrapper[IntelPhishingURLInfo]),
)
@ -154,7 +154,7 @@ class AsyncBrandProtection(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> BrandProtectionSubmitResponse:
) -> IntelPhishingURLSubmit:
"""
Submit suspicious URL for scanning
@ -183,7 +183,7 @@ class AsyncBrandProtection(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[BrandProtectionSubmitResponse], ResultWrapper[BrandProtectionSubmitResponse]),
cast_to=cast(Type[IntelPhishingURLSubmit], ResultWrapper[IntelPhishingURLSubmit]),
)
async def url_info(
@ -198,7 +198,7 @@ class AsyncBrandProtection(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> BrandProtectionURLInfoResponse:
) -> IntelPhishingURLInfo:
"""
Get results for a URL scan
@ -231,7 +231,7 @@ class AsyncBrandProtection(AsyncAPIResource):
),
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[BrandProtectionURLInfoResponse], ResultWrapper[BrandProtectionURLInfoResponse]),
cast_to=cast(Type[IntelPhishingURLInfo], ResultWrapper[IntelPhishingURLInfo]),
)

10
src/cloudflare/resources/cache/variants.py vendored
View file

@ -20,7 +20,7 @@ from ..._response import (
async_to_streamed_response_wrapper,
)
from ..._wrappers import ResultWrapper
from ...types.cache import VariantGetResponse, VariantEditResponse, VariantDeleteResponse, variant_edit_params
from ...types.cache import CacheVariants, VariantGetResponse, VariantEditResponse, variant_edit_params
from ..._base_client import (
make_request_options,
)
@ -47,7 +47,7 @@ class Variants(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> VariantDeleteResponse:
) -> CacheVariants:
"""
Variant support enables caching variants of images with certain file extensions
in addition to the original. This only applies when the origin server sends the
@ -77,7 +77,7 @@ class Variants(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[VariantDeleteResponse], ResultWrapper[VariantDeleteResponse]),
cast_to=cast(Type[CacheVariants], ResultWrapper[CacheVariants]),
)
def edit(
@ -190,7 +190,7 @@ class AsyncVariants(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> VariantDeleteResponse:
) -> CacheVariants:
"""
Variant support enables caching variants of images with certain file extensions
in addition to the original. This only applies when the origin server sends the
@ -220,7 +220,7 @@ class AsyncVariants(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[VariantDeleteResponse], ResultWrapper[VariantDeleteResponse]),
cast_to=cast(Type[CacheVariants], ResultWrapper[CacheVariants]),
)
async def edit(

38
src/cloudflare/resources/calls.py
View file

@ -7,11 +7,9 @@ from typing import Type, cast
import httpx
from ..types import (
CallGetResponse,
CallsApp,
CallListResponse,
CallCreateResponse,
CallDeleteResponse,
CallUpdateResponse,
CallsAppWithSecret,
call_create_params,
call_update_params,
)
@ -56,7 +54,7 @@ class Calls(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> CallCreateResponse:
) -> CallsAppWithSecret:
"""Creates a new Cloudflare calls app.
An app is an unique enviroment where each
@ -87,7 +85,7 @@ class Calls(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[CallCreateResponse], ResultWrapper[CallCreateResponse]),
cast_to=cast(Type[CallsAppWithSecret], ResultWrapper[CallsAppWithSecret]),
)
def update(
@ -102,7 +100,7 @@ class Calls(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> CallUpdateResponse:
) -> CallsApp:
"""
Edit details for a single app.
@ -135,7 +133,7 @@ class Calls(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[CallUpdateResponse], ResultWrapper[CallUpdateResponse]),
cast_to=cast(Type[CallsApp], ResultWrapper[CallsApp]),
)
def list(
@ -188,7 +186,7 @@ class Calls(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> CallDeleteResponse:
) -> CallsApp:
"""
Deletes an app from Cloudflare Calls
@ -218,7 +216,7 @@ class Calls(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[CallDeleteResponse], ResultWrapper[CallDeleteResponse]),
cast_to=cast(Type[CallsApp], ResultWrapper[CallsApp]),
)
def get(
@ -232,7 +230,7 @@ class Calls(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> CallGetResponse:
) -> CallsApp:
"""
Fetches details for a single Calls app.
@ -262,7 +260,7 @@ class Calls(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[CallGetResponse], ResultWrapper[CallGetResponse]),
cast_to=cast(Type[CallsApp], ResultWrapper[CallsApp]),
)
@ -286,7 +284,7 @@ class AsyncCalls(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> CallCreateResponse:
) -> CallsAppWithSecret:
"""Creates a new Cloudflare calls app.
An app is an unique enviroment where each
@ -317,7 +315,7 @@ class AsyncCalls(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[CallCreateResponse], ResultWrapper[CallCreateResponse]),
cast_to=cast(Type[CallsAppWithSecret], ResultWrapper[CallsAppWithSecret]),
)
async def update(
@ -332,7 +330,7 @@ class AsyncCalls(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> CallUpdateResponse:
) -> CallsApp:
"""
Edit details for a single app.
@ -365,7 +363,7 @@ class AsyncCalls(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[CallUpdateResponse], ResultWrapper[CallUpdateResponse]),
cast_to=cast(Type[CallsApp], ResultWrapper[CallsApp]),
)
async def list(
@ -418,7 +416,7 @@ class AsyncCalls(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> CallDeleteResponse:
) -> CallsApp:
"""
Deletes an app from Cloudflare Calls
@ -448,7 +446,7 @@ class AsyncCalls(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[CallDeleteResponse], ResultWrapper[CallDeleteResponse]),
cast_to=cast(Type[CallsApp], ResultWrapper[CallsApp]),
)
async def get(
@ -462,7 +460,7 @@ class AsyncCalls(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> CallGetResponse:
) -> CallsApp:
"""
Fetches details for a single Calls app.
@ -492,7 +490,7 @@ class AsyncCalls(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[CallGetResponse], ResultWrapper[CallGetResponse]),
cast_to=cast(Type[CallsApp], ResultWrapper[CallsApp]),
)

31
src/cloudflare/resources/certificate_authorities/hostname_associations.py
View file

@ -24,8 +24,7 @@ from ..._base_client import (
make_request_options,
)
from ...types.certificate_authorities import (
HostnameAssociationGetResponse,
HostnameAssociationUpdateResponse,
TLSCertificatesAndHostnamesHostnameAssociation,
hostname_association_get_params,
hostname_association_update_params,
)
@ -54,7 +53,7 @@ class HostnameAssociations(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> HostnameAssociationUpdateResponse:
) -> TLSCertificatesAndHostnamesHostnameAssociation:
"""
Replace Hostname Associations
@ -91,7 +90,10 @@ class HostnameAssociations(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[HostnameAssociationUpdateResponse], ResultWrapper[HostnameAssociationUpdateResponse]),
cast_to=cast(
Type[TLSCertificatesAndHostnamesHostnameAssociation],
ResultWrapper[TLSCertificatesAndHostnamesHostnameAssociation],
),
)
def get(
@ -105,7 +107,7 @@ class HostnameAssociations(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> HostnameAssociationGetResponse:
) -> TLSCertificatesAndHostnamesHostnameAssociation:
"""
List Hostname Associations
@ -139,7 +141,10 @@ class HostnameAssociations(SyncAPIResource):
),
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[HostnameAssociationGetResponse], ResultWrapper[HostnameAssociationGetResponse]),
cast_to=cast(
Type[TLSCertificatesAndHostnamesHostnameAssociation],
ResultWrapper[TLSCertificatesAndHostnamesHostnameAssociation],
),
)
@ -164,7 +169,7 @@ class AsyncHostnameAssociations(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> HostnameAssociationUpdateResponse:
) -> TLSCertificatesAndHostnamesHostnameAssociation:
"""
Replace Hostname Associations
@ -201,7 +206,10 @@ class AsyncHostnameAssociations(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[HostnameAssociationUpdateResponse], ResultWrapper[HostnameAssociationUpdateResponse]),
cast_to=cast(
Type[TLSCertificatesAndHostnamesHostnameAssociation],
ResultWrapper[TLSCertificatesAndHostnamesHostnameAssociation],
),
)
async def get(
@ -215,7 +223,7 @@ class AsyncHostnameAssociations(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> HostnameAssociationGetResponse:
) -> TLSCertificatesAndHostnamesHostnameAssociation:
"""
List Hostname Associations
@ -249,7 +257,10 @@ class AsyncHostnameAssociations(AsyncAPIResource):
),
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[HostnameAssociationGetResponse], ResultWrapper[HostnameAssociationGetResponse]),
cast_to=cast(
Type[TLSCertificatesAndHostnamesHostnameAssociation],
ResultWrapper[TLSCertificatesAndHostnamesHostnameAssociation],
),
)

60
src/cloudflare/resources/challenges/widgets.py
View file

@ -27,12 +27,8 @@ from ..._base_client import (
make_request_options,
)
from ...types.challenges import (
WidgetGetResponse,
WidgetListResponse,
WidgetCreateResponse,
WidgetDeleteResponse,
WidgetUpdateResponse,
WidgetRotateSecretResponse,
NcChallengesAdminWidgetList,
NcChallengesAdminWidgetDetail,
widget_list_params,
widget_create_params,
widget_update_params,
@ -72,7 +68,7 @@ class Widgets(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> Optional[WidgetCreateResponse]:
) -> Optional[NcChallengesAdminWidgetDetail]:
"""
Lists challenge widgets.
@ -143,7 +139,7 @@ class Widgets(SyncAPIResource):
),
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[Optional[WidgetCreateResponse]], ResultWrapper[WidgetCreateResponse]),
cast_to=cast(Type[Optional[NcChallengesAdminWidgetDetail]], ResultWrapper[NcChallengesAdminWidgetDetail]),
)
def update(
@ -163,7 +159,7 @@ class Widgets(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> Optional[WidgetUpdateResponse]:
) -> Optional[NcChallengesAdminWidgetDetail]:
"""
Update the configuration of a widget.
@ -218,7 +214,7 @@ class Widgets(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[Optional[WidgetUpdateResponse]], ResultWrapper[WidgetUpdateResponse]),
cast_to=cast(Type[Optional[NcChallengesAdminWidgetDetail]], ResultWrapper[NcChallengesAdminWidgetDetail]),
)
def list(
@ -235,7 +231,7 @@ class Widgets(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> SyncV4PagePaginationArray[WidgetListResponse]:
) -> SyncV4PagePaginationArray[NcChallengesAdminWidgetList]:
"""
Lists all turnstile widgets of an account.
@ -262,7 +258,7 @@ class Widgets(SyncAPIResource):
raise ValueError(f"Expected a non-empty value for `account_identifier` but received {account_identifier!r}")
return self._get_api_list(
f"/accounts/{account_identifier}/challenges/widgets",
page=SyncV4PagePaginationArray[WidgetListResponse],
page=SyncV4PagePaginationArray[NcChallengesAdminWidgetList],
options=make_request_options(
extra_headers=extra_headers,
extra_query=extra_query,
@ -278,7 +274,7 @@ class Widgets(SyncAPIResource):
widget_list_params.WidgetListParams,
),
),
model=WidgetListResponse,
model=NcChallengesAdminWidgetList,
)
def delete(
@ -292,7 +288,7 @@ class Widgets(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> Optional[WidgetDeleteResponse]:
) -> Optional[NcChallengesAdminWidgetDetail]:
"""
Destroy a Turnstile Widget.
@ -322,7 +318,7 @@ class Widgets(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[Optional[WidgetDeleteResponse]], ResultWrapper[WidgetDeleteResponse]),
cast_to=cast(Type[Optional[NcChallengesAdminWidgetDetail]], ResultWrapper[NcChallengesAdminWidgetDetail]),
)
def get(
@ -336,7 +332,7 @@ class Widgets(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> Optional[WidgetGetResponse]:
) -> Optional[NcChallengesAdminWidgetDetail]:
"""
Show a single challenge widget configuration.
@ -366,7 +362,7 @@ class Widgets(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[Optional[WidgetGetResponse]], ResultWrapper[WidgetGetResponse]),
cast_to=cast(Type[Optional[NcChallengesAdminWidgetDetail]], ResultWrapper[NcChallengesAdminWidgetDetail]),
)
def rotate_secret(
@ -381,7 +377,7 @@ class Widgets(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> Optional[WidgetRotateSecretResponse]:
) -> Optional[NcChallengesAdminWidgetDetail]:
"""Generate a new secret key for this widget.
If `invalidate_immediately` is set to
@ -422,7 +418,7 @@ class Widgets(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[Optional[WidgetRotateSecretResponse]], ResultWrapper[WidgetRotateSecretResponse]),
cast_to=cast(Type[Optional[NcChallengesAdminWidgetDetail]], ResultWrapper[NcChallengesAdminWidgetDetail]),
)
@ -456,7 +452,7 @@ class AsyncWidgets(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> Optional[WidgetCreateResponse]:
) -> Optional[NcChallengesAdminWidgetDetail]:
"""
Lists challenge widgets.
@ -527,7 +523,7 @@ class AsyncWidgets(AsyncAPIResource):
),
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[Optional[WidgetCreateResponse]], ResultWrapper[WidgetCreateResponse]),
cast_to=cast(Type[Optional[NcChallengesAdminWidgetDetail]], ResultWrapper[NcChallengesAdminWidgetDetail]),
)
async def update(
@ -547,7 +543,7 @@ class AsyncWidgets(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> Optional[WidgetUpdateResponse]:
) -> Optional[NcChallengesAdminWidgetDetail]:
"""
Update the configuration of a widget.
@ -602,7 +598,7 @@ class AsyncWidgets(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[Optional[WidgetUpdateResponse]], ResultWrapper[WidgetUpdateResponse]),
cast_to=cast(Type[Optional[NcChallengesAdminWidgetDetail]], ResultWrapper[NcChallengesAdminWidgetDetail]),
)
def list(
@ -619,7 +615,7 @@ class AsyncWidgets(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> AsyncPaginator[WidgetListResponse, AsyncV4PagePaginationArray[WidgetListResponse]]:
) -> AsyncPaginator[NcChallengesAdminWidgetList, AsyncV4PagePaginationArray[NcChallengesAdminWidgetList]]:
"""
Lists all turnstile widgets of an account.
@ -646,7 +642,7 @@ class AsyncWidgets(AsyncAPIResource):
raise ValueError(f"Expected a non-empty value for `account_identifier` but received {account_identifier!r}")
return self._get_api_list(
f"/accounts/{account_identifier}/challenges/widgets",
page=AsyncV4PagePaginationArray[WidgetListResponse],
page=AsyncV4PagePaginationArray[NcChallengesAdminWidgetList],
options=make_request_options(
extra_headers=extra_headers,
extra_query=extra_query,
@ -662,7 +658,7 @@ class AsyncWidgets(AsyncAPIResource):
widget_list_params.WidgetListParams,
),
),
model=WidgetListResponse,
model=NcChallengesAdminWidgetList,
)
async def delete(
@ -676,7 +672,7 @@ class AsyncWidgets(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> Optional[WidgetDeleteResponse]:
) -> Optional[NcChallengesAdminWidgetDetail]:
"""
Destroy a Turnstile Widget.
@ -706,7 +702,7 @@ class AsyncWidgets(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[Optional[WidgetDeleteResponse]], ResultWrapper[WidgetDeleteResponse]),
cast_to=cast(Type[Optional[NcChallengesAdminWidgetDetail]], ResultWrapper[NcChallengesAdminWidgetDetail]),
)
async def get(
@ -720,7 +716,7 @@ class AsyncWidgets(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> Optional[WidgetGetResponse]:
) -> Optional[NcChallengesAdminWidgetDetail]:
"""
Show a single challenge widget configuration.
@ -750,7 +746,7 @@ class AsyncWidgets(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[Optional[WidgetGetResponse]], ResultWrapper[WidgetGetResponse]),
cast_to=cast(Type[Optional[NcChallengesAdminWidgetDetail]], ResultWrapper[NcChallengesAdminWidgetDetail]),
)
async def rotate_secret(
@ -765,7 +761,7 @@ class AsyncWidgets(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> Optional[WidgetRotateSecretResponse]:
) -> Optional[NcChallengesAdminWidgetDetail]:
"""Generate a new secret key for this widget.
If `invalidate_immediately` is set to
@ -806,7 +802,7 @@ class AsyncWidgets(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[Optional[WidgetRotateSecretResponse]], ResultWrapper[WidgetRotateSecretResponse]),
cast_to=cast(Type[Optional[NcChallengesAdminWidgetDetail]], ResultWrapper[NcChallengesAdminWidgetDetail]),
)

77
src/cloudflare/resources/client_certificates.py
View file

@ -8,11 +8,7 @@ from typing_extensions import Literal
import httpx
from ..types import (
ClientCertificateGetResponse,
ClientCertificateEditResponse,
ClientCertificateListResponse,
ClientCertificateCreateResponse,
ClientCertificateDeleteResponse,
TLSCertificatesAndHostnamesClientCertificate,
client_certificate_list_params,
client_certificate_create_params,
)
@ -60,7 +56,7 @@ class ClientCertificates(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> ClientCertificateCreateResponse:
) -> TLSCertificatesAndHostnamesClientCertificate:
"""
Create a new API Shield mTLS Client Certificate
@ -97,7 +93,10 @@ class ClientCertificates(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[ClientCertificateCreateResponse], ResultWrapper[ClientCertificateCreateResponse]),
cast_to=cast(
Type[TLSCertificatesAndHostnamesClientCertificate],
ResultWrapper[TLSCertificatesAndHostnamesClientCertificate],
),
)
def list(
@ -116,7 +115,7 @@ class ClientCertificates(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> SyncV4PagePaginationArray[ClientCertificateListResponse]:
) -> SyncV4PagePaginationArray[TLSCertificatesAndHostnamesClientCertificate]:
"""
List all of your Zone's API Shield mTLS Client Certificates by Status and/or
using Pagination
@ -146,7 +145,7 @@ class ClientCertificates(SyncAPIResource):
raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
return self._get_api_list(
f"/zones/{zone_id}/client_certificates",
page=SyncV4PagePaginationArray[ClientCertificateListResponse],
page=SyncV4PagePaginationArray[TLSCertificatesAndHostnamesClientCertificate],
options=make_request_options(
extra_headers=extra_headers,
extra_query=extra_query,
@ -163,7 +162,7 @@ class ClientCertificates(SyncAPIResource):
client_certificate_list_params.ClientCertificateListParams,
),
),
model=ClientCertificateListResponse,
model=TLSCertificatesAndHostnamesClientCertificate,
)
def delete(
@ -177,7 +176,7 @@ class ClientCertificates(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> ClientCertificateDeleteResponse:
) -> TLSCertificatesAndHostnamesClientCertificate:
"""
Set a API Shield mTLS Client Certificate to pending_revocation status for
processing to revoked status.
@ -210,7 +209,10 @@ class ClientCertificates(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[ClientCertificateDeleteResponse], ResultWrapper[ClientCertificateDeleteResponse]),
cast_to=cast(
Type[TLSCertificatesAndHostnamesClientCertificate],
ResultWrapper[TLSCertificatesAndHostnamesClientCertificate],
),
)
def edit(
@ -224,7 +226,7 @@ class ClientCertificates(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> ClientCertificateEditResponse:
) -> TLSCertificatesAndHostnamesClientCertificate:
"""
If a API Shield mTLS Client Certificate is in a pending_revocation state, you
may reactivate it with this endpoint.
@ -257,7 +259,10 @@ class ClientCertificates(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[ClientCertificateEditResponse], ResultWrapper[ClientCertificateEditResponse]),
cast_to=cast(
Type[TLSCertificatesAndHostnamesClientCertificate],
ResultWrapper[TLSCertificatesAndHostnamesClientCertificate],
),
)
def get(
@ -271,7 +276,7 @@ class ClientCertificates(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> ClientCertificateGetResponse:
) -> TLSCertificatesAndHostnamesClientCertificate:
"""
Get Details for a single mTLS API Shield Client Certificate
@ -303,7 +308,10 @@ class ClientCertificates(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[ClientCertificateGetResponse], ResultWrapper[ClientCertificateGetResponse]),
cast_to=cast(
Type[TLSCertificatesAndHostnamesClientCertificate],
ResultWrapper[TLSCertificatesAndHostnamesClientCertificate],
),
)
@ -328,7 +336,7 @@ class AsyncClientCertificates(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> ClientCertificateCreateResponse:
) -> TLSCertificatesAndHostnamesClientCertificate:
"""
Create a new API Shield mTLS Client Certificate
@ -365,7 +373,10 @@ class AsyncClientCertificates(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[ClientCertificateCreateResponse], ResultWrapper[ClientCertificateCreateResponse]),
cast_to=cast(
Type[TLSCertificatesAndHostnamesClientCertificate],
ResultWrapper[TLSCertificatesAndHostnamesClientCertificate],
),
)
def list(
@ -384,7 +395,10 @@ class AsyncClientCertificates(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> AsyncPaginator[ClientCertificateListResponse, AsyncV4PagePaginationArray[ClientCertificateListResponse]]:
) -> AsyncPaginator[
TLSCertificatesAndHostnamesClientCertificate,
AsyncV4PagePaginationArray[TLSCertificatesAndHostnamesClientCertificate],
]:
"""
List all of your Zone's API Shield mTLS Client Certificates by Status and/or
using Pagination
@ -414,7 +428,7 @@ class AsyncClientCertificates(AsyncAPIResource):
raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
return self._get_api_list(
f"/zones/{zone_id}/client_certificates",
page=AsyncV4PagePaginationArray[ClientCertificateListResponse],
page=AsyncV4PagePaginationArray[TLSCertificatesAndHostnamesClientCertificate],
options=make_request_options(
extra_headers=extra_headers,
extra_query=extra_query,
@ -431,7 +445,7 @@ class AsyncClientCertificates(AsyncAPIResource):
client_certificate_list_params.ClientCertificateListParams,
),
),
model=ClientCertificateListResponse,
model=TLSCertificatesAndHostnamesClientCertificate,
)
async def delete(
@ -445,7 +459,7 @@ class AsyncClientCertificates(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> ClientCertificateDeleteResponse:
) -> TLSCertificatesAndHostnamesClientCertificate:
"""
Set a API Shield mTLS Client Certificate to pending_revocation status for
processing to revoked status.
@ -478,7 +492,10 @@ class AsyncClientCertificates(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[ClientCertificateDeleteResponse], ResultWrapper[ClientCertificateDeleteResponse]),
cast_to=cast(
Type[TLSCertificatesAndHostnamesClientCertificate],
ResultWrapper[TLSCertificatesAndHostnamesClientCertificate],
),
)
async def edit(
@ -492,7 +509,7 @@ class AsyncClientCertificates(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> ClientCertificateEditResponse:
) -> TLSCertificatesAndHostnamesClientCertificate:
"""
If a API Shield mTLS Client Certificate is in a pending_revocation state, you
may reactivate it with this endpoint.
@ -525,7 +542,10 @@ class AsyncClientCertificates(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[ClientCertificateEditResponse], ResultWrapper[ClientCertificateEditResponse]),
cast_to=cast(
Type[TLSCertificatesAndHostnamesClientCertificate],
ResultWrapper[TLSCertificatesAndHostnamesClientCertificate],
),
)
async def get(
@ -539,7 +559,7 @@ class AsyncClientCertificates(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> ClientCertificateGetResponse:
) -> TLSCertificatesAndHostnamesClientCertificate:
"""
Get Details for a single mTLS API Shield Client Certificate
@ -571,7 +591,10 @@ class AsyncClientCertificates(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[ClientCertificateGetResponse], ResultWrapper[ClientCertificateGetResponse]),
cast_to=cast(
Type[TLSCertificatesAndHostnamesClientCertificate],
ResultWrapper[TLSCertificatesAndHostnamesClientCertificate],
),
)

19
src/cloudflare/resources/cloudforce_one/requests/message.py
View file

@ -27,9 +27,8 @@ from ...._base_client import (
)
from ....types.cloudforce_one.requests import (
MessageGetResponse,
MessageCreateResponse,
MessageDeleteResponse,
MessageUpdateResponse,
CloudforceOneRequestMessageItem,
message_get_params,
message_create_params,
message_update_params,
@ -59,7 +58,7 @@ class Message(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> MessageCreateResponse:
) -> CloudforceOneRequestMessageItem:
"""
Creating a request adds the request into the Cloudforce One queue for analysis.
In addition to the content, a short title, type, priority, and releasability
@ -94,7 +93,7 @@ class Message(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[MessageCreateResponse], ResultWrapper[MessageCreateResponse]),
cast_to=cast(Type[CloudforceOneRequestMessageItem], ResultWrapper[CloudforceOneRequestMessageItem]),
)
def update(
@ -114,7 +113,7 @@ class Message(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> MessageUpdateResponse:
) -> CloudforceOneRequestMessageItem:
"""
Update a Request Message
@ -164,7 +163,7 @@ class Message(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[MessageUpdateResponse], ResultWrapper[MessageUpdateResponse]),
cast_to=cast(Type[CloudforceOneRequestMessageItem], ResultWrapper[CloudforceOneRequestMessageItem]),
)
def delete(
@ -312,7 +311,7 @@ class AsyncMessage(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> MessageCreateResponse:
) -> CloudforceOneRequestMessageItem:
"""
Creating a request adds the request into the Cloudforce One queue for analysis.
In addition to the content, a short title, type, priority, and releasability
@ -347,7 +346,7 @@ class AsyncMessage(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[MessageCreateResponse], ResultWrapper[MessageCreateResponse]),
cast_to=cast(Type[CloudforceOneRequestMessageItem], ResultWrapper[CloudforceOneRequestMessageItem]),
)
async def update(
@ -367,7 +366,7 @@ class AsyncMessage(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> MessageUpdateResponse:
) -> CloudforceOneRequestMessageItem:
"""
Update a Request Message
@ -417,7 +416,7 @@ class AsyncMessage(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[MessageUpdateResponse], ResultWrapper[MessageUpdateResponse]),
cast_to=cast(Type[CloudforceOneRequestMessageItem], ResultWrapper[CloudforceOneRequestMessageItem]),
)
async def delete(

38
src/cloudflare/resources/cloudforce_one/requests/priority.py
View file

@ -24,12 +24,10 @@ from ...._wrappers import ResultWrapper
from ...._base_client import (
make_request_options,
)
from ....types.cloudforce_one import CloudforceOneQuota, CloudforceOneRequestItem
from ....types.cloudforce_one.requests import (
PriorityGetResponse,
PriorityQuotaResponse,
PriorityCreateResponse,
PriorityDeleteResponse,
PriorityUpdateResponse,
CloudforceOnePriorityItem,
priority_create_params,
priority_update_params,
)
@ -60,7 +58,7 @@ class Priority(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> PriorityCreateResponse:
) -> CloudforceOnePriorityItem:
"""
Create a New Priority Requirement
@ -103,7 +101,7 @@ class Priority(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[PriorityCreateResponse], ResultWrapper[PriorityCreateResponse]),
cast_to=cast(Type[CloudforceOnePriorityItem], ResultWrapper[CloudforceOnePriorityItem]),
)
def update(
@ -121,7 +119,7 @@ class Priority(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> PriorityUpdateResponse:
) -> CloudforceOneRequestItem:
"""
Update a Priority Intelligence Requirement
@ -168,7 +166,7 @@ class Priority(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[PriorityUpdateResponse], ResultWrapper[PriorityUpdateResponse]),
cast_to=cast(Type[CloudforceOneRequestItem], ResultWrapper[CloudforceOneRequestItem]),
)
def delete(
@ -231,7 +229,7 @@ class Priority(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> PriorityGetResponse:
) -> CloudforceOneRequestItem:
"""
Get a Priority Intelligence Requirement
@ -261,7 +259,7 @@ class Priority(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[PriorityGetResponse], ResultWrapper[PriorityGetResponse]),
cast_to=cast(Type[CloudforceOneRequestItem], ResultWrapper[CloudforceOneRequestItem]),
)
def quota(
@ -274,7 +272,7 @@ class Priority(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> PriorityQuotaResponse:
) -> CloudforceOneQuota:
"""
Get Priority Intelligence Requirement Quota
@ -300,7 +298,7 @@ class Priority(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[PriorityQuotaResponse], ResultWrapper[PriorityQuotaResponse]),
cast_to=cast(Type[CloudforceOneQuota], ResultWrapper[CloudforceOneQuota]),
)
@ -327,7 +325,7 @@ class AsyncPriority(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> PriorityCreateResponse:
) -> CloudforceOnePriorityItem:
"""
Create a New Priority Requirement
@ -370,7 +368,7 @@ class AsyncPriority(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[PriorityCreateResponse], ResultWrapper[PriorityCreateResponse]),
cast_to=cast(Type[CloudforceOnePriorityItem], ResultWrapper[CloudforceOnePriorityItem]),
)
async def update(
@ -388,7 +386,7 @@ class AsyncPriority(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> PriorityUpdateResponse:
) -> CloudforceOneRequestItem:
"""
Update a Priority Intelligence Requirement
@ -435,7 +433,7 @@ class AsyncPriority(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[PriorityUpdateResponse], ResultWrapper[PriorityUpdateResponse]),
cast_to=cast(Type[CloudforceOneRequestItem], ResultWrapper[CloudforceOneRequestItem]),
)
async def delete(
@ -498,7 +496,7 @@ class AsyncPriority(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> PriorityGetResponse:
) -> CloudforceOneRequestItem:
"""
Get a Priority Intelligence Requirement
@ -528,7 +526,7 @@ class AsyncPriority(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[PriorityGetResponse], ResultWrapper[PriorityGetResponse]),
cast_to=cast(Type[CloudforceOneRequestItem], ResultWrapper[CloudforceOneRequestItem]),
)
async def quota(
@ -541,7 +539,7 @@ class AsyncPriority(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> PriorityQuotaResponse:
) -> CloudforceOneQuota:
"""
Get Priority Intelligence Requirement Quota
@ -567,7 +565,7 @@ class AsyncPriority(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[PriorityQuotaResponse], ResultWrapper[PriorityQuotaResponse]),
cast_to=cast(Type[CloudforceOneQuota], ResultWrapper[CloudforceOneQuota]),
)

72
src/cloudflare/resources/cloudforce_one/requests/requests.py
View file

@ -44,14 +44,12 @@ from ...._base_client import (
make_request_options,
)
from ....types.cloudforce_one import (
RequestGetResponse,
RequestListResponse,
RequestQuotaResponse,
RequestTypesResponse,
RequestCreateResponse,
CloudforceOneQuota,
RequestDeleteResponse,
RequestUpdateResponse,
RequestConstantsResponse,
CloudforceOneRequestItem,
CloudforceOneRequestTypes,
CloudforceOneRequestListItem,
CloudforceOneRequestConstants,
request_list_params,
request_create_params,
request_update_params,
@ -92,7 +90,7 @@ class Requests(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> RequestCreateResponse:
) -> CloudforceOneRequestItem:
"""
Creating a request adds the request into the Cloudforce One queue for analysis.
In addition to the content, a short title, type, priority, and releasability
@ -140,7 +138,7 @@ class Requests(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[RequestCreateResponse], ResultWrapper[RequestCreateResponse]),
cast_to=cast(Type[CloudforceOneRequestItem], ResultWrapper[CloudforceOneRequestItem]),
)
def update(
@ -159,7 +157,7 @@ class Requests(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> RequestUpdateResponse:
) -> CloudforceOneRequestItem:
"""Updating a request alters the request in the Cloudforce One queue.
This API may
@ -212,7 +210,7 @@ class Requests(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[RequestUpdateResponse], ResultWrapper[RequestUpdateResponse]),
cast_to=cast(Type[CloudforceOneRequestItem], ResultWrapper[CloudforceOneRequestItem]),
)
def list(
@ -235,7 +233,7 @@ class Requests(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> SyncV4PagePaginationArray[RequestListResponse]:
) -> SyncV4PagePaginationArray[CloudforceOneRequestListItem]:
"""
List Requests
@ -274,7 +272,7 @@ class Requests(SyncAPIResource):
raise ValueError(f"Expected a non-empty value for `account_identifier` but received {account_identifier!r}")
return self._get_api_list(
f"/accounts/{account_identifier}/cloudforce-one/requests",
page=SyncV4PagePaginationArray[RequestListResponse],
page=SyncV4PagePaginationArray[CloudforceOneRequestListItem],
body=maybe_transform(
{
"page": page,
@ -293,7 +291,7 @@ class Requests(SyncAPIResource):
options=make_request_options(
extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
),
model=RequestListResponse,
model=CloudforceOneRequestListItem,
method="post",
)
@ -356,7 +354,7 @@ class Requests(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> RequestConstantsResponse:
) -> CloudforceOneRequestConstants:
"""
Get Request Priority, Status, and TLP constants
@ -382,7 +380,7 @@ class Requests(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[RequestConstantsResponse], ResultWrapper[RequestConstantsResponse]),
cast_to=cast(Type[CloudforceOneRequestConstants], ResultWrapper[CloudforceOneRequestConstants]),
)
def get(
@ -396,7 +394,7 @@ class Requests(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> RequestGetResponse:
) -> CloudforceOneRequestItem:
"""
Get a Request
@ -426,7 +424,7 @@ class Requests(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[RequestGetResponse], ResultWrapper[RequestGetResponse]),
cast_to=cast(Type[CloudforceOneRequestItem], ResultWrapper[CloudforceOneRequestItem]),
)
def quota(
@ -439,7 +437,7 @@ class Requests(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> RequestQuotaResponse:
) -> CloudforceOneQuota:
"""
Get Request Quota
@ -465,7 +463,7 @@ class Requests(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[RequestQuotaResponse], ResultWrapper[RequestQuotaResponse]),
cast_to=cast(Type[CloudforceOneQuota], ResultWrapper[CloudforceOneQuota]),
)
def types(
@ -478,7 +476,7 @@ class Requests(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> RequestTypesResponse:
) -> CloudforceOneRequestTypes:
"""
Get Request Types
@ -504,7 +502,7 @@ class Requests(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[RequestTypesResponse], ResultWrapper[RequestTypesResponse]),
cast_to=cast(Type[CloudforceOneRequestTypes], ResultWrapper[CloudforceOneRequestTypes]),
)
@ -540,7 +538,7 @@ class AsyncRequests(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> RequestCreateResponse:
) -> CloudforceOneRequestItem:
"""
Creating a request adds the request into the Cloudforce One queue for analysis.
In addition to the content, a short title, type, priority, and releasability
@ -588,7 +586,7 @@ class AsyncRequests(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[RequestCreateResponse], ResultWrapper[RequestCreateResponse]),
cast_to=cast(Type[CloudforceOneRequestItem], ResultWrapper[CloudforceOneRequestItem]),
)
async def update(
@ -607,7 +605,7 @@ class AsyncRequests(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> RequestUpdateResponse:
) -> CloudforceOneRequestItem:
"""Updating a request alters the request in the Cloudforce One queue.
This API may
@ -660,7 +658,7 @@ class AsyncRequests(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[RequestUpdateResponse], ResultWrapper[RequestUpdateResponse]),
cast_to=cast(Type[CloudforceOneRequestItem], ResultWrapper[CloudforceOneRequestItem]),
)
def list(
@ -683,7 +681,7 @@ class AsyncRequests(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> AsyncPaginator[RequestListResponse, AsyncV4PagePaginationArray[RequestListResponse]]:
) -> AsyncPaginator[CloudforceOneRequestListItem, AsyncV4PagePaginationArray[CloudforceOneRequestListItem]]:
"""
List Requests
@ -722,7 +720,7 @@ class AsyncRequests(AsyncAPIResource):
raise ValueError(f"Expected a non-empty value for `account_identifier` but received {account_identifier!r}")
return self._get_api_list(
f"/accounts/{account_identifier}/cloudforce-one/requests",
page=AsyncV4PagePaginationArray[RequestListResponse],
page=AsyncV4PagePaginationArray[CloudforceOneRequestListItem],
body=maybe_transform(
{
"page": page,
@ -741,7 +739,7 @@ class AsyncRequests(AsyncAPIResource):
options=make_request_options(
extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
),
model=RequestListResponse,
model=CloudforceOneRequestListItem,
method="post",
)
@ -804,7 +802,7 @@ class AsyncRequests(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> RequestConstantsResponse:
) -> CloudforceOneRequestConstants:
"""
Get Request Priority, Status, and TLP constants
@ -830,7 +828,7 @@ class AsyncRequests(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[RequestConstantsResponse], ResultWrapper[RequestConstantsResponse]),
cast_to=cast(Type[CloudforceOneRequestConstants], ResultWrapper[CloudforceOneRequestConstants]),
)
async def get(
@ -844,7 +842,7 @@ class AsyncRequests(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> RequestGetResponse:
) -> CloudforceOneRequestItem:
"""
Get a Request
@ -874,7 +872,7 @@ class AsyncRequests(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[RequestGetResponse], ResultWrapper[RequestGetResponse]),
cast_to=cast(Type[CloudforceOneRequestItem], ResultWrapper[CloudforceOneRequestItem]),
)
async def quota(
@ -887,7 +885,7 @@ class AsyncRequests(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> RequestQuotaResponse:
) -> CloudforceOneQuota:
"""
Get Request Quota
@ -913,7 +911,7 @@ class AsyncRequests(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[RequestQuotaResponse], ResultWrapper[RequestQuotaResponse]),
cast_to=cast(Type[CloudforceOneQuota], ResultWrapper[CloudforceOneQuota]),
)
async def types(
@ -926,7 +924,7 @@ class AsyncRequests(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> RequestTypesResponse:
) -> CloudforceOneRequestTypes:
"""
Get Request Types
@ -952,7 +950,7 @@ class AsyncRequests(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[RequestTypesResponse], ResultWrapper[RequestTypesResponse]),
cast_to=cast(Type[CloudforceOneRequestTypes], ResultWrapper[CloudforceOneRequestTypes]),
)

17
src/cloudflare/resources/custom_certificates/custom_certificates.py
View file

@ -10,9 +10,9 @@ import httpx
from ...types import (
CustomCertificateGetResponse,
CustomCertificateEditResponse,
CustomCertificateListResponse,
CustomCertificateCreateResponse,
CustomCertificateDeleteResponse,
TLSCertificatesAndHostnamesCustomCertificate,
custom_certificate_edit_params,
custom_certificate_list_params,
custom_certificate_create_params,
@ -165,7 +165,7 @@ class CustomCertificates(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> SyncV4PagePaginationArray[CustomCertificateListResponse]:
) -> SyncV4PagePaginationArray[TLSCertificatesAndHostnamesCustomCertificate]:
"""List, search, and filter all of your custom SSL certificates.
The higher
@ -193,7 +193,7 @@ class CustomCertificates(SyncAPIResource):
raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
return self._get_api_list(
f"/zones/{zone_id}/custom_certificates",
page=SyncV4PagePaginationArray[CustomCertificateListResponse],
page=SyncV4PagePaginationArray[TLSCertificatesAndHostnamesCustomCertificate],
options=make_request_options(
extra_headers=extra_headers,
extra_query=extra_query,
@ -208,7 +208,7 @@ class CustomCertificates(SyncAPIResource):
custom_certificate_list_params.CustomCertificateListParams,
),
),
model=CustomCertificateListResponse,
model=TLSCertificatesAndHostnamesCustomCertificate,
)
def delete(
@ -522,7 +522,10 @@ class AsyncCustomCertificates(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> AsyncPaginator[CustomCertificateListResponse, AsyncV4PagePaginationArray[CustomCertificateListResponse]]:
) -> AsyncPaginator[
TLSCertificatesAndHostnamesCustomCertificate,
AsyncV4PagePaginationArray[TLSCertificatesAndHostnamesCustomCertificate],
]:
"""List, search, and filter all of your custom SSL certificates.
The higher
@ -550,7 +553,7 @@ class AsyncCustomCertificates(AsyncAPIResource):
raise ValueError(f"Expected a non-empty value for `zone_id` but received {zone_id!r}")
return self._get_api_list(
f"/zones/{zone_id}/custom_certificates",
page=AsyncV4PagePaginationArray[CustomCertificateListResponse],
page=AsyncV4PagePaginationArray[TLSCertificatesAndHostnamesCustomCertificate],
options=make_request_options(
extra_headers=extra_headers,
extra_query=extra_query,
@ -565,7 +568,7 @@ class AsyncCustomCertificates(AsyncAPIResource):
custom_certificate_list_params.CustomCertificateListParams,
),
),
model=CustomCertificateListResponse,
model=TLSCertificatesAndHostnamesCustomCertificate,
)
async def delete(

10
src/cloudflare/resources/custom_nameservers.py
View file

@ -8,7 +8,7 @@ import httpx
from ..types import (
CustomNameserverGetResponse,
CustomNameserverCreateResponse,
DNSCustomNameserversCustomNS,
CustomNameserverDeleteResponse,
CustomNameserverVerifyResponse,
CustomNameserverAvailabiltyResponse,
@ -56,7 +56,7 @@ class CustomNameservers(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> CustomNameserverCreateResponse:
) -> DNSCustomNameserversCustomNS:
"""
Add Account Custom Nameserver
@ -93,7 +93,7 @@ class CustomNameservers(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[CustomNameserverCreateResponse], ResultWrapper[CustomNameserverCreateResponse]),
cast_to=cast(Type[DNSCustomNameserversCustomNS], ResultWrapper[DNSCustomNameserversCustomNS]),
)
def delete(
@ -286,7 +286,7 @@ class AsyncCustomNameservers(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> CustomNameserverCreateResponse:
) -> DNSCustomNameserversCustomNS:
"""
Add Account Custom Nameserver
@ -323,7 +323,7 @@ class AsyncCustomNameservers(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[CustomNameserverCreateResponse], ResultWrapper[CustomNameserverCreateResponse]),
cast_to=cast(Type[DNSCustomNameserversCustomNS], ResultWrapper[DNSCustomNameserversCustomNS]),
)
async def delete(

33
src/cloudflare/resources/d1/database.py
View file

@ -13,10 +13,9 @@ from ..._utils import (
)
from ..._compat import cached_property
from ...types.d1 import (
DatabaseGetResponse,
DatabaseListResponse,
D1CreateDatabase,
D1DatabaseDetails,
DatabaseQueryResponse,
DatabaseCreateResponse,
DatabaseDeleteResponse,
database_list_params,
database_query_params,
@ -59,7 +58,7 @@ class Database(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> DatabaseCreateResponse:
) -> D1CreateDatabase:
"""
Returns the created D1 database.
@ -86,7 +85,7 @@ class Database(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[DatabaseCreateResponse], ResultWrapper[DatabaseCreateResponse]),
cast_to=cast(Type[D1CreateDatabase], ResultWrapper[D1CreateDatabase]),
)
def list(
@ -102,7 +101,7 @@ class Database(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> SyncV4PagePaginationArray[DatabaseListResponse]:
) -> SyncV4PagePaginationArray[D1CreateDatabase]:
"""
Returns a list of D1 databases.
@ -127,7 +126,7 @@ class Database(SyncAPIResource):
raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
return self._get_api_list(
f"/accounts/{account_id}/d1/database",
page=SyncV4PagePaginationArray[DatabaseListResponse],
page=SyncV4PagePaginationArray[D1CreateDatabase],
options=make_request_options(
extra_headers=extra_headers,
extra_query=extra_query,
@ -142,7 +141,7 @@ class Database(SyncAPIResource):
database_list_params.DatabaseListParams,
),
),
model=DatabaseListResponse,
model=D1CreateDatabase,
)
def delete(
@ -205,7 +204,7 @@ class Database(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> DatabaseGetResponse:
) -> D1DatabaseDetails:
"""
Returns the specified D1 database.
@ -235,7 +234,7 @@ class Database(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[DatabaseGetResponse], ResultWrapper[DatabaseGetResponse]),
cast_to=cast(Type[D1DatabaseDetails], ResultWrapper[D1DatabaseDetails]),
)
def query(
@ -312,7 +311,7 @@ class AsyncDatabase(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> DatabaseCreateResponse:
) -> D1CreateDatabase:
"""
Returns the created D1 database.
@ -339,7 +338,7 @@ class AsyncDatabase(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[DatabaseCreateResponse], ResultWrapper[DatabaseCreateResponse]),
cast_to=cast(Type[D1CreateDatabase], ResultWrapper[D1CreateDatabase]),
)
def list(
@ -355,7 +354,7 @@ class AsyncDatabase(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> AsyncPaginator[DatabaseListResponse, AsyncV4PagePaginationArray[DatabaseListResponse]]:
) -> AsyncPaginator[D1CreateDatabase, AsyncV4PagePaginationArray[D1CreateDatabase]]:
"""
Returns a list of D1 databases.
@ -380,7 +379,7 @@ class AsyncDatabase(AsyncAPIResource):
raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
return self._get_api_list(
f"/accounts/{account_id}/d1/database",
page=AsyncV4PagePaginationArray[DatabaseListResponse],
page=AsyncV4PagePaginationArray[D1CreateDatabase],
options=make_request_options(
extra_headers=extra_headers,
extra_query=extra_query,
@ -395,7 +394,7 @@ class AsyncDatabase(AsyncAPIResource):
database_list_params.DatabaseListParams,
),
),
model=DatabaseListResponse,
model=D1CreateDatabase,
)
async def delete(
@ -458,7 +457,7 @@ class AsyncDatabase(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> DatabaseGetResponse:
) -> D1DatabaseDetails:
"""
Returns the specified D1 database.
@ -488,7 +487,7 @@ class AsyncDatabase(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[DatabaseGetResponse], ResultWrapper[DatabaseGetResponse]),
cast_to=cast(Type[D1DatabaseDetails], ResultWrapper[D1DatabaseDetails]),
)
async def query(

14
src/cloudflare/resources/dcv_delegation/uuid.py
View file

@ -19,7 +19,7 @@ from ..._wrappers import ResultWrapper
from ..._base_client import (
make_request_options,
)
from ...types.dcv_delegation import UUIDGetResponse
from ...types.dcv_delegation import TLSCertificatesAndHostnamesUUIDObject
__all__ = ["UUID", "AsyncUUID"]
@ -43,7 +43,7 @@ class UUID(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> UUIDGetResponse:
) -> TLSCertificatesAndHostnamesUUIDObject:
"""
Retrieve the account and zone specific unique identifier used as part of the
CNAME target for DCV Delegation.
@ -70,7 +70,9 @@ class UUID(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[UUIDGetResponse], ResultWrapper[UUIDGetResponse]),
cast_to=cast(
Type[TLSCertificatesAndHostnamesUUIDObject], ResultWrapper[TLSCertificatesAndHostnamesUUIDObject]
),
)
@ -93,7 +95,7 @@ class AsyncUUID(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> UUIDGetResponse:
) -> TLSCertificatesAndHostnamesUUIDObject:
"""
Retrieve the account and zone specific unique identifier used as part of the
CNAME target for DCV Delegation.
@ -120,7 +122,9 @@ class AsyncUUID(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[UUIDGetResponse], ResultWrapper[UUIDGetResponse]),
cast_to=cast(
Type[TLSCertificatesAndHostnamesUUIDObject], ResultWrapper[TLSCertificatesAndHostnamesUUIDObject]
),
)

10
src/cloudflare/resources/dns/analytics/reports/bytimes.py
View file

@ -25,7 +25,7 @@ from ....._wrappers import ResultWrapper
from ....._base_client import (
make_request_options,
)
from .....types.dns.analytics.reports import BytimeGetResponse, bytime_get_params
from .....types.dns.analytics.reports import DNSDNSAnalyticsAPIReportBytime, bytime_get_params
__all__ = ["Bytimes", "AsyncBytimes"]
@ -58,7 +58,7 @@ class Bytimes(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> BytimeGetResponse:
) -> DNSDNSAnalyticsAPIReportBytime:
"""
Retrieves a list of aggregate metrics grouped by time interval.
@ -118,7 +118,7 @@ class Bytimes(SyncAPIResource):
),
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[BytimeGetResponse], ResultWrapper[BytimeGetResponse]),
cast_to=cast(Type[DNSDNSAnalyticsAPIReportBytime], ResultWrapper[DNSDNSAnalyticsAPIReportBytime]),
)
@ -150,7 +150,7 @@ class AsyncBytimes(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> BytimeGetResponse:
) -> DNSDNSAnalyticsAPIReportBytime:
"""
Retrieves a list of aggregate metrics grouped by time interval.
@ -210,7 +210,7 @@ class AsyncBytimes(AsyncAPIResource):
),
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[BytimeGetResponse], ResultWrapper[BytimeGetResponse]),
cast_to=cast(Type[DNSDNSAnalyticsAPIReportBytime], ResultWrapper[DNSDNSAnalyticsAPIReportBytime]),
)

10
src/cloudflare/resources/dns/analytics/reports/reports.py
View file

@ -32,7 +32,7 @@ from ....._wrappers import ResultWrapper
from ....._base_client import (
make_request_options,
)
from .....types.dns.analytics import ReportGetResponse, report_get_params
from .....types.dns.analytics import DNSDNSAnalyticsAPIReport, report_get_params
__all__ = ["Reports", "AsyncReports"]
@ -67,7 +67,7 @@ class Reports(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> ReportGetResponse:
) -> DNSDNSAnalyticsAPIReport:
"""
Retrieves a list of summarised aggregate metrics over a given time period.
@ -124,7 +124,7 @@ class Reports(SyncAPIResource):
),
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[ReportGetResponse], ResultWrapper[ReportGetResponse]),
cast_to=cast(Type[DNSDNSAnalyticsAPIReport], ResultWrapper[DNSDNSAnalyticsAPIReport]),
)
@ -158,7 +158,7 @@ class AsyncReports(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> ReportGetResponse:
) -> DNSDNSAnalyticsAPIReport:
"""
Retrieves a list of summarised aggregate metrics over a given time period.
@ -215,7 +215,7 @@ class AsyncReports(AsyncAPIResource):
),
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[ReportGetResponse], ResultWrapper[ReportGetResponse]),
cast_to=cast(Type[DNSDNSAnalyticsAPIReport], ResultWrapper[DNSDNSAnalyticsAPIReport]),
)

11
src/cloudflare/resources/dns/firewall/analytics/reports/bytimes.py
View file

@ -25,7 +25,8 @@ from ......_wrappers import ResultWrapper
from ......_base_client import (
make_request_options,
)
from ......types.dns.firewall.analytics.reports import BytimeGetResponse, bytime_get_params
from ......types.dns.analytics.reports import DNSDNSAnalyticsAPIReportBytime
from ......types.dns.firewall.analytics.reports import bytime_get_params
__all__ = ["Bytimes", "AsyncBytimes"]
@ -59,7 +60,7 @@ class Bytimes(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> BytimeGetResponse:
) -> DNSDNSAnalyticsAPIReportBytime:
"""
Retrieves a list of aggregate metrics grouped by time interval.
@ -123,7 +124,7 @@ class Bytimes(SyncAPIResource):
),
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[BytimeGetResponse], ResultWrapper[BytimeGetResponse]),
cast_to=cast(Type[DNSDNSAnalyticsAPIReportBytime], ResultWrapper[DNSDNSAnalyticsAPIReportBytime]),
)
@ -156,7 +157,7 @@ class AsyncBytimes(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> BytimeGetResponse:
) -> DNSDNSAnalyticsAPIReportBytime:
"""
Retrieves a list of aggregate metrics grouped by time interval.
@ -220,7 +221,7 @@ class AsyncBytimes(AsyncAPIResource):
),
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[BytimeGetResponse], ResultWrapper[BytimeGetResponse]),
cast_to=cast(Type[DNSDNSAnalyticsAPIReportBytime], ResultWrapper[DNSDNSAnalyticsAPIReportBytime]),
)

11
src/cloudflare/resources/dns/firewall/analytics/reports/reports.py
View file

@ -32,7 +32,8 @@ from ......_wrappers import ResultWrapper
from ......_base_client import (
make_request_options,
)
from ......types.dns.firewall.analytics import ReportGetResponse, report_get_params
from ......types.dns.analytics import DNSDNSAnalyticsAPIReport
from ......types.dns.firewall.analytics import report_get_params
__all__ = ["Reports", "AsyncReports"]
@ -68,7 +69,7 @@ class Reports(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> ReportGetResponse:
) -> DNSDNSAnalyticsAPIReport:
"""
Retrieves a list of summarised aggregate metrics over a given time period.
@ -129,7 +130,7 @@ class Reports(SyncAPIResource):
),
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[ReportGetResponse], ResultWrapper[ReportGetResponse]),
cast_to=cast(Type[DNSDNSAnalyticsAPIReport], ResultWrapper[DNSDNSAnalyticsAPIReport]),
)
@ -164,7 +165,7 @@ class AsyncReports(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> ReportGetResponse:
) -> DNSDNSAnalyticsAPIReport:
"""
Retrieves a list of summarised aggregate metrics over a given time period.
@ -225,7 +226,7 @@ class AsyncReports(AsyncAPIResource):
),
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[ReportGetResponse], ResultWrapper[ReportGetResponse]),
cast_to=cast(Type[DNSDNSAnalyticsAPIReport], ResultWrapper[DNSDNSAnalyticsAPIReport]),
)

41
src/cloudflare/resources/dns/firewall/firewall.py
View file

@ -29,10 +29,7 @@ from ...._response import (
)
from ...._wrappers import ResultWrapper
from ....types.dns import (
FirewallGetResponse,
FirewallEditResponse,
FirewallListResponse,
FirewallCreateResponse,
DNSFirewallDNSFirewall,
FirewallDeleteResponse,
firewall_edit_params,
firewall_list_params,
@ -82,7 +79,7 @@ class Firewall(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> FirewallCreateResponse:
) -> DNSFirewallDNSFirewall:
"""
Create a configured DNS Firewall Cluster.
@ -146,7 +143,7 @@ class Firewall(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[FirewallCreateResponse], ResultWrapper[FirewallCreateResponse]),
cast_to=cast(Type[DNSFirewallDNSFirewall], ResultWrapper[DNSFirewallDNSFirewall]),
)
def list(
@ -161,7 +158,7 @@ class Firewall(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> SyncV4PagePaginationArray[FirewallListResponse]:
) -> SyncV4PagePaginationArray[DNSFirewallDNSFirewall]:
"""
List configured DNS Firewall clusters for an account.
@ -184,7 +181,7 @@ class Firewall(SyncAPIResource):
raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
return self._get_api_list(
f"/accounts/{account_id}/dns_firewall",
page=SyncV4PagePaginationArray[FirewallListResponse],
page=SyncV4PagePaginationArray[DNSFirewallDNSFirewall],
options=make_request_options(
extra_headers=extra_headers,
extra_query=extra_query,
@ -198,7 +195,7 @@ class Firewall(SyncAPIResource):
firewall_list_params.FirewallListParams,
),
),
model=FirewallListResponse,
model=DNSFirewallDNSFirewall,
)
def delete(
@ -268,7 +265,7 @@ class Firewall(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> FirewallEditResponse:
) -> DNSFirewallDNSFirewall:
"""
Modify a DNS Firewall Cluster configuration.
@ -337,7 +334,7 @@ class Firewall(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[FirewallEditResponse], ResultWrapper[FirewallEditResponse]),
cast_to=cast(Type[DNSFirewallDNSFirewall], ResultWrapper[DNSFirewallDNSFirewall]),
)
def get(
@ -351,7 +348,7 @@ class Firewall(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> FirewallGetResponse:
) -> DNSFirewallDNSFirewall:
"""
Show a single configured DNS Firewall cluster for an account.
@ -381,7 +378,7 @@ class Firewall(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[FirewallGetResponse], ResultWrapper[FirewallGetResponse]),
cast_to=cast(Type[DNSFirewallDNSFirewall], ResultWrapper[DNSFirewallDNSFirewall]),
)
@ -419,7 +416,7 @@ class AsyncFirewall(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> FirewallCreateResponse:
) -> DNSFirewallDNSFirewall:
"""
Create a configured DNS Firewall Cluster.
@ -483,7 +480,7 @@ class AsyncFirewall(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[FirewallCreateResponse], ResultWrapper[FirewallCreateResponse]),
cast_to=cast(Type[DNSFirewallDNSFirewall], ResultWrapper[DNSFirewallDNSFirewall]),
)
def list(
@ -498,7 +495,7 @@ class AsyncFirewall(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> AsyncPaginator[FirewallListResponse, AsyncV4PagePaginationArray[FirewallListResponse]]:
) -> AsyncPaginator[DNSFirewallDNSFirewall, AsyncV4PagePaginationArray[DNSFirewallDNSFirewall]]:
"""
List configured DNS Firewall clusters for an account.
@ -521,7 +518,7 @@ class AsyncFirewall(AsyncAPIResource):
raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
return self._get_api_list(
f"/accounts/{account_id}/dns_firewall",
page=AsyncV4PagePaginationArray[FirewallListResponse],
page=AsyncV4PagePaginationArray[DNSFirewallDNSFirewall],
options=make_request_options(
extra_headers=extra_headers,
extra_query=extra_query,
@ -535,7 +532,7 @@ class AsyncFirewall(AsyncAPIResource):
firewall_list_params.FirewallListParams,
),
),
model=FirewallListResponse,
model=DNSFirewallDNSFirewall,
)
async def delete(
@ -605,7 +602,7 @@ class AsyncFirewall(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> FirewallEditResponse:
) -> DNSFirewallDNSFirewall:
"""
Modify a DNS Firewall Cluster configuration.
@ -674,7 +671,7 @@ class AsyncFirewall(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[FirewallEditResponse], ResultWrapper[FirewallEditResponse]),
cast_to=cast(Type[DNSFirewallDNSFirewall], ResultWrapper[DNSFirewallDNSFirewall]),
)
async def get(
@ -688,7 +685,7 @@ class AsyncFirewall(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> FirewallGetResponse:
) -> DNSFirewallDNSFirewall:
"""
Show a single configured DNS Firewall cluster for an account.
@ -718,7 +715,7 @@ class AsyncFirewall(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[FirewallGetResponse], ResultWrapper[FirewallGetResponse]),
cast_to=cast(Type[DNSFirewallDNSFirewall], ResultWrapper[DNSFirewallDNSFirewall]),
)

18
src/cloudflare/resources/dnssec.py
View file

@ -7,7 +7,7 @@ from typing_extensions import Literal
import httpx
from ..types import DNSSECGetResponse, DNSSECEditResponse, DNSSECDeleteResponse, dnssec_edit_params
from ..types import DNSSECDNSSEC, DNSSECDeleteResponse, dnssec_edit_params
from .._types import NOT_GIVEN, Body, Query, Headers, NotGiven
from .._utils import (
maybe_transform,
@ -95,7 +95,7 @@ class DNSSEC(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> DNSSECEditResponse:
) -> DNSSECDNSSEC:
"""
Enable or disable DNSSEC.
@ -148,7 +148,7 @@ class DNSSEC(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[DNSSECEditResponse], ResultWrapper[DNSSECEditResponse]),
cast_to=cast(Type[DNSSECDNSSEC], ResultWrapper[DNSSECDNSSEC]),
)
def get(
@ -161,7 +161,7 @@ class DNSSEC(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> DNSSECGetResponse:
) -> DNSSECDNSSEC:
"""
Details about DNSSEC status and configuration.
@ -187,7 +187,7 @@ class DNSSEC(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[DNSSECGetResponse], ResultWrapper[DNSSECGetResponse]),
cast_to=cast(Type[DNSSECDNSSEC], ResultWrapper[DNSSECDNSSEC]),
)
@ -257,7 +257,7 @@ class AsyncDNSSEC(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> DNSSECEditResponse:
) -> DNSSECDNSSEC:
"""
Enable or disable DNSSEC.
@ -310,7 +310,7 @@ class AsyncDNSSEC(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[DNSSECEditResponse], ResultWrapper[DNSSECEditResponse]),
cast_to=cast(Type[DNSSECDNSSEC], ResultWrapper[DNSSECDNSSEC]),
)
async def get(
@ -323,7 +323,7 @@ class AsyncDNSSEC(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> DNSSECGetResponse:
) -> DNSSECDNSSEC:
"""
Details about DNSSEC status and configuration.
@ -349,7 +349,7 @@ class AsyncDNSSEC(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[DNSSECGetResponse], ResultWrapper[DNSSECGetResponse]),
cast_to=cast(Type[DNSSECDNSSEC], ResultWrapper[DNSSECDNSSEC]),
)

18
src/cloudflare/resources/email_routing/routing/rules/catch_alls.py
View file

@ -24,7 +24,7 @@ from ....._wrappers import ResultWrapper
from ....._base_client import (
make_request_options,
)
from .....types.email_routing.routing.rules import CatchAllGetResponse, CatchAllUpdateResponse, catch_all_update_params
from .....types.email_routing.routing.rules import EmailCatchAllRule, catch_all_update_params
__all__ = ["CatchAlls", "AsyncCatchAlls"]
@ -52,7 +52,7 @@ class CatchAlls(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> CatchAllUpdateResponse:
) -> EmailCatchAllRule:
"""
Enable or disable catch-all routing rule, or change action to forward to
specific destination address.
@ -96,7 +96,7 @@ class CatchAlls(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[CatchAllUpdateResponse], ResultWrapper[CatchAllUpdateResponse]),
cast_to=cast(Type[EmailCatchAllRule], ResultWrapper[EmailCatchAllRule]),
)
def get(
@ -109,7 +109,7 @@ class CatchAlls(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> CatchAllGetResponse:
) -> EmailCatchAllRule:
"""
Get information on the default catch-all routing rule.
@ -135,7 +135,7 @@ class CatchAlls(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[CatchAllGetResponse], ResultWrapper[CatchAllGetResponse]),
cast_to=cast(Type[EmailCatchAllRule], ResultWrapper[EmailCatchAllRule]),
)
@ -162,7 +162,7 @@ class AsyncCatchAlls(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> CatchAllUpdateResponse:
) -> EmailCatchAllRule:
"""
Enable or disable catch-all routing rule, or change action to forward to
specific destination address.
@ -206,7 +206,7 @@ class AsyncCatchAlls(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[CatchAllUpdateResponse], ResultWrapper[CatchAllUpdateResponse]),
cast_to=cast(Type[EmailCatchAllRule], ResultWrapper[EmailCatchAllRule]),
)
async def get(
@ -219,7 +219,7 @@ class AsyncCatchAlls(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> CatchAllGetResponse:
) -> EmailCatchAllRule:
"""
Get information on the default catch-all routing rule.
@ -245,7 +245,7 @@ class AsyncCatchAlls(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[CatchAllGetResponse], ResultWrapper[CatchAllGetResponse]),
cast_to=cast(Type[EmailCatchAllRule], ResultWrapper[EmailCatchAllRule]),
)

41
src/cloudflare/resources/filters.py
View file

@ -7,11 +7,8 @@ from typing import Type, Optional, cast
import httpx
from ..types import (
FilterGetResponse,
FilterListResponse,
LegacyJhsFilter,
FilterCreateResponse,
FilterDeleteResponse,
FilterUpdateResponse,
filter_list_params,
filter_create_params,
filter_update_params,
@ -101,7 +98,7 @@ class Filters(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> Optional[FilterUpdateResponse]:
) -> Optional[LegacyJhsFilter]:
"""
Updates an existing filter.
@ -132,7 +129,7 @@ class Filters(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[Optional[FilterUpdateResponse]], ResultWrapper[FilterUpdateResponse]),
cast_to=cast(Type[Optional[LegacyJhsFilter]], ResultWrapper[LegacyJhsFilter]),
)
def list(
@ -151,7 +148,7 @@ class Filters(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> SyncV4PagePaginationArray[FilterListResponse]:
) -> SyncV4PagePaginationArray[LegacyJhsFilter]:
"""Fetches filters in a zone.
You can filter the results using several optional
@ -184,7 +181,7 @@ class Filters(SyncAPIResource):
raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
return self._get_api_list(
f"/zones/{zone_identifier}/filters",
page=SyncV4PagePaginationArray[FilterListResponse],
page=SyncV4PagePaginationArray[LegacyJhsFilter],
options=make_request_options(
extra_headers=extra_headers,
extra_query=extra_query,
@ -202,7 +199,7 @@ class Filters(SyncAPIResource):
filter_list_params.FilterListParams,
),
),
model=FilterListResponse,
model=LegacyJhsFilter,
)
def delete(
@ -216,7 +213,7 @@ class Filters(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> Optional[FilterDeleteResponse]:
) -> Optional[LegacyJhsFilter]:
"""
Deletes an existing filter.
@ -246,7 +243,7 @@ class Filters(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[Optional[FilterDeleteResponse]], ResultWrapper[FilterDeleteResponse]),
cast_to=cast(Type[Optional[LegacyJhsFilter]], ResultWrapper[LegacyJhsFilter]),
)
def get(
@ -260,7 +257,7 @@ class Filters(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> Optional[FilterGetResponse]:
) -> Optional[LegacyJhsFilter]:
"""
Fetches the details of a filter.
@ -290,7 +287,7 @@ class Filters(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[Optional[FilterGetResponse]], ResultWrapper[FilterGetResponse]),
cast_to=cast(Type[Optional[LegacyJhsFilter]], ResultWrapper[LegacyJhsFilter]),
)
@ -356,7 +353,7 @@ class AsyncFilters(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> Optional[FilterUpdateResponse]:
) -> Optional[LegacyJhsFilter]:
"""
Updates an existing filter.
@ -387,7 +384,7 @@ class AsyncFilters(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[Optional[FilterUpdateResponse]], ResultWrapper[FilterUpdateResponse]),
cast_to=cast(Type[Optional[LegacyJhsFilter]], ResultWrapper[LegacyJhsFilter]),
)
def list(
@ -406,7 +403,7 @@ class AsyncFilters(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> AsyncPaginator[FilterListResponse, AsyncV4PagePaginationArray[FilterListResponse]]:
) -> AsyncPaginator[LegacyJhsFilter, AsyncV4PagePaginationArray[LegacyJhsFilter]]:
"""Fetches filters in a zone.
You can filter the results using several optional
@ -439,7 +436,7 @@ class AsyncFilters(AsyncAPIResource):
raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
return self._get_api_list(
f"/zones/{zone_identifier}/filters",
page=AsyncV4PagePaginationArray[FilterListResponse],
page=AsyncV4PagePaginationArray[LegacyJhsFilter],
options=make_request_options(
extra_headers=extra_headers,
extra_query=extra_query,
@ -457,7 +454,7 @@ class AsyncFilters(AsyncAPIResource):
filter_list_params.FilterListParams,
),
),
model=FilterListResponse,
model=LegacyJhsFilter,
)
async def delete(
@ -471,7 +468,7 @@ class AsyncFilters(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> Optional[FilterDeleteResponse]:
) -> Optional[LegacyJhsFilter]:
"""
Deletes an existing filter.
@ -501,7 +498,7 @@ class AsyncFilters(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[Optional[FilterDeleteResponse]], ResultWrapper[FilterDeleteResponse]),
cast_to=cast(Type[Optional[LegacyJhsFilter]], ResultWrapper[LegacyJhsFilter]),
)
async def get(
@ -515,7 +512,7 @@ class AsyncFilters(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> Optional[FilterGetResponse]:
) -> Optional[LegacyJhsFilter]:
"""
Fetches the details of a filter.
@ -545,7 +542,7 @@ class AsyncFilters(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[Optional[FilterGetResponse]], ResultWrapper[FilterGetResponse]),
cast_to=cast(Type[Optional[LegacyJhsFilter]], ResultWrapper[LegacyJhsFilter]),
)

41
src/cloudflare/resources/firewall/lockdowns.py
View file

@ -26,11 +26,8 @@ from ..._base_client import (
make_request_options,
)
from ...types.firewall import (
LockdownGetResponse,
LockdownListResponse,
LockdownCreateResponse,
LegacyJhsZonelockdown,
LockdownDeleteResponse,
LockdownUpdateResponse,
lockdown_list_params,
lockdown_create_params,
lockdown_update_params,
@ -59,7 +56,7 @@ class Lockdowns(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> Optional[LockdownCreateResponse]:
) -> Optional[LegacyJhsZonelockdown]:
"""
Creates a new Zone Lockdown rule.
@ -86,7 +83,7 @@ class Lockdowns(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[Optional[LockdownCreateResponse]], ResultWrapper[LockdownCreateResponse]),
cast_to=cast(Type[Optional[LegacyJhsZonelockdown]], ResultWrapper[LegacyJhsZonelockdown]),
)
def update(
@ -101,7 +98,7 @@ class Lockdowns(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> Optional[LockdownUpdateResponse]:
) -> Optional[LegacyJhsZonelockdown]:
"""
Updates an existing Zone Lockdown rule.
@ -132,7 +129,7 @@ class Lockdowns(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[Optional[LockdownUpdateResponse]], ResultWrapper[LockdownUpdateResponse]),
cast_to=cast(Type[Optional[LegacyJhsZonelockdown]], ResultWrapper[LegacyJhsZonelockdown]),
)
def list(
@ -154,7 +151,7 @@ class Lockdowns(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> SyncV4PagePaginationArray[LockdownListResponse]:
) -> SyncV4PagePaginationArray[LegacyJhsZonelockdown]:
"""Fetches Zone Lockdown rules.
You can filter the results using several optional
@ -196,7 +193,7 @@ class Lockdowns(SyncAPIResource):
raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
return self._get_api_list(
f"/zones/{zone_identifier}/firewall/lockdowns",
page=SyncV4PagePaginationArray[LockdownListResponse],
page=SyncV4PagePaginationArray[LegacyJhsZonelockdown],
options=make_request_options(
extra_headers=extra_headers,
extra_query=extra_query,
@ -217,7 +214,7 @@ class Lockdowns(SyncAPIResource):
lockdown_list_params.LockdownListParams,
),
),
model=LockdownListResponse,
model=LegacyJhsZonelockdown,
)
def delete(
@ -275,7 +272,7 @@ class Lockdowns(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> Optional[LockdownGetResponse]:
) -> Optional[LegacyJhsZonelockdown]:
"""
Fetches the details of a Zone Lockdown rule.
@ -305,7 +302,7 @@ class Lockdowns(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[Optional[LockdownGetResponse]], ResultWrapper[LockdownGetResponse]),
cast_to=cast(Type[Optional[LegacyJhsZonelockdown]], ResultWrapper[LegacyJhsZonelockdown]),
)
@ -329,7 +326,7 @@ class AsyncLockdowns(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> Optional[LockdownCreateResponse]:
) -> Optional[LegacyJhsZonelockdown]:
"""
Creates a new Zone Lockdown rule.
@ -356,7 +353,7 @@ class AsyncLockdowns(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[Optional[LockdownCreateResponse]], ResultWrapper[LockdownCreateResponse]),
cast_to=cast(Type[Optional[LegacyJhsZonelockdown]], ResultWrapper[LegacyJhsZonelockdown]),
)
async def update(
@ -371,7 +368,7 @@ class AsyncLockdowns(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> Optional[LockdownUpdateResponse]:
) -> Optional[LegacyJhsZonelockdown]:
"""
Updates an existing Zone Lockdown rule.
@ -402,7 +399,7 @@ class AsyncLockdowns(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[Optional[LockdownUpdateResponse]], ResultWrapper[LockdownUpdateResponse]),
cast_to=cast(Type[Optional[LegacyJhsZonelockdown]], ResultWrapper[LegacyJhsZonelockdown]),
)
def list(
@ -424,7 +421,7 @@ class AsyncLockdowns(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> AsyncPaginator[LockdownListResponse, AsyncV4PagePaginationArray[LockdownListResponse]]:
) -> AsyncPaginator[LegacyJhsZonelockdown, AsyncV4PagePaginationArray[LegacyJhsZonelockdown]]:
"""Fetches Zone Lockdown rules.
You can filter the results using several optional
@ -466,7 +463,7 @@ class AsyncLockdowns(AsyncAPIResource):
raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
return self._get_api_list(
f"/zones/{zone_identifier}/firewall/lockdowns",
page=AsyncV4PagePaginationArray[LockdownListResponse],
page=AsyncV4PagePaginationArray[LegacyJhsZonelockdown],
options=make_request_options(
extra_headers=extra_headers,
extra_query=extra_query,
@ -487,7 +484,7 @@ class AsyncLockdowns(AsyncAPIResource):
lockdown_list_params.LockdownListParams,
),
),
model=LockdownListResponse,
model=LegacyJhsZonelockdown,
)
async def delete(
@ -545,7 +542,7 @@ class AsyncLockdowns(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> Optional[LockdownGetResponse]:
) -> Optional[LegacyJhsZonelockdown]:
"""
Fetches the details of a Zone Lockdown rule.
@ -575,7 +572,7 @@ class AsyncLockdowns(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[Optional[LockdownGetResponse]], ResultWrapper[LockdownGetResponse]),
cast_to=cast(Type[Optional[LegacyJhsZonelockdown]], ResultWrapper[LegacyJhsZonelockdown]),
)

41
src/cloudflare/resources/firewall/rules.py
View file

@ -26,12 +26,9 @@ from ..._base_client import (
make_request_options,
)
from ...types.firewall import (
RuleGetResponse,
RuleEditResponse,
RuleListResponse,
RuleCreateResponse,
RuleDeleteResponse,
RuleUpdateResponse,
LegacyJhsFilterRule,
rule_edit_params,
rule_list_params,
rule_create_params,
@ -104,7 +101,7 @@ class Rules(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> Optional[RuleUpdateResponse]:
) -> Optional[LegacyJhsFilterRule]:
"""
Updates an existing firewall rule.
@ -135,7 +132,7 @@ class Rules(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[Optional[RuleUpdateResponse]], ResultWrapper[RuleUpdateResponse]),
cast_to=cast(Type[Optional[LegacyJhsFilterRule]], ResultWrapper[LegacyJhsFilterRule]),
)
def list(
@ -153,7 +150,7 @@ class Rules(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> SyncV4PagePaginationArray[RuleListResponse]:
) -> SyncV4PagePaginationArray[LegacyJhsFilterRule]:
"""Fetches firewall rules in a zone.
You can filter the results using several
@ -184,7 +181,7 @@ class Rules(SyncAPIResource):
raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
return self._get_api_list(
f"/zones/{zone_identifier}/firewall/rules",
page=SyncV4PagePaginationArray[RuleListResponse],
page=SyncV4PagePaginationArray[LegacyJhsFilterRule],
options=make_request_options(
extra_headers=extra_headers,
extra_query=extra_query,
@ -201,7 +198,7 @@ class Rules(SyncAPIResource):
rule_list_params.RuleListParams,
),
),
model=RuleListResponse,
model=LegacyJhsFilterRule,
)
def delete(
@ -216,7 +213,7 @@ class Rules(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> Optional[RuleDeleteResponse]:
) -> Optional[LegacyJhsFilterRule]:
"""
Deletes an existing firewall rule.
@ -252,7 +249,7 @@ class Rules(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[Optional[RuleDeleteResponse]], ResultWrapper[RuleDeleteResponse]),
cast_to=cast(Type[Optional[LegacyJhsFilterRule]], ResultWrapper[LegacyJhsFilterRule]),
)
def edit(
@ -312,7 +309,7 @@ class Rules(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> Optional[RuleGetResponse]:
) -> Optional[LegacyJhsFilterRule]:
"""
Fetches the details of a firewall rule.
@ -342,7 +339,7 @@ class Rules(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[Optional[RuleGetResponse]], ResultWrapper[RuleGetResponse]),
cast_to=cast(Type[Optional[LegacyJhsFilterRule]], ResultWrapper[LegacyJhsFilterRule]),
)
@ -408,7 +405,7 @@ class AsyncRules(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> Optional[RuleUpdateResponse]:
) -> Optional[LegacyJhsFilterRule]:
"""
Updates an existing firewall rule.
@ -439,7 +436,7 @@ class AsyncRules(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[Optional[RuleUpdateResponse]], ResultWrapper[RuleUpdateResponse]),
cast_to=cast(Type[Optional[LegacyJhsFilterRule]], ResultWrapper[LegacyJhsFilterRule]),
)
def list(
@ -457,7 +454,7 @@ class AsyncRules(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> AsyncPaginator[RuleListResponse, AsyncV4PagePaginationArray[RuleListResponse]]:
) -> AsyncPaginator[LegacyJhsFilterRule, AsyncV4PagePaginationArray[LegacyJhsFilterRule]]:
"""Fetches firewall rules in a zone.
You can filter the results using several
@ -488,7 +485,7 @@ class AsyncRules(AsyncAPIResource):
raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
return self._get_api_list(
f"/zones/{zone_identifier}/firewall/rules",
page=AsyncV4PagePaginationArray[RuleListResponse],
page=AsyncV4PagePaginationArray[LegacyJhsFilterRule],
options=make_request_options(
extra_headers=extra_headers,
extra_query=extra_query,
@ -505,7 +502,7 @@ class AsyncRules(AsyncAPIResource):
rule_list_params.RuleListParams,
),
),
model=RuleListResponse,
model=LegacyJhsFilterRule,
)
async def delete(
@ -520,7 +517,7 @@ class AsyncRules(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> Optional[RuleDeleteResponse]:
) -> Optional[LegacyJhsFilterRule]:
"""
Deletes an existing firewall rule.
@ -556,7 +553,7 @@ class AsyncRules(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[Optional[RuleDeleteResponse]], ResultWrapper[RuleDeleteResponse]),
cast_to=cast(Type[Optional[LegacyJhsFilterRule]], ResultWrapper[LegacyJhsFilterRule]),
)
async def edit(
@ -616,7 +613,7 @@ class AsyncRules(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> Optional[RuleGetResponse]:
) -> Optional[LegacyJhsFilterRule]:
"""
Fetches the details of a firewall rule.
@ -646,7 +643,7 @@ class AsyncRules(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[Optional[RuleGetResponse]], ResultWrapper[RuleGetResponse]),
cast_to=cast(Type[Optional[LegacyJhsFilterRule]], ResultWrapper[LegacyJhsFilterRule]),
)

41
src/cloudflare/resources/firewall/waf/overrides.py
View file

@ -26,11 +26,8 @@ from ...._base_client import (
make_request_options,
)
from ....types.firewall.waf import (
OverrideGetResponse,
OverrideListResponse,
OverrideCreateResponse,
LegacyJhsOverride,
OverrideDeleteResponse,
OverrideUpdateResponse,
override_list_params,
override_create_params,
override_update_params,
@ -59,7 +56,7 @@ class Overrides(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> Optional[OverrideCreateResponse]:
) -> Optional[LegacyJhsOverride]:
"""
Creates a URI-based WAF override for a zone.
@ -89,7 +86,7 @@ class Overrides(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[Optional[OverrideCreateResponse]], ResultWrapper[OverrideCreateResponse]),
cast_to=cast(Type[Optional[LegacyJhsOverride]], ResultWrapper[LegacyJhsOverride]),
)
def update(
@ -104,7 +101,7 @@ class Overrides(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> Optional[OverrideUpdateResponse]:
) -> Optional[LegacyJhsOverride]:
"""
Updates an existing URI-based WAF override.
@ -138,7 +135,7 @@ class Overrides(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[Optional[OverrideUpdateResponse]], ResultWrapper[OverrideUpdateResponse]),
cast_to=cast(Type[Optional[LegacyJhsOverride]], ResultWrapper[LegacyJhsOverride]),
)
def list(
@ -153,7 +150,7 @@ class Overrides(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> SyncV4PagePaginationArray[OverrideListResponse]:
) -> SyncV4PagePaginationArray[LegacyJhsOverride]:
"""
Fetches the URI-based WAF overrides in a zone.
@ -179,7 +176,7 @@ class Overrides(SyncAPIResource):
raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
return self._get_api_list(
f"/zones/{zone_identifier}/firewall/waf/overrides",
page=SyncV4PagePaginationArray[OverrideListResponse],
page=SyncV4PagePaginationArray[LegacyJhsOverride],
options=make_request_options(
extra_headers=extra_headers,
extra_query=extra_query,
@ -193,7 +190,7 @@ class Overrides(SyncAPIResource):
override_list_params.OverrideListParams,
),
),
model=OverrideListResponse,
model=LegacyJhsOverride,
)
def delete(
@ -254,7 +251,7 @@ class Overrides(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> Optional[OverrideGetResponse]:
) -> Optional[LegacyJhsOverride]:
"""
Fetches the details of a URI-based WAF override.
@ -287,7 +284,7 @@ class Overrides(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[Optional[OverrideGetResponse]], ResultWrapper[OverrideGetResponse]),
cast_to=cast(Type[Optional[LegacyJhsOverride]], ResultWrapper[LegacyJhsOverride]),
)
@ -311,7 +308,7 @@ class AsyncOverrides(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> Optional[OverrideCreateResponse]:
) -> Optional[LegacyJhsOverride]:
"""
Creates a URI-based WAF override for a zone.
@ -341,7 +338,7 @@ class AsyncOverrides(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[Optional[OverrideCreateResponse]], ResultWrapper[OverrideCreateResponse]),
cast_to=cast(Type[Optional[LegacyJhsOverride]], ResultWrapper[LegacyJhsOverride]),
)
async def update(
@ -356,7 +353,7 @@ class AsyncOverrides(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> Optional[OverrideUpdateResponse]:
) -> Optional[LegacyJhsOverride]:
"""
Updates an existing URI-based WAF override.
@ -390,7 +387,7 @@ class AsyncOverrides(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[Optional[OverrideUpdateResponse]], ResultWrapper[OverrideUpdateResponse]),
cast_to=cast(Type[Optional[LegacyJhsOverride]], ResultWrapper[LegacyJhsOverride]),
)
def list(
@ -405,7 +402,7 @@ class AsyncOverrides(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> AsyncPaginator[OverrideListResponse, AsyncV4PagePaginationArray[OverrideListResponse]]:
) -> AsyncPaginator[LegacyJhsOverride, AsyncV4PagePaginationArray[LegacyJhsOverride]]:
"""
Fetches the URI-based WAF overrides in a zone.
@ -431,7 +428,7 @@ class AsyncOverrides(AsyncAPIResource):
raise ValueError(f"Expected a non-empty value for `zone_identifier` but received {zone_identifier!r}")
return self._get_api_list(
f"/zones/{zone_identifier}/firewall/waf/overrides",
page=AsyncV4PagePaginationArray[OverrideListResponse],
page=AsyncV4PagePaginationArray[LegacyJhsOverride],
options=make_request_options(
extra_headers=extra_headers,
extra_query=extra_query,
@ -445,7 +442,7 @@ class AsyncOverrides(AsyncAPIResource):
override_list_params.OverrideListParams,
),
),
model=OverrideListResponse,
model=LegacyJhsOverride,
)
async def delete(
@ -506,7 +503,7 @@ class AsyncOverrides(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> Optional[OverrideGetResponse]:
) -> Optional[LegacyJhsOverride]:
"""
Fetches the details of a URI-based WAF override.
@ -539,7 +536,7 @@ class AsyncOverrides(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[Optional[OverrideGetResponse]], ResultWrapper[OverrideGetResponse]),
cast_to=cast(Type[Optional[LegacyJhsOverride]], ResultWrapper[LegacyJhsOverride]),
)

14
src/cloudflare/resources/firewall/waf/packages/groups.py
View file

@ -29,7 +29,7 @@ from ....._base_client import (
from .....types.firewall.waf.packages import (
GroupGetResponse,
GroupEditResponse,
GroupListResponse,
WAFManagedRulesSchemasGroup,
group_edit_params,
group_list_params,
)
@ -63,7 +63,7 @@ class Groups(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> SyncV4PagePaginationArray[GroupListResponse]:
) -> SyncV4PagePaginationArray[WAFManagedRulesSchemasGroup]:
"""
Fetches the WAF rule groups in a WAF package.
@ -103,7 +103,7 @@ class Groups(SyncAPIResource):
raise ValueError(f"Expected a non-empty value for `package_id` but received {package_id!r}")
return self._get_api_list(
f"/zones/{zone_id}/firewall/waf/packages/{package_id}/groups",
page=SyncV4PagePaginationArray[GroupListResponse],
page=SyncV4PagePaginationArray[WAFManagedRulesSchemasGroup],
options=make_request_options(
extra_headers=extra_headers,
extra_query=extra_query,
@ -121,7 +121,7 @@ class Groups(SyncAPIResource):
group_list_params.GroupListParams,
),
),
model=GroupListResponse,
model=WAFManagedRulesSchemasGroup,
)
def edit(
@ -272,7 +272,7 @@ class AsyncGroups(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> AsyncPaginator[GroupListResponse, AsyncV4PagePaginationArray[GroupListResponse]]:
) -> AsyncPaginator[WAFManagedRulesSchemasGroup, AsyncV4PagePaginationArray[WAFManagedRulesSchemasGroup]]:
"""
Fetches the WAF rule groups in a WAF package.
@ -312,7 +312,7 @@ class AsyncGroups(AsyncAPIResource):
raise ValueError(f"Expected a non-empty value for `package_id` but received {package_id!r}")
return self._get_api_list(
f"/zones/{zone_id}/firewall/waf/packages/{package_id}/groups",
page=AsyncV4PagePaginationArray[GroupListResponse],
page=AsyncV4PagePaginationArray[WAFManagedRulesSchemasGroup],
options=make_request_options(
extra_headers=extra_headers,
extra_query=extra_query,
@ -330,7 +330,7 @@ class AsyncGroups(AsyncAPIResource):
group_list_params.GroupListParams,
),
),
model=GroupListResponse,
model=WAFManagedRulesSchemasGroup,
)
async def edit(

14
src/cloudflare/resources/firewall/waf/packages/rules.py
View file

@ -29,7 +29,7 @@ from ....._base_client import (
from .....types.firewall.waf.packages import (
RuleGetResponse,
RuleEditResponse,
RuleListResponse,
WAFManagedRulesRule,
rule_edit_params,
rule_list_params,
)
@ -63,7 +63,7 @@ class Rules(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> SyncV4PagePaginationArray[RuleListResponse]:
) -> SyncV4PagePaginationArray[WAFManagedRulesRule]:
"""
Fetches WAF rules in a WAF package.
@ -102,7 +102,7 @@ class Rules(SyncAPIResource):
raise ValueError(f"Expected a non-empty value for `package_id` but received {package_id!r}")
return self._get_api_list(
f"/zones/{zone_id}/firewall/waf/packages/{package_id}/rules",
page=SyncV4PagePaginationArray[RuleListResponse],
page=SyncV4PagePaginationArray[WAFManagedRulesRule],
options=make_request_options(
extra_headers=extra_headers,
extra_query=extra_query,
@ -120,7 +120,7 @@ class Rules(SyncAPIResource):
rule_list_params.RuleListParams,
),
),
model=cast(Any, RuleListResponse), # Union types cannot be passed in as arguments in the type system
model=cast(Any, WAFManagedRulesRule), # Union types cannot be passed in as arguments in the type system
)
def edit(
@ -270,7 +270,7 @@ class AsyncRules(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> AsyncPaginator[RuleListResponse, AsyncV4PagePaginationArray[RuleListResponse]]:
) -> AsyncPaginator[WAFManagedRulesRule, AsyncV4PagePaginationArray[WAFManagedRulesRule]]:
"""
Fetches WAF rules in a WAF package.
@ -309,7 +309,7 @@ class AsyncRules(AsyncAPIResource):
raise ValueError(f"Expected a non-empty value for `package_id` but received {package_id!r}")
return self._get_api_list(
f"/zones/{zone_id}/firewall/waf/packages/{package_id}/rules",
page=AsyncV4PagePaginationArray[RuleListResponse],
page=AsyncV4PagePaginationArray[WAFManagedRulesRule],
options=make_request_options(
extra_headers=extra_headers,
extra_query=extra_query,
@ -327,7 +327,7 @@ class AsyncRules(AsyncAPIResource):
rule_list_params.RuleListParams,
),
),
model=cast(Any, RuleListResponse), # Union types cannot be passed in as arguments in the type system
model=cast(Any, WAFManagedRulesRule), # Union types cannot be passed in as arguments in the type system
)
async def edit(

37
src/cloudflare/resources/healthchecks/healthchecks.py
View file

@ -8,12 +8,9 @@ from typing_extensions import Literal
import httpx
from ...types import (
HealthcheckGetResponse,
HealthcheckEditResponse,
HealthcheckListResponse,
HealthcheckCreateResponse,
HealthchecksHealthchecks,
HealthcheckDeleteResponse,
HealthcheckUpdateResponse,
healthcheck_edit_params,
healthcheck_create_params,
healthcheck_update_params,
@ -103,7 +100,7 @@ class Healthchecks(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> HealthcheckCreateResponse:
) -> HealthchecksHealthchecks:
"""
Create a new health check.
@ -181,7 +178,7 @@ class Healthchecks(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[HealthcheckCreateResponse], ResultWrapper[HealthcheckCreateResponse]),
cast_to=cast(Type[HealthchecksHealthchecks], ResultWrapper[HealthchecksHealthchecks]),
)
def update(
@ -228,7 +225,7 @@ class Healthchecks(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> HealthcheckUpdateResponse:
) -> HealthchecksHealthchecks:
"""
Update a configured health check.
@ -310,7 +307,7 @@ class Healthchecks(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[HealthcheckUpdateResponse], ResultWrapper[HealthcheckUpdateResponse]),
cast_to=cast(Type[HealthchecksHealthchecks], ResultWrapper[HealthchecksHealthchecks]),
)
def list(
@ -440,7 +437,7 @@ class Healthchecks(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> HealthcheckEditResponse:
) -> HealthchecksHealthchecks:
"""
Patch a configured health check.
@ -522,7 +519,7 @@ class Healthchecks(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[HealthcheckEditResponse], ResultWrapper[HealthcheckEditResponse]),
cast_to=cast(Type[HealthchecksHealthchecks], ResultWrapper[HealthchecksHealthchecks]),
)
def get(
@ -536,7 +533,7 @@ class Healthchecks(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> HealthcheckGetResponse:
) -> HealthchecksHealthchecks:
"""
Fetch a single configured health check.
@ -566,7 +563,7 @@ class Healthchecks(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[HealthcheckGetResponse], ResultWrapper[HealthcheckGetResponse]),
cast_to=cast(Type[HealthchecksHealthchecks], ResultWrapper[HealthchecksHealthchecks]),
)
@ -626,7 +623,7 @@ class AsyncHealthchecks(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> HealthcheckCreateResponse:
) -> HealthchecksHealthchecks:
"""
Create a new health check.
@ -704,7 +701,7 @@ class AsyncHealthchecks(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[HealthcheckCreateResponse], ResultWrapper[HealthcheckCreateResponse]),
cast_to=cast(Type[HealthchecksHealthchecks], ResultWrapper[HealthchecksHealthchecks]),
)
async def update(
@ -751,7 +748,7 @@ class AsyncHealthchecks(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> HealthcheckUpdateResponse:
) -> HealthchecksHealthchecks:
"""
Update a configured health check.
@ -833,7 +830,7 @@ class AsyncHealthchecks(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[HealthcheckUpdateResponse], ResultWrapper[HealthcheckUpdateResponse]),
cast_to=cast(Type[HealthchecksHealthchecks], ResultWrapper[HealthchecksHealthchecks]),
)
async def list(
@ -963,7 +960,7 @@ class AsyncHealthchecks(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> HealthcheckEditResponse:
) -> HealthchecksHealthchecks:
"""
Patch a configured health check.
@ -1045,7 +1042,7 @@ class AsyncHealthchecks(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[HealthcheckEditResponse], ResultWrapper[HealthcheckEditResponse]),
cast_to=cast(Type[HealthchecksHealthchecks], ResultWrapper[HealthchecksHealthchecks]),
)
async def get(
@ -1059,7 +1056,7 @@ class AsyncHealthchecks(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> HealthcheckGetResponse:
) -> HealthchecksHealthchecks:
"""
Fetch a single configured health check.
@ -1089,7 +1086,7 @@ class AsyncHealthchecks(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[HealthcheckGetResponse], ResultWrapper[HealthcheckGetResponse]),
cast_to=cast(Type[HealthchecksHealthchecks], ResultWrapper[HealthchecksHealthchecks]),
)

24
src/cloudflare/resources/healthchecks/previews.py
View file

@ -7,6 +7,7 @@ from typing_extensions import Literal
import httpx
from ...types import HealthchecksHealthchecks
from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
from ..._utils import (
maybe_transform,
@ -24,12 +25,7 @@ from ..._wrappers import ResultWrapper
from ..._base_client import (
make_request_options,
)
from ...types.healthchecks import (
PreviewGetResponse,
PreviewCreateResponse,
PreviewDeleteResponse,
preview_create_params,
)
from ...types.healthchecks import PreviewDeleteResponse, preview_create_params
__all__ = ["Previews", "AsyncPreviews"]
@ -86,7 +82,7 @@ class Previews(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> PreviewCreateResponse:
) -> HealthchecksHealthchecks:
"""
Create a new preview health check.
@ -164,7 +160,7 @@ class Previews(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[PreviewCreateResponse], ResultWrapper[PreviewCreateResponse]),
cast_to=cast(Type[HealthchecksHealthchecks], ResultWrapper[HealthchecksHealthchecks]),
)
def delete(
@ -222,7 +218,7 @@ class Previews(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> PreviewGetResponse:
) -> HealthchecksHealthchecks:
"""
Fetch a single configured health check preview.
@ -252,7 +248,7 @@ class Previews(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[PreviewGetResponse], ResultWrapper[PreviewGetResponse]),
cast_to=cast(Type[HealthchecksHealthchecks], ResultWrapper[HealthchecksHealthchecks]),
)
@ -308,7 +304,7 @@ class AsyncPreviews(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> PreviewCreateResponse:
) -> HealthchecksHealthchecks:
"""
Create a new preview health check.
@ -386,7 +382,7 @@ class AsyncPreviews(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[PreviewCreateResponse], ResultWrapper[PreviewCreateResponse]),
cast_to=cast(Type[HealthchecksHealthchecks], ResultWrapper[HealthchecksHealthchecks]),
)
async def delete(
@ -444,7 +440,7 @@ class AsyncPreviews(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> PreviewGetResponse:
) -> HealthchecksHealthchecks:
"""
Fetch a single configured health check preview.
@ -474,7 +470,7 @@ class AsyncPreviews(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[PreviewGetResponse], ResultWrapper[PreviewGetResponse]),
cast_to=cast(Type[HealthchecksHealthchecks], ResultWrapper[HealthchecksHealthchecks]),
)

33
src/cloudflare/resources/hostnames/settings/tls.py
View file

@ -24,7 +24,12 @@ from ...._wrappers import ResultWrapper
from ...._base_client import (
make_request_options,
)
from ....types.hostnames.settings import TLSGetResponse, TLSDeleteResponse, TLSUpdateResponse, tls_update_params
from ....types.hostnames.settings import (
TLSGetResponse,
TLSCertificatesAndHostnamesSettingObject,
TLSCertificatesAndHostnamesSettingObjectDelete,
tls_update_params,
)
__all__ = ["TLS", "AsyncTLS"]
@ -51,7 +56,7 @@ class TLS(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> TLSUpdateResponse:
) -> TLSCertificatesAndHostnamesSettingObject:
"""
Update the tls setting value for the hostname.
@ -88,7 +93,9 @@ class TLS(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[TLSUpdateResponse], ResultWrapper[TLSUpdateResponse]),
cast_to=cast(
Type[TLSCertificatesAndHostnamesSettingObject], ResultWrapper[TLSCertificatesAndHostnamesSettingObject]
),
)
def delete(
@ -103,7 +110,7 @@ class TLS(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> TLSDeleteResponse:
) -> TLSCertificatesAndHostnamesSettingObjectDelete:
"""
Delete the tls setting value for the hostname.
@ -137,7 +144,10 @@ class TLS(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[TLSDeleteResponse], ResultWrapper[TLSDeleteResponse]),
cast_to=cast(
Type[TLSCertificatesAndHostnamesSettingObjectDelete],
ResultWrapper[TLSCertificatesAndHostnamesSettingObjectDelete],
),
)
def get(
@ -207,7 +217,7 @@ class AsyncTLS(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> TLSUpdateResponse:
) -> TLSCertificatesAndHostnamesSettingObject:
"""
Update the tls setting value for the hostname.
@ -244,7 +254,9 @@ class AsyncTLS(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[TLSUpdateResponse], ResultWrapper[TLSUpdateResponse]),
cast_to=cast(
Type[TLSCertificatesAndHostnamesSettingObject], ResultWrapper[TLSCertificatesAndHostnamesSettingObject]
),
)
async def delete(
@ -259,7 +271,7 @@ class AsyncTLS(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> TLSDeleteResponse:
) -> TLSCertificatesAndHostnamesSettingObjectDelete:
"""
Delete the tls setting value for the hostname.
@ -293,7 +305,10 @@ class AsyncTLS(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[TLSDeleteResponse], ResultWrapper[TLSDeleteResponse]),
cast_to=cast(
Type[TLSCertificatesAndHostnamesSettingObjectDelete],
ResultWrapper[TLSCertificatesAndHostnamesSettingObjectDelete],
),
)
async def get(

10
src/cloudflare/resources/images/v1/keys.py
View file

@ -19,7 +19,7 @@ from ...._wrappers import ResultWrapper
from ...._base_client import (
make_request_options,
)
from ....types.images.v1 import KeyListResponse
from ....types.images.v1 import ImagesImageKeys
__all__ = ["Keys", "AsyncKeys"]
@ -43,7 +43,7 @@ class Keys(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> KeyListResponse:
) -> ImagesImageKeys:
"""Lists your signing keys.
These can be found on your Cloudflare Images dashboard.
@ -70,7 +70,7 @@ class Keys(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[KeyListResponse], ResultWrapper[KeyListResponse]),
cast_to=cast(Type[ImagesImageKeys], ResultWrapper[ImagesImageKeys]),
)
@ -93,7 +93,7 @@ class AsyncKeys(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> KeyListResponse:
) -> ImagesImageKeys:
"""Lists your signing keys.
These can be found on your Cloudflare Images dashboard.
@ -120,7 +120,7 @@ class AsyncKeys(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[KeyListResponse], ResultWrapper[KeyListResponse]),
cast_to=cast(Type[ImagesImageKeys], ResultWrapper[ImagesImageKeys]),
)

10
src/cloudflare/resources/images/v1/stats.py
View file

@ -19,7 +19,7 @@ from ...._wrappers import ResultWrapper
from ...._base_client import (
make_request_options,
)
from ....types.images.v1 import StatGetResponse
from ....types.images.v1 import ImagesImagesStats
__all__ = ["Stats", "AsyncStats"]
@ -43,7 +43,7 @@ class Stats(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> StatGetResponse:
) -> ImagesImagesStats:
"""
Fetch usage statistics details for Cloudflare Images.
@ -69,7 +69,7 @@ class Stats(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[StatGetResponse], ResultWrapper[StatGetResponse]),
cast_to=cast(Type[ImagesImagesStats], ResultWrapper[ImagesImagesStats]),
)
@ -92,7 +92,7 @@ class AsyncStats(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> StatGetResponse:
) -> ImagesImagesStats:
"""
Fetch usage statistics details for Cloudflare Images.
@ -118,7 +118,7 @@ class AsyncStats(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[StatGetResponse], ResultWrapper[StatGetResponse]),
cast_to=cast(Type[ImagesImagesStats], ResultWrapper[ImagesImagesStats]),
)

28
src/cloudflare/resources/images/v1/v1.py
View file

@ -58,10 +58,8 @@ from ...._base_client import (
make_request_options,
)
from ....types.images import (
V1GetResponse,
V1EditResponse,
ImagesImage,
V1ListResponse,
V1CreateResponse,
V1DeleteResponse,
v1_edit_params,
v1_list_params,
@ -108,7 +106,7 @@ class V1(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> V1CreateResponse:
) -> ImagesImage:
"""
Upload an image with up to 10 Megabytes using a single HTTP POST
(multipart/form-data) request. An image can be uploaded by sending an image file
@ -145,7 +143,7 @@ class V1(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[V1CreateResponse], ResultWrapper[V1CreateResponse]),
cast_to=cast(Type[ImagesImage], ResultWrapper[ImagesImage]),
)
def list(
@ -266,7 +264,7 @@ class V1(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> V1EditResponse:
) -> ImagesImage:
"""Update image access control.
On access control change, all copies of the image
@ -312,7 +310,7 @@ class V1(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[V1EditResponse], ResultWrapper[V1EditResponse]),
cast_to=cast(Type[ImagesImage], ResultWrapper[ImagesImage]),
)
def get(
@ -326,7 +324,7 @@ class V1(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> V1GetResponse:
) -> ImagesImage:
"""
Fetch details for a single image.
@ -356,7 +354,7 @@ class V1(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[V1GetResponse], ResultWrapper[V1GetResponse]),
cast_to=cast(Type[ImagesImage], ResultWrapper[ImagesImage]),
)
@ -397,7 +395,7 @@ class AsyncV1(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> V1CreateResponse:
) -> ImagesImage:
"""
Upload an image with up to 10 Megabytes using a single HTTP POST
(multipart/form-data) request. An image can be uploaded by sending an image file
@ -434,7 +432,7 @@ class AsyncV1(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[V1CreateResponse], ResultWrapper[V1CreateResponse]),
cast_to=cast(Type[ImagesImage], ResultWrapper[ImagesImage]),
)
def list(
@ -555,7 +553,7 @@ class AsyncV1(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> V1EditResponse:
) -> ImagesImage:
"""Update image access control.
On access control change, all copies of the image
@ -601,7 +599,7 @@ class AsyncV1(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[V1EditResponse], ResultWrapper[V1EditResponse]),
cast_to=cast(Type[ImagesImage], ResultWrapper[ImagesImage]),
)
async def get(
@ -615,7 +613,7 @@ class AsyncV1(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> V1GetResponse:
) -> ImagesImage:
"""
Fetch details for a single image.
@ -645,7 +643,7 @@ class AsyncV1(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[V1GetResponse], ResultWrapper[V1GetResponse]),
cast_to=cast(Type[ImagesImage], ResultWrapper[ImagesImage]),
)

38
src/cloudflare/resources/images/v1/variants.py
View file

@ -24,10 +24,8 @@ from ...._base_client import (
make_request_options,
)
from ....types.images.v1 import (
VariantGetResponse,
VariantEditResponse,
VariantListResponse,
VariantCreateResponse,
ImageVariant,
ImageVariants,
VariantDeleteResponse,
variant_edit_params,
variant_create_params,
@ -58,7 +56,7 @@ class Variants(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> VariantCreateResponse:
) -> ImageVariant:
"""
Specify variants that allow you to resize images for different use cases.
@ -97,7 +95,7 @@ class Variants(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[VariantCreateResponse], ResultWrapper[VariantCreateResponse]),
cast_to=cast(Type[ImageVariant], ResultWrapper[ImageVariant]),
)
def list(
@ -110,7 +108,7 @@ class Variants(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> VariantListResponse:
) -> ImageVariants:
"""
Lists existing variants.
@ -136,7 +134,7 @@ class Variants(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[VariantListResponse], ResultWrapper[VariantListResponse]),
cast_to=cast(Type[ImageVariants], ResultWrapper[ImageVariants]),
)
def delete(
@ -197,7 +195,7 @@ class Variants(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> VariantEditResponse:
) -> ImageVariant:
"""
Updating a variant purges the cache for all images associated with the variant.
@ -235,7 +233,7 @@ class Variants(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[VariantEditResponse], ResultWrapper[VariantEditResponse]),
cast_to=cast(Type[ImageVariant], ResultWrapper[ImageVariant]),
)
def get(
@ -249,7 +247,7 @@ class Variants(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> VariantGetResponse:
) -> ImageVariant:
"""
Fetch details for a single variant.
@ -275,7 +273,7 @@ class Variants(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[VariantGetResponse], ResultWrapper[VariantGetResponse]),
cast_to=cast(Type[ImageVariant], ResultWrapper[ImageVariant]),
)
@ -301,7 +299,7 @@ class AsyncVariants(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> VariantCreateResponse:
) -> ImageVariant:
"""
Specify variants that allow you to resize images for different use cases.
@ -340,7 +338,7 @@ class AsyncVariants(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[VariantCreateResponse], ResultWrapper[VariantCreateResponse]),
cast_to=cast(Type[ImageVariant], ResultWrapper[ImageVariant]),
)
async def list(
@ -353,7 +351,7 @@ class AsyncVariants(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> VariantListResponse:
) -> ImageVariants:
"""
Lists existing variants.
@ -379,7 +377,7 @@ class AsyncVariants(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[VariantListResponse], ResultWrapper[VariantListResponse]),
cast_to=cast(Type[ImageVariants], ResultWrapper[ImageVariants]),
)
async def delete(
@ -440,7 +438,7 @@ class AsyncVariants(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> VariantEditResponse:
) -> ImageVariant:
"""
Updating a variant purges the cache for all images associated with the variant.
@ -478,7 +476,7 @@ class AsyncVariants(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[VariantEditResponse], ResultWrapper[VariantEditResponse]),
cast_to=cast(Type[ImageVariant], ResultWrapper[ImageVariant]),
)
async def get(
@ -492,7 +490,7 @@ class AsyncVariants(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> VariantGetResponse:
) -> ImageVariant:
"""
Fetch details for a single variant.
@ -518,7 +516,7 @@ class AsyncVariants(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[VariantGetResponse], ResultWrapper[VariantGetResponse]),
cast_to=cast(Type[ImageVariant], ResultWrapper[ImageVariant]),
)

14
src/cloudflare/resources/intel/asn/asn.py
View file

@ -24,7 +24,7 @@ from ...._response import (
async_to_streamed_response_wrapper,
)
from ...._wrappers import ResultWrapper
from ....types.intel import ASNGetResponse
from ....types.intel import IntelASN
from ...._base_client import (
make_request_options,
)
@ -47,7 +47,7 @@ class ASN(SyncAPIResource):
def get(
self,
asn: int,
asn: IntelASN,
*,
account_id: str,
# Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
@ -56,7 +56,7 @@ class ASN(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> ASNGetResponse:
) -> IntelASN:
"""
Get ASN Overview
@ -82,7 +82,7 @@ class ASN(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[ASNGetResponse], ResultWrapper[int]),
cast_to=cast(Type[IntelASN], ResultWrapper[int]),
)
@ -101,7 +101,7 @@ class AsyncASN(AsyncAPIResource):
async def get(
self,
asn: int,
asn: IntelASN,
*,
account_id: str,
# Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
@ -110,7 +110,7 @@ class AsyncASN(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> ASNGetResponse:
) -> IntelASN:
"""
Get ASN Overview
@ -136,7 +136,7 @@ class AsyncASN(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[ASNGetResponse], ResultWrapper[int]),
cast_to=cast(Type[IntelASN], ResultWrapper[int]),
)

5
src/cloudflare/resources/intel/asn/subnets.py
View file

@ -13,6 +13,7 @@ from ...._response import (
async_to_raw_response_wrapper,
async_to_streamed_response_wrapper,
)
from ....types.intel import IntelASN
from ...._base_client import (
make_request_options,
)
@ -32,7 +33,7 @@ class Subnets(SyncAPIResource):
def get(
self,
asn: int,
asn: IntelASN,
*,
account_id: str,
# Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
@ -78,7 +79,7 @@ class AsyncSubnets(AsyncAPIResource):
async def get(
self,
asn: int,
asn: IntelASN,
*,
account_id: str,
# Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.

10
src/cloudflare/resources/intel/dns.py
View file

@ -20,7 +20,7 @@ from ..._response import (
async_to_streamed_response_wrapper,
)
from ..._wrappers import ResultWrapper
from ...types.intel import DNSGetResponse, dns_get_params
from ...types.intel import IntelPassiveDNSByIP, dns_get_params
from ..._base_client import (
make_request_options,
)
@ -51,7 +51,7 @@ class DNS(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> DNSGetResponse:
) -> IntelPassiveDNSByIP:
"""
Get Passive DNS by IP
@ -90,7 +90,7 @@ class DNS(SyncAPIResource):
),
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[DNSGetResponse], ResultWrapper[DNSGetResponse]),
cast_to=cast(Type[IntelPassiveDNSByIP], ResultWrapper[IntelPassiveDNSByIP]),
)
@ -117,7 +117,7 @@ class AsyncDNS(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> DNSGetResponse:
) -> IntelPassiveDNSByIP:
"""
Get Passive DNS by IP
@ -156,7 +156,7 @@ class AsyncDNS(AsyncAPIResource):
),
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[DNSGetResponse], ResultWrapper[DNSGetResponse]),
cast_to=cast(Type[IntelPassiveDNSByIP], ResultWrapper[IntelPassiveDNSByIP]),
)

10
src/cloudflare/resources/intel/domains/domains.py
View file

@ -28,7 +28,7 @@ from ...._response import (
async_to_streamed_response_wrapper,
)
from ...._wrappers import ResultWrapper
from ....types.intel import DomainGetResponse, domain_get_params
from ....types.intel import IntelDomain, domain_get_params
from ...._base_client import (
make_request_options,
)
@ -60,7 +60,7 @@ class Domains(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> DomainGetResponse:
) -> IntelDomain:
"""
Get Domain Details
@ -87,7 +87,7 @@ class Domains(SyncAPIResource):
query=maybe_transform({"domain": domain}, domain_get_params.DomainGetParams),
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[DomainGetResponse], ResultWrapper[DomainGetResponse]),
cast_to=cast(Type[IntelDomain], ResultWrapper[IntelDomain]),
)
@ -115,7 +115,7 @@ class AsyncDomains(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> DomainGetResponse:
) -> IntelDomain:
"""
Get Domain Details
@ -142,7 +142,7 @@ class AsyncDomains(AsyncAPIResource):
query=await async_maybe_transform({"domain": domain}, domain_get_params.DomainGetParams),
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[DomainGetResponse], ResultWrapper[DomainGetResponse]),
cast_to=cast(Type[IntelDomain], ResultWrapper[IntelDomain]),
)

30
src/cloudflare/resources/intel/indicator_feeds/indicator_feeds.py
View file

@ -29,10 +29,10 @@ from ...._response import (
)
from ...._wrappers import ResultWrapper
from ....types.intel import (
IndicatorFeedGetResponse,
IntelUpdateFeed,
IntelIndicatorFeedItem,
IndicatorFeedListResponse,
IndicatorFeedCreateResponse,
IndicatorFeedUpdateResponse,
IntelIndicatorFeedMetadata,
indicator_feed_create_params,
indicator_feed_update_params,
)
@ -68,7 +68,7 @@ class IndicatorFeeds(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> IndicatorFeedCreateResponse:
) -> IntelIndicatorFeedItem:
"""
Create new indicator feed
@ -105,7 +105,7 @@ class IndicatorFeeds(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[IndicatorFeedCreateResponse], ResultWrapper[IndicatorFeedCreateResponse]),
cast_to=cast(Type[IntelIndicatorFeedItem], ResultWrapper[IntelIndicatorFeedItem]),
)
def update(
@ -120,7 +120,7 @@ class IndicatorFeeds(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> IndicatorFeedUpdateResponse:
) -> IntelUpdateFeed:
"""
Update indicator feed data
@ -151,7 +151,7 @@ class IndicatorFeeds(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[IndicatorFeedUpdateResponse], ResultWrapper[IndicatorFeedUpdateResponse]),
cast_to=cast(Type[IntelUpdateFeed], ResultWrapper[IntelUpdateFeed]),
)
def list(
@ -243,7 +243,7 @@ class IndicatorFeeds(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> IndicatorFeedGetResponse:
) -> IntelIndicatorFeedMetadata:
"""
Get indicator feed metadata
@ -271,7 +271,7 @@ class IndicatorFeeds(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[IndicatorFeedGetResponse], ResultWrapper[IndicatorFeedGetResponse]),
cast_to=cast(Type[IntelIndicatorFeedMetadata], ResultWrapper[IntelIndicatorFeedMetadata]),
)
@ -300,7 +300,7 @@ class AsyncIndicatorFeeds(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> IndicatorFeedCreateResponse:
) -> IntelIndicatorFeedItem:
"""
Create new indicator feed
@ -337,7 +337,7 @@ class AsyncIndicatorFeeds(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[IndicatorFeedCreateResponse], ResultWrapper[IndicatorFeedCreateResponse]),
cast_to=cast(Type[IntelIndicatorFeedItem], ResultWrapper[IntelIndicatorFeedItem]),
)
async def update(
@ -352,7 +352,7 @@ class AsyncIndicatorFeeds(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> IndicatorFeedUpdateResponse:
) -> IntelUpdateFeed:
"""
Update indicator feed data
@ -385,7 +385,7 @@ class AsyncIndicatorFeeds(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[IndicatorFeedUpdateResponse], ResultWrapper[IndicatorFeedUpdateResponse]),
cast_to=cast(Type[IntelUpdateFeed], ResultWrapper[IntelUpdateFeed]),
)
async def list(
@ -477,7 +477,7 @@ class AsyncIndicatorFeeds(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> IndicatorFeedGetResponse:
) -> IntelIndicatorFeedMetadata:
"""
Get indicator feed metadata
@ -505,7 +505,7 @@ class AsyncIndicatorFeeds(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[IndicatorFeedGetResponse], ResultWrapper[IndicatorFeedGetResponse]),
cast_to=cast(Type[IntelIndicatorFeedMetadata], ResultWrapper[IntelIndicatorFeedMetadata]),
)

19
src/cloudflare/resources/intel/indicator_feeds/permissions.py
View file

@ -24,9 +24,8 @@ from ...._base_client import (
make_request_options,
)
from ....types.intel.indicator_feeds import (
IntelPermissionsUpdate,
PermissionListResponse,
PermissionCreateResponse,
PermissionDeleteResponse,
permission_create_params,
permission_delete_params,
)
@ -55,7 +54,7 @@ class Permissions(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> PermissionCreateResponse:
) -> IntelPermissionsUpdate:
"""
Grant permission to indicator feed
@ -92,7 +91,7 @@ class Permissions(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[PermissionCreateResponse], ResultWrapper[PermissionCreateResponse]),
cast_to=cast(Type[IntelPermissionsUpdate], ResultWrapper[IntelPermissionsUpdate]),
)
def list(
@ -146,7 +145,7 @@ class Permissions(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> PermissionDeleteResponse:
) -> IntelPermissionsUpdate:
"""
Revoke permission to indicator feed
@ -183,7 +182,7 @@ class Permissions(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[PermissionDeleteResponse], ResultWrapper[PermissionDeleteResponse]),
cast_to=cast(Type[IntelPermissionsUpdate], ResultWrapper[IntelPermissionsUpdate]),
)
@ -208,7 +207,7 @@ class AsyncPermissions(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> PermissionCreateResponse:
) -> IntelPermissionsUpdate:
"""
Grant permission to indicator feed
@ -245,7 +244,7 @@ class AsyncPermissions(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[PermissionCreateResponse], ResultWrapper[PermissionCreateResponse]),
cast_to=cast(Type[IntelPermissionsUpdate], ResultWrapper[IntelPermissionsUpdate]),
)
async def list(
@ -299,7 +298,7 @@ class AsyncPermissions(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> PermissionDeleteResponse:
) -> IntelPermissionsUpdate:
"""
Revoke permission to indicator feed
@ -336,7 +335,7 @@ class AsyncPermissions(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[PermissionDeleteResponse], ResultWrapper[PermissionDeleteResponse]),
cast_to=cast(Type[IntelPermissionsUpdate], ResultWrapper[IntelPermissionsUpdate]),
)

10
src/cloudflare/resources/intel/whois.py
View file

@ -20,7 +20,7 @@ from ..._response import (
async_to_streamed_response_wrapper,
)
from ..._wrappers import ResultWrapper
from ...types.intel import WhoisGetResponse, whois_get_params
from ...types.intel import IntelWhois, whois_get_params
from ..._base_client import (
make_request_options,
)
@ -48,7 +48,7 @@ class Whois(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> WhoisGetResponse:
) -> IntelWhois:
"""
Get WHOIS Record
@ -75,7 +75,7 @@ class Whois(SyncAPIResource):
query=maybe_transform({"domain": domain}, whois_get_params.WhoisGetParams),
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[WhoisGetResponse], ResultWrapper[WhoisGetResponse]),
cast_to=cast(Type[IntelWhois], ResultWrapper[IntelWhois]),
)
@ -99,7 +99,7 @@ class AsyncWhois(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> WhoisGetResponse:
) -> IntelWhois:
"""
Get WHOIS Record
@ -126,7 +126,7 @@ class AsyncWhois(AsyncAPIResource):
query=await async_maybe_transform({"domain": domain}, whois_get_params.WhoisGetParams),
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[WhoisGetResponse], ResultWrapper[WhoisGetResponse]),
cast_to=cast(Type[IntelWhois], ResultWrapper[IntelWhois]),
)

28
src/cloudflare/resources/keyless_certificates.py
View file

@ -8,10 +8,8 @@ from typing_extensions import Literal
import httpx
from ..types import (
KeylessCertificateGetResponse,
KeylessCertificateEditResponse,
KeylessCertificateListResponse,
KeylessCertificateCreateResponse,
TLSCertificatesAndHostnamesBase,
KeylessCertificateDeleteResponse,
keyless_certificate_edit_params,
keyless_certificate_create_params,
@ -62,7 +60,7 @@ class KeylessCertificates(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> KeylessCertificateCreateResponse:
) -> TLSCertificatesAndHostnamesBase:
"""
Create Keyless SSL Configuration
@ -115,7 +113,7 @@ class KeylessCertificates(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[KeylessCertificateCreateResponse], ResultWrapper[KeylessCertificateCreateResponse]),
cast_to=cast(Type[TLSCertificatesAndHostnamesBase], ResultWrapper[TLSCertificatesAndHostnamesBase]),
)
def list(
@ -219,7 +217,7 @@ class KeylessCertificates(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> KeylessCertificateEditResponse:
) -> TLSCertificatesAndHostnamesBase:
"""This will update attributes of a Keyless SSL.
Consists of one or more of the
@ -274,7 +272,7 @@ class KeylessCertificates(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[KeylessCertificateEditResponse], ResultWrapper[KeylessCertificateEditResponse]),
cast_to=cast(Type[TLSCertificatesAndHostnamesBase], ResultWrapper[TLSCertificatesAndHostnamesBase]),
)
def get(
@ -288,7 +286,7 @@ class KeylessCertificates(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> KeylessCertificateGetResponse:
) -> TLSCertificatesAndHostnamesBase:
"""
Get details for one Keyless SSL configuration.
@ -320,7 +318,7 @@ class KeylessCertificates(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[KeylessCertificateGetResponse], ResultWrapper[KeylessCertificateGetResponse]),
cast_to=cast(Type[TLSCertificatesAndHostnamesBase], ResultWrapper[TLSCertificatesAndHostnamesBase]),
)
@ -349,7 +347,7 @@ class AsyncKeylessCertificates(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> KeylessCertificateCreateResponse:
) -> TLSCertificatesAndHostnamesBase:
"""
Create Keyless SSL Configuration
@ -402,7 +400,7 @@ class AsyncKeylessCertificates(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[KeylessCertificateCreateResponse], ResultWrapper[KeylessCertificateCreateResponse]),
cast_to=cast(Type[TLSCertificatesAndHostnamesBase], ResultWrapper[TLSCertificatesAndHostnamesBase]),
)
async def list(
@ -506,7 +504,7 @@ class AsyncKeylessCertificates(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> KeylessCertificateEditResponse:
) -> TLSCertificatesAndHostnamesBase:
"""This will update attributes of a Keyless SSL.
Consists of one or more of the
@ -561,7 +559,7 @@ class AsyncKeylessCertificates(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[KeylessCertificateEditResponse], ResultWrapper[KeylessCertificateEditResponse]),
cast_to=cast(Type[TLSCertificatesAndHostnamesBase], ResultWrapper[TLSCertificatesAndHostnamesBase]),
)
async def get(
@ -575,7 +573,7 @@ class AsyncKeylessCertificates(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> KeylessCertificateGetResponse:
) -> TLSCertificatesAndHostnamesBase:
"""
Get details for one Keyless SSL configuration.
@ -607,7 +605,7 @@ class AsyncKeylessCertificates(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[KeylessCertificateGetResponse], ResultWrapper[KeylessCertificateGetResponse]),
cast_to=cast(Type[TLSCertificatesAndHostnamesBase], ResultWrapper[TLSCertificatesAndHostnamesBase]),
)

23
src/cloudflare/resources/kv/namespaces/namespaces.py
View file

@ -46,8 +46,7 @@ from ...._utils import (
)
from ...._compat import cached_property
from ....types.kv import (
NamespaceListResponse,
NamespaceCreateResponse,
WorkersKVNamespace,
NamespaceDeleteResponse,
NamespaceUpdateResponse,
namespace_list_params,
@ -107,7 +106,7 @@ class Namespaces(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> NamespaceCreateResponse:
) -> WorkersKVNamespace:
"""Creates a namespace under the given title.
A `400` is returned if the account
@ -139,7 +138,7 @@ class Namespaces(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[NamespaceCreateResponse], ResultWrapper[NamespaceCreateResponse]),
cast_to=cast(Type[WorkersKVNamespace], ResultWrapper[WorkersKVNamespace]),
)
def update(
@ -209,7 +208,7 @@ class Namespaces(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> SyncV4PagePaginationArray[NamespaceListResponse]:
) -> SyncV4PagePaginationArray[WorkersKVNamespace]:
"""
Returns the namespaces owned by an account.
@ -236,7 +235,7 @@ class Namespaces(SyncAPIResource):
raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
return self._get_api_list(
f"/accounts/{account_id}/storage/kv/namespaces",
page=SyncV4PagePaginationArray[NamespaceListResponse],
page=SyncV4PagePaginationArray[WorkersKVNamespace],
options=make_request_options(
extra_headers=extra_headers,
extra_query=extra_query,
@ -252,7 +251,7 @@ class Namespaces(SyncAPIResource):
namespace_list_params.NamespaceListParams,
),
),
model=NamespaceListResponse,
model=WorkersKVNamespace,
)
def delete(
@ -341,7 +340,7 @@ class AsyncNamespaces(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> NamespaceCreateResponse:
) -> WorkersKVNamespace:
"""Creates a namespace under the given title.
A `400` is returned if the account
@ -373,7 +372,7 @@ class AsyncNamespaces(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[NamespaceCreateResponse], ResultWrapper[NamespaceCreateResponse]),
cast_to=cast(Type[WorkersKVNamespace], ResultWrapper[WorkersKVNamespace]),
)
async def update(
@ -443,7 +442,7 @@ class AsyncNamespaces(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> AsyncPaginator[NamespaceListResponse, AsyncV4PagePaginationArray[NamespaceListResponse]]:
) -> AsyncPaginator[WorkersKVNamespace, AsyncV4PagePaginationArray[WorkersKVNamespace]]:
"""
Returns the namespaces owned by an account.
@ -470,7 +469,7 @@ class AsyncNamespaces(AsyncAPIResource):
raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
return self._get_api_list(
f"/accounts/{account_id}/storage/kv/namespaces",
page=AsyncV4PagePaginationArray[NamespaceListResponse],
page=AsyncV4PagePaginationArray[WorkersKVNamespace],
options=make_request_options(
extra_headers=extra_headers,
extra_query=extra_query,
@ -486,7 +485,7 @@ class AsyncNamespaces(AsyncAPIResource):
namespace_list_params.NamespaceListParams,
),
),
model=NamespaceListResponse,
model=WorkersKVNamespace,
)
async def delete(

37
src/cloudflare/resources/load_balancers/monitors/monitors.py
View file

@ -41,16 +41,13 @@ from ...._base_client import (
make_request_options,
)
from ....types.load_balancers import (
MonitorGetResponse,
MonitorEditResponse,
MonitorListResponse,
MonitorCreateResponse,
MonitorDeleteResponse,
MonitorUpdateResponse,
monitor_edit_params,
monitor_create_params,
monitor_update_params,
)
from ....types.user.load_balancers import LoadBalancingMonitor
__all__ = ["Monitors", "AsyncMonitors"]
@ -98,7 +95,7 @@ class Monitors(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> MonitorCreateResponse:
) -> LoadBalancingMonitor:
"""
Create a configured monitor.
@ -194,7 +191,7 @@ class Monitors(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[MonitorCreateResponse], ResultWrapper[MonitorCreateResponse]),
cast_to=cast(Type[LoadBalancingMonitor], ResultWrapper[LoadBalancingMonitor]),
)
def update(
@ -224,7 +221,7 @@ class Monitors(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> MonitorUpdateResponse:
) -> LoadBalancingMonitor:
"""
Modify a configured monitor.
@ -322,7 +319,7 @@ class Monitors(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[MonitorUpdateResponse], ResultWrapper[MonitorUpdateResponse]),
cast_to=cast(Type[LoadBalancingMonitor], ResultWrapper[LoadBalancingMonitor]),
)
def list(
@ -433,7 +430,7 @@ class Monitors(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> MonitorEditResponse:
) -> LoadBalancingMonitor:
"""
Apply changes to an existing monitor, overwriting the supplied properties.
@ -531,7 +528,7 @@ class Monitors(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[MonitorEditResponse], ResultWrapper[MonitorEditResponse]),
cast_to=cast(Type[LoadBalancingMonitor], ResultWrapper[LoadBalancingMonitor]),
)
def get(
@ -545,7 +542,7 @@ class Monitors(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> MonitorGetResponse:
) -> LoadBalancingMonitor:
"""
List a single configured monitor for an account.
@ -573,7 +570,7 @@ class Monitors(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[MonitorGetResponse], ResultWrapper[MonitorGetResponse]),
cast_to=cast(Type[LoadBalancingMonitor], ResultWrapper[LoadBalancingMonitor]),
)
@ -620,7 +617,7 @@ class AsyncMonitors(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> MonitorCreateResponse:
) -> LoadBalancingMonitor:
"""
Create a configured monitor.
@ -716,7 +713,7 @@ class AsyncMonitors(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[MonitorCreateResponse], ResultWrapper[MonitorCreateResponse]),
cast_to=cast(Type[LoadBalancingMonitor], ResultWrapper[LoadBalancingMonitor]),
)
async def update(
@ -746,7 +743,7 @@ class AsyncMonitors(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> MonitorUpdateResponse:
) -> LoadBalancingMonitor:
"""
Modify a configured monitor.
@ -844,7 +841,7 @@ class AsyncMonitors(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[MonitorUpdateResponse], ResultWrapper[MonitorUpdateResponse]),
cast_to=cast(Type[LoadBalancingMonitor], ResultWrapper[LoadBalancingMonitor]),
)
async def list(
@ -955,7 +952,7 @@ class AsyncMonitors(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> MonitorEditResponse:
) -> LoadBalancingMonitor:
"""
Apply changes to an existing monitor, overwriting the supplied properties.
@ -1053,7 +1050,7 @@ class AsyncMonitors(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[MonitorEditResponse], ResultWrapper[MonitorEditResponse]),
cast_to=cast(Type[LoadBalancingMonitor], ResultWrapper[LoadBalancingMonitor]),
)
async def get(
@ -1067,7 +1064,7 @@ class AsyncMonitors(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> MonitorGetResponse:
) -> LoadBalancingMonitor:
"""
List a single configured monitor for an account.
@ -1095,7 +1092,7 @@ class AsyncMonitors(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[MonitorGetResponse], ResultWrapper[MonitorGetResponse]),
cast_to=cast(Type[LoadBalancingMonitor], ResultWrapper[LoadBalancingMonitor]),
)

37
src/cloudflare/resources/load_balancers/pools/pools.py
View file

@ -41,17 +41,14 @@ from ...._base_client import (
make_request_options,
)
from ....types.load_balancers import (
PoolGetResponse,
PoolEditResponse,
PoolListResponse,
PoolCreateResponse,
PoolDeleteResponse,
PoolUpdateResponse,
pool_edit_params,
pool_list_params,
pool_create_params,
pool_update_params,
)
from ....types.user.load_balancers import LoadBalancingPool
__all__ = ["Pools", "AsyncPools"]
@ -95,7 +92,7 @@ class Pools(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> PoolCreateResponse:
) -> LoadBalancingPool:
"""
Create a new pool.
@ -177,7 +174,7 @@ class Pools(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[PoolCreateResponse], ResultWrapper[PoolCreateResponse]),
cast_to=cast(Type[LoadBalancingPool], ResultWrapper[LoadBalancingPool]),
)
def update(
@ -224,7 +221,7 @@ class Pools(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> PoolUpdateResponse:
) -> LoadBalancingPool:
"""
Modify a configured pool.
@ -312,7 +309,7 @@ class Pools(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[PoolUpdateResponse], ResultWrapper[PoolUpdateResponse]),
cast_to=cast(Type[LoadBalancingPool], ResultWrapper[LoadBalancingPool]),
)
def list(
@ -445,7 +442,7 @@ class Pools(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> PoolEditResponse:
) -> LoadBalancingPool:
"""
Apply changes to an existing pool, overwriting the supplied properties.
@ -533,7 +530,7 @@ class Pools(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[PoolEditResponse], ResultWrapper[PoolEditResponse]),
cast_to=cast(Type[LoadBalancingPool], ResultWrapper[LoadBalancingPool]),
)
def get(
@ -547,7 +544,7 @@ class Pools(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> PoolGetResponse:
) -> LoadBalancingPool:
"""
Fetch a single configured pool.
@ -575,7 +572,7 @@ class Pools(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[PoolGetResponse], ResultWrapper[PoolGetResponse]),
cast_to=cast(Type[LoadBalancingPool], ResultWrapper[LoadBalancingPool]),
)
@ -618,7 +615,7 @@ class AsyncPools(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> PoolCreateResponse:
) -> LoadBalancingPool:
"""
Create a new pool.
@ -700,7 +697,7 @@ class AsyncPools(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[PoolCreateResponse], ResultWrapper[PoolCreateResponse]),
cast_to=cast(Type[LoadBalancingPool], ResultWrapper[LoadBalancingPool]),
)
async def update(
@ -747,7 +744,7 @@ class AsyncPools(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> PoolUpdateResponse:
) -> LoadBalancingPool:
"""
Modify a configured pool.
@ -835,7 +832,7 @@ class AsyncPools(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[PoolUpdateResponse], ResultWrapper[PoolUpdateResponse]),
cast_to=cast(Type[LoadBalancingPool], ResultWrapper[LoadBalancingPool]),
)
async def list(
@ -968,7 +965,7 @@ class AsyncPools(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> PoolEditResponse:
) -> LoadBalancingPool:
"""
Apply changes to an existing pool, overwriting the supplied properties.
@ -1056,7 +1053,7 @@ class AsyncPools(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[PoolEditResponse], ResultWrapper[PoolEditResponse]),
cast_to=cast(Type[LoadBalancingPool], ResultWrapper[LoadBalancingPool]),
)
async def get(
@ -1070,7 +1067,7 @@ class AsyncPools(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> PoolGetResponse:
) -> LoadBalancingPool:
"""
Fetch a single configured pool.
@ -1098,7 +1095,7 @@ class AsyncPools(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[PoolGetResponse], ResultWrapper[PoolGetResponse]),
cast_to=cast(Type[LoadBalancingPool], ResultWrapper[LoadBalancingPool]),
)

10
src/cloudflare/resources/load_balancers/previews.py
View file

@ -19,7 +19,7 @@ from ..._wrappers import ResultWrapper
from ..._base_client import (
make_request_options,
)
from ...types.load_balancers import PreviewGetResponse
from ...types.user.load_balancers import LoadBalancingPreviewResult
__all__ = ["Previews", "AsyncPreviews"]
@ -44,7 +44,7 @@ class Previews(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> PreviewGetResponse:
) -> LoadBalancingPreviewResult:
"""
Get the result of a previous preview operation using the provided preview_id.
@ -70,7 +70,7 @@ class Previews(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[PreviewGetResponse], ResultWrapper[PreviewGetResponse]),
cast_to=cast(Type[LoadBalancingPreviewResult], ResultWrapper[LoadBalancingPreviewResult]),
)
@ -94,7 +94,7 @@ class AsyncPreviews(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> PreviewGetResponse:
) -> LoadBalancingPreviewResult:
"""
Get the result of a previous preview operation using the provided preview_id.
@ -120,7 +120,7 @@ class AsyncPreviews(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[PreviewGetResponse], ResultWrapper[PreviewGetResponse]),
cast_to=cast(Type[LoadBalancingPreviewResult], ResultWrapper[LoadBalancingPreviewResult]),
)

10
src/cloudflare/resources/logpush/edge.py
View file

@ -23,7 +23,7 @@ from ..._wrappers import ResultWrapper
from ..._base_client import (
make_request_options,
)
from ...types.logpush import EdgeGetResponse, EdgeCreateResponse, edge_create_params
from ...types.logpush import EdgeGetResponse, LogpushInstantLogsJob, edge_create_params
__all__ = ["Edge", "AsyncEdge"]
@ -50,7 +50,7 @@ class Edge(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> Optional[EdgeCreateResponse]:
) -> Optional[LogpushInstantLogsJob]:
"""
Creates a new Instant Logs job for a zone.
@ -92,7 +92,7 @@ class Edge(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[Optional[EdgeCreateResponse]], ResultWrapper[EdgeCreateResponse]),
cast_to=cast(Type[Optional[LogpushInstantLogsJob]], ResultWrapper[LogpushInstantLogsJob]),
)
def get(
@ -157,7 +157,7 @@ class AsyncEdge(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> Optional[EdgeCreateResponse]:
) -> Optional[LogpushInstantLogsJob]:
"""
Creates a new Instant Logs job for a zone.
@ -199,7 +199,7 @@ class AsyncEdge(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[Optional[EdgeCreateResponse]], ResultWrapper[EdgeCreateResponse]),
cast_to=cast(Type[Optional[LogpushInstantLogsJob]], ResultWrapper[LogpushInstantLogsJob]),
)
async def get(

35
src/cloudflare/resources/logpush/jobs.py
View file

@ -24,15 +24,8 @@ from ..._wrappers import ResultWrapper
from ..._base_client import (
make_request_options,
)
from ...types.logpush import (
JobGetResponse,
JobListResponse,
JobCreateResponse,
JobDeleteResponse,
JobUpdateResponse,
job_create_params,
job_update_params,
)
from ...types.logpush import JobListResponse, JobDeleteResponse, job_create_params, job_update_params
from ...types.logpush.datasets import LogpushLogpushJob
__all__ = ["Jobs", "AsyncJobs"]
@ -65,7 +58,7 @@ class Jobs(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> Optional[JobCreateResponse]:
) -> Optional[LogpushLogpushJob]:
"""
Creates a new Logpush job for an account or zone.
@ -146,7 +139,7 @@ class Jobs(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[Optional[JobCreateResponse]], ResultWrapper[JobCreateResponse]),
cast_to=cast(Type[Optional[LogpushLogpushJob]], ResultWrapper[LogpushLogpushJob]),
)
def update(
@ -167,7 +160,7 @@ class Jobs(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> Optional[JobUpdateResponse]:
) -> Optional[LogpushLogpushJob]:
"""
Updates a Logpush job.
@ -242,7 +235,7 @@ class Jobs(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[Optional[JobUpdateResponse]], ResultWrapper[JobUpdateResponse]),
cast_to=cast(Type[Optional[LogpushLogpushJob]], ResultWrapper[LogpushLogpushJob]),
)
def list(
@ -375,7 +368,7 @@ class Jobs(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> Optional[JobGetResponse]:
) -> Optional[LogpushLogpushJob]:
"""
Gets the details of a Logpush job.
@ -418,7 +411,7 @@ class Jobs(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[Optional[JobGetResponse]], ResultWrapper[JobGetResponse]),
cast_to=cast(Type[Optional[LogpushLogpushJob]], ResultWrapper[LogpushLogpushJob]),
)
@ -450,7 +443,7 @@ class AsyncJobs(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> Optional[JobCreateResponse]:
) -> Optional[LogpushLogpushJob]:
"""
Creates a new Logpush job for an account or zone.
@ -531,7 +524,7 @@ class AsyncJobs(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[Optional[JobCreateResponse]], ResultWrapper[JobCreateResponse]),
cast_to=cast(Type[Optional[LogpushLogpushJob]], ResultWrapper[LogpushLogpushJob]),
)
async def update(
@ -552,7 +545,7 @@ class AsyncJobs(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> Optional[JobUpdateResponse]:
) -> Optional[LogpushLogpushJob]:
"""
Updates a Logpush job.
@ -627,7 +620,7 @@ class AsyncJobs(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[Optional[JobUpdateResponse]], ResultWrapper[JobUpdateResponse]),
cast_to=cast(Type[Optional[LogpushLogpushJob]], ResultWrapper[LogpushLogpushJob]),
)
async def list(
@ -760,7 +753,7 @@ class AsyncJobs(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> Optional[JobGetResponse]:
) -> Optional[LogpushLogpushJob]:
"""
Gets the details of a Logpush job.
@ -803,7 +796,7 @@ class AsyncJobs(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[Optional[JobGetResponse]], ResultWrapper[JobGetResponse]),
cast_to=cast(Type[Optional[LogpushLogpushJob]], ResultWrapper[LogpushLogpushJob]),
)

23
src/cloudflare/resources/logs/control/cmb/config.py
View file

@ -23,12 +23,7 @@ from ....._wrappers import ResultWrapper
from ....._base_client import (
make_request_options,
)
from .....types.logs.control.cmb import (
ConfigGetResponse,
ConfigCreateResponse,
ConfigDeleteResponse,
config_create_params,
)
from .....types.logs.control.cmb import LogcontrolCmbConfig, ConfigDeleteResponse, config_create_params
__all__ = ["Config", "AsyncConfig"]
@ -53,7 +48,7 @@ class Config(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> Optional[ConfigCreateResponse]:
) -> Optional[LogcontrolCmbConfig]:
"""
Updates CMB config.
@ -82,7 +77,7 @@ class Config(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[Optional[ConfigCreateResponse]], ResultWrapper[ConfigCreateResponse]),
cast_to=cast(Type[Optional[LogcontrolCmbConfig]], ResultWrapper[LogcontrolCmbConfig]),
)
def delete(
@ -139,7 +134,7 @@ class Config(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> Optional[ConfigGetResponse]:
) -> Optional[LogcontrolCmbConfig]:
"""
Gets CMB config.
@ -165,7 +160,7 @@ class Config(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[Optional[ConfigGetResponse]], ResultWrapper[ConfigGetResponse]),
cast_to=cast(Type[Optional[LogcontrolCmbConfig]], ResultWrapper[LogcontrolCmbConfig]),
)
@ -189,7 +184,7 @@ class AsyncConfig(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> Optional[ConfigCreateResponse]:
) -> Optional[LogcontrolCmbConfig]:
"""
Updates CMB config.
@ -218,7 +213,7 @@ class AsyncConfig(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[Optional[ConfigCreateResponse]], ResultWrapper[ConfigCreateResponse]),
cast_to=cast(Type[Optional[LogcontrolCmbConfig]], ResultWrapper[LogcontrolCmbConfig]),
)
async def delete(
@ -275,7 +270,7 @@ class AsyncConfig(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> Optional[ConfigGetResponse]:
) -> Optional[LogcontrolCmbConfig]:
"""
Gets CMB config.
@ -301,7 +296,7 @@ class AsyncConfig(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[Optional[ConfigGetResponse]], ResultWrapper[ConfigGetResponse]),
cast_to=cast(Type[Optional[LogcontrolCmbConfig]], ResultWrapper[LogcontrolCmbConfig]),
)

48
src/cloudflare/resources/magic_network_monitoring/configs/configs.py
View file

@ -27,13 +27,7 @@ from ...._wrappers import ResultWrapper
from ...._base_client import (
make_request_options,
)
from ....types.magic_network_monitoring import (
ConfigGetResponse,
ConfigEditResponse,
ConfigCreateResponse,
ConfigDeleteResponse,
ConfigUpdateResponse,
)
from ....types.magic_network_monitoring import MagicVisibilityMNMConfig
__all__ = ["Configs", "AsyncConfigs"]
@ -61,7 +55,7 @@ class Configs(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> ConfigCreateResponse:
) -> MagicVisibilityMNMConfig:
"""
Create a new network monitoring configuration.
@ -83,7 +77,7 @@ class Configs(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[ConfigCreateResponse], ResultWrapper[ConfigCreateResponse]),
cast_to=cast(Type[MagicVisibilityMNMConfig], ResultWrapper[MagicVisibilityMNMConfig]),
)
def update(
@ -96,7 +90,7 @@ class Configs(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> ConfigUpdateResponse:
) -> MagicVisibilityMNMConfig:
"""
Update an existing network monitoring configuration, requires the entire
configuration to be updated at once.
@ -119,7 +113,7 @@ class Configs(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[ConfigUpdateResponse], ResultWrapper[ConfigUpdateResponse]),
cast_to=cast(Type[MagicVisibilityMNMConfig], ResultWrapper[MagicVisibilityMNMConfig]),
)
def delete(
@ -132,7 +126,7 @@ class Configs(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> ConfigDeleteResponse:
) -> MagicVisibilityMNMConfig:
"""
Delete an existing network monitoring configuration.
@ -154,7 +148,7 @@ class Configs(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[ConfigDeleteResponse], ResultWrapper[ConfigDeleteResponse]),
cast_to=cast(Type[MagicVisibilityMNMConfig], ResultWrapper[MagicVisibilityMNMConfig]),
)
def edit(
@ -167,7 +161,7 @@ class Configs(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> ConfigEditResponse:
) -> MagicVisibilityMNMConfig:
"""
Update fields in an existing network monitoring configuration.
@ -189,7 +183,7 @@ class Configs(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[ConfigEditResponse], ResultWrapper[ConfigEditResponse]),
cast_to=cast(Type[MagicVisibilityMNMConfig], ResultWrapper[MagicVisibilityMNMConfig]),
)
def get(
@ -202,7 +196,7 @@ class Configs(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> ConfigGetResponse:
) -> MagicVisibilityMNMConfig:
"""
Lists default sampling and router IPs for account.
@ -224,7 +218,7 @@ class Configs(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[ConfigGetResponse], ResultWrapper[ConfigGetResponse]),
cast_to=cast(Type[MagicVisibilityMNMConfig], ResultWrapper[MagicVisibilityMNMConfig]),
)
@ -251,7 +245,7 @@ class AsyncConfigs(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> ConfigCreateResponse:
) -> MagicVisibilityMNMConfig:
"""
Create a new network monitoring configuration.
@ -273,7 +267,7 @@ class AsyncConfigs(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[ConfigCreateResponse], ResultWrapper[ConfigCreateResponse]),
cast_to=cast(Type[MagicVisibilityMNMConfig], ResultWrapper[MagicVisibilityMNMConfig]),
)
async def update(
@ -286,7 +280,7 @@ class AsyncConfigs(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> ConfigUpdateResponse:
) -> MagicVisibilityMNMConfig:
"""
Update an existing network monitoring configuration, requires the entire
configuration to be updated at once.
@ -309,7 +303,7 @@ class AsyncConfigs(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[ConfigUpdateResponse], ResultWrapper[ConfigUpdateResponse]),
cast_to=cast(Type[MagicVisibilityMNMConfig], ResultWrapper[MagicVisibilityMNMConfig]),
)
async def delete(
@ -322,7 +316,7 @@ class AsyncConfigs(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> ConfigDeleteResponse:
) -> MagicVisibilityMNMConfig:
"""
Delete an existing network monitoring configuration.
@ -344,7 +338,7 @@ class AsyncConfigs(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[ConfigDeleteResponse], ResultWrapper[ConfigDeleteResponse]),
cast_to=cast(Type[MagicVisibilityMNMConfig], ResultWrapper[MagicVisibilityMNMConfig]),
)
async def edit(
@ -357,7 +351,7 @@ class AsyncConfigs(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> ConfigEditResponse:
) -> MagicVisibilityMNMConfig:
"""
Update fields in an existing network monitoring configuration.
@ -379,7 +373,7 @@ class AsyncConfigs(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[ConfigEditResponse], ResultWrapper[ConfigEditResponse]),
cast_to=cast(Type[MagicVisibilityMNMConfig], ResultWrapper[MagicVisibilityMNMConfig]),
)
async def get(
@ -392,7 +386,7 @@ class AsyncConfigs(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> ConfigGetResponse:
) -> MagicVisibilityMNMConfig:
"""
Lists default sampling and router IPs for account.
@ -414,7 +408,7 @@ class AsyncConfigs(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[ConfigGetResponse], ResultWrapper[ConfigGetResponse]),
cast_to=cast(Type[MagicVisibilityMNMConfig], ResultWrapper[MagicVisibilityMNMConfig]),
)

10
src/cloudflare/resources/magic_network_monitoring/configs/full.py
View file

@ -19,7 +19,7 @@ from ...._wrappers import ResultWrapper
from ...._base_client import (
make_request_options,
)
from ....types.magic_network_monitoring.configs import FullGetResponse
from ....types.magic_network_monitoring import MagicVisibilityMNMConfig
__all__ = ["Full", "AsyncFull"]
@ -43,7 +43,7 @@ class Full(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> FullGetResponse:
) -> MagicVisibilityMNMConfig:
"""
Lists default sampling, router IPs, and rules for account.
@ -65,7 +65,7 @@ class Full(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[FullGetResponse], ResultWrapper[FullGetResponse]),
cast_to=cast(Type[MagicVisibilityMNMConfig], ResultWrapper[MagicVisibilityMNMConfig]),
)
@ -88,7 +88,7 @@ class AsyncFull(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> FullGetResponse:
) -> MagicVisibilityMNMConfig:
"""
Lists default sampling, router IPs, and rules for account.
@ -110,7 +110,7 @@ class AsyncFull(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[FullGetResponse], ResultWrapper[FullGetResponse]),
cast_to=cast(Type[MagicVisibilityMNMConfig], ResultWrapper[MagicVisibilityMNMConfig]),
)

14
src/cloudflare/resources/magic_network_monitoring/rules/advertisements.py
View file

@ -19,7 +19,7 @@ from ...._wrappers import ResultWrapper
from ...._base_client import (
make_request_options,
)
from ....types.magic_network_monitoring.rules import AdvertisementEditResponse
from ....types.magic_network_monitoring.rules import MagicVisibilityMNMRuleAdvertisable
__all__ = ["Advertisements", "AsyncAdvertisements"]
@ -44,7 +44,7 @@ class Advertisements(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> Optional[AdvertisementEditResponse]:
) -> Optional[MagicVisibilityMNMRuleAdvertisable]:
"""
Update advertisement for rule.
@ -66,7 +66,9 @@ class Advertisements(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[Optional[AdvertisementEditResponse]], ResultWrapper[AdvertisementEditResponse]),
cast_to=cast(
Type[Optional[MagicVisibilityMNMRuleAdvertisable]], ResultWrapper[MagicVisibilityMNMRuleAdvertisable]
),
)
@ -90,7 +92,7 @@ class AsyncAdvertisements(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> Optional[AdvertisementEditResponse]:
) -> Optional[MagicVisibilityMNMRuleAdvertisable]:
"""
Update advertisement for rule.
@ -112,7 +114,9 @@ class AsyncAdvertisements(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[Optional[AdvertisementEditResponse]], ResultWrapper[AdvertisementEditResponse]),
cast_to=cast(
Type[Optional[MagicVisibilityMNMRuleAdvertisable]], ResultWrapper[MagicVisibilityMNMRuleAdvertisable]
),
)

49
src/cloudflare/resources/magic_network_monitoring/rules/rules.py
View file

@ -27,14 +27,7 @@ from .advertisements import (
from ...._base_client import (
make_request_options,
)
from ....types.magic_network_monitoring import (
RuleGetResponse,
RuleEditResponse,
RuleListResponse,
RuleCreateResponse,
RuleDeleteResponse,
RuleUpdateResponse,
)
from ....types.magic_network_monitoring import RuleListResponse, MagicVisibilityMNMRule
__all__ = ["Rules", "AsyncRules"]
@ -62,7 +55,7 @@ class Rules(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> Optional[RuleCreateResponse]:
) -> Optional[MagicVisibilityMNMRule]:
"""Create network monitoring rules for account.
Currently only supports creating a
@ -86,7 +79,7 @@ class Rules(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[Optional[RuleCreateResponse]], ResultWrapper[RuleCreateResponse]),
cast_to=cast(Type[Optional[MagicVisibilityMNMRule]], ResultWrapper[MagicVisibilityMNMRule]),
)
def update(
@ -99,7 +92,7 @@ class Rules(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> Optional[RuleUpdateResponse]:
) -> Optional[MagicVisibilityMNMRule]:
"""
Update network monitoring rules for account.
@ -121,7 +114,7 @@ class Rules(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[Optional[RuleUpdateResponse]], ResultWrapper[RuleUpdateResponse]),
cast_to=cast(Type[Optional[MagicVisibilityMNMRule]], ResultWrapper[MagicVisibilityMNMRule]),
)
def list(
@ -170,7 +163,7 @@ class Rules(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> Optional[RuleDeleteResponse]:
) -> Optional[MagicVisibilityMNMRule]:
"""
Delete a network monitoring rule for account.
@ -192,7 +185,7 @@ class Rules(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[Optional[RuleDeleteResponse]], ResultWrapper[RuleDeleteResponse]),
cast_to=cast(Type[Optional[MagicVisibilityMNMRule]], ResultWrapper[MagicVisibilityMNMRule]),
)
def edit(
@ -206,7 +199,7 @@ class Rules(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> Optional[RuleEditResponse]:
) -> Optional[MagicVisibilityMNMRule]:
"""
Update a network monitoring rule for account.
@ -228,7 +221,7 @@ class Rules(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[Optional[RuleEditResponse]], ResultWrapper[RuleEditResponse]),
cast_to=cast(Type[Optional[MagicVisibilityMNMRule]], ResultWrapper[MagicVisibilityMNMRule]),
)
def get(
@ -242,7 +235,7 @@ class Rules(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> Optional[RuleGetResponse]:
) -> Optional[MagicVisibilityMNMRule]:
"""
List a single network monitoring rule for account.
@ -264,7 +257,7 @@ class Rules(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[Optional[RuleGetResponse]], ResultWrapper[RuleGetResponse]),
cast_to=cast(Type[Optional[MagicVisibilityMNMRule]], ResultWrapper[MagicVisibilityMNMRule]),
)
@ -291,7 +284,7 @@ class AsyncRules(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> Optional[RuleCreateResponse]:
) -> Optional[MagicVisibilityMNMRule]:
"""Create network monitoring rules for account.
Currently only supports creating a
@ -315,7 +308,7 @@ class AsyncRules(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[Optional[RuleCreateResponse]], ResultWrapper[RuleCreateResponse]),
cast_to=cast(Type[Optional[MagicVisibilityMNMRule]], ResultWrapper[MagicVisibilityMNMRule]),
)
async def update(
@ -328,7 +321,7 @@ class AsyncRules(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> Optional[RuleUpdateResponse]:
) -> Optional[MagicVisibilityMNMRule]:
"""
Update network monitoring rules for account.
@ -350,7 +343,7 @@ class AsyncRules(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[Optional[RuleUpdateResponse]], ResultWrapper[RuleUpdateResponse]),
cast_to=cast(Type[Optional[MagicVisibilityMNMRule]], ResultWrapper[MagicVisibilityMNMRule]),
)
async def list(
@ -399,7 +392,7 @@ class AsyncRules(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> Optional[RuleDeleteResponse]:
) -> Optional[MagicVisibilityMNMRule]:
"""
Delete a network monitoring rule for account.
@ -421,7 +414,7 @@ class AsyncRules(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[Optional[RuleDeleteResponse]], ResultWrapper[RuleDeleteResponse]),
cast_to=cast(Type[Optional[MagicVisibilityMNMRule]], ResultWrapper[MagicVisibilityMNMRule]),
)
async def edit(
@ -435,7 +428,7 @@ class AsyncRules(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> Optional[RuleEditResponse]:
) -> Optional[MagicVisibilityMNMRule]:
"""
Update a network monitoring rule for account.
@ -457,7 +450,7 @@ class AsyncRules(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[Optional[RuleEditResponse]], ResultWrapper[RuleEditResponse]),
cast_to=cast(Type[Optional[MagicVisibilityMNMRule]], ResultWrapper[MagicVisibilityMNMRule]),
)
async def get(
@ -471,7 +464,7 @@ class AsyncRules(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> Optional[RuleGetResponse]:
) -> Optional[MagicVisibilityMNMRule]:
"""
List a single network monitoring rule for account.
@ -493,7 +486,7 @@ class AsyncRules(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[Optional[RuleGetResponse]], ResultWrapper[RuleGetResponse]),
cast_to=cast(Type[Optional[MagicVisibilityMNMRule]], ResultWrapper[MagicVisibilityMNMRule]),
)

47
src/cloudflare/resources/mtls_certificates/mtls_certificates.py
View file

@ -7,10 +7,9 @@ from typing import Type, Optional, cast
import httpx
from ...types import (
MTLSCertificateGetResponse,
MTLSCertificateListResponse,
MTLSCertificateCreateResponse,
MTLSCertificateDeleteResponse,
TLSCertificatesAndHostnamesCertificateObjectPost,
TLSCertificatesAndHostnamesComponentsSchemasCertificateObject,
mtls_certificate_create_params,
)
from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
@ -69,7 +68,7 @@ class MTLSCertificates(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> MTLSCertificateCreateResponse:
) -> TLSCertificatesAndHostnamesCertificateObjectPost:
"""
Upload a certificate that you want to use with mTLS-enabled Cloudflare services.
@ -112,7 +111,10 @@ class MTLSCertificates(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[MTLSCertificateCreateResponse], ResultWrapper[MTLSCertificateCreateResponse]),
cast_to=cast(
Type[TLSCertificatesAndHostnamesCertificateObjectPost],
ResultWrapper[TLSCertificatesAndHostnamesCertificateObjectPost],
),
)
def list(
@ -165,7 +167,7 @@ class MTLSCertificates(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> MTLSCertificateDeleteResponse:
) -> TLSCertificatesAndHostnamesComponentsSchemasCertificateObject:
"""
Deletes the mTLS certificate unless the certificate is in use by one or more
Cloudflare services.
@ -198,7 +200,10 @@ class MTLSCertificates(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[MTLSCertificateDeleteResponse], ResultWrapper[MTLSCertificateDeleteResponse]),
cast_to=cast(
Type[TLSCertificatesAndHostnamesComponentsSchemasCertificateObject],
ResultWrapper[TLSCertificatesAndHostnamesComponentsSchemasCertificateObject],
),
)
def get(
@ -212,7 +217,7 @@ class MTLSCertificates(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> MTLSCertificateGetResponse:
) -> TLSCertificatesAndHostnamesComponentsSchemasCertificateObject:
"""
Fetches a single mTLS certificate.
@ -244,7 +249,10 @@ class MTLSCertificates(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[MTLSCertificateGetResponse], ResultWrapper[MTLSCertificateGetResponse]),
cast_to=cast(
Type[TLSCertificatesAndHostnamesComponentsSchemasCertificateObject],
ResultWrapper[TLSCertificatesAndHostnamesComponentsSchemasCertificateObject],
),
)
@ -275,7 +283,7 @@ class AsyncMTLSCertificates(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> MTLSCertificateCreateResponse:
) -> TLSCertificatesAndHostnamesCertificateObjectPost:
"""
Upload a certificate that you want to use with mTLS-enabled Cloudflare services.
@ -318,7 +326,10 @@ class AsyncMTLSCertificates(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[MTLSCertificateCreateResponse], ResultWrapper[MTLSCertificateCreateResponse]),
cast_to=cast(
Type[TLSCertificatesAndHostnamesCertificateObjectPost],
ResultWrapper[TLSCertificatesAndHostnamesCertificateObjectPost],
),
)
async def list(
@ -371,7 +382,7 @@ class AsyncMTLSCertificates(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> MTLSCertificateDeleteResponse:
) -> TLSCertificatesAndHostnamesComponentsSchemasCertificateObject:
"""
Deletes the mTLS certificate unless the certificate is in use by one or more
Cloudflare services.
@ -404,7 +415,10 @@ class AsyncMTLSCertificates(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[MTLSCertificateDeleteResponse], ResultWrapper[MTLSCertificateDeleteResponse]),
cast_to=cast(
Type[TLSCertificatesAndHostnamesComponentsSchemasCertificateObject],
ResultWrapper[TLSCertificatesAndHostnamesComponentsSchemasCertificateObject],
),
)
async def get(
@ -418,7 +432,7 @@ class AsyncMTLSCertificates(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> MTLSCertificateGetResponse:
) -> TLSCertificatesAndHostnamesComponentsSchemasCertificateObject:
"""
Fetches a single mTLS certificate.
@ -450,7 +464,10 @@ class AsyncMTLSCertificates(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[MTLSCertificateGetResponse], ResultWrapper[MTLSCertificateGetResponse]),
cast_to=cast(
Type[TLSCertificatesAndHostnamesComponentsSchemasCertificateObject],
ResultWrapper[TLSCertificatesAndHostnamesComponentsSchemasCertificateObject],
),
)

46
src/cloudflare/resources/origin_tls_client_auth/hostnames/certificates.py
View file

@ -24,10 +24,8 @@ from ...._base_client import (
make_request_options,
)
from ....types.origin_tls_client_auth.hostnames import (
CertificateGetResponse,
CertificateListResponse,
CertificateCreateResponse,
CertificateDeleteResponse,
TLSCertificatesAndHostnamesSchemasCertificateObject,
certificate_create_params,
)
@ -55,7 +53,7 @@ class Certificates(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> CertificateCreateResponse:
) -> TLSCertificatesAndHostnamesSchemasCertificateObject:
"""Upload a certificate to be used for client authentication on a hostname.
10
@ -94,7 +92,10 @@ class Certificates(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[CertificateCreateResponse], ResultWrapper[CertificateCreateResponse]),
cast_to=cast(
Type[TLSCertificatesAndHostnamesSchemasCertificateObject],
ResultWrapper[TLSCertificatesAndHostnamesSchemasCertificateObject],
),
)
def list(
@ -147,7 +148,7 @@ class Certificates(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> CertificateDeleteResponse:
) -> TLSCertificatesAndHostnamesSchemasCertificateObject:
"""
Delete Hostname Client Certificate
@ -177,7 +178,10 @@ class Certificates(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[CertificateDeleteResponse], ResultWrapper[CertificateDeleteResponse]),
cast_to=cast(
Type[TLSCertificatesAndHostnamesSchemasCertificateObject],
ResultWrapper[TLSCertificatesAndHostnamesSchemasCertificateObject],
),
)
def get(
@ -191,7 +195,7 @@ class Certificates(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> CertificateGetResponse:
) -> TLSCertificatesAndHostnamesSchemasCertificateObject:
"""
Get the certificate by ID to be used for client authentication on a hostname.
@ -221,7 +225,10 @@ class Certificates(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[CertificateGetResponse], ResultWrapper[CertificateGetResponse]),
cast_to=cast(
Type[TLSCertificatesAndHostnamesSchemasCertificateObject],
ResultWrapper[TLSCertificatesAndHostnamesSchemasCertificateObject],
),
)
@ -246,7 +253,7 @@ class AsyncCertificates(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> CertificateCreateResponse:
) -> TLSCertificatesAndHostnamesSchemasCertificateObject:
"""Upload a certificate to be used for client authentication on a hostname.
10
@ -285,7 +292,10 @@ class AsyncCertificates(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[CertificateCreateResponse], ResultWrapper[CertificateCreateResponse]),
cast_to=cast(
Type[TLSCertificatesAndHostnamesSchemasCertificateObject],
ResultWrapper[TLSCertificatesAndHostnamesSchemasCertificateObject],
),
)
async def list(
@ -338,7 +348,7 @@ class AsyncCertificates(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> CertificateDeleteResponse:
) -> TLSCertificatesAndHostnamesSchemasCertificateObject:
"""
Delete Hostname Client Certificate
@ -368,7 +378,10 @@ class AsyncCertificates(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[CertificateDeleteResponse], ResultWrapper[CertificateDeleteResponse]),
cast_to=cast(
Type[TLSCertificatesAndHostnamesSchemasCertificateObject],
ResultWrapper[TLSCertificatesAndHostnamesSchemasCertificateObject],
),
)
async def get(
@ -382,7 +395,7 @@ class AsyncCertificates(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> CertificateGetResponse:
) -> TLSCertificatesAndHostnamesSchemasCertificateObject:
"""
Get the certificate by ID to be used for client authentication on a hostname.
@ -412,7 +425,10 @@ class AsyncCertificates(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[CertificateGetResponse], ResultWrapper[CertificateGetResponse]),
cast_to=cast(
Type[TLSCertificatesAndHostnamesSchemasCertificateObject],
ResultWrapper[TLSCertificatesAndHostnamesSchemasCertificateObject],
),
)

20
src/cloudflare/resources/origin_tls_client_auth/hostnames/hostnames.py
View file

@ -31,7 +31,11 @@ from .certificates import (
from ...._base_client import (
make_request_options,
)
from ....types.origin_tls_client_auth import HostnameGetResponse, HostnameUpdateResponse, hostname_update_params
from ....types.origin_tls_client_auth import (
HostnameUpdateResponse,
TLSCertificatesAndHostnamesHostnameCertidObject,
hostname_update_params,
)
__all__ = ["Hostnames", "AsyncHostnames"]
@ -105,7 +109,7 @@ class Hostnames(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> HostnameGetResponse:
) -> TLSCertificatesAndHostnamesHostnameCertidObject:
"""
Get the Hostname Status for Client Authentication
@ -136,7 +140,10 @@ class Hostnames(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[HostnameGetResponse], ResultWrapper[HostnameGetResponse]),
cast_to=cast(
Type[TLSCertificatesAndHostnamesHostnameCertidObject],
ResultWrapper[TLSCertificatesAndHostnamesHostnameCertidObject],
),
)
@ -209,7 +216,7 @@ class AsyncHostnames(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> HostnameGetResponse:
) -> TLSCertificatesAndHostnamesHostnameCertidObject:
"""
Get the Hostname Status for Client Authentication
@ -240,7 +247,10 @@ class AsyncHostnames(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[HostnameGetResponse], ResultWrapper[HostnameGetResponse]),
cast_to=cast(
Type[TLSCertificatesAndHostnamesHostnameCertidObject],
ResultWrapper[TLSCertificatesAndHostnamesHostnameCertidObject],
),
)

10
src/cloudflare/resources/page_shield/connections.py
View file

@ -24,7 +24,7 @@ from ..._wrappers import ResultWrapper
from ..._base_client import (
make_request_options,
)
from ...types.page_shield import ConnectionGetResponse, ConnectionListResponse, connection_list_params
from ...types.page_shield import PageShieldConnection, ConnectionListResponse, connection_list_params
__all__ = ["Connections", "AsyncConnections"]
@ -163,7 +163,7 @@ class Connections(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> ConnectionGetResponse:
) -> PageShieldConnection:
"""
Fetches a connection detected by Page Shield by connection ID.
@ -189,7 +189,7 @@ class Connections(SyncAPIResource):
options=make_request_options(
extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
),
cast_to=ConnectionGetResponse,
cast_to=PageShieldConnection,
)
@ -327,7 +327,7 @@ class AsyncConnections(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> ConnectionGetResponse:
) -> PageShieldConnection:
"""
Fetches a connection detected by Page Shield by connection ID.
@ -353,7 +353,7 @@ class AsyncConnections(AsyncAPIResource):
options=make_request_options(
extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
),
cast_to=ConnectionGetResponse,
cast_to=PageShieldConnection,
)

18
src/cloudflare/resources/page_shield/page_shield.py
View file

@ -6,7 +6,7 @@ from typing import Type, cast
import httpx
from ...types import PageShieldListResponse, PageShieldUpdateResponse, page_shield_update_params
from ...types import PageShieldGetZoneSettings, PageShieldUpdateZoneSettings, page_shield_update_params
from .scripts import (
Scripts,
AsyncScripts,
@ -86,7 +86,7 @@ class PageShield(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> PageShieldUpdateResponse:
) -> PageShieldUpdateZoneSettings:
"""
Updates Page Shield settings.
@ -127,7 +127,7 @@ class PageShield(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[PageShieldUpdateResponse], ResultWrapper[PageShieldUpdateResponse]),
cast_to=cast(Type[PageShieldUpdateZoneSettings], ResultWrapper[PageShieldUpdateZoneSettings]),
)
def list(
@ -140,7 +140,7 @@ class PageShield(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> PageShieldListResponse:
) -> PageShieldGetZoneSettings:
"""
Fetches the Page Shield settings.
@ -166,7 +166,7 @@ class PageShield(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[PageShieldListResponse], ResultWrapper[PageShieldListResponse]),
cast_to=cast(Type[PageShieldGetZoneSettings], ResultWrapper[PageShieldGetZoneSettings]),
)
@ -204,7 +204,7 @@ class AsyncPageShield(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> PageShieldUpdateResponse:
) -> PageShieldUpdateZoneSettings:
"""
Updates Page Shield settings.
@ -245,7 +245,7 @@ class AsyncPageShield(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[PageShieldUpdateResponse], ResultWrapper[PageShieldUpdateResponse]),
cast_to=cast(Type[PageShieldUpdateZoneSettings], ResultWrapper[PageShieldUpdateZoneSettings]),
)
async def list(
@ -258,7 +258,7 @@ class AsyncPageShield(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> PageShieldListResponse:
) -> PageShieldGetZoneSettings:
"""
Fetches the Page Shield settings.
@ -284,7 +284,7 @@ class AsyncPageShield(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[PageShieldListResponse], ResultWrapper[PageShieldListResponse]),
cast_to=cast(Type[PageShieldGetZoneSettings], ResultWrapper[PageShieldGetZoneSettings]),
)

28
src/cloudflare/resources/page_shield/policies.py
View file

@ -25,10 +25,8 @@ from ..._base_client import (
make_request_options,
)
from ...types.page_shield import (
PolicyGetResponse,
PolicyListResponse,
PolicyCreateResponse,
PolicyUpdateResponse,
PageShieldPageshieldPolicy,
policy_create_params,
policy_update_params,
)
@ -60,7 +58,7 @@ class Policies(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> PolicyCreateResponse:
) -> PageShieldPageshieldPolicy:
"""
Create a Page Shield policy.
@ -103,7 +101,7 @@ class Policies(SyncAPIResource):
options=make_request_options(
extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
),
cast_to=PolicyCreateResponse,
cast_to=PageShieldPageshieldPolicy,
)
def update(
@ -122,7 +120,7 @@ class Policies(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> PolicyUpdateResponse:
) -> PageShieldPageshieldPolicy:
"""
Update a Page Shield policy by ID.
@ -169,7 +167,7 @@ class Policies(SyncAPIResource):
options=make_request_options(
extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
),
cast_to=PolicyUpdateResponse,
cast_to=PageShieldPageshieldPolicy,
)
def list(
@ -263,7 +261,7 @@ class Policies(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> PolicyGetResponse:
) -> PageShieldPageshieldPolicy:
"""
Fetches a Page Shield policy by ID.
@ -289,7 +287,7 @@ class Policies(SyncAPIResource):
options=make_request_options(
extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
),
cast_to=PolicyGetResponse,
cast_to=PageShieldPageshieldPolicy,
)
@ -317,7 +315,7 @@ class AsyncPolicies(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> PolicyCreateResponse:
) -> PageShieldPageshieldPolicy:
"""
Create a Page Shield policy.
@ -360,7 +358,7 @@ class AsyncPolicies(AsyncAPIResource):
options=make_request_options(
extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
),
cast_to=PolicyCreateResponse,
cast_to=PageShieldPageshieldPolicy,
)
async def update(
@ -379,7 +377,7 @@ class AsyncPolicies(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> PolicyUpdateResponse:
) -> PageShieldPageshieldPolicy:
"""
Update a Page Shield policy by ID.
@ -426,7 +424,7 @@ class AsyncPolicies(AsyncAPIResource):
options=make_request_options(
extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
),
cast_to=PolicyUpdateResponse,
cast_to=PageShieldPageshieldPolicy,
)
async def list(
@ -520,7 +518,7 @@ class AsyncPolicies(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> PolicyGetResponse:
) -> PageShieldPageshieldPolicy:
"""
Fetches a Page Shield policy by ID.
@ -546,7 +544,7 @@ class AsyncPolicies(AsyncAPIResource):
options=make_request_options(
extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
),
cast_to=PolicyGetResponse,
cast_to=PageShieldPageshieldPolicy,
)

10
src/cloudflare/resources/pagerules/settings.py
View file

@ -19,7 +19,7 @@ from ..._wrappers import ResultWrapper
from ..._base_client import (
make_request_options,
)
from ...types.pagerules import SettingListResponse
from ...types.pagerules import ZonesSettings
__all__ = ["Settings", "AsyncSettings"]
@ -43,7 +43,7 @@ class Settings(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> SettingListResponse:
) -> ZonesSettings:
"""
Returns a list of settings (and their details) that Page Rules can apply to
matching requests.
@ -70,7 +70,7 @@ class Settings(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[SettingListResponse], ResultWrapper[SettingListResponse]),
cast_to=cast(Type[ZonesSettings], ResultWrapper[ZonesSettings]),
)
@ -93,7 +93,7 @@ class AsyncSettings(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> SettingListResponse:
) -> ZonesSettings:
"""
Returns a list of settings (and their details) that Page Rules can apply to
matching requests.
@ -120,7 +120,7 @@ class AsyncSettings(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[SettingListResponse], ResultWrapper[SettingListResponse]),
cast_to=cast(Type[ZonesSettings], ResultWrapper[ZonesSettings]),
)

42
src/cloudflare/resources/pages/projects/deployments/deployments.py
View file

@ -28,18 +28,12 @@ from ....._response import (
async_to_streamed_response_wrapper,
)
from ....._wrappers import ResultWrapper
from .....types.pages import PagesDeployments
from .history.history import History, AsyncHistory
from ....._base_client import (
make_request_options,
)
from .....types.pages.projects import (
DeploymentGetResponse,
DeploymentListResponse,
DeploymentRetryResponse,
DeploymentCreateResponse,
DeploymentRollbackResponse,
deployment_create_params,
)
from .....types.pages.projects import DeploymentListResponse, deployment_create_params
__all__ = ["Deployments", "AsyncDeployments"]
@ -69,7 +63,7 @@ class Deployments(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> DeploymentCreateResponse:
) -> PagesDeployments:
"""Start a new deployment from production.
The repository and account must have
@ -105,7 +99,7 @@ class Deployments(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[DeploymentCreateResponse], ResultWrapper[DeploymentCreateResponse]),
cast_to=cast(Type[PagesDeployments], ResultWrapper[PagesDeployments]),
)
def list(
@ -209,7 +203,7 @@ class Deployments(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> DeploymentGetResponse:
) -> PagesDeployments:
"""
Fetch information about a deployment.
@ -243,7 +237,7 @@ class Deployments(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[DeploymentGetResponse], ResultWrapper[DeploymentGetResponse]),
cast_to=cast(Type[PagesDeployments], ResultWrapper[PagesDeployments]),
)
def retry(
@ -258,7 +252,7 @@ class Deployments(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> DeploymentRetryResponse:
) -> PagesDeployments:
"""
Retry a previous deployment.
@ -292,7 +286,7 @@ class Deployments(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[DeploymentRetryResponse], ResultWrapper[DeploymentRetryResponse]),
cast_to=cast(Type[PagesDeployments], ResultWrapper[PagesDeployments]),
)
def rollback(
@ -307,7 +301,7 @@ class Deployments(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> DeploymentRollbackResponse:
) -> PagesDeployments:
"""Rollback the production deployment to a previous deployment.
You can only
@ -343,7 +337,7 @@ class Deployments(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[DeploymentRollbackResponse], ResultWrapper[DeploymentRollbackResponse]),
cast_to=cast(Type[PagesDeployments], ResultWrapper[PagesDeployments]),
)
@ -372,7 +366,7 @@ class AsyncDeployments(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> DeploymentCreateResponse:
) -> PagesDeployments:
"""Start a new deployment from production.
The repository and account must have
@ -408,7 +402,7 @@ class AsyncDeployments(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[DeploymentCreateResponse], ResultWrapper[DeploymentCreateResponse]),
cast_to=cast(Type[PagesDeployments], ResultWrapper[PagesDeployments]),
)
async def list(
@ -512,7 +506,7 @@ class AsyncDeployments(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> DeploymentGetResponse:
) -> PagesDeployments:
"""
Fetch information about a deployment.
@ -546,7 +540,7 @@ class AsyncDeployments(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[DeploymentGetResponse], ResultWrapper[DeploymentGetResponse]),
cast_to=cast(Type[PagesDeployments], ResultWrapper[PagesDeployments]),
)
async def retry(
@ -561,7 +555,7 @@ class AsyncDeployments(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> DeploymentRetryResponse:
) -> PagesDeployments:
"""
Retry a previous deployment.
@ -595,7 +589,7 @@ class AsyncDeployments(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[DeploymentRetryResponse], ResultWrapper[DeploymentRetryResponse]),
cast_to=cast(Type[PagesDeployments], ResultWrapper[PagesDeployments]),
)
async def rollback(
@ -610,7 +604,7 @@ class AsyncDeployments(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> DeploymentRollbackResponse:
) -> PagesDeployments:
"""Rollback the production deployment to a previous deployment.
You can only
@ -646,7 +640,7 @@ class AsyncDeployments(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[DeploymentRollbackResponse], ResultWrapper[DeploymentRollbackResponse]),
cast_to=cast(Type[PagesDeployments], ResultWrapper[PagesDeployments]),
)

19
src/cloudflare/resources/pages/projects/projects.py
View file

@ -37,9 +37,10 @@ from ...._response import (
)
from ...._wrappers import ResultWrapper
from ....types.pages import (
ProjectGetResponse,
PagesProjects,
ProjectEditResponse,
ProjectListResponse,
PagesDeploymentsParam,
ProjectCreateResponse,
project_edit_params,
project_create_params,
@ -74,9 +75,9 @@ class Projects(SyncAPIResource):
*,
account_id: str,
build_config: project_create_params.BuildConfig | NotGiven = NOT_GIVEN,
canonical_deployment: project_create_params.CanonicalDeployment | NotGiven = NOT_GIVEN,
canonical_deployment: PagesDeploymentsParam | NotGiven = NOT_GIVEN,
deployment_configs: project_create_params.DeploymentConfigs | NotGiven = NOT_GIVEN,
latest_deployment: project_create_params.LatestDeployment | NotGiven = NOT_GIVEN,
latest_deployment: PagesDeploymentsParam | NotGiven = NOT_GIVEN,
name: str | NotGiven = NOT_GIVEN,
production_branch: str | NotGiven = NOT_GIVEN,
# Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
@ -281,7 +282,7 @@ class Projects(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> ProjectGetResponse:
) -> PagesProjects:
"""
Fetch a project by name.
@ -311,7 +312,7 @@ class Projects(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[ProjectGetResponse], ResultWrapper[ProjectGetResponse]),
cast_to=cast(Type[PagesProjects], ResultWrapper[PagesProjects]),
)
def purge_build_cache(
@ -377,9 +378,9 @@ class AsyncProjects(AsyncAPIResource):
*,
account_id: str,
build_config: project_create_params.BuildConfig | NotGiven = NOT_GIVEN,
canonical_deployment: project_create_params.CanonicalDeployment | NotGiven = NOT_GIVEN,
canonical_deployment: PagesDeploymentsParam | NotGiven = NOT_GIVEN,
deployment_configs: project_create_params.DeploymentConfigs | NotGiven = NOT_GIVEN,
latest_deployment: project_create_params.LatestDeployment | NotGiven = NOT_GIVEN,
latest_deployment: PagesDeploymentsParam | NotGiven = NOT_GIVEN,
name: str | NotGiven = NOT_GIVEN,
production_branch: str | NotGiven = NOT_GIVEN,
# Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
@ -584,7 +585,7 @@ class AsyncProjects(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> ProjectGetResponse:
) -> PagesProjects:
"""
Fetch a project by name.
@ -614,7 +615,7 @@ class AsyncProjects(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[ProjectGetResponse], ResultWrapper[ProjectGetResponse]),
cast_to=cast(Type[PagesProjects], ResultWrapper[PagesProjects]),
)
async def purge_build_cache(

19
src/cloudflare/resources/pcaps/ownerships.py
View file

@ -22,8 +22,7 @@ from ..._response import (
from ..._wrappers import ResultWrapper
from ...types.pcaps import (
OwnershipGetResponse,
OwnershipCreateResponse,
OwnershipValidateResponse,
MagicVisibilityPCAPsOwnership,
ownership_create_params,
ownership_validate_params,
)
@ -54,7 +53,7 @@ class Ownerships(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> OwnershipCreateResponse:
) -> MagicVisibilityPCAPsOwnership:
"""
Adds an AWS or GCP bucket to use with full packet captures.
@ -83,7 +82,7 @@ class Ownerships(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[OwnershipCreateResponse], ResultWrapper[OwnershipCreateResponse]),
cast_to=cast(Type[MagicVisibilityPCAPsOwnership], ResultWrapper[MagicVisibilityPCAPsOwnership]),
)
def delete(
@ -178,7 +177,7 @@ class Ownerships(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> OwnershipValidateResponse:
) -> MagicVisibilityPCAPsOwnership:
"""
Validates buckets added to the packet captures API.
@ -215,7 +214,7 @@ class Ownerships(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[OwnershipValidateResponse], ResultWrapper[OwnershipValidateResponse]),
cast_to=cast(Type[MagicVisibilityPCAPsOwnership], ResultWrapper[MagicVisibilityPCAPsOwnership]),
)
@ -239,7 +238,7 @@ class AsyncOwnerships(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> OwnershipCreateResponse:
) -> MagicVisibilityPCAPsOwnership:
"""
Adds an AWS or GCP bucket to use with full packet captures.
@ -270,7 +269,7 @@ class AsyncOwnerships(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[OwnershipCreateResponse], ResultWrapper[OwnershipCreateResponse]),
cast_to=cast(Type[MagicVisibilityPCAPsOwnership], ResultWrapper[MagicVisibilityPCAPsOwnership]),
)
async def delete(
@ -365,7 +364,7 @@ class AsyncOwnerships(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> OwnershipValidateResponse:
) -> MagicVisibilityPCAPsOwnership:
"""
Validates buckets added to the packet captures API.
@ -402,7 +401,7 @@ class AsyncOwnerships(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[OwnershipValidateResponse], ResultWrapper[OwnershipValidateResponse]),
cast_to=cast(Type[MagicVisibilityPCAPsOwnership], ResultWrapper[MagicVisibilityPCAPsOwnership]),
)

20
src/cloudflare/resources/queues/consumers.py
View file

@ -25,9 +25,9 @@ from ..._base_client import (
)
from ...types.queues import (
ConsumerGetResponse,
ConsumerCreateResponse,
ConsumerDeleteResponse,
ConsumerUpdateResponse,
WorkersConsumerCreated,
WorkersConsumerUpdated,
consumer_create_params,
consumer_update_params,
)
@ -56,7 +56,7 @@ class Consumers(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> Optional[ConsumerCreateResponse]:
) -> Optional[WorkersConsumerCreated]:
"""
Creates a new consumer for a queue.
@ -85,7 +85,7 @@ class Consumers(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[Optional[ConsumerCreateResponse]], ResultWrapper[ConsumerCreateResponse]),
cast_to=cast(Type[Optional[WorkersConsumerCreated]], ResultWrapper[WorkersConsumerCreated]),
)
def update(
@ -101,7 +101,7 @@ class Consumers(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> Optional[ConsumerUpdateResponse]:
) -> Optional[WorkersConsumerUpdated]:
"""
Updates the consumer for a queue, or creates one if it does not exist.
@ -132,7 +132,7 @@ class Consumers(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[Optional[ConsumerUpdateResponse]], ResultWrapper[ConsumerUpdateResponse]),
cast_to=cast(Type[Optional[WorkersConsumerUpdated]], ResultWrapper[WorkersConsumerUpdated]),
)
def delete(
@ -249,7 +249,7 @@ class AsyncConsumers(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> Optional[ConsumerCreateResponse]:
) -> Optional[WorkersConsumerCreated]:
"""
Creates a new consumer for a queue.
@ -278,7 +278,7 @@ class AsyncConsumers(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[Optional[ConsumerCreateResponse]], ResultWrapper[ConsumerCreateResponse]),
cast_to=cast(Type[Optional[WorkersConsumerCreated]], ResultWrapper[WorkersConsumerCreated]),
)
async def update(
@ -294,7 +294,7 @@ class AsyncConsumers(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> Optional[ConsumerUpdateResponse]:
) -> Optional[WorkersConsumerUpdated]:
"""
Updates the consumer for a queue, or creates one if it does not exist.
@ -325,7 +325,7 @@ class AsyncConsumers(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[Optional[ConsumerUpdateResponse]], ResultWrapper[ConsumerUpdateResponse]),
cast_to=cast(Type[Optional[WorkersConsumerUpdated]], ResultWrapper[WorkersConsumerUpdated]),
)
async def delete(

30
src/cloudflare/resources/queues/queues.py
View file

@ -7,11 +7,11 @@ from typing import Any, Type, Optional, cast
import httpx
from ...types import (
QueueGetResponse,
WorkersQueue,
QueueListResponse,
QueueCreateResponse,
QueueDeleteResponse,
QueueUpdateResponse,
WorkersQueueCreated,
WorkersQueueUpdated,
queue_create_params,
queue_update_params,
)
@ -68,7 +68,7 @@ class Queues(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> Optional[QueueCreateResponse]:
) -> Optional[WorkersQueueCreated]:
"""
Creates a new queue.
@ -95,7 +95,7 @@ class Queues(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[Optional[QueueCreateResponse]], ResultWrapper[QueueCreateResponse]),
cast_to=cast(Type[Optional[WorkersQueueCreated]], ResultWrapper[WorkersQueueCreated]),
)
def update(
@ -110,7 +110,7 @@ class Queues(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> Optional[QueueUpdateResponse]:
) -> Optional[WorkersQueueUpdated]:
"""
Updates a queue.
@ -139,7 +139,7 @@ class Queues(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[Optional[QueueUpdateResponse]], ResultWrapper[QueueUpdateResponse]),
cast_to=cast(Type[Optional[WorkersQueueUpdated]], ResultWrapper[WorkersQueueUpdated]),
)
def list(
@ -239,7 +239,7 @@ class Queues(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> Optional[QueueGetResponse]:
) -> Optional[WorkersQueue]:
"""
Get information about a specific queue.
@ -267,7 +267,7 @@ class Queues(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[Optional[QueueGetResponse]], ResultWrapper[QueueGetResponse]),
cast_to=cast(Type[Optional[WorkersQueue]], ResultWrapper[WorkersQueue]),
)
@ -295,7 +295,7 @@ class AsyncQueues(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> Optional[QueueCreateResponse]:
) -> Optional[WorkersQueueCreated]:
"""
Creates a new queue.
@ -322,7 +322,7 @@ class AsyncQueues(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[Optional[QueueCreateResponse]], ResultWrapper[QueueCreateResponse]),
cast_to=cast(Type[Optional[WorkersQueueCreated]], ResultWrapper[WorkersQueueCreated]),
)
async def update(
@ -337,7 +337,7 @@ class AsyncQueues(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> Optional[QueueUpdateResponse]:
) -> Optional[WorkersQueueUpdated]:
"""
Updates a queue.
@ -366,7 +366,7 @@ class AsyncQueues(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[Optional[QueueUpdateResponse]], ResultWrapper[QueueUpdateResponse]),
cast_to=cast(Type[Optional[WorkersQueueUpdated]], ResultWrapper[WorkersQueueUpdated]),
)
async def list(
@ -466,7 +466,7 @@ class AsyncQueues(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> Optional[QueueGetResponse]:
) -> Optional[WorkersQueue]:
"""
Get information about a specific queue.
@ -494,7 +494,7 @@ class AsyncQueues(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[Optional[QueueGetResponse]], ResultWrapper[QueueGetResponse]),
cast_to=cast(Type[Optional[WorkersQueue]], ResultWrapper[WorkersQueue]),
)

24
src/cloudflare/resources/r2/buckets.py
View file

@ -13,13 +13,7 @@ from ..._utils import (
async_maybe_transform,
)
from ..._compat import cached_property
from ...types.r2 import (
BucketGetResponse,
BucketListResponse,
BucketCreateResponse,
bucket_list_params,
bucket_create_params,
)
from ...types.r2 import R2Bucket, BucketListResponse, bucket_list_params, bucket_create_params
from ..._resource import SyncAPIResource, AsyncAPIResource
from ..._response import (
to_raw_response_wrapper,
@ -56,7 +50,7 @@ class Buckets(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> BucketCreateResponse:
) -> R2Bucket:
"""
Creates a new R2 bucket.
@ -93,7 +87,7 @@ class Buckets(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[BucketCreateResponse], ResultWrapper[BucketCreateResponse]),
cast_to=cast(Type[R2Bucket], ResultWrapper[R2Bucket]),
)
def list(
@ -221,7 +215,7 @@ class Buckets(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> BucketGetResponse:
) -> R2Bucket:
"""
Gets metadata for an existing R2 bucket.
@ -251,7 +245,7 @@ class Buckets(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[BucketGetResponse], ResultWrapper[BucketGetResponse]),
cast_to=cast(Type[R2Bucket], ResultWrapper[R2Bucket]),
)
@ -276,7 +270,7 @@ class AsyncBuckets(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> BucketCreateResponse:
) -> R2Bucket:
"""
Creates a new R2 bucket.
@ -313,7 +307,7 @@ class AsyncBuckets(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[BucketCreateResponse], ResultWrapper[BucketCreateResponse]),
cast_to=cast(Type[R2Bucket], ResultWrapper[R2Bucket]),
)
async def list(
@ -441,7 +435,7 @@ class AsyncBuckets(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> BucketGetResponse:
) -> R2Bucket:
"""
Gets metadata for an existing R2 bucket.
@ -471,7 +465,7 @@ class AsyncBuckets(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[BucketGetResponse], ResultWrapper[BucketGetResponse]),
cast_to=cast(Type[R2Bucket], ResultWrapper[R2Bucket]),
)

18
src/cloudflare/resources/r2/sippy.py
View file

@ -12,7 +12,7 @@ from ..._utils import (
async_maybe_transform,
)
from ..._compat import cached_property
from ...types.r2 import SippyGetResponse, SippyDeleteResponse, SippyUpdateResponse, sippy_update_params
from ...types.r2 import R2Sippy, SippyDeleteResponse, sippy_update_params
from ..._resource import SyncAPIResource, AsyncAPIResource
from ..._response import (
to_raw_response_wrapper,
@ -50,7 +50,7 @@ class Sippy(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> SippyUpdateResponse:
) -> R2Sippy:
"""
Sets configuration for Sippy for an existing R2 bucket.
@ -87,7 +87,7 @@ class Sippy(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[SippyUpdateResponse], ResultWrapper[SippyUpdateResponse]),
cast_to=cast(Type[R2Sippy], ResultWrapper[R2Sippy]),
)
def delete(
@ -145,7 +145,7 @@ class Sippy(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> SippyGetResponse:
) -> R2Sippy:
"""
Gets configuration for Sippy for an existing R2 bucket.
@ -175,7 +175,7 @@ class Sippy(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[SippyGetResponse], ResultWrapper[SippyGetResponse]),
cast_to=cast(Type[R2Sippy], ResultWrapper[R2Sippy]),
)
@ -201,7 +201,7 @@ class AsyncSippy(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> SippyUpdateResponse:
) -> R2Sippy:
"""
Sets configuration for Sippy for an existing R2 bucket.
@ -238,7 +238,7 @@ class AsyncSippy(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[SippyUpdateResponse], ResultWrapper[SippyUpdateResponse]),
cast_to=cast(Type[R2Sippy], ResultWrapper[R2Sippy]),
)
async def delete(
@ -296,7 +296,7 @@ class AsyncSippy(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> SippyGetResponse:
) -> R2Sippy:
"""
Gets configuration for Sippy for an existing R2 bucket.
@ -326,7 +326,7 @@ class AsyncSippy(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[SippyGetResponse], ResultWrapper[SippyGetResponse]),
cast_to=cast(Type[R2Sippy], ResultWrapper[R2Sippy]),
)

34
src/cloudflare/resources/rules/lists/lists.py
View file

@ -29,15 +29,7 @@ from ...._response import (
async_to_streamed_response_wrapper,
)
from ...._wrappers import ResultWrapper
from ....types.rules import (
ListGetResponse,
ListListResponse,
ListCreateResponse,
ListDeleteResponse,
ListUpdateResponse,
list_create_params,
list_update_params,
)
from ....types.rules import ListsList, ListListResponse, ListDeleteResponse, list_create_params, list_update_params
from ...._base_client import (
make_request_options,
)
@ -83,7 +75,7 @@ class Lists(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> Optional[ListCreateResponse]:
) -> Optional[ListsList]:
"""
Creates a new list of the specified type.
@ -124,7 +116,7 @@ class Lists(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[Optional[ListCreateResponse]], ResultWrapper[ListCreateResponse]),
cast_to=cast(Type[Optional[ListsList]], ResultWrapper[ListsList]),
)
def update(
@ -139,7 +131,7 @@ class Lists(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> Optional[ListUpdateResponse]:
) -> Optional[ListsList]:
"""
Updates the description of a list.
@ -172,7 +164,7 @@ class Lists(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[Optional[ListUpdateResponse]], ResultWrapper[ListUpdateResponse]),
cast_to=cast(Type[Optional[ListsList]], ResultWrapper[ListsList]),
)
def list(
@ -269,7 +261,7 @@ class Lists(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> Optional[ListGetResponse]:
) -> Optional[ListsList]:
"""
Fetches the details of a list.
@ -299,7 +291,7 @@ class Lists(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[Optional[ListGetResponse]], ResultWrapper[ListGetResponse]),
cast_to=cast(Type[Optional[ListsList]], ResultWrapper[ListsList]),
)
@ -333,7 +325,7 @@ class AsyncLists(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> Optional[ListCreateResponse]:
) -> Optional[ListsList]:
"""
Creates a new list of the specified type.
@ -374,7 +366,7 @@ class AsyncLists(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[Optional[ListCreateResponse]], ResultWrapper[ListCreateResponse]),
cast_to=cast(Type[Optional[ListsList]], ResultWrapper[ListsList]),
)
async def update(
@ -389,7 +381,7 @@ class AsyncLists(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> Optional[ListUpdateResponse]:
) -> Optional[ListsList]:
"""
Updates the description of a list.
@ -422,7 +414,7 @@ class AsyncLists(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[Optional[ListUpdateResponse]], ResultWrapper[ListUpdateResponse]),
cast_to=cast(Type[Optional[ListsList]], ResultWrapper[ListsList]),
)
async def list(
@ -519,7 +511,7 @@ class AsyncLists(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> Optional[ListGetResponse]:
) -> Optional[ListsList]:
"""
Fetches the details of a list.
@ -549,7 +541,7 @@ class AsyncLists(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[Optional[ListGetResponse]], ResultWrapper[ListGetResponse]),
cast_to=cast(Type[Optional[ListsList]], ResultWrapper[ListsList]),
)

19
src/cloudflare/resources/rulesets/phases/phases.py
View file

@ -7,6 +7,7 @@ from typing_extensions import Literal
import httpx
from ....types import RulesetsRulesetResponse
from .versions import (
Versions,
AsyncVersions,
@ -32,7 +33,7 @@ from ...._wrappers import ResultWrapper
from ...._base_client import (
make_request_options,
)
from ....types.rulesets import PhaseGetResponse, PhaseUpdateResponse, phase_update_params
from ....types.rulesets import phase_update_params
__all__ = ["Phases", "AsyncPhases"]
@ -117,7 +118,7 @@ class Phases(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> PhaseUpdateResponse:
) -> RulesetsRulesetResponse:
"""
Updates an account or zone entry point ruleset, creating a new version.
@ -185,7 +186,7 @@ class Phases(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[PhaseUpdateResponse], ResultWrapper[PhaseUpdateResponse]),
cast_to=cast(Type[RulesetsRulesetResponse], ResultWrapper[RulesetsRulesetResponse]),
)
def get(
@ -224,7 +225,7 @@ class Phases(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> PhaseGetResponse:
) -> RulesetsRulesetResponse:
"""
Fetches the latest version of the account or zone entry point ruleset for a
given phase.
@ -270,7 +271,7 @@ class Phases(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[PhaseGetResponse], ResultWrapper[PhaseGetResponse]),
cast_to=cast(Type[RulesetsRulesetResponse], ResultWrapper[RulesetsRulesetResponse]),
)
@ -354,7 +355,7 @@ class AsyncPhases(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> PhaseUpdateResponse:
) -> RulesetsRulesetResponse:
"""
Updates an account or zone entry point ruleset, creating a new version.
@ -422,7 +423,7 @@ class AsyncPhases(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[PhaseUpdateResponse], ResultWrapper[PhaseUpdateResponse]),
cast_to=cast(Type[RulesetsRulesetResponse], ResultWrapper[RulesetsRulesetResponse]),
)
async def get(
@ -461,7 +462,7 @@ class AsyncPhases(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> PhaseGetResponse:
) -> RulesetsRulesetResponse:
"""
Fetches the latest version of the account or zone entry point ruleset for a
given phase.
@ -507,7 +508,7 @@ class AsyncPhases(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[PhaseGetResponse], ResultWrapper[PhaseGetResponse]),
cast_to=cast(Type[RulesetsRulesetResponse], ResultWrapper[RulesetsRulesetResponse]),
)

18
src/cloudflare/resources/rulesets/phases/versions.py
View file

@ -7,6 +7,7 @@ from typing_extensions import Literal
import httpx
from ....types import RulesetsRulesetResponse, RulesetsRulesetsResponse
from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
from ...._compat import cached_property
from ...._resource import SyncAPIResource, AsyncAPIResource
@ -20,7 +21,6 @@ from ...._wrappers import ResultWrapper
from ...._base_client import (
make_request_options,
)
from ....types.rulesets.phases import VersionGetResponse, VersionListResponse
__all__ = ["Versions", "AsyncVersions"]
@ -70,7 +70,7 @@ class Versions(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> VersionListResponse:
) -> RulesetsRulesetsResponse:
"""
Fetches the versions of an account or zone entry point ruleset.
@ -115,7 +115,7 @@ class Versions(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[VersionListResponse], ResultWrapper[VersionListResponse]),
cast_to=cast(Type[RulesetsRulesetsResponse], ResultWrapper[RulesetsRulesetsResponse]),
)
def get(
@ -155,7 +155,7 @@ class Versions(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> VersionGetResponse:
) -> RulesetsRulesetResponse:
"""
Fetches a specific version of an account or zone entry point ruleset.
@ -204,7 +204,7 @@ class Versions(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[VersionGetResponse], ResultWrapper[VersionGetResponse]),
cast_to=cast(Type[RulesetsRulesetResponse], ResultWrapper[RulesetsRulesetResponse]),
)
@ -253,7 +253,7 @@ class AsyncVersions(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> VersionListResponse:
) -> RulesetsRulesetsResponse:
"""
Fetches the versions of an account or zone entry point ruleset.
@ -298,7 +298,7 @@ class AsyncVersions(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[VersionListResponse], ResultWrapper[VersionListResponse]),
cast_to=cast(Type[RulesetsRulesetsResponse], ResultWrapper[RulesetsRulesetsResponse]),
)
async def get(
@ -338,7 +338,7 @@ class AsyncVersions(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> VersionGetResponse:
) -> RulesetsRulesetResponse:
"""
Fetches a specific version of an account or zone entry point ruleset.
@ -387,7 +387,7 @@ class AsyncVersions(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[VersionGetResponse], ResultWrapper[VersionGetResponse]),
cast_to=cast(Type[RulesetsRulesetResponse], ResultWrapper[RulesetsRulesetResponse]),
)

33
src/cloudflare/resources/rulesets/rules.py
View file

@ -6,6 +6,7 @@ from typing import Type, cast
import httpx
from ...types import RulesetsRulesetResponse
from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
from ..._utils import (
maybe_transform,
@ -23,13 +24,7 @@ from ..._wrappers import ResultWrapper
from ..._base_client import (
make_request_options,
)
from ...types.rulesets import (
RuleEditResponse,
RuleCreateResponse,
RuleDeleteResponse,
rule_edit_params,
rule_create_params,
)
from ...types.rulesets import rule_edit_params, rule_create_params
__all__ = ["Rules", "AsyncRules"]
@ -56,7 +51,7 @@ class Rules(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> RuleCreateResponse:
) -> RulesetsRulesetResponse:
"""Adds a new rule to an account or zone ruleset.
The rule will be added to the end
@ -106,7 +101,7 @@ class Rules(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[RuleCreateResponse], ResultWrapper[RuleCreateResponse]),
cast_to=cast(Type[RulesetsRulesetResponse], ResultWrapper[RulesetsRulesetResponse]),
)
def delete(
@ -122,7 +117,7 @@ class Rules(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> RuleDeleteResponse:
) -> RulesetsRulesetResponse:
"""
Deletes an existing rule from an account or zone ruleset.
@ -171,7 +166,7 @@ class Rules(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[RuleDeleteResponse], ResultWrapper[RuleDeleteResponse]),
cast_to=cast(Type[RulesetsRulesetResponse], ResultWrapper[RulesetsRulesetResponse]),
)
def edit(
@ -188,7 +183,7 @@ class Rules(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> RuleEditResponse:
) -> RulesetsRulesetResponse:
"""
Updates an existing rule in an account ruleset.
@ -240,7 +235,7 @@ class Rules(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[RuleEditResponse], ResultWrapper[RuleEditResponse]),
cast_to=cast(Type[RulesetsRulesetResponse], ResultWrapper[RulesetsRulesetResponse]),
)
@ -266,7 +261,7 @@ class AsyncRules(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> RuleCreateResponse:
) -> RulesetsRulesetResponse:
"""Adds a new rule to an account or zone ruleset.
The rule will be added to the end
@ -316,7 +311,7 @@ class AsyncRules(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[RuleCreateResponse], ResultWrapper[RuleCreateResponse]),
cast_to=cast(Type[RulesetsRulesetResponse], ResultWrapper[RulesetsRulesetResponse]),
)
async def delete(
@ -332,7 +327,7 @@ class AsyncRules(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> RuleDeleteResponse:
) -> RulesetsRulesetResponse:
"""
Deletes an existing rule from an account or zone ruleset.
@ -381,7 +376,7 @@ class AsyncRules(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[RuleDeleteResponse], ResultWrapper[RuleDeleteResponse]),
cast_to=cast(Type[RulesetsRulesetResponse], ResultWrapper[RulesetsRulesetResponse]),
)
async def edit(
@ -398,7 +393,7 @@ class AsyncRules(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> RuleEditResponse:
) -> RulesetsRulesetResponse:
"""
Updates an existing rule in an account ruleset.
@ -450,7 +445,7 @@ class AsyncRules(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[RuleEditResponse], ResultWrapper[RuleEditResponse]),
cast_to=cast(Type[RulesetsRulesetResponse], ResultWrapper[RulesetsRulesetResponse]),
)

38
src/cloudflare/resources/rulesets/rulesets.py
View file

@ -24,10 +24,8 @@ from .phases import (
AsyncPhasesWithStreamingResponse,
)
from ...types import (
RulesetGetResponse,
RulesetListResponse,
RulesetCreateResponse,
RulesetUpdateResponse,
RulesetsRulesetResponse,
RulesetsRulesetsResponse,
ruleset_create_params,
ruleset_update_params,
)
@ -123,7 +121,7 @@ class Rulesets(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> RulesetCreateResponse:
) -> RulesetsRulesetResponse:
"""
Creates a ruleset.
@ -184,7 +182,7 @@ class Rulesets(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[RulesetCreateResponse], ResultWrapper[RulesetCreateResponse]),
cast_to=cast(Type[RulesetsRulesetResponse], ResultWrapper[RulesetsRulesetResponse]),
)
def update(
@ -230,7 +228,7 @@ class Rulesets(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> RulesetUpdateResponse:
) -> RulesetsRulesetResponse:
"""
Updates an account or zone ruleset, creating a new version.
@ -298,7 +296,7 @@ class Rulesets(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[RulesetUpdateResponse], ResultWrapper[RulesetUpdateResponse]),
cast_to=cast(Type[RulesetsRulesetResponse], ResultWrapper[RulesetsRulesetResponse]),
)
def list(
@ -312,7 +310,7 @@ class Rulesets(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> RulesetListResponse:
) -> RulesetsRulesetsResponse:
"""
Fetches all rulesets.
@ -353,7 +351,7 @@ class Rulesets(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[RulesetListResponse], ResultWrapper[RulesetListResponse]),
cast_to=cast(Type[RulesetsRulesetsResponse], ResultWrapper[RulesetsRulesetsResponse]),
)
def delete(
@ -425,7 +423,7 @@ class Rulesets(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> RulesetGetResponse:
) -> RulesetsRulesetResponse:
"""
Fetches the latest version of an account or zone ruleset.
@ -470,7 +468,7 @@ class Rulesets(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[RulesetGetResponse], ResultWrapper[RulesetGetResponse]),
cast_to=cast(Type[RulesetsRulesetResponse], ResultWrapper[RulesetsRulesetResponse]),
)
@ -535,7 +533,7 @@ class AsyncRulesets(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> RulesetCreateResponse:
) -> RulesetsRulesetResponse:
"""
Creates a ruleset.
@ -596,7 +594,7 @@ class AsyncRulesets(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[RulesetCreateResponse], ResultWrapper[RulesetCreateResponse]),
cast_to=cast(Type[RulesetsRulesetResponse], ResultWrapper[RulesetsRulesetResponse]),
)
async def update(
@ -642,7 +640,7 @@ class AsyncRulesets(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> RulesetUpdateResponse:
) -> RulesetsRulesetResponse:
"""
Updates an account or zone ruleset, creating a new version.
@ -710,7 +708,7 @@ class AsyncRulesets(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[RulesetUpdateResponse], ResultWrapper[RulesetUpdateResponse]),
cast_to=cast(Type[RulesetsRulesetResponse], ResultWrapper[RulesetsRulesetResponse]),
)
async def list(
@ -724,7 +722,7 @@ class AsyncRulesets(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> RulesetListResponse:
) -> RulesetsRulesetsResponse:
"""
Fetches all rulesets.
@ -765,7 +763,7 @@ class AsyncRulesets(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[RulesetListResponse], ResultWrapper[RulesetListResponse]),
cast_to=cast(Type[RulesetsRulesetsResponse], ResultWrapper[RulesetsRulesetsResponse]),
)
async def delete(
@ -837,7 +835,7 @@ class AsyncRulesets(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> RulesetGetResponse:
) -> RulesetsRulesetResponse:
"""
Fetches the latest version of an account or zone ruleset.
@ -882,7 +880,7 @@ class AsyncRulesets(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[RulesetGetResponse], ResultWrapper[RulesetGetResponse]),
cast_to=cast(Type[RulesetsRulesetResponse], ResultWrapper[RulesetsRulesetResponse]),
)

10
src/cloudflare/resources/rulesets/versions/by_tags.py
View file

@ -6,6 +6,7 @@ from typing import Type, cast
import httpx
from ....types import RulesetsRulesetResponse
from ...._types import NOT_GIVEN, Body, Query, Headers, NotGiven
from ...._compat import cached_property
from ...._resource import SyncAPIResource, AsyncAPIResource
@ -19,7 +20,6 @@ from ...._wrappers import ResultWrapper
from ...._base_client import (
make_request_options,
)
from ....types.rulesets.versions import ByTagGetResponse
__all__ = ["ByTags", "AsyncByTags"]
@ -46,7 +46,7 @@ class ByTags(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> ByTagGetResponse:
) -> RulesetsRulesetResponse:
"""
Fetches the rules of a managed account ruleset version for a given tag.
@ -84,7 +84,7 @@ class ByTags(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[ByTagGetResponse], ResultWrapper[ByTagGetResponse]),
cast_to=cast(Type[RulesetsRulesetResponse], ResultWrapper[RulesetsRulesetResponse]),
)
@ -110,7 +110,7 @@ class AsyncByTags(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> ByTagGetResponse:
) -> RulesetsRulesetResponse:
"""
Fetches the rules of a managed account ruleset version for a given tag.
@ -148,7 +148,7 @@ class AsyncByTags(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[ByTagGetResponse], ResultWrapper[ByTagGetResponse]),
cast_to=cast(Type[RulesetsRulesetResponse], ResultWrapper[RulesetsRulesetResponse]),
)

18
src/cloudflare/resources/rulesets/versions/versions.py
View file

@ -14,6 +14,7 @@ from .by_tags import (
ByTagsWithStreamingResponse,
AsyncByTagsWithStreamingResponse,
)
from ....types import RulesetsRulesetResponse, RulesetsRulesetsResponse
from ...._types import NOT_GIVEN, Body, Query, Headers, NoneType, NotGiven
from ...._compat import cached_property
from ...._resource import SyncAPIResource, AsyncAPIResource
@ -27,7 +28,6 @@ from ...._wrappers import ResultWrapper
from ...._base_client import (
make_request_options,
)
from ....types.rulesets import VersionGetResponse, VersionListResponse
__all__ = ["Versions", "AsyncVersions"]
@ -57,7 +57,7 @@ class Versions(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> VersionListResponse:
) -> RulesetsRulesetsResponse:
"""
Fetches the versions of an account or zone ruleset.
@ -102,7 +102,7 @@ class Versions(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[VersionListResponse], ResultWrapper[VersionListResponse]),
cast_to=cast(Type[RulesetsRulesetsResponse], ResultWrapper[RulesetsRulesetsResponse]),
)
def delete(
@ -180,7 +180,7 @@ class Versions(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> VersionGetResponse:
) -> RulesetsRulesetResponse:
"""
Fetches a specific version of an account or zone ruleset.
@ -229,7 +229,7 @@ class Versions(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[VersionGetResponse], ResultWrapper[VersionGetResponse]),
cast_to=cast(Type[RulesetsRulesetResponse], ResultWrapper[RulesetsRulesetResponse]),
)
@ -258,7 +258,7 @@ class AsyncVersions(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> VersionListResponse:
) -> RulesetsRulesetsResponse:
"""
Fetches the versions of an account or zone ruleset.
@ -303,7 +303,7 @@ class AsyncVersions(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[VersionListResponse], ResultWrapper[VersionListResponse]),
cast_to=cast(Type[RulesetsRulesetsResponse], ResultWrapper[RulesetsRulesetsResponse]),
)
async def delete(
@ -381,7 +381,7 @@ class AsyncVersions(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> VersionGetResponse:
) -> RulesetsRulesetResponse:
"""
Fetches a specific version of an account or zone ruleset.
@ -430,7 +430,7 @@ class AsyncVersions(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[VersionGetResponse], ResultWrapper[VersionGetResponse]),
cast_to=cast(Type[RulesetsRulesetResponse], ResultWrapper[RulesetsRulesetResponse]),
)

25
src/cloudflare/resources/rum/rules.py
View file

@ -20,14 +20,7 @@ from ..._response import (
async_to_streamed_response_wrapper,
)
from ..._wrappers import ResultWrapper
from ...types.rum import (
RuleListResponse,
RuleCreateResponse,
RuleDeleteResponse,
RuleUpdateResponse,
rule_create_params,
rule_update_params,
)
from ...types.rum import RUMRule, RuleListResponse, RuleDeleteResponse, rule_create_params, rule_update_params
from ..._base_client import (
make_request_options,
)
@ -59,7 +52,7 @@ class Rules(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> Optional[RuleCreateResponse]:
) -> Optional[RUMRule]:
"""
Creates a new rule in a Web Analytics ruleset.
@ -102,7 +95,7 @@ class Rules(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[Optional[RuleCreateResponse]], ResultWrapper[RuleCreateResponse]),
cast_to=cast(Type[Optional[RUMRule]], ResultWrapper[RUMRule]),
)
def update(
@ -121,7 +114,7 @@ class Rules(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> Optional[RuleUpdateResponse]:
) -> Optional[RUMRule]:
"""
Updates a rule in a Web Analytics ruleset.
@ -168,7 +161,7 @@ class Rules(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[Optional[RuleUpdateResponse]], ResultWrapper[RuleUpdateResponse]),
cast_to=cast(Type[Optional[RUMRule]], ResultWrapper[RUMRule]),
)
def list(
@ -289,7 +282,7 @@ class AsyncRules(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> Optional[RuleCreateResponse]:
) -> Optional[RUMRule]:
"""
Creates a new rule in a Web Analytics ruleset.
@ -332,7 +325,7 @@ class AsyncRules(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[Optional[RuleCreateResponse]], ResultWrapper[RuleCreateResponse]),
cast_to=cast(Type[Optional[RUMRule]], ResultWrapper[RUMRule]),
)
async def update(
@ -351,7 +344,7 @@ class AsyncRules(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> Optional[RuleUpdateResponse]:
) -> Optional[RUMRule]:
"""
Updates a rule in a Web Analytics ruleset.
@ -398,7 +391,7 @@ class AsyncRules(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[Optional[RuleUpdateResponse]], ResultWrapper[RuleUpdateResponse]),
cast_to=cast(Type[Optional[RUMRule]], ResultWrapper[RUMRule]),
)
async def list(

41
src/cloudflare/resources/rum/site_infos.py
View file

@ -22,11 +22,8 @@ from ..._response import (
)
from ..._wrappers import ResultWrapper
from ...types.rum import (
SiteInfoGetResponse,
SiteInfoListResponse,
SiteInfoCreateResponse,
RUMSite,
SiteInfoDeleteResponse,
SiteInfoUpdateResponse,
site_info_list_params,
site_info_create_params,
site_info_update_params,
@ -62,7 +59,7 @@ class SiteInfos(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> Optional[SiteInfoCreateResponse]:
) -> Optional[RUMSite]:
"""
Creates a new Web Analytics site.
@ -103,7 +100,7 @@ class SiteInfos(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[Optional[SiteInfoCreateResponse]], ResultWrapper[SiteInfoCreateResponse]),
cast_to=cast(Type[Optional[RUMSite]], ResultWrapper[RUMSite]),
)
def update(
@ -120,7 +117,7 @@ class SiteInfos(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> Optional[SiteInfoUpdateResponse]:
) -> Optional[RUMSite]:
"""
Updates an existing Web Analytics site.
@ -165,7 +162,7 @@ class SiteInfos(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[Optional[SiteInfoUpdateResponse]], ResultWrapper[SiteInfoUpdateResponse]),
cast_to=cast(Type[Optional[RUMSite]], ResultWrapper[RUMSite]),
)
def list(
@ -181,7 +178,7 @@ class SiteInfos(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> SyncV4PagePaginationArray[SiteInfoListResponse]:
) -> SyncV4PagePaginationArray[RUMSite]:
"""
Lists all Web Analytics sites of an account.
@ -206,7 +203,7 @@ class SiteInfos(SyncAPIResource):
raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
return self._get_api_list(
f"/accounts/{account_id}/rum/site_info/list",
page=SyncV4PagePaginationArray[SiteInfoListResponse],
page=SyncV4PagePaginationArray[RUMSite],
options=make_request_options(
extra_headers=extra_headers,
extra_query=extra_query,
@ -221,7 +218,7 @@ class SiteInfos(SyncAPIResource):
site_info_list_params.SiteInfoListParams,
),
),
model=SiteInfoListResponse,
model=RUMSite,
)
def delete(
@ -279,7 +276,7 @@ class SiteInfos(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> Optional[SiteInfoGetResponse]:
) -> Optional[RUMSite]:
"""
Retrieves a Web Analytics site.
@ -309,7 +306,7 @@ class SiteInfos(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[Optional[SiteInfoGetResponse]], ResultWrapper[SiteInfoGetResponse]),
cast_to=cast(Type[Optional[RUMSite]], ResultWrapper[RUMSite]),
)
@ -335,7 +332,7 @@ class AsyncSiteInfos(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> Optional[SiteInfoCreateResponse]:
) -> Optional[RUMSite]:
"""
Creates a new Web Analytics site.
@ -376,7 +373,7 @@ class AsyncSiteInfos(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[Optional[SiteInfoCreateResponse]], ResultWrapper[SiteInfoCreateResponse]),
cast_to=cast(Type[Optional[RUMSite]], ResultWrapper[RUMSite]),
)
async def update(
@ -393,7 +390,7 @@ class AsyncSiteInfos(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> Optional[SiteInfoUpdateResponse]:
) -> Optional[RUMSite]:
"""
Updates an existing Web Analytics site.
@ -438,7 +435,7 @@ class AsyncSiteInfos(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[Optional[SiteInfoUpdateResponse]], ResultWrapper[SiteInfoUpdateResponse]),
cast_to=cast(Type[Optional[RUMSite]], ResultWrapper[RUMSite]),
)
def list(
@ -454,7 +451,7 @@ class AsyncSiteInfos(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> AsyncPaginator[SiteInfoListResponse, AsyncV4PagePaginationArray[SiteInfoListResponse]]:
) -> AsyncPaginator[RUMSite, AsyncV4PagePaginationArray[RUMSite]]:
"""
Lists all Web Analytics sites of an account.
@ -479,7 +476,7 @@ class AsyncSiteInfos(AsyncAPIResource):
raise ValueError(f"Expected a non-empty value for `account_id` but received {account_id!r}")
return self._get_api_list(
f"/accounts/{account_id}/rum/site_info/list",
page=AsyncV4PagePaginationArray[SiteInfoListResponse],
page=AsyncV4PagePaginationArray[RUMSite],
options=make_request_options(
extra_headers=extra_headers,
extra_query=extra_query,
@ -494,7 +491,7 @@ class AsyncSiteInfos(AsyncAPIResource):
site_info_list_params.SiteInfoListParams,
),
),
model=SiteInfoListResponse,
model=RUMSite,
)
async def delete(
@ -552,7 +549,7 @@ class AsyncSiteInfos(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> Optional[SiteInfoGetResponse]:
) -> Optional[RUMSite]:
"""
Retrieves a Web Analytics site.
@ -582,7 +579,7 @@ class AsyncSiteInfos(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[Optional[SiteInfoGetResponse]], ResultWrapper[SiteInfoGetResponse]),
cast_to=cast(Type[Optional[RUMSite]], ResultWrapper[RUMSite]),
)

28
src/cloudflare/resources/secondary_dns/acls.py
View file

@ -24,11 +24,9 @@ from ..._base_client import (
make_request_options,
)
from ...types.secondary_dns import (
ACLGetResponse,
ACLListResponse,
ACLCreateResponse,
SecondaryDNSACL,
ACLDeleteResponse,
ACLUpdateResponse,
acl_create_params,
acl_update_params,
)
@ -56,7 +54,7 @@ class ACLs(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> ACLCreateResponse:
) -> SecondaryDNSACL:
"""
Create ACL.
@ -79,7 +77,7 @@ class ACLs(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[ACLCreateResponse], ResultWrapper[ACLCreateResponse]),
cast_to=cast(Type[SecondaryDNSACL], ResultWrapper[SecondaryDNSACL]),
)
def update(
@ -95,7 +93,7 @@ class ACLs(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> ACLUpdateResponse:
) -> SecondaryDNSACL:
"""
Modify ACL.
@ -132,7 +130,7 @@ class ACLs(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[ACLUpdateResponse], ResultWrapper[ACLUpdateResponse]),
cast_to=cast(Type[SecondaryDNSACL], ResultWrapper[SecondaryDNSACL]),
)
def list(
@ -217,7 +215,7 @@ class ACLs(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> ACLGetResponse:
) -> SecondaryDNSACL:
"""
Get ACL.
@ -239,7 +237,7 @@ class ACLs(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[ACLGetResponse], ResultWrapper[ACLGetResponse]),
cast_to=cast(Type[SecondaryDNSACL], ResultWrapper[SecondaryDNSACL]),
)
@ -263,7 +261,7 @@ class AsyncACLs(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> ACLCreateResponse:
) -> SecondaryDNSACL:
"""
Create ACL.
@ -286,7 +284,7 @@ class AsyncACLs(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[ACLCreateResponse], ResultWrapper[ACLCreateResponse]),
cast_to=cast(Type[SecondaryDNSACL], ResultWrapper[SecondaryDNSACL]),
)
async def update(
@ -302,7 +300,7 @@ class AsyncACLs(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> ACLUpdateResponse:
) -> SecondaryDNSACL:
"""
Modify ACL.
@ -339,7 +337,7 @@ class AsyncACLs(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[ACLUpdateResponse], ResultWrapper[ACLUpdateResponse]),
cast_to=cast(Type[SecondaryDNSACL], ResultWrapper[SecondaryDNSACL]),
)
async def list(
@ -424,7 +422,7 @@ class AsyncACLs(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> ACLGetResponse:
) -> SecondaryDNSACL:
"""
Get ACL.
@ -446,7 +444,7 @@ class AsyncACLs(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[ACLGetResponse], ResultWrapper[ACLGetResponse]),
cast_to=cast(Type[SecondaryDNSACL], ResultWrapper[SecondaryDNSACL]),
)

28
src/cloudflare/resources/secondary_dns/peers.py
View file

@ -24,11 +24,9 @@ from ..._base_client import (
make_request_options,
)
from ...types.secondary_dns import (
PeerGetResponse,
PeerListResponse,
PeerCreateResponse,
SecondaryDNSPeer,
PeerDeleteResponse,
PeerUpdateResponse,
peer_create_params,
peer_update_params,
)
@ -56,7 +54,7 @@ class Peers(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> PeerCreateResponse:
) -> SecondaryDNSPeer:
"""
Create Peer.
@ -79,7 +77,7 @@ class Peers(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[PeerCreateResponse], ResultWrapper[PeerCreateResponse]),
cast_to=cast(Type[SecondaryDNSPeer], ResultWrapper[SecondaryDNSPeer]),
)
def update(
@ -98,7 +96,7 @@ class Peers(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> PeerUpdateResponse:
) -> SecondaryDNSPeer:
"""
Modify Peer.
@ -146,7 +144,7 @@ class Peers(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[PeerUpdateResponse], ResultWrapper[PeerUpdateResponse]),
cast_to=cast(Type[SecondaryDNSPeer], ResultWrapper[SecondaryDNSPeer]),
)
def list(
@ -231,7 +229,7 @@ class Peers(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> PeerGetResponse:
) -> SecondaryDNSPeer:
"""
Get Peer.
@ -253,7 +251,7 @@ class Peers(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[PeerGetResponse], ResultWrapper[PeerGetResponse]),
cast_to=cast(Type[SecondaryDNSPeer], ResultWrapper[SecondaryDNSPeer]),
)
@ -277,7 +275,7 @@ class AsyncPeers(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> PeerCreateResponse:
) -> SecondaryDNSPeer:
"""
Create Peer.
@ -300,7 +298,7 @@ class AsyncPeers(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[PeerCreateResponse], ResultWrapper[PeerCreateResponse]),
cast_to=cast(Type[SecondaryDNSPeer], ResultWrapper[SecondaryDNSPeer]),
)
async def update(
@ -319,7 +317,7 @@ class AsyncPeers(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> PeerUpdateResponse:
) -> SecondaryDNSPeer:
"""
Modify Peer.
@ -367,7 +365,7 @@ class AsyncPeers(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[PeerUpdateResponse], ResultWrapper[PeerUpdateResponse]),
cast_to=cast(Type[SecondaryDNSPeer], ResultWrapper[SecondaryDNSPeer]),
)
async def list(
@ -452,7 +450,7 @@ class AsyncPeers(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> PeerGetResponse:
) -> SecondaryDNSPeer:
"""
Get Peer.
@ -474,7 +472,7 @@ class AsyncPeers(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[PeerGetResponse], ResultWrapper[PeerGetResponse]),
cast_to=cast(Type[SecondaryDNSPeer], ResultWrapper[SecondaryDNSPeer]),
)

28
src/cloudflare/resources/secondary_dns/tsigs.py
View file

@ -24,11 +24,9 @@ from ..._base_client import (
make_request_options,
)
from ...types.secondary_dns import (
TSIGGetResponse,
SecondaryDNSTSIG,
TSIGListResponse,
TSIGCreateResponse,
TSIGDeleteResponse,
TSIGUpdateResponse,
tsig_create_params,
tsig_update_params,
)
@ -58,7 +56,7 @@ class TSIGs(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> TSIGCreateResponse:
) -> SecondaryDNSTSIG:
"""
Create TSIG.
@ -94,7 +92,7 @@ class TSIGs(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[TSIGCreateResponse], ResultWrapper[TSIGCreateResponse]),
cast_to=cast(Type[SecondaryDNSTSIG], ResultWrapper[SecondaryDNSTSIG]),
)
def update(
@ -111,7 +109,7 @@ class TSIGs(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> TSIGUpdateResponse:
) -> SecondaryDNSTSIG:
"""
Modify TSIG.
@ -147,7 +145,7 @@ class TSIGs(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[TSIGUpdateResponse], ResultWrapper[TSIGUpdateResponse]),
cast_to=cast(Type[SecondaryDNSTSIG], ResultWrapper[SecondaryDNSTSIG]),
)
def list(
@ -232,7 +230,7 @@ class TSIGs(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> TSIGGetResponse:
) -> SecondaryDNSTSIG:
"""
Get TSIG.
@ -254,7 +252,7 @@ class TSIGs(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[TSIGGetResponse], ResultWrapper[TSIGGetResponse]),
cast_to=cast(Type[SecondaryDNSTSIG], ResultWrapper[SecondaryDNSTSIG]),
)
@ -280,7 +278,7 @@ class AsyncTSIGs(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> TSIGCreateResponse:
) -> SecondaryDNSTSIG:
"""
Create TSIG.
@ -316,7 +314,7 @@ class AsyncTSIGs(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[TSIGCreateResponse], ResultWrapper[TSIGCreateResponse]),
cast_to=cast(Type[SecondaryDNSTSIG], ResultWrapper[SecondaryDNSTSIG]),
)
async def update(
@ -333,7 +331,7 @@ class AsyncTSIGs(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> TSIGUpdateResponse:
) -> SecondaryDNSTSIG:
"""
Modify TSIG.
@ -369,7 +367,7 @@ class AsyncTSIGs(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[TSIGUpdateResponse], ResultWrapper[TSIGUpdateResponse]),
cast_to=cast(Type[SecondaryDNSTSIG], ResultWrapper[SecondaryDNSTSIG]),
)
async def list(
@ -454,7 +452,7 @@ class AsyncTSIGs(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> TSIGGetResponse:
) -> SecondaryDNSTSIG:
"""
Get TSIG.
@ -476,7 +474,7 @@ class AsyncTSIGs(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[TSIGGetResponse], ResultWrapper[TSIGGetResponse]),
cast_to=cast(Type[SecondaryDNSTSIG], ResultWrapper[SecondaryDNSTSIG]),
)

24
src/cloudflare/resources/snippets/snippets.py
View file

@ -14,13 +14,7 @@ from .rules import (
RulesWithStreamingResponse,
AsyncRulesWithStreamingResponse,
)
from ...types import (
SnippetGetResponse,
SnippetListResponse,
SnippetDeleteResponse,
SnippetUpdateResponse,
snippet_update_params,
)
from ...types import Snippet, SnippetListResponse, SnippetDeleteResponse, snippet_update_params
from .content import (
Content,
AsyncContent,
@ -80,7 +74,7 @@ class Snippets(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> SnippetUpdateResponse:
) -> Snippet:
"""
Put Snippet
@ -119,7 +113,7 @@ class Snippets(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[SnippetUpdateResponse], ResultWrapper[SnippetUpdateResponse]),
cast_to=cast(Type[Snippet], ResultWrapper[Snippet]),
)
def list(
@ -221,7 +215,7 @@ class Snippets(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> SnippetGetResponse:
) -> Snippet:
"""
Snippet
@ -251,7 +245,7 @@ class Snippets(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[SnippetGetResponse], ResultWrapper[SnippetGetResponse]),
cast_to=cast(Type[Snippet], ResultWrapper[Snippet]),
)
@ -285,7 +279,7 @@ class AsyncSnippets(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> SnippetUpdateResponse:
) -> Snippet:
"""
Put Snippet
@ -324,7 +318,7 @@ class AsyncSnippets(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[SnippetUpdateResponse], ResultWrapper[SnippetUpdateResponse]),
cast_to=cast(Type[Snippet], ResultWrapper[Snippet]),
)
async def list(
@ -426,7 +420,7 @@ class AsyncSnippets(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> SnippetGetResponse:
) -> Snippet:
"""
Snippet
@ -456,7 +450,7 @@ class AsyncSnippets(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[SnippetGetResponse], ResultWrapper[SnippetGetResponse]),
cast_to=cast(Type[Snippet], ResultWrapper[Snippet]),
)

10
src/cloudflare/resources/speed/availabilities.py
View file

@ -16,7 +16,7 @@ from ..._response import (
async_to_streamed_response_wrapper,
)
from ..._wrappers import ResultWrapper
from ...types.speed import AvailabilityListResponse
from ...types.speed import ObservatoryAvailabilities
from ..._base_client import (
make_request_options,
)
@ -43,7 +43,7 @@ class Availabilities(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> Optional[AvailabilityListResponse]:
) -> Optional[ObservatoryAvailabilities]:
"""
Retrieves quota for all plans, as well as the current zone quota.
@ -69,7 +69,7 @@ class Availabilities(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[Optional[AvailabilityListResponse]], ResultWrapper[AvailabilityListResponse]),
cast_to=cast(Type[Optional[ObservatoryAvailabilities]], ResultWrapper[ObservatoryAvailabilities]),
)
@ -92,7 +92,7 @@ class AsyncAvailabilities(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> Optional[AvailabilityListResponse]:
) -> Optional[ObservatoryAvailabilities]:
"""
Retrieves quota for all plans, as well as the current zone quota.
@ -118,7 +118,7 @@ class AsyncAvailabilities(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[Optional[AvailabilityListResponse]], ResultWrapper[AvailabilityListResponse]),
cast_to=cast(Type[Optional[ObservatoryAvailabilities]], ResultWrapper[ObservatoryAvailabilities]),
)

20
src/cloudflare/resources/speed/speed.py
View file

@ -24,9 +24,9 @@ from .tests import (
AsyncTestsWithStreamingResponse,
)
from ...types import (
ObservatoryTrend,
ObservatorySchedule,
SpeedDeleteResponse,
SpeedTrendsListResponse,
SpeedScheduleGetResponse,
speed_delete_params,
speed_trends_list_params,
speed_schedule_get_params,
@ -199,7 +199,7 @@ class Speed(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> Optional[SpeedScheduleGetResponse]:
) -> Optional[ObservatorySchedule]:
"""
Retrieves the test schedule for a page in a specific region.
@ -232,7 +232,7 @@ class Speed(SyncAPIResource):
query=maybe_transform({"region": region}, speed_schedule_get_params.SpeedScheduleGetParams),
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[Optional[SpeedScheduleGetResponse]], ResultWrapper[SpeedScheduleGetResponse]),
cast_to=cast(Type[Optional[ObservatorySchedule]], ResultWrapper[ObservatorySchedule]),
)
def trends_list(
@ -272,7 +272,7 @@ class Speed(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> Optional[SpeedTrendsListResponse]:
) -> Optional[ObservatoryTrend]:
"""
Lists the core web vital metrics trend over time for a specific page.
@ -319,7 +319,7 @@ class Speed(SyncAPIResource):
),
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[Optional[SpeedTrendsListResponse]], ResultWrapper[SpeedTrendsListResponse]),
cast_to=cast(Type[Optional[ObservatoryTrend]], ResultWrapper[ObservatoryTrend]),
)
@ -454,7 +454,7 @@ class AsyncSpeed(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> Optional[SpeedScheduleGetResponse]:
) -> Optional[ObservatorySchedule]:
"""
Retrieves the test schedule for a page in a specific region.
@ -487,7 +487,7 @@ class AsyncSpeed(AsyncAPIResource):
query=await async_maybe_transform({"region": region}, speed_schedule_get_params.SpeedScheduleGetParams),
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[Optional[SpeedScheduleGetResponse]], ResultWrapper[SpeedScheduleGetResponse]),
cast_to=cast(Type[Optional[ObservatorySchedule]], ResultWrapper[ObservatorySchedule]),
)
async def trends_list(
@ -527,7 +527,7 @@ class AsyncSpeed(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> Optional[SpeedTrendsListResponse]:
) -> Optional[ObservatoryTrend]:
"""
Lists the core web vital metrics trend over time for a specific page.
@ -574,7 +574,7 @@ class AsyncSpeed(AsyncAPIResource):
),
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[Optional[SpeedTrendsListResponse]], ResultWrapper[SpeedTrendsListResponse]),
cast_to=cast(Type[Optional[ObservatoryTrend]], ResultWrapper[ObservatoryTrend]),
)

19
src/cloudflare/resources/speed/tests.py
View file

@ -22,10 +22,9 @@ from ..._response import (
)
from ..._wrappers import ResultWrapper
from ...types.speed import (
TestGetResponse,
TestListResponse,
TestCreateResponse,
TestDeleteResponse,
ObservatoryPageTest,
test_list_params,
test_create_params,
test_delete_params,
@ -83,7 +82,7 @@ class Tests(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> Optional[TestCreateResponse]:
) -> Optional[ObservatoryPageTest]:
"""
Starts a test for a specific webpage, in a specific region.
@ -116,7 +115,7 @@ class Tests(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[Optional[TestCreateResponse]], ResultWrapper[TestCreateResponse]),
cast_to=cast(Type[Optional[ObservatoryPageTest]], ResultWrapper[ObservatoryPageTest]),
)
def list(
@ -283,7 +282,7 @@ class Tests(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> Optional[TestGetResponse]:
) -> Optional[ObservatoryPageTest]:
"""
Retrieves the result of a specific test.
@ -315,7 +314,7 @@ class Tests(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[Optional[TestGetResponse]], ResultWrapper[TestGetResponse]),
cast_to=cast(Type[Optional[ObservatoryPageTest]], ResultWrapper[ObservatoryPageTest]),
)
@ -363,7 +362,7 @@ class AsyncTests(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> Optional[TestCreateResponse]:
) -> Optional[ObservatoryPageTest]:
"""
Starts a test for a specific webpage, in a specific region.
@ -396,7 +395,7 @@ class AsyncTests(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[Optional[TestCreateResponse]], ResultWrapper[TestCreateResponse]),
cast_to=cast(Type[Optional[ObservatoryPageTest]], ResultWrapper[ObservatoryPageTest]),
)
async def list(
@ -563,7 +562,7 @@ class AsyncTests(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> Optional[TestGetResponse]:
) -> Optional[ObservatoryPageTest]:
"""
Retrieves the result of a specific test.
@ -595,7 +594,7 @@ class AsyncTests(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[Optional[TestGetResponse]], ResultWrapper[TestGetResponse]),
cast_to=cast(Type[Optional[ObservatoryPageTest]], ResultWrapper[ObservatoryPageTest]),
)

26
src/cloudflare/resources/ssl/universal/settings.py
View file

@ -23,7 +23,7 @@ from ...._wrappers import ResultWrapper
from ...._base_client import (
make_request_options,
)
from ....types.ssl.universal import SettingGetResponse, SettingEditResponse, setting_edit_params
from ....types.ssl.universal import TLSCertificatesAndHostnamesUniversal, setting_edit_params
__all__ = ["Settings", "AsyncSettings"]
@ -48,7 +48,7 @@ class Settings(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> SettingEditResponse:
) -> TLSCertificatesAndHostnamesUniversal:
"""
Patch Universal SSL Settings for a Zone.
@ -101,7 +101,9 @@ class Settings(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[SettingEditResponse], ResultWrapper[SettingEditResponse]),
cast_to=cast(
Type[TLSCertificatesAndHostnamesUniversal], ResultWrapper[TLSCertificatesAndHostnamesUniversal]
),
)
def get(
@ -114,7 +116,7 @@ class Settings(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> SettingGetResponse:
) -> TLSCertificatesAndHostnamesUniversal:
"""
Get Universal SSL Settings for a Zone.
@ -140,7 +142,9 @@ class Settings(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[SettingGetResponse], ResultWrapper[SettingGetResponse]),
cast_to=cast(
Type[TLSCertificatesAndHostnamesUniversal], ResultWrapper[TLSCertificatesAndHostnamesUniversal]
),
)
@ -164,7 +168,7 @@ class AsyncSettings(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> SettingEditResponse:
) -> TLSCertificatesAndHostnamesUniversal:
"""
Patch Universal SSL Settings for a Zone.
@ -217,7 +221,9 @@ class AsyncSettings(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[SettingEditResponse], ResultWrapper[SettingEditResponse]),
cast_to=cast(
Type[TLSCertificatesAndHostnamesUniversal], ResultWrapper[TLSCertificatesAndHostnamesUniversal]
),
)
async def get(
@ -230,7 +236,7 @@ class AsyncSettings(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> SettingGetResponse:
) -> TLSCertificatesAndHostnamesUniversal:
"""
Get Universal SSL Settings for a Zone.
@ -256,7 +262,9 @@ class AsyncSettings(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[SettingGetResponse], ResultWrapper[SettingGetResponse]),
cast_to=cast(
Type[TLSCertificatesAndHostnamesUniversal], ResultWrapper[TLSCertificatesAndHostnamesUniversal]
),
)

20
src/cloudflare/resources/storage/analytics.py
View file

@ -24,8 +24,8 @@ from ..._base_client import (
make_request_options,
)
from ...types.storage import (
AnalyticsListResponse,
AnalyticsStoredResponse,
WorkersKVSchemasResult,
WorkersKVComponentsSchemasResult,
analytics_list_params,
analytics_stored_params,
)
@ -53,7 +53,7 @@ class Analytics(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> AnalyticsListResponse:
) -> WorkersKVSchemasResult:
"""
Retrieves Workers KV request metrics for the given account.
@ -82,7 +82,7 @@ class Analytics(SyncAPIResource):
query=maybe_transform({"query": query}, analytics_list_params.AnalyticsListParams),
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[AnalyticsListResponse], ResultWrapper[AnalyticsListResponse]),
cast_to=cast(Type[WorkersKVSchemasResult], ResultWrapper[WorkersKVSchemasResult]),
)
def stored(
@ -96,7 +96,7 @@ class Analytics(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> AnalyticsStoredResponse:
) -> WorkersKVComponentsSchemasResult:
"""
Retrieves Workers KV stored data metrics for the given account.
@ -125,7 +125,7 @@ class Analytics(SyncAPIResource):
query=maybe_transform({"query": query}, analytics_stored_params.AnalyticsStoredParams),
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[AnalyticsStoredResponse], ResultWrapper[AnalyticsStoredResponse]),
cast_to=cast(Type[WorkersKVComponentsSchemasResult], ResultWrapper[WorkersKVComponentsSchemasResult]),
)
@ -149,7 +149,7 @@ class AsyncAnalytics(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> AnalyticsListResponse:
) -> WorkersKVSchemasResult:
"""
Retrieves Workers KV request metrics for the given account.
@ -178,7 +178,7 @@ class AsyncAnalytics(AsyncAPIResource):
query=await async_maybe_transform({"query": query}, analytics_list_params.AnalyticsListParams),
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[AnalyticsListResponse], ResultWrapper[AnalyticsListResponse]),
cast_to=cast(Type[WorkersKVSchemasResult], ResultWrapper[WorkersKVSchemasResult]),
)
async def stored(
@ -192,7 +192,7 @@ class AsyncAnalytics(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> AnalyticsStoredResponse:
) -> WorkersKVComponentsSchemasResult:
"""
Retrieves Workers KV stored data metrics for the given account.
@ -221,7 +221,7 @@ class AsyncAnalytics(AsyncAPIResource):
query=await async_maybe_transform({"query": query}, analytics_stored_params.AnalyticsStoredParams),
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[AnalyticsStoredResponse], ResultWrapper[AnalyticsStoredResponse]),
cast_to=cast(Type[WorkersKVComponentsSchemasResult], ResultWrapper[WorkersKVComponentsSchemasResult]),
)

19
src/cloudflare/resources/stream/audio_tracks.py
View file

@ -25,8 +25,7 @@ from ..._base_client import (
)
from ...types.stream import (
AudioTrackGetResponse,
AudioTrackCopyResponse,
AudioTrackEditResponse,
StreamAdditionalAudio,
AudioTrackDeleteResponse,
audio_track_copy_params,
audio_track_edit_params,
@ -113,7 +112,7 @@ class AudioTracks(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> AudioTrackCopyResponse:
) -> StreamAdditionalAudio:
"""
Adds an additional audio track to a video using the provided audio track URL.
@ -157,7 +156,7 @@ class AudioTracks(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[AudioTrackCopyResponse], ResultWrapper[AudioTrackCopyResponse]),
cast_to=cast(Type[StreamAdditionalAudio], ResultWrapper[StreamAdditionalAudio]),
)
def edit(
@ -174,7 +173,7 @@ class AudioTracks(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> AudioTrackEditResponse:
) -> StreamAdditionalAudio:
"""Edits additional audio tracks on a video.
Editing the default status of an audio
@ -223,7 +222,7 @@ class AudioTracks(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[AudioTrackEditResponse], ResultWrapper[AudioTrackEditResponse]),
cast_to=cast(Type[StreamAdditionalAudio], ResultWrapper[StreamAdditionalAudio]),
)
def get(
@ -351,7 +350,7 @@ class AsyncAudioTracks(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> AudioTrackCopyResponse:
) -> StreamAdditionalAudio:
"""
Adds an additional audio track to a video using the provided audio track URL.
@ -395,7 +394,7 @@ class AsyncAudioTracks(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[AudioTrackCopyResponse], ResultWrapper[AudioTrackCopyResponse]),
cast_to=cast(Type[StreamAdditionalAudio], ResultWrapper[StreamAdditionalAudio]),
)
async def edit(
@ -412,7 +411,7 @@ class AsyncAudioTracks(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> AudioTrackEditResponse:
) -> StreamAdditionalAudio:
"""Edits additional audio tracks on a video.
Editing the default status of an audio
@ -461,7 +460,7 @@ class AsyncAudioTracks(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[AudioTrackEditResponse], ResultWrapper[AudioTrackEditResponse]),
cast_to=cast(Type[StreamAdditionalAudio], ResultWrapper[StreamAdditionalAudio]),
)
async def get(

10
src/cloudflare/resources/stream/clips.py
View file

@ -23,7 +23,7 @@ from ..._wrappers import ResultWrapper
from ..._base_client import (
make_request_options,
)
from ...types.stream import ClipCreateResponse, clip_create_params
from ...types.stream import StreamClipping, clip_create_params
__all__ = ["Clips", "AsyncClips"]
@ -56,7 +56,7 @@ class Clips(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> ClipCreateResponse:
) -> StreamClipping:
"""
Clips a video based on the specified start and end times provided in seconds.
@ -121,7 +121,7 @@ class Clips(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[ClipCreateResponse], ResultWrapper[ClipCreateResponse]),
cast_to=cast(Type[StreamClipping], ResultWrapper[StreamClipping]),
)
@ -153,7 +153,7 @@ class AsyncClips(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> ClipCreateResponse:
) -> StreamClipping:
"""
Clips a video based on the specified start and end times provided in seconds.
@ -218,7 +218,7 @@ class AsyncClips(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[ClipCreateResponse], ResultWrapper[ClipCreateResponse]),
cast_to=cast(Type[StreamClipping], ResultWrapper[StreamClipping]),
)

11
src/cloudflare/resources/stream/copies.py
View file

@ -7,6 +7,7 @@ from datetime import datetime
import httpx
from ...types import StreamVideos
from ..._types import NOT_GIVEN, Body, Query, Headers, NotGiven
from ..._utils import (
maybe_transform,
@ -24,7 +25,7 @@ from ..._wrappers import ResultWrapper
from ..._base_client import (
make_request_options,
)
from ...types.stream import CopyCreateResponse, copy_create_params
from ...types.stream import copy_create_params
__all__ = ["Copies", "AsyncCopies"]
@ -56,7 +57,7 @@ class Copies(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> CopyCreateResponse:
) -> StreamVideos:
"""
Uploads a video to Stream from a provided URL.
@ -120,7 +121,7 @@ class Copies(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[CopyCreateResponse], ResultWrapper[CopyCreateResponse]),
cast_to=cast(Type[StreamVideos], ResultWrapper[StreamVideos]),
)
@ -151,7 +152,7 @@ class AsyncCopies(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> CopyCreateResponse:
) -> StreamVideos:
"""
Uploads a video to Stream from a provided URL.
@ -215,7 +216,7 @@ class AsyncCopies(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[CopyCreateResponse], ResultWrapper[CopyCreateResponse]),
cast_to=cast(Type[StreamVideos], ResultWrapper[StreamVideos]),
)

10
src/cloudflare/resources/stream/keys.py
View file

@ -19,7 +19,7 @@ from ..._wrappers import ResultWrapper
from ..._base_client import (
make_request_options,
)
from ...types.stream import KeyGetResponse, KeyCreateResponse, KeyDeleteResponse
from ...types.stream import StreamKeys, KeyGetResponse, KeyDeleteResponse
__all__ = ["Keys", "AsyncKeys"]
@ -43,7 +43,7 @@ class Keys(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> KeyCreateResponse:
) -> StreamKeys:
"""Creates an RSA private key in PEM and JWK formats.
Key files are only displayed
@ -72,7 +72,7 @@ class Keys(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[KeyCreateResponse], ResultWrapper[KeyCreateResponse]),
cast_to=cast(Type[StreamKeys], ResultWrapper[StreamKeys]),
)
def delete(
@ -183,7 +183,7 @@ class AsyncKeys(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> KeyCreateResponse:
) -> StreamKeys:
"""Creates an RSA private key in PEM and JWK formats.
Key files are only displayed
@ -212,7 +212,7 @@ class AsyncKeys(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[KeyCreateResponse], ResultWrapper[KeyCreateResponse]),
cast_to=cast(Type[StreamKeys], ResultWrapper[StreamKeys]),
)
async def delete(

28
src/cloudflare/resources/stream/live_inputs/live_inputs.py
View file

@ -32,10 +32,8 @@ from ...._base_client import (
make_request_options,
)
from ....types.stream import (
LiveInputGetResponse,
StreamLiveInput,
LiveInputListResponse,
LiveInputCreateResponse,
LiveInputUpdateResponse,
live_input_list_params,
live_input_create_params,
live_input_update_params,
@ -71,7 +69,7 @@ class LiveInputs(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> LiveInputCreateResponse:
) -> StreamLiveInput:
"""
Creates a live input, and returns credentials that you or your users can use to
stream live video to Cloudflare Stream.
@ -122,7 +120,7 @@ class LiveInputs(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[LiveInputCreateResponse], ResultWrapper[LiveInputCreateResponse]),
cast_to=cast(Type[StreamLiveInput], ResultWrapper[StreamLiveInput]),
)
def update(
@ -140,7 +138,7 @@ class LiveInputs(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> LiveInputUpdateResponse:
) -> StreamLiveInput:
"""
Updates a specified live input.
@ -196,7 +194,7 @@ class LiveInputs(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[LiveInputUpdateResponse], ResultWrapper[LiveInputUpdateResponse]),
cast_to=cast(Type[StreamLiveInput], ResultWrapper[StreamLiveInput]),
)
def list(
@ -300,7 +298,7 @@ class LiveInputs(SyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> LiveInputGetResponse:
) -> StreamLiveInput:
"""
Retrieves details of an existing live input.
@ -332,7 +330,7 @@ class LiveInputs(SyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[LiveInputGetResponse], ResultWrapper[LiveInputGetResponse]),
cast_to=cast(Type[StreamLiveInput], ResultWrapper[StreamLiveInput]),
)
@ -363,7 +361,7 @@ class AsyncLiveInputs(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> LiveInputCreateResponse:
) -> StreamLiveInput:
"""
Creates a live input, and returns credentials that you or your users can use to
stream live video to Cloudflare Stream.
@ -414,7 +412,7 @@ class AsyncLiveInputs(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[LiveInputCreateResponse], ResultWrapper[LiveInputCreateResponse]),
cast_to=cast(Type[StreamLiveInput], ResultWrapper[StreamLiveInput]),
)
async def update(
@ -432,7 +430,7 @@ class AsyncLiveInputs(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> LiveInputUpdateResponse:
) -> StreamLiveInput:
"""
Updates a specified live input.
@ -488,7 +486,7 @@ class AsyncLiveInputs(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[LiveInputUpdateResponse], ResultWrapper[LiveInputUpdateResponse]),
cast_to=cast(Type[StreamLiveInput], ResultWrapper[StreamLiveInput]),
)
async def list(
@ -594,7 +592,7 @@ class AsyncLiveInputs(AsyncAPIResource):
extra_query: Query | None = None,
extra_body: Body | None = None,
timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
) -> LiveInputGetResponse:
) -> StreamLiveInput:
"""
Retrieves details of an existing live input.
@ -626,7 +624,7 @@ class AsyncLiveInputs(AsyncAPIResource):
timeout=timeout,
post_parser=ResultWrapper._unwrapper,
),
cast_to=cast(Type[LiveInputGetResponse], ResultWrapper[LiveInputGetResponse]),
cast_to=cast(Type[StreamLiveInput], ResultWrapper[StreamLiveInput]),
)

Some files were not shown because too many files have changed in this diff Show more