induced_slot() now materializes non-scalar metaslots

Author: sujaypatil96

linkml_runtime/utils/schemaview.py

@@ -12,6 +12,7 @@
 from linkml_runtime.utils.namespaces import Namespaces
 from deprecated.classic import deprecated
 from linkml_runtime.utils.context_utils import parse_import_map, map_import
+from linkml_runtime.utils.formatutils import is_empty
 from linkml_runtime.utils.pattern import PatternResolver
 from linkml_runtime.linkml_model.meta import *
 from linkml_runtime.exceptions import OrderingError
@@ -1369,7 +1370,10 @@ def induced_slot(self, slot_name: SLOT_NAME, class_name: CLASS_NAME = None, impo
                         if v2 is not None:
                             v = COMBINE[metaslot_name](v, v2)
                     else:
-                        if v2 is not None:
+                        # can rewrite below as:
+                        # 1. if v2:
+                        # 2. if v2 is not None and ((isinstance(v2, (dict, list)) and v2) or (isinstance(v2, JsonObj) and as_dict(v2)))
+                        if not is_empty(v2):
                             v = v2
                             logging.debug(f'{v} takes precedence over {v2} for {induced_slot.name}.{metaslot_name}')
             if v is None:

tests/test_issues/input/linkml_issue_2224.yaml

@@ -0,0 +1,62 @@
+id: DJControllerSchema
+name: DJControllerSchema
+title: LinkML schema for my DJ controller
+imports:
+- linkml:types
+classes:
+  DJController:
+    slots:
+    - jog_wheels
+    - tempo
+    - volume_faders
+    - crossfaders
+    slot_usage:
+      tempo:
+        examples:
+        - value: 120.0
+        - value: 144.0
+        - value: 126.8
+        - value: 102.6
+        annotations:
+          expected_value: a number between 0 and 300
+          preferred_unit: BPM
+slots:
+  jog_wheels:
+    description: The number of jog wheels on the DJ controller
+    range: integer
+    examples:
+    - value: 2
+    annotations:
+      expected_value: an integer between 0 and 4
+    in_subset: decks
+  tempo:
+    description: The tempo of the track (in BPM)
+    range: float
+    examples:
+    - value: 120.0
+    - value: 144.0
+    annotations:
+      expected_value: a number between 0 and 200
+      preferred_unit: BPM
+    in_subset: decks
+  volume_faders:
+    description: The number of volume faders on the DJ controller
+    range: integer
+    examples:
+    - value: 4
+    annotations:
+      expected_value: an integer between 0 and 8
+    in_subset: mixer
+  crossfaders:
+    description: The number of crossfaders on the DJ controller
+    range: integer
+    examples:
+    - value: 1
+    annotations:
+      expected_value: an integer between 0 and 2
+    in_subset: mixer
+subsets:
+  decks:
+    description: A subset that represents the components in the deck portion of a DJ controller
+  mixer:
+    description: A subset that represents the components in the mixer portion of a DJ controller

tests/test_issues/test_issue_2224.py

@@ -0,0 +1,52 @@
+import unittest
+from unittest import TestCase
+from linkml_runtime.utils.schemaview import SchemaView
+from jsonasobj2 import JsonObj
+
+from tests.test_issues.environment import env
+
+
+class Issue2224TestCase(TestCase):
+    env = env
+
+    def test_issue_2224_slot_classes(self):
+        sv = SchemaView(env.input_path("linkml_issue_2224.yaml"))
+        cls = sv.induced_class("DJController")
+
+        # jog_wheels is a slot asserted at the schema level
+        # check that the range (scalar value) is being materialized properly
+        self.assertEqual(cls.attributes["jog_wheels"].range, "integer")
+        # check that the examples (list) is being materialized properly
+        self.assertIsInstance(cls.attributes["jog_wheels"].examples, list)
+        for example in cls.attributes["jog_wheels"].examples:
+            self.assertEqual(example.value, "2")
+        for example in cls.attributes["volume_faders"].examples:
+            self.assertEqual(example.value, "4")
+        for example in cls.attributes["crossfaders"].examples:
+            self.assertEqual(example.value, "1")
+        # check that the annotations (dictionary) is being materialized properly
+        self.assertIsInstance(cls.attributes["jog_wheels"].annotations, JsonObj)
+        self.assertEqual(
+            cls.attributes["jog_wheels"].annotations.expected_value.value,
+            "an integer between 0 and 4",
+        )
+        self.assertEqual(
+            cls.attributes["volume_faders"].annotations.expected_value.value,
+            "an integer between 0 and 8",
+        )
+
+        # examples being overriden by slot_usage modification
+        for example in cls.attributes["tempo"].examples:
+            self.assertIn(example.value, ["120.0", "144.0", "126.8", "102.6"])
+        # annotations being overriden by slot_usage modification
+        self.assertEqual(
+            cls.attributes["tempo"].annotations.expected_value.value,
+            "a number between 0 and 300",
+        )
+        self.assertEqual(
+            cls.attributes["tempo"].annotations.preferred_unit.value, "BPM"
+        )
+
+
+if __name__ == "__main__":
+    unittest.main()