5.1.3 photomaker

prodiapy/__init__.py

@@ -1,3 +1,4 @@
+
 from . import _exceptions, resources, aio
 from .resources.logger import logger
 from ._client import Prodia

prodiapy/_client.py

@@ -39,6 +39,7 @@ def __init__(
 
         general = resources.General(self)
 
+        self.photomaker = general.photomaker
         self.faceswap = general.faceswap
         self.upscale = general.upscale
         self.create = general.create

prodiapy/aio.py

@@ -38,6 +38,7 @@ def __init__(
 
         general = resources.AsyncGeneral(self)
 
+        self.photomaker = general.photomaker
         self.faceswap = general.faceswap
         self.upscale = general.upscale
         self.create = general.create

prodiapy/resources/__init__.py

@@ -1,7 +1,3 @@
 from .logger import logger
-from .stablediffusion import StableDiffusion, AsyncStableDiffusion
-from .stablediffusionxl import StableDiffusionXL, AsyncStableDiffusionXL
-from .upscale import Upscale, AsyncUpscale
-from .faceswap import FaceSwap, AsyncFaceSwap
-from .facerestore import FaceRestore, AsyncFaceRestore
+from .stablediffusion import StableDiffusion, StableDiffusionXL, AsyncStableDiffusion, AsyncStableDiffusionXL
 from .general import General, AsyncGeneral

prodiapy/resources/engine.py

@@ -1,3 +1,4 @@
+
 import aiohttp
 import requests
 from typing import Literal, Optional, Union
@@ -46,7 +47,3 @@ def __init__(self, client: Union[SyncAPIClient, AsyncAPIClient]) -> None:
         self._client = client
         self._get = client.get
         self._post = client.post
-
-
-
-

prodiapy/resources/general.py

@@ -4,6 +4,7 @@
 from prodiapy.resources.facerestore import FaceRestore, AsyncFaceRestore
 from prodiapy.resources.faceswap import FaceSwap, AsyncFaceSwap
 from prodiapy.resources.upscale import Upscale, AsyncUpscale
+from prodiapy.resources.photomaker import PhotoMaker, AsyncPhotoMaker
 from prodiapy.resources.response import ProdiaResponse
 from prodiapy.resources.utils import form_body
 from prodiapy.resources import logger
@@ -21,6 +22,7 @@ class General(APIResource):
 
     def __init__(self, client: SyncAPIClient) -> None:
         super().__init__(client)
+        self.photomaker = PhotoMaker(client).photomaker
         self.facerestore = FaceRestore(client).facerestore
         self.faceswap = FaceSwap(client).faceswap
         self.upscale = Upscale(client).upscale
@@ -106,6 +108,7 @@ class AsyncGeneral(APIResource):
 
     def __init__(self, client: AsyncAPIClient) -> None:
         super().__init__(client)
+        self.photomaker = AsyncPhotoMaker(client).photomaker
         self.facerestore = AsyncFaceRestore(client).facerestore
         self.faceswap = AsyncFaceSwap(client).faceswap
         self.upscale = AsyncUpscale(client).upscale

prodiapy/resources/photomaker.py

@@ -0,0 +1,85 @@
+
+from prodiapy.resources.engine import APIResource, SyncAPIClient, AsyncAPIClient
+from typing import Union, Literal, Optional
+from prodiapy.resources.utils import form_body
+
+
+class PhotoMaker(APIResource):
+    def __init__(self, client: SyncAPIClient) -> None:
+        super().__init__(client)
+
+    def photomaker(
+            self,
+            image_urls: Optional[list[str]] = None,
+            image_data: Optional[list[str]] = None,
+            prompt: Optional[str] = None,
+            negative_prompt: Optional[str] = None,
+            style_preset: Optional[str] = None,
+            strength: Optional[int] = None,
+            steps: Optional[int] = None,
+            seed: Optional[int] = None,
+            dict_parameters: Optional[dict] = None,
+            **kwargs
+    ) -> dict:
+        """
+        Generate images with character consistency, source: https://docs.prodia.com/reference/photomaker
+
+        Returns:
+            Python dictionary containing job id
+        """
+        return self._post(
+            "/photomaker",
+            body=form_body(
+                dict_parameters=dict_parameters,
+                imageUrls=image_urls,
+                imageData=image_data,
+                prompt=prompt,
+                negative_prompt=negative_prompt,
+                style_preset=style_preset,
+                strength=strength,
+                steps=steps,
+                seed=seed,
+                **kwargs
+            )
+        )
+
+
+class AsyncPhotoMaker(APIResource):
+    def __init__(self, client: AsyncAPIClient) -> None:
+        super().__init__(client)
+
+    async def photomaker(
+            self,
+            image_urls: Optional[list[str]] = None,
+            image_data: Optional[list[str]] = None,
+            prompt: Optional[str] = None,
+            negative_prompt: Optional[str] = None,
+            style_preset: Optional[str] = None,
+            strength: Optional[int] = None,
+            steps: Optional[int] = None,
+            seed: Optional[int] = None,
+            dict_parameters: Optional[dict] = None,
+            **kwargs
+    ) -> dict:
+        """
+        Generate images with character consistency, source: https://docs.prodia.com/reference/photomaker
+
+        Returns:
+            Python dictionary containing job id
+        """
+        return await self._post(
+            "/upscale",
+            body=form_body(
+                dict_parameters=dict_parameters,
+                imageUrls=image_urls,
+                imageData=image_data,
+                prompt=prompt,
+                negative_prompt=negative_prompt,
+                style_preset=style_preset,
+                strength=strength,
+                steps=steps,
+                seed=seed,
+                **kwargs
+            )
+        )
+

prodiapy/resources/response.py

@@ -8,10 +8,10 @@ class ProdiaResponse:
         job_id: id of the job
         image_url: URL of generated image
         failed: is job failed or not(boolean)
-        json: JSON response(raw)
+        json: JSON response(dictionary)
     """
     def __init__(self, output: dict):
-        self.job_id = output.get('job')
-        self.image_url = output.get('imageUrl')
-        self.failed = output.get('failed', False)
-        self.json = output
+        self.job_id: str | None = output.get('job')
+        self.image_url: str | None = output.get('imageUrl')
+        self.failed: bool = output.get('failed', False)
+        self.json: dict = output

prodiapy/resources/stablediffusion/__init__.py

@@ -0,0 +1,2 @@
+from .sd15 import StableDiffusion, AsyncStableDiffusion
+from .sdxl import StableDiffusionXL, AsyncStableDiffusionXL

prodiapy/resources/stablediffusion.py → prodiapy/resources/stablediffusion/sd15.py

@@ -1,8 +1,7 @@
 from __future__ import annotations
 
-from prodiapy.resources.engine import APIResource
 from typing import Union, Optional, Literal
-from prodiapy.resources.stablediffusiongeneral import StableDiffusionGeneral, AsyncStableDiffusionGeneral
+from prodiapy.resources.stablediffusion.template import StableDiffusionGeneral, AsyncStableDiffusionGeneral
 from prodiapy.resources.engine import SyncAPIClient, AsyncAPIClient
 from prodiapy.resources.utils import form_body
 

prodiapy/resources/stablediffusionxl.py → prodiapy/resources/stablediffusion/sdxl.py

@@ -1,5 +1,5 @@
 
-from prodiapy.resources.stablediffusiongeneral import StableDiffusionGeneral, AsyncStableDiffusionGeneral
+from prodiapy.resources.stablediffusion.template import StableDiffusionGeneral, AsyncStableDiffusionGeneral
 
 
 class StableDiffusionXL(StableDiffusionGeneral):

prodiapy/resources/utils.py

@@ -1,26 +1,16 @@
+
 from typing import Optional
 from prodiapy._exceptions import *
 
 
-def form_body(dict_parameters: Optional[dict] = None, **kwargs):
-    if dict_parameters:
-        body = dict_parameters
-    else:
-        body = {}
-        for kwarg in kwargs:
-            if kwargs.get(kwarg) is not None:
-                body[kwarg] = kwargs.get(kwarg)
-
-    return body
+def form_body(dict_parameters: Optional[dict] = None, **kwargs) -> dict:
+    return dict_parameters or {k: v for k, v in kwargs.items() if v is not None}
 
 
 def raise_exception(status: int, message: str) -> None:
     message_body = f"Prodia API returned {status}. Details: {message}"
-    if status == 200:
-        pass
-    elif status in exception_vocab:
-        raise exception_vocab[status](message_body)
-    else:
-        raise UnknownError(message_body)
+    exception = exception_vocab.get(status, UnknownError)
+    if status != 200:
+        raise exception(message_body)
 
 

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "prodiapy"
-version = "5.1.2"
+version = "5.1.3"
 description = "Package for using Prodia API"
 authors = ["zenafey <[email protected]>"]
 readme = "README.md"