squash! added missing Duration conversions from String, JavaDuration, Long/Int (by Claude)

Author: Jolanrensen

core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/convert.kt

@@ -2927,126 +2927,73 @@ public fun <T> Convert<T, *>.toDateTimeComponents(): DataFrame<T> = asColumn { i
 // region toDuration
 
 /**
- * Converts values in this [String] column to [Duration].
+ * Converts values in this column to [Duration].
  *
- * Parses each string using [Duration.parse].
- * Fails with an exception if a value cannot be parsed.
+ * Supported source types: [String] (parsed via [Duration.parse]),
+ * [JavaDuration], [Long] and [Int] (interpreted as milliseconds).
  *
  * @return A new [DataColumn] with the [Duration] values.
  */
-@JvmName("convertToDurationFromString")
-public fun DataColumn<String>.convertToDuration(): DataColumn<Duration> = convertTo()
+@JvmName("convertToDurationFromT")
+public fun <T : Any> DataColumn<T>.convertToDuration(): DataColumn<Duration> = convertTo()
 
 /**
- * Converts values in this [String] column to [Duration]. Preserves null values.
+ * Converts values in this column to [Duration]. Preserves null values.
  *
- * Parses each string using [Duration.parse].
- * Fails with an exception if a value cannot be parsed.
+ * Supported source types: [String] (parsed via [Duration.parse]),
+ * [JavaDuration], [Long] and [Int] (interpreted as milliseconds).
  *
  * @return A new [DataColumn] with the [Duration] nullable values.
  */
-@JvmName("convertToDurationFromStringNullable")
-public fun DataColumn<String?>.convertToDuration(): DataColumn<Duration?> = convertTo()
-
-/**
- * Converts values in this [JavaDuration] column to [Duration].
- *
- * @return A new [DataColumn] with the [Duration] values.
- */
-@JvmName("convertToDurationFromJavaDuration")
-public fun DataColumn<JavaDuration>.convertToDuration(): DataColumn<Duration> = convertTo()
+public fun <T : Any> DataColumn<T?>.convertToDuration(): DataColumn<Duration?> = convertTo()
 
 /**
- * Converts values in this [JavaDuration] column to [Duration]. Preserves null values.
- *
- * @return A new [DataColumn] with the [Duration] nullable values.
- */
-@JvmName("convertToDurationFromJavaDurationNullable")
-public fun DataColumn<JavaDuration?>.convertToDuration(): DataColumn<Duration?> = convertTo()
-
-/**
- * Converts values in the [String] columns previously selected with [convert] to [Duration],
+ * Converts values in the columns previously selected with [convert] to [Duration],
  * preserving their original names and positions within the [DataFrame].
- * Preserves null values.
  *
- * Parses each string using [Duration.parse].
- * Fails with an exception if a value cannot be parsed.
+ * Supported source types: [String] (parsed via [Duration.parse]),
+ * [JavaDuration], [Long] and [Int] (interpreted as milliseconds).
  *
  * For more information: {@include [DocumentationUrls.Convert]}
  *
  * ### Examples:
  * ```kotlin
  * df.convert { duration }.toDuration()
+ * df.convert { colsOf<String>() }.toDuration()
+ * df.convert { colsOf<Long>() }.toDuration()
  * ```
  *
  * @return A new [DataFrame] with the values converted to [Duration].
  */
-@JvmName("toDurationFromStringNullable")
-@Refine
-@Converter(Duration::class, nullable = true)
-@Interpretable("ToSpecificType")
-public fun <T> Convert<T, String?>.toDuration(): DataFrame<T> = asColumn { it.convertToDuration() }
-
-/**
- * Converts values in the [String] columns previously selected with [convert] to [Duration],
- * preserving their original names and positions within the [DataFrame].
- *
- * Parses each string using [Duration.parse].
- * Fails with an exception if a value cannot be parsed.
- *
- * For more information: {@include [DocumentationUrls.Convert]}
- *
- * ### Examples:
- * ```kotlin
- * df.convert { duration }.toDuration()
- * ```
- *
- * @return A new [DataFrame] with the values converted to [Duration].
- */
-@JvmName("toDurationFromString")
+@JvmName("toDurationTAny")
 @Refine
 @Converter(Duration::class, nullable = false)
 @Interpretable("ToSpecificType")
-public fun <T> Convert<T, String>.toDuration(): DataFrame<T> = asColumn { it.convertToDuration() }
+public fun <T> Convert<T, Any>.toDuration(): DataFrame<T> = to<Duration>()
 
 /**
- * Converts values in the [JavaDuration] columns previously selected with [convert] to [Duration],
+ * Converts values in the columns previously selected with [convert] to [Duration],
  * preserving their original names and positions within the [DataFrame].
  * Preserves null values.
  *
- * For more information: {@include [DocumentationUrls.Convert]}
- *
- * ### Examples:
- * ```kotlin
- * df.convert { duration }.toDuration()
- * ```
- *
- * @return A new [DataFrame] with the values converted to [Duration].
- */
-@JvmName("toDurationFromJavaDurationNullable")
-@Refine
-@Converter(Duration::class, nullable = true)
-@Interpretable("ToSpecificType")
-public fun <T> Convert<T, JavaDuration?>.toDuration(): DataFrame<T> = asColumn { it.convertToDuration() }
-
-/**
- * Converts values in the [JavaDuration] columns previously selected with [convert] to [Duration],
- * preserving their original names and positions within the [DataFrame].
+ * Supported source types: [String] (parsed via [Duration.parse]),
+ * [JavaDuration], [Long] and [Int] (interpreted as milliseconds).
  *
  * For more information: {@include [DocumentationUrls.Convert]}
  *
  * ### Examples:
  * ```kotlin
  * df.convert { duration }.toDuration()
+ * df.convert { colsOf<String?>() }.toDuration()
+ * df.convert { colsOf<Long?>() }.toDuration()
  * ```
  *
  * @return A new [DataFrame] with the values converted to [Duration].
  */
-@JvmName("toDurationFromJavaDuration")
 @Refine
-@Converter(Duration::class, nullable = false)
+@Converter(Duration::class, nullable = true)
 @Interpretable("ToSpecificType")
-public fun <T> Convert<T, JavaDuration>.toDuration(): DataFrame<T> = asColumn { it.convertToDuration() }
+public fun <T> Convert<T, Any?>.toDuration(): DataFrame<T> = to<Duration?>()
 
 // endregion
 

core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/api/convert.kt

@@ -59,6 +59,7 @@ import kotlin.reflect.full.withNullability
 import kotlin.reflect.jvm.jvmErasure
 import kotlin.reflect.typeOf
 import kotlin.time.Duration
+import kotlin.time.Duration.Companion.milliseconds
 import kotlin.time.toJavaDuration
 import kotlin.time.toJavaInstant
 import kotlin.time.toKotlinDuration
@@ -273,11 +274,18 @@ internal fun createConverter(from: KType, to: KType, options: ParserOptions? = n
         toClass == Duration::class -> when (fromClass) {
             String::class -> Parsers.getAsConverterOrNull(to, options)!!
             JavaDuration::class -> convert<JavaDuration> { it.toKotlinDuration() }
+            Long::class -> convert<Long> { it.milliseconds }
+            Int::class -> convert<Int> { it.milliseconds }
             else -> null
         }
 
-        fromClass == Duration::class && toClass == JavaDuration::class ->
-            convert<Duration> { it.toJavaDuration() }
+        fromClass == Duration::class -> when (toClass) {
+            JavaDuration::class -> convert<Duration> { it.toJavaDuration() }
+            Long::class -> convert<Duration> { it.inWholeMilliseconds }
+            Int::class -> convert<Duration> { it.inWholeMilliseconds.toInt() }
+            String::class -> convert<Duration> { it.toString() }
+            else -> null
+        }
 
         toClass.isValue -> {
             val constructor =

core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/api/convert.kt

@@ -28,6 +28,7 @@ import kotlin.reflect.full.starProjectedType
 import kotlin.reflect.typeOf
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.hours
+import kotlin.time.Duration.Companion.milliseconds
 import kotlin.time.Duration.Companion.minutes
 import kotlin.time.toKotlinDuration
 import java.time.Duration as JavaDuration
@@ -375,31 +376,59 @@ class ConvertTests {
     @Test
     fun `toDuration from String column`() {
         val duration by columnOf("1h", "30m")
-        val df = duration.toDataFrame()
-        df.convert { duration }.toDuration()[{ "duration"<Duration>() }][0] shouldBe 1.hours
+        duration.toDataFrame().convert { duration }.toDuration()["duration"][0] shouldBe 1.hours
     }
 
     @Test
     fun `toDuration from nullable String column`() {
         val duration by columnOf("1h", null)
-        val df = duration.toDataFrame()
-        df.convert { duration }.toDuration()[{ "duration"<Duration?>() }].hasNulls shouldBe true
+        duration.toDataFrame().convert { duration }.toDuration()["duration"].hasNulls shouldBe true
     }
 
     @Test
     fun `toDuration from JavaDuration column`() {
         val javaDuration = JavaDuration.ofHours(2)
         val duration by columnOf(javaDuration)
-        val df = duration.toDataFrame()
-        df.convert { duration }.toDuration()[{ "duration"<Duration>() }][0] shouldBe javaDuration.toKotlinDuration()
+        duration.toDataFrame().convert { duration }.toDuration()["duration"][0] shouldBe javaDuration.toKotlinDuration()
     }
 
     @Test
     fun `toDuration from nullable JavaDuration column`() {
         val javaDuration = JavaDuration.ofMinutes(45)
         val duration by columnOf(javaDuration, null)
-        val df = duration.toDataFrame()
-        df.convert { duration }.toDuration()[{ "duration"<Duration?>() }][0] shouldBe javaDuration.toKotlinDuration()
+        duration.toDataFrame().convert { duration }.toDuration()["duration"][0] shouldBe javaDuration.toKotlinDuration()
+    }
+
+    @Test
+    fun `toDuration from Long column`() {
+        val duration by columnOf(3600_000L, 1800_000L)
+        duration.toDataFrame().convert { duration }.toDuration()["duration"][0] shouldBe 1.hours
+    }
+
+    @Test
+    fun `toDuration from Int column`() {
+        val duration by columnOf(3600_000, 1800_000)
+        duration.toDataFrame().convert { duration }.toDuration()["duration"][0] shouldBe 1.hours
+    }
+
+    @Test
+    fun `Duration roundtrip via Long`() {
+        val col = columnOf(1.hours, 30.minutes)
+        col.convertToLong() shouldBe columnOf(3600_000L, 1800_000L)
+        col.convertToLong().convertToDuration() shouldBe col
+    }
+
+    @Test
+    fun `Duration roundtrip via Int`() {
+        val col = columnOf(1.hours, 30.minutes)
+        col.convertToInt() shouldBe columnOf(3600_000, 1800_000)
+        col.convertToInt().convertToDuration() shouldBe col
+    }
+
+    @Test
+    fun `Duration roundtrip via JavaDuration`() {
+        val col = columnOf(1.hours)
+        col.convertTo<JavaDuration>().convertToDuration() shouldBe col
     }
 
     private interface Marker