[fix] handle cases with b64encoded body, add test payload

events/payloads_body_base64.json

@@ -0,0 +1,52 @@
+{
+  "version": "2.0",
+  "routeKey": "POST /prediction",
+  "rawPath": "/localhost/prediction",
+  "rawQueryString": "",
+  "headers": {
+    "accept": "application/json, text/plain, */*",
+    "accept-encoding": "gzip, deflate, br",
+    "accept-language": "en-GB,en-US;q=0.9,en;q=0.8",
+    "authorization": "Bearer ey...",
+    "content-length": "126",
+    "content-type": "application/json",
+    "host": "xxx.execute-api.eu-west-1.amazonaws.com",
+    "origin": "http://localhost:3000",
+    "referer": "http://localhost:3000/",
+    "sec-fetch-dest": "empty",
+    "sec-fetch-mode": "cors",
+    "sec-fetch-site": "cross-site",
+    "user-agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/113.0.0.0 Safari/537.36",
+    "x-amzn-trace-id": "Root=1-xxx-aaaa",
+    "x-forwarded-for": "1.1.1.1",
+    "x-forwarded-port": "443",
+    "x-forwarded-proto": "https"
+  },
+  "requestContext": {
+    "accountId": "123",
+    "apiId": "api-id-aws",
+    "authorizer": {
+      "jwt": {
+        "claims": {
+          "scope": "openid profile email"
+        },
+        "scopes": null
+      }
+    },
+    "domainName": "xxx.execute-api.eu-west-1.amazonaws.com",
+    "domainPrefix": "xxx",
+    "http": {
+      "method": "POST",
+      "path": "/localhost/prediction",
+      "protocol": "HTTP/1.1",
+      "sourceIp": "52.143.157.36",
+      "userAgent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/113.0.0.0 Safari/537.36"
+    },
+    "requestId": "aaa-bbbb=",
+    "routeKey": "POST /prediction",
+    "stage": "localhost",
+    "time": "21/May/2023:19:32:35 +0000",
+    "timeEpoch": 1684697555723
+  },
+  "body": "eyJiYm94IjogWzEsIDIsIDMsIDRdLCAicG9pbnRzIjogW1s1LCA2XV19"
+}

src/utilities/utilities.py

@@ -1,16 +1,19 @@
 """Various utilities (logger, time benchmark, args dump, numerical and stats info)"""
-import loguru
 
-from src.utilities.constants import ROOT
 
-
-def is_base64(s):
+def is_base64(sb):
     import base64
 
     try:
-        return base64.b64encode(base64.b64decode(s, validate=True)) == s
-    except Exception as e:
-        print("e:", e, "#")
+        if isinstance(sb, str):
+            # If there's any unicode here, an exception will be thrown and the function will return false
+            sb_bytes = bytes(sb, 'ascii')
+        elif isinstance(sb, bytes):
+            sb_bytes = sb
+        else:
+            raise ValueError("Argument must be string or bytes")
+        return base64.b64encode(base64.b64decode(sb_bytes, validate=True)) == sb_bytes
+    except ValueError:
         return False