Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move load csv/json v2 protocol #21

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Move load csv/json v2 protocol #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion rai-sdk-examples/src/main/java/com/relationalai/examples/LoadCsv.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,6 @@ public void run(String[] args) throws HttpError, InterruptedException, IOExcepti
var input = new FileInputStream(filename);
var rname = relation != null ? relation : sansext(filename);
var rsp = client.loadCsv(database, engine, rname, input, options);
Json.print(rsp, 4);
System.out.println(rsp);
}
}
2 changes: 1 addition & 1 deletion rai-sdk-examples/src/main/java/com/relationalai/examples/LoadJson.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,6 @@ public void run(String[] args) throws HttpError, InterruptedException, IOExcepti
var input = new FileInputStream(filename);
var rname = relation != null ? relation : sansext(filename);
var rsp = client.loadJson(database, engine, rname, input);
Json.print(rsp, 4);
System.out.println(rsp);
}
}
21 changes: 13 additions & 8 deletions rai-sdk/src/main/java/com/relationalai/Client.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -724,6 +724,11 @@ public TransactionAsyncResult execute(
return execute(database, engine, source, readonly, new HashMap<>());
}

public TransactionAsyncResult execute(
String database, String engine, String source) throws HttpError, IOException, InterruptedException {
return execute(database, engine, source, true);
}

public TransactionAsyncResult execute(
String database, String engine,
String source, boolean readonly,
Expand Down Expand Up @@ -1007,35 +1012,35 @@ static String genLoadCsv(String relation, CsvOptions options) {
return builder.toString();
}

public TransactionResult loadCsv(
public TransactionAsyncResult loadCsv(
String database, String engine, String relation, InputStream data)
throws HttpError, InterruptedException, IOException {
var s = new String(data.readAllBytes());
return loadCsv(database, engine, relation, s, null);
}

public TransactionResult loadCsv(
public TransactionAsyncResult loadCsv(
String database, String engine, String relation, String data)
throws HttpError, InterruptedException, IOException {
return loadCsv(database, engine, relation, data, null);
}

public TransactionResult loadCsv(
public TransactionAsyncResult loadCsv(
String database, String engine, String relation,
InputStream data, CsvOptions options)
throws HttpError, InterruptedException, IOException {
var s = new String(data.readAllBytes());
return loadCsv(database, engine, relation, s, options);
}

public TransactionResult loadCsv(
public TransactionAsyncResult loadCsv(
String database, String engine, String relation,
String data, CsvOptions options)
throws HttpError, InterruptedException, IOException {
var source = genLoadCsv(relation, options);
var inputs = new HashMap<String, String>();
inputs.put("data", data);
return executeV1(database, engine, source, false, inputs);
return execute(database, engine, source, false, inputs);
}

// Generate the Rel to load JSON data into a relation.
Expand All @@ -1046,19 +1051,19 @@ static String genLoadJson(String relation) {
return builder.toString();
}

public TransactionResult loadJson(
public TransactionAsyncResult loadJson(
String database, String engine, String relation, InputStream data)
throws HttpError, InterruptedException, IOException {
var s = new String(data.readAllBytes());
return loadJson(database, engine, relation, s);
}

public TransactionResult loadJson(
public TransactionAsyncResult loadJson(
String database, String engine, String relation, String data)
throws HttpError, InterruptedException, IOException {
var inputs = new HashMap<String, String>();
inputs.put("data", data);
var source = genLoadJson(relation);
return executeV1(database, engine, source, false, inputs);
return execute(database, engine, source, false, inputs);
}
}
15 changes: 7 additions & 8 deletions rai-sdk/src/test/java/com/relationalai/DatabaseTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,14 +133,13 @@ void testDatabase() throws HttpError, InterruptedException, IOException {

// Load some data and a model
var loadRsp = client.loadJson(databaseName, engineName, "test_data", testJson);
assertEquals(false, loadRsp.aborted);
assertEquals(0, loadRsp.output.length);
assertEquals(0, loadRsp.problems.length);

loadRsp = client.loadModel(databaseName, engineName, "test_model", testModel);
assertEquals(false, loadRsp.aborted);
assertEquals(0, loadRsp.output.length);
assertEquals(0, loadRsp.problems.length);
assertEquals("COMPLETED", loadRsp.transaction.state);
assertEquals(0, loadRsp.problems.size());

var loadModelRsp = client.loadModel(databaseName, engineName, "test_model", testModel);
assertEquals(false, loadModelRsp.aborted);
assertEquals(0, loadModelRsp.output.length);
assertEquals(0, loadModelRsp.problems.length);

// Clone the database
var databaseCloneName = databaseName + "-clone";
Expand Down
Loading