Chore/update cla action node24

.github/workflows/BuildAndRun.yml

@@ -33,20 +33,13 @@ jobs:
       - name: Create output folder
         run: mkdir BuildOutput
 
-#      - name: Build flyfly project
-#        working-directory: ./FlySpring/flyfly
-#        run: mvn clean package
-
-#      - name: Copy flyfly JAR to Examples folder and rename
-#        run: cp ./FlySpring/flyfly/target/flyfly-0.0.1-SNAPSHOT.jar ././BuildOutput/flyfly.jar
-
       - name: Build edgechain-app project
-        working-directory: ./FlySpring/edgechain-app
+        working-directory: ./FlySpring
         #         run: mvn -Djavacpp.platform=linux-x86_64 clean package -DskipTests
         run: mvn  clean package -DskipTests
 
       - name: Run edgechain testcases
-        working-directory: ./FlySpring/edgechain-app
+        working-directory: ./FlySpring
         run: mvn test
 
       - name: Copy edgechain-app JAR to Examples folder
@@ -72,24 +65,6 @@ jobs:
       - name: Display structure of downloaded files
         run: ls -R
 
-      #       - name: Create Release
-      #         id: create_release
-      #         uses: actions/create-release@v1.1.4
-      #         env:
-      #           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      #         with:
-      #           tag_name: ${{ github.ref }}
-      #           release_name: ${{ github.ref }}
-      #       - name: Upload Release jar
-      #         id: upload_release_asset
-      #         uses: actions/upload-release-asset@v1.0.1
-      #         env:
-      #           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      #         with:
-      #           upload_url: ${{ steps.create_release.outputs.upload_url }}
-      #           asset_path: Examples/
-      #           asset_name: Examples
-      #           asset_content_type: application/zip
       - name: 'Get variables'
         id: vars
         run: |

.github/workflows/pr-build.yml

@@ -59,11 +59,12 @@ jobs:
         run: mkdir BuildOutput
 
       - name: Build edgechain-app project
-        working-directory: ./FlySpring/edgechain-app
+        working-directory: ./FlySpring
+        #         run: mvn -Djavacpp.platform=linux-x86_64 clean package -DskipTests
         run: mvn  clean package -DskipTests
 
       - name: Run edgechain testcases
-        working-directory: ./FlySpring/edgechain-app
+        working-directory: ./FlySpring
         run: mvn test
 
       - name: Copy edgechain-app JAR to Examples folder
@@ -74,5 +75,4 @@ jobs:
         with:
           name: Output
           path: ./BuildOutput/
-
 

.gitignore

@@ -31,3 +31,6 @@ build/
 
 ### VS Code ###
 .vscode/
+**/out/
+.DS_Store
+

Examples/airtable/AirtableExample.java

