sinapsis-huggingface 0.2.11__tar.gz → 0.2.12__tar.gz

{sinapsis_huggingface-0.2.11 → sinapsis_huggingface-0.2.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sinapsis-huggingface
-Version: 0.2.11
+Version: 0.2.12
 Summary: Package for HuggingFace-based templates
 Author-email: SinapsisAI <dev@sinapsis.tech>
 Project-URL: Homepage, https://sinapsis.tech

{sinapsis_huggingface-0.2.11 → sinapsis_huggingface-0.2.12}/packages/sinapsis_huggingface.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sinapsis-huggingface
-Version: 0.2.11
+Version: 0.2.12
 Summary: Package for HuggingFace-based templates
 Author-email: SinapsisAI <dev@sinapsis.tech>
 Project-URL: Homepage, https://sinapsis.tech

{sinapsis_huggingface-0.2.11 → sinapsis_huggingface-0.2.12}/packages/sinapsis_huggingface_diffusers/src/sinapsis_huggingface_diffusers/templates/base_diffusers.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 
+import gc
 from abc import ABC, abstractmethod
 from typing import Literal
 
@@ -107,7 +108,14 @@ class BaseDiffusers(Template, ABC):
 
     def __init__(self, attributes: TemplateAttributeType) -> None:
         super().__init__(attributes)
+        self.initialize()
 
+    def initialize(self) -> None:
+        """Initializes the template's common state for creation or reset.
+
+        This method is called by both `__init__` and `reset_state` to ensure
+        a consistent state. Can be overriden by subclasses for specific behaviour.
+        """
         self.pipeline = self._make_pipeline()
         self.pipeline.set_progress_bar_config(disable=True)
         self.num_images_per_prompt = self.attributes.generation_params.num_images_per_prompt
@@ -155,7 +163,7 @@ class BaseDiffusers(Template, ABC):
         pipeline_class = self._pipeline_class()
         return pipeline_class.from_pretrained(
             self.attributes.model_path,
-            torch_dtype=self.TORCH_DTYPE.get(self.attributes.torch_dtype),
+            dtype=self.TORCH_DTYPE.get(self.attributes.torch_dtype),
             cache_dir=self.attributes.model_cache_dir,
         ).to(self.attributes.device)
 
@@ -199,8 +207,10 @@ class BaseDiffusers(Template, ABC):
             output_type="np",
         )
         generated_images = output.images if output_attribute == "images" else output.frames[0]
+        images_as_uint8 = [(image * 255).clip(0, 255).astype(np.uint8) for image in generated_images]
+        del output
 
-        return [(image * 255).clip(0, 255).astype(np.uint8) for image in generated_images]
+        return images_as_uint8
 
     def _update_images_in_container(self, container: DataContainer, new_packets: list[ImagePacket]) -> None:
         """Updates the container with new image packets based on the `overwrite_images` attribute.
@@ -218,17 +228,39 @@ class BaseDiffusers(Template, ABC):
         else:
             container.images.extend(new_packets)
 
-    def _clear_memory(self) -> None:
+    @staticmethod
+    def clear_memory() -> None:
         """Clears memory to free up resources.
 
         This method performs garbage collection and clears GPU memory (if applicable) to prevent memory leaks
         and ensure efficient resource usage.
         """
-        del self.generator
-        if self.attributes.device == "cuda":
+        gc.collect()
+        if torch.cuda.is_available():
             torch.cuda.empty_cache()
-            torch.cuda.ipc_collect()
 
     def reset_state(self, template_name: str | None = None) -> None:
-        self._clear_memory()
-        super().reset_state(template_name)
+        """Releases the pipeline and processor from memory and re-instantiates the template.
+
+        Args:
+            template_name (str | None, optional): The name of the template instance being reset. Defaults to None.
+        """
+        _ = template_name
+
+        if hasattr(self, "pipeline") and self.pipeline is not None:
+            components = self.pipeline.components
+            for component in components.values():
+                if isinstance(component, torch.nn.Module):
+                    component.to("cpu")
+
+            del self.pipeline
+
+        if hasattr(self, "processor"):
+            del self.processor
+
+        if hasattr(self, "generator"):
+            del self.generator
+
+        self.clear_memory()
+        self.initialize()
+        self.logger.info(f"Reset template instance `{self.instance_name}`")

{sinapsis_huggingface-0.2.11 → sinapsis_huggingface-0.2.12}/packages/sinapsis_huggingface_diffusers/src/sinapsis_huggingface_diffusers/templates/image_to_image_diffusers.py

@@ -8,7 +8,6 @@ import numpy as np
 from diffusers import AutoPipelineForImage2Image
 from PIL import Image
 from sinapsis_core.data_containers.data_packet import DataContainer, ImagePacket
-from sinapsis_core.template_base.base_models import TemplateAttributeType
 
 from sinapsis_huggingface_diffusers.helpers.tags import Tags
 from sinapsis_huggingface_diffusers.templates.base_diffusers import BaseDiffusers
@@ -52,9 +51,13 @@ class ImageToImageDiffusers(BaseDiffusers):
 
     UIProperties = ImageToImageDiffusersUIProperties
 
-    def __init__(self, attributes: TemplateAttributeType) -> None:
-        super().__init__(attributes)
-        self.requires_pil = False
+    def initialize(self) -> None:
+        """Initializes the template's common state for creation or reset.
+
+        This method is called by both `__init__` and `reset_state` to ensure
+        a consistent state. Can be overriden by subclasses for specific behaviour.
+        """
+        super().initialize()
         self.output_attribute: Literal["images", "frames"] = "images"
         self.num_duplicates = self.num_images_per_prompt
 
@@ -67,7 +70,8 @@ class ImageToImageDiffusers(BaseDiffusers):
         """
         return AutoPipelineForImage2Image
 
