magic_hour 0.36.2__py3-none-any.whl → 0.38.0__py3-none-any.whl

magic_hour/__init__.py

@@ -1,6 +1,6 @@
 from .client import AsyncClient, Client
-from .core import ApiError, BinaryResponse
 from .environment import Environment
+from make_api_request import ApiError, BinaryResponse
 
 
 __all__ = ["ApiError", "AsyncClient", "BinaryResponse", "Client", "Environment"]

magic_hour/client.py

@@ -1,9 +1,9 @@
 import httpx
 import typing
 
-from magic_hour.core import AsyncBaseClient, AuthBearer, SyncBaseClient
 from magic_hour.environment import Environment, _get_base_url
 from magic_hour.resources.v1 import AsyncV1Client, V1Client
+from make_api_request import AsyncBaseClient, AuthBearer, SyncBaseClient
 
 
 class Client:

magic_hour/environment.py

@@ -6,7 +6,7 @@ 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.36.0"
+    MOCK_SERVER = "https://api.sideko.dev/v1/mock/magichour/magic-hour/0.38.0"
 
 
 def _get_base_url(

magic_hour/resources/v1/ai_clothes_changer/client.py

@@ -1,13 +1,5 @@
 import typing
 
-from magic_hour.core import (
-    AsyncBaseClient,
-    RequestOptions,
-    SyncBaseClient,
-    default_request_options,
-    to_encodable,
-    type_utils,
-)
 from magic_hour.helpers.logger import get_sdk_logger
 from magic_hour.resources.v1.files.client import AsyncFilesClient, FilesClient
 from magic_hour.resources.v1.image_projects.client import (
@@ -15,6 +7,14 @@ from magic_hour.resources.v1.image_projects.client import (
     ImageProjectsClient,
 )
 from magic_hour.types import models, params
+from make_api_request import (
+    AsyncBaseClient,
+    RequestOptions,
+    SyncBaseClient,
+    default_request_options,
+    to_encodable,
+    type_utils,
+)
 
 
 logger = get_sdk_logger(__name__)

magic_hour/resources/v1/ai_face_editor/client.py

@@ -1,13 +1,5 @@
 import typing
 
-from magic_hour.core import (
-    AsyncBaseClient,
-    RequestOptions,
-    SyncBaseClient,
-    default_request_options,
-    to_encodable,
-    type_utils,
-)
 from magic_hour.helpers.logger import get_sdk_logger
 from magic_hour.resources.v1.files.client import AsyncFilesClient, FilesClient
 from magic_hour.resources.v1.image_projects.client import (
@@ -15,6 +7,14 @@ from magic_hour.resources.v1.image_projects.client import (
     ImageProjectsClient,
 )
 from magic_hour.types import models, params
+from make_api_request import (
+    AsyncBaseClient,
+    RequestOptions,
+    SyncBaseClient,
+    default_request_options,
+    to_encodable,
+    type_utils,
+)
 
 
 logger = get_sdk_logger(__name__)

magic_hour/resources/v1/ai_gif_generator/client.py

@@ -1,6 +1,13 @@
 import typing
+import typing_extensions
 
-from magic_hour.core import (
+from magic_hour.helpers.logger import get_sdk_logger
+from magic_hour.resources.v1.image_projects.client import (
+    AsyncImageProjectsClient,
+    ImageProjectsClient,
+)
+from magic_hour.types import models, params
+from make_api_request import (
     AsyncBaseClient,
     RequestOptions,
     SyncBaseClient,
@@ -8,12 +15,6 @@ from magic_hour.core import (
     to_encodable,
     type_utils,
 )
-from magic_hour.helpers.logger import get_sdk_logger
-from magic_hour.resources.v1.image_projects.client import (
-    AsyncImageProjectsClient,
-    ImageProjectsClient,
-)
-from magic_hour.types import models, params
 
 
 logger = get_sdk_logger(__name__)
@@ -85,6 +86,10 @@ class AiGifGeneratorClient:
         name: typing.Union[
             typing.Optional[str], type_utils.NotGiven
         ] = type_utils.NOT_GIVEN,
+        output_format: typing.Union[
+            typing.Optional[typing_extensions.Literal["gif", "mp4", "webm"]],
+            type_utils.NotGiven,
+        ] = type_utils.NOT_GIVEN,
         request_options: typing.Optional[RequestOptions] = None,
     ) -> models.V1AiGifGeneratorCreateResponse:
         """
@@ -96,6 +101,7 @@ class AiGifGeneratorClient:
 
         Args:
             name: The name of gif. This value is mainly used for your own identification of the gif.
+            output_format: The output file format for the generated animation.
             style: V1AiGifGeneratorCreateBodyStyle
             request_options: Additional options to customize the HTTP request
 
@@ -109,12 +115,14 @@ class AiGifGeneratorClient:
         Examples:
         ```py
         client.v1.ai_gif_generator.create(
-            style={"prompt": "Cute dancing cat, pixel art"}, name="Ai Gif gif"
+            style={"prompt": "Cute dancing cat, pixel art"},
+            name="Ai Gif gif",
+            output_format="gif",
         )
         ```
         """
         _json = to_encodable(
-            item={"name": name, "style": style},
+            item={"name": name, "output_format": output_format, "style": style},
             dump_with=params._SerializerV1AiGifGeneratorCreateBody,
         )
         return self._base_client.request(
@@ -193,6 +201,10 @@ class AsyncAiGifGeneratorClient:
         name: typing.Union[
             typing.Optional[str], type_utils.NotGiven
         ] = type_utils.NOT_GIVEN,
+        output_format: typing.Union[
+            typing.Optional[typing_extensions.Literal["gif", "mp4", "webm"]],
+            type_utils.NotGiven,
+        ] = type_utils.NOT_GIVEN,
         request_options: typing.Optional[RequestOptions] = None,
     ) -> models.V1AiGifGeneratorCreateResponse:
         """
@@ -204,6 +216,7 @@ class AsyncAiGifGeneratorClient:
 
         Args:
             name: The name of gif. This value is mainly used for your own identification of the gif.
+            output_format: The output file format for the generated animation.
             style: V1AiGifGeneratorCreateBodyStyle
             request_options: Additional options to customize the HTTP request
 
@@ -217,12 +230,14 @@ class AsyncAiGifGeneratorClient:
         Examples:
         ```py
         await client.v1.ai_gif_generator.create(
-            style={"prompt": "Cute dancing cat, pixel art"}, name="Ai Gif gif"
+            style={"prompt": "Cute dancing cat, pixel art"},
+            name="Ai Gif gif",
+            output_format="gif",
         )
         ```
         """
         _json = to_encodable(
-            item={"name": name, "style": style},
+            item={"name": name, "output_format": output_format, "style": style},
             dump_with=params._SerializerV1AiGifGeneratorCreateBody,
         )
         return await self._base_client.request(

magic_hour/resources/v1/ai_headshot_generator/client.py

@@ -1,13 +1,5 @@
 import typing
 
-from magic_hour.core import (
-    AsyncBaseClient,
-    RequestOptions,
-    SyncBaseClient,
-    default_request_options,
-    to_encodable,
-    type_utils,
-)
 from magic_hour.helpers.logger import get_sdk_logger
 from magic_hour.resources.v1.files.client import AsyncFilesClient, FilesClient
 from magic_hour.resources.v1.image_projects.client import (
@@ -15,6 +7,14 @@ from magic_hour.resources.v1.image_projects.client import (
     ImageProjectsClient,
 )
 from magic_hour.types import models, params
+from make_api_request import (
+    AsyncBaseClient,
+    RequestOptions,
+    SyncBaseClient,
+    default_request_options,
+    to_encodable,
+    type_utils,
+)
 
 
 logger = get_sdk_logger(__name__)

magic_hour/resources/v1/ai_image_editor/client.py

@@ -1,13 +1,5 @@
 import typing
 
-from magic_hour.core import (
-    AsyncBaseClient,
-    RequestOptions,
-    SyncBaseClient,
-    default_request_options,
-    to_encodable,
-    type_utils,
-)
 from magic_hour.helpers.logger import get_sdk_logger
 from magic_hour.resources.v1.files.client import AsyncFilesClient, FilesClient
 from magic_hour.resources.v1.image_projects.client import (
@@ -15,6 +7,14 @@ from magic_hour.resources.v1.image_projects.client import (
     ImageProjectsClient,
 )
 from magic_hour.types import models, params
+from make_api_request import (
+    AsyncBaseClient,
+    RequestOptions,
+    SyncBaseClient,
+    default_request_options,
+    to_encodable,
+    type_utils,
+)
 
 
 logger = get_sdk_logger(__name__)

magic_hour/resources/v1/ai_image_generator/client.py

@@ -1,7 +1,13 @@
 import typing
 import typing_extensions
 
-from magic_hour.core import (
+from magic_hour.helpers.logger import get_sdk_logger
+from magic_hour.resources.v1.image_projects.client import (
+    AsyncImageProjectsClient,
+    ImageProjectsClient,
+)
+from magic_hour.types import models, params
+from make_api_request import (
     AsyncBaseClient,
     RequestOptions,
     SyncBaseClient,
@@ -9,12 +15,6 @@ from magic_hour.core import (
     to_encodable,
     type_utils,
 )
-from magic_hour.helpers.logger import get_sdk_logger
-from magic_hour.resources.v1.image_projects.client import (
-    AsyncImageProjectsClient,
-    ImageProjectsClient,
-)
-from magic_hour.types import models, params
 
 
 logger = get_sdk_logger(__name__)

magic_hour/resources/v1/ai_image_upscaler/client.py

@@ -1,13 +1,5 @@
 import typing
 
-from magic_hour.core import (
-    AsyncBaseClient,
-    RequestOptions,
-    SyncBaseClient,
-    default_request_options,
-    to_encodable,
-    type_utils,
-)
 from magic_hour.helpers.logger import get_sdk_logger
 from magic_hour.resources.v1.files.client import AsyncFilesClient, FilesClient
 from magic_hour.resources.v1.image_projects.client import (
@@ -15,6 +7,14 @@ from magic_hour.resources.v1.image_projects.client import (
     ImageProjectsClient,
 )
 from magic_hour.types import models, params
+from make_api_request import (
+    AsyncBaseClient,
+    RequestOptions,
+    SyncBaseClient,
+    default_request_options,
+    to_encodable,
+    type_utils,
+)
 
 
 logger = get_sdk_logger(__name__)

magic_hour/resources/v1/ai_meme_generator/client.py

@@ -1,6 +1,12 @@
 import typing
 
-from magic_hour.core import (
+from magic_hour.helpers.logger import get_sdk_logger
+from magic_hour.resources.v1.image_projects.client import (
+    AsyncImageProjectsClient,
+    ImageProjectsClient,
+)
+from magic_hour.types import models, params
+from make_api_request import (
     AsyncBaseClient,
     RequestOptions,
     SyncBaseClient,
@@ -8,12 +14,6 @@ from magic_hour.core import (
     to_encodable,
     type_utils,
 )
-from magic_hour.helpers.logger import get_sdk_logger
-from magic_hour.resources.v1.image_projects.client import (
-    AsyncImageProjectsClient,
-    ImageProjectsClient,
-)
-from magic_hour.types import models, params
 
 
 logger = get_sdk_logger(__name__)

magic_hour/resources/v1/ai_photo_editor/client.py

@@ -1,13 +1,5 @@
 import typing
 
-from magic_hour.core import (
-    AsyncBaseClient,
-    RequestOptions,
-    SyncBaseClient,
-    default_request_options,
-    to_encodable,
-    type_utils,
-)
 from magic_hour.helpers.logger import get_sdk_logger
 from magic_hour.resources.v1.files.client import AsyncFilesClient, FilesClient
 from magic_hour.resources.v1.image_projects.client import (
@@ -15,6 +7,14 @@ from magic_hour.resources.v1.image_projects.client import (
     ImageProjectsClient,
 )
 from magic_hour.types import models, params
+from make_api_request import (
+    AsyncBaseClient,
+    RequestOptions,
+    SyncBaseClient,
+    default_request_options,
+    to_encodable,
+    type_utils,
+)
 
 
 logger = get_sdk_logger(__name__)

magic_hour/resources/v1/ai_qr_code_generator/client.py

@@ -1,6 +1,12 @@
 import typing
 
-from magic_hour.core import (
+from magic_hour.helpers.logger import get_sdk_logger
+from magic_hour.resources.v1.image_projects.client import (
+    AsyncImageProjectsClient,
+    ImageProjectsClient,
+)
+from magic_hour.types import models, params
+from make_api_request import (
     AsyncBaseClient,
     RequestOptions,
     SyncBaseClient,
@@ -8,12 +14,6 @@ from magic_hour.core import (
     to_encodable,
     type_utils,
 )
-from magic_hour.helpers.logger import get_sdk_logger
-from magic_hour.resources.v1.image_projects.client import (
-    AsyncImageProjectsClient,
-    ImageProjectsClient,
-)
-from magic_hour.types import models, params
 
 
 logger = get_sdk_logger(__name__)

magic_hour/resources/v1/ai_talking_photo/client.py

@@ -1,13 +1,5 @@
 import typing
 
-from magic_hour.core import (
-    AsyncBaseClient,
-    RequestOptions,
-    SyncBaseClient,
-    default_request_options,
-    to_encodable,
-    type_utils,
-)
 from magic_hour.helpers.logger import get_sdk_logger
 from magic_hour.resources.v1.files.client import AsyncFilesClient, FilesClient
 from magic_hour.resources.v1.video_projects.client import (
@@ -15,6 +7,14 @@ from magic_hour.resources.v1.video_projects.client import (
     VideoProjectsClient,
 )
 from magic_hour.types import models, params
+from make_api_request import (
+    AsyncBaseClient,
+    RequestOptions,
+    SyncBaseClient,
+    default_request_options,
+    to_encodable,
+    type_utils,
+)
 
 
 logger = get_sdk_logger(__name__)

magic_hour/resources/v1/animation/client.py

@@ -1,13 +1,5 @@
 import typing
 
-from magic_hour.core import (
-    AsyncBaseClient,
-    RequestOptions,
-    SyncBaseClient,
-    default_request_options,
-    to_encodable,
-    type_utils,
-)
 from magic_hour.helpers.logger import get_sdk_logger
 from magic_hour.resources.v1.files.client import AsyncFilesClient, FilesClient
 from magic_hour.resources.v1.video_projects.client import (
@@ -15,6 +7,14 @@ from magic_hour.resources.v1.video_projects.client import (
     VideoProjectsClient,
 )
 from magic_hour.types import models, params
+from make_api_request import (
+    AsyncBaseClient,
+    RequestOptions,
+    SyncBaseClient,
+    default_request_options,
+    to_encodable,
+    type_utils,
+)
 
 
 logger = get_sdk_logger(__name__)

magic_hour/resources/v1/auto_subtitle_generator/client.py

@@ -1,13 +1,5 @@
 import typing
 
-from magic_hour.core import (
-    AsyncBaseClient,
-    RequestOptions,
-    SyncBaseClient,
-    default_request_options,
-    to_encodable,
-    type_utils,
-)
 from magic_hour.helpers.logger import get_sdk_logger
 from magic_hour.resources.v1.files.client import AsyncFilesClient, FilesClient
 from magic_hour.resources.v1.video_projects.client import (
@@ -15,6 +7,14 @@ from magic_hour.resources.v1.video_projects.client import (
     VideoProjectsClient,
 )
 from magic_hour.types import models, params
+from make_api_request import (
+    AsyncBaseClient,
+    RequestOptions,
+    SyncBaseClient,
+    default_request_options,
+    to_encodable,
+    type_utils,
+)
 
 
 logger = get_sdk_logger(__name__)

magic_hour/resources/v1/client.py

@@ -1,4 +1,3 @@
-from magic_hour.core import AsyncBaseClient, SyncBaseClient
 from magic_hour.resources.v1.ai_clothes_changer import (
     AiClothesChangerClient,
     AsyncAiClothesChangerClient,
@@ -87,6 +86,7 @@ from magic_hour.resources.v1.video_to_video import (
     AsyncVideoToVideoClient,
     VideoToVideoClient,
 )
+from make_api_request import AsyncBaseClient, SyncBaseClient
 
 
 class V1Client:

magic_hour/resources/v1/face_detection/client.py

@@ -4,7 +4,11 @@ import pydantic
 import time
 import typing
 
-from magic_hour.core import (
+from magic_hour.helpers.download import download_files_async, download_files_sync
+from magic_hour.helpers.logger import get_sdk_logger
+from magic_hour.resources.v1.files import AsyncFilesClient, FilesClient
+from magic_hour.types import models, params
+from make_api_request import (
     AsyncBaseClient,
     RequestOptions,
     SyncBaseClient,
@@ -12,10 +16,6 @@ from magic_hour.core import (
     to_encodable,
     type_utils,
 )
-from magic_hour.helpers.download import download_files_async, download_files_sync
-from magic_hour.helpers.logger import get_sdk_logger
-from magic_hour.resources.v1.files import AsyncFilesClient, FilesClient
-from magic_hour.types import models, params
 
 
 logger = get_sdk_logger(__name__)

magic_hour/resources/v1/face_swap/client.py

@@ -1,13 +1,5 @@
 import typing
 
-from magic_hour.core import (
-    AsyncBaseClient,
-    RequestOptions,
-    SyncBaseClient,
-    default_request_options,
-    to_encodable,
-    type_utils,
-)
 from magic_hour.helpers.logger import get_sdk_logger
 from magic_hour.resources.v1.files.client import AsyncFilesClient, FilesClient
 from magic_hour.resources.v1.video_projects.client import (
@@ -15,6 +7,14 @@ from magic_hour.resources.v1.video_projects.client import (
     VideoProjectsClient,
 )
 from magic_hour.types import models, params
+from make_api_request import (
+    AsyncBaseClient,
+    RequestOptions,
+    SyncBaseClient,
+    default_request_options,
+    to_encodable,
+    type_utils,
+)
 
 
 logger = get_sdk_logger(__name__)

magic_hour/resources/v1/face_swap_photo/client.py

@@ -1,13 +1,5 @@
 import typing
 
-from magic_hour.core import (
-    AsyncBaseClient,
-    RequestOptions,
-    SyncBaseClient,
-    default_request_options,
-    to_encodable,
-    type_utils,
-)
 from magic_hour.helpers.logger import get_sdk_logger
 from magic_hour.resources.v1.files.client import AsyncFilesClient, FilesClient
 from magic_hour.resources.v1.image_projects.client import (
@@ -15,6 +7,14 @@ from magic_hour.resources.v1.image_projects.client import (
     ImageProjectsClient,
 )
 from magic_hour.types import models, params
+from make_api_request import (
+    AsyncBaseClient,
+    RequestOptions,
+    SyncBaseClient,
+    default_request_options,
+    to_encodable,
+    type_utils,
+)
 
 
 logger = get_sdk_logger(__name__)

magic_hour/resources/v1/files/client.py

@@ -6,7 +6,6 @@ import pathlib
 import typing
 import typing_extensions
 
-from magic_hour.core import AsyncBaseClient, SyncBaseClient
 from magic_hour.helpers.logger import get_sdk_logger
 from magic_hour.resources.v1.files.upload_urls import (
     AsyncUploadUrlsClient,
@@ -15,6 +14,7 @@ from magic_hour.resources.v1.files.upload_urls import (
 from magic_hour.types.params.v1_files_upload_urls_create_body_items_item import (
     V1FilesUploadUrlsCreateBodyItemsItem,
 )
+from make_api_request import AsyncBaseClient, SyncBaseClient
 from pathlib import Path
 
 

magic_hour/resources/v1/files/upload_urls/client.py

@@ -1,13 +1,13 @@
 import typing
 
-from magic_hour.core import (
+from magic_hour.types import models, params
+from make_api_request import (
     AsyncBaseClient,
     RequestOptions,
     SyncBaseClient,
     default_request_options,
     to_encodable,
 )
-from magic_hour.types import models, params
 
 
 class UploadUrlsClient:

magic_hour/resources/v1/image_background_remover/client.py

@@ -1,13 +1,5 @@
 import typing
 
-from magic_hour.core import (
-    AsyncBaseClient,
-    RequestOptions,
-    SyncBaseClient,
-    default_request_options,
-    to_encodable,
-    type_utils,
-)
 from magic_hour.helpers.logger import get_sdk_logger
 from magic_hour.resources.v1.files.client import AsyncFilesClient, FilesClient
 from magic_hour.resources.v1.image_projects.client import (
@@ -15,6 +7,14 @@ from magic_hour.resources.v1.image_projects.client import (
     ImageProjectsClient,
 )
 from magic_hour.types import models, params
+from make_api_request import (
+    AsyncBaseClient,
+    RequestOptions,
+    SyncBaseClient,
+    default_request_options,
+    to_encodable,
+    type_utils,
+)
 
 
 logger = get_sdk_logger(__name__)

magic_hour/resources/v1/image_projects/client.py

@@ -4,15 +4,15 @@ import pydantic
 import time
 import typing
 
-from magic_hour.core import (
+from magic_hour.helpers.download import download_files_async, download_files_sync
+from magic_hour.helpers.logger import get_sdk_logger
+from magic_hour.types import models
+from make_api_request import (
     AsyncBaseClient,
     RequestOptions,
     SyncBaseClient,
     default_request_options,
 )
-from magic_hour.helpers.download import download_files_async, download_files_sync
-from magic_hour.helpers.logger import get_sdk_logger
-from magic_hour.types import models
 
 
 logger = get_sdk_logger(__name__)

magic_hour/resources/v1/image_to_video/client.py

@@ -1,14 +1,6 @@
 import typing
 import typing_extensions
 
-from magic_hour.core import (
-    AsyncBaseClient,
-    RequestOptions,
-    SyncBaseClient,
-    default_request_options,
-    to_encodable,
-    type_utils,
-)
 from magic_hour.helpers.logger import get_sdk_logger
 from magic_hour.resources.v1.files.client import AsyncFilesClient, FilesClient
 from magic_hour.resources.v1.video_projects.client import (
@@ -16,6 +8,14 @@ from magic_hour.resources.v1.video_projects.client import (
     VideoProjectsClient,
 )
 from magic_hour.types import models, params
+from make_api_request import (
+    AsyncBaseClient,
+    RequestOptions,
+    SyncBaseClient,
+    default_request_options,
+    to_encodable,
+    type_utils,
+)
 
 
 logger = get_sdk_logger(__name__)