Merge pull request #808 from rhayes777/feature/collection_type_annotations

feature/collection type annotations

Author: Jammy2211

autofit/mapper/prior_model/prior_model.py

@@ -1,7 +1,9 @@
 import builtins
+import collections.abc
 import copy
 import inspect
 import logging
+import typing
 
 from autoconf.class_path import get_class_path
 from autoconf.exc import ConfigException
@@ -164,7 +166,20 @@ def __init__(
                 elif hasattr(spec, "__args__") and type(None) in spec.__args__:
                     setattr(self, arg, None)
                 else:
-                    setattr(self, arg, Model(annotations[arg]))
+                    annotation = annotations[arg]
+
+                    if (
+                        hasattr(annotation, "__origin__")
+                        and issubclass(
+                            annotation.__origin__, collections.abc.Collection
+                        )
+                    ) or isinstance(annotation, collections.abc.Collection):
+                        from autofit.mapper.prior_model.collection import Collection
+
+                        value = Collection()
+                    else:
+                        value = Model(annotation)
+                    setattr(self, arg, value)
             else:
                 prior = self.make_prior(arg)
                 if (

test_autofit/mapper/model/test_regression.py

@@ -1,3 +1,5 @@
+from typing import List
+
 import pytest
 
 import autofit as af
@@ -157,3 +159,13 @@ def test_instance_from_vector(model_with_assertion):
 
 def test_random_instance(model_with_assertion):
     model_with_assertion.random_instance(ignore_prior_limits=True)
+
+
+class TestModel:
+    def __init__(self, items: List[float]):
+        self.items = items
+
+
+def test_typing_annotations():
+    model = af.Model(TestModel)
+    assert model.items == af.Collection()