Added support for displaying and editing a RecordSet dataTypes and a Field equivalentPropertyin the editor. Currently those features are not observable or editable in the editor, but they are important to give clearer meaning to the records and fields. For now the RecordSet dataTypes are shown in 1 text box separated by comma. It could be changed to a button and multiple fields, but that would be a lot more code, let us know how do you feel. The equivalentProperty has been added right after the Field dataType in the table on the left side in the Record Sets tab, as well as in the field details on the right side. We can remove it from the left side table if you feel it is too much and should only be shown in the details

Author: david4096

editor/core/state.py

@@ -167,6 +167,7 @@ class Field(Node):
 
     description: str | None = None
     data_types: str | list[str] | None = None
+    equivalentProperty: str | list[str] | None = None
     source: mlc.Source | None = None
     references: mlc.Source | None = None
 

editor/events/fields.py

@@ -61,6 +61,7 @@ class FieldEvent(enum.Enum):
     ID = "ID"
     DESCRIPTION = "DESCRIPTION"
     DATA_TYPE = "DATA_TYPE"
+    EQUIVALENT_PROPERTY = "EQUIVALENT_PROPERTY"
     SOURCE = "SOURCE"
     SOURCE_EXTRACT = "SOURCE_EXTRACT"
     SOURCE_EXTRACT_COLUMN = "SOURCE_EXTRACT_COLUMN"
@@ -95,6 +96,8 @@ def handle_field_change(
             metadata.rename_id(old_id=old_id, new_id=new_id)
     elif change == FieldEvent.DESCRIPTION:
         field.description = value
+    elif change == FieldEvent.EQUIVALENT_PROPERTY:
+        field.equivalentProperty = value
     elif change == FieldEvent.DATA_TYPE:
         field.data_types = [str_to_mlc_data_type(value)]
     elif change == FieldEvent.SOURCE:

editor/events/record_sets.py

@@ -13,6 +13,7 @@ class RecordSetEvent(enum.Enum):
     NAME = "NAME"
     ID = "ID"
     DESCRIPTION = "DESCRIPTION"
+    DATA_TYPES = "DATA_TYPES"
     IS_ENUMERATION = "IS_ENUMERATION"
     HAS_DATA = "HAS_DATA"
     CHANGE_DATA = "CHANGE_DATA"
@@ -35,6 +36,8 @@ def handle_record_set_change(event: RecordSetEvent, record_set: RecordSet, key:
             metadata.rename_id(old_id=old_id, new_id=new_id)
     elif event == RecordSetEvent.DESCRIPTION:
         record_set.description = value
+    elif event == RecordSetEvent.DATA_TYPES:
+        record_set.data_types = [value.strip() for value in value.split(',')]
     elif event == RecordSetEvent.IS_ENUMERATION:
         record_set.is_enumeration = value
     elif event == RecordSetEvent.HAS_DATA:

editor/views/jsonld.py

@@ -32,6 +32,7 @@ def render_jsonld():
                         name=field["name"],
                         description=field["description"],
                         data_types=field["data_type"],
+                        equivalentProperty=field["equivalentProperty"],
                         source=mlc.Source(
                             distribution=file.name,
                             extract=mlc.Extract(column=field["name"]),

editor/views/record_sets.py

@@ -193,13 +193,16 @@ def _handle_fields_change(record_set_key: int, record_set: RecordSet):
                 field.description = new_value
             elif new_field == FieldDataFrame.DATA_TYPE:
                 field.data_types = [str_to_mlc_data_type(new_value)]
+            elif new_field == FieldDataFrame.EQUIVALENT_PROPERTY:
+                field.equivalentProperty = new_value
     for added_row in result["added_rows"]:
         data_type = str_to_mlc_data_type(added_row.get(FieldDataFrame.DATA_TYPE))
         field = Field(
             id=added_row.get(FieldDataFrame.NAME),
             name=added_row.get(FieldDataFrame.NAME),
             description=added_row.get(FieldDataFrame.DESCRIPTION),
             data_types=[data_type],
+            equivalentProperty=added_row.get(FieldDataFrame.EQUIVALENT_PROPERTY),
             source=mlc.Source(),
             references=mlc.Source(),
         )
@@ -217,6 +220,7 @@ class FieldDataFrame:
     NAME = "Field name"
     DESCRIPTION = "Field description"
     DATA_TYPE = "Data type"
+    EQUIVALENT_PROPERTY = "Property IRI"
     SOURCE_UID = "Source"
     SOURCE_EXTRACT = "Source extract"
     SOURCE_TRANSFORM = "Source transform"
@@ -273,6 +277,19 @@ def _render_left_panel():
                 on_change=handle_record_set_change,
                 args=(RecordSetEvent.DESCRIPTION, record_set, key),
             )
+            key = f"{prefix}-datatypes"
+            st.text_input(
+                "Data types",
+                placeholder="Provide comma-separated data types for the RecordSet.",
+                help=(
+                    "Records in this set are instances of the corresponding data types"
+                    " (comma-separated)."
+                ),
+                key=key,
+                value=", ".join(record_set.data_types) if record_set.data_types else None,
+                on_change=handle_record_set_change,
+                args=(RecordSetEvent.DATA_TYPES, record_set, key),
+            )
             key = f"{prefix}-is-enumeration"
             st.checkbox(
                 "The RecordSet is an enumeration",
@@ -350,6 +367,9 @@ def _render_left_panel():
                     FieldDataFrame.NAME: names,
                     FieldDataFrame.DESCRIPTION: descriptions,
                     FieldDataFrame.DATA_TYPE: data_types,
+                    FieldDataFrame.EQUIVALENT_PROPERTY: [
+                        field.equivalentProperty for field in record_set.fields
+                    ],
                 },
                 dtype=np.str_,
             )
@@ -386,6 +406,11 @@ def _render_left_panel():
                         options=STR_DATA_TYPES,
                         required=True,
                     ),
+                    FieldDataFrame.EQUIVALENT_PROPERTY: st.column_config.TextColumn(
+                        FieldDataFrame.EQUIVALENT_PROPERTY,
+                        help="Equivalent property IRI for the field",
+                        required=False,
+                    ),
                 },
                 on_change=_handle_fields_change,
                 args=(record_set_key, record_set),
@@ -469,7 +494,7 @@ def _render_right_panel():
         else:
             for field_key, field in enumerate(record_set.fields):
                 prefix = f"{record_set_key}-{field.name}-{field_key}"
-                col1, col2, col3 = st.columns([1, 1, 1])
+                col1, col2, col3, col4 = st.columns([1, 1, 1, 1])
 
                 key = f"{prefix}-name"
                 if field.ctx.is_v0():
@@ -521,6 +546,16 @@ def _render_right_panel():
                     on_change=handle_field_change,
                     args=(FieldEvent.DATA_TYPE, field, key),
                 )
+                key = f"{prefix}-properties"
+                col4.text_input(
+                    "Property IRI",
+                    placeholder="Provide an equivalent property IRI for the RecordSet.",
+                    help="Equivalent property IRI describing the field.",
+                    key=key,
+                    on_change=handle_field_change,
+                    value=field.equivalentProperty,
+                    args=(FieldEvent.EQUIVALENT_PROPERTY, field, key),
+                )
                 possible_sources = _get_possible_sources(metadata)
                 render_source(record_set, field, possible_sources)
                 render_references(record_set, field, possible_sources)