solved comflict

Author: paolap

src/mopper/mop_utils.py

@@ -1110,9 +1110,10 @@ def define_attrs(ctx):
     ctx : click context
         Includes obj dict with 'cmor' settings, exp attributes
     """
-    #var_log = logging.getLogger(ctx.obj['var_log'])
-    attrs = ctx.obj['attrs']
+    var_log = logging.getLogger(ctx.obj['var_log'])
+    attrs = ctx.obj['attrs'].copy()
     notes = attrs.get('notes', '')
+    var_log.debug(f"in define_attrs, notes: {notes}")
     # open file containing notes
     fname = import_files('mopdata').joinpath('notes.yaml')
     data = read_yaml(fname)['notes']
@@ -1125,7 +1126,8 @@ def define_attrs(ctx):
         fval = ctx.obj[field]
         for k,v in data[field].items():
             if k == fval or (k[0] == '~' and k[1:] in fval):
-                notes += v
+                notes += f" {v} "
     if notes != '':
-        attrs['notes'] = notes
+        attrs['notes'] = notes.strip()
+    var_log.debug(f"in define_attrs, attrs: {attrs}")
     return attrs

tests/test_mop_utils.py

@@ -22,7 +22,8 @@
 import logging
 from pathlib import Path
 
-from mopper.mop_utils import (check_timestamp, get_cmorname,)
+from mopper.mop_utils import (check_timestamp, get_cmorname,
+    define_attrs)
 
 
 ctx = click.Context(click.Command('cmd'),
@@ -121,8 +122,25 @@ def test_get_cmorname(caplog):
     assert iname == 'longitude'
     assert jname == 'latitude'
     assert zname == 'plev3'
-    # test generic axis alevel 
     ctx.obj['axes'] = 'longitude latitude alevel time'
     with ctx:
         zname = get_cmorname('theta_model_level_number')
     assert zname == 'hybrid_height'
+
+def test_define_attrs(caplog):
+    global ctx
+    caplog.set_level(logging.DEBUG, logger='varlog_1')
+    ctx.obj['attrs'] = {'notes': "some existing note"}
+    ctx.obj['variable_id'] = "ta"
+    ctx.obj['calculation'] = "... plevinterp(var[0]) "
+    with ctx:
+        out = define_attrs()
+    assert out['notes'] == "some existing note Linearly interpolated from model levels using numpy.interp() function. NaNs are assigned to pressure levels falling out of the height range covered by the model"
+    # repeating to make sure we are not using reference to ctx see issue #190
+    with ctx:
+        out = define_attrs()
+    assert out['notes'] == "some existing note Linearly interpolated from model levels using numpy.interp() function. NaNs are assigned to pressure levels falling out of the height range covered by the model"
+    ctx.obj['attrs'] = {}
+    with ctx:
+        out = define_attrs()
+    assert out['notes'] == "Linearly interpolated from model levels using numpy.interp() function. NaNs are assigned to pressure levels falling out of the height range covered by the model"