feat(stubs): accept generic package type in stub manifest

Signed-off-by: Braden Mars <bradenmars@bradenmars.me>

micropy/stubs/__init__.py

@@ -8,7 +8,7 @@
 
 from . import source
 from .manifest import StubsManifest
-from .package import StubPackage
+from .package import AnyStubPackage, StubPackage
 from .repo import StubRepository
 from .repo_package import StubRepositoryPackage
 from .repositories import MicropyStubPackage, MicropythonStubsManifest, MicropythonStubsPackage
@@ -20,6 +20,7 @@
     "source",
     "StubsManifest",
     "StubPackage",
+    "AnyStubPackage",
     "StubRepository",
     "MicropyStubPackage",
     "MicropythonStubsPackage",

micropy/stubs/manifest.py

@@ -1,18 +1,22 @@
 from __future__ import annotations
 
 import abc
+from typing import Generic
 
-from micropy.stubs.package import StubPackage
+from micropy.stubs.package import AnyStubPackage, StubPackage
 from micropy.stubs.repository_info import RepositoryInfo
-from pydantic import BaseModel
+from pydantic import Field
+from pydantic.generics import GenericModel
+from typing_extensions import Annotated
 
 
-class StubsManifest(BaseModel, abc.ABC):
+class StubsManifest(GenericModel, Generic[AnyStubPackage], abc.ABC):
+
     class Config:
         frozen = True
 
     repository: RepositoryInfo
-    packages: frozenset[StubPackage]
+    packages: Annotated[frozenset[AnyStubPackage], Field(repr=False)]
 
     @abc.abstractmethod
     def resolve_package_url(self, package: StubPackage) -> str:

micropy/stubs/package.py

@@ -1,15 +1,22 @@
 from __future__ import annotations
 
+from typing import TypeVar
+
 from pydantic import BaseModel
 
 
 class StubPackage(BaseModel):
+
     class Config:
         frozen = True
+        allow_population_by_field_name = True
 
     name: str
     version: str
 
     @property
     def package_name(self) -> str:
         return self.name
+
+
+AnyStubPackage = TypeVar("AnyStubPackage", bound=StubPackage)

micropy/stubs/repo_package.py

@@ -8,7 +8,7 @@
 
 @attrs.frozen
 class StubRepositoryPackage:
-    manifest: StubsManifest
+    manifest: StubsManifest[StubPackage]
     package: StubPackage
 
     @property

micropy/stubs/repositories/micropy.py

@@ -15,10 +15,9 @@ class MicropyStubPackage(StubPackage):
     version: Annotated[str, Field(alias="sha256sum")]
 
 
-class MicropyStubsManifest(StubsManifest):
+class MicropyStubsManifest(StubsManifest[MicropyStubPackage]):
     location: str
     path: str
-    packages: frozenset[MicropyStubPackage]
 
     @root_validator(pre=True)
     def check(cls, values: dict):

micropy/stubs/repositories/micropython.py

@@ -18,10 +18,10 @@ class MicropythonStubsPackage(StubPackage):
     version: Annotated[str, Field(alias="pkg_version")]
 
 
-class MicropythonStubsManifest(StubsManifest):
 
-    packages: frozenset[MicropythonStubsPackage]
 
+
+class MicropythonStubsManifest(StubsManifest[MicropythonStubsPackage]):
     @validator("packages", pre=True)
     def _get_packages(cls, v: dict[str, dict]):
         data = v["data"].values()