@@ -0,0 +1,134 @@
+package com.edgechain;
+
+import com.edgechain.lib.endpoint.impl.integration.AirtableEndpoint;
+import com.edgechain.lib.integration.airtable.query.AirtableQueryBuilder;
+import com.edgechain.lib.integration.airtable.query.SortOrder;
+import com.edgechain.lib.request.ArkRequest;
+import com.edgechain.lib.response.ArkResponse;
+import com.edgechain.lib.rxjava.transformer.observable.EdgeChain;
+import dev.fuxing.airtable.AirtableRecord;
+import dev.fuxing.airtable.formula.AirtableFormula;
+import dev.fuxing.airtable.formula.LogicalOperator;
+import org.json.JSONObject;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Properties;
+
+/**
+ * For the purpose, of this example, create a simple table using AirTable i.e, "Speakers" Following
+ * are some basic fields: "speaker_name", "designation", "organization", "biography",
+ * "speaker_photo", "rating To get, your BASE_ID of specific database; use the following API
+ * https://api.airtable.com/v0/meta/bases --header 'Authorization: Bearer
+ * YOUR_PERSONAL_ACCESS_TOKEN' You can create, complex tables using Airtable; also define
+ * relationships b/w tables via lookups.
+ */
+@SpringBootApplication
+public class AirtableExample {
+  private static final String AIRTABLE_API_KEY = "";
+  private static final String AIRTABLE_BASE_ID = "";
+
+  private static AirtableEndpoint airtableEndpoint;
+
+  public static void main(String[] args) {
+
+    System.setProperty("server.port", "8080");
+
+    Properties properties = new Properties();
+    properties.setProperty("cors.origins", "http://localhost:4200");
+
+    new SpringApplicationBuilder(AirtableExample.class).properties(properties).run(args);
+
+    airtableEndpoint = new AirtableEndpoint(AIRTABLE_BASE_ID, AIRTABLE_API_KEY);
+  }
+
+  @RestController
+  @RequestMapping("/airtable")
+  public class AirtableController {
+
+    @GetMapping("/findAll")
+    public ArkResponse findAll(ArkRequest arkRequest) {
+
+      int pageSize = arkRequest.getIntQueryParam("pageSize");
+      String sortSpeakerName = arkRequest.getQueryParam("sortName");
+      String offset = arkRequest.getQueryParam("offset");
+
+      AirtableQueryBuilder queryBuilder = new AirtableQueryBuilder();
+      queryBuilder.pageSize(pageSize); // pageSize --> no. of records in each request
+      queryBuilder.sort("speaker_name", SortOrder.fromValue(sortSpeakerName).getValue());
+      queryBuilder.offset(offset); // move to next page by passing offset returned in response;
+
+      // Return only those speakers which have rating Greater Than Eq to 3;
+      queryBuilder.filterByFormula(
+          LogicalOperator.GTE,
+          AirtableFormula.Object.field("rating"),
+          AirtableFormula.Object.value(3));
+
+      return new EdgeChain<>(airtableEndpoint.findAll("Speakers", queryBuilder)).getArkResponse();
+    }
+
+    @GetMapping("/find")
+    public ArkResponse findById(ArkRequest arkRequest) {
+      String id = arkRequest.getQueryParam("id");
+      return new EdgeChain<>(airtableEndpoint.findById("Speakers", id)).getArkResponse();
+    }
+
+    @PostMapping("/create")
+    public ArkResponse create(ArkRequest arkRequest) {
+
+      JSONObject body = arkRequest.getBody();
+      String speakerName = body.getString("name");
+      String designation = body.getString("designation");
+      int rating = body.getInt("rating");
+      String organization = body.getString("organization");
+      String biography = body.getString("biography");
+
+      // Airtable API doesn't allow to upload blob files directly; therefore, you would require to
+      // upload it
+      // to some cloud storage i.e, S3 and then set the URL in Airtable.
+
+      AirtableRecord record = new AirtableRecord();
+      record.putField("speaker_name", speakerName);
+      record.putField("designation", designation);
+      record.putField("rating", rating);
+      record.putField("organization", organization);
+      record.putField("biography", biography);
+
+      return new EdgeChain<>(airtableEndpoint.create("Speakers", record)).getArkResponse();
+    }
+
+    @PostMapping("/update")
+    public ArkResponse update(ArkRequest arkRequest) {
+
+      JSONObject body = arkRequest.getBody();
+      String id = body.getString("id");
+      String speakerName = body.getString("name");
+      String designation = body.getString("designation");
+      int rating = body.getInt("rating");
+      String organization = body.getString("organization");
+      String biography = body.getString("biography");
+
+      // Airtable API doesn't allow to upload blob files directly; therefore, you would require to
+      // upload it
+      // to some cloud storage i.e, S3 and then set the URL in Airtable.
+
+      AirtableRecord record = new AirtableRecord();
+      record.setId(id);
+      record.putField("speaker_name", speakerName);
+      record.putField("designation", designation);
+      record.putField("rating", rating);
+      record.putField("organization", organization);
+      record.putField("biography", biography);
+
+      return new EdgeChain<>(airtableEndpoint.update("Speakers", record)).getArkResponse();
+    }
+
+    @DeleteMapping("/delete")
+    public ArkResponse delete(ArkRequest arkRequest) {
+      JSONObject body = arkRequest.getBody();
+      String id = body.getString("id");
+      return new EdgeChain<>(airtableEndpoint.delete("Speakers", id)).getArkResponse();
+    }
+  }
+}

