diff --git a/backend/app_sdk/app_base.py b/backend/app_sdk/app_base.py
index a668c9cc..df6ee007 100755
--- a/backend/app_sdk/app_base.py
+++ b/backend/app_sdk/app_base.py
@@ -356,11 +356,13 @@ class AppBase:
self.action = json.loads(self.action)
self.original_action = json.loads(self.action)
except Exception as e:
- self.logger.info(f"[DEBUG] Failed parsing action as JSON (init): {e}. NOT important if running apps with webserver. This is NOT critical.")
+ pass
if len(self.base_url) == 0:
self.base_url = self.url
+ self.local_storage = []
+
# Checks output for whether it should be automatically parsed or not
def run_magic_parser(self, input_data):
if not isinstance(input_data, str):
@@ -1034,7 +1036,6 @@ class AppBase:
#self.logger.info(f"NEW PARAMS: {new_params}")
param_multiplier = new_params
- #self.logger.info("Returned with newparams of length %d", len(new_params))
#if isinstance(new_params, list) and len(new_params) == 1:
# params = new_params[0]
#else:
@@ -1322,6 +1323,19 @@ class AppBase:
"key": key,
}
+ try:
+ newstorage = []
+ for item in self.local_storage:
+ if item["execution_id"] == self.current_execution_id and item["key"] == key:
+ continue
+
+ newstorage.append(item)
+
+ self.local_storage = newstorage
+
+ except Exception as e:
+ print("[ERROR] Failed DELETING current execution id local storage: %s" % e)
+
response = requests.post(url, json=data, verify=False, proxies=self.proxy_config)
try:
allvalues = response.json()
@@ -1343,6 +1357,19 @@ class AppBase:
"value": str(value),
}
+ try:
+ newstorage = []
+ for item in self.local_storage:
+ if item["execution_id"] == self.current_execution_id and item["key"] == key:
+ continue
+
+ newstorage.append(item)
+
+ self.local_storage = newstorage
+
+ except Exception as e:
+ print("[ERROR] Failed SETTING current execution id local storage: %s" % e)
+
response = requests.post(url, json=data, verify=False, proxies=self.proxy_config)
try:
allvalues = response.json()
@@ -1365,12 +1392,23 @@ class AppBase:
"key": key,
}
+ # Makes it so that loops for the same action doesn't re-ask the db unless necessary
+ try:
+ for item in self.local_storage:
+ if item["execution_id"] == self.current_execution_id and item["key"] == key:
+ # Max keeping the local cache properly for 5 seconds due to workflow continuations
+ elapsed_time = time.time() - item["time_set"]
+ if elapsed_time > 5:
+ break
+
+ return item["data"]
+ except Exception as e:
+ print("[ERROR] Failed getting current execution id local storage: %s" % e)
+
value = requests.post(url, json=data, verify=False, proxies=self.proxy_config)
try:
allvalues = value.json()
- self.logger.info("VAL1: ", allvalues)
allvalues["key"] = key
- self.logger.info("VAL2: ", allvalues)
try:
parsedvalue = json.loads(allvalues["value"])
@@ -1378,6 +1416,14 @@ class AppBase:
except:
self.logger.info("Parsing of value as JSON failed. Continue anyway!")
+ try:
+ newdata = json.loads(json.dumps(data))
+ newdata["time_set"] = time.time()
+ newdata["data"] = allvalues
+ self.local_storage.append(newdata)
+ except Exception as e:
+ print("[ERROR] Failed in local storage append: %s" % e)
+
return allvalues
except:
self.logger.info("Value couldn't be parsed, or json dump of value failed")
@@ -1484,7 +1530,6 @@ class AppBase:
pass
self.action = copy.deepcopy(action)
- self.logger.info(f"[DEBUG] Sending starting action result (EXECUTING). Param replace: {replace_params}")
headers = {
"Content-Type": "application/json",
@@ -2721,7 +2766,8 @@ class AppBase:
#self.logger.info("VALUE: %s" % parameter["value"])
else:
- self.logger.info(f"[ERROR] Not running static variant regex parsing (slow) on value with length {len(parameter['value'])}. Max is 5Mb~.")
+ #self.logger.info(f"[ERROR] Not running static variant regex parsing (slow) on value with length {len(parameter['value'])}. Max is 5Mb~.")
+ pass
if parameter["variant"] == "WORKFLOW_VARIABLE":
self.logger.info("[DEBUG] Handling workflow variable")
@@ -3204,7 +3250,6 @@ class AppBase:
try:
self.original_action = json.loads(json.dumps(action))
except Exception as e:
- #self.logger.info(f"[ERROR] Failed parsing action as JSON to original action. This COULD have bad effects on LOOPED executions: {e}")
pass
# calltimes is used to handle forloops in the app itself.
diff --git a/frontend/src/components/Billing.jsx b/frontend/src/components/Billing.jsx
index 26e5b857..5ddf7d86 100644
--- a/frontend/src/components/Billing.jsx
+++ b/frontend/src/components/Billing.jsx
@@ -21,6 +21,7 @@ import {
TextField,
InputAdornment,
IconButton,
+ Chip,
Checkbox,
Tooltip,
} from "@mui/material";
@@ -39,6 +40,7 @@ import {
//import { useAlert
import { typecost, typecost_single, } from "../views/HandlePaymentNew.jsx";
import BillingStats from "../components/BillingStats.jsx";
+import { handlePayasyougo } from "../views/HandlePaymentNew.jsx"
const Billing = (props) => {
const { globalUrl, userdata, serverside, billingInfo, stripeKey, selectedOrganization, handleGetOrg, } = props;
@@ -404,10 +406,32 @@ const Billing = (props) => {
+ {top_text === "Base Cloud Access" && userdata.has_card_available === true ?
+ {
+ console.log("Clicked chip")
+ }}
+ variant="outlined"
+ color="primary"
+ />
+ : null}
{top_text}
- {isCloud && highlight === true ?
+ {isCloud && highlight === true && top_text !== "Base Cloud Access" ?
{
{subscription.name.includes("Scale") ?
""
:
- "You are not subscribed to any plan and are using the free plan with max 10,000 app runs per month. Upgrade to deactivate this limit."
+
+ userdata.has_card_available === true ?
+ "While you have a card attached to your account, Shuffle will no longer prevent workflows from running. Billing will occur at the start of each month."
+ :
+ `You are not subscribed to any plan and are using the free plan with max 10,000 app runs per month. Upgrade to deactivate this limit. Your organisations manager email is ${selectedOrganization.org}.`
}
{/*isCloud ?
@@ -549,20 +577,75 @@ const Billing = (props) => {
Add Payment Method
: null*/}
+
+ {userdata.has_card_available === true ?
+
+ : null}
+
+ {userdata.has_card_available === false ?
+
+ : null}
: null}
{showSupport ?
@@ -1046,7 +1129,7 @@ const Billing = (props) => {
+ : null}
: null}
{showSupport ?
@@ -1046,7 +1129,7 @@ const Billing = (props) => {