Ton of minor fixes all pulled in. More info in the latest release for 1.2.0

backend/app_sdk/Dockerfile

@@ -1,6 +1,6 @@
 #FROM python:3.9.1-alpine as base
-#FROM python:3.10.0-alpine as base
-FROM python:3.11.3-alpine as base
+FROM python:3.10.0-alpine as base
+#FROM python:3.11.3-alpine as base
 
 FROM base as builder
 RUN apk --no-cache add --update alpine-sdk libffi libffi-dev musl-dev openssl-dev tzdata coreutils

backend/app_sdk/app_base.py

@@ -2279,13 +2279,6 @@ class AppBase:
 
                 # Can't handle self yet (?)
                 ret = run.render(**globals())
-                    
-                # Load output as JSON
-                try:
-                    ret = json.loads(ret)
-                except: 
-                    pass
-
                 return ret
             except jinja2.exceptions.TemplateNotFound as e:
                 self.logger.info(f"[ERROR] Liquid Template error: {e}")
@@ -3071,6 +3064,7 @@ class AppBase:
                         #self.logger.info(action["parameters"])
 
                         # This seems redundant now 
+                        self.logger.info("[DEBUG] Pre parameters")
                         for parameter in newparams:
                             action["parameters"].append(parameter)
 
@@ -3092,6 +3086,7 @@ class AppBase:
 
                         # Multi_parameter has the data for each. variable
                         minlength = 0
+                        self.logger.info("[DEBUG] Pre-loading parameters")
                         multi_parameters = json.loads(json.dumps(params))
                         multiexecution = False
                         multi_execution_lists = []
@@ -3518,11 +3513,8 @@ class AppBase:
                                             try:
                                                 del params[field]
                                                 self.logger.info("[WARNING] Removed field invalid field %s" % field)
-                                            except KeyError as e:
-                                                self.logger.info("[WARNING] Tried to remove field %s but it didn't exist" % field)
+                                            except KeyError:
                                                 break
-                                        else:
-                                            self.logger.info("[ERROR] Couldn't find fieldsplit in error. Raw error: %s" % errorstring)
                                     else:
                                         newres = json.dumps({
                                             "success": False,
@@ -3899,11 +3891,7 @@ class AppBase:
             else:
                 self.logger.info("ACTION TYPE (unhandled): %s" % type(action))
 
-            #await app.execute_action(app.action)
             app.execute_action(app.action)
 
-    #app.run(host="0.0.0.0", port=33334)
-
 if __name__ == "__main__":
     AppBase.run()
-    #asyncio.run(AppBase.run(), debug=True)

backend/app_sdk/build.sh

@@ -2,7 +2,7 @@
 
 ### DEFAULT 
 NAME=shuffle-app_sdk
-VERSION=1.1.0
+VERSION=1.2.0
 
 docker rmi docker.pkg.github.com/frikky/shuffle/$NAME:$VERSION --force
 docker build . -f Dockerfile -t frikky/shuffle:app_sdk -t frikky/$NAME:$VERSION -t docker.pkg.github.com/frikky/shuffle/$NAME:$VERSION -t ghcr.io/frikky/$NAME:$VERSION -t ghcr.io/frikky/$NAME:nightly -t shuffle/shuffle:app_sdk -t shuffle/$NAME:$VERSION -t docker.pkg.github.com/shuffle/shuffle/$NAME:$VERSION -t ghcr.io/shuffle/$NAME:$VERSION -t ghcr.io/shuffle/$NAME:nightly