Examples/code-interpreter/CodeInterpreter.java

@@ -4,6 +4,7 @@
 
 import java.util.concurrent.TimeUnit;
 
+import com.edgechain.lib.endpoint.impl.llm.OpenAiChatEndpoint;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -13,7 +14,6 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import com.edgechain.lib.codeInterpreter.Eval;
-import com.edgechain.lib.endpoint.impl.OpenAiEndpoint;
 import com.edgechain.lib.jsonnet.JsonnetArgs;
 import com.edgechain.lib.jsonnet.JsonnetLoader;
 import com.edgechain.lib.jsonnet.enums.DataType;
@@ -28,7 +28,7 @@
 public class CodeInterpreter {
 
   private static final String OPENAI_AUTH_KEY = "";
-  private static OpenAiEndpoint userChatEndpoint;
+  private static OpenAiChatEndpoint userChatEndpoint;
   private static final ObjectMapper objectMapper = new ObjectMapper();
   private static JsonnetLoader loader =
       new FileJsonnetLoader("./code-interpreter/code-interpreter.jsonnet");
@@ -48,7 +48,7 @@ public double interpret(ArkRequest arkRequest) throws JSONException {
       JSONObject json = arkRequest.getBody();
 
       userChatEndpoint =
-          new OpenAiEndpoint(
+          new OpenAiChatEndpoint(
               OPENAI_CHAT_COMPLETION_API,
               OPENAI_AUTH_KEY,
               "gpt-3.5-turbo",

Examples/json/JsonFormat.java

@@ -7,6 +7,7 @@
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
+import com.edgechain.lib.endpoint.impl.llm.OpenAiChatEndpoint;
 import org.json.JSONObject;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.builder.SpringApplicationBuilder;
@@ -17,7 +18,6 @@
 import org.springframework.web.client.RestTemplate;
 
 import com.edgechain.lib.constants.EndpointConstants;
-import com.edgechain.lib.endpoint.impl.OpenAiEndpoint;
 import com.edgechain.lib.jsonFormat.request.FunctionRequest;
 import com.edgechain.lib.jsonFormat.request.Message;
 import com.edgechain.lib.jsonFormat.request.OpenApiFunctionRequest;
@@ -41,7 +41,7 @@ public class JsonFormat {
   // need only for situation endpoint
   private static final String OPENAI_ORG_ID = "";
 
-  private static OpenAiEndpoint userChatEndpoint;
+  private static OpenAiChatEndpoint userChatEndpoint;
   private static JsonnetLoader loader = new FileJsonnetLoader("./json/json-format.jsonnet");
   private static JsonnetLoader functionLoader = new FileJsonnetLoader("./json/function.jsonnet");
   private static final ObjectMapper objectMapper = new ObjectMapper();
@@ -84,7 +84,7 @@ public class ExampleController {
     public String extract(ArkRequest arkRequest) {
 
       userChatEndpoint =
-          new OpenAiEndpoint(
+          new OpenAiChatEndpoint(
               OPENAI_CHAT_COMPLETION_API,
               OPENAI_AUTH_KEY,
               "gpt-3.5-turbo",
@@ -129,8 +129,8 @@ public String situation(ArkRequest arkRequest) {
 
       JSONObject json = arkRequest.getBody();
 
-      OpenAiEndpoint userChat =
-          new OpenAiEndpoint(
+      OpenAiChatEndpoint userChat =
+          new OpenAiChatEndpoint(
               EndpointConstants.OPENAI_CHAT_COMPLETION_API,
               OPENAI_AUTH_KEY,
               OPENAI_ORG_ID,