Rebase on latest main and fixes for unit and integration tests

Signed-off-by: Mark Kurtz <[email protected]>

Author: markurtz

src/speculators/convert/eagle/__init__.py

@@ -1,7 +1,8 @@
 """
-Eagle-1 and Eagle-3 checkpoint conversion utilities.
+EAGLE v1, EAGLE v2, EAGLE v3, and HASS checkpoint conversion utilities.
 """
 
+from speculators.convert.eagle.eagle3_converter import Eagle3Converter
 from speculators.convert.eagle.eagle_converter import EagleConverter
 
-__all__ = ["EagleConverter"]
+__all__ = ["Eagle3Converter", "EagleConverter"]

src/speculators/convert/eagle/eagle3_converter.py

@@ -18,6 +18,8 @@
 from speculators.models.eagle3 import Eagle3Speculator, Eagle3SpeculatorConfig
 from speculators.proposals.greedy import GreedyTokenProposalConfig
 
+__all__ = ["Eagle3Converter"]
+
 
 class Eagle3Converter:
     """

src/speculators/convert/eagle/eagle_converter.py

@@ -19,6 +19,8 @@
 from speculators.models.eagle import EagleSpeculator, EagleSpeculatorConfig
 from speculators.proposals.greedy import GreedyTokenProposalConfig
 
+__all__ = ["EagleConverter"]
+
 
 class EagleConverter:
     """

src/speculators/utils/auto_importer.py

@@ -8,12 +8,10 @@
 discovered when placed in the correct package structure.
 """
 
-from __future__ import annotations
-
 import importlib
 import pkgutil
 import sys
-from typing import ClassVar
+from typing import ClassVar, Union
 
 __all__ = ["AutoImporterMixin"]
 
@@ -41,9 +39,9 @@ class MyRegistry(AutoImporterMixin):
     :cvar auto_imported_modules: List tracking which modules have been imported
     """
 
-    auto_package: ClassVar[str | tuple[str, ...] | None] = None
-    auto_ignore_modules: ClassVar[tuple[str, ...] | None] = None
-    auto_imported_modules: ClassVar[list[str] | None] = None
+    auto_package: ClassVar[Union[str, tuple[str, ...], None]] = None
+    auto_ignore_modules: ClassVar[Union[tuple[str, ...], None]] = None
+    auto_imported_modules: ClassVar[Union[list[str], None]] = None
 
     @classmethod
     def auto_import_package_modules(cls) -> None:

src/speculators/utils/registry.py

@@ -10,7 +10,7 @@
 
 from __future__ import annotations
 
-from typing import Callable, ClassVar, Generic, TypeVar, cast
+from typing import Callable, ClassVar, Generic, TypeVar, Union, cast
 
 from speculators.utils.auto_importer import AutoImporterMixin
 
@@ -62,7 +62,7 @@ class TokenProposal(RegistryMixin):
     :cvar registry_populated: Track whether auto-discovery has completed
     """
 
-    registry: ClassVar[dict[str, RegistryObjT] | None] = None  # type: ignore[misc]
+    registry: ClassVar[Union[dict[str, RegistryObjT], None]] = None  # type: ignore[misc]  # noqa: UP007
     registry_auto_discovery: ClassVar[bool] = False
     registry_populated: ClassVar[bool] = False
 

tests/unit/convert/test_eagle_utils.py

@@ -93,7 +93,7 @@ def test_download_with_cache_dir(self, mock_download, tmp_path):
         ensure_checkpoint_is_local("test-model/checkpoint", cache_dir=cache_dir)
 
         mock_download.assert_called_once_with(
-            model_id="test-model/checkpoint", cache_dir=cache_dir
+            model_id="test-model/checkpoint", cache_dir=str(cache_dir)
         )