diff --git a/api.md b/api.md index 3bbdf78e9a6..b9401c406b9 100644 --- a/api.md +++ b/api.md @@ -3759,11 +3759,7 @@ Methods: Types: ```python -from cloudflare.types import ( - HealthCheck, - HealthCheckType, - UnnamedSchemaRefEebdc868ce7f7ae92e23438caa84e7b5, -) +from cloudflare.types import HealthCheck, HealthCheckRate, HealthCheckType ``` ## CfInterconnects @@ -3967,10 +3963,7 @@ Methods: Types: ```python -from cloudflare.types.magic_network_monitoring import ( - Configuration, - UnnamedSchemaRef621ca3f6ea9a96427c902b0d14279ff8, -) +from cloudflare.types.magic_network_monitoring import Configuration ``` Methods: @@ -3992,10 +3985,7 @@ Methods: Types: ```python -from cloudflare.types.magic_network_monitoring import ( - MagicNetworkMonitoringRule, - UnnamedSchemaRef99ba74ba6027c3c87ca03d4e81cfc16d, -) +from cloudflare.types.magic_network_monitoring import MagicNetworkMonitoringRule ``` Methods: @@ -4198,13 +4188,7 @@ Methods: Types: ```python -from cloudflare.types.rules import ( - Hostname, - List, - Redirect, - UnnamedSchemaRefE706d5e8367564544e2991af82ebb07a, - ListDeleteResponse, -) +from cloudflare.types.rules import Hostname, List, Redirect, ListDeleteResponse ``` Methods: @@ -4220,10 +4204,7 @@ Methods: Types: ```python -from cloudflare.types.rules.lists import ( - UnnamedSchemaRefCc279fb99baf6a166db5c4e790a8c6cd, - BulkOperationGetResponse, -) +from cloudflare.types.rules.lists import OperationStatus, BulkOperationGetResponse ``` Methods: @@ -4236,8 +4217,8 @@ Types: ```python from cloudflare.types.rules.lists import ( - UnnamedSchemaRef34bb6e31800bc0207c083affa12d2775, - UnnamedSchemaRef46621d4d5b6644caae5c9167b8e28865, + ListCursor, + ListItem, ItemCreateResponse, ItemUpdateResponse, ItemListResponse, @@ -4261,11 +4242,7 @@ Methods: Types: ```python -from cloudflare.types.storage import ( - Components, - Schema, - UnnamedSchemaRef608bee5065f7314d6fa572b89a1910f7, -) +from cloudflare.types.storage import Components, Schema ``` Methods: @@ -4490,7 +4467,7 @@ Methods: Types: ```python -from cloudflare.types import UnnamedSchemaRefD6e23adacaca017802aaa484a8b3f405 +from cloudflare.types import Alert ``` ## AvailableAlerts @@ -4753,9 +4730,9 @@ Types: ```python from cloudflare.types.zero_trust.devices import ( + DEXTest, SchemaData, SchemaHTTP, - UnnamedSchemaRef15fd6ef0641450fd873ffb71715170c9, DEXTestDeleteResponse, ) ``` @@ -4773,11 +4750,7 @@ Methods: Types: ```python -from cloudflare.types.zero_trust.devices import ( - DeviceNetwork, - UnnamedSchemaRefD2b048663faf5e0cd5c90501b71171de, - NetworkDeleteResponse, -) +from cloudflare.types.zero_trust.devices import DeviceNetwork, NetworkDeleteResponse ``` Methods: @@ -4793,11 +4766,7 @@ Methods: Types: ```python -from cloudflare.types.zero_trust.devices import ( - SettingsPolicy, - UnnamedSchemaRefF636ff9f2cb41ff4b715cf8ed8515581, - PolicyDeleteResponse, -) +from cloudflare.types.zero_trust.devices import SettingsPolicy, PolicyDeleteResponse ``` Methods: @@ -4827,7 +4796,6 @@ Types: ```python from cloudflare.types.zero_trust.devices.policies import ( SplitTunnelExclude, - UnnamedSchemaRef0462afe1a32ee90b1999d4277af59fa8, ExcludeUpdateResponse, ExcludeGetResponse, ) @@ -4846,7 +4814,7 @@ Types: ```python from cloudflare.types.zero_trust.devices.policies import ( FallbackDomain, - UnnamedSchemaRef1fbf91ecd61792c751fead58dc8005e6, + FallbackDomainPolicy, FallbackDomainUpdateResponse, FallbackDomainGetResponse, ) @@ -4865,7 +4833,6 @@ Types: ```python from cloudflare.types.zero_trust.devices.policies import ( SplitTunnelInclude, - UnnamedSchemaRef5e0c6134a624678286f4a424b001870a, IncludeUpdateResponse, IncludeGetResponse, ) @@ -4886,9 +4853,6 @@ from cloudflare.types.zero_trust.devices import ( DeviceInput, DeviceMatch, DevicePostureRule, - UnnamedSchemaRef34ef0ad73a63c3f76ed170adca181930, - UnnamedSchemaRef41885dd46b9e0294254c49305a273681, - UnnamedSchemaRef9e35ef84511131488ae286ce78ac4b27, PostureDeleteResponse, ) ``` @@ -4906,11 +4870,7 @@ Methods: Types: ```python -from cloudflare.types.zero_trust.devices.posture import ( - Integration, - UnnamedSchemaRefB84b377dfc9454d455b646d4bc9ab507, - IntegrationDeleteResponse, -) +from cloudflare.types.zero_trust.devices.posture import Integration, IntegrationDeleteResponse ``` Methods: @@ -5043,6 +5003,9 @@ from cloudflare.types.zero_trust.access import ( Application, CorsHeaders, CustomPagesh, + SaasAppNameFormat, + SaasAppNameIDFormat, + SaasAppSource, SAMLSaasApp, SelfHostedDomainsh, ApplicationDeleteResponse, diff --git a/src/cloudflare/_utils/_proxy.py b/src/cloudflare/_utils/_proxy.py index b9c12dc3f49..c46a62a6982 100644 --- a/src/cloudflare/_utils/_proxy.py +++ b/src/cloudflare/_utils/_proxy.py @@ -10,7 +10,7 @@ class LazyProxy(Generic[T], ABC): """Implements data methods to pretend that an instance is another instance. - This includes forwarding attribute access and othe methods. + This includes forwarding attribute access and other methods. """ # Note: we have to special case proxies that themselves return proxies diff --git a/src/cloudflare/types/__init__.py b/src/cloudflare/types/__init__.py index a408356540a..44cd1d31a3d 100644 --- a/src/cloudflare/types/__init__.py +++ b/src/cloudflare/types/__init__.py @@ -92,6 +92,7 @@ from .additional_routes import AdditionalRoutes as AdditionalRoutes from .cookie_attributes import CookieAttributes as CookieAttributes from .custom_nameserver import CustomNameserver as CustomNameserver +from .health_check_rate import HealthCheckRate as HealthCheckRate from .health_check_type import HealthCheckType as HealthCheckType from .lighthouse_report import LighthouseReport as LighthouseReport from .location_strategy import LocationStrategy as LocationStrategy @@ -356,6 +357,3 @@ from .unnamed_schema_ref_c5858f1f916a921846e0b6159af470a7 import ( UnnamedSchemaRefC5858f1f916a921846e0b6159af470a7 as UnnamedSchemaRefC5858f1f916a921846e0b6159af470a7, ) -from .unnamed_schema_ref_eebdc868ce7f7ae92e23438caa84e7b5 import ( - UnnamedSchemaRefEebdc868ce7f7ae92e23438caa84e7b5 as UnnamedSchemaRefEebdc868ce7f7ae92e23438caa84e7b5, -) diff --git a/src/cloudflare/types/health_check.py b/src/cloudflare/types/health_check.py index 666eb00f5ec..24c6463d9c4 100644 --- a/src/cloudflare/types/health_check.py +++ b/src/cloudflare/types/health_check.py @@ -4,8 +4,8 @@ from typing_extensions import Literal from .._models import BaseModel +from .health_check_rate import HealthCheckRate from .health_check_type import HealthCheckType -from .unnamed_schema_ref_eebdc868ce7f7ae92e23438caa84e7b5 import UnnamedSchemaRefEebdc868ce7f7ae92e23438caa84e7b5 __all__ = ["HealthCheck"] @@ -24,7 +24,7 @@ class HealthCheck(BaseModel): enabled: Optional[bool] = None """Determines whether to run healthchecks for a tunnel.""" - rate: Optional[UnnamedSchemaRefEebdc868ce7f7ae92e23438caa84e7b5] = None + rate: Optional[HealthCheckRate] = None """How frequent the health check is run. The default value is `mid`.""" target: Optional[str] = None diff --git a/src/cloudflare/types/health_check_param.py b/src/cloudflare/types/health_check_param.py index 5332dc86034..10d28c17f4a 100644 --- a/src/cloudflare/types/health_check_param.py +++ b/src/cloudflare/types/health_check_param.py @@ -4,8 +4,8 @@ from typing_extensions import Literal, TypedDict +from .health_check_rate import HealthCheckRate from .health_check_type import HealthCheckType -from .unnamed_schema_ref_eebdc868ce7f7ae92e23438caa84e7b5 import UnnamedSchemaRefEebdc868ce7f7ae92e23438caa84e7b5 __all__ = ["HealthCheckParam"] @@ -24,7 +24,7 @@ class HealthCheckParam(TypedDict, total=False): enabled: bool """Determines whether to run healthchecks for a tunnel.""" - rate: UnnamedSchemaRefEebdc868ce7f7ae92e23438caa84e7b5 + rate: HealthCheckRate """How frequent the health check is run. The default value is `mid`.""" target: str diff --git a/src/cloudflare/types/health_check_rate.py b/src/cloudflare/types/health_check_rate.py new file mode 100644 index 00000000000..f0c649d64d7 --- /dev/null +++ b/src/cloudflare/types/health_check_rate.py @@ -0,0 +1,7 @@ +# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. + +from typing_extensions import Literal + +__all__ = ["HealthCheckRate"] + +HealthCheckRate = Literal["low", "mid", "high"] diff --git a/src/cloudflare/types/magic_transit/cf_interconnect_list_response.py b/src/cloudflare/types/magic_transit/cf_interconnect_list_response.py index d6bd91ccca2..21773a2a216 100644 --- a/src/cloudflare/types/magic_transit/cf_interconnect_list_response.py +++ b/src/cloudflare/types/magic_transit/cf_interconnect_list_response.py @@ -4,8 +4,8 @@ from datetime import datetime from ..._models import BaseModel +from ..health_check_rate import HealthCheckRate from ..health_check_type import HealthCheckType -from ..unnamed_schema_ref_eebdc868ce7f7ae92e23438caa84e7b5 import UnnamedSchemaRefEebdc868ce7f7ae92e23438caa84e7b5 __all__ = ["CfInterconnectListResponse", "Interconnect", "InterconnectGRE", "InterconnectHealthCheck"] @@ -22,7 +22,7 @@ class InterconnectHealthCheck(BaseModel): enabled: Optional[bool] = None """Determines whether to run healthchecks for a tunnel.""" - rate: Optional[UnnamedSchemaRefEebdc868ce7f7ae92e23438caa84e7b5] = None + rate: Optional[HealthCheckRate] = None """How frequent the health check is run. The default value is `mid`.""" target: Optional[str] = None diff --git a/src/cloudflare/types/magic_transit/cf_interconnect_update_params.py b/src/cloudflare/types/magic_transit/cf_interconnect_update_params.py index 0d89fdcaf10..4a7c939b72e 100644 --- a/src/cloudflare/types/magic_transit/cf_interconnect_update_params.py +++ b/src/cloudflare/types/magic_transit/cf_interconnect_update_params.py @@ -4,8 +4,8 @@ from typing_extensions import Required, TypedDict +from ..health_check_rate import HealthCheckRate from ..health_check_type import HealthCheckType -from ..unnamed_schema_ref_eebdc868ce7f7ae92e23438caa84e7b5 import UnnamedSchemaRefEebdc868ce7f7ae92e23438caa84e7b5 __all__ = ["CfInterconnectUpdateParams", "GRE", "HealthCheck"] @@ -48,7 +48,7 @@ class HealthCheck(TypedDict, total=False): enabled: bool """Determines whether to run healthchecks for a tunnel.""" - rate: UnnamedSchemaRefEebdc868ce7f7ae92e23438caa84e7b5 + rate: HealthCheckRate """How frequent the health check is run. The default value is `mid`.""" target: str diff --git a/src/cloudflare/types/magic_transit/ipsec_tunnel_create_response.py b/src/cloudflare/types/magic_transit/ipsec_tunnel_create_response.py index b1d6d3f1e52..0b9e0b69a2b 100644 --- a/src/cloudflare/types/magic_transit/ipsec_tunnel_create_response.py +++ b/src/cloudflare/types/magic_transit/ipsec_tunnel_create_response.py @@ -5,8 +5,8 @@ from ..._models import BaseModel from .psk_metadata import PSKMetadata +from ..health_check_rate import HealthCheckRate from ..health_check_type import HealthCheckType -from ..unnamed_schema_ref_eebdc868ce7f7ae92e23438caa84e7b5 import UnnamedSchemaRefEebdc868ce7f7ae92e23438caa84e7b5 __all__ = ["IPSECTunnelCreateResponse", "IPSECTunnel", "IPSECTunnelTunnelHealthCheck"] @@ -15,7 +15,7 @@ class IPSECTunnelTunnelHealthCheck(BaseModel): enabled: Optional[bool] = None """Determines whether to run healthchecks for a tunnel.""" - rate: Optional[UnnamedSchemaRefEebdc868ce7f7ae92e23438caa84e7b5] = None + rate: Optional[HealthCheckRate] = None """How frequent the health check is run. The default value is `mid`.""" target: Optional[str] = None diff --git a/src/cloudflare/types/magic_transit/ipsec_tunnel_list_response.py b/src/cloudflare/types/magic_transit/ipsec_tunnel_list_response.py index 3d5dafc572a..9b45fd11650 100644 --- a/src/cloudflare/types/magic_transit/ipsec_tunnel_list_response.py +++ b/src/cloudflare/types/magic_transit/ipsec_tunnel_list_response.py @@ -5,8 +5,8 @@ from ..._models import BaseModel from .psk_metadata import PSKMetadata +from ..health_check_rate import HealthCheckRate from ..health_check_type import HealthCheckType -from ..unnamed_schema_ref_eebdc868ce7f7ae92e23438caa84e7b5 import UnnamedSchemaRefEebdc868ce7f7ae92e23438caa84e7b5 __all__ = ["IPSECTunnelListResponse", "IPSECTunnel", "IPSECTunnelTunnelHealthCheck"] @@ -15,7 +15,7 @@ class IPSECTunnelTunnelHealthCheck(BaseModel): enabled: Optional[bool] = None """Determines whether to run healthchecks for a tunnel.""" - rate: Optional[UnnamedSchemaRefEebdc868ce7f7ae92e23438caa84e7b5] = None + rate: Optional[HealthCheckRate] = None """How frequent the health check is run. The default value is `mid`.""" target: Optional[str] = None diff --git a/src/cloudflare/types/rules/lists/__init__.py b/src/cloudflare/types/rules/lists/__init__.py index df814037d10..0124438ea28 100644 --- a/src/cloudflare/types/rules/lists/__init__.py +++ b/src/cloudflare/types/rules/lists/__init__.py @@ -2,7 +2,9 @@ from __future__ import annotations +from .list_cursor import ListCursor as ListCursor from .item_list_params import ItemListParams as ItemListParams +from .operation_status import OperationStatus as OperationStatus from .item_get_response import ItemGetResponse as ItemGetResponse from .item_create_params import ItemCreateParams as ItemCreateParams from .item_delete_params import ItemDeleteParams as ItemDeleteParams @@ -11,9 +13,3 @@ from .item_delete_response import ItemDeleteResponse as ItemDeleteResponse from .item_update_response import ItemUpdateResponse as ItemUpdateResponse from .bulk_operation_get_response import BulkOperationGetResponse as BulkOperationGetResponse -from .unnamed_schema_ref_34bb6e31800bc0207c083affa12d2775 import ( - UnnamedSchemaRef34bb6e31800bc0207c083affa12d2775 as UnnamedSchemaRef34bb6e31800bc0207c083affa12d2775, -) -from .unnamed_schema_ref_cc279fb99baf6a166db5c4e790a8c6cd import ( - UnnamedSchemaRefCc279fb99baf6a166db5c4e790a8c6cd as UnnamedSchemaRefCc279fb99baf6a166db5c4e790a8c6cd, -) diff --git a/src/cloudflare/types/rules/lists/unnamed_schema_ref_34bb6e31800bc0207c083affa12d2775.py b/src/cloudflare/types/rules/lists/list_cursor.py similarity index 62% rename from src/cloudflare/types/rules/lists/unnamed_schema_ref_34bb6e31800bc0207c083affa12d2775.py rename to src/cloudflare/types/rules/lists/list_cursor.py index 82ebab693bf..2757b8af132 100644 --- a/src/cloudflare/types/rules/lists/unnamed_schema_ref_34bb6e31800bc0207c083affa12d2775.py +++ b/src/cloudflare/types/rules/lists/list_cursor.py @@ -4,10 +4,10 @@ from ...._models import BaseModel -__all__ = ["UnnamedSchemaRef34bb6e31800bc0207c083affa12d2775"] +__all__ = ["ListCursor"] -class UnnamedSchemaRef34bb6e31800bc0207c083affa12d2775(BaseModel): +class ListCursor(BaseModel): after: Optional[str] = None before: Optional[str] = None diff --git a/src/cloudflare/types/rules/lists/operation_status.py b/src/cloudflare/types/rules/lists/operation_status.py new file mode 100644 index 00000000000..bf394155fed --- /dev/null +++ b/src/cloudflare/types/rules/lists/operation_status.py @@ -0,0 +1,7 @@ +# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. + +from typing_extensions import Literal + +__all__ = ["OperationStatus"] + +OperationStatus = Literal["pending", "running", "completed", "failed"] diff --git a/src/cloudflare/types/rules/lists/unnamed_schema_ref_cc279fb99baf6a166db5c4e790a8c6cd.py b/src/cloudflare/types/rules/lists/unnamed_schema_ref_cc279fb99baf6a166db5c4e790a8c6cd.py deleted file mode 100644 index 633d9fc9b6d..00000000000 --- a/src/cloudflare/types/rules/lists/unnamed_schema_ref_cc279fb99baf6a166db5c4e790a8c6cd.py +++ /dev/null @@ -1,7 +0,0 @@ -# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. - -from typing_extensions import Literal - -__all__ = ["UnnamedSchemaRefCc279fb99baf6a166db5c4e790a8c6cd"] - -UnnamedSchemaRefCc279fb99baf6a166db5c4e790a8c6cd = Literal["pending", "running", "completed", "failed"] diff --git a/src/cloudflare/types/storage/__init__.py b/src/cloudflare/types/storage/__init__.py index b650d0931cd..003dd49ba66 100644 --- a/src/cloudflare/types/storage/__init__.py +++ b/src/cloudflare/types/storage/__init__.py @@ -6,6 +6,3 @@ from .components import Components as Components from .analytics_list_params import AnalyticsListParams as AnalyticsListParams from .analytics_stored_params import AnalyticsStoredParams as AnalyticsStoredParams -from .unnamed_schema_ref_608bee5065f7314d6fa572b89a1910f7 import ( - UnnamedSchemaRef608bee5065f7314d6fa572b89a1910f7 as UnnamedSchemaRef608bee5065f7314d6fa572b89a1910f7, -) diff --git a/src/cloudflare/types/storage/components.py b/src/cloudflare/types/storage/components.py index 0f3b0d26ed5..301f41ede27 100644 --- a/src/cloudflare/types/storage/components.py +++ b/src/cloudflare/types/storage/components.py @@ -4,9 +4,13 @@ from datetime import datetime from ..._models import BaseModel -from .unnamed_schema_ref_608bee5065f7314d6fa572b89a1910f7 import UnnamedSchemaRef608bee5065f7314d6fa572b89a1910f7 -__all__ = ["Components", "Query"] +__all__ = ["Components", "Data", "Query"] + + +class Data(BaseModel): + metrics: List[object] + """List of metrics returned by the query.""" class Query(BaseModel): @@ -53,7 +57,7 @@ class Query(BaseModel): class Components(BaseModel): - data: Optional[List[UnnamedSchemaRef608bee5065f7314d6fa572b89a1910f7]] = None + data: Optional[List[Data]] = None data_lag: float """Number of seconds between current time and last processed event, i.e. diff --git a/src/cloudflare/types/storage/schema.py b/src/cloudflare/types/storage/schema.py index 130988ee763..2e1c5743d29 100644 --- a/src/cloudflare/types/storage/schema.py +++ b/src/cloudflare/types/storage/schema.py @@ -4,9 +4,13 @@ from datetime import datetime from ..._models import BaseModel -from .unnamed_schema_ref_608bee5065f7314d6fa572b89a1910f7 import UnnamedSchemaRef608bee5065f7314d6fa572b89a1910f7 -__all__ = ["Schema", "Query"] +__all__ = ["Schema", "Data", "Query"] + + +class Data(BaseModel): + metrics: List[object] + """List of metrics returned by the query.""" class Query(BaseModel): @@ -53,7 +57,7 @@ class Query(BaseModel): class Schema(BaseModel): - data: Optional[List[UnnamedSchemaRef608bee5065f7314d6fa572b89a1910f7]] = None + data: Optional[List[Data]] = None data_lag: float """Number of seconds between current time and last processed event, i.e. diff --git a/src/cloudflare/types/storage/unnamed_schema_ref_608bee5065f7314d6fa572b89a1910f7.py b/src/cloudflare/types/storage/unnamed_schema_ref_608bee5065f7314d6fa572b89a1910f7.py deleted file mode 100644 index 154d97ce54a..00000000000 --- a/src/cloudflare/types/storage/unnamed_schema_ref_608bee5065f7314d6fa572b89a1910f7.py +++ /dev/null @@ -1,12 +0,0 @@ -# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. - -from typing import List - -from ..._models import BaseModel - -__all__ = ["UnnamedSchemaRef608bee5065f7314d6fa572b89a1910f7"] - - -class UnnamedSchemaRef608bee5065f7314d6fa572b89a1910f7(BaseModel): - metrics: List[object] - """List of metrics returned by the query.""" diff --git a/src/cloudflare/types/unnamed_schema_ref_eebdc868ce7f7ae92e23438caa84e7b5.py b/src/cloudflare/types/unnamed_schema_ref_eebdc868ce7f7ae92e23438caa84e7b5.py deleted file mode 100644 index 8afccbc66f0..00000000000 --- a/src/cloudflare/types/unnamed_schema_ref_eebdc868ce7f7ae92e23438caa84e7b5.py +++ /dev/null @@ -1,7 +0,0 @@ -# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. - -from typing_extensions import Literal - -__all__ = ["UnnamedSchemaRefEebdc868ce7f7ae92e23438caa84e7b5"] - -UnnamedSchemaRefEebdc868ce7f7ae92e23438caa84e7b5 = Literal["low", "mid", "high"] diff --git a/src/cloudflare/types/zero_trust/access/__init__.py b/src/cloudflare/types/zero_trust/access/__init__.py index 399271bed1b..d930f650c7e 100644 --- a/src/cloudflare/types/zero_trust/access/__init__.py +++ b/src/cloudflare/types/zero_trust/access/__init__.py @@ -14,6 +14,7 @@ from .custom_pagesh import CustomPagesh as CustomPagesh from .saml_saas_app import SAMLSaasApp as SAMLSaasApp from .service_token import ServiceToken as ServiceToken +from .saas_app_source import SaasAppSource as SaasAppSource from .allowed_headersh import AllowedHeadersh as AllowedHeadersh from .allowed_methodsh import AllowedMethodsh as AllowedMethodsh from .allowed_originsh import AllowedOriginsh as AllowedOriginsh @@ -30,11 +31,14 @@ from .saml_saas_app_param import SAMLSaasAppParam as SAMLSaasAppParam from .tag_delete_response import TagDeleteResponse as TagDeleteResponse from .associated_hostnames import AssociatedHostnames as AssociatedHostnames +from .saas_app_name_format import SaasAppNameFormat as SaasAppNameFormat from .self_hosted_domainsh import SelfHostedDomainsh as SelfHostedDomainsh from .group_delete_response import GroupDeleteResponse as GroupDeleteResponse +from .saas_app_source_param import SaasAppSourceParam as SaasAppSourceParam from .bookmark_create_params import BookmarkCreateParams as BookmarkCreateParams from .bookmark_delete_params import BookmarkDeleteParams as BookmarkDeleteParams from .bookmark_update_params import BookmarkUpdateParams as BookmarkUpdateParams +from .saas_app_name_id_format import SaasAppNameIDFormat as SaasAppNameIDFormat from .bookmark_delete_response import BookmarkDeleteResponse as BookmarkDeleteResponse from .custom_page_without_html import CustomPageWithoutHTML as CustomPageWithoutHTML from .application_create_params import ApplicationCreateParams as ApplicationCreateParams diff --git a/src/cloudflare/types/zero_trust/access/saas_app_name_format.py b/src/cloudflare/types/zero_trust/access/saas_app_name_format.py new file mode 100644 index 00000000000..e8197aad4ec --- /dev/null +++ b/src/cloudflare/types/zero_trust/access/saas_app_name_format.py @@ -0,0 +1,11 @@ +# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. + +from typing_extensions import Literal + +__all__ = ["SaasAppNameFormat"] + +SaasAppNameFormat = Literal[ + "urn:oasis:names:tc:SAML:2.0:attrname-format:unspecified", + "urn:oasis:names:tc:SAML:2.0:attrname-format:basic", + "urn:oasis:names:tc:SAML:2.0:attrname-format:uri", +] diff --git a/src/cloudflare/types/zero_trust/access/saas_app_name_id_format.py b/src/cloudflare/types/zero_trust/access/saas_app_name_id_format.py new file mode 100644 index 00000000000..e2ae5e89b24 --- /dev/null +++ b/src/cloudflare/types/zero_trust/access/saas_app_name_id_format.py @@ -0,0 +1,7 @@ +# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. + +from typing_extensions import Literal + +__all__ = ["SaasAppNameIDFormat"] + +SaasAppNameIDFormat = Literal["id", "email"] diff --git a/src/cloudflare/types/zero_trust/access/saas_app_source.py b/src/cloudflare/types/zero_trust/access/saas_app_source.py new file mode 100644 index 00000000000..2dfc97fd5f5 --- /dev/null +++ b/src/cloudflare/types/zero_trust/access/saas_app_source.py @@ -0,0 +1,12 @@ +# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. + +from typing import Optional + +from ...._models import BaseModel + +__all__ = ["SaasAppSource"] + + +class SaasAppSource(BaseModel): + name: Optional[str] = None + """The name of the IdP attribute.""" diff --git a/src/cloudflare/types/zero_trust/access/saas_app_source_param.py b/src/cloudflare/types/zero_trust/access/saas_app_source_param.py new file mode 100644 index 00000000000..484e8b7c7a4 --- /dev/null +++ b/src/cloudflare/types/zero_trust/access/saas_app_source_param.py @@ -0,0 +1,12 @@ +# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. + +from __future__ import annotations + +from typing_extensions import TypedDict + +__all__ = ["SaasAppSourceParam"] + + +class SaasAppSourceParam(TypedDict, total=False): + name: str + """The name of the IdP attribute.""" diff --git a/src/cloudflare/types/zero_trust/access/saml_saas_app.py b/src/cloudflare/types/zero_trust/access/saml_saas_app.py index 17c09585d68..370372831c8 100644 --- a/src/cloudflare/types/zero_trust/access/saml_saas_app.py +++ b/src/cloudflare/types/zero_trust/access/saml_saas_app.py @@ -5,29 +5,21 @@ from typing_extensions import Literal from ...._models import BaseModel +from .saas_app_source import SaasAppSource +from .saas_app_name_format import SaasAppNameFormat +from .saas_app_name_id_format import SaasAppNameIDFormat -__all__ = ["SAMLSaasApp", "CustomAttributes", "CustomAttributesSource"] - - -class CustomAttributesSource(BaseModel): - name: Optional[str] = None - """The name of the IdP attribute.""" +__all__ = ["SAMLSaasApp", "CustomAttributes"] class CustomAttributes(BaseModel): name: Optional[str] = None """The name of the attribute.""" - name_format: Optional[ - Literal[ - "urn:oasis:names:tc:SAML:2.0:attrname-format:unspecified", - "urn:oasis:names:tc:SAML:2.0:attrname-format:basic", - "urn:oasis:names:tc:SAML:2.0:attrname-format:uri", - ] - ] = None + name_format: Optional[SaasAppNameFormat] = None """A globally unique name for an identity or service provider.""" - source: Optional[CustomAttributesSource] = None + source: Optional[SaasAppSource] = None class SAMLSaasApp(BaseModel): @@ -57,7 +49,7 @@ class SAMLSaasApp(BaseModel): idp_entity_id: Optional[str] = None """The unique identifier for your SaaS application.""" - name_id_format: Optional[Literal["id", "email"]] = None + name_id_format: Optional[SaasAppNameIDFormat] = None """The format of the name identifier sent to the SaaS application.""" name_id_transform_jsonata: Optional[str] = None diff --git a/src/cloudflare/types/zero_trust/access/saml_saas_app_param.py b/src/cloudflare/types/zero_trust/access/saml_saas_app_param.py index 7237bbee617..e680f91be03 100644 --- a/src/cloudflare/types/zero_trust/access/saml_saas_app_param.py +++ b/src/cloudflare/types/zero_trust/access/saml_saas_app_param.py @@ -4,26 +4,21 @@ from typing_extensions import Literal, TypedDict -__all__ = ["SAMLSaasAppParam", "CustomAttributes", "CustomAttributesSource"] +from .saas_app_name_format import SaasAppNameFormat +from .saas_app_source_param import SaasAppSourceParam +from .saas_app_name_id_format import SaasAppNameIDFormat - -class CustomAttributesSource(TypedDict, total=False): - name: str - """The name of the IdP attribute.""" +__all__ = ["SAMLSaasAppParam", "CustomAttributes"] class CustomAttributes(TypedDict, total=False): name: str """The name of the attribute.""" - name_format: Literal[ - "urn:oasis:names:tc:SAML:2.0:attrname-format:unspecified", - "urn:oasis:names:tc:SAML:2.0:attrname-format:basic", - "urn:oasis:names:tc:SAML:2.0:attrname-format:uri", - ] + name_format: SaasAppNameFormat """A globally unique name for an identity or service provider.""" - source: CustomAttributesSource + source: SaasAppSourceParam class SAMLSaasAppParam(TypedDict, total=False): @@ -51,7 +46,7 @@ class SAMLSaasAppParam(TypedDict, total=False): idp_entity_id: str """The unique identifier for your SaaS application.""" - name_id_format: Literal["id", "email"] + name_id_format: SaasAppNameIDFormat """The format of the name identifier sent to the SaaS application.""" name_id_transform_jsonata: str diff --git a/src/cloudflare/types/zero_trust/devices/__init__.py b/src/cloudflare/types/zero_trust/devices/__init__.py index e5448a3f15c..98e95a4c54d 100644 --- a/src/cloudflare/types/zero_trust/devices/__init__.py +++ b/src/cloudflare/types/zero_trust/devices/__init__.py @@ -34,9 +34,3 @@ from .dex_test_delete_response import DEXTestDeleteResponse as DEXTestDeleteResponse from .unrevoke_create_response import UnrevokeCreateResponse as UnrevokeCreateResponse from .override_code_list_response import OverrideCodeListResponse as OverrideCodeListResponse -from .unnamed_schema_ref_34ef0ad73a63c3f76ed170adca181930 import ( - UnnamedSchemaRef34ef0ad73a63c3f76ed170adca181930 as UnnamedSchemaRef34ef0ad73a63c3f76ed170adca181930, -) -from .unnamed_schema_ref_41885dd46b9e0294254c49305a273681 import ( - UnnamedSchemaRef41885dd46b9e0294254c49305a273681 as UnnamedSchemaRef41885dd46b9e0294254c49305a273681, -) diff --git a/src/cloudflare/types/zero_trust/devices/device_input.py b/src/cloudflare/types/zero_trust/devices/device_input.py index 84f7faf215c..4dc5027e1dd 100644 --- a/src/cloudflare/types/zero_trust/devices/device_input.py +++ b/src/cloudflare/types/zero_trust/devices/device_input.py @@ -6,8 +6,6 @@ from pydantic import Field as FieldInfo from ...._models import BaseModel -from .unnamed_schema_ref_34ef0ad73a63c3f76ed170adca181930 import UnnamedSchemaRef34ef0ad73a63c3f76ed170adca181930 -from .unnamed_schema_ref_41885dd46b9e0294254c49305a273681 import UnnamedSchemaRef41885dd46b9e0294254c49305a273681 __all__ = [ "DeviceInput", @@ -31,7 +29,7 @@ class TeamsDevicesFileInputRequest(BaseModel): - operating_system: UnnamedSchemaRef41885dd46b9e0294254c49305a273681 + operating_system: Literal["windows", "linux", "mac"] """Operating system""" path: str @@ -67,7 +65,7 @@ class TeamsDevicesOSVersionInputRequest(BaseModel): operating_system: Literal["windows"] """Operating System""" - operator: UnnamedSchemaRef34ef0ad73a63c3f76ed170adca181930 + operator: Literal["<", "<=", ">", ">=", "=="] """operator""" version: str @@ -96,7 +94,7 @@ class TeamsDevicesFirewallInputRequest(BaseModel): class TeamsDevicesSentineloneInputRequest(BaseModel): - operating_system: UnnamedSchemaRef41885dd46b9e0294254c49305a273681 + operating_system: Literal["windows", "linux", "mac"] """Operating system""" path: str @@ -110,7 +108,7 @@ class TeamsDevicesSentineloneInputRequest(BaseModel): class TeamsDevicesCarbonblackInputRequest(BaseModel): - operating_system: UnnamedSchemaRef41885dd46b9e0294254c49305a273681 + operating_system: Literal["windows", "linux", "mac"] """Operating system""" path: str @@ -132,7 +130,7 @@ class TeamsDevicesDiskEncryptionInputRequest(BaseModel): class TeamsDevicesApplicationInputRequest(BaseModel): - operating_system: UnnamedSchemaRef41885dd46b9e0294254c49305a273681 + operating_system: Literal["windows", "linux", "mac"] """Operating system""" path: str @@ -168,7 +166,7 @@ class TeamsDevicesCrowdstrikeInputRequest(BaseModel): last_seen: Optional[str] = None """For more details on last seen, please refer to the Crowdstrike documentation.""" - operator: Optional[UnnamedSchemaRef34ef0ad73a63c3f76ed170adca181930] = None + operator: Optional[Literal["<", "<=", ">", ">=", "=="]] = None """operator""" os: Optional[str] = None @@ -245,7 +243,7 @@ class TeamsDevicesSentineloneS2sInputRequest(BaseModel): network_status: Optional[Literal["connected", "disconnected", "disconnecting", "connecting"]] = None """Network status of device.""" - operator: Optional[UnnamedSchemaRef34ef0ad73a63c3f76ed170adca181930] = None + operator: Optional[Literal["<", "<=", ">", ">=", "=="]] = None """operator""" diff --git a/src/cloudflare/types/zero_trust/devices/device_input_param.py b/src/cloudflare/types/zero_trust/devices/device_input_param.py index 2895c6f9f9e..0b8029384ee 100644 --- a/src/cloudflare/types/zero_trust/devices/device_input_param.py +++ b/src/cloudflare/types/zero_trust/devices/device_input_param.py @@ -6,8 +6,6 @@ from typing_extensions import Literal, Required, Annotated, TypedDict from ...._utils import PropertyInfo -from .unnamed_schema_ref_34ef0ad73a63c3f76ed170adca181930 import UnnamedSchemaRef34ef0ad73a63c3f76ed170adca181930 -from .unnamed_schema_ref_41885dd46b9e0294254c49305a273681 import UnnamedSchemaRef41885dd46b9e0294254c49305a273681 __all__ = [ "DeviceInputParam", @@ -31,7 +29,7 @@ class TeamsDevicesFileInputRequest(TypedDict, total=False): - operating_system: Required[UnnamedSchemaRef41885dd46b9e0294254c49305a273681] + operating_system: Required[Literal["windows", "linux", "mac"]] """Operating system""" path: Required[str] @@ -67,7 +65,7 @@ class TeamsDevicesOSVersionInputRequest(TypedDict, total=False): operating_system: Required[Literal["windows"]] """Operating System""" - operator: Required[UnnamedSchemaRef34ef0ad73a63c3f76ed170adca181930] + operator: Required[Literal["<", "<=", ">", ">=", "=="]] """operator""" version: Required[str] @@ -96,7 +94,7 @@ class TeamsDevicesFirewallInputRequest(TypedDict, total=False): class TeamsDevicesSentineloneInputRequest(TypedDict, total=False): - operating_system: Required[UnnamedSchemaRef41885dd46b9e0294254c49305a273681] + operating_system: Required[Literal["windows", "linux", "mac"]] """Operating system""" path: Required[str] @@ -110,7 +108,7 @@ class TeamsDevicesSentineloneInputRequest(TypedDict, total=False): class TeamsDevicesCarbonblackInputRequest(TypedDict, total=False): - operating_system: Required[UnnamedSchemaRef41885dd46b9e0294254c49305a273681] + operating_system: Required[Literal["windows", "linux", "mac"]] """Operating system""" path: Required[str] @@ -132,7 +130,7 @@ class TeamsDevicesDiskEncryptionInputRequest(TypedDict, total=False): class TeamsDevicesApplicationInputRequest(TypedDict, total=False): - operating_system: Required[UnnamedSchemaRef41885dd46b9e0294254c49305a273681] + operating_system: Required[Literal["windows", "linux", "mac"]] """Operating system""" path: Required[str] @@ -168,7 +166,7 @@ class TeamsDevicesCrowdstrikeInputRequest(TypedDict, total=False): last_seen: str """For more details on last seen, please refer to the Crowdstrike documentation.""" - operator: UnnamedSchemaRef34ef0ad73a63c3f76ed170adca181930 + operator: Literal["<", "<=", ">", ">=", "=="] """operator""" os: str @@ -247,7 +245,7 @@ class TeamsDevicesSentineloneS2sInputRequest(TypedDict, total=False): network_status: Literal["connected", "disconnected", "disconnecting", "connecting"] """Network status of device.""" - operator: UnnamedSchemaRef34ef0ad73a63c3f76ed170adca181930 + operator: Literal["<", "<=", ">", ">=", "=="] """operator""" diff --git a/src/cloudflare/types/zero_trust/devices/unnamed_schema_ref_34ef0ad73a63c3f76ed170adca181930.py b/src/cloudflare/types/zero_trust/devices/unnamed_schema_ref_34ef0ad73a63c3f76ed170adca181930.py deleted file mode 100644 index 653f654984e..00000000000 --- a/src/cloudflare/types/zero_trust/devices/unnamed_schema_ref_34ef0ad73a63c3f76ed170adca181930.py +++ /dev/null @@ -1,7 +0,0 @@ -# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. - -from typing_extensions import Literal - -__all__ = ["UnnamedSchemaRef34ef0ad73a63c3f76ed170adca181930"] - -UnnamedSchemaRef34ef0ad73a63c3f76ed170adca181930 = Literal["<", "<=", ">", ">=", "=="] diff --git a/src/cloudflare/types/zero_trust/devices/unnamed_schema_ref_41885dd46b9e0294254c49305a273681.py b/src/cloudflare/types/zero_trust/devices/unnamed_schema_ref_41885dd46b9e0294254c49305a273681.py deleted file mode 100644 index 8212e0739df..00000000000 --- a/src/cloudflare/types/zero_trust/devices/unnamed_schema_ref_41885dd46b9e0294254c49305a273681.py +++ /dev/null @@ -1,7 +0,0 @@ -# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. - -from typing_extensions import Literal - -__all__ = ["UnnamedSchemaRef41885dd46b9e0294254c49305a273681"] - -UnnamedSchemaRef41885dd46b9e0294254c49305a273681 = Literal["windows", "linux", "mac"]