ARgorithm Execution and StateSet Model implemented

Author: alanpjohn

Assets/Scripts/ARgorithmAPI/APIClient.cs

@@ -59,7 +59,6 @@ The ConnectionResponse.status can have following values
                         webRequest.downloadHandler.text
                     );
                     serverEndpoint = url;
-                    Debug.Log(serverEndpoint);
                     if (response.auth == "ENABLED")
                     {
                         callback(new ConnectionResponse {
@@ -209,7 +208,6 @@ Returns list of ARgorithms
 
                 if(webRequest.isDone){
                     string value = "{\"items\":" + webRequest.downloadHandler.text + "}";
-                    Debug.Log(value);
                     ARgorithmCollection response = JsonConvert.DeserializeObject<ARgorithmCollection>(value);
                     callback(response);
                 }
@@ -264,39 +262,42 @@ The LoginResponse.status can have following values
             }
         }
 
-        /*
-            BELOW CODE IS ATTEMPT AT RUNNING ARGOTIHMS
-            IGNORE FOR NOW , WILL IMPLEMENT LATER
-        */
-
-        // public IEnumerator run(ExecutionRequest exec,System.Action<string> callback){
-        //     string body = JsonUtility.ToJson(exec);
-        //     Debug.Log(body);
-        //     using(UnityWebRequest webRequest = UnityWebRequest.Post(serverEndpoint+"/argorithms/run",body)){
-        //         webRequest.SetRequestHeader("authorization","Bearer "+token);
-        //         webRequest.SetRequestHeader("Content-Type","application/json");
-        //         yield return webRequest.SendWebRequest();
+        public IEnumerator run(ExecutionRequest exec,System.Action<ExecutionResponse> callback){
+            string body = JsonConvert.SerializeObject(exec);
+            
+            using(UnityWebRequest webRequest = new UnityWebRequest(serverEndpoint+"/argorithms/run","POST")){
+                byte[] jsonToSend = new System.Text.UTF8Encoding().GetBytes(body);
+                webRequest.uploadHandler = (UploadHandler)new UploadHandlerRaw(jsonToSend);
+                webRequest.downloadHandler = (DownloadHandler)new DownloadHandlerBuffer();
+                webRequest.SetRequestHeader("authorization","Bearer "+token);
+                webRequest.SetRequestHeader("Content-Type","application/json");
+                yield return webRequest.SendWebRequest();
 
-        //         if(webRequest.isNetworkError){
-        //             callback("FAILURE");
-        //         }
+                if(webRequest.isNetworkError){
+                    callback(new ExecutionResponse{
+                        status="FAILURE",
+                        data={}
+                    });
+                }
 
-        //         if (webRequest.isDone){
-        //             switch (webRequest.responseCode)
-        //             {
-        //                 case 200:
-        //                     callback(webRequest.downloadHandler.text);
-        //                     break;
+                if (webRequest.isDone){
+                    switch (webRequest.responseCode)
+                    {
+                        case 200:
+                            ExecutionResponse res = JsonConvert.DeserializeObject<ExecutionResponse>(webRequest.downloadHandler.text);
+                            callback(res);
+                            break;
 
-        //                 default:
-        //                     Debug.Log(webRequest.responseCode);
-        //                     Debug.Log(webRequest.downloadHandler.text);
-        //                     callback("TRY_AGAIN"); 
-        //                     break;
-        //             }
-        //         }
-        //     }
-        // }
+                        default:
+                            callback(new ExecutionResponse{
+                                status="FAILURE",
+                                data={}
+                            }); 
+                            break;
+                    }
+                }
+            }
+        }
 
     }
 

Assets/Scripts/ARgorithmAPI/Models/Models.cs

@@ -2,6 +2,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
+using Newtonsoft.Json.Linq;
 
 namespace ARgorithmAPI.Models{
     /*
@@ -73,8 +74,8 @@ public class ARgorithm{
         public string description;
         public string function;
         public string filename;
-        public object parameters;
-        public object example;
+        public JObject parameters;
+        public JObject example;
     }
 
     [Serializable]
@@ -85,4 +86,23 @@ public class ARgorithmCollection{
         public ARgorithm[] items;
     }
 
+    [Serializable]
+    public class ExecutionRequest{
+        public string argorithmID;
+        public JObject parameters;
+    }
+
+    [Serializable]
+    public class State{
+        public string state_type;
+        public JObject state_def;
+        public string comments;
+    }
+
+    [Serializable]
+    public class ExecutionResponse{
+        public string status;
+        public List<State> data;
+    }
+
 }