magic_hour 0.36.1__py3-none-any.whl → 0.37.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.37.0"
 
 
 def _get_base_url(

magic_hour/helpers/__init__.py

@@ -1,3 +1,4 @@
 from .download import download_files_sync, download_files_async
+from .logger import get_sdk_logger
 
-__all__ = ["download_files_sync", "download_files_async"]
+__all__ = ["download_files_sync", "download_files_async", "get_sdk_logger"]

magic_hour/helpers/logger.py

@@ -0,0 +1,8 @@
+import logging
+
+
+def get_sdk_logger(name: str) -> logging.Logger:
+    logger = logging.getLogger(name)
+    logger.addHandler(logging.NullHandler())  # safe default
+    logger.propagate = True
+    return logger

magic_hour/resources/v1/ai_clothes_changer/client.py

@@ -1,7 +1,13 @@
-import logging
 import typing
 
-from magic_hour.core import (
+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 (
+    AsyncImageProjectsClient,
+    ImageProjectsClient,
+)
+from magic_hour.types import models, params
+from make_api_request import (
     AsyncBaseClient,
     RequestOptions,
     SyncBaseClient,
@@ -9,16 +15,9 @@ from magic_hour.core import (
     to_encodable,
     type_utils,
 )
-from magic_hour.resources.v1.files.client import AsyncFilesClient, FilesClient
-from magic_hour.resources.v1.image_projects.client import (
-    AsyncImageProjectsClient,
-    ImageProjectsClient,
-)
-from magic_hour.types import models, params
 
 
-logging.basicConfig(level=logging.INFO)
-logger = logging.getLogger(__name__)
+logger = get_sdk_logger(__name__)
 
 
 class AiClothesChangerClient:

magic_hour/resources/v1/ai_face_editor/client.py

@@ -1,7 +1,13 @@
-import logging
 import typing
 
-from magic_hour.core import (
+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 (
+    AsyncImageProjectsClient,
+    ImageProjectsClient,
+)
+from magic_hour.types import models, params
+from make_api_request import (
     AsyncBaseClient,
     RequestOptions,
     SyncBaseClient,
@@ -9,16 +15,9 @@ from magic_hour.core import (
     to_encodable,
     type_utils,
 )
-from magic_hour.resources.v1.files.client import AsyncFilesClient, FilesClient
-from magic_hour.resources.v1.image_projects.client import (
-    AsyncImageProjectsClient,
-    ImageProjectsClient,
-)
-from magic_hour.types import models, params
 
 
-logging.basicConfig(level=logging.INFO)
-logger = logging.getLogger(__name__)
+logger = get_sdk_logger(__name__)
 
 
 class AiFaceEditorClient:

magic_hour/resources/v1/ai_gif_generator/client.py

@@ -1,7 +1,12 @@
-import logging
 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,
@@ -9,15 +14,9 @@ from magic_hour.core import (
     to_encodable,
     type_utils,
 )
-from magic_hour.resources.v1.image_projects.client import (
-    AsyncImageProjectsClient,
-    ImageProjectsClient,
-)
-from magic_hour.types import models, params
 
 
-logging.basicConfig(level=logging.INFO)
-logger = logging.getLogger(__name__)
+logger = get_sdk_logger(__name__)
 
 
 class AiGifGeneratorClient:

magic_hour/resources/v1/ai_headshot_generator/client.py

@@ -1,7 +1,13 @@
-import logging
 import typing
 
-from magic_hour.core import (
+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 (
+    AsyncImageProjectsClient,
+    ImageProjectsClient,
+)
+from magic_hour.types import models, params
+from make_api_request import (
     AsyncBaseClient,
     RequestOptions,
     SyncBaseClient,
@@ -9,16 +15,9 @@ from magic_hour.core import (
     to_encodable,
     type_utils,
 )
-from magic_hour.resources.v1.files.client import AsyncFilesClient, FilesClient
-from magic_hour.resources.v1.image_projects.client import (
-    AsyncImageProjectsClient,
-    ImageProjectsClient,
-)
-from magic_hour.types import models, params
 
 
-logging.basicConfig(level=logging.INFO)
-logger = logging.getLogger(__name__)
+logger = get_sdk_logger(__name__)
 
 
 class AiHeadshotGeneratorClient:

magic_hour/resources/v1/ai_image_editor/client.py

@@ -1,7 +1,13 @@
-import logging
 import typing
 
-from magic_hour.core import (
+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 (
+    AsyncImageProjectsClient,
+    ImageProjectsClient,
+)
+from magic_hour.types import models, params
+from make_api_request import (
     AsyncBaseClient,
     RequestOptions,
     SyncBaseClient,
@@ -9,16 +15,9 @@ from magic_hour.core import (
     to_encodable,
     type_utils,
 )
-from magic_hour.resources.v1.files.client import AsyncFilesClient, FilesClient
-from magic_hour.resources.v1.image_projects.client import (
-    AsyncImageProjectsClient,
-    ImageProjectsClient,
-)
-from magic_hour.types import models, params
 
 
-logging.basicConfig(level=logging.INFO)
-logger = logging.getLogger(__name__)
+logger = get_sdk_logger(__name__)
 
 
 class AiImageEditorClient:

magic_hour/resources/v1/ai_image_generator/client.py

@@ -1,8 +1,13 @@
-import logging
 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,
@@ -10,15 +15,9 @@ from magic_hour.core import (
     to_encodable,
     type_utils,
 )
-from magic_hour.resources.v1.image_projects.client import (
-    AsyncImageProjectsClient,
-    ImageProjectsClient,
-)
-from magic_hour.types import models, params
 
 
-logging.basicConfig(level=logging.INFO)
-logger = logging.getLogger(__name__)
+logger = get_sdk_logger(__name__)
 
 
 class AiImageGeneratorClient:

magic_hour/resources/v1/ai_image_upscaler/client.py

@@ -1,7 +1,13 @@
-import logging
 import typing
 
-from magic_hour.core import (
+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 (
+    AsyncImageProjectsClient,
+    ImageProjectsClient,
+)
+from magic_hour.types import models, params
+from make_api_request import (
     AsyncBaseClient,
     RequestOptions,
     SyncBaseClient,
@@ -9,16 +15,9 @@ from magic_hour.core import (
     to_encodable,
     type_utils,
 )
-from magic_hour.resources.v1.files.client import AsyncFilesClient, FilesClient
-from magic_hour.resources.v1.image_projects.client import (
-    AsyncImageProjectsClient,
-    ImageProjectsClient,
-)
-from magic_hour.types import models, params
 
 
-logging.basicConfig(level=logging.INFO)
-logger = logging.getLogger(__name__)
+logger = get_sdk_logger(__name__)
 
 
 class AiImageUpscalerClient:

magic_hour/resources/v1/ai_meme_generator/client.py

@@ -1,7 +1,12 @@
-import logging
 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,
@@ -9,15 +14,9 @@ from magic_hour.core import (
     to_encodable,
     type_utils,
 )
-from magic_hour.resources.v1.image_projects.client import (
-    AsyncImageProjectsClient,
-    ImageProjectsClient,
-)
-from magic_hour.types import models, params
 
 
-logging.basicConfig(level=logging.INFO)
-logger = logging.getLogger(__name__)
+logger = get_sdk_logger(__name__)
 
 
 class AiMemeGeneratorClient:

magic_hour/resources/v1/ai_photo_editor/client.py

@@ -1,7 +1,13 @@
-import logging
 import typing
 
-from magic_hour.core import (
+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 (
+    AsyncImageProjectsClient,
+    ImageProjectsClient,
+)
+from magic_hour.types import models, params
+from make_api_request import (
     AsyncBaseClient,
     RequestOptions,
     SyncBaseClient,
@@ -9,16 +15,9 @@ from magic_hour.core import (
     to_encodable,
     type_utils,
 )
-from magic_hour.resources.v1.files.client import AsyncFilesClient, FilesClient
-from magic_hour.resources.v1.image_projects.client import (
-    AsyncImageProjectsClient,
-    ImageProjectsClient,
-)
-from magic_hour.types import models, params
 
 
-logging.basicConfig(level=logging.INFO)
-logger = logging.getLogger(__name__)
+logger = get_sdk_logger(__name__)
 
 
 class AiPhotoEditorClient:

magic_hour/resources/v1/ai_qr_code_generator/client.py

@@ -1,7 +1,12 @@
-import logging
 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,
@@ -9,15 +14,9 @@ from magic_hour.core import (
     to_encodable,
     type_utils,
 )
-from magic_hour.resources.v1.image_projects.client import (
-    AsyncImageProjectsClient,
-    ImageProjectsClient,
-)
-from magic_hour.types import models, params
 
 
-logging.basicConfig(level=logging.INFO)
-logger = logging.getLogger(__name__)
+logger = get_sdk_logger(__name__)
 
 
 class AiQrCodeGeneratorClient:

magic_hour/resources/v1/ai_talking_photo/client.py

@@ -1,7 +1,13 @@
-import logging
 import typing
 
-from magic_hour.core import (
+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 (
+    AsyncVideoProjectsClient,
+    VideoProjectsClient,
+)
+from magic_hour.types import models, params
+from make_api_request import (
     AsyncBaseClient,
     RequestOptions,
     SyncBaseClient,
@@ -9,16 +15,9 @@ from magic_hour.core import (
     to_encodable,
     type_utils,
 )
-from magic_hour.resources.v1.files.client import AsyncFilesClient, FilesClient
-from magic_hour.resources.v1.video_projects.client import (
-    AsyncVideoProjectsClient,
-    VideoProjectsClient,
-)
-from magic_hour.types import models, params
 
 
-logging.basicConfig(level=logging.INFO)
-logger = logging.getLogger(__name__)
+logger = get_sdk_logger(__name__)
 
 
 class AiTalkingPhotoClient:

magic_hour/resources/v1/animation/client.py

@@ -1,7 +1,13 @@
-import logging
 import typing
 
-from magic_hour.core import (
+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 (
+    AsyncVideoProjectsClient,
+    VideoProjectsClient,
+)
+from magic_hour.types import models, params
+from make_api_request import (
     AsyncBaseClient,
     RequestOptions,
     SyncBaseClient,
@@ -9,16 +15,9 @@ from magic_hour.core import (
     to_encodable,
     type_utils,
 )
-from magic_hour.resources.v1.files.client import AsyncFilesClient, FilesClient
-from magic_hour.resources.v1.video_projects.client import (
-    AsyncVideoProjectsClient,
-    VideoProjectsClient,
-)
-from magic_hour.types import models, params
 
 
-logging.basicConfig(level=logging.INFO)
-logger = logging.getLogger(__name__)
+logger = get_sdk_logger(__name__)
 
 
 class AnimationClient:

magic_hour/resources/v1/auto_subtitle_generator/client.py

@@ -1,7 +1,13 @@
-import logging
 import typing
 
-from magic_hour.core import (
+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 (
+    AsyncVideoProjectsClient,
+    VideoProjectsClient,
+)
+from magic_hour.types import models, params
+from make_api_request import (
     AsyncBaseClient,
     RequestOptions,
     SyncBaseClient,
@@ -9,16 +15,9 @@ from magic_hour.core import (
     to_encodable,
     type_utils,
 )
-from magic_hour.resources.v1.files.client import AsyncFilesClient, FilesClient
-from magic_hour.resources.v1.video_projects.client import (
-    AsyncVideoProjectsClient,
-    VideoProjectsClient,
-)
-from magic_hour.types import models, params
 
 
-logging.basicConfig(level=logging.INFO)
-logger = logging.getLogger(__name__)
+logger = get_sdk_logger(__name__)
 
 
 class AutoSubtitleGeneratorClient:

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

@@ -1,11 +1,14 @@
 import asyncio
-import logging
 import os
 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,
@@ -13,12 +16,9 @@ from magic_hour.core import (
     to_encodable,
     type_utils,
 )
-from magic_hour.helpers.download import download_files_async, download_files_sync
-from magic_hour.resources.v1.files import AsyncFilesClient, FilesClient
-from magic_hour.types import models, params
 
 
-logger = logging.getLogger(__name__)
+logger = get_sdk_logger(__name__)
 
 
 class V1FaceDetectionGetResponseWithDownloads(models.V1FaceDetectionGetResponse):

magic_hour/resources/v1/face_swap/client.py

@@ -1,7 +1,13 @@
-import logging
 import typing
 
-from magic_hour.core import (
+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 (
+    AsyncVideoProjectsClient,
+    VideoProjectsClient,
+)
+from magic_hour.types import models, params
+from make_api_request import (
     AsyncBaseClient,
     RequestOptions,
     SyncBaseClient,
@@ -9,16 +15,9 @@ from magic_hour.core import (
     to_encodable,
     type_utils,
 )
-from magic_hour.resources.v1.files.client import AsyncFilesClient, FilesClient
-from magic_hour.resources.v1.video_projects.client import (
-    AsyncVideoProjectsClient,
-    VideoProjectsClient,
-)
-from magic_hour.types import models, params
 
 
-logging.basicConfig(level=logging.INFO)
-logger = logging.getLogger(__name__)
+logger = get_sdk_logger(__name__)
 
 
 class FaceSwapClient:

magic_hour/resources/v1/face_swap_photo/client.py

@@ -1,7 +1,13 @@
-import logging
 import typing
 
-from magic_hour.core import (
+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 (
+    AsyncImageProjectsClient,
+    ImageProjectsClient,
+)
+from magic_hour.types import models, params
+from make_api_request import (
     AsyncBaseClient,
     RequestOptions,
     SyncBaseClient,
@@ -9,16 +15,9 @@ from magic_hour.core import (
     to_encodable,
     type_utils,
 )
-from magic_hour.resources.v1.files.client import AsyncFilesClient, FilesClient
-from magic_hour.resources.v1.image_projects.client import (
-    AsyncImageProjectsClient,
-    ImageProjectsClient,
-)
-from magic_hour.types import models, params
 
 
-logging.basicConfig(level=logging.INFO)
-logger = logging.getLogger(__name__)
+logger = get_sdk_logger(__name__)
 
 
 class FaceSwapPhotoClient:

magic_hour/resources/v1/files/client.py

@@ -1,13 +1,12 @@
 import httpx
 import io
-import logging
 import mimetypes
 import os
 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,
     UploadUrlsClient,
@@ -15,10 +14,11 @@ 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
 
 
-logger = logging.getLogger(__name__)
+logger = get_sdk_logger(__name__)
 
 
 def _get_file_type_and_extension(file_path: str):

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,7 +1,13 @@
-import logging
 import typing
 
-from magic_hour.core import (
+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 (
+    AsyncImageProjectsClient,
+    ImageProjectsClient,
+)
+from magic_hour.types import models, params
+from make_api_request import (
     AsyncBaseClient,
     RequestOptions,
     SyncBaseClient,
@@ -9,16 +15,9 @@ from magic_hour.core import (
     to_encodable,
     type_utils,
 )
-from magic_hour.resources.v1.files.client import AsyncFilesClient, FilesClient
-from magic_hour.resources.v1.image_projects.client import (
-    AsyncImageProjectsClient,
-    ImageProjectsClient,
-)
-from magic_hour.types import models, params
 
 
-logging.basicConfig(level=logging.INFO)
-logger = logging.getLogger(__name__)
+logger = get_sdk_logger(__name__)
 
 
 class ImageBackgroundRemoverClient: