ovld 0.5.7__py3-none-any.whl → 0.5.9__py3-none-any.whl

ovld/medley.py

@@ -164,7 +164,7 @@ class medley_cls_dict(dict):
         super().__setitem__(attr, value)
 
     def __setitem__(self, attr, value):
-        if attr == "__annotations__":
+        if attr == "__annotations__" or attr == "__annotate_func__":
             self.set_direct(attr, value)
             return
 
@@ -365,6 +365,7 @@ def meld_classes(classes):
     merged = medley_cls_dict(medleys)
     merged.set_direct("_ovld_codegen_fields", tuple(cg_fields))
     merged.set_direct("_ovld_medleys", tuple(medleys))
+    merged.set_direct("__annotations__", {name: t for name, t, f in dc_fields})
 
     if "__qualname__" in merged._combiners:
         del merged._combiners["__qualname__"]

ovld/mro.py

@@ -1,7 +1,7 @@
 from dataclasses import dataclass
 from enum import Enum
 from graphlib import TopologicalSorter
-from typing import get_args, get_origin
+from typing import Annotated, Any, get_args, get_origin
 
 from .utils import UnionTypes, is_dependent
 
@@ -52,6 +52,10 @@ def typeorder(t1, t2):
     """
     if t1 == t2:
         return Order.SAME
+    if t1 is Any:
+        return Order.MORE
+    if t2 is Any:
+        return Order.LESS
 
     if (
         hasattr(t1, "__type_order__")
@@ -67,14 +71,35 @@ def typeorder(t1, t2):
     o1 = get_origin(t1)
     o2 = get_origin(t2)
 
+    if o1 is Annotated and o2 is Annotated:
+        t1, *a1 = get_args(t1)
+        t2, *a2 = get_args(t2)
+        p1 = max([getattr(ann, "annotation_priority", 0) for ann in a1], default=0)
+        p2 = max([getattr(ann, "annotation_priority", 0) for ann in a2], default=0)
+        if p1 < p2:
+            return Order.MORE
+        elif p2 < p1:
+            return Order.LESS
+        else:
+            return typeorder(t1, t2)
+
+    if o1 is Annotated:
+        if t2 is Annotated:
+            return Order.LESS
+        return typeorder(get_args(t1)[0], t2)
+    if o2 is Annotated:
+        if t1 is Annotated:
+            return Order.MORE
+        return typeorder(t1, get_args(t2)[0])
+
     if o2 and not o1:
         return typeorder(t2, t1).opposite()
 
     if o1:
         if not o2:
             order = typeorder(o1, t2)
-            if order is order.SAME:
-                order = order.LESS
+            if order is Order.SAME:
+                order = Order.LESS
             return order
 
         if (order := typeorder(o1, o2)) is not Order.SAME:
@@ -93,6 +118,9 @@ def typeorder(t1, t2):
         ords = [typeorder(a1, a2) for a1, a2 in zip(args1, args2)]
         return Order.merge(ords)
 
+    if not isinstance(t1, type) or not isinstance(t2, type):  # pragma: no cover
+        return Order.SAME
+
     sx = issubclass(t1, t2)
     sy = issubclass(t2, t1)
     if sx and sy:  # pragma: no cover
@@ -106,9 +134,18 @@ def typeorder(t1, t2):
         return Order.NONE
 
 
+def _find_ann(main, others):
+    if main in others:
+        return True
+    elif isinstance(main, type):
+        return any(isinstance(x, main) for x in others)
+    else:
+        return False
+
+
 def subclasscheck(t1, t2):
     """Check whether t1 is a "subclass" of t2."""
-    if t1 == t2:
+    if t1 == t2 or t2 is Any:
         return True
 
     if (
@@ -134,12 +171,20 @@ def subclasscheck(t1, t2):
     o1 = get_origin(t1)
     o2 = get_origin(t2)
 
+    if o1 is Annotated and o2 is Annotated:
+        t1, *a1 = get_args(t1)
+        t2, *a2 = get_args(t2)
+        return subclasscheck(t1, t2) and any(_find_ann(main, a1) for main in a2)
+
+    if o1 is Annotated:
+        return t2 is Annotated
+
     if not isinstance(o1, type):
         o1 = None
     if not isinstance(o2, type):
         o2 = None
 
-    if o1 or o2:
+    if (o1 or o2) and o2 not in UnionTypes:
         o1 = o1 or t1
         o2 = o2 or t2
         if isinstance(o1, type) and isinstance(o2, type) and issubclass(o1, o2):

ovld/utils.py

@@ -199,6 +199,7 @@ _standard_instancechecks = {
     type(list[object]).__instancecheck__,
     ABCMeta.__instancecheck__,
     type(typing.Protocol).__instancecheck__,
+    type(typing.Any).__instancecheck__,
 }
 
 

ovld/version.py

@@ -1 +1 @@
-version = "0.5.7"
+version = "0.5.9"

{ovld-0.5.7.dist-info → ovld-0.5.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ovld
-Version: 0.5.7
+Version: 0.5.9
 Summary: Overloading Python functions
 Project-URL: Homepage, https://ovld.readthedocs.io/en/latest/
 Project-URL: Documentation, https://ovld.readthedocs.io/en/latest/

{ovld-0.5.7.dist-info → ovld-0.5.9.dist-info}/RECORD

@@ -3,16 +3,16 @@ ovld/abc.py,sha256=4qpZyYwI8dWgY1Oiv5FhdKg2uzNcyWxIpGmGJVcjXrs,1177
 ovld/codegen.py,sha256=27tmamlanuTPDT-x31ISyqP0wGKW9BCFZJGVyq9qLg8,9728
 ovld/core.py,sha256=WqZ1lvcAGSri02XZeY73Bj5AKB9RYBCAvHLbyns8u68,17792
 ovld/dependent.py,sha256=JIgsc_5ddPH51_2IrZ6JW6bWE5RyrrrOwR2e9UvDhZ4,8922
-ovld/medley.py,sha256=0fseIntzJRCPYXq-tmnxgy5ipNa4ZxR0D_6So0xstdQ,12729
-ovld/mro.py,sha256=Aw1r5Zz7V9cVBDwWzQ-WNnbpBwoGztgbw3wLAyS6Y60,4863
+ovld/medley.py,sha256=Pq6j4qPl8osyQ4Xp-ktnt2uJXytC9Jo70toS5LYHRf8,12840
+ovld/mro.py,sha256=-M-BFtmSSEZ39eMPpZ4c2xTAwE43zuJu_jtlxAEfuPo,6238
 ovld/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ovld/recode.py,sha256=vXg9XLExp_9LdAHO0JWR4wvwHhpOLu2Xcrg9ZYg1nms,16407
 ovld/signatures.py,sha256=Q8JucSOun0ESGx14aWtHtBzLEiM6FxY5HP3imyqXoDo,8984
 ovld/typemap.py,sha256=wkLuCc6xa2VZJOMaAhuYYgnNrywhovkQwbkBnoRfCsY,13985
 ovld/types.py,sha256=CRL6Vuzg5moXgAAhIj2698GvZoyF4HWbUDYz2hKt6us,13373
-ovld/utils.py,sha256=cyy9pcuMhmo1_UdPonH9JT6B9QlI4oH6_JK89cM3_gk,5046
-ovld/version.py,sha256=06EkKCZh0our2EHc5Ssv0FmkpTsQ75viNNVyU74k-Zg,18
-ovld-0.5.7.dist-info/METADATA,sha256=8kgc5SptJGDMMR4twLX9cB88rnMMC-GvuUn2Z8mCmgE,10458
-ovld-0.5.7.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-ovld-0.5.7.dist-info/licenses/LICENSE,sha256=cSwNTIzd1cbI89xt3PeZZYJP2y3j8Zus4bXgo4svpX8,1066
-ovld-0.5.7.dist-info/RECORD,,
+ovld/utils.py,sha256=8nvycMWpTmwGq7ojjDA7yi2NdkU78NBdUlvRk_vDECY,5086
+ovld/version.py,sha256=fa8mYJ1rRpnvSWOBQjwJEtqO9AqOw8j-QGkxIJqUaM0,18
+ovld-0.5.9.dist-info/METADATA,sha256=7TIVCS1fVm0Oq7GcG5KR9JRNWQa6JkM-c6euVUu3e6g,10458
+ovld-0.5.9.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+ovld-0.5.9.dist-info/licenses/LICENSE,sha256=cSwNTIzd1cbI89xt3PeZZYJP2y3j8Zus4bXgo4svpX8,1066
+ovld-0.5.9.dist-info/RECORD,,