recognize int and float options if there is a int/float

Author: bernt-matthias

acclimatise/model.py

@@ -372,7 +372,7 @@ def capital(self):
 
 
 int_re = re.compile(
-    r"\b((int(eger)?)|size|length|max|min|num(ber)?)\b", flags=re.IGNORECASE
+    r"\b((int(eger)?)|size|length|max|min|(num(ber)?))\b", flags=re.IGNORECASE
 )
 str_re = re.compile(r"\bstr(ing)?\b", flags=re.IGNORECASE)
 float_re = re.compile(r"\b(float|decimal)\b", flags=re.IGNORECASE)
@@ -385,8 +385,12 @@ def capital(self):
 default_re = re.compile(
     r"default(?: value)?(?:[:=] ?| )([^ )\]]+)", flags=re.IGNORECASE
 )
-float_re = re.compile(r"[+-]?([0-9]+([.][0-9]*)?|[.][0-9]+)", flags=re.IGNORECASE)
-int_re = re.compile(r"[+-]?([0-9]+[^.0-9])", flags=re.IGNORECASE)
+# 
+float_num_re = re.compile(
+    r"[+-]?(([0-9]*\.[0-9]+)|((?:0|[1-9]\d*)(?:\.\d*)?(?:[eE][+\-]?\d+)))",
+    flags=re.IGNORECASE
+)
+int_num_re = re.compile(r"([+-]?[0-9]+)", flags=re.IGNORECASE)
 
 
 def infer_type(string) -> typing.Optional[cli_types.CliType]:
@@ -417,7 +421,13 @@ def infer_type(string) -> typing.Optional[cli_types.CliType]:
     elif str_re.search(string):
         return cli_types.CliString()
     else:
-        return cli_types.CliString()
+        if float_num_re.search(string):
+            return cli_types.CliFloat()
+        elif int_num_re.search(string):
+            print("int num")
+            return cli_types.CliInteger()
+        else:
+            return cli_types.CliString()
 
 
 @yaml_object(yaml)

test/test_type_inference.py

@@ -31,6 +31,10 @@
         ("folder", CliDir, None),
         ("directory", CliDir, None),
         ("output directory", CliDir, True),
+        ("blah 23 blub", CliInteger, False),
+        ("nonsense 23.42", CliFloat, True),
+        (".42 gibberish", CliFloat, True),
+        ("1E-5", CliFloat, True),
     ],
 )
 def test_type_inference(string, typ, isoutput):