Merge branch 'dev-3.x' into refactor-weight-conversion

Author: bryce13950

docs/make_docs.py

@@ -7,7 +7,7 @@
 
 import pandas as pd
 
-from transformer_lens import loading
+from transformer_lens import loading, supported_models
 
 # Docs Directories
 CURRENT_DIR = Path(__file__).parent
@@ -94,10 +94,13 @@ def generate_model_table(_app: Optional[Any] = None):
     ]
     df = pd.DataFrame(
         {
-            name: [get_property(name, model_name) for model_name in loading.DEFAULT_MODEL_ALIASES]
+            name: [
+                get_property(name, model_name)
+                for model_name in supported_models.DEFAULT_MODEL_ALIASES
+            ]
             for name in column_names
         },
-        index=loading.DEFAULT_MODEL_ALIASES,
+        index=supported_models.DEFAULT_MODEL_ALIASES,
     )
 
     # Convert to markdown (with a title)

tests/unit/test_supported_models.py

@@ -0,0 +1,18 @@
+from transformer_lens.supported_models import MODEL_ALIASES, OFFICIAL_MODEL_NAMES
+
+
+def test_official_model_names_is_alphabetical():
+    assert OFFICIAL_MODEL_NAMES == sorted(
+        OFFICIAL_MODEL_NAMES, key=str.casefold
+    ), "OFFICIAL_MODEL_NAMES are not alphabetical"
+
+
+def test_model_aliases_is_alphabetical():
+    # Extract the keys as they appear in the dictionary
+    actual_keys = list(MODEL_ALIASES.keys())
+
+    # Create a sorted version, ignoring case
+    expected_keys = sorted(actual_keys, key=str.casefold)
+
+    # Compare the actual insertion order to the expected alphabetical order
+    assert actual_keys == expected_keys, "MODEL_ALIASES keys are not in alphabetical order. "

transformer_lens/__init__.py

@@ -1,3 +1,4 @@
+from . import supported_models
 from . import utilities
 from . import hook_points
 from . import evals