extendable 1.2.1__tar.gz → 1.3.0__tar.gz

{extendable-1.2.1 → extendable-1.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: extendable
-Version: 1.2.1
+Version: 1.3.0
 Summary: A lib to define class extendable at runtime.
 Author-email: Laurent Mignon <laurent.mignon@acsone.eu>
 Requires-Python: >=3.6
@@ -8,6 +8,7 @@ Description-Content-Type: text/markdown
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Intended Audience :: Developers
 Classifier: Operating System :: OS Independent
+License-File: LICENSE
 Requires-Dist: contextvars;python_version<'3.7'
 Requires-Dist: types-contextvars;python_version<'3.7'
 Requires-Dist: typing_extensions;python_version<'3.7'

{extendable-1.2.1 → extendable-1.3.0}/src/extendable/main.py

@@ -24,6 +24,7 @@ if TYPE_CHECKING:
 class ExtendableClassDef:
     name: str
     base_names: List[str]
+    original_base_names: List[str]
     namespace: Dict[str, Any]
     original_name: str
     others_bases: List[Any]
@@ -44,7 +45,8 @@ class ExtendableClassDef:
         self.name = namespace["__xreg_name__"]
         self.original_name = original_name
         self.others_bases = bases
-        self.base_names = namespace["__xreg_base_names__"] or []
+        self.base_names = namespace["__xreg_base_names__"].copy() or []
+        self.original_base_names = self.base_names.copy()
         self.hierarchy = [self]
         self.metaclass = metaclass
         self.kwargs = kwargs
@@ -85,9 +87,9 @@ class ExtendableClassDef:
         return clone
 
 
-_extendable_class_defs_by_module: OrderedDict[
-    str, List[ExtendableClassDef]
-] = collections.OrderedDict()
+_extendable_class_defs_by_module: OrderedDict[str, List[ExtendableClassDef]] = (
+    collections.OrderedDict()
+)
 
 
 def __register_class_def__(module: str, cls_def: ExtendableClassDef) -> None:
@@ -106,7 +108,7 @@ class ExtendableMeta(ABCMeta):
 
     @no_type_check
     def __new__(metacls, name, bases, namespace, extends=None, **kwargs):
-        """create the expected class and collect the class definition that will be used
+        """Create the expected class and collect the class definition that will be used
         at the end of registry load process to build the final class."""
         class_def = None
         if isinstance(extends, bool) and extends:
@@ -249,6 +251,18 @@ class ExtendableMeta(ABCMeta):
     ###############################################################
     # concrete methods provided to the final class by the metaclass
     ###############################################################
+    def __instancecheck__(self, instance: Any) -> bool:  # noqa: B902
+        """Implement issubclass(sub, cls)."""
+        if not hasattr(instance, "__xreg_name__"):
+            return False
+
+        if instance.__xreg_name__ == self.__xreg_name__:
+            # this is the same class
+            return True
+        # self is a class and instance is an instance of a class
+        if self.__xreg_name__ in instance.__xreg_all_base_names__:
+            return True
+        return super().__instancecheck__(instance)
 
     def __subclasscheck__(cls, subclass: Any) -> bool:  # noqa: B902
         """Implement issubclass(sub, cls)."""

{extendable-1.2.1 → extendable-1.3.0}/src/extendable/registry.py

@@ -8,8 +8,9 @@ from .utils import LastOrderedSet
 
 
 class ExtendableRegistryListener:
-    def on_registry_initialized(self, registry: "ExtendableClassesRegistry") -> None:
-        ...
+    def on_registry_initialized(
+        self, registry: "ExtendableClassesRegistry"
+    ) -> None: ...
 
     def before_init_registry(
         self,
@@ -121,13 +122,18 @@ class ExtendableClassesRegistry:
             # determine all the classes the component should inherit from
             bases = LastOrderedSet[main.ExtendableMeta]()
             for base_name in cls_def.base_names:
+                # the base_names contains all the bases for the final aggregated
+                # class. Here we check that all the base required to build the
+                # current hierarchy are already build.
                 if base_name not in self:
                     if idx != 0 or base_name != cls_def.name:
                         raise TypeError(
                             f"Pydnatic class '{name}' extends an non-existing "
                             f"extendable class '{base_name}'."
                         )
-                else:
+                elif base_name in cls_def.original_base_names:
+                    # The bases to inherit for the current class are the one
+                    # defined into the original class definition.
                     parent_class = self[base_name]
                     bases.add(parent_class)
             for other_base in class_def.others_bases:

extendable-1.3.0/src/extendable/version.py

@@ -0,0 +1 @@
+__version__ = "1.3.0"

extendable-1.2.1/src/extendable/version.py

@@ -1 +0,0 @@
-__version__ = "1.2.1"