magic_hour 0.9.3__tar.gz → 0.9.5__tar.gz

{magic_hour-0.9.3 → magic_hour-0.9.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: magic_hour
-Version: 0.9.3
+Version: 0.9.5
 Summary: Python SDK for Magic Hour API
 Requires-Python: >=3.8,<4.0
 Classifier: Programming Language :: Python :: 3

{magic_hour-0.9.3 → magic_hour-0.9.5}/magic_hour/client.py

@@ -1,9 +1,9 @@
 import httpx
 import typing
 
-from magic_hour.resources.v1 import AsyncV1Client, V1Client
-from magic_hour.environment import Environment
 from magic_hour.core import AsyncBaseClient, AuthBearer, SyncBaseClient
+from magic_hour.environment import Environment
+from magic_hour.resources.v1 import AsyncV1Client, V1Client
 
 
 class Client:
@@ -16,14 +16,14 @@ class Client:
         environment: Environment = Environment.ENVIRONMENT,
         token: typing.Optional[str] = None,
     ):
+        """Initialize root client"""
         self._base_client = SyncBaseClient(
             base_url=_get_base_url(base_url=base_url, environment=environment),
-            httpx_client=(
-                httpx.Client(timeout=timeout) if httpx_client is None else httpx_client
-            ),
+            httpx_client=httpx.Client(timeout=timeout)
+            if httpx_client is None
+            else httpx_client,
         )
         self._base_client.register_auth("bearerAuth", AuthBearer(val=token))
-
         self.v1 = V1Client(base_client=self._base_client)
 
 
@@ -37,16 +37,14 @@ class AsyncClient:
         environment: Environment = Environment.ENVIRONMENT,
         token: typing.Optional[str] = None,
     ):
+        """Initialize root client"""
         self._base_client = AsyncBaseClient(
             base_url=_get_base_url(base_url=base_url, environment=environment),
-            httpx_client=(
-                httpx.AsyncClient(timeout=timeout)
-                if httpx_client is None
-                else httpx_client
-            ),
+            httpx_client=httpx.AsyncClient(timeout=timeout)
+            if httpx_client is None
+            else httpx_client,
         )
         self._base_client.register_auth("bearerAuth", AuthBearer(val=token))
-
         self.v1 = AsyncV1Client(base_client=self._base_client)
 
 

{magic_hour-0.9.3 → magic_hour-0.9.5}/magic_hour/core/__init__.py

@@ -13,14 +13,13 @@ from .auth import (
 )
 from .base_client import AsyncBaseClient, BaseClient, SyncBaseClient
 from .binary_response import BinaryResponse
+from .query import encode_query_param, QueryParams
 from .request import (
-    encode_param,
     filter_not_given,
     to_content,
     to_encodable,
     RequestOptions,
     default_request_options,
-    QueryParams,
 )
 from .response import from_encodable, AsyncStreamResponse, StreamResponse
 
