diff --git a/api.md b/api.md index f24918d5ab9..0a5b2b7d6ca 100644 --- a/api.md +++ b/api.md @@ -4360,15 +4360,15 @@ Methods: Types: ```python -from cloudflare.types.stream import Watermaks, WatermarkDeleteResponse +from cloudflare.types.stream import Watermark, WatermarkDeleteResponse ``` Methods: -- client.stream.watermarks.create(\*, account_id, \*\*params) -> Optional -- client.stream.watermarks.list(\*, account_id) -> SyncSinglePage[Watermaks] +- client.stream.watermarks.create(\*, account_id, \*\*params) -> Optional +- client.stream.watermarks.list(\*, account_id) -> SyncSinglePage[Watermark] - client.stream.watermarks.delete(identifier, \*, account_id, \*\*params) -> Optional -- client.stream.watermarks.get(identifier, \*, account_id) -> Optional +- client.stream.watermarks.get(identifier, \*, account_id) -> Optional ## Webhooks diff --git a/src/cloudflare/resources/stream/watermarks.py b/src/cloudflare/resources/stream/watermarks.py index 0392215d21e..48d1b21daf2 100644 --- a/src/cloudflare/resources/stream/watermarks.py +++ b/src/cloudflare/resources/stream/watermarks.py @@ -25,7 +25,7 @@ AsyncPaginator, make_request_options, ) -from ...types.stream import Watermaks, WatermarkDeleteResponse, watermark_create_params, watermark_delete_params +from ...types.stream import Watermark, WatermarkDeleteResponse, watermark_create_params, watermark_delete_params __all__ = ["Watermarks", "AsyncWatermarks"] @@ -55,7 +55,7 @@ def create( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> Optional[Watermaks]: + ) -> Optional[Watermark]: """ Creates watermark profiles using a single `HTTP POST multipart/form-data` request. @@ -112,9 +112,9 @@ def create( extra_query=extra_query, extra_body=extra_body, timeout=timeout, - post_parser=ResultWrapper[Optional[Watermaks]]._unwrapper, + post_parser=ResultWrapper[Optional[Watermark]]._unwrapper, ), - cast_to=cast(Type[Optional[Watermaks]], ResultWrapper[Watermaks]), + cast_to=cast(Type[Optional[Watermark]], ResultWrapper[Watermark]), ) def list( @@ -127,7 +127,7 @@ def list( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> SyncSinglePage[Watermaks]: + ) -> SyncSinglePage[Watermark]: """ Lists all watermark profiles for an account. @@ -146,11 +146,11 @@ def list( 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}/stream/watermarks", - page=SyncSinglePage[Watermaks], + page=SyncSinglePage[Watermark], options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), - model=Watermaks, + model=Watermark, ) def delete( @@ -215,7 +215,7 @@ def get( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> Optional[Watermaks]: + ) -> Optional[Watermark]: """ Retrieves details for a single watermark profile. @@ -243,9 +243,9 @@ def get( extra_query=extra_query, extra_body=extra_body, timeout=timeout, - post_parser=ResultWrapper[Optional[Watermaks]]._unwrapper, + post_parser=ResultWrapper[Optional[Watermark]]._unwrapper, ), - cast_to=cast(Type[Optional[Watermaks]], ResultWrapper[Watermaks]), + cast_to=cast(Type[Optional[Watermark]], ResultWrapper[Watermark]), ) @@ -274,7 +274,7 @@ async def create( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> Optional[Watermaks]: + ) -> Optional[Watermark]: """ Creates watermark profiles using a single `HTTP POST multipart/form-data` request. @@ -331,9 +331,9 @@ async def create( extra_query=extra_query, extra_body=extra_body, timeout=timeout, - post_parser=ResultWrapper[Optional[Watermaks]]._unwrapper, + post_parser=ResultWrapper[Optional[Watermark]]._unwrapper, ), - cast_to=cast(Type[Optional[Watermaks]], ResultWrapper[Watermaks]), + cast_to=cast(Type[Optional[Watermark]], ResultWrapper[Watermark]), ) def list( @@ -346,7 +346,7 @@ def list( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> AsyncPaginator[Watermaks, AsyncSinglePage[Watermaks]]: + ) -> AsyncPaginator[Watermark, AsyncSinglePage[Watermark]]: """ Lists all watermark profiles for an account. @@ -365,11 +365,11 @@ def list( 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}/stream/watermarks", - page=AsyncSinglePage[Watermaks], + page=AsyncSinglePage[Watermark], options=make_request_options( extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout ), - model=Watermaks, + model=Watermark, ) async def delete( @@ -434,7 +434,7 @@ async def get( extra_query: Query | None = None, extra_body: Body | None = None, timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN, - ) -> Optional[Watermaks]: + ) -> Optional[Watermark]: """ Retrieves details for a single watermark profile. @@ -462,9 +462,9 @@ async def get( extra_query=extra_query, extra_body=extra_body, timeout=timeout, - post_parser=ResultWrapper[Optional[Watermaks]]._unwrapper, + post_parser=ResultWrapper[Optional[Watermark]]._unwrapper, ), - cast_to=cast(Type[Optional[Watermaks]], ResultWrapper[Watermaks]), + cast_to=cast(Type[Optional[Watermark]], ResultWrapper[Watermark]), ) diff --git a/src/cloudflare/types/stream/__init__.py b/src/cloudflare/types/stream/__init__.py index 9aa6856a37f..8ef5dc26c18 100644 --- a/src/cloudflare/types/stream/__init__.py +++ b/src/cloudflare/types/stream/__init__.py @@ -7,7 +7,7 @@ from .audio import Audio as Audio from .video import Video as Video from .caption import Caption as Caption -from .watermaks import Watermaks as Watermaks +from .watermark import Watermark as Watermark from .live_input import LiveInput as LiveInput from .allowed_origins import AllowedOrigins as AllowedOrigins from .key_get_response import KeyGetResponse as KeyGetResponse diff --git a/src/cloudflare/types/stream/direct_upload_create_response.py b/src/cloudflare/types/stream/direct_upload_create_response.py index e97cb77b598..241adb04ca6 100644 --- a/src/cloudflare/types/stream/direct_upload_create_response.py +++ b/src/cloudflare/types/stream/direct_upload_create_response.py @@ -6,7 +6,7 @@ from pydantic import Field as FieldInfo from ..._models import BaseModel -from .watermaks import Watermaks +from .watermark import Watermark __all__ = ["DirectUploadCreateResponse"] @@ -29,4 +29,4 @@ class DirectUploadCreateResponse(BaseModel): `HTTP POST multipart/form-data` request. """ - watermark: Optional[Watermaks] = None + watermark: Optional[Watermark] = None diff --git a/src/cloudflare/types/stream/video.py b/src/cloudflare/types/stream/video.py index dedd298f21b..d53fad7387f 100644 --- a/src/cloudflare/types/stream/video.py +++ b/src/cloudflare/types/stream/video.py @@ -7,7 +7,7 @@ from pydantic import Field as FieldInfo from ..._models import BaseModel -from .watermaks import Watermaks +from .watermark import Watermark from .allowed_origins import AllowedOrigins __all__ = ["Video", "Input", "Playback", "Status"] @@ -177,4 +177,4 @@ class Video(BaseModel): uploads. """ - watermark: Optional[Watermaks] = None + watermark: Optional[Watermark] = None diff --git a/src/cloudflare/types/stream/watermaks.py b/src/cloudflare/types/stream/watermark.py similarity index 97% rename from src/cloudflare/types/stream/watermaks.py rename to src/cloudflare/types/stream/watermark.py index a06de1f764a..e36de655af1 100644 --- a/src/cloudflare/types/stream/watermaks.py +++ b/src/cloudflare/types/stream/watermark.py @@ -7,10 +7,10 @@ from ..._models import BaseModel -__all__ = ["Watermaks"] +__all__ = ["Watermark"] -class Watermaks(BaseModel): +class Watermark(BaseModel): created: Optional[datetime] = None """The date and a time a watermark profile was created.""" diff --git a/tests/api_resources/stream/test_watermarks.py b/tests/api_resources/stream/test_watermarks.py index 83c9058bc3d..212a32853a6 100644 --- a/tests/api_resources/stream/test_watermarks.py +++ b/tests/api_resources/stream/test_watermarks.py @@ -10,7 +10,7 @@ from cloudflare import Cloudflare, AsyncCloudflare from tests.utils import assert_matches_type from cloudflare.pagination import SyncSinglePage, AsyncSinglePage -from cloudflare.types.stream import Watermaks, WatermarkDeleteResponse +from cloudflare.types.stream import Watermark, WatermarkDeleteResponse base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") @@ -25,7 +25,7 @@ def test_method_create(self, client: Cloudflare) -> None: account_id="023e105f4ecef8ad9ca31a8372d0c353", file="@/Users/rchen/Downloads/watermark.png", ) - assert_matches_type(Optional[Watermaks], watermark, path=["response"]) + assert_matches_type(Optional[Watermark], watermark, path=["response"]) @pytest.mark.skip() @parametrize @@ -39,7 +39,7 @@ def test_method_create_with_all_params(self, client: Cloudflare) -> None: position="center", scale=0.1, ) - assert_matches_type(Optional[Watermaks], watermark, path=["response"]) + assert_matches_type(Optional[Watermark], watermark, path=["response"]) @pytest.mark.skip() @parametrize @@ -52,7 +52,7 @@ def test_raw_response_create(self, client: Cloudflare) -> None: assert response.is_closed is True assert response.http_request.headers.get("X-Stainless-Lang") == "python" watermark = response.parse() - assert_matches_type(Optional[Watermaks], watermark, path=["response"]) + assert_matches_type(Optional[Watermark], watermark, path=["response"]) @pytest.mark.skip() @parametrize @@ -65,7 +65,7 @@ def test_streaming_response_create(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" watermark = response.parse() - assert_matches_type(Optional[Watermaks], watermark, path=["response"]) + assert_matches_type(Optional[Watermark], watermark, path=["response"]) assert cast(Any, response.is_closed) is True @@ -84,7 +84,7 @@ def test_method_list(self, client: Cloudflare) -> None: watermark = client.stream.watermarks.list( account_id="023e105f4ecef8ad9ca31a8372d0c353", ) - assert_matches_type(SyncSinglePage[Watermaks], watermark, path=["response"]) + assert_matches_type(SyncSinglePage[Watermark], watermark, path=["response"]) @pytest.mark.skip() @parametrize @@ -96,7 +96,7 @@ def test_raw_response_list(self, client: Cloudflare) -> None: assert response.is_closed is True assert response.http_request.headers.get("X-Stainless-Lang") == "python" watermark = response.parse() - assert_matches_type(SyncSinglePage[Watermaks], watermark, path=["response"]) + assert_matches_type(SyncSinglePage[Watermark], watermark, path=["response"]) @pytest.mark.skip() @parametrize @@ -108,7 +108,7 @@ def test_streaming_response_list(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" watermark = response.parse() - assert_matches_type(SyncSinglePage[Watermaks], watermark, path=["response"]) + assert_matches_type(SyncSinglePage[Watermark], watermark, path=["response"]) assert cast(Any, response.is_closed) is True @@ -184,7 +184,7 @@ def test_method_get(self, client: Cloudflare) -> None: "ea95132c15732412d22c1476fa83f27a", account_id="023e105f4ecef8ad9ca31a8372d0c353", ) - assert_matches_type(Optional[Watermaks], watermark, path=["response"]) + assert_matches_type(Optional[Watermark], watermark, path=["response"]) @pytest.mark.skip() @parametrize @@ -197,7 +197,7 @@ def test_raw_response_get(self, client: Cloudflare) -> None: assert response.is_closed is True assert response.http_request.headers.get("X-Stainless-Lang") == "python" watermark = response.parse() - assert_matches_type(Optional[Watermaks], watermark, path=["response"]) + assert_matches_type(Optional[Watermark], watermark, path=["response"]) @pytest.mark.skip() @parametrize @@ -210,7 +210,7 @@ def test_streaming_response_get(self, client: Cloudflare) -> None: assert response.http_request.headers.get("X-Stainless-Lang") == "python" watermark = response.parse() - assert_matches_type(Optional[Watermaks], watermark, path=["response"]) + assert_matches_type(Optional[Watermark], watermark, path=["response"]) assert cast(Any, response.is_closed) is True @@ -240,7 +240,7 @@ async def test_method_create(self, async_client: AsyncCloudflare) -> None: account_id="023e105f4ecef8ad9ca31a8372d0c353", file="@/Users/rchen/Downloads/watermark.png", ) - assert_matches_type(Optional[Watermaks], watermark, path=["response"]) + assert_matches_type(Optional[Watermark], watermark, path=["response"]) @pytest.mark.skip() @parametrize @@ -254,7 +254,7 @@ async def test_method_create_with_all_params(self, async_client: AsyncCloudflare position="center", scale=0.1, ) - assert_matches_type(Optional[Watermaks], watermark, path=["response"]) + assert_matches_type(Optional[Watermark], watermark, path=["response"]) @pytest.mark.skip() @parametrize @@ -267,7 +267,7 @@ async def test_raw_response_create(self, async_client: AsyncCloudflare) -> None: assert response.is_closed is True assert response.http_request.headers.get("X-Stainless-Lang") == "python" watermark = await response.parse() - assert_matches_type(Optional[Watermaks], watermark, path=["response"]) + assert_matches_type(Optional[Watermark], watermark, path=["response"]) @pytest.mark.skip() @parametrize @@ -280,7 +280,7 @@ async def test_streaming_response_create(self, async_client: AsyncCloudflare) -> assert response.http_request.headers.get("X-Stainless-Lang") == "python" watermark = await response.parse() - assert_matches_type(Optional[Watermaks], watermark, path=["response"]) + assert_matches_type(Optional[Watermark], watermark, path=["response"]) assert cast(Any, response.is_closed) is True @@ -299,7 +299,7 @@ async def test_method_list(self, async_client: AsyncCloudflare) -> None: watermark = await async_client.stream.watermarks.list( account_id="023e105f4ecef8ad9ca31a8372d0c353", ) - assert_matches_type(AsyncSinglePage[Watermaks], watermark, path=["response"]) + assert_matches_type(AsyncSinglePage[Watermark], watermark, path=["response"]) @pytest.mark.skip() @parametrize @@ -311,7 +311,7 @@ async def test_raw_response_list(self, async_client: AsyncCloudflare) -> None: assert response.is_closed is True assert response.http_request.headers.get("X-Stainless-Lang") == "python" watermark = await response.parse() - assert_matches_type(AsyncSinglePage[Watermaks], watermark, path=["response"]) + assert_matches_type(AsyncSinglePage[Watermark], watermark, path=["response"]) @pytest.mark.skip() @parametrize @@ -323,7 +323,7 @@ async def test_streaming_response_list(self, async_client: AsyncCloudflare) -> N assert response.http_request.headers.get("X-Stainless-Lang") == "python" watermark = await response.parse() - assert_matches_type(AsyncSinglePage[Watermaks], watermark, path=["response"]) + assert_matches_type(AsyncSinglePage[Watermark], watermark, path=["response"]) assert cast(Any, response.is_closed) is True @@ -399,7 +399,7 @@ async def test_method_get(self, async_client: AsyncCloudflare) -> None: "ea95132c15732412d22c1476fa83f27a", account_id="023e105f4ecef8ad9ca31a8372d0c353", ) - assert_matches_type(Optional[Watermaks], watermark, path=["response"]) + assert_matches_type(Optional[Watermark], watermark, path=["response"]) @pytest.mark.skip() @parametrize @@ -412,7 +412,7 @@ async def test_raw_response_get(self, async_client: AsyncCloudflare) -> None: assert response.is_closed is True assert response.http_request.headers.get("X-Stainless-Lang") == "python" watermark = await response.parse() - assert_matches_type(Optional[Watermaks], watermark, path=["response"]) + assert_matches_type(Optional[Watermark], watermark, path=["response"]) @pytest.mark.skip() @parametrize @@ -425,7 +425,7 @@ async def test_streaming_response_get(self, async_client: AsyncCloudflare) -> No assert response.http_request.headers.get("X-Stainless-Lang") == "python" watermark = await response.parse() - assert_matches_type(Optional[Watermaks], watermark, path=["response"]) + assert_matches_type(Optional[Watermark], watermark, path=["response"]) assert cast(Any, response.is_closed) is True