Merge pull request #4 from cyberlabsai/feature/enroll

User enroll

Example/PerseDemo/PerseDemo/Info.plist

@@ -2,10 +2,10 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>BASE_URL</key>
-	<string>$(BASE_URL)</string>
 	<key>API_KEY</key>
 	<string>$(API_KEY)</string>
+	<key>BASE_URL</key>
+	<string>$(BASE_URL)</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleDisplayName</key>
@@ -29,7 +29,7 @@
 	<key>NSCameraUsageDescription</key>
 	<string>Camera usage for Perse</string>
 	<key>NSPerseUsageDescription</key>
-	<string>The face detection&apos;s module for iOS with a lot of awesome features</string>
+	<string>The face detection's module for iOS with a lot of awesome features</string>
 	<key>NSPhotoLibraryUsageDescription</key>
 	<string>This app requires access to the photo library</string>
 	<key>UIApplicationSceneManifest</key>

Example/PerseDemo/PerseDemo/PerseCameraViewController.swift

@@ -15,18 +15,21 @@ class PerseCameraViewController:
     @IBOutlet var horizontalMovementLabel: UILabel!
     @IBOutlet var verticalMovementLabel: UILabel!
     @IBOutlet var tiltMovementLabel: UILabel!
-    @IBOutlet var faceUnderexposeIcon: UIImageView!
+    @IBOutlet var faceUnderexposureIcon: UIImageView!
     @IBOutlet var faceSharpnessIcon: UIImageView!
-    @IBOutlet var imageUnderexposeIcon: UIImageView!
+    @IBOutlet var imageUnderexposureIcon: UIImageView!
     @IBOutlet var imageSharpnessIcon: UIImageView!
     var image: UIImage?
 
     override func viewDidLoad() {
         super.viewDidLoad()
 
         self.reset()
-
-        self.perseCamera.apiKey = Environment.apiKey
+
+        self.perseCamera.perse = Perse(
+            apiKey: Environment.apiKey,
+            baseUrl: Environment.baseUrl
+        )
         self.perseCamera.perseEventListener = self
         self.perseCamera.startPreview()
         self.perseCamera.setDetectionBox(true)
@@ -37,7 +40,7 @@ class PerseCameraViewController:
         _ count: Int,
         _ total: Int,
         _ imagePath: String,
-        _ detectResponse: DetectResponse?
+        _ detectResponse: PerseAPIResponse.Face.Detect?
     ) {
         let subpath = imagePath
             .substring(
@@ -60,12 +63,12 @@ class PerseCameraViewController:
         }
 
         self.faceImageView.image = image
-        let face: FaceResponse = detectResponse.faces[0]
+        let face: PerseAPIResponse.Face.Face = detectResponse.faces[0]
 
         self.setSpoofingValidation(valid: face.livenessScore >= detectResponse.defaultThresholds.liveness)
-        self.faceUnderexposeIcon.validate(valid: face.faceMetrics.underexposure > detectResponse.defaultThresholds.underexposure)
+        self.faceUnderexposureIcon.validate(valid: face.faceMetrics.underexposure > detectResponse.defaultThresholds.underexposure)
         self.faceSharpnessIcon.validate(valid: face.faceMetrics.sharpness < detectResponse.defaultThresholds.sharpness)
-        self.imageUnderexposeIcon.validate(valid: detectResponse.imageMetrics.underexposure > detectResponse.defaultThresholds.underexposure)
+        self.imageUnderexposureIcon.validate(valid: detectResponse.imageMetrics.underexposure > detectResponse.defaultThresholds.underexposure)
         self.imageSharpnessIcon.validate(valid: detectResponse.imageMetrics.sharpness < detectResponse.defaultThresholds.sharpness)
     }
 
@@ -190,9 +193,9 @@ class PerseCameraViewController:
         self.horizontalMovementLabel.text = "-"
         self.verticalMovementLabel.text = "-"
         self.tiltMovementLabel.text = "-"
-        self.faceUnderexposeIcon.reset()
+        self.faceUnderexposureIcon.reset()
         self.faceSharpnessIcon.reset()
-        self.imageUnderexposeIcon.reset()
+        self.imageUnderexposureIcon.reset()
         self.imageSharpnessIcon.reset()
         self.perseCamera.setDetectionBoxColor(0, 1, 1, 1)
         self.perseCamera.setFaceContoursColor(0, 1, 1, 1)

