make annotation optional for convert_req_function_args

Author: nicopop

src/Rules.py

@@ -9,6 +9,7 @@
 import re
 import math
 import inspect
+import logging
 
 if TYPE_CHECKING:
     from . import ManualWorld
@@ -94,8 +95,8 @@ def checkRequireStringForArea(state: CollectionState, area: dict):
 
             if not callable(func):
                 raise ValueError(f"Invalid function `{func_name}` in {area}.")
-            if func_args:
-                convert_req_function_args(func, func_args, area["name"])
+
+            convert_req_function_args(func, func_args, area["name"])
             result = func(world, multiworld, state, player, *func_args)
             if isinstance(result, bool):
                 requires_list = requires_list.replace("{" + func_name + "(" + item[1] + ")}", "1" if result else "0")
@@ -273,7 +274,7 @@ def allRegionsAccessible(state):
     # Victory requirement
     multiworld.completion_condition[player] = lambda state: state.has("__Victory__", player)
 
-    def convert_req_function_args(func, args: list[str], areaName: str):
+    def convert_req_function_args(func, args: list[str], areaName: str, warn: bool = False):
         parameters = inspect.signature(func).parameters
         knownArguments = ["world", "multiworld", "state", "player"]
         index = 0
@@ -282,8 +283,12 @@ def convert_req_function_args(func, args: list[str], areaName: str):
                 continue
 
             argType = info.annotation
+
+            if issubclass(argType, inspect._empty): #if not set then it wont get converted but still be checked for valid data at index
+                argType = str
+
             try:
-                value = args[index].strip().lower()
+                value = args[index].strip()
 
             except IndexError:
                 if info is not inspect.Parameter.empty:
@@ -292,19 +297,22 @@ def convert_req_function_args(func, args: list[str], areaName: str):
                 else:
                     raise Exception(f"A call of the {func.__name__} function in '{areaName}'s requirement, asks for a value of type {argType}\nfor its argument '{info.name}' but its missing")
 
+
             if not isinstance(value, argType):
                 if issubclass(argType, bool):
                     #Special conversion to bool
-                    if value in ['true', '1']:
+                    if value.lower() in ['true', '1']:
                         value = True
 
-                    elif value in ['false', '0']:
+                    elif value.lower() in ['false', '0']:
                         value = False
 
                     else:
-                        # warning here spam the console, might be worth to make it a data validation instead
-                        # logging.warn(f"A function in '{areaName}'s requirement, asks for a value of type {argType}\nfor its argument '{info.name}' but an unknown string was passed")
                         value = bool(value)
+                        if warn:
+                        # warning here spam the console if called from rules.py, might be worth to make it a data validation instead
+                            logging.warn(f"A call of the {func.__name__} function in '{areaName}'s requirement, asks for a value of type {argType}\nfor its argument '{info.name}' but an unknown string was passed and thus converted to {value}")
+
 
                 else:
                     try: