OpenConceptLab/ocl_issues#954 | custom attributes datatype conversion (…

…#12) * OpenConceptLab/ocl_issues#954 | custom attributes datatype conversion * OpenConceptLab/ocl_issues#954 | making sure extras attribute data type is not added as part of the key name
OpenConceptLab · Sep 27, 2021 · 03a74a9 · 03a74a9
1 parent 50cc303
commit 03a74a9
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/ocldev/oclcsvtojsonconverter.py b/ocldev/oclcsvtojsonconverter.py
@@ -14,6 +14,8 @@
 
 import six
 
+from distutils import util
+
 from ocldev import oclconstants
 
 
@@ -436,14 +438,22 @@ def get_auto_extra_attributes(self, csv_row, auto_attributes_def):
             re.escape(auto_attributes_def[self.DEF_KEY_AUTO_INDEX_PREFIX]),
             auto_attributes_def[self.DEF_KEY_AUTO_INDEX_REGEX],
             re.escape(auto_attributes_def[self.DEF_KEY_AUTO_INDEX_POSTFIX]))
+        data_types = ['bool', 'str', 'int', 'float', 'list']
 
         # Process CSV columns
         for column_name in csv_row:
+            data_type = 'str'
+            if column_name.count(':') == 2:
+                suffix_part = column_name.split(':')[2].strip()
+                if suffix_part in data_types:
+                    data_type = suffix_part
             if column_name[:len(standard_needle)] == standard_needle:
                 # Check if standard attr (e.g. attr:my-custom-attr)
                 if not omit_if_empty_value or (omit_if_empty_value and csv_row[column_name]):
                     key_name = column_name[len(standard_needle):]
-                    extra_attributes[key_name] = csv_row[column_name]
+                    if key_name.endswith(":" + data_type):
+                        key_name = key_name.replace(":" + data_type, "")
+                    extra_attributes[key_name] = self.do_datatype_conversion(csv_row[column_name], data_type)
             else:
                 key_regex_match = re.search(key_needle, column_name)
                 value_regex_match = re.search(value_needle, column_name)
@@ -710,7 +720,7 @@ def do_datatype_conversion(self, value, datatype):
         desired datatype (e.g. datatype="bool", "int", "float").
         """
         if datatype == 'bool':
-            return bool(value)
+            return bool(util.strtobool(str(value)))
         elif datatype == 'int':
             return int(value)
         elif datatype == 'float':