Merge pull request #7 from datastax/1.x

Set Main as last version

Author: clun

astra-db-java/pom.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>com.datastax.astra</groupId>
     <artifactId>astra-db-java</artifactId>
     <name>Java Client Library for Data API</name>
     <description>Implementation of a client to the Astra/Stargate Data API written in Java</description>

examples/pom.xml

@@ -10,13 +10,14 @@
     <parent>
         <groupId>com.datastax.astra</groupId>
         <artifactId>astra-db-java-parent</artifactId>
-        <version>1.4.3-SNAPSHOT</version>
+        <version>1.4.6-SNAPSHOT</version>
     </parent>
 
     <dependencies>
         <dependency>
             <groupId>com.datastax.astra</groupId>
             <artifactId>astra-db-java</artifactId>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>ch.qos.logback</groupId>

langchain4j-astradb/pom.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>com.datastax.astra</groupId>
     <artifactId>langchain4j-astradb</artifactId>
     <name>LangChain4j :: Integration :: AstraDB</name>
     <description>Some dependencies have a "Public Domain" license</description>

pom.xml

@@ -13,6 +13,8 @@
     <modules>
         <module>astra-db-java</module>
         <module>langchain4j-astradb</module>
+        <module>examples</module>
+        <module>tools</module>
     </modules>
 
     <properties>
@@ -342,6 +344,10 @@
     <profiles>
         <profile>
             <id>release</id>
+            <modules>
+                <module>astra-db-java</module>
+                <module>langchain4j-astradb</module>
+            </modules>
             <build>
                 <plugins>
                     <plugin>

tools/pom.xml

@@ -10,13 +10,14 @@
     <parent>
         <groupId>com.datastax.astra</groupId>
         <artifactId>astra-db-java-parent</artifactId>
-        <version>1.4.3-SNAPSHOT</version>
+        <version>1.4.6-SNAPSHOT</version>
     </parent>
 
     <dependencies>
         <dependency>
             <groupId>com.datastax.astra</groupId>
             <artifactId>astra-db-java</artifactId>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>ch.qos.logback</groupId>

tools/src/main/java/com/datastax/astra/tool/loader/csv/CsvLoader.java

@@ -71,6 +71,7 @@ public static void load(String fileName, CsvLoaderSettings settings, Collection<
                 batch.add(processor.map(rowMap));
                 if (batch.size() == settings.batchSize) {
                     final List<Document> batchToInsert = new ArrayList<>(batch);
+                    log.info("Enqueuing {} rows from {}... ", collection, batch.size());
                     executor.submit(() -> collection.insertMany(batchToInsert));
                     batch.clear(); // Clear the batch for the next set of rows
                 }

tools/src/test/java/com/datastax/astra/samples/CsvPhilosophers.java

@@ -0,0 +1,43 @@
+package com.datastax.astra.samples;
+
+import com.datastax.astra.client.Collection;
+import com.datastax.astra.client.DataAPIClient;
+import com.datastax.astra.client.Database;
+import com.datastax.astra.client.model.Document;
+import com.datastax.astra.tool.loader.csv.CsvLoader;
+import com.datastax.astra.tool.loader.csv.CsvRowMapper;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * Load a CSV to Astra
+ */
+@Slf4j
+public class CsvPhilosophers {
+
+    private static final String ASTRA_TOKEN  = System.getenv("ASTRA_DB_APPLICATION_TOKEN");
+    private static final String API_ENDPOINT = "https://ba006059-a932-405c-857d-50921694078a-us-east1.apps.astra.datastax.com";
+
+    public static void main(String[] args) throws Exception {
+        // Get an empty Collection
+        DataAPIClient        client = new DataAPIClient(ASTRA_TOKEN);
+        Database             db = client.getDatabase(API_ENDPOINT);
+        Collection<Document> collection = db.getCollection("openai_clun");
+
+        collection.deleteAll();
+
+        // Zou !
+        String csvFilename = "/Users/cedricklunven/dev/datastax/JAVA/astra-db-java/tools/src/test/resources/philosopher-quotes.csv";
+        CsvLoader.load(csvFilename, collection, new CsvRowMapper() {
+            @Override
+            public Document map(Document csvRow) {
+                // Tags should be an Array
+                csvRow.vectorize(csvRow.getString("quote"));
+                csvRow.append("tags",csvRow.getString("tags").split(";"));
+                return csvRow;
+            }
+        });
+        Thread.sleep(10000);
+
+    }
+
+}