Merge pull request #178 from RADAR-base/fix/oura-requests

this-Aditya · web-flow · commit 10d28dd24fc3 · 2025-08-22T21:09:34.000+05:30
Improve Oura connector requests
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -28,7 +28,7 @@ jobs:
           java-version: 17
 
       - name: Setup Gradle
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/actions/setup-gradle@v3
 
       - name: Compile code
         run: ./gradlew assemble
diff --git a/.github/workflows/oura.yml b/.github/workflows/oura.yml
@@ -28,7 +28,9 @@ jobs:
           java-version: 17
 
       - name: Setup Gradle
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/actions/setup-gradle@v3
+        with:
+          gradle-version: '8.4'
 
       - name: Compile code
         run: gradle assemble
diff --git a/kafka-connect-oura-source/src/main/java/org/radarbase/connect/rest/oura/OuraSourceTask.java b/kafka-connect-oura-source/src/main/java/org/radarbase/connect/rest/oura/OuraSourceTask.java
@@ -155,7 +155,7 @@ public List<SourceRecord> poll() throws InterruptedException {
       while (sourceRecords.isEmpty() && requestIterator.hasNext()) {
         RestRequest request = requestIterator.next();
 
-        logger.info("Requesting {}", request.getRequest().url());
+        logger.info("Requesting for user {}, url: {}", request.getUser().getUserId(), request.getRequest().url());
         requestsGenerated++;
 
         try {
diff --git a/oura-library/src/main/kotlin/org/radarbase/oura/converter/OuraDailyActivityMetConverter.kt b/oura-library/src/main/kotlin/org/radarbase/oura/converter/OuraDailyActivityMetConverter.kt
@@ -38,24 +38,27 @@ class OuraDailyActivityMetConverter(
         val timeReceivedEpoch = System.currentTimeMillis() / 1000.0
         val id = this.get("id").textValue()
         val interval = this.get(sampleKey)?.get("interval")?.intValue()
-            ?: throw IOException("Unable to get sample interval.")
-        val items = this.get(sampleKey)?.get("items") ?: throw IOException("Unable to get items.")
-        return items.asSequence()
-            .mapIndexedCatching { index, value ->
-                val offset = interval * index
-                val time = startTimeEpoch + offset
-                TopicData(
-                    key = user.observationKey,
-                    topic = topic,
-                    offset = time.toLong(),
-                    value = toMet(
-                        time,
-                        timeReceivedEpoch,
-                        id,
-                        value.floatValue(),
-                    ),
-                )
-            }
+        val items = this.get(sampleKey)?.get("items")
+        return if (items == null || interval == null) {
+            emptySequence()
+        } else {
+            items.asSequence()
+                .mapIndexedCatching { index, value ->
+                    val offset = interval * index
+                    val time = startTimeEpoch + offset
+                    TopicData(
+                        key = user.observationKey,
+                        topic = topic,
+                        offset = time.toLong(),
+                        value = toMet(
+                            time,
+                            timeReceivedEpoch,
+                            id,
+                            value.floatValue(),
+                        ),
+                    )
+                }
+        }
     }
 
     private fun toMet(
diff --git a/oura-library/src/main/kotlin/org/radarbase/oura/converter/OuraHeartRateConverter.kt b/oura-library/src/main/kotlin/org/radarbase/oura/converter/OuraHeartRateConverter.kt
@@ -38,6 +38,7 @@ class OuraHeartRateConverter(
             time = startTime.toEpochMilli() / 1000.0
             timeReceived = System.currentTimeMillis() / 1000.0
             source = data.get("source")?.textValue()?.classify()
+                ?: OuraHeartRateSource.UNKNOWN
             bpm = data.get("bpm")?.intValue()
         }.build()
     }
diff --git a/oura-library/src/main/kotlin/org/radarbase/oura/converter/OuraRingConfigurationConverter.kt b/oura-library/src/main/kotlin/org/radarbase/oura/converter/OuraRingConfigurationConverter.kt
@@ -46,10 +46,11 @@ class OuraRingConfigurationConverter(
             time = System.currentTimeMillis() / 1000.0
             timeReceived = System.currentTimeMillis() / 1000.0
             id = data.get("id")?.textValue()
-            color = data.get("color")?.textValue()?.classifyColor()
-            design = data.get("design")?.textValue()?.classifyDesign()
+            color = data.get("color")?.textValue()?.classifyColor() ?: OuraRingColor.UNKNOWN
+            design = data.get("design")?.textValue()?.classifyDesign() ?: OuraRingDesign.UNKNOWN
             firmwareVersion = data.get("firmware_version")?.textValue()
             hardwareType = data.get("hardware_type")?.textValue()?.classifyHardware()
+                ?: OuraRingHardwareType.UNKNOWN
             setUpAt = setupTime?.toEpochMilli()?.let { it / 1000.0 }
             size = data.get("size")?.intValue()
         }.build()
diff --git a/oura-library/src/main/kotlin/org/radarbase/oura/converter/OuraSessionConverter.kt b/oura-library/src/main/kotlin/org/radarbase/oura/converter/OuraSessionConverter.kt
@@ -44,7 +44,9 @@ class OuraSessionConverter(
             timeReceived = System.currentTimeMillis() / 1000.0
             id = data.get("id")?.textValue()
             type = data.get("type")?.textValue()?.classifyType()
+                ?: OuraMomentType.UNKNOWN
             mood = data.get("mood")?.textValue()?.classifyMood()
+                ?: OuraMomentMood.UNKNOWN
         }.build()
     }
 
diff --git a/oura-library/src/main/kotlin/org/radarbase/oura/converter/OuraSessionHeartRateConverter.kt b/oura-library/src/main/kotlin/org/radarbase/oura/converter/OuraSessionHeartRateConverter.kt
@@ -39,25 +39,27 @@ class OuraSessionHeartRateConverter(
         val timeReceivedEpoch = System.currentTimeMillis() / 1000.0
         val id = this.get("id").textValue()
         val interval = this.get(sampleKey)?.get("interval")?.intValue()
-            ?: throw IOException("Unable to get sample interval.")
         val items = this.get(sampleKey)?.get("items")
-            ?: throw IOException("Unable to get sample items.")
-        return items.asSequence()
-            .mapIndexedCatching { index, value ->
-                val offset = interval * index
-                val time = startTimeEpoch + offset
-                TopicData(
-                    key = user.observationKey,
-                    topic = topic,
-                    offset = time.toLong(),
-                    value = toHeartRate(
-                        time,
-                        timeReceivedEpoch,
-                        id,
-                        value.intValue(),
-                    ),
-                )
-            }
+        return if (items == null || interval == null) {
+            emptySequence()
+        } else {
+            items.asSequence()
+                .mapIndexedCatching { index, value ->
+                    val offset = interval * index
+                    val time = startTimeEpoch + offset
+                    TopicData(
+                        key = user.observationKey,
+                        topic = topic,
+                        offset = time.toLong(),
+                        value = toHeartRate(
+                            time,
+                            timeReceivedEpoch,
+                            id,
+                            value.intValue(),
+                        ),
+                    )
+                }
+        }
     }
 
     private fun toHeartRate(
diff --git a/oura-library/src/main/kotlin/org/radarbase/oura/converter/OuraSessionHrvConverter.kt b/oura-library/src/main/kotlin/org/radarbase/oura/converter/OuraSessionHrvConverter.kt
@@ -38,24 +38,27 @@ class OuraSessionHrvConverter(
         val timeReceivedEpoch = System.currentTimeMillis() / 1000.0
         val id = this.get("id").textValue()
         val interval = this.get(sampleKey)?.get("interval")?.intValue()
-            ?: throw IOException("Unable to get sample interval.")
-        val items = this.get(sampleKey)?.get("items") ?: throw IOException("Unable to get items.")
-        return items.asSequence()
-            .mapIndexedCatching { index, value ->
-                val offset = index * interval
-                val time = startTimeEpoch + offset
-                TopicData(
-                    key = user.observationKey,
-                    topic = topic,
-                    offset = time.toLong(),
-                    value = toHrv(
-                        time,
-                        timeReceivedEpoch,
-                        id,
-                        value.floatValue(),
-                    ),
-                )
-            }
+        val items = this.get(sampleKey)?.get("items")
+        return if (items == null || interval == null) {
+            emptySequence()
+        } else {
+            items.asSequence()
+                .mapIndexedCatching { index, value ->
+                    val offset = index * interval
+                    val time = startTimeEpoch + offset
+                    TopicData(
+                        key = user.observationKey,
+                        topic = topic,
+                        offset = time.toLong(),
+                        value = toHrv(
+                            time,
+                            timeReceivedEpoch,
+                            id,
+                            value.floatValue(),
+                        ),
+                    )
+                }
+        }
     }
 
     private fun toHrv(
diff --git a/oura-library/src/main/kotlin/org/radarbase/oura/converter/OuraSessionMotionCountConverter.kt b/oura-library/src/main/kotlin/org/radarbase/oura/converter/OuraSessionMotionCountConverter.kt
@@ -38,24 +38,27 @@ class OuraSessionMotionCountConverter(
         val timeReceivedEpoch = System.currentTimeMillis() / 1000.0
         val id = this.get("id").textValue()
         val interval = this.get(sampleKey)?.get("interval")?.intValue()
-            ?: throw IOException("Unable to get sample interval.")
-        val items = this.get(sampleKey)?.get("items") ?: throw IOException("Unable to get items.")
-        return items.asSequence()
-            .mapIndexedCatching { index, value ->
-                val offset = interval * index
-                val time = startTimeEpoch + offset
-                TopicData(
-                    key = user.observationKey,
-                    topic = topic,
-                    offset = time.toLong(),
-                    value = toMotionCount(
-                        startTimeEpoch,
-                        timeReceivedEpoch,
-                        id,
-                        value.intValue(),
-                    ),
-                )
-            }
+        val items = this.get(sampleKey)?.get("items")
+        return if (items == null || interval == null) {
+            emptySequence()
+        } else {
+            items.asSequence()
+                .mapIndexedCatching { index, value ->
+                    val offset = interval * index
+                    val time = startTimeEpoch + offset
+                    TopicData(
+                        key = user.observationKey,
+                        topic = topic,
+                        offset = time.toLong(),
+                        value = toMotionCount(
+                            startTimeEpoch,
+                            timeReceivedEpoch,
+                            id,
+                            value.intValue(),
+                        ),
+                    )
+                }
+        }
     }
 
     private fun toMotionCount(
diff --git a/oura-library/src/main/kotlin/org/radarbase/oura/converter/OuraSleepConverter.kt b/oura-library/src/main/kotlin/org/radarbase/oura/converter/OuraSleepConverter.kt
@@ -80,6 +80,7 @@ class OuraSleepConverter(
             timeInBed = data.get("time_in_bed")?.intValue()
             totalSleepDuration = data.get("total_sleep_duration")?.intValue()
             type = data.get("type")?.textValue()?.classifyType()
+                ?: OuraSleepType.UNKNOWN
         }.build()
     }
 
diff --git a/oura-library/src/main/kotlin/org/radarbase/oura/converter/OuraSleepHeartRateConverter.kt b/oura-library/src/main/kotlin/org/radarbase/oura/converter/OuraSleepHeartRateConverter.kt
@@ -39,24 +39,27 @@ class OuraSleepHeartRateConverter(
         val timeReceivedEpoch = System.currentTimeMillis() / 1000.0
         val id = this.get("id").textValue()
         val interval = this.get(sampleKey)?.get("interval")?.intValue()
-            ?: throw IOException("Unable to get sample interval.")
-        val items = this.get(sampleKey)?.get("items") ?: throw IOException("Unable to get items.")
-        return items.asSequence()
-            .mapIndexedCatching { index, value ->
-                val offset = interval * index
-                val time = startTimeEpoch + offset
-                TopicData(
-                    key = user.observationKey,
-                    topic = topic,
-                    offset = time.toLong(),
-                    value = toHeartRate(
-                        time,
-                        timeReceivedEpoch,
-                        id,
-                        value.intValue(),
-                    ),
-                )
-            }
+        val items = this.get(sampleKey)?.get("items")
+        return if (items == null || interval == null) {
+            emptySequence()
+        } else {
+            items.asSequence()
+                .mapIndexedCatching { index, value ->
+                    val offset = interval * index
+                    val time = startTimeEpoch + offset
+                    TopicData(
+                        key = user.observationKey,
+                        topic = topic,
+                        offset = time.toLong(),
+                        value = toHeartRate(
+                            time,
+                            timeReceivedEpoch,
+                            id,
+                            value.intValue(),
+                        ),
+                    )
+                }
+        }
     }
 
     private fun toHeartRate(
diff --git a/oura-library/src/main/kotlin/org/radarbase/oura/converter/OuraSleepHrvConverter.kt b/oura-library/src/main/kotlin/org/radarbase/oura/converter/OuraSleepHrvConverter.kt
@@ -38,24 +38,27 @@ class OuraSleepHrvConverter(
         val timeReceivedEpoch = System.currentTimeMillis() / 1000.0
         val id = this.get("id").textValue()
         val interval = this.get(sampleKey)?.get("interval")?.intValue()
-            ?: throw IOException("Unable to get sample interval.")
-        val items = this.get(sampleKey)?.get("items") ?: throw IOException("Unable to get items.")
-        return items.asSequence()
-            .mapIndexedCatching { index, value ->
-                val offset = interval * index
-                val time = startTimeEpoch + offset
-                TopicData(
-                    key = user.observationKey,
-                    topic = topic,
-                    offset = time.toLong(),
-                    value = toHrv(
-                        time,
-                        timeReceivedEpoch,
-                        id,
-                        value.floatValue(),
-                    ),
-                )
-            }
+        val items = this.get(sampleKey)?.get("items")
+        return if (items == null || interval == null) {
+            emptySequence()
+        } else {
+            items.asSequence()
+                .mapIndexedCatching { index, value ->
+                    val offset = interval * index
+                    val time = startTimeEpoch + offset
+                    TopicData(
+                        key = user.observationKey,
+                        topic = topic,
+                        offset = time.toLong(),
+                        value = toHrv(
+                            time,
+                            timeReceivedEpoch,
+                            id,
+                            value.floatValue(),
+                        ),
+                    )
+                }
+        }
     }
 
     private fun toHrv(
diff --git a/oura-library/src/main/kotlin/org/radarbase/oura/converter/OuraSleepPhaseConverter.kt b/oura-library/src/main/kotlin/org/radarbase/oura/converter/OuraSleepPhaseConverter.kt
@@ -34,8 +34,8 @@ class OuraSleepPhaseConverter(
         val startTimeEpoch = startTime.toInstant().toEpochMilli() / 1000.0
         val timeReceivedEpoch = System.currentTimeMillis() / 1000.0
         val id = this.get("id").textValue()
-        val items = this.get("sleep_phase_5_min").textValue().toCharArray()
-        return if (items.isEmpty()) {
+        val items = this.get("sleep_phase_5_min")?.textValue()?.toCharArray()
+        return if (items == null) {
             emptySequence()
         } else {
             items.asSequence()
diff --git a/oura-library/src/main/kotlin/org/radarbase/oura/converter/OuraSleepTimeRecommendationConverter.kt b/oura-library/src/main/kotlin/org/radarbase/oura/converter/OuraSleepTimeRecommendationConverter.kt
@@ -49,7 +49,9 @@ class OuraSleepTimeRecommendationConverter(
             optimalBedtimeEndOffset = data.get("optimal_bedtime")?.get("end_offset")?.intValue()
             optimalBedtimeTimezoneOffset = data.get("optimal_bedtime")?.get("day_tz")?.intValue()
             recommendation = data.get("recommendation").textValue()?.classifyRecommendation()
+                ?: OuraSleepRecommendation.UNKNOWN
             status = data.get("status").textValue()?.classifyStatus()
+                ?: OuraSleepStatus.UNKNOWN
         }.build()
     }
 
diff --git a/oura-library/src/main/kotlin/org/radarbase/oura/converter/OuraWorkoutConverter.kt b/oura-library/src/main/kotlin/org/radarbase/oura/converter/OuraWorkoutConverter.kt
@@ -48,8 +48,10 @@ class OuraWorkoutConverter(
             day = data.get("day")?.textValue()
             distance = data.get("distance")?.floatValue()
             intensity = data.get("intensity")?.textValue()?.classifyIntensity()
+                ?: OuraWorkoutIntensity.UNKNOWN
             label = data.get("label")?.textValue()
             source = data.get("source")?.textValue()?.classifySource()
+                ?: OuraWorkoutSource.UNKNOWN
         }.build()
     }
 
diff --git a/oura-library/src/main/kotlin/org/radarbase/oura/request/OuraRequestGenerator.kt b/oura-library/src/main/kotlin/org/radarbase/oura/request/OuraRequestGenerator.kt
diff --git a/oura-library/src/main/kotlin/org/radarbase/oura/route/OuraHeartRateRoute.kt b/oura-library/src/main/kotlin/org/radarbase/oura/route/OuraHeartRateRoute.kt
diff --git a/oura-library/src/main/kotlin/org/radarbase/oura/route/OuraRoute.kt b/oura-library/src/main/kotlin/org/radarbase/oura/route/OuraRoute.kt

Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,7 @@ class OuraHeartRateConverter(`
`38`	`38`	`time = startTime.toEpochMilli() / 1000.0`
`39`	`39`	`timeReceived = System.currentTimeMillis() / 1000.0`
`40`	`40`	`source = data.get("source")?.textValue()?.classify()`
	`41`	`+ ?: OuraHeartRateSource.UNKNOWN`
`41`	`42`	`bpm = data.get("bpm")?.intValue()`
`42`	`43`	`}.build()`
`43`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,9 @@ class OuraSessionConverter(`
`44`	`44`	`timeReceived = System.currentTimeMillis() / 1000.0`
`45`	`45`	`id = data.get("id")?.textValue()`
`46`	`46`	`type = data.get("type")?.textValue()?.classifyType()`
	`47`	`+ ?: OuraMomentType.UNKNOWN`
`47`	`48`	`mood = data.get("mood")?.textValue()?.classifyMood()`
	`49`	`+ ?: OuraMomentMood.UNKNOWN`
`48`	`50`	`}.build()`
`49`	`51`	`}`
`50`	`52`