fix: move variable validations from llm tool to page controllers

Author: ruchamahabal

studio/ai/agent/tools/variables.py

@@ -14,7 +14,6 @@
 """
 
 import json
-import re
 
 import frappe
 
@@ -23,24 +22,17 @@
 from studio.ai.block_codec import BlockCodec
 
 VARIABLE_TYPES = ("String", "Number", "Boolean", "Object")
-# A binding name has to be a bare JS identifier — it's spread into the eval context
-# and referenced as {{ <name> }}.
-VARIABLE_NAME_REGEX = re.compile(r"^[A-Za-z_$][A-Za-z0-9_$]*$")
 
 
 def run_add_variable(ctx, args: dict) -> str:
 	name = text_arg(args.get("variable_name"))
 	var_type = text_arg(args.get("variable_type")) or "String"
-	if error := _validate_name(name):
-		return f"FAILED: {error}"
 	if var_type not in VARIABLE_TYPES:
 		return f"FAILED: variable_type must be one of {list(VARIABLE_TYPES)}."
 
 	page = load_page(ctx)
 	if page is None:
 		return "FAILED: no page in context."
-	if _find_variable(page, name):
-		return f"FAILED: a variable named '{name}' already exists. Use update_variable to change it."
 
 	page.append(
 		"variables",
@@ -117,14 +109,6 @@ def run_delete_variable(ctx, args: dict) -> str:
 # --- helpers --------------------------------------------------------------
 
 
-def _validate_name(name: str) -> str | None:
-	if not name:
-		return "variable_name is required."
-	if not VARIABLE_NAME_REGEX.match(name):
-		return f"'{name}' is not a valid variable name — use letters, digits and underscores, starting with a letter."
-	return None
-
-
 def _find_variable(page, name: str):
 	if not name:
 		return None

studio/studio/doctype/studio_page/studio_page.py

@@ -1,6 +1,7 @@
 # Copyright (c) 2024, Frappe Technologies Pvt Ltd and contributors
 # For license information, please see license.txt
 import os
+import re
 
 import frappe
 from frappe import _
@@ -17,6 +18,10 @@
 )
 from studio.utils import camel_case_to_kebab_case
 
+# A variable is referenced as {{ name }} and spread into the page's JS eval context, so its
+# name must be a bare JS identifier.
+VARIABLE_NAME_REGEX = re.compile(r"^[A-Za-z_$][A-Za-z0-9_$]*$")
+
 
 class StudioPage(Document):
 	# begin: auto-generated types
@@ -200,6 +205,14 @@ def validate_variables(self):
 		if duplicate_variable_names:
 			frappe.throw(_("Duplicate variable name: {0}").format(", ".join(duplicate_variable_names)))
 
+		for variable in self.variables:
+			if not VARIABLE_NAME_REGEX.match(variable.variable_name or ""):
+				frappe.throw(
+					_(
+						"Invalid variable name '{0}' — use letters, digits and underscores, starting with a letter."
+					).format(variable.variable_name)
+				)
+
 	def process_resources(self):
 		for resource in self.resources:
 			self.validate_resources(resource)