chore(places): update service tests and tasks

Author: jazzify

apps/places/services.py

@@ -8,7 +8,6 @@
 from apps.places.models import Place, PlaceImage, PlaceTag
 from apps.places.tasks import (
     suggest_tags_from_uploaded_images,
-    transform_uploaded_images,
 )
 from apps.users.models import BaseUser
 
@@ -111,11 +110,6 @@ def place_images_create(
             images_for_detection[place_image.id] = place_image.image.path
             created_place_images.append(place_image)
 
-            transform_uploaded_images.enqueue(
-                user_id=user.id,
-                file_path=place_image.image.path,
-                parent_folder=str(place_image.id),
-            )
         suggest_tags_from_uploaded_images.enqueue(
             user_id=user.id,
             place_id=place_id,

apps/places/tasks.py

@@ -5,103 +5,14 @@
 logger = logging.getLogger(__name__)
 
 
-@task(queue_name="place_images")
-def transform_uploaded_images(user_id: int, file_path: str, parent_folder: str) -> None:
-    from apps.image_processing.services import image_local_transform
-    from apps.image_processing_api.constants import (
-        ImageTransformations,
-        TransformationFilterBlurFilter,
-        TransformationFilterDither,
-        TransformationFilterThumbnailResampling,
-    )
-    from apps.image_processing_api.data_models import (
-        ImageTransformationDefinition,
-        TransformationFiltersBlackAndWhite,
-        TransformationFiltersBlur,
-        TransformationFiltersThumbnail,
-    )
-
-    logger.info(f"Transforming image {file_path}")
-    transformations = [
-        ImageTransformationDefinition(
-            identifier="THUMBNAIL/default",
-            transformation=ImageTransformations.THUMBNAIL,
-        ),
-        ImageTransformationDefinition(
-            identifier="THUMBNAIL/size_64",
-            transformation=ImageTransformations.THUMBNAIL,
-            filters=TransformationFiltersThumbnail(size=(64, 64)),
-        ),
-        ImageTransformationDefinition(
-            identifier="THUMBNAIL/s_320_gap_4",
-            transformation=ImageTransformations.THUMBNAIL,
-            filters=TransformationFiltersThumbnail(size=(320, 320), reducing_gap=4),
-        ),
-        ImageTransformationDefinition(
-            identifier="THUMBNAIL/s_320_gap_8_lanczos",
-            transformation=ImageTransformations.THUMBNAIL,
-            filters=TransformationFiltersThumbnail(
-                size=(320, 320),
-                reducing_gap=8,
-                resample=TransformationFilterThumbnailResampling.LANCZOS,
-            ),
-        ),
-        ImageTransformationDefinition(
-            identifier="BNW/default",
-            transformation=ImageTransformations.BLACK_AND_WHITE,
-        ),
-        ImageTransformationDefinition(
-            identifier="BNW/floydsteinberg",
-            transformation=ImageTransformations.BLACK_AND_WHITE,
-            filters=TransformationFiltersBlackAndWhite(
-                dither=TransformationFilterDither.FLOYDSTEINBERG
-            ),
-        ),
-        ImageTransformationDefinition(
-            identifier="BNW/none",
-            transformation=ImageTransformations.BLACK_AND_WHITE,
-            filters=TransformationFiltersBlackAndWhite(
-                dither=TransformationFilterDither.NONE
-            ),
-        ),
-        ImageTransformationDefinition(
-            identifier="BLUR/default",
-            transformation=ImageTransformations.BLUR,
-        ),
-        ImageTransformationDefinition(
-            identifier="BLUR/gaussian_86",
-            transformation=ImageTransformations.BLUR,
-            filters=TransformationFiltersBlur(
-                filter=TransformationFilterBlurFilter.GAUSSIAN_BLUR,
-                radius=86,
-            ),
-        ),
-        ImageTransformationDefinition(
-            identifier="BLUR/box_48",
-            transformation=ImageTransformations.BLUR,
-            filters=TransformationFiltersBlur(
-                filter=TransformationFilterBlurFilter.BOX_BLUR,
-                radius=48,
-            ),
-        ),
-    ]
-    applied_transformations = image_local_transform(
-        user_id=user_id,
-        image_path=file_path,
-        transformations=transformations,
-        parent_folder=parent_folder,
-    )
-
-    for transformation in applied_transformations:
-        logger.info(f"{transformation.identifier}: {transformation.path}")
-
-
 @task(queue_name="place_images")
 def suggest_tags_from_uploaded_images(
     user_id: int, place_id: int, images: dict[int, str]
 ) -> None:
-    from apps.image_processing.core.detectors import CommonObjectDetector
-    from apps.image_processing.data_models import DetectorImage
+    from apps.image_processing.core.detectors.base import DetectorImage
+    from apps.image_processing.core.detectors.common_object_detector import (
+        CommonObjectDetector,
+    )
     from apps.places.models import Place, PlaceTag
 
     user_place = (

apps/places/tests/test_services.py

@@ -125,9 +125,8 @@ def test_place_create_with_tags(user):
 
 
 @patch("apps.places.services.suggest_tags_from_uploaded_images")
-@patch("apps.places.services.transform_uploaded_images")
 @pytest.mark.django_db
-def test_place_images_create(mock_transform_uploaded_images, mock_suggest_tags, user):
+def test_place_images_create(mock_suggest_tags, user):
     place = PlaceFactory(user=user)
 
     image1 = SimpleUploadedFile(
@@ -149,11 +148,6 @@ def test_place_images_create(mock_transform_uploaded_images, mock_suggest_tags,
 
     assert place.images.count() == 1
 
-    mock_transform_uploaded_images.enqueue.assert_called_once_with(
-        user_id=user.id,
-        file_path=f"{settings.MEDIA_ROOT}/place_images/test_image1.jpg",
-        parent_folder=str(1),
-    )
     mock_suggest_tags.enqueue.assert_called_once_with(
         user_id=user.id,
         place_id=place.id,