[Refactor] #183 - 주고받는 데이터 data -> CGImage로 변경

Author: OneTen19

Neki-iOS/Core/Sources/ImageTransform/Data/DefaultImageTransformRepository.swift

@@ -6,12 +6,9 @@
 //
 
 import Foundation
-import CoreML
 import Vision
-import UniformTypeIdentifiers
 import ComposableArchitecture
 import CoreImage
-import os
 
 public final class DefaultImageTransformRepository: ImageTransformRepository {
 
@@ -28,17 +25,17 @@ public final class DefaultImageTransformRepository: ImageTransformRepository {
         }
     }
 
-    public func transform(data inputData: Data) async throws -> Data {
+    public func transform(image inputImage: CGImage) async throws -> CGImage {
         let visionModel = try await modelTask.value
 
         return try await Task(priority: .userInitiated) {
             let request = VNCoreMLRequest(model: visionModel)
             request.imageCropAndScaleOption = .scaleFit
 
-            let handler = VNImageRequestHandler(data: inputData)
+            let handler = VNImageRequestHandler(cgImage: inputImage)
             try handler.perform([request])
 
-            return try self.extractData(from: request.results)
+            return try self.extractCGImage(from: request.results)
         }.value
     }
 }
@@ -47,48 +44,18 @@ public final class DefaultImageTransformRepository: ImageTransformRepository {
 // MARK: - DefaultImageTransformRepository Private Helpers
 
 private extension DefaultImageTransformRepository {
-    
-    /// Vision 결과물을 추출하여 최종 PNG Data로 변환하는 로직
-    func extractData(from results: [VNObservation]?) throws -> Data {
-        // Vision 결과물(CVPixelBuffer)
+    func extractCGImage(from results: [VNObservation]?) throws -> CGImage {
         guard let observations = results as? [VNPixelBufferObservation],
               let pixelBuffer = observations.first?.pixelBuffer else {
             throw ImageTransformRepositoryError.renderingFailed
         }
 
-        // 픽셀 데이터를 이미지(CIImage -> CGImage)로 렌더링
         let ciImage = CIImage(cvPixelBuffer: pixelBuffer)
         guard let outputCGImage = self.ciContext.createCGImage(ciImage, from: ciImage.extent) else {
             throw ImageTransformRepositoryError.renderingFailed
         }
 
-        // 렌더링된 이미지를 PNG 형식의 Data로 압축
-        return try compressToPNG(cgImage: outputCGImage)
-    }
-    
-    /// CGImage를 PNG Data로 압축하는 메서드 (너무 어렵다...)
-    /// UIImage(cgImage:).pngData() 이거 쓰면 딸깍이긴 하지만 Data 레이어에 UIKit 의존성이 생겨버림..
-    func compressToPNG(cgImage: CGImage) throws -> Data {
-        guard let cfMutableData = CFDataCreateMutable(kCFAllocatorDefault, 0) else {
-            throw ImageTransformRepositoryError.destinationCreationFailed
-        }
-        
-        guard let destination = CGImageDestinationCreateWithData(
-            cfMutableData,
-            UTType.png.identifier as CFString,
-            1,
-            nil
-        ) else {
-            throw ImageTransformRepositoryError.destinationCreationFailed
-        }
-        
-        CGImageDestinationAddImage(destination, cgImage, nil)
-        
-        if CGImageDestinationFinalize(destination) {
-            return cfMutableData as Data
-        } else {
-            throw ImageTransformRepositoryError.dataCompressionFailed
-        }
+        return outputCGImage
     }
 }
 

Neki-iOS/Core/Sources/ImageTransform/Domain/ImageTransformClient.swift

@@ -7,18 +7,19 @@
 
 import Foundation
 import ComposableArchitecture
+import CoreGraphics
 
 public struct ImageTransformClient {
-    public var transformImage: @Sendable (_ image: Data) async throws -> Data
+    public var transformImage: @Sendable (_ image: CGImage) async throws -> CGImage
 }
 
 extension ImageTransformClient: DependencyKey {
     public static let liveValue: ImageTransformClient = {
         @Dependency(\.imageTransformRepository) var repository
 
         return ImageTransformClient(
-            transformImage: { inputData in
-                return try await repository.transform(data: inputData)
+            transformImage: { inputImage in
+                return try await repository.transform(image: inputImage)
             }
         )
     }()
@@ -33,8 +34,8 @@ extension DependencyValues {
 
 extension ImageTransformClient: TestDependencyKey {
     public static let testValue = ImageTransformClient(
-        transformImage: { inputData in
-            return inputData
+        transformImage: { inputImage in
+            return inputImage
         }
     )
 }

Neki-iOS/Core/Sources/ImageTransform/Domain/ImageTransformRepository.swift

@@ -6,22 +6,19 @@
 //
 
 import Foundation
+import CoreGraphics
 
 public protocol ImageTransformRepository: Sendable {
-    func transform(data: Data) async throws -> Data
+    func transform(image: CGImage) async throws -> CGImage
 }
 
 public enum ImageTransformRepositoryError: LocalizedError {
     case modelLoadFailed
-    case destinationCreationFailed
-    case dataCompressionFailed
     case renderingFailed
 
     public var errorDescription: String? {
         switch self {
         case .modelLoadFailed: return "AI 모델을 불러오는데 실패했습니다."
-        case .destinationCreationFailed: return "데이터 저장소를 생성할 수 없습니다."
-        case .dataCompressionFailed: return "이미지 압축에 실패했습니다."
         case .renderingFailed: return "이미지 렌더링에 실패했습니다."
         }
     }

Neki-iOS/Core/Sources/ImageTransform/Presentation/ImageTransformFeature.swift

@@ -55,15 +55,12 @@ public struct ImageTransformFeature {
                         let originalRatio = inputImage.size.width / inputImage.size.height
 
                         guard let squaredImage = self.prepareSquareForCoreML(image: inputImage, targetSize: 512),
-                              let inputData = squaredImage.pngData() else {
+                              let inputCGImage = squaredImage.cgImage else {
                             throw ImageTransformError.processingFailed
                         }
 
-                        let resultData = try await imageTransformClient.transformImage(inputData)
-                        
-                        guard let resultSquareImage = UIImage(data: resultData) else {
-                            throw ImageTransformError.resultDataReadFailed
-                        }
+                        let resultCGImage = try await imageTransformClient.transformImage(inputCGImage)
+                        let resultSquareImage = UIImage(cgImage: resultCGImage)
 
                         if let finalCroppedImage = self.cropToOriginalRatio(image: resultSquareImage, originalRatio: originalRatio) {
                             await send(.transformCompleted(finalCroppedImage))