#204: Added file upload baseline to app creator

backend/app_sdk/app_base.py

@@ -397,7 +397,7 @@ class AppBase:
             }
 
             ret1 = requests.get("%s%s" % (self.url, get_path), headers=headers)
-            print("RET1: %s" % ret1.text)
+            print("RET1 (file get): %s" % ret1.text)
             if ret1.status_code != 200:
                 returns.append({
                     "filename": "",
@@ -408,7 +408,7 @@ class AppBase:
 
             content_path = "/api/v1/files/%s/content?execution_id=%s" % (item, full_execution["execution_id"])
             ret2 = requests.get("%s%s" % (self.url, content_path), headers=headers)
-            print("Ret2: %s" % ret2.text)
+            print("RET2 (file get): %s" % ret2.text)
             if ret2.status_code == 200:
                 tmpdata = ret1.json()
                 returndata = {
@@ -418,6 +418,8 @@ class AppBase:
                 }
                 returns.append(returndata)
 
+            print("RET3 (file get done)")
+
         if len(returns) == 0:
             return {
                 "success": False,
@@ -1687,7 +1689,7 @@ class AppBase:
                             print("[INFO] APP_SDK DONE: Starting NORMAL execution of function")
                             print("[INFO] Running with params (0): %s" % params) 
                             newres = await func(**params)
-                            print("[INFO] Returned from execution.")
+                            print("[INFO] Returned from execution:", newres)
                             if isinstance(newres, tuple):
                                 print("[INFO] Handling return as tuple")
                                 # Handles files.

backend/go-app/codegen.go

@@ -365,6 +365,16 @@ func makePythoncode(swagger *openapi3.Swagger, name, url, method string, paramet
 		preparedHeaders += "}"
 	}
 
+	fileBalance := ""
+	fileAdder := ``
+	fileGrabber := ``
+	if method == "post" && strings.Contains(functionname, "filescan") {
+		fileGrabber = `filedata = self.get_file("63264006-5958-451a-bff1-1975495fb4d8")`
+		//fileGrabber += "\n        print(filedata)"
+		fileAdder = `files = {"file": (filedata["filename"], filedata["data"])}`
+		fileBalance = ", files=files"
+	}
+
 	// Extra param for url if it's changeable
 	// Extra param for authentication scheme(s)
 	// The last weird one is the body.. Tabs & spaces sucks.
@@ -375,7 +385,9 @@ func makePythoncode(swagger *openapi3.Swagger, name, url, method string, paramet
         %s
         %s
         %s
-        return requests.%s(url, headers=headers%s%s%s).text
+        %s
+        %s
+        return requests.%s(url, headers=headers%s%s%s%s).text
 		`,
 		functionname,
 		authenticationParameter,
@@ -391,17 +403,20 @@ func makePythoncode(swagger *openapi3.Swagger, name, url, method string, paramet
 		authenticationSetup,
 		queryData,
 		bodyFormatter,
+		fileGrabber,
+		fileAdder,
 		method,
 		authenticationAddin,
 		bodyAddin,
 		verifyAddin,
+		fileBalance,
 	)
 
 	//log.Printf("FUNCTION: %s", data)
-	//if strings.Contains(functionname, "search") {
-	//	log.Println(data)
-	//	log.Printf("Queries: %s", queryString)
-	//}
+	if strings.Contains(functionname, "filescan") {
+		log.Println(data)
+		log.Printf("Queries: %s", queryString)
+	}
 
 	//log.Printf(data)
 	return functionname, data