sqla-fancy-core 1.1.0__py3-none-any.whl → 1.1.2__py3-none-any.whl

sqla_fancy_core/decorators.py

@@ -7,7 +7,9 @@ from typing import Union, overload
 import sqlalchemy as sa
 from sqlalchemy.ext.asyncio import AsyncConnection, AsyncEngine
 
-EngineType = Union[sa.engine.Engine, AsyncEngine]
+from sqla_fancy_core.wrappers import AsyncFancyEngineWrapper, FancyEngineWrapper
+
+EngineType = Union[sa.Engine, AsyncEngine, FancyEngineWrapper, AsyncFancyEngineWrapper]
 
 
 class _Injectable:
@@ -16,9 +18,9 @@ class _Injectable:
 
 
 @overload
-def Inject(engine: sa.Engine) -> sa.Connection: ...
+def Inject(engine: Union[sa.Engine, FancyEngineWrapper]) -> sa.Connection: ...
 @overload
-def Inject(engine: AsyncEngine) -> AsyncConnection: ...
+def Inject(engine: Union[AsyncEngine, AsyncFancyEngineWrapper]) -> AsyncConnection: ...
 def Inject(engine: EngineType):  # type: ignore
     """A marker class for dependency injection."""
     return _Injectable(engine)
@@ -44,7 +46,6 @@ def transact(func):
             create_user(name="existing", conn=conn)
     """
 
-    # Find the parameter with value Inject
     sig = inspect.signature(func)
     inject_param_name = None
     for name, param in sig.parameters.items():
@@ -56,8 +57,21 @@ def transact(func):
     if inject_param_name is None:
         return func  # No injection needed
 
-    engine = sig.parameters[inject_param_name].default.engine
-    is_async = isinstance(engine, AsyncEngine)
+    engine_arg = sig.parameters[inject_param_name].default.engine
+    if isinstance(engine_arg, sa.Engine):
+        is_async = False
+        engine = engine_arg
+    elif isinstance(engine_arg, FancyEngineWrapper):
+        is_async = False
+        engine = engine_arg.engine
+    elif isinstance(engine_arg, AsyncEngine):
+        is_async = True
+        engine = engine_arg
+    elif isinstance(engine_arg, AsyncFancyEngineWrapper):
+        is_async = True
+        engine = engine_arg.engine
+    else:
+        raise TypeError("Unsupported engine type")
 
     if is_async:
 
@@ -70,8 +84,14 @@ def transact(func):
                 else:
                     async with conn.begin():
                         return await func(*args, **kwargs)
+            elif isinstance(conn, sa.Connection):
+                if conn.in_transaction():
+                    return await func(*args, **kwargs)
+                else:
+                    with conn.begin():
+                        return await func(*args, **kwargs)
             else:
-                async with engine.begin() as conn:
+                async with engine.begin() as conn:  # type: ignore
                     kwargs[inject_param_name] = conn
                     return await func(*args, **kwargs)
 
@@ -88,8 +108,10 @@ def transact(func):
                 else:
                     with conn.begin():
                         return func(*args, **kwargs)
+            elif isinstance(conn, AsyncConnection):
+                raise TypeError("AsyncConnection cannot be used in sync function")
             else:
-                with engine.begin() as conn:
+                with engine.begin() as conn:  # type: ignore
                     kwargs[inject_param_name] = conn
                     return func(*args, **kwargs)
 
@@ -116,7 +138,6 @@ def connect(func):
             count = get_user_count(conn)
     """
 
-    # Find the parameter with value Inject
     sig = inspect.signature(func)
     inject_param_name = None
     for name, param in sig.parameters.items():
@@ -128,18 +149,31 @@ def connect(func):
     if inject_param_name is None:
         return func  # No injection needed
 
-    engine = sig.parameters[inject_param_name].default.engine
-    is_async = isinstance(engine, AsyncEngine)
+    engine_arg = sig.parameters[inject_param_name].default.engine
+    if isinstance(engine_arg, sa.Engine):
+        is_async = False
+        engine = engine_arg
+    elif isinstance(engine_arg, FancyEngineWrapper):
+        is_async = False
+        engine = engine_arg.engine
+    elif isinstance(engine_arg, AsyncEngine):
+        is_async = True
+        engine = engine_arg
+    elif isinstance(engine_arg, AsyncFancyEngineWrapper):
+        is_async = True
+        engine = engine_arg.engine
+    else:
+        raise TypeError("Unsupported engine type")
 
     if is_async:
 
         @functools.wraps(func)
         async def async_wrapper(*args, **kwargs):
             conn = kwargs.get(inject_param_name)
-            if isinstance(conn, AsyncConnection):
+            if isinstance(conn, (AsyncConnection, sa.Connection)):
                 return await func(*args, **kwargs)
             else:
-                async with engine.connect() as conn:
+                async with engine.connect() as conn:  # type: ignore
                     kwargs[inject_param_name] = conn
                     return await func(*args, **kwargs)
 
