Pass everything.

Author: superdosh

src/modelbench/record.py

@@ -103,8 +103,9 @@ def default(self, o):
                 del result["_scoring_log"]
             return result
         elif isinstance(o, BenchmarkDefinition):
-            benchmark_version = o.get_uid_part("version")
-            return {"uid": o.uid, "hazards": o.hazards(), "version": benchmark_version}
+            def_dict = {"uid": o.uid, "hazards": o.hazards()}
+            def_dict.update(o.uid_dict)
+            return def_dict
         elif isinstance(o, HazardDefinition):
             result = {"uid": o.uid, "reference_standard": o.reference_standard()}
             if o._tests:

src/modelbench/uid.py

@@ -45,8 +45,13 @@ def __init__(self):
     This object's UID would be "ice_cream-chocolate"
     """
 
-    @staticmethod
-    def _render_uid(self, uid_def):
+    @property
+    def uid_definition(self) -> dict:
+        if not hasattr(self.__class__, "_uid_definition"):
+            raise AttributeError("classes with HasUid must define _uid_definition")
+        return self.__class__._uid_definition
+
+    def _as_string(self, k, o):
         def clean_string(s):
             if isinstance(s, Enum):
                 s = s.value.lower()
@@ -56,38 +61,25 @@ def clean_string(s):
             else:
                 return s
 
-        def as_string(k, o):
-            if k == "class" and o == "self":
-                return clean_string(self.__class__.__name__)
-            if isinstance(o, type):
-                return clean_string(o.__name__)
-            if isinstance(o, classmethod):
-                return clean_string(str(o.__wrapped__(self.__class__)))
-            if callable(o):
-                return clean_string(str(o(self)))
-            if o.startswith("self."):
-                return clean_string(self.__getattribute__(o[5:]))
-            return clean_string(str(o))
-
-        return "-".join(as_string(k, v) for k, v in uid_def.items())
+        if k == "class" and o == "self":
+            return clean_string(self.__class__.__name__)
+        if isinstance(o, type):
+            return clean_string(o.__name__)
+        if isinstance(o, classmethod):
+            return clean_string(str(o.__wrapped__(self.__class__)))
+        if callable(o):
+            return clean_string(str(o(self)))
+        if o.startswith("self."):
+            return clean_string(self.__getattribute__(o[5:]))
+        return clean_string(str(o))
 
     @property
-    def uid(self):
-        if not hasattr(self.__class__, "_uid_definition"):
-            raise AttributeError("classes with HasUid must define _uid_definition")
+    def uid(self) -> str:
+        return "-".join(self._as_string(k, v) for k, v in self.uid_definition.items())
 
-        return HasUid._render_uid(self, self.__class__._uid_definition)
-
-    def get_uid_part(self, part_name: str) -> str:
-        """Gets string-rendered value of a specific part of the UID."""
-        if not hasattr(self.__class__, "_uid_definition"):
-            raise AttributeError("classes with HasUid must define _uid_definition")
-
-        uid_def = self.__class__._uid_definition
-        if part_name not in uid_def:
-            raise KeyError(f"part name {part_name} not found in _uid_definition")
-
-        return HasUid._render_uid(self, {part_name: uid_def[part_name]})
+    @property
+    def uid_dict(self) -> dict:
+        return {k: self._as_string(k, v) for k, v in self.uid_definition.items()}
 
     def __str__(self):
         return f"{self.__class__.__name__}({self.uid})"

tests/modelbench_tests/test_record.py

@@ -190,6 +190,7 @@ def test_general_benchmark_definition():
     j = encode_and_parse(GeneralPurposeAiChatBenchmarkV1(locale=EN_US, prompt_set="practice"))
     assert j["uid"] == "general_purpose_ai_chat_benchmark-1.1-en_us-practice-default"
     assert j["version"] == "1.1"
+    assert j["prompt_set"] == "practice"
     assert "safe_hazard-1.1-cse-en_us-practice" in [i["uid"] for i in j["hazards"]]