Skip to content

Commit 1801e26

Browse files
NRHelmiNRHelmi
authored
Merge pull request #14 from RelationalAI/hnr-cancel-transaction
Cancel async transaction
2 parents 9cdf9c4 + e28ddae commit 1801e26

File tree

10 files changed

+65
-70
lines changed

10 files changed

+65
-70
lines changed

‎CHANGELOG.md‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
## v0.2.2-alpha (latest)
1+
## v0.3.0-alpha
2+
* Added `CancelTransaction` feature.
3+
4+
## v0.2.2-alpha
25
* Fixed `getTransaction` missing required properties: [finished_at].
36
* Added `deleteTransaction`.
47

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ In order to use the `rai-sdk-java`, you need add this dependency to your project
8686
<dependency>
8787
<groupId>com.relationalai</groupId>
8888
<artifactId>rai-sdk</artifactId>
89-
<version>0.2.2-alpha</version>
89+
<version>0.3.0-alpha</version>
9090
</dependency>
9191

9292
You need also to point maven to the SDK GitHub packages repository in the project's POM:

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<description>The RelationalAI Software Development Kit (SDK) for Java</description>
2222
<groupId>com.relationalai</groupId>
2323
<artifactId>rai-sdk-pom</artifactId>
24-
<version>0.2.2-alpha</version>
24+
<version>0.3.0-alpha</version>
2525
<packaging>pom</packaging>
2626
<url></url>
2727

‎rai-sdk-examples/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<groupId>com.relationalai</groupId>
2222
<artifactId>rai-sdk-pom</artifactId>
23-
<version>0.2.2-alpha</version>
23+
<version>0.3.0-alpha</version>
2424
</parent>
2525

2626
<name>RelationalAI SDK for Java Examples</name>

‎rai-sdk-examples/src/main/java/com/relationalai/examples/CancelTransaction.java‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
package com.relationalai.examples;
2+
3+
import com.relationalai.Client;
4+
import com.relationalai.Config;
5+
import com.relationalai.HttpError;
6+
import com.relationalai.Json;
7+
8+
import java.io.IOException;
9+
10+
public class CancelTransaction implements Runnable {
11+
String id, profile;
12+
13+
public void parseArgs(String[] args) {
14+
var c = Command.create("CancelTransaction")
15+
.addArgument("id")
16+
.addOption("profile", "config profile (default: default)")
17+
.parseArgs(args);
18+
this.id = c.getValue("id");
19+
this.profile = c.getValue("profile");
20+
}
21+
22+
public void run(String[] args) throws HttpError, InterruptedException, IOException {
23+
parseArgs(args);
24+
var cfg = Config.loadConfig("~/.rai/config", profile);
25+
var client = new Client(cfg);
26+
27+
var rsp = client.cancelTransaction(id);
28+
Json.print(rsp);
29+
}
30+
}

‎rai-sdk-examples/src/main/java/com/relationalai/examples/DeleteTransaction.java‎

Lines changed: 0 additions & 46 deletions
This file was deleted.

‎rai-sdk/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<groupId>com.relationalai</groupId>
2222
<artifactId>rai-sdk-pom</artifactId>
23-
<version>0.2.2-alpha</version>
23+
<version>0.3.0-alpha</version>
2424
</parent>
2525

2626
<name>RelationalAI SDK for Java Package</name>

‎rai-sdk/src/main/java/com/relationalai/Client.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -809,9 +809,9 @@ public List<Object> getTransactionProblems(String id) throws HttpError, IOExcept
809809
return parseProblemsResult(rsp);
810810
}
811811