Example/PerseDemo/PerseDemo/PerseDetectViewController.swift

@@ -115,7 +115,7 @@ class PerseDetectViewController:
                 detectResponse.totalFaces
             ))
 
-            guard let faces = detectResponse.faces as Array<FaceResponse>? else {
+            guard let faces = detectResponse.faces as Array<PerseAPIResponse.Face.Face>? else {
                 return
             }
 

Example/PerseDemo/PerseDemoTests/DataUtils.swift

@@ -2,7 +2,7 @@ import Foundation
 import UIKit
 
 func getTempData(name: String) -> Data? {
-    guard let fileUrl: URL = Bundle(for: PerseFaceDetectWithDataTests.self)
+    guard let fileUrl: URL = Bundle(for: FaceDetectWithDataTests.self)
         .url(
             forResource: name,
             withExtension: "jpeg"

Example/PerseDemo/PerseDemoTests/PerseFaceCompareWithDataTests.swift → Example/PerseDemo/PerseDemoTests/FaceCompareWithDataTests.swift

@@ -3,37 +3,43 @@ import Perse
 import PerseLite
 import Foundation
 
-class PerseFaceCompareWithDataTests: XCTestCase {
-    
-    func testWithSameHuman() {
+class FaceCompareWithDataTests: XCTestCase {
+
+    func test_with_same_human() {
         compareWithData(
             self,
             firstImageName: "human",
             secondImageName: "human1",
             apiKey: Environment.apiKey
         ) { response in
             XCTAssertEqual(response.status, 200)
-            XCTAssertGreaterThan(response.similarity, response.defaultThresholds.similarity)
+            XCTAssertGreaterThan(
+                response.similarity,
+                response.defaultThresholds.similarity
+            )
         } onError: { error in
             XCTFail("Error on compare: \(error)")
         }
     }
-    
-    func testWithDifferentHumans() {
+
+    func test_with_different_humans() {
         compareWithData(
             self,
             firstImageName: "human1",
             secondImageName: "human2",
             apiKey: Environment.apiKey
         ) { response in
             XCTAssertEqual(response.status, 200)
-            XCTAssertLessThan(response.similarity, response.defaultThresholds.similarity)
+            XCTAssertLessThan(
+                response.similarity,
+                response.defaultThresholds.similarity
+            )
         } onError: { error in
             XCTFail("Error on compare: \(error)")
         }
     }
-    
-    func testWithHumanAndNonHuman() {
+
+    func test_with_human_and_non_human() {
         compareWithData(
             self,
             firstImageName: "human",
@@ -45,8 +51,8 @@ class PerseFaceCompareWithDataTests: XCTestCase {
             XCTAssertEqual(error, "402")
         }
     }
-    
-    func testWithNonHumanAndHuman() {
+
+    func test_with_non_human_and_human() {
         compareWithData(
             self,
             firstImageName: "dog",
@@ -58,8 +64,8 @@ class PerseFaceCompareWithDataTests: XCTestCase {
             XCTAssertEqual(error, "402")
         }
     }
-    
-    func testWithNonHumanAndNonHuman() {
+
+    func test_with_non_human_and_non_human() {
         compareWithData(
             self,
             firstImageName: "dog",
@@ -71,21 +77,8 @@ class PerseFaceCompareWithDataTests: XCTestCase {
             XCTAssertEqual(error, "402")
         }
     }
-
-    func testWithAPIKeyInvalid() {
-        compareWithData(
-            self,
-            firstImageName: "human",
-            secondImageName: "human2",
-            apiKey: ""
-        ) { detectResponse in
-            XCTFail("Back-end authorized invalid api token.")
-        } onError: { error in
-            XCTAssertEqual(error, "401")
-        }
-    }
-
-    func testWithImagePathsInvalid() {
+
+    func test_with_image_paths_invalid() {
         compareWithData(
             self,
             firstImageName: "test0",
@@ -94,11 +87,14 @@ class PerseFaceCompareWithDataTests: XCTestCase {
         ) { detectResponse in
             XCTFail("")
         } onError: { error in
-            XCTAssertEqual(error, Perse.Error.INVALID_IMAGE_PATH)
+            XCTAssertEqual(
+                error,
+                PerseLite.Error.INVALID_IMAGE_PATH
+            )
         }
     }
-    
-    func testWithNonHumans() {
+
+    func test_with_non_humans() {
         compareWithData(
             self,
             firstImageName: "dog",
@@ -110,5 +106,5 @@ class PerseFaceCompareWithDataTests: XCTestCase {
             XCTAssertEqual(error, "402")
         }
     }
-    
+
 }

Example/PerseDemo/PerseDemoTests/PerseFaceCompareWithFileTests.swift → Example/PerseDemo/PerseDemoTests/FaceCompareWithFileTests.swift

@@ -3,37 +3,43 @@ import Perse
 import PerseLite
 import Foundation
 
-class PerseFaceCompareWithFileTests: XCTestCase {
-    
-    func testWithSameHuman() {
+class FaceCompareWithFileTests: XCTestCase {
+
+    func test_with_same_human() {
         compareWithFile(
             self,
             firstImageName: "human",
             secondImageName: "human1",
             apiKey: Environment.apiKey
         ) { response in
             XCTAssertEqual(response.status, 200)
-            XCTAssertGreaterThan(response.similarity, response.defaultThresholds.similarity)
+            XCTAssertGreaterThan(
+                response.similarity,
+                response.defaultThresholds.similarity
+            )
         } onError: { error in
             XCTFail("Error on compare: \(error)")
         }
     }
-    
-    func testWithDifferentHumans() {
+
+    func test_with_different_humans() {
         compareWithFile(
             self,
             firstImageName: "human1",
             secondImageName: "human2",
             apiKey: Environment.apiKey
         ) { response in
             XCTAssertEqual(response.status, 200)
-            XCTAssertLessThan(response.similarity, response.defaultThresholds.similarity)
+            XCTAssertLessThan(
+                response.similarity,
+                response.defaultThresholds.similarity
+            )
         } onError: { error in
             XCTFail("Error on compare: \(error)")
         }
     }
-    
-    func testWithHumanAndNonHuman() {
+
+    func test_with_human_and_non_human() {
         compareWithFile(
             self,
             firstImageName: "human",
@@ -45,8 +51,8 @@ class PerseFaceCompareWithFileTests: XCTestCase {
             XCTAssertEqual(error, "402")
         }
     }
-    
-    func testWithNonHumanAndHuman() {
+
+    func test_with_non_human_and_human() {
         compareWithFile(
             self,
             firstImageName: "dog",
@@ -58,8 +64,8 @@ class PerseFaceCompareWithFileTests: XCTestCase {
             XCTAssertEqual(error, "402")
         }
     }
-    
-    func testWithNonHumanAndNonHuman() {
+
+    func test_with_non_human_and_non_human() {
         compareWithFile(
             self,
             firstImageName: "dog",
@@ -71,21 +77,8 @@ class PerseFaceCompareWithFileTests: XCTestCase {
             XCTAssertEqual(error, "402")
         }
     }
-
-    func testWithAPIKeyInvalid() {
-        compareWithFile(
-            self,
-            firstImageName: "human",
-            secondImageName: "human2",
-            apiKey: ""
-        ) { detectResponse in
-            XCTFail("Back-end authorized invalid api token.")
-        } onError: { error in
-            XCTAssertEqual(error, "401")
-        }
-    }
-
-    func testWithImagePathsInvalid() {
+
+    func test_with_image_paths_invalid() {
         compareWithFile(
             self,
             firstImageName: "test0",
@@ -94,11 +87,14 @@ class PerseFaceCompareWithFileTests: XCTestCase {
         ) { detectResponse in
             XCTFail("")
         } onError: { error in
-            XCTAssertEqual(error, Perse.Error.INVALID_IMAGE_PATH)
+            XCTAssertEqual(
+                error,
+                PerseLite.Error.INVALID_IMAGE_PATH
+            )
         }
     }
-    
-    func testWithNonHumans() {
+
+    func test_with_non_humans() {
         compareWithFile(
             self,
             firstImageName: "dog",
@@ -110,5 +106,5 @@ class PerseFaceCompareWithFileTests: XCTestCase {
             XCTAssertEqual(error, "402")
         }
     }
-    
+
 }