ENH: Config syntax for importing objects (#463)

Author: rrjbca

examples/galaxies/sdss_photometry.yml

@@ -1,4 +1,4 @@
-cosmology: !astropy.cosmology.default_cosmology.get
+cosmology: !astropy.cosmology.default_cosmology.get []
 z_range: !numpy.linspace [0, 2, 21]
 M_star: !astropy.modeling.models.Linear1D [-0.9408582, -20.40492365]
 phi_star: !astropy.modeling.models.Exponential1D [0.00370253, -9.73858]

skypy/pipeline/_config.py

@@ -52,23 +52,23 @@ def construct_ref(self, node):
         return Ref(ref)
 
     def construct_call(self, name, node):
-        if isinstance(node, yaml.ScalarNode):
-            arg = self.construct_scalar(node)
-            args = [arg] if arg != '' else []
-            kwargs = {}
-        elif isinstance(node, yaml.SequenceNode):
-            args = self.construct_sequence(node)
-            kwargs = {}
-        elif isinstance(node, yaml.MappingNode):
-            args = []
-            kwargs = self.construct_mapping(node)
-
         try:
-            function = import_function(name)
+            object = import_function(name)
         except (ModuleNotFoundError, AttributeError) as e:
             raise ImportError(f'{e}\n{node.start_mark}') from e
 
-        return Call(function, args, kwargs)
+        if isinstance(node, yaml.ScalarNode):
+            if node.value:
+                raise ValueError(f'{node.value}: ScalarNode should be empty to import an object')
+            return object
+        else:
+            if isinstance(node, yaml.SequenceNode):
+                args = self.construct_sequence(node)
+                kwargs = {}
+            if isinstance(node, yaml.MappingNode):
+                args = []
+                kwargs = self.construct_mapping(node)
+            return Call(object, args, kwargs)
 
     def construct_quantity(self, node):
         value = self.construct_scalar(node)

skypy/pipeline/tests/data/bad_object.yml

@@ -0,0 +1 @@
+bad_object: !astropy.cosmology.Planck15 "bad value"

skypy/pipeline/tests/data/test_config.yml

@@ -1,8 +1,9 @@
 test_int: 1
 test_float: 1.0
 test_str: hello world
-test_func: !numpy.random.uniform
-test_func_with_arg: !len 'hello world'
+test_func: !numpy.random.uniform []
+test_func_with_arg: !len ['hello world']
+test_object: !astropy.cosmology.Planck15
 cosmology: !astropy.cosmology.FlatLambdaCDM
   H0: 67.74
   Om0: 0.3075

skypy/pipeline/tests/test_config.py

@@ -3,6 +3,7 @@
 from skypy.pipeline import load_skypy_yaml
 from skypy.pipeline._items import Call
 from astropy import units
+from astropy.cosmology.core import Cosmology
 
 
 def test_load_skypy_yaml():
@@ -18,6 +19,8 @@ def test_load_skypy_yaml():
     assert isinstance(config['test_float'], float)
     assert isinstance(config['test_str'], str)
     assert isinstance(config['test_func'], Call)
+    assert isinstance(config['test_func_with_arg'], Call)
+    assert isinstance(config['test_object'], Cosmology)
     assert isinstance(config['cosmology'], Call)
     assert isinstance(config['tables']['test_table_1']['test_column_3'], Call)
 
@@ -31,6 +34,11 @@ def test_load_skypy_yaml():
     with pytest.raises(ImportError):
         load_skypy_yaml(filename)
 
+    # Bad object
+    filename = get_pkg_data_filename('data/bad_object.yml')
+    with pytest.raises(ValueError):
+        load_skypy_yaml(filename)
+
 
 def test_empty_ref():
     filename = get_pkg_data_filename('data/test_empty_ref.yml')