fix pydantic support

pyproject.toml

@@ -54,6 +54,7 @@ pytest-github-actions-annotate-failures = "*"
 pytest-cov = "*"
 python-kacl = "*"
 ruff = ">=0.2.0"
+pydantic = "*"
 
 [build-system]
 requires = ["poetry-core>=1.0.0"]

src/magic_di/_container.py

@@ -95,24 +95,15 @@ def new(_: Any) -> T:
     #   >>> injected_redis()  # works
     #   >>> injected_redis(timeout=10)  # doesn't work
     #
-    # Here we manually create a new class using the `type` metaclass
-    # to prevent possible overrides of it.
-    # We copy all object attributes (__dict__)
-    # so that upon inspection,
-    # the class should look exactly like the wrapped class.
-    # However, we override the __new__ method
-    # to return an instance of the original class.
+    # Here we manually create a new singleton class factory using the `type` metaclass
     # Since the original class was not modified, it will use its own metaclass.
     return functools.wraps(
         obj,
         updated=(),
     )(
         type(
             obj.__name__,
-            (obj,),
-            {
-                **obj.__dict__,
-                "__new__": new,
-            },
+            (),
+            {"__new__": new},
         ),
     )

src/magic_di/_injector.py

@@ -150,7 +150,7 @@ async def connect(self) -> None:
             self.inject(postponed)
 
         for cls, instance in self._deps.iter_instances():
-            if is_injectable(cls):
+            if is_injectable(instance):
                 self.logger.debug("Connecting %s...", cls.__name__)
                 await instance.__connect__()
 
@@ -159,7 +159,7 @@ async def disconnect(self) -> None:
         Disconnect all injected dependencies
         """
         for cls, instance in self._deps.iter_instances(reverse=True):
-            if is_injectable(cls):
+            if is_injectable(instance):
                 try:
                     await instance.__disconnect__()
                 except Exception:

src/magic_di/_utils.py

@@ -66,6 +66,13 @@ def safe_is_subclass(sub_cls: Any, cls: type) -> bool:
         return False
 
 
+def safe_is_instance(sub_cls: Any, cls: type) -> bool:
+    try:
+        return isinstance(sub_cls, cls)
+    except TypeError:
+        return False
+
+
 def is_injectable(cls: Any) -> bool:
     """
     Check if a class is a subclass of ConnectableProtocol.
@@ -76,7 +83,7 @@ def is_injectable(cls: Any) -> bool:
     Returns:
         bool: True if the class is a subclass of ConnectableProtocol, False otherwise.
     """
-    return safe_is_subclass(cls, ConnectableProtocol)
+    return safe_is_subclass(cls, ConnectableProtocol) or safe_is_instance(cls, ConnectableProtocol)
 
 
 def get_type_hints(obj: Any, *, include_extras: bool = False) -> dict[str, type]:

tests/test_injector.py

@@ -155,3 +155,14 @@ class ServiceWithNonConnectable:
 
     injected = injector.inject(ServiceWithNonConnectable)()
     assert isinstance(injected.db, NonConnectableDatabase)
+
+
+def test_injector_pydantic_metaclass_doesnt_break(injector: DependencyInjector) -> None:
+    from pydantic import BaseModel
+
+    class PydanticClass(BaseModel, Connectable):
+        var: int = 1
+
+    injected = injector.inject(PydanticClass)()
+    assert isinstance(injected, PydanticClass)
+    assert injected.var == 1