SSDM-14382: fixed clearing of vocabulary properties

api-openbis-python3-pybis/src/python/pybis/property.py

@@ -146,15 +146,15 @@ class PropertyHolder:
                 if type(value) != list:
                     value = [value]
                 for single_value in value:
-                    if str(single_value).upper() not in terms.df["code"].values:
+                    if single_value != '' and str(single_value).upper() not in terms.df["code"].values:
                         raise ValueError(
                             f"Value for attribute «{name}» must be one of these terms: {', '.join(terms.df['code'].values)}"
                         )
             else:
                 value = str(value).upper()
-                if value not in terms.df["code"].values:
+                if value != '' and value not in terms.df["code"].values:
                     raise ValueError(
-                        f"Value for attribute «{name}» must be one of these terms: {', '.join(terms.df['code'].values)}"
+                        f"Value for attribute «{name}» must be one of these terms: {', '.join(terms.df['code'].values)} VALUE:{value}"
                     )
         elif data_type == "SAMPLE":
             if "multiValue" in property_type and property_type["multiValue"] is True:

api-openbis-python3-pybis/src/python/tests/test_vocabulary.py

@@ -15,6 +15,7 @@
 import random
 
 import time
+import uuid
 
 
 def test_create_delete_vocabulary(openbis_instance):
@@ -83,4 +84,83 @@ def test_create_delete_vocabulary_term(openbis_instance):
     assert list(terms.df['code']) == ['TERM_CODE1', 'TERM_CODE2']
 
 
+def test_create_set_and_remove_vocabulary_property(space):
+    o = space.openbis
+    timestamp = time.strftime('%a_%y%m%d_%H%M%S').upper()
+    voc_code = 'test_voc_' + timestamp + "_" + str(random.randint(0, 1000))
+
+    voc = o.new_vocabulary(
+        code=voc_code,
+        description='description of vocabulary',
+        urlTemplate='https://ethz.ch',
+        terms=[
+            {"code": 'term_code1', "label": "term_label1", "description": "term_description1"},
+            {"code": 'term_code2', "label": "term_label2", "description": "term_description2"},
+            {"code": 'term_code3', "label": "term_label3", "description": "term_description3"}
+        ],
+        chosenFromList=False
+    )
+    voc.save()
+
+    voc_exists = o.get_vocabulary(voc_code)
+    assert voc_exists is not None
+    assert voc_exists.code == voc_code.upper()
+
+    property_type_code = "test_vocabulary_property_type_" + timestamp + "_" + str(uuid.uuid4())
+    pt_date = o.new_property_type(
+        code=property_type_code,
+        label='custom property of data type controlled vocabulary',
+        description='custom property created in unit test',
+        dataType='CONTROLLEDVOCABULARY',
+        vocabulary=voc_code
+    )
+    pt_date.save()
+
+    # Create custom sample type
+    sample_type_code = "test_sample_type_" + timestamp + "_" + str(uuid.uuid4())
+    sample_type = o.new_sample_type(
+        code=sample_type_code,
+        generatedCodePrefix="S",
+        autoGeneratedCode=True,
+        listable=True,
+    )
+    sample_type.save()
+
+    # Assign created property to new sample type
+    sample_type.assign_property(
+        prop=property_type_code,
+        section='vocabulary section',
+        ordinal=1,
+        mandatory=False,
+        showInEditView=True,
+        showRawValueInForms=True
+    )
+
+    project = space.new_project(f'my_project_{timestamp}')
+    project.save()
+
+    collection = o.new_experiment('UNKNOWN', f'my_collection_{timestamp}', project)
+    collection.save()
+
+    sample_code = "my_sample_{}".format(timestamp)
+
+    sample = space.new_sample(code=sample_code,
+                              type=sample_type_code,
+                              experiment=collection,
+                              props={
+                                  property_type_code.lower(): 'term_code1'})
+    sample.save()
+
+    assert len(sample.props()) == 1
+    key, val = sample.props().popitem()
+    assert key.lower() == property_type_code.lower()
+    assert val == 'term_code1'.upper()
+
+    sample.props[property_type_code.lower()] = ''
+    sample.save()
+
+    assert len(sample.props()) == 1
+    key, val = sample.props().popitem()
+    assert key.lower() == property_type_code.lower()
+    assert val == ''