Deephaven csv as default

build.gradle.kts

@@ -55,8 +55,7 @@ dependencies {
     api(project(":dataframe-excel"))
     api(project(":dataframe-openapi"))
     api(project(":dataframe-jdbc"))
-    // TODO enable when it leaves the experimental phase
-    //  api(project(":dataframe-csv"))
+    api(project(":dataframe-csv"))
 
     kover(project(":core"))
     kover(project(":dataframe-arrow"))

core/build.gradle.kts

@@ -85,6 +85,9 @@ dependencies {
     testImplementation(libs.kotlin.scriptingJvm)
     testImplementation(libs.jsoup)
     testImplementation(libs.sl4jsimple)
+
+    // for JupyterCodegenTests and samples.api
+    testImplementation(project(":dataframe-csv"))
 }
 
 val samplesImplementation by configurations.getting {

core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/parse.kt

@@ -12,7 +12,6 @@ import org.jetbrains.kotlinx.dataframe.impl.api.StringParser
 import org.jetbrains.kotlinx.dataframe.impl.api.parseImpl
 import org.jetbrains.kotlinx.dataframe.impl.api.tryParseImpl
 import org.jetbrains.kotlinx.dataframe.impl.io.FastDoubleParser
-import org.jetbrains.kotlinx.dataframe.io.readCSV
 import org.jetbrains.kotlinx.dataframe.typeClass
 import org.jetbrains.kotlinx.dataframe.util.PARSER_OPTIONS
 import org.jetbrains.kotlinx.dataframe.util.PARSER_OPTIONS_COPY
@@ -27,7 +26,7 @@ import kotlin.reflect.KType
  * These options are used to configure how [DataColumns][DataColumn] of type [String] or [String?][String]
  * should be parsed.
  * You can always pass a [ParserOptions] object to functions that perform parsing, like [tryParse], [parse],
- * or even [DataFrame.readCSV][DataFrame.Companion.readCSV] to override these options.
+ * or even [DataFrame.readCsv][DataFrame.Companion.readCsv] to override these options.
  */
 public val DataFrame.Companion.parser: GlobalParserOptions
     get() = Parsers

core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/io/csv.kt

@@ -19,18 +19,35 @@ import org.jetbrains.kotlinx.dataframe.codeGen.DefaultReadCsvMethod
 import org.jetbrains.kotlinx.dataframe.codeGen.DefaultReadDfMethod
 import org.jetbrains.kotlinx.dataframe.impl.api.parse
 import org.jetbrains.kotlinx.dataframe.impl.io.readDelimImpl
+import org.jetbrains.kotlinx.dataframe.util.APACHE_CSV
 import org.jetbrains.kotlinx.dataframe.util.AS_URL
 import org.jetbrains.kotlinx.dataframe.util.AS_URL_IMPORT
 import org.jetbrains.kotlinx.dataframe.util.AS_URL_REPLACE
 import org.jetbrains.kotlinx.dataframe.util.DF_READ_NO_CSV
 import org.jetbrains.kotlinx.dataframe.util.DF_READ_NO_CSV_REPLACE
+import org.jetbrains.kotlinx.dataframe.util.READ_CSV
+import org.jetbrains.kotlinx.dataframe.util.READ_CSV_FILE_OR_URL_REPLACE
+import org.jetbrains.kotlinx.dataframe.util.READ_CSV_FILE_REPLACE
+import org.jetbrains.kotlinx.dataframe.util.READ_CSV_IMPORT
+import org.jetbrains.kotlinx.dataframe.util.READ_CSV_STREAM_REPLACE
+import org.jetbrains.kotlinx.dataframe.util.READ_CSV_URL_REPLACE
+import org.jetbrains.kotlinx.dataframe.util.READ_DELIM
+import org.jetbrains.kotlinx.dataframe.util.READ_DELIM_READER_REPLACE
+import org.jetbrains.kotlinx.dataframe.util.READ_DELIM_STREAM_REPLACE
+import org.jetbrains.kotlinx.dataframe.util.TO_CSV
+import org.jetbrains.kotlinx.dataframe.util.TO_CSV_IMPORT
+import org.jetbrains.kotlinx.dataframe.util.TO_CSV_REPLACE
+import org.jetbrains.kotlinx.dataframe.util.WRITE_CSV
+import org.jetbrains.kotlinx.dataframe.util.WRITE_CSV_FILE_REPLACE
+import org.jetbrains.kotlinx.dataframe.util.WRITE_CSV_IMPORT
+import org.jetbrains.kotlinx.dataframe.util.WRITE_CSV_PATH_REPLACE
+import org.jetbrains.kotlinx.dataframe.util.WRITE_CSV_WRITER_REPLACE
 import org.jetbrains.kotlinx.dataframe.values
 import java.io.BufferedInputStream
 import java.io.BufferedReader
 import java.io.File
 import java.io.FileInputStream
 import java.io.FileWriter
-import java.io.IOException
 import java.io.InputStream
 import java.io.InputStreamReader
 import java.io.Reader
@@ -46,6 +63,7 @@ import kotlin.reflect.KType
 import kotlin.reflect.typeOf
 import kotlin.time.Duration
 
+@Deprecated(message = APACHE_CSV, level = DeprecationLevel.WARNING)
 public class CSV(private val delimiter: Char = ',') : SupportedDataFrameFormat {
     override fun readDataFrame(stream: InputStream, header: List<String>): AnyFrame =
         DataFrame.readCSV(stream = stream, delimiter = delimiter, header = header)
@@ -57,14 +75,18 @@ public class CSV(private val delimiter: Char = ',') : SupportedDataFrameFormat {
 
     override fun acceptsSample(sample: SupportedFormatSample): Boolean = true // Extension is enough
 
-    override val testOrder: Int = 20000
+    override val testOrder: Int = 20_001
 
     override fun createDefaultReadMethod(pathRepresentation: String?): DefaultReadDfMethod {
         val arguments = MethodArguments().add("delimiter", typeOf<Char>(), "'%L'", delimiter)
         return DefaultReadCsvMethod(pathRepresentation, arguments)
     }
 }
 
+@Deprecated(
+    message = APACHE_CSV,
+    level = DeprecationLevel.WARNING,
+)
 public enum class CSVType(public val format: CSVFormat) {
     DEFAULT(
         CSVFormat.DEFAULT.builder()
@@ -81,12 +103,19 @@ public enum class CSVType(public val format: CSVFormat) {
 
 private val defaultCharset = Charsets.UTF_8
 
+@Deprecated("", level = DeprecationLevel.WARNING)
 internal fun isCompressed(fileOrUrl: String) = listOf("gz", "zip").contains(fileOrUrl.split(".").last())
 
+@Deprecated("", level = DeprecationLevel.WARNING)
 internal fun isCompressed(file: File) = listOf("gz", "zip").contains(file.extension)
 
+@Deprecated("", level = DeprecationLevel.WARNING)
 internal fun isCompressed(url: URL) = isCompressed(url.path)
 
+@Deprecated(
+    message = APACHE_CSV,
+    level = DeprecationLevel.HIDDEN, // clashes with the new readDelim
+)
 @Refine
 @Interpretable("ReadDelimStr")
 public fun DataFrame.Companion.readDelimStr(
@@ -106,7 +135,7 @@ public fun DataFrame.Companion.readDelimStr(
 
 @Deprecated(
     message = DF_READ_NO_CSV,
-    replaceWith = ReplaceWith(DF_READ_NO_CSV_REPLACE),
+    replaceWith = ReplaceWith(DF_READ_NO_CSV_REPLACE, READ_CSV_IMPORT),
     level = DeprecationLevel.ERROR,
 )
 public fun DataFrame.Companion.read(
@@ -118,22 +147,13 @@ public fun DataFrame.Companion.read(
     readLines: Int? = null,
     duplicate: Boolean = true,
     charset: Charset = Charsets.UTF_8,
-): DataFrame<*> =
-    catchHttpResponse(asUrl(fileOrUrl)) {
-        readDelim(
-            it,
-            delimiter,
-            header,
-            isCompressed(fileOrUrl),
-            getCSVType(fileOrUrl),
-            colTypes,
-            skipLines,
-            readLines,
-            duplicate,
-            charset,
-        )
-    }
+): DataFrame<*> = error(DF_READ_NO_CSV)
 
+@Deprecated(
+    message = READ_CSV,
+    replaceWith = ReplaceWith(READ_CSV_FILE_OR_URL_REPLACE, READ_CSV_IMPORT),
+    level = DeprecationLevel.WARNING,
+)
 @OptInRefine
 @Interpretable("ReadCSV0")
 public fun DataFrame.Companion.readCSV(
@@ -163,6 +183,11 @@ public fun DataFrame.Companion.readCSV(
         )
     }
 
+@Deprecated(
+    message = READ_CSV,
+    replaceWith = ReplaceWith(READ_CSV_FILE_REPLACE, READ_CSV_IMPORT),
+    level = DeprecationLevel.WARNING,
+)
 public fun DataFrame.Companion.readCSV(
     file: File,
     delimiter: Char = ',',
@@ -188,6 +213,11 @@ public fun DataFrame.Companion.readCSV(
         parserOptions,
     )
 
+@Deprecated(
+    message = READ_CSV,
+    replaceWith = ReplaceWith(READ_CSV_URL_REPLACE, READ_CSV_IMPORT),
+    level = DeprecationLevel.WARNING,
+)
 public fun DataFrame.Companion.readCSV(
     url: URL,
     delimiter: Char = ',',
@@ -212,6 +242,11 @@ public fun DataFrame.Companion.readCSV(
         parserOptions,
     )
 
+@Deprecated(
+    message = READ_CSV,
+    replaceWith = ReplaceWith(READ_CSV_STREAM_REPLACE, READ_CSV_IMPORT),
+    level = DeprecationLevel.WARNING,
+)
 public fun DataFrame.Companion.readCSV(
     stream: InputStream,
     delimiter: Char = ',',
@@ -238,13 +273,6 @@ public fun DataFrame.Companion.readCSV(
         parserOptions,
     )
 
-private fun getCSVType(path: String): CSVType =
-    when (path.substringAfterLast('.').lowercase()) {
-        "csv" -> CSVType.DEFAULT
-        "tdf" -> CSVType.TDF
-        else -> throw IOException("Unknown file format")
-    }
-
 @Deprecated(
     message = AS_URL,
     replaceWith = ReplaceWith(AS_URL_REPLACE, AS_URL_IMPORT),
@@ -264,6 +292,11 @@ private fun getFormat(
         .setAllowMissingColumnNames(duplicate)
         .build()
 
+@Deprecated(
+    message = READ_DELIM,
+    replaceWith = ReplaceWith(READ_DELIM_STREAM_REPLACE),
+    level = DeprecationLevel.WARNING,
+)
 public fun DataFrame.Companion.readDelim(
     inStream: InputStream,
     delimiter: Char = ',',
@@ -343,6 +376,11 @@ public fun ColType.toKType(): KType =
         ColType.Char -> typeOf<Char>()
     }
 
+@Deprecated(
+    message = READ_DELIM,
+    replaceWith = ReplaceWith(READ_DELIM_READER_REPLACE),
+    level = DeprecationLevel.WARNING,
+)
 public fun DataFrame.Companion.readDelim(
     reader: Reader,
     format: CSVFormat = CSVFormat.DEFAULT.builder()
@@ -371,12 +409,27 @@ public fun DataFrame.Companion.readDelim(
         )
     }
 
+@Deprecated(
+    message = WRITE_CSV,
+    replaceWith = ReplaceWith(WRITE_CSV_FILE_REPLACE, WRITE_CSV_IMPORT),
+    level = DeprecationLevel.WARNING,
+)
 public fun AnyFrame.writeCSV(file: File, format: CSVFormat = CSVFormat.DEFAULT): Unit =
     writeCSV(FileWriter(file), format)
 
+@Deprecated(
+    message = WRITE_CSV,
+    replaceWith = ReplaceWith(WRITE_CSV_PATH_REPLACE, WRITE_CSV_IMPORT),
+    level = DeprecationLevel.WARNING,
+)
 public fun AnyFrame.writeCSV(path: String, format: CSVFormat = CSVFormat.DEFAULT): Unit =
     writeCSV(FileWriter(path), format)
 
+@Deprecated(
+    message = WRITE_CSV,
+    replaceWith = ReplaceWith(WRITE_CSV_WRITER_REPLACE, WRITE_CSV_IMPORT),
+    level = DeprecationLevel.WARNING,
+)
 public fun AnyFrame.writeCSV(writer: Appendable, format: CSVFormat = CSVFormat.DEFAULT) {
     format.print(writer).use { printer ->
         if (!format.skipHeaderRecord) {
@@ -395,6 +448,11 @@ public fun AnyFrame.writeCSV(writer: Appendable, format: CSVFormat = CSVFormat.D
     }
 }
 
+@Deprecated(
+    message = TO_CSV,
+    replaceWith = ReplaceWith(TO_CSV_REPLACE, TO_CSV_IMPORT),
+    level = DeprecationLevel.WARNING,
+)
 public fun AnyFrame.toCsv(format: CSVFormat = CSVFormat.DEFAULT): String =
     StringWriter().use {
         this.writeCSV(it, format)

core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/io/tsv.kt

@@ -5,12 +5,23 @@ import org.jetbrains.kotlinx.dataframe.DataFrame
 import org.jetbrains.kotlinx.dataframe.api.ParserOptions
 import org.jetbrains.kotlinx.dataframe.codeGen.DefaultReadDfMethod
 import org.jetbrains.kotlinx.dataframe.codeGen.DefaultReadTsvMethod
+import org.jetbrains.kotlinx.dataframe.util.APACHE_CSV
+import org.jetbrains.kotlinx.dataframe.util.READ_TSV
+import org.jetbrains.kotlinx.dataframe.util.READ_TSV_FILE_OR_URL_REPLACE
+import org.jetbrains.kotlinx.dataframe.util.READ_TSV_FILE_REPLACE
+import org.jetbrains.kotlinx.dataframe.util.READ_TSV_IMPORT
+import org.jetbrains.kotlinx.dataframe.util.READ_TSV_STREAM_REPLACE
+import org.jetbrains.kotlinx.dataframe.util.READ_TSV_URL_REPLACE
 import java.io.File
 import java.io.FileInputStream
 import java.io.InputStream
 import java.net.URL
 import java.nio.charset.Charset
 
+@Deprecated(
+    message = APACHE_CSV,
+    level = DeprecationLevel.WARNING,
+)
 public class TSV : SupportedDataFrameFormat {
     override fun readDataFrame(stream: InputStream, header: List<String>): AnyFrame =
         DataFrame.readTSV(stream, header = header)
@@ -21,14 +32,19 @@ public class TSV : SupportedDataFrameFormat {
 
     override fun acceptsSample(sample: SupportedFormatSample): Boolean = true // Extension is enough
 
-    override val testOrder: Int = 30000
+    override val testOrder: Int = 30_001
 
     override fun createDefaultReadMethod(pathRepresentation: String?): DefaultReadDfMethod =
         DefaultReadTsvMethod(pathRepresentation)
 }
 
 private const val TAB_CHAR = '\t'
 
+@Deprecated(
+    message = READ_TSV,
+    replaceWith = ReplaceWith(READ_TSV_FILE_OR_URL_REPLACE, READ_TSV_IMPORT),
+    level = DeprecationLevel.WARNING,
+)
 public fun DataFrame.Companion.readTSV(
     fileOrUrl: String,
     header: List<String> = listOf(),
@@ -55,6 +71,11 @@ public fun DataFrame.Companion.readTSV(
         )
     }
 
+@Deprecated(
+    message = READ_TSV,
+    replaceWith = ReplaceWith(READ_TSV_FILE_REPLACE, READ_TSV_IMPORT),
+    level = DeprecationLevel.WARNING,
+)
 public fun DataFrame.Companion.readTSV(
     file: File,
     header: List<String> = listOf(),
@@ -77,6 +98,11 @@ public fun DataFrame.Companion.readTSV(
         charset,
     )
 
+@Deprecated(
+    message = READ_TSV,
+    replaceWith = ReplaceWith(READ_TSV_URL_REPLACE, READ_TSV_IMPORT),
+    level = DeprecationLevel.WARNING,
+)
 public fun DataFrame.Companion.readTSV(
     url: URL,
     header: List<String> = listOf(),
@@ -99,6 +125,11 @@ public fun DataFrame.Companion.readTSV(
         parserOptions,
     )
 
+@Deprecated(
+    message = READ_TSV,
+    replaceWith = ReplaceWith(READ_TSV_STREAM_REPLACE, READ_TSV_IMPORT),
+    level = DeprecationLevel.WARNING,
+)
 public fun DataFrame.Companion.readTSV(
     stream: InputStream,
     header: List<String> = listOf(),

core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/jupyter/Integration.kt

@@ -157,15 +157,15 @@ internal class Integration(private val notebook: Notebook, private val options:
     override fun Builder.onLoaded() {
         if (version != null) {
             if (enableExperimentalCsv?.toBoolean() == true) {
-                println("Enabling experimental CSV module: dataframe-csv")
-                dependencies("org.jetbrains.kotlinx:dataframe-csv:$version")
+                println("CSV module is already enabled by default now.")
             }
             if (enableExperimentalGeo?.toBoolean() == true) {
                 println("Enabling experimental Geo module: dataframe-geo")
                 repositories("https://repo.osgeo.org/repository/release")
                 dependencies("org.jetbrains.kotlinx:dataframe-geo:$version")
             }
             dependencies(
+                "org.jetbrains.kotlinx:dataframe-csv:$version",
                 "org.jetbrains.kotlinx:dataframe-excel:$version",
                 "org.jetbrains.kotlinx:dataframe-jdbc:$version",
                 "org.jetbrains.kotlinx:dataframe-arrow:$version",