Fix aggregation validation for builtins and callables

Author: shuofengzhang

neat/aggregations.py

@@ -3,6 +3,7 @@
 and code for adding new user-defined ones.
 """
 
+import inspect
 import types
 import warnings
 from functools import reduce
@@ -49,14 +50,27 @@ class InvalidAggregationFunction(TypeError):
 
 
 def validate_aggregation(function):  # TODO: Recognize when need `reduce`
-    if not isinstance(function,
-                      (types.BuiltinFunctionType,
-                       types.FunctionType,
-                       types.LambdaType)):
-        raise InvalidAggregationFunction("A function object is required.")
-
-    if not (function.__code__.co_argcount >= 1):
-        raise InvalidAggregationFunction("A function taking at least one argument is required")
+    if not callable(function):
+        raise InvalidAggregationFunction("A callable object is required.")
+
+    try:
+        signature = inspect.signature(function)
+    except (TypeError, ValueError) as exc:
+        if isinstance(function, types.BuiltinFunctionType):
+            return
+        raise InvalidAggregationFunction("Unable to inspect aggregation callable signature.") from exc
+
+    accepts_positional = any(
+        parameter.kind in (
+            inspect.Parameter.POSITIONAL_ONLY,
+            inspect.Parameter.POSITIONAL_OR_KEYWORD,
+            inspect.Parameter.VAR_POSITIONAL,
+        )
+        for parameter in signature.parameters.values()
+    )
+
+    if not accepts_positional:
+        raise InvalidAggregationFunction("A function taking at least one positional argument is required")
 
 
 class AggregationFunctionSet:

tests/test_aggregation.py

@@ -72,10 +72,25 @@ def test_add_minabs():
     assert config.genome_config.aggregation_function_defs.is_valid('minabs')
 
 
+def test_add_builtin_max():
+    local_dir = os.path.dirname(__file__)
+    config_path = os.path.join(local_dir, 'test_configuration')
+    config = neat.Config(neat.DefaultGenome, neat.DefaultReproduction,
+                         neat.DefaultSpeciesSet, neat.DefaultStagnation,
+                         config_path)
+
+    config.genome_config.add_aggregation('builtin_max', max)
+    assert config.genome_config.aggregation_function_defs.get('builtin_max') is max
+
+
 def dud_function():
     return 0.0
 
 
+def keyword_only_function(*, items):
+    return sum(items)
+
+
 def test_function_set():
     s = aggregations.AggregationFunctionSet()
     assert s.get('sum') is not None
@@ -135,6 +150,21 @@ def test_bad_add2():
         raise Exception("Should have had a TypeError/derived for dud_function")
 
 
+def test_bad_add3():
+    local_dir = os.path.dirname(__file__)
+    config_path = os.path.join(local_dir, 'test_configuration')
+    config = neat.Config(neat.DefaultGenome, neat.DefaultReproduction,
+                         neat.DefaultSpeciesSet, neat.DefaultStagnation,
+                         config_path)
+
+    try:
+        config.genome_config.add_aggregation('keyword_only_function', keyword_only_function)
+    except TypeError:
+        pass
+    else:
+        raise Exception("Should have had a TypeError/derived for keyword_only_function")
+
+
 if __name__ == '__main__':
     test_sum()
     test_product()