-    def _convert_image_format(self, image_packet: ImagePacket) -> np.ndarray | Image.Image:
+    @staticmethod
+    def _convert_image_format(image_packet: ImagePacket) -> Image.Image:
         """Converts the input image into the appropriate format for the pipeline.
 
         The format depends on the `requires_pil` attribute:
@@ -78,12 +82,9 @@ class ImageToImageDiffusers(BaseDiffusers):
             image_packet (ImagePacket): The input image packet.
 
         Returns:
-            np.ndarray | Image.Image: The converted image, either as a normalized NumPy array or a
-                PIL Image.
+            Image.Image: The converted image as a PIL Image.
         """
-        if self.requires_pil:
-            return Image.fromarray(image_packet.content)
-        return image_packet.content / 255.0
+        return Image.fromarray(image_packet.content)
 
     def preprocess_inputs(self, image_packet: ImagePacket) -> dict[str, np.ndarray | list[np.ndarray]]:
         """Prepares the input image for the image-to-image pipeline.
@@ -157,6 +158,6 @@ class ImageToImageDiffusers(BaseDiffusers):
         new_packets = [ImagePacket(content=image) for image in all_generated_images]
         processed_packets, _ = self.post_processing_packets(new_packets, old_packets)
         self._update_images_in_container(container, processed_packets)
-        self._clear_memory()
+        self.clear_memory()
 
         return container

{sinapsis_huggingface-0.2.11 → sinapsis_huggingface-0.2.12}/packages/sinapsis_huggingface_diffusers/src/sinapsis_huggingface_diffusers/templates/image_to_video_gen_xl_diffusers.py

@@ -1,7 +1,8 @@
 # -*- coding: utf-8 -*-
+from typing import Literal
+
 from diffusers import I2VGenXLPipeline
 from pydantic import Field
-from sinapsis_core.template_base.base_models import TemplateAttributeType
 
 from sinapsis_huggingface_diffusers.helpers.tags import Tags
 from sinapsis_huggingface_diffusers.templates.base_diffusers import BaseDiffusersAttributes, BaseGenerationParams
@@ -72,11 +73,15 @@ class ImageToVideoGenXLDiffusers(ImageToImageDiffusers):
     AttributesBaseModel = ImageToVideoGenXLDiffusersAttributes
     UIProperties = ImageToVideoGenXLDiffusersUIProperties
 
-    def __init__(self, attributes: TemplateAttributeType) -> None:
-        super().__init__(attributes)
+    def initialize(self) -> None:
+        """Initializes the template's common state for creation or reset.
+
+        This method is called by both `__init__` and `reset_state` to ensure
+        a consistent state. Can be overriden by subclasses for specific behaviour.
+        """
+        super().initialize()
+        self.output_attribute: Literal["images", "frames"] = "frames"
         self.num_duplicates = self.attributes.generation_params.num_frames
-        self.requires_pil = True
-        self.output_attribute = "frames"
 
     @staticmethod
     def _pipeline_class() -> I2VGenXLPipeline:

{sinapsis_huggingface-0.2.11 → sinapsis_huggingface-0.2.12}/packages/sinapsis_huggingface_diffusers/src/sinapsis_huggingface_diffusers/templates/inpainting_diffusers.py

@@ -7,7 +7,6 @@ import cv2
 import numpy as np
 from diffusers import AutoPipelineForInpainting
 from sinapsis_core.data_containers.data_packet import ImageAnnotations, ImagePacket
-from sinapsis_core.template_base.base_models import TemplateAttributeType
 
 from sinapsis_huggingface_diffusers.helpers.tags import Tags
 from sinapsis_huggingface_diffusers.templates.base_diffusers import (
@@ -75,8 +74,13 @@ class InpaintingDiffusers(ImageToImageDiffusers):
     UIProperties = InpaintingDiffusersUIProperties
     AttributesBaseModel = InpaintingDiffusersAttributes
 
-    def __init__(self, attributes: TemplateAttributeType) -> None:
-        super().__init__(attributes)
+    def initialize(self) -> None:
+        """Initializes the template's common state for creation or reset.
+
+        This method is called by both `__init__` and `reset_state` to ensure
+        a consistent state. Can be overriden by subclasses for specific behaviour.
+        """
+        super().initialize()
         if self.attributes.preserve_outside_content and self.attributes.dilation_radius is None:
             raise ValueError("Need to specify a dilation_radius if preserve_outside_content=True")
 

{sinapsis_huggingface-0.2.11 → sinapsis_huggingface-0.2.12}/packages/sinapsis_huggingface_diffusers/src/sinapsis_huggingface_diffusers/templates/text_to_image_diffusers.py

@@ -80,6 +80,6 @@ class TextToImageDiffusers(BaseDiffusers):
         image_packets = [ImagePacket(content=image) for image in generated_images]
         self._set_packet_sources(image_packets)
         self._update_images_in_container(container, image_packets)
-        self._clear_memory()
+        self.clear_memory()
 
         return container

{sinapsis_huggingface-0.2.11 → sinapsis_huggingface-0.2.12}/packages/sinapsis_huggingface_grounding_dino/src/sinapsis_huggingface_grounding_dino/templates/grounding_dino.py

@@ -111,11 +111,18 @@ class GroundingDINO(Template):
             attributes (dict[str, Any]): Dictionary containing configuration parameters.
         """
         super().__init__(attributes)
