Merge pull request #9 from RelationalAI/hnr-fix-build-failure

Fix build failure + anticipate access token expiration

Author: NRHelmi

.github/workflows/maven-build.yaml

@@ -1,6 +1,9 @@
 name: build/test
 
-on: [push]
+on:
+  push:
+  schedule:
+    - cron: '30 5 * * *'
 
 jobs:
   build:

CHANGELOG.md

@@ -1,4 +1,8 @@
-## latest
+## v0.2.2-alpha (latest)
+* Fixed `getTransaction` missing required properties: [finished_at].
+* Added `deleteTransaction`.
+
+## v0.2.1-alpha
 * Fixed `executeAsync` inputs issue.
 
 ## v0.2.0-alpha

README.md

@@ -86,7 +86,7 @@ In order to use the `rai-sdk-java`, you need add this dependency to your project
     <dependency>
         <groupId>com.relationalai</groupId>
         <artifactId>rai-sdk</artifactId>
-        <version>0.2.1-alpha</version>
+        <version>0.2.2-alpha</version>
     </dependency>
 
 You need also to point maven to the SDK GitHub packages repository in the project's POM:

pom.xml

@@ -21,7 +21,7 @@
     <description>The RelationalAI Software Development Kit (SDK) for Java</description>
     <groupId>com.relationalai</groupId>
     <artifactId>rai-sdk-pom</artifactId>
-    <version>0.2.1-alpha</version>
+    <version>0.2.2-alpha</version>
     <packaging>pom</packaging>
     <url></url>
 

rai-sdk-examples/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.relationalai</groupId>
         <artifactId>rai-sdk-pom</artifactId>
-        <version>0.2.1-alpha</version>
+        <version>0.2.2-alpha</version>
     </parent>
 
     <name>RelationalAI SDK for Java Examples</name>

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

@@ -0,0 +1,46 @@
+/*
+ * Copyright 2022 RelationalAI, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"): you may
+ * not use this file except in compliance with the License. You may obtain
+ * a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.relationalai.examples;
+
+import com.relationalai.Client;
+import com.relationalai.Config;
+import com.relationalai.HttpError;
+import com.relationalai.Json;
+
+import java.io.IOException;
+
+public class DeleteTransaction implements Runnable {
+    String id, profile;
+
+    public void parseArgs(String[] args) {
+        var c = Command.create("DeleteTransaction")
+                .addArgument("id")
+                .addOption("profile", "config profile (default: default)")
+                .parseArgs(args);
+        this.id = c.getValue("id");
+        this.profile = c.getValue("profile");
+    }
+
+    public void run(String[] args) throws HttpError, InterruptedException, IOException {
+        parseArgs(args);
+        var cfg = Config.loadConfig("~/.rai/config", profile);
+        var client = new Client(cfg);
+
+        var rsp = client.deleteTransaction(id);
+        Json.print(rsp);
+    }
+}

rai-sdk/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.relationalai</groupId>
         <artifactId>rai-sdk-pom</artifactId>
-        <version>0.2.1-alpha</version>
+        <version>0.2.2-alpha</version>
     </parent>
 
     <name>RelationalAI SDK for Java Package</name>

rai-sdk/src/main/java/com/relationalai/AccessToken.java

@@ -43,7 +43,8 @@ long nowEpochSecs() {
     }
 
     // Answers if the token is expired.
+    // Anticipate access token expiration by 5 seconds
     public boolean isExpired() {
-        return nowEpochSecs() > expiresOn();
+        return nowEpochSecs() > expiresOn() - 5;
     }
 }

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

@@ -809,6 +809,11 @@ public List<Object> getTransactionProblems(String id) throws HttpError, IOExcept
         return parseProblemsResult(rsp);
     }
 
+    public TransactionAsyncDeleteResponse deleteTransaction(String id) throws HttpError, IOException, InterruptedException {
+        var rsp = (String) delete(String.format("%s/%s", PATH_TRANSACTIONS, id));
+        return Json.deserialize(rsp, TransactionAsyncDeleteResponse.class);
+    }
+
     // EDBs
 
     public Edb[] listEdbs(String database, String engine)

rai-sdk/src/main/java/com/relationalai/TransactionAsyncDeleteResponse.java

@@ -0,0 +1,17 @@
+package com.relationalai;
+
+import com.jsoniter.annotation.JsonProperty;
+
+public class TransactionAsyncDeleteResponse {
+    @JsonProperty(value = "txn_id", required = true)
+    public String id;
+
+    @JsonProperty(value = "message", required = true)
+    public String message;
+
+    public TransactionAsyncDeleteResponse() {}
+    public TransactionAsyncDeleteResponse(String id, String state) {
+        this.id = id;
+        this.message = state;
+    }
+}

rai-sdk/src/main/java/com/relationalai/TransactionAsyncResponse.java

@@ -12,7 +12,7 @@ public class TransactionAsyncResponse extends TransactionAsyncCompactResponse {
     @JsonProperty(value = "created_on", required = true)
     public Long createdOn;
 
-    @JsonProperty(value = "finished_at", required = true)
+    @JsonProperty(value = "finished_at")
     public Long finishedAt;
 
     @JsonProperty(value = "database_name", required = true)