Fix bug where casing of J2P landmarks was wrong

This was sending in snake case instead of camel case. Added test for this.
Formguru · Feb 27, 2023 · fb87819 · fb87819
1 parent ca416c5
commit fb87819
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 28 deletions.
diff --git a/guru-android-sdk/src/main/java/ai/getguru/androidsdk/AnalysisClient.kt b/guru-android-sdk/src/main/java/ai/getguru/androidsdk/AnalysisClient.kt
@@ -115,7 +115,7 @@ class AnalysisClient(
 
         for (nextLandmark in InferenceLandmark.values()) {
             inference.keypointForLandmark(nextLandmark)?.let { keypoint ->
-                json[nextLandmark.value] = mapOf(
+                json[nextLandmark.camelCase()] = mapOf(
                     "x" to keypoint.x,
                     "y" to keypoint.y,
                     "score" to keypoint.score

diff --git a/guru-android-sdk/src/main/java/ai/getguru/androidsdk/FrameInference.kt b/guru-android-sdk/src/main/java/ai/getguru/androidsdk/FrameInference.kt
@@ -11,27 +11,6 @@ class FrameInference constructor(
 ) {
     val smoothKeypoints: Map<Int, Keypoint>
 
-    val cocoKeypoints = arrayOf(
-        "nose",
-        "left_eye",
-        "right_eye",
-        "left_ear",
-        "right_ear",
-        "left_shoulder",
-        "right_shoulder",
-        "left_elbow",
-        "right_elbow",
-        "left_wrist",
-        "right_wrist",
-        "left_hip",
-        "right_hip",
-        "left_knee",
-        "right_knee",
-        "left_ankle",
-        "right_ankle",
-    )
-    val cocoLabelToIdx = cocoKeypoints.associateBy ({ it }, { cocoKeypoints.indexOf(it) } )
-
     val cocoPairs = arrayOf(
         arrayOf("left_shoulder", "right_shoulder"),
         arrayOf("left_shoulder", "left_hip"),
@@ -56,9 +35,7 @@ class FrameInference constructor(
     }
 
     fun keypointForLandmark(landmark: InferenceLandmark): Keypoint? {
-        return smoothKeypoints[
-            cocoLabelToIdx[landmark.value]
-        ]
+        return smoothKeypoints[landmark.cocoIndex()]
     }
 
     fun userFacing(): UserFacing {
@@ -91,7 +68,7 @@ class FrameInference constructor(
         val smoothedKeypoints = HashMap<Int, Keypoint>()
         for (nextLandmark in InferenceLandmark.values()) {
             val previousKeypoint = previousFrame!!.keypointForLandmark(nextLandmark)
-            val landmarkIndex = cocoLabelToIdx[nextLandmark.value]!!
+            val landmarkIndex = nextLandmark.cocoIndex()
             val currentKeypoint = keypoints[landmarkIndex]
 
             val minScore = 0.01

diff --git a/guru-android-sdk/src/main/java/ai/getguru/androidsdk/InferenceLandmark.kt b/guru-android-sdk/src/main/java/ai/getguru/androidsdk/InferenceLandmark.kt
@@ -17,5 +17,37 @@ enum class InferenceLandmark(val value: String) {
     LEFT_KNEE("left_knee"),
     RIGHT_KNEE("right_knee"),
     LEFT_ANKLE("left_ankle"),
-    RIGHT_ANKLE("right_ankle"),
+    RIGHT_ANKLE("right_ankle");
+
+    private val cocoKeypoints = arrayOf(
+        "nose",
+        "left_eye",
+        "right_eye",
+        "left_ear",
+        "right_ear",
+        "left_shoulder",
+        "right_shoulder",
+        "left_elbow",
+        "right_elbow",
+        "left_wrist",
+        "right_wrist",
+        "left_hip",
+        "right_hip",
+        "left_knee",
+        "right_knee",
+        "left_ankle",
+        "right_ankle",
+    )
+    private val cocoLabelToIdx = cocoKeypoints.associateBy ({ it }, { cocoKeypoints.indexOf(it) } )
+
+    private val snakeCaseRegex = "_[a-zA-Z]".toRegex()
+    fun camelCase(): String {
+        return snakeCaseRegex.replace(value) {
+            it.value.replace("_","").uppercase()
+        }
+    }
+
+    fun cocoIndex(): Int {
+        return cocoLabelToIdx[value]!!
+    }
 }
diff --git a/guru-android-sdk/src/test/java/ai/getguru/androidsdk/AnalysisClientTest.kt b/guru-android-sdk/src/test/java/ai/getguru/androidsdk/AnalysisClientTest.kt
@@ -1,6 +1,7 @@
 package ai.getguru.androidsdk
 
 import com.google.gson.Gson
+import com.google.gson.reflect.TypeToken
 import kotlinx.coroutines.runBlocking
 import okhttp3.mockwebserver.MockResponse
 import okhttp3.mockwebserver.MockWebServer
@@ -33,7 +34,9 @@ class AnalysisClientTest {
         runBlocking {
             analysisClient.add(
                 FrameInference(
-                    emptyMap(),
+                    mapOf(
+                        InferenceLandmark.LEFT_HIP.cocoIndex() to Keypoint(0.5, 0.5, 1.0),
+                    ),
                     null,
                     0,
                     0.0,
@@ -43,6 +46,9 @@ class AnalysisClientTest {
 
             val request = server.takeRequest()
             assertTrue(request.path!!.endsWith("/videos/$videoId/j2p"))
+            val mapType = object : TypeToken<List<Map<String, Any>>>() {}.type
+            val body: List<Map<String, Any>> = gson.fromJson(request.body.readUtf8(), mapType)
+            assertTrue(body[0].containsKey(InferenceLandmark.LEFT_HIP.camelCase()))
         }
     }
 }