@@ -152,8 +186,10 @@ def connect(func):
             conn = kwargs.get(inject_param_name)
             if isinstance(conn, sa.Connection):
                 return func(*args, **kwargs)
+            elif isinstance(conn, AsyncConnection):
+                raise TypeError("AsyncConnection cannot be used in sync function")
             else:
-                with engine.connect() as conn:
+                with engine.connect() as conn:  # type: ignore
                     kwargs[inject_param_name] = conn
                     return func(*args, **kwargs)
 

{sqla_fancy_core-1.1.0.dist-info → sqla_fancy_core-1.1.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sqla-fancy-core
-Version: 1.1.0
+Version: 1.1.2
 Summary: SQLAlchemy core, but fancier
 Project-URL: Homepage, https://github.com/sayanarijit/sqla-fancy-core
 Author-email: Arijit Basu <sayanarijit@gmail.com>
@@ -242,27 +242,24 @@ users = sa.Table(
 )
 metadata.create_all(engine)
 
-# 1) Ensure a connection is available (no implicit transaction)
 @connect
 def get_user_count(conn=Inject(engine)):
     return conn.execute(sa.select(sa.func.count()).select_from(users)).scalar_one()
 
 assert get_user_count() == 0
 
-# 2) Wrap in a transaction automatically
 @transact
 def create_user(name: str, conn=Inject(engine)):
     conn.execute(sa.insert(users).values(name=name))
 
+# Without an explicit transaction
 create_user("alice")
 assert get_user_count() == 1
 
-# 3) Reuse an explicit connection or transaction
+# With an explicit transaction
 with engine.begin() as txn:
     create_user("bob", conn=txn)
     assert get_user_count(conn=txn) == 2
-
-assert get_user_count() == 2
 ```
 
 ### Async examples
@@ -293,10 +290,12 @@ async def get_user_count(conn=Inject(engine)):
 async def create_user(name: str, conn=Inject(engine)):
     await conn.execute(sa.insert(users).values(name=name))
 
+# Without an explicit transaction
 assert await get_user_count() == 0
 await create_user("carol")
 assert await get_user_count() == 1
 
+# With an explicit transaction
 async with engine.connect() as conn:
     await create_user("dave", conn=conn)
     assert await get_user_count(conn=conn) == 2

sqla_fancy_core-1.1.2.dist-info/RECORD

@@ -0,0 +1,8 @@
+sqla_fancy_core/__init__.py,sha256=iCfZrKbdoAG65CeHGducjiA1p4zYLgFSrxGDzQEhM8U,256
+sqla_fancy_core/decorators.py,sha256=VhkYf5x6qwcQnc8QCuUzKPQxMI3tNNGM7nVSPUqMkPw,6649
+sqla_fancy_core/factories.py,sha256=EgOhc15rCo9GyIuSNhuoB1pJ6lXx_UtRR5y9hh2lEtM,6326
+sqla_fancy_core/wrappers.py,sha256=TesGKm9ddsd7dJwbkonZPl46Huvqeh7AfUwB623qRwA,8165
+sqla_fancy_core-1.1.2.dist-info/METADATA,sha256=dWdZEq6fwzkvrK9zoYpAdh5QQLtMd1lc5NATrp2-1Yo,14419
+sqla_fancy_core-1.1.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+sqla_fancy_core-1.1.2.dist-info/licenses/LICENSE,sha256=XcYXJ0ipvwOn-nzko6p_xoCCbke8tAhmlIN04rUZDLk,1068
+sqla_fancy_core-1.1.2.dist-info/RECORD,,

sqla_fancy_core-1.1.0.dist-info/RECORD

@@ -1,8 +0,0 @@
-sqla_fancy_core/__init__.py,sha256=iCfZrKbdoAG65CeHGducjiA1p4zYLgFSrxGDzQEhM8U,256
-sqla_fancy_core/decorators.py,sha256=0UlOL2MUAJq3Rv3hE7mLspvrZDX16f2pm_yh1mLgQWQ,5056
-sqla_fancy_core/factories.py,sha256=EgOhc15rCo9GyIuSNhuoB1pJ6lXx_UtRR5y9hh2lEtM,6326
-sqla_fancy_core/wrappers.py,sha256=TesGKm9ddsd7dJwbkonZPl46Huvqeh7AfUwB623qRwA,8165
-sqla_fancy_core-1.1.0.dist-info/METADATA,sha256=1imY4gioOlMMTxS3GBit_-eUSGz71_ArMl9D7WWMxxU,14473
-sqla_fancy_core-1.1.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-sqla_fancy_core-1.1.0.dist-info/licenses/LICENSE,sha256=XcYXJ0ipvwOn-nzko6p_xoCCbke8tAhmlIN04rUZDLk,1068
-sqla_fancy_core-1.1.0.dist-info/RECORD,,