review

Author: lucascolley

Diff for: src/metrology_apis/__init__.py

@@ -9,32 +9,23 @@
 
 
 @runtime_checkable
-class MetrologyNamespace[Q: Quantity, U: Unit, D: Dimension](Protocol):
+class MetrologyNamespace[Q: Quantity[V, U, D], V, U: Unit[D], D: Dimension](Protocol):
 
     @staticmethod
     def asdimension(obj: str | D) -> D: ...
 
     @staticmethod
-    def asunit(obj) -> U[D]: ...
+    def asunit(obj: str | U) -> U: ...
 
     @staticmethod
-    def asquantity(obj: V, unit: obj) -> Q[V, U[D]]: ...
-
-    @property
-    def Dimension(self) -> D: ...
-
-    @property
-    def Unit(self) -> U: ...
-
-    @property
-    def Quantity(self) -> Q: ...
+    def asquantity(obj: Q | V, *, unit: U) -> Q: ...
 
 
 @runtime_checkable
 class Dimension(Protocol):
-    def __metrology_namespace__(
+    def __metrology_namespace__[Q: Quantity, U: Unit](
         self, /, *, api_version: str | None = None
-    ) -> MetrologyNamespace:
+    ) -> MetrologyNamespace[Q, U, Self]:
         """
         Returns an object that has all the metrology API functions on it.
         Parameters
@@ -59,10 +50,10 @@ def __ne__(self, other: Self, /) -> bool: ...
 
 
 @runtime_checkable
-class Unit(Protocol):
-    def __metrology_namespace__(
+class Unit[D: Dimension](Protocol):
+    def __metrology_namespace__[Q: Quantity](
         self, /, *, api_version: str | None = None
-    ) -> MetrologyNamespace:
+    ) -> MetrologyNamespace[Q, Self, D]:
         """
         Returns an object that has all the metrology API functions on it.
         Parameters
@@ -76,7 +67,7 @@ def __metrology_namespace__(
         """
 
     @property
-    def dimension(self) -> Dimension: ...
+    def dimension(self) -> D: ...
 
     def __mul__(self, other: Self, /) -> Self: ...
     def __truediv__(self, other: Self, /) -> Self: ...
@@ -88,10 +79,10 @@ def __rpow__(self, other: int | float, /) -> Self: ...
 
 
 @runtime_checkable
-class Quantity[V, U: Unit](Protocol):
+class Quantity[V, U: Unit[D], D: Dimension](Protocol):
     def __metrology_namespace__(
         self, /, *, api_version: str | None = None
-    ) -> MetrologyNamespace:
+    ) -> MetrologyNamespace[Self, U, D]:
         """
         Returns an object that has all the metrology API functions on it.
         Parameters