-        self.device = self.attributes.device
+        self.initialize()
+
+    def initialize(self) -> None:
+        """Initializes the template's common state for creation or reset.
+
+        This method is called by both `__init__` and `reset_state` to ensure
+        a consistent state. Can be overriden by subclasses for specific behaviour.
+        """
         self.processor = AutoProcessor.from_pretrained(
             self.attributes.model_path, cache_dir=self.attributes.model_cache_dir
         )
-        self.model = self._set_model().to(self.device)
+        self.model = self._set_model().to(self.attributes.device)
         self.max_tokens = self.processor.tokenizer.model_max_length
         self.text_input = self.validate_and_format_text_input(self.attributes.text_input)
 
@@ -171,7 +178,7 @@ class GroundingDINO(Template):
             images=image_packet.content,
             text=self.text_input,
             return_tensors="pt",
-        ).to(self.device)
+        ).to(self.attributes.device)
 
         with torch.no_grad():
             outputs = self.model(**inputs)
@@ -350,19 +357,32 @@ class GroundingDINO(Template):
 
         return container
 
-    def _clear_memory(self) -> None:
+    @staticmethod
+    def clear_memory() -> None:
         """Clears memory to free up resources.
 
         This method performs garbage collection and clears GPU memory (if applicable) to prevent memory leaks
         and ensure efficient resource usage.
         """
-        for child in self.model.children():
-            child.cpu()
-            gc.collect()
-        if self.attributes.device == "cuda":
+        gc.collect()
+        if torch.cuda.is_available():
             torch.cuda.empty_cache()
-            torch.cuda.ipc_collect()
 
     def reset_state(self, template_name: str | None = None) -> None:
-        self._clear_memory()
-        super().reset_state(template_name)
+        """Releases the pipeline and processor from memory and re-instantiates the template.
+
+        Args:
+            template_name (str | None, optional): The name of the template instance being reset. Defaults to None.
+        """
+        _ = template_name
+
+        if hasattr(self, "model") and self.model is not None:
+            self.model.to("cpu")
+            del self.model
+
+        if hasattr(self, "processor"):
+            del self.processor
+
+        self.clear_memory()
+        self.initialize()
+        self.logger.info(f"Reset template instance `{self.instance_name}`")

{sinapsis_huggingface-0.2.11 → sinapsis_huggingface-0.2.12}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "sinapsis-huggingface"
-version = "0.2.11"
+version = "0.2.12"
 description = "Package for HuggingFace-based templates"
 authors = [
     {name = "SinapsisAI", email = "dev@sinapsis.tech"},