812-
public TransactionAsyncDeleteResponse deleteTransaction(String id) throws HttpError, IOException, InterruptedException {
813-
var rsp = (String) delete(String.format("%s/%s", PATH_TRANSACTIONS, id));
814-
return Json.deserialize(rsp, TransactionAsyncDeleteResponse.class);
812+
public TransactionAsyncCancelResponse cancelTransaction(String id) throws HttpError, IOException, InterruptedException {
813+
var rsp = (String) post(String.format("%s/%s/cancel", PATH_TRANSACTIONS, id), null, null);
814+
return Json.deserialize(rsp, TransactionAsyncCancelResponse.class);
815815
}
816816

817817
// EDBs

‎rai-sdk/src/main/java/com/relationalai/TransactionAsyncCancelResponse.java‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
package com.relationalai;
2+
3+
import com.jsoniter.annotation.JsonProperty;
4+
5+
public class TransactionAsyncCancelResponse extends Entity {
6+
@JsonProperty(value = "message")
7+
public String message;
8+
}

‎rai-sdk/src/test/java/com/relationalai/LoadCsvTest.java‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -55,31 +55,31 @@ public class LoadCsvTest extends UnitTest {
5555
assertNotNull(rel);
5656
assertEquals(2, rel.columns.length);
5757
assertArrayEquals(new Object[][] {
58-
{29., 60., 91., 127.},
58+
{2., 3., 4., 5.},
5959
{"2020-01-01", "2020-02-02", "2020-03-03", "2020-04-04"}
6060
}, rel.columns);
6161

6262
rel = findRelation(rsp.output, ":price");
6363
assertNotNull(rel);
6464
assertEquals(2, rel.columns.length);
6565
assertArrayEquals(new Object[][] {
66-
{29., 60., 91., 127.},
66+
{2., 3., 4., 5.},
6767
{"12.50", "14.25", "11.00", "12.25"}
6868
}, rel.columns);
6969

7070
rel = findRelation(rsp.output, ":quantity");
7171
assertNotNull(rel);
7272
assertEquals(2, rel.columns.length);
7373
assertArrayEquals(new Object[][] {
74-
{29., 60., 91., 127.},
74+
{2., 3., 4., 5.},
7575
{"2", "4", "4", "3"}
7676
}, rel.columns);
7777

7878
rel = findRelation(rsp.output, ":cocktail");
7979
assertNotNull(rel);
8080
assertEquals(2, rel.columns.length);
8181
assertArrayEquals(new Object[][] {
82-
{29., 60., 91., 127.},
82+
{2., 3., 4., 5.},
8383
{"martini", "sazerac", "cosmopolitan", "bellini"}
8484
}, rel.columns);
8585
}
@@ -111,7 +111,7 @@ public class LoadCsvTest extends UnitTest {
111111
assertNotNull(rel);
112112
assertEquals(2, rel.columns.length);
113113
assertArrayEquals(new Object[][] {
114-
{0., 31., 62., 98.},
114+
{1., 2., 3., 4.},
115115
{"martini", "sazerac", "cosmopolitan", "bellini"}
116116
}, rel.columns);
117117

@@ -120,23 +120,23 @@ public class LoadCsvTest extends UnitTest {
120120
assertNotNull(rel);
121121
assertEquals(2, rel.columns.length);
122122
assertArrayEquals(new Object[][] {
123-
{0., 31., 62., 98.},
123+
{1., 2., 3., 4.},
124124
{"2", "4", "4", "3"}
125125
}, rel.columns);
126126

127127
rel = findRelation(rsp.output, ":COL3");
128128
assertNotNull(rel);
129129
assertEquals(2, rel.columns.length);
130130
assertArrayEquals(new Object[][] {
131-
{0., 31., 62., 98.},
131+
{1., 2., 3., 4.},
132132
{"12.50", "14.25", "11.00", "12.25"}
133133
}, rel.columns);
134134

135135
rel = findRelation(rsp.output, ":COL4");
136136
assertNotNull(rel);
137137
assertEquals(2, rel.columns.length);
138138
assertArrayEquals(new Object[][] {
139-
{0., 31., 62., 98.},
139+
{1., 2., 3., 4.},
140140
{"2020-01-01", "2020-02-02", "2020-03-03", "2020-04-04"}
141141
}, rel.columns);
142142
}
@@ -168,31 +168,31 @@ public class LoadCsvTest extends UnitTest {
168168
assertNotNull(rel);
169169
assertEquals(2, rel.columns.length);
170170
assertArrayEquals(new Object[][] {
171-
{29., 60., 91., 127.},
171+
{2., 3., 4., 5.},
172172
{"2020-01-01", "2020-02-02", "2020-03-03", "2020-04-04"}
173173
}, rel.columns);
174174

175175
rel = findRelation(rsp.output, ":price");
176176
assertNotNull(rel);
177177
assertEquals(2, rel.columns.length);
178178
assertArrayEquals(new Object[][] {
179-
{29., 60., 91., 127.},
179+
{2., 3., 4., 5.},
180180
{"12.50", "14.25", "11.00", "12.25"}
181181
}, rel.columns);
182182

183183
rel = findRelation(rsp.output, ":quantity");
184184
assertNotNull(rel);
185185
assertEquals(2, rel.columns.length);
186186
assertArrayEquals(new Object[][] {
187-
{29., 60., 91., 127.},
187+
{2., 3., 4., 5.},
188188
{"2", "4", "4", "3"}
189189
}, rel.columns);
190190

191191
rel = findRelation(rsp.output, ":cocktail");
192192
assertNotNull(rel);
193193
assertEquals(2, rel.columns.length);
194194
assertArrayEquals(new Object[][] {
195-
{29., 60., 91., 127.},
195+
{2., 3., 4., 5.},
196196
{"martini", "sazerac", "cosmopolitan", "bellini"}
197197
}, rel.columns);
198198
}
@@ -222,7 +222,7 @@ public class LoadCsvTest extends UnitTest {
222222
assertNotNull(rel);
223223
assertEquals(2, rel.columns.length);
224224
assertArrayEquals(new Object[][] {
225-
{29., 60., 91., 127.},
225+
{2., 3., 4., 5.},
226226
{"2020-01-01", "2020-02-02", "2020-03-03", "2020-04-04"}
227227
}, rel.columns);
228228
assertEquals(1, rel.relKey.values.length);
@@ -232,7 +232,7 @@ public class LoadCsvTest extends UnitTest {
232232
assertNotNull(rel);
233233
assertEquals(2, rel.columns.length);
234234
assertArrayEquals(new Object[][] {
235-
{29., 60., 91., 127.},
235+
{2., 3., 4., 5.},
236236
{12.5, 14.25, 11.00, 12.25}
237237
}, rel.columns);
238238
assertEquals(1, rel.relKey.values.length);
@@ -242,7 +242,7 @@ public class LoadCsvTest extends UnitTest {
242242
assertNotNull(rel);
243243
assertEquals(2, rel.columns.length);
244244
assertArrayEquals(new Object[][] {
245-
{29., 60., 91., 127.},
245+
{2., 3., 4., 5.},
246246
{2., 4., 4., 3.}
247247
}, rel.columns);
248248
assertEquals(1, rel.relKey.values.length);
@@ -252,7 +252,7 @@ public class LoadCsvTest extends UnitTest {
252252
assertNotNull(rel);
253253
assertEquals(2, rel.columns.length);
254254
assertArrayEquals(new Object[][] {
255-
{29., 60., 91., 127.},
255+
{2., 3., 4., 5.},
256256
{"martini", "sazerac", "cosmopolitan", "bellini"}
257257
}, rel.columns);
258258
assertEquals(1, rel.relKey.values.length);

0 commit comments

Comments
 (0)