Release Candidate v4.6.0 (#256)

Author: milosmns

.version

@@ -1 +1 @@
-4.5.0
+4.6.0

Pipfile.lock

@@ -35,7 +35,6 @@
     from features.chat.currency_alert_service import CurrencyAlertService
     from features.chat.dev_announcements_service import DevAnnouncementsService
     from features.chat.llm_tools.llm_tool_library import LLMToolLibrary
-    from features.chat.smart_stable_diffusion_generator import SmartStableDiffusionGenerator
     from features.chat.telegram.domain_langchain_mapper import DomainLangchainMapper
     from features.chat.telegram.sdk.telegram_bot_api import TelegramBotAPI
     from features.chat.telegram.sdk.telegram_bot_sdk import TelegramBotSDK
@@ -56,6 +55,7 @@
     from features.images.image_editor import ImageEditor
     from features.images.image_uploader import ImageUploader
     from features.images.simple_stable_diffusion_generator import SimpleStableDiffusionGenerator
+    from features.images.smart_stable_diffusion_generator import SmartStableDiffusionGenerator
     from features.integrations.platform_bot_sdk import PlatformBotSDK
     from features.sponsorships.sponsorship_service import SponsorshipService
     from features.support.user_support_service import UserSupportService
@@ -555,18 +555,22 @@ def smart_stable_diffusion_generator(
         raw_prompt: str,
         configured_copywriter_tool: ConfiguredTool,
         configured_image_gen_tool: ConfiguredTool,
+        aspect_ratio: str | None = None,
     ) -> "SmartStableDiffusionGenerator":
-        from features.chat.smart_stable_diffusion_generator import SmartStableDiffusionGenerator
-        return SmartStableDiffusionGenerator(raw_prompt, configured_copywriter_tool, configured_image_gen_tool, self)
+        from features.images.smart_stable_diffusion_generator import SmartStableDiffusionGenerator
+        return SmartStableDiffusionGenerator(
+            raw_prompt, configured_copywriter_tool, configured_image_gen_tool, self, aspect_ratio,
+        )
 
     # noinspection PyMethodMayBeStatic
     def simple_stable_diffusion_generator(
         self,
         prompt: str,
         configured_tool: ConfiguredTool,
+        aspect_ratio: str | None = None,
     ) -> "SimpleStableDiffusionGenerator":
         from features.images.simple_stable_diffusion_generator import SimpleStableDiffusionGenerator
-        return SimpleStableDiffusionGenerator(prompt, configured_tool, self)
+        return SimpleStableDiffusionGenerator(prompt, configured_tool, self, aspect_ratio)
 
     # noinspection PyMethodMayBeStatic
     def image_uploader(
@@ -593,9 +597,10 @@ def chat_imaging_service(
         attachment_ids: list[str],
         operation_name: str,
         operation_guidance: str | None,
+        aspect_ratio: str | None = None,
     ) -> "ChatImagingService":
         from features.chat.chat_imaging_service import ChatImagingService
-        return ChatImagingService(attachment_ids, operation_name, operation_guidance, self)
+        return ChatImagingService(attachment_ids, operation_name, operation_guidance, aspect_ratio, self)
 
     # noinspection PyMethodMayBeStatic
     def image_editor(
@@ -604,9 +609,10 @@ def image_editor(
         configured_tool: ConfiguredTool,
         context: str | None = None,
         mime_type: str | None = None,
+        aspect_ratio: str | None = None,
     ) -> "ImageEditor":
         from features.images.image_editor import ImageEditor
-        return ImageEditor(image_url, configured_tool, context, mime_type)
+        return ImageEditor(image_url, configured_tool, context, mime_type, aspect_ratio)
 
     # noinspection PyMethodMayBeStatic
     def image_background_remover(

src/di/di.py

@@ -2,6 +2,7 @@
 
 from db.schema.chat_message_attachment import ChatMessageAttachment
 from di.di import DI
+from features.images.aspect_ratio_utils import validate_aspect_ratio
 from features.images.image_background_remover import ImageBackgroundRemover
 from features.images.image_contents_restorer import ImageContentsRestorer
 from features.images.image_editor import ImageEditor
@@ -37,13 +38,15 @@ def resolve(operation: str) -> "ChatImagingService.Operation":
     __attachments: list[ChatMessageAttachment]
     __operation: Operation
     __operation_guidance: str | None
+    __aspect_ratio: str
     __di: DI
 
     def __init__(
         self,
         attachment_ids: list[str],
         operation_name: str,
         operation_guidance: str | None,
+        aspect_ratio: str | None,
         di: DI,
     ):
         if not attachment_ids:
@@ -52,6 +55,7 @@ def __init__(
         self.__attachments = self.__di.platform_bot_sdk().refresh_attachments_by_ids(attachment_ids)
         self.__operation = ChatImagingService.Operation.resolve(operation_name)
         self.__operation_guidance = operation_guidance
+        self.__aspect_ratio = validate_aspect_ratio(aspect_ratio, ImageEditor.DEFAULT_ASPECT_RATIO)
 
     def __remove_background(self) -> tuple[Result, URLList, ErrorList]:
         log.t(f"Removing background from {len(self.__attachments)} images")
@@ -163,6 +167,7 @@ def __edit_image(self) -> tuple[Result, URLList, ErrorList]:
                     configured_tool = configured_tool,
                     context = self.__operation_guidance,
                     mime_type = attachment.mime_type,
+                    aspect_ratio = self.__aspect_ratio,
                 )
                 editing_result = editor.execute()
                 if editor.error:
@@ -194,50 +199,50 @@ def execute(self) -> tuple[Result, list[dict[str, str | None]]]:
         if self.__operation == ChatImagingService.Operation.remove_background:
             result, urls, errors = self.__remove_background()
             urls = self.__clean_urls(urls)
-            output: list[dict[str, str | None]] = []
+            output_removal_urls: list[dict[str, str | None]] = []
             for image_url, error in zip(urls, errors):
                 if image_url is None:
-                    output.append({"url": None, "error": error})
+                    output_removal_urls.append({"url": None, "error": error})
                     continue
                 external_id = str(invoker_chat.external_id)
                 log.t(f"Sending edited image to chat '{external_id}'")
                 self.__di.platform_bot_sdk().send_document(external_id, image_url, thumbnail = image_url)
                 self.__di.platform_bot_sdk().send_photo(external_id, image_url, caption = "📸")
                 log.t("Image edited and sent successfully")
-                output.append({"url": image_url, "error": None, "status": "delivered"})
-            return result, output
+                output_removal_urls.append({"url": image_url, "error": None, "status": "delivered"})
+            return result, output_removal_urls
 
         elif self.__operation == ChatImagingService.Operation.restore_image:
             result, urls, errors = self.__restore_image()
             urls = self.__clean_urls(urls)
-            output: list[dict[str, str | None]] = []
+            output_restoration_urls: list[dict[str, str | None]] = []
             for image_url, error in zip(urls, errors):
                 if image_url is None:
-                    output.append({"url": None, "error": error})
+                    output_restoration_urls.append({"url": None, "error": error})
                     continue
                 external_id = str(invoker_chat.external_id)
                 log.t(f"Sending restored image to chat '{external_id}': {image_url}")
                 self.__di.platform_bot_sdk().send_document(external_id, image_url, thumbnail = image_url)
                 self.__di.platform_bot_sdk().send_photo(external_id, image_url, caption = "📸")
                 log.t("Image restored and sent successfully")
-                output.append({"url": image_url, "error": None, "status": "delivered"})
-            return result, output
+                output_restoration_urls.append({"url": image_url, "error": None, "status": "delivered"})
+            return result, output_restoration_urls
 
         elif self.__operation == ChatImagingService.Operation.edit_image:
             result, urls, errors = self.__edit_image()
             urls = self.__clean_urls(urls)
-            output: list[dict[str, str | None]] = []
+            output_editing_urls: list[dict[str, str | None]] = []
             for image_url, error in zip(urls, errors):
                 if image_url is None:
-                    output.append({"url": None, "error": error})
+                    output_editing_urls.append({"url": None, "error": error})
                     continue
                 external_id = str(invoker_chat.external_id)
                 log.t(f"Sending edited image to chat '{external_id}': {image_url}")
                 self.__di.platform_bot_sdk().send_document(external_id, image_url, thumbnail = image_url)
                 self.__di.platform_bot_sdk().send_photo(external_id, image_url, caption = "📸")
                 log.t("Image edited and sent successfully")
-                output.append({"url": image_url, "error": None, "status": "delivered"})
-            return result, output
+                output_editing_urls.append({"url": image_url, "error": None, "status": "delivered"})
+            return result, output_editing_urls
 
         else:
             raise ValueError(f"Unknown operation '{self.__operation.value}'")