Update app.py

app.py

@@ -3,10 +3,10 @@ import operator as op
 import re
 import gradio as gr
 
-# ----------------------------
-# Safe arithmetic evaluator
-# ----------------------------
-ALLOWED_OPERATORS = {
+# =========================
+# SAFE CALCULATION LOGIC
+# =========================
+OPS = {
     ast.Add: op.add,
     ast.Sub: op.sub,
     ast.Mult: op.mul,
@@ -17,124 +17,75 @@ ALLOWED_OPERATORS = {
     ast.USub: op.neg,
 }
 
-def _safe_eval_node(node):
-    if isinstance(node, ast.Constant) and isinstance(node.value, (int, float)):
-        return node.value
-
-    if isinstance(node, ast.BinOp) and type(node.op) in ALLOWED_OPERATORS:
-        return ALLOWED_OPERATORS[type(node.op)](
-            _safe_eval_node(node.left),
-            _safe_eval_node(node.right),
-        )
-
-    if isinstance(node, ast.UnaryOp) and type(node.op) in ALLOWED_OPERATORS:
-        return ALLOWED_OPERATORS[type(node.op)](_safe_eval_node(node.operand))
-
-    raise ValueError("Unsupported expression")
-
-def safe_eval(expr: str):
+def eval_expr(expr):
     expr = expr.replace("×", "*").replace("÷", "/").replace("−", "-")
     tree = ast.parse(expr, mode="eval")
-    return _safe_eval_node(tree.body)
+    return _eval(tree.body)
 
-def format_result(value):
-    if isinstance(value, float) and value.is_integer():
-        return str(int(value))
-    return str(value)
+def _eval(node):
+    if isinstance(node, ast.Constant):
+        return node.value
+    elif isinstance(node, ast.BinOp):
+        return OPS[type(node.op)](_eval(node.left), _eval(node.right))
+    elif isinstance(node, ast.UnaryOp):
+        return OPS[type(node.op)](_eval(node.operand))
+    else:
+        raise Exception("Invalid")
 
-# ----------------------------
-# Calculator actions
-# ----------------------------
-def append_value(current, value):
+# =========================
+# BUTTON FUNCTIONS
+# =========================
+def append(current, val):
     if current in ("0", "Error"):
         current = ""
 
-    if value in "+-*/":
-        if not current and value != "-":
-            return "0", "0"
-        if current.endswith(("+", "-", "*", "/", ".")):
-            current = current[:-1]
+    if val in "+-*/" and current.endswith(("+","-","*","/")):
+        current = current[:-1]
 
-    return current + value, current + value
+    return current + val, current + val
 
-def clear_display():
-    return "0", "0"
-
-def backspace(current):
-    if current in ("0", "Error", ""):
-        return "0", "0"
-    new_value = current[:-1]
-    if not new_value:
-        new_value = "0"
-    return new_value, new_value
-
-def evaluate(current):
+def calculate(current):
     try:
-        result = safe_eval(current)
-        result = format_result(result)
-        return result, result
+        result = eval_expr(current)
+        return str(result), str(result)
     except:
         return "Error", "Error"
 
-def toggle_sign(current):
-    if current in ("0", "Error", ""):
-        return "-", "-"
-
-    m = re.search(r"(-?\d+(?:\.\d+)?)$", current)
-    if not m:
-        return current, current
-
-    start, end = m.span()
-    num = m.group(0)
+def clear():
+    return "0", "0"
 
-    if num.startswith("-"):
-        num = num[1:]
-    else:
-        num = "-" + num
+def backspace(current):
+    if len(current) <= 1:
+        return "0", "0"
+    return current[:-1], current[:-1]
 
-    new_value = current[:start] + num
-    return new_value, new_value
+def toggle_sign(current):
+    if current == "0":
+        return "-0", "-0"
+    if current.startswith("-"):
+        return current[1:], current[1:]
+    return "-" + current, "-" + current
 
 def percent(current):
-    if current in ("0", "Error", ""):
-        return "0", "0"
-
-    if current.endswith((".", "+", "-", "*", "/")):
+    try:
+        value = eval_expr(current) / 100
+        return str(value), str(value)
+    except:
         return current, current
 
-    new_value = current + "/100"
-    return new_value, new_value
-
-def parens(current):
-    if current in ("0", "Error"):
-        current = ""
-
-    open_count = current.count("(")
-    close_count = current.count(")")
-
-    if not current or current.endswith(("+", "-", "*", "/", "(")):
-        ch = "("
-    elif open_count > close_count:
-        ch = ")"
-    else:
-        ch = "("
-
-    new_value = current + ch
-    return new_value, new_value
-
 def make_append(v):
     def fn(current):
-        return append_value(current, v)
+        return append(current, v)
     return fn
 
-# ----------------------------
-# UI
-# ----------------------------
+# =========================
+# CSS (VT323 FONT)
+# =========================
 CSS = """
-@import url('https://fonts.googleapis.com/css2?family=VT323:wght@300;400;600&display=swap');
+@import url('https://fonts.googleapis.com/css2?family=VT323&display=swap');
 
 * {
-    font-family: 'VT323', sans-serif !important;
+    font-family: 'VT323', monospace !important;
 }
 
 body, .gradio-container {
@@ -144,130 +95,90 @@ body, .gradio-container {
 
 .phone {
     max-width: 390px;
-    margin: 0 auto;
-    padding: 16px 14px 20px;
+    margin: auto;
+    padding: 15px;
 }
 
+/* Display */
 .display textarea {
-    background: #000 !important;
-    color: #fff !important;
-    border: none !important;
-    box-shadow: none !important;
+    background: black !important;
+    color: white !important;
+    font-size: 60px !important;
     text-align: right !important;
-    font-size: 72px !important;
-    font-weight: 300 !important;
-    height: 170px !important;
-    padding: 10px 0 0 0 !important;
-    resize: none !important;
-}
-
-.divider {
-    height: 1px;
-    background: rgba(255,255,255,0.18);
-    margin: 10px 0 18px 0;
-}
-
-.topbar {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    color: rgba(255,255,255,0.8);
-    font-size: 18px;
-    margin-bottom: 8px;
-    opacity: 0.9;
+    border: none !important;
+    height: 140px !important;
 }
 
+/* Buttons */
 button {
-    height: 82px !important;
-    min-height: 82px !important;
-    border-radius: 999px !important;
-    font-size: 30px !important;
-    font-weight: 500 !important;
+    height: 75px !important;
+    border-radius: 50% !important;
+    font-size: 26px !important;
     border: none !important;
-    box-shadow: none !important;
 }
 
+/* Colors */
 .digit button {
-    background: #272727 !important;
-    color: #fff !important;
+    background: #1c1c1c !important;
+    color: white !important;
 }
 
 .utility button {
     background: #a5a5a5 !important;
-    color: #000 !important;
+    color: black !important;
 }
 
 .operator button {
-    background: #bfbfbf !important;
-    color: #000 !important;
+    background: #ff9500 !important;
+    color: white !important;
 }
 
 .equals button {
     background: #34c759 !important;
-    color: #fff !important;
+    color: white !important;
 }
 """
 
-with gr.Blocks(css=CSS, title="Calculator") as demo:
+# =========================
+# UI
+# =========================
+with gr.Blocks(css=CSS) as demo:
+
     with gr.Column(elem_classes="phone"):
-        display = gr.Textbox(
-            value="0",
-            show_label=False,
-            interactive=False,
-            container=False,
-            lines=1,
-            elem_classes="display",
-        )
-        state = gr.State("0")
 
-        gr.HTML("""
-        <div class="divider"></div>
-        """)
+        display = gr.Textbox(value="0", show_label=False, elem_classes="display")
+        state = gr.State("0")
 
         # Row 1
         with gr.Row():
-            with gr.Column(scale=1, min_width=0):
-                gr.Button("C", elem_classes=["utility"]).click(clear_display, None, [state, display])
-            with gr.Column(scale=1, min_width=0):
-                gr.Button("()", elem_classes=["utility"]).click(parens, state, [state, display])
-            with gr.Column(scale=1, min_width=0):
-                gr.Button("%", elem_classes=["utility"]).click(percent, state, [state, display])
-            with gr.Column(scale=1, min_width=0):
-                gr.Button("÷", elem_classes=["operator"]).click(make_append("/"), state, [state, display])
+            gr.Button("C", elem_classes="utility").click(clear, None, [state, display])
+            gr.Button("+/-", elem_classes="utility").click(toggle_sign, state, [state, display])
+            gr.Button("%", elem_classes="utility").click(percent, state, [state, display])
+            gr.Button("÷", elem_classes="operator").click(make_append("/"), state, [state, display])
 
         # Row 2
         with gr.Row():
-            for label in ["7", "8", "9"]:
-                with gr.Column(scale=1, min_width=0):
-                    gr.Button(label, elem_classes=["digit"]).click(make_append(label), state, [state, display])
-            with gr.Column(scale=1, min_width=0):
-                gr.Button("×", elem_classes=["operator"]).click(make_append("*"), state, [state, display])
+            for i in ["7","8","9"]:
+                gr.Button(i, elem_classes="digit").click(make_append(i), state, [state, display])
+            gr.Button("×", elem_classes="operator").click(make_append("*"), state, [state, display])
 
         # Row 3
         with gr.Row():
-            for label in ["4", "5", "6"]:
-                with gr.Column(scale=1, min_width=0):
-                    gr.Button(label, elem_classes=["digit"]).click(make_append(label), state, [state, display])
-            with gr.Column(scale=1, min_width=0):
-                gr.Button("−", elem_classes=["operator"]).click(make_append("-"), state, [state, display])
+            for i in ["4","5","6"]:
+                gr.Button(i, elem_classes="digit").click(make_append(i), state, [state, display])
+            gr.Button("−", elem_classes="operator").click(make_append("-"), state, [state, display])
 
         # Row 4
         with gr.Row():
-            for label in ["1", "2", "3"]:
-                with gr.Column(scale=1, min_width=0):
-                    gr.Button(label, elem_classes=["digit"]).click(make_append(label), state, [state, display])
-            with gr.Column(scale=1, min_width=0):
-                gr.Button("+", elem_classes=["operator"]).click(make_append("+"), state, [state, display])
+            for i in ["1","2","3"]:
+                gr.Button(i, elem_classes="digit").click(make_append(i), state, [state, display])
+            gr.Button("+", elem_classes="operator").click(make_append("+"), state, [state, display])
 
         # Row 5
         with gr.Row():
-            with gr.Column(scale=1, min_width=0):
-                gr.Button("+/-", elem_classes=["utility"]).click(toggle_sign, state, [state, display])
-            with gr.Column(scale=2, min_width=0):
-                gr.Button("0", elem_classes=["digit", "zero"]).click(make_append("0"), state, [state, display])
-            with gr.Column(scale=1, min_width=0):
-                gr.Button(".", elem_classes=["digit"]).click(make_append("."), state, [state, display])
-            with gr.Column(scale=1, min_width=0):
-                gr.Button("=", elem_classes=["equals"]).click(evaluate, state, [state, display])
+            gr.Button("⌫", elem_classes="utility").click(backspace, state, [state, display])
+            gr.Button("0", elem_classes="digit").click(make_append("0"), state, [state, display])
+            gr.Button(".", elem_classes="digit").click(make_append("."), state, [state, display])
+            gr.Button("=", elem_classes="equals").click(calculate, state, [state, display])
 
 demo.launch(server_name="0.0.0.0", server_port=7860)