@@ -45,7 +44,7 @@ __all__ = [
     "to_encodable",
     "filter_not_given",
     "to_content",
-    "encode_param",
+    "encode_query_param",
     "from_encodable",
     "AsyncStreamResponse",
     "StreamResponse",

magic_hour-0.9.5/magic_hour/core/query.py

@@ -0,0 +1,106 @@
+from typing import Any, Dict, Union
+from typing_extensions import Literal, Sequence
+from urllib.parse import quote_plus, quote
+
+import httpx
+
+
+# Type alias for query parameters that can handle both primitive data and sequences
+QueryParams = Dict[
+    str, Union[httpx._types.PrimitiveData, Sequence[httpx._types.PrimitiveData]]
+]
+
+
+def encode_query_param(
+    params: QueryParams,
+    name: str,
+    value: Any,
+    style: Literal["form", "spaceDelimited", "pipeDelimited", "deepObject"] = "form",
+    explode: bool = True,
+):
+    if style == "form":
+        _encode_form(params, name, value, explode)
+    elif style == "spaceDelimited":
+        _encode_spaced_delimited(params, name, value, explode)
+    elif style == "pipeDelimited":
+        _encode_pipe_delimited(params, name, value, explode)
+    elif style == "deepObject":
+        _encode_deep_object(params, name, value, explode)
+    else:
+        raise NotImplementedError(f"query param style '{style}' not implemented")
+
+
+def _encode_form(params: QueryParams, name: str, value: Any, explode: bool):
+    """
+    Encodes query params in the `form` style as defined by OpenAPI with both explode and non-explode
+    variants.
+    """
+    if isinstance(value, list) and not explode:
+        # non-explode form lists should be encoded like /users?id=3,4,5
+        params[name] = quote_plus(",".join(map(str, value)))
+    elif isinstance(value, dict):
+        if explode:
+            # explode form objects should be encoded like /users?key0=val0&key1=val1
+            # the input param name will be omitted
+            for k, v in value.items():
+                params[k] = quote_plus(str(v))
+        else:
+            # non-explode form objects should be encoded like /users?id=key0,val0,key1,val1
+            encoded_chunks = []
+            for k, v in value.items():
+                encoded_chunks.extend([str(k), str(v)])
+            params[name] = quote_plus(",".join(encoded_chunks))
+    else:
+        params[name] = value
+
+
+def _encode_spaced_delimited(params: QueryParams, name: str, value: Any, explode: bool):
+    """
+    Encodes query params in the `spaceDelimited` style as defined by OpenAPI with both explode and non-explode
+    variants.
+    """
+    if isinstance(value, list) and not explode:
+        # non-explode spaceDelimited lists should be encoded like /users?id=3%204%205
+        params[name] = quote(" ".join(map(str, value)))
+    else:
+        # according to the docs, spaceDelimited + explode=false only effects lists,
+        # all other encodings are marked as n/a or are the same as `form` style
+        # fall back on form style as it is the default for query params
+        _encode_form(params, name, value, explode)
+
+
+def _encode_pipe_delimited(params: QueryParams, name: str, value: Any, explode: bool):
+    """
+    Encodes query params in the `pipeDelimited` style as defined by OpenAPI with both explode and non-explode
+    variants.
+    """
+    if isinstance(value, list) and not explode:
+        # non-explode pipeDelimited lists should be encoded like /users?id=3|4|5
+        params[name] = quote("|".join(map(str, value)))
+    else:
+        # according to the docs, pipeDelimited + explode=false only effects lists,
+        # all other encodings are marked as n/a or are the same as `form` style
+        # fall back on form style as it is the default for query params
+        _encode_form(params, name, value, explode)
+
+
+def _encode_deep_object(params: QueryParams, name: str, value: Any, explode: bool):
+    """ """
+    if isinstance(value, dict):
+        _encode_deep_object_key(params, name, value)
+    else:
+        # according to the docs, deepObject style only applies to
+        # object encodes, encodings for primitives & arrays are listed as n/a,
+        # fall back on form style as it is the default for query params
+        _encode_form(params, name, value, explode)
+
+
+def _encode_deep_object_key(params: QueryParams, key: str, value: Any):
+    if isinstance(value, dict):
+        for k, v in value.items():
+            _encode_deep_object_key(params, f"{key}[{k}]", v)
+    elif isinstance(value, list):
+        for i, v in enumerate(value):
+            _encode_deep_object_key(params, f"{key}[{i}]", v)
+    else:
+        params[key] = value

{magic_hour-0.9.3 → magic_hour-0.9.5}/magic_hour/core/request.py

@@ -1,9 +1,12 @@
 from typing import Any, Dict, Type, Union, Sequence, List
 from urllib.parse import quote_plus
+
 import httpx
 from typing_extensions import TypedDict, Required, NotRequired
 from pydantic import TypeAdapter, BaseModel
+
 from .type_utils import NotGiven
+from .query import QueryParams
 
 """
 Request configuration and utility functions for handling HTTP requests.
@@ -11,11 +14,6 @@ This module provides type definitions and helper functions for building
 and processing HTTP requests in a type-safe manner.
 """
 
-# Type alias for query parameters that can handle both primitive data and sequences
-QueryParams = Dict[
-    str, Union[httpx._types.PrimitiveData, Sequence[httpx._types.PrimitiveData]]
-]
-
 
 class RequestConfig(TypedDict):
     """

{magic_hour-0.9.3 → magic_hour-0.9.5}/magic_hour/core/utils.py

@@ -21,7 +21,7 @@ def get_response_type(headers: httpx.Headers) -> Literal["json", "text", "binary
     """Check response type based on content type"""
     content_type = headers.get("content-type")
 
-    if re.search("^application/(.+\+)?json", content_type):
+    if re.search("^application/(.+[+])?json", content_type):
         return "json"
     elif re.search("^text/(.+)", content_type):
         return "text"

{magic_hour-0.9.3 → magic_hour-0.9.5}/magic_hour/environment.py

@@ -2,5 +2,7 @@ import enum
 
 
 class Environment(enum.Enum):
+    """Pre-defined base URLs for the API"""
+
     ENVIRONMENT = "https://api.magichour.ai"
-    MOCK_SERVER = "https://api.sideko.dev/v1/mock/magichour/magic-hour/0.9.3"
+    MOCK_SERVER = "https://api.sideko.dev/v1/mock/magichour/magic-hour/0.9.5"

{magic_hour-0.9.3 → magic_hour-0.9.5}/magic_hour/resources/v1/ai_clothes_changer/client.py

@@ -54,7 +54,6 @@ class AiClothesChangerClient:
             name="Clothes Changer image",
         )
         ```
-
         """
         _json = to_encodable(
             item={"name": name, "assets": assets},
@@ -113,7 +112,6 @@ class AsyncAiClothesChangerClient:
             name="Clothes Changer image",
         )
         ```
-
         """
         _json = to_encodable(
             item={"name": name, "assets": assets},

{magic_hour-0.9.3 → magic_hour-0.9.5}/magic_hour/resources/v1/ai_headshot_generator/client.py

@@ -50,7 +50,6 @@ class AiHeadshotGeneratorClient:
             name="Ai Headshot image",
         )
         ```
-
         """
         _json = to_encodable(
             item={"name": name, "assets": assets},
@@ -105,7 +104,6 @@ class AsyncAiHeadshotGeneratorClient:
             name="Ai Headshot image",
         )
         ```
-
         """
         _json = to_encodable(
             item={"name": name, "assets": assets},

{magic_hour-0.9.3 → magic_hour-0.9.5}/magic_hour/resources/v1/ai_image_generator/client.py

@@ -1,5 +1,5 @@
-import typing_extensions
 import typing
+import typing_extensions
 
 from magic_hour.core import (
     AsyncBaseClient,
@@ -57,7 +57,6 @@ class AiImageGeneratorClient:
             name="Ai Image image",
         )
         ```
-
         """
         _json = to_encodable(
             item={
@@ -123,7 +122,6 @@ class AsyncAiImageGeneratorClient:
             name="Ai Image image",
         )
         ```
-
         """
         _json = to_encodable(
             item={

{magic_hour-0.9.3 → magic_hour-0.9.5}/magic_hour/resources/v1/ai_image_upscaler/client.py

@@ -56,7 +56,6 @@ class AiImageUpscalerClient:
             name="Image Upscaler image",
         )
         ```
-
         """
         _json = to_encodable(
             item={
@@ -122,7 +121,6 @@ class AsyncAiImageUpscalerClient:
             name="Image Upscaler image",
         )
         ```
-
         """
         _json = to_encodable(
             item={

{magic_hour-0.9.3 → magic_hour-0.9.5}/magic_hour/resources/v1/ai_photo_editor/client.py

@@ -67,7 +67,6 @@ class AiPhotoEditorClient:
             name="Photo Editor image",
         )
         ```
-
         """
         _json = to_encodable(
             item={
@@ -145,7 +144,6 @@ class AsyncAiPhotoEditorClient:
             name="Photo Editor image",
         )
         ```
-
         """
         _json = to_encodable(
             item={

{magic_hour-0.9.3 → magic_hour-0.9.5}/magic_hour/resources/v1/ai_qr_code_generator/client.py

@@ -53,7 +53,6 @@ class AiQrCodeGeneratorClient:
             name="Qr Code image",
         )
         ```
-
         """
         _json = to_encodable(
             item={"name": name, "content": content, "style": style},
@@ -111,7 +110,6 @@ class AsyncAiQrCodeGeneratorClient:
             name="Qr Code image",
         )
         ```
-
         """
         _json = to_encodable(
             item={"name": name, "content": content, "style": style},

{magic_hour-0.9.3 → magic_hour-0.9.5}/magic_hour/resources/v1/animation/client.py

@@ -71,7 +71,6 @@ class AnimationClient:
             name="Animation video",
         )
         ```
-
         """
         _json = to_encodable(
             item={
@@ -155,7 +154,6 @@ class AsyncAnimationClient:
             name="Animation video",
         )
         ```
-
         """
         _json = to_encodable(
             item={

{magic_hour-0.9.3 → magic_hour-0.9.5}/magic_hour/resources/v1/client.py

@@ -1,12 +1,4 @@
 from magic_hour.core import AsyncBaseClient, SyncBaseClient
-from magic_hour.resources.v1.image_projects import (
-    AsyncImageProjectsClient,
-    ImageProjectsClient,
-)
-from magic_hour.resources.v1.video_projects import (
-    AsyncVideoProjectsClient,
-    VideoProjectsClient,
-)
 from magic_hour.resources.v1.ai_clothes_changer import (
     AiClothesChangerClient,
     AsyncAiClothesChangerClient,
@@ -42,6 +34,10 @@ from magic_hour.resources.v1.image_background_remover import (
     AsyncImageBackgroundRemoverClient,
     ImageBackgroundRemoverClient,
 )
+from magic_hour.resources.v1.image_projects import (
+    AsyncImageProjectsClient,
+    ImageProjectsClient,
+)
 from magic_hour.resources.v1.image_to_video import (
     AsyncImageToVideoClient,
     ImageToVideoClient,
@@ -51,6 +47,10 @@ from magic_hour.resources.v1.text_to_video import (
     AsyncTextToVideoClient,
     TextToVideoClient,
 )
+from magic_hour.resources.v1.video_projects import (
+    AsyncVideoProjectsClient,
+    VideoProjectsClient,
+)
 from magic_hour.resources.v1.video_to_video import (
     AsyncVideoToVideoClient,
     VideoToVideoClient,
@@ -60,94 +60,60 @@ from magic_hour.resources.v1.video_to_video import (
 class V1Client:
     def __init__(self, *, base_client: SyncBaseClient):
         self._base_client = base_client
-
         self.image_projects = ImageProjectsClient(base_client=self._base_client)
-
         self.video_projects = VideoProjectsClient(base_client=self._base_client)
-
         self.ai_clothes_changer = AiClothesChangerClient(base_client=self._base_client)
-
         self.ai_headshot_generator = AiHeadshotGeneratorClient(
             base_client=self._base_client
         )
-
         self.ai_image_generator = AiImageGeneratorClient(base_client=self._base_client)
-
         self.ai_image_upscaler = AiImageUpscalerClient(base_client=self._base_client)
-
         self.ai_photo_editor = AiPhotoEditorClient(base_client=self._base_client)
-
         self.ai_qr_code_generator = AiQrCodeGeneratorClient(
             base_client=self._base_client
         )
-
         self.animation = AnimationClient(base_client=self._base_client)
-
         self.face_swap = FaceSwapClient(base_client=self._base_client)
-
         self.face_swap_photo = FaceSwapPhotoClient(base_client=self._base_client)
-
         self.files = FilesClient(base_client=self._base_client)
-
         self.image_background_remover = ImageBackgroundRemoverClient(
             base_client=self._base_client
         )
-
         self.image_to_video = ImageToVideoClient(base_client=self._base_client)
-
         self.lip_sync = LipSyncClient(base_client=self._base_client)
-
         self.text_to_video = TextToVideoClient(base_client=self._base_client)
-
         self.video_to_video = VideoToVideoClient(base_client=self._base_client)
 
 
 class AsyncV1Client:
     def __init__(self, *, base_client: AsyncBaseClient):
         self._base_client = base_client
-
         self.image_projects = AsyncImageProjectsClient(base_client=self._base_client)
-
         self.video_projects = AsyncVideoProjectsClient(base_client=self._base_client)
-
         self.ai_clothes_changer = AsyncAiClothesChangerClient(
             base_client=self._base_client
         )
-
         self.ai_headshot_generator = AsyncAiHeadshotGeneratorClient(
             base_client=self._base_client
         )
-
         self.ai_image_generator = AsyncAiImageGeneratorClient(
             base_client=self._base_client
         )
-
         self.ai_image_upscaler = AsyncAiImageUpscalerClient(
             base_client=self._base_client
         )
-
         self.ai_photo_editor = AsyncAiPhotoEditorClient(base_client=self._base_client)
-
         self.ai_qr_code_generator = AsyncAiQrCodeGeneratorClient(
             base_client=self._base_client
         )
-
         self.animation = AsyncAnimationClient(base_client=self._base_client)
-
         self.face_swap = AsyncFaceSwapClient(base_client=self._base_client)
-
         self.face_swap_photo = AsyncFaceSwapPhotoClient(base_client=self._base_client)
-
         self.files = AsyncFilesClient(base_client=self._base_client)
-
         self.image_background_remover = AsyncImageBackgroundRemoverClient(
             base_client=self._base_client
         )
-
         self.image_to_video = AsyncImageToVideoClient(base_client=self._base_client)
-
         self.lip_sync = AsyncLipSyncClient(base_client=self._base_client)
-
         self.text_to_video = AsyncTextToVideoClient(base_client=self._base_client)
-
         self.video_to_video = AsyncVideoToVideoClient(base_client=self._base_client)

{magic_hour-0.9.3 → magic_hour-0.9.5}/magic_hour/resources/v1/face_swap/client.py

@@ -65,7 +65,6 @@ class FaceSwapClient:
             name="Face Swap video",
         )
         ```
-
         """
         _json = to_encodable(
             item={
@@ -142,7 +141,6 @@ class AsyncFaceSwapClient:
             name="Face Swap video",
         )
         ```
-
         """
         _json = to_encodable(
             item={

{magic_hour-0.9.3 → magic_hour-0.9.5}/magic_hour/resources/v1/face_swap_photo/client.py

@@ -53,7 +53,6 @@ class FaceSwapPhotoClient:
             name="Face Swap image",
         )
         ```
-
         """
         _json = to_encodable(
             item={"name": name, "assets": assets},
@@ -111,7 +110,6 @@ class AsyncFaceSwapPhotoClient:
             name="Face Swap image",
         )
         ```
-
         """
         _json = to_encodable(
             item={"name": name, "assets": assets},

{magic_hour-0.9.3 → magic_hour-0.9.5}/magic_hour/resources/v1/files/client.py

@@ -8,12 +8,10 @@ from magic_hour.resources.v1.files.upload_urls import (
 class FilesClient:
     def __init__(self, *, base_client: SyncBaseClient):
         self._base_client = base_client
-
         self.upload_urls = UploadUrlsClient(base_client=self._base_client)
 
 
 class AsyncFilesClient:
     def __init__(self, *, base_client: AsyncBaseClient):
         self._base_client = base_client
-
         self.upload_urls = AsyncUploadUrlsClient(base_client=self._base_client)

{magic_hour-0.9.3 → magic_hour-0.9.5}/magic_hour/resources/v1/files/upload_urls/client.py

@@ -61,7 +61,6 @@ class UploadUrlsClient:
         ```py
         client.v1.files.upload_urls.create(items=[{"extension": "mp4", "type_field": "video"}, {"extension": "mp3", "type_field": "audio"}])
         ```
-        
         """
         _json = to_encodable(
             item={"items": items}, dump_with=params._SerializerPostV1FilesUploadUrlsBody
@@ -127,7 +126,6 @@ class AsyncUploadUrlsClient:
         ```py
         await client.v1.files.upload_urls.create(items=[{"extension": "mp4", "type_field": "video"}, {"extension": "mp3", "type_field": "audio"}])
         ```
-        
         """
         _json = to_encodable(
             item={"items": items}, dump_with=params._SerializerPostV1FilesUploadUrlsBody

{magic_hour-0.9.3 → magic_hour-0.9.5}/magic_hour/resources/v1/image_background_remover/client.py

@@ -50,7 +50,6 @@ class ImageBackgroundRemoverClient:
             name="Background Remover image",
         )
         ```
-
         """
         _json = to_encodable(
             item={"name": name, "assets": assets},
@@ -105,7 +104,6 @@ class AsyncImageBackgroundRemoverClient:
             name="Background Remover image",
         )
         ```
-
         """
         _json = to_encodable(
             item={"name": name, "assets": assets},

{magic_hour-0.9.3 → magic_hour-0.9.5}/magic_hour/resources/v1/image_projects/README.md

@@ -29,7 +29,7 @@ res = await client.v1.image_projects.delete(id="cm6pvghix03bvyz0zwash6noj")
 ### get <a name="get"></a>
 Get image details
 
-Get the details of a image project. The `download` field will be `null` unless the image was successfully rendered.
+Get the details of a image project. The `downloads` field will be empty unless the image was successfully rendered.
 
 The image can be one of the following status
 - `draft` - not currently used

{magic_hour-0.9.3 → magic_hour-0.9.5}/magic_hour/resources/v1/image_projects/client.py

@@ -38,7 +38,6 @@ class ImageProjectsClient:
         ```py
         client.v1.image_projects.delete(id="cm6pvghix03bvyz0zwash6noj")
         ```
-
         """
         self._base_client.request(
             method="DELETE",
@@ -54,7 +53,7 @@ class ImageProjectsClient:
         """
         Get image details
 
-        Get the details of a image project. The `download` field will be `null` unless the image was successfully rendered.
+        Get the details of a image project. The `downloads` field will be empty unless the image was successfully rendered.
 
         The image can be one of the following status
         - `draft` - not currently used
@@ -82,7 +81,6 @@ class ImageProjectsClient:
         ```py
         client.v1.image_projects.get(id="cm6pvghix03bvyz0zwash6noj")
         ```
-
         """
         return self._base_client.request(
             method="GET",
@@ -122,7 +120,6 @@ class AsyncImageProjectsClient:
         ```py
         await client.v1.image_projects.delete(id="cm6pvghix03bvyz0zwash6noj")
         ```
-
         """
         await self._base_client.request(
             method="DELETE",
@@ -138,7 +135,7 @@ class AsyncImageProjectsClient:
         """
         Get image details
 
-        Get the details of a image project. The `download` field will be `null` unless the image was successfully rendered.
+        Get the details of a image project. The `downloads` field will be empty unless the image was successfully rendered.
 
         The image can be one of the following status
         - `draft` - not currently used
@@ -166,7 +163,6 @@ class AsyncImageProjectsClient:
         ```py
         await client.v1.image_projects.get(id="cm6pvghix03bvyz0zwash6noj")
         ```
-
         """
         return await self._base_client.request(
             method="GET",

{magic_hour-0.9.3 → magic_hour-0.9.5}/magic_hour/resources/v1/image_to_video/client.py

@@ -65,7 +65,6 @@ class ImageToVideoClient:
             name="Image To Video video",
         )
         ```
-
         """
         _json = to_encodable(
             item={
@@ -142,7 +141,6 @@ class AsyncImageToVideoClient:
             name="Image To Video video",
         )
         ```
-
         """
         _json = to_encodable(
             item={

{magic_hour-0.9.3 → magic_hour-0.9.5}/magic_hour/resources/v1/lip_sync/client.py

@@ -73,7 +73,6 @@ class LipSyncClient:
             name="Lip Sync video",
         )
         ```
-
         """
         _json = to_encodable(
             item={
@@ -159,7 +158,6 @@ class AsyncLipSyncClient:
             name="Lip Sync video",
         )
         ```
-
         """
         _json = to_encodable(
             item={