Update app.py

app.py

@@ -1,5 +1,5 @@
 from flask import Flask, request, render_template_string
-from decimal import Decimal, ROUND_HALF_UP
+from decimal import Decimal, ROUND_HALF_UP, InvalidOperation
 import re
 from datetime import datetime
 
@@ -38,11 +38,16 @@ def log(message):
 def parse_value_unit(value_unit_str):
     """数値と単位をパースして、共通単位に変換"""
     log(f"Parsing: {value_unit_str}")
-    match = re.match(r"([\d.]+)\s*\[([a-zA-Zµ^2]+)\]", value_unit_str)
+    match = re.match(r"([\d.eE+-]+)\s*\[([a-zA-Zµ^2]+)\]", value_unit_str)
     if match:
         value, unit = match.groups()
         log(f"Parsed value: {value}, unit: {unit}")
-        return Decimal(value), unit, len(value.split('.')[1]) if '.' in value else 0
+        try:
+            decimal_value = Decimal(value)
+        except InvalidOperation:
+            raise ValueError(f"Invalid numeric value: {value}")
+        sig_figs = len(value.split('.')[1]) if '.' in value else 0
+        return decimal_value, unit, sig_figs
     else:
         raise ValueError("Invalid format. The input should be in the form 'value[unit]'.")
 
@@ -69,7 +74,7 @@ def convert_to_common_unit(value, from_unit, to_unit):
 def calculate_expression(expression):
     """複数の数値を処理する計算（加算、減算、乗算、除算に対応）"""
     log(f"Calculating expression: {expression}")
-    pattern = r"([\d.]+\s*\[[^\]]+\])"
+    pattern = r"([\d.eE+-]+\s*\[[^\]]+\])"
     terms = re.findall(pattern, expression)
     log(f"Found terms: {terms}")
     
@@ -103,9 +108,13 @@ def calculate_expression(expression):
     # 最も少ない有効数字に基づいて丸める
     min_sig_figs = min(sig_figs_list)
     rounded_result = total_value.quantize(Decimal('1e{0}'.format(-(min_sig_figs - 1))), rounding=ROUND_HALF_UP)
-    log(f"Final result: {rounded_result} [{total_unit}]")
     
-    return f"{rounded_result} [{total_unit}]"
+    # 小数点以下のゼロを省略せずに表示
+    rounded_result_str = format(rounded_result, 'f')
+    
+    log(f"Final result: {rounded_result_str} [{total_unit}]")
+    
+    return f"{rounded_result_str} [{total_unit}]"
 
 # HTMLテンプレート（バイト列でエンコード）
 template = b"""
@@ -190,6 +199,7 @@ def calculate():
         result = calculate_expression(expression)
         return result
     except Exception as e:
+        log(f"Error: {str(e)}")
         return f"Error: {str(e)}", 400
 
 if __name__ == '__main__':