Update app.py

app.py

@@ -1,10 +1,15 @@
 import gradio as gr
 import math
+import re
 
 history = []
 
 def calculate(expression):
     try:
+        # Input validation
+        if not re.match(r'^[\d\s\+\-\*/\(\)\^\.\w]+$', expression):
+            raise ValueError("Invalid characters in expression")
+        
         expression = expression.replace('^', '**')
         safe_dict = {
             'sin': math.sin, 'cos': math.cos, 'tan': math.tan,
@@ -23,6 +28,9 @@ def calculate(expression):
 def update_expression(expression, value):
     if expression == "0" and value not in ['.', '(', ')']:
         return value
+    # Automatically add brackets for functions
+    if value in ['sin', 'cos', 'tan', 'log', 'ln', 'sqrt']:
+        return expression + value + '('
     return expression + value
 
 def backspace(expression):
@@ -37,6 +45,7 @@ css = """
 .number-button { background-color: #e0e0e0; }
 .basic-op-button { background-color: #ffffff; }
 .advanced-op-button { background-color: #ffa500; }
+.calculator-box { border: 1px solid #ccc; padding: 10px; margin: 5px; border-radius: 5px; }
 """
 
 with gr.Blocks(css=css) as iface:
@@ -50,33 +59,36 @@ with gr.Blocks(css=css) as iface:
     
     with gr.Row():
         with gr.Column(scale=3):
-            # Number pad
-            for i in range(3):
+            with gr.Box(elem_classes=["calculator-box"]):
+                # Number pad
+                for i in range(3):
+                    with gr.Row():
+                        for j in range(3):
+                            num = 7 - 3*i + j
+                            globals()[f"btn_{num}"] = gr.Button(str(num), elem_classes=["calculator-button", "number-button"])
                 with gr.Row():
-                    for j in range(3):
-                        num = 7 - 3*i + j
-                        globals()[f"btn_{num}"] = gr.Button(str(num), elem_classes=["calculator-button", "number-button"])
-            with gr.Row():
-                btn_0 = gr.Button("0", elem_classes=["calculator-button", "number-button"])
-                btn_dot = gr.Button(".", elem_classes=["calculator-button", "number-button"])
-                btn_equals = gr.Button("=", elem_classes=["calculator-button", "basic-op-button"])
+                    btn_0 = gr.Button("0", elem_classes=["calculator-button", "number-button"])
+                    btn_dot = gr.Button(".", elem_classes=["calculator-button", "number-button"])
+                    btn_equals = gr.Button("=", elem_classes=["calculator-button", "basic-op-button"])
         
         with gr.Column(scale=2):
-            # Basic operations
-            for op, symbol in [("add", "+"), ("sub", "-"), ("mul", "*"), ("div", "/")]:
-                globals()[f"btn_{op}"] = gr.Button(symbol, elem_classes=["calculator-button", "basic-op-button"])
-            btn_left_paren = gr.Button("(", elem_classes=["calculator-button", "basic-op-button"])
-            btn_right_paren = gr.Button(")", elem_classes=["calculator-button", "basic-op-button"])
-            btn_clear = gr.Button("C", elem_classes=["calculator-button", "basic-op-button"])
-            btn_backspace = gr.Button("⌫", elem_classes=["calculator-button", "basic-op-button"])
+            with gr.Box(elem_classes=["calculator-box"]):
+                # Basic operations
+                for op, symbol in [("add", "+"), ("sub", "-"), ("mul", "*"), ("div", "/")]:
+                    globals()[f"btn_{op}"] = gr.Button(symbol, elem_classes=["calculator-button", "basic-op-button"])
+                btn_left_paren = gr.Button("(", elem_classes=["calculator-button", "basic-op-button"])
+                btn_right_paren = gr.Button(")", elem_classes=["calculator-button", "basic-op-button"])
+                btn_clear = gr.Button("C", elem_classes=["calculator-button", "basic-op-button"])
+                btn_backspace = gr.Button("⌫", elem_classes=["calculator-button", "basic-op-button"])
         
         with gr.Column(scale=2):
-            # Advanced operations
-            for func in ["sin", "cos", "tan", "log", "ln", "sqrt"]:
-                globals()[f"btn_{func}"] = gr.Button(func, elem_classes=["calculator-button", "advanced-op-button"])
-            btn_power = gr.Button("^", elem_classes=["calculator-button", "advanced-op-button"])
-            btn_pi = gr.Button("π", elem_classes=["calculator-button", "advanced-op-button"])
-            btn_e = gr.Button("e", elem_classes=["calculator-button", "advanced-op-button"])
+            with gr.Box(elem_classes=["calculator-box"]):
+                # Advanced operations
+                for func in ["sin", "cos", "tan", "log", "ln", "sqrt"]:
+                    globals()[f"btn_{func}"] = gr.Button(func, elem_classes=["calculator-button", "advanced-op-button"])
+                btn_power = gr.Button("^", elem_classes=["calculator-button", "advanced-op-button"])
+                btn_pi = gr.Button("π", elem_classes=["calculator-button", "advanced-op-button"])
+                btn_e = gr.Button("e", elem_classes=["calculator-button", "advanced-op-button"])
 
     # Define button click events
     for btn in [btn_0, btn_1, btn_2, btn_3, btn_4, btn_5, btn_6, btn_7, btn_8, btn_9,