fixturify 0.1.10__tar.gz → 0.1.12__tar.gz

{fixturify-0.1.10 → fixturify-0.1.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fixturify
-Version: 0.1.10
+Version: 0.1.12
 Summary: A collection of convenient testing utilities for Python
 Project-URL: Homepage, https://github.com/eleven-sea/pytools
 Project-URL: Repository, https://github.com/eleven-sea/pytools

{fixturify-0.1.10 → fixturify-0.1.12}/docker-compose.yml

@@ -18,11 +18,11 @@ services:
     environment:
       - POSTGRES_USER=postgres
       - POSTGRES_PASSWORD=postgres
-      - POSTGRES_DB=pytools
+      - POSTGRES_DB=fixturify
     volumes:
       - postgres_data:/var/lib/postgresql/data
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U postgres -d pytools"]
+      test: ["CMD-SHELL", "pg_isready -U postgres -d fixturify"]
       interval: 5s
       timeout: 5s
       retries: 5
@@ -33,7 +33,7 @@ services:
       - "3306:3306"
     environment:
       - MYSQL_ALLOW_EMPTY_PASSWORD=yes
-      - MYSQL_DATABASE=pytools
+      - MYSQL_DATABASE=fixturify
     volumes:
       - mysql_data:/var/lib/mysql
     healthcheck:

{fixturify-0.1.10 → fixturify-0.1.12}/fixturify/__init__.py

@@ -1,6 +1,6 @@
 """PyTools - A collection of reusable Python utility modules."""
 
-__version__ = "0.1.10"
+__version__ = "0.1.12"
 
 from fixturify.sql_d import sql, Phase, SqlTestConfig
 from fixturify.read_d import read

{fixturify-0.1.10 → fixturify-0.1.12}/fixturify/http_d/_recorder.py

@@ -811,10 +811,36 @@ def create_response_from_http_client(
     Returns:
         HttpResponse model
     """
+    import gzip
+    import zlib
+
     headers = dict(response.getheaders()) if hasattr(response, "getheaders") else {}
     content_type = headers.get("content-type", headers.get("Content-Type", ""))
+    content_encoding = headers.get(
+        "content-encoding", headers.get("Content-Encoding", "")
+    ).lower()
 
     body_bytes = response.read()
+
+    # Decompress if needed (http.client doesn't auto-decompress)
+    if body_bytes and content_encoding in ("gzip", "deflate"):
+        try:
+            if content_encoding == "gzip":
+                body_bytes = gzip.decompress(body_bytes)
+            elif content_encoding == "deflate":
+                # deflate can be raw or zlib-wrapped
+                try:
+                    body_bytes = zlib.decompress(body_bytes)
+                except zlib.error:
+                    body_bytes = zlib.decompress(body_bytes, -zlib.MAX_WBITS)
+            # Remove content-encoding header since we decompressed
+            headers = {
+                k: v for k, v in headers.items()
+                if k.lower() != "content-encoding"
+            }
+        except (gzip.BadGzipFile, OSError, zlib.error):
+            pass  # Not actually compressed, use as-is
+
     body, body_encoding, is_binary = _serialize_body(body_bytes, content_type)
 
     if is_binary:
@@ -1312,18 +1338,43 @@ def create_response_from_httpcore(
     Returns:
         HttpResponse model
     """
+    import gzip
+    import zlib
+
     # Convert headers from list of tuples to dict
     headers_dict: Dict[str, str] = {}
+    content_encoding = ""
     if response.headers:
         for k, v in response.headers:
             key = k.decode() if isinstance(k, bytes) else k
             val = v.decode() if isinstance(v, bytes) else v
             headers_dict[key] = val
+            if key.lower() == "content-encoding":
+                content_encoding = val.lower()
 
     content_type = headers_dict.get("content-type", headers_dict.get("Content-Type", ""))
 
     # Get body content
     body_bytes = response.content
+
+    # Decompress if needed (httpcore doesn't auto-decompress)
+    if body_bytes and content_encoding in ("gzip", "deflate"):
+        try:
+            if content_encoding == "gzip":
+                body_bytes = gzip.decompress(body_bytes)
+            elif content_encoding == "deflate":
+                try:
+                    body_bytes = zlib.decompress(body_bytes)
+                except zlib.error:
+                    body_bytes = zlib.decompress(body_bytes, -zlib.MAX_WBITS)
+            # Remove content-encoding header since we decompressed
+            headers_dict = {
+                k: v for k, v in headers_dict.items()
+                if k.lower() != "content-encoding"
+            }
+        except (gzip.BadGzipFile, OSError, zlib.error):
+            pass  # Not actually compressed, use as-is
+
     body, body_encoding, is_binary = _serialize_body(body_bytes, content_type)
 
     if is_binary:

{fixturify-0.1.10 → fixturify-0.1.12}/fixturify/http_d/_stubs/_httpcore.py

@@ -9,7 +9,7 @@ import functools
 from typing import TYPE_CHECKING, Any
 
 from .._models import HttpRequest, HttpResponse
-from .._recorder import create_request_from_httpcore, create_response_from_httpcore
+from .._recorder import create_request_from_httpcore
 
 if TYPE_CHECKING:
     from .._mock_context import HttpMockContext
@@ -72,13 +72,14 @@ def _build_response(response_model: HttpResponse) -> Any:
     """Build httpcore Response from HttpResponse model."""
     from httpcore import Response
     import gzip
-    
+    import zlib
+
     # Get content encoding before filtering headers
     content_encoding = response_model.headers.get(
-        "content-encoding", 
+        "content-encoding",
         response_model.headers.get("Content-Encoding", "")
     ).lower()
-    
+
     # Build headers as list of tuples
     headers = [
         (k.encode("ascii"), v.encode("ascii"))
@@ -86,15 +87,21 @@ def _build_response(response_model: HttpResponse) -> Any:
         # Skip headers that cause issues
         if k.lower() not in ("transfer-encoding", "content-encoding")
     ]
-    
+
     body = response_model.get_body_bytes()
-    
-    # Decompress gzip body if needed (since we removed content-encoding header)
-    if content_encoding == "gzip" and body:
+
+    # Decompress body if needed (since we removed content-encoding header)
+    if body and content_encoding in ("gzip", "deflate"):
         try:
-            body = gzip.decompress(body)
-        except (gzip.BadGzipFile, OSError):
-            pass  # Not actually gzip, use as-is
+            if content_encoding == "gzip":
+                body = gzip.decompress(body)
+            elif content_encoding == "deflate":
+                try:
+                    body = zlib.decompress(body)
+                except zlib.error:
+                    body = zlib.decompress(body, -zlib.MAX_WBITS)
+        except (gzip.BadGzipFile, OSError, zlib.error):
+            pass  # Not actually compressed, use as-is
     
     return Response(
         status=response_model.status,
@@ -105,16 +112,17 @@ def _build_response(response_model: HttpResponse) -> Any:
 
 def _serialize_response(httpcore_response: Any) -> HttpResponse:
     """Create HttpResponse from httpcore Response object.
-    
-    Handles gzip decompression before serialization to ensure
+
+    Handles gzip/deflate decompression before serialization to ensure
     body is stored as readable text, not binary.
     """
     import gzip
+    import zlib
     from .._models import HttpResponse
-    
+
     # Get body - should be available after read()/aread()
     body_bytes = httpcore_response.content
-    
+
     # Convert headers
     headers_dict = {}
     content_encoding = ""
@@ -124,21 +132,24 @@ def _serialize_response(httpcore_response: Any) -> HttpResponse:
         headers_dict[key] = val
         if key.lower() == "content-encoding":
             content_encoding = val.lower()
-    
-    # If gzip, decompress body before serialization
-    if content_encoding == "gzip" and body_bytes:
+
+    # Decompress body before serialization if needed
+    if body_bytes and content_encoding in ("gzip", "deflate"):
         try:
-            body_bytes = gzip.decompress(body_bytes)
+            if content_encoding == "gzip":
+                body_bytes = gzip.decompress(body_bytes)
+            elif content_encoding == "deflate":
+                try:
+                    body_bytes = zlib.decompress(body_bytes)
+                except zlib.error:
+                    body_bytes = zlib.decompress(body_bytes, -zlib.MAX_WBITS)
             # Remove content-encoding header since we decompressed
             headers_dict = {
                 k: v for k, v in headers_dict.items()
                 if k.lower() != "content-encoding"
             }
-        except (gzip.BadGzipFile, OSError):
-            pass  # Not actually gzip, use as-is
-    
-    # Determine content type
-    content_type = headers_dict.get("content-type", headers_dict.get("Content-Type", ""))
+        except (gzip.BadGzipFile, OSError, zlib.error):
+            pass  # Not actually compressed, use as-is
     
     # Try to decode as text/JSON
     body_str = None

{fixturify-0.1.10 → fixturify-0.1.12}/fixturify/sql_d/__init__.py

@@ -1,7 +1,8 @@
 """SQL module for executing SQL files before/after tests."""
 
 from fixturify.sql_d._config import SqlTestConfig
+from fixturify.sql_d._connection_cache import get_connection_cache
 from fixturify.sql_d._decorator import sql
 from fixturify.sql_d._phase import Phase
 
-__all__ = ["sql", "Phase", "SqlTestConfig"]
+__all__ = ["sql", "Phase", "SqlTestConfig", "get_connection_cache"]

fixturify-0.1.12/fixturify/sql_d/_connection_cache.py

@@ -0,0 +1,235 @@
+"""Connection cache for sharing database connections across test decorators.
+
+This module provides a singleton cache that stores database connections
+keyed by their configuration. This avoids creating a new connection
+for each @sql decorator invocation, significantly improving test performance.
+"""
+
+import atexit
+import asyncio
+from dataclasses import dataclass
+from typing import Any, Dict, Optional, Tuple, TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from ._config import SqlTestConfig
+
+
+@dataclass(frozen=True)
+class CacheKey:
+    """Immutable key for connection cache lookup."""
+
+    driver: str
+    host: str
+    database: str
+    user: str
+    port: Optional[int]
+
+    @classmethod
+    def from_config(cls, config: "SqlTestConfig") -> "CacheKey":
+        """Create cache key from SqlTestConfig."""
+        return cls(
+            driver=config.driver,
+            host=config.host,
+            database=config.database,
+            user=config.user,
+            port=config.port,
+        )
+
+
+class ConnectionCache:
+    """
+    Singleton cache for database connections.
+
+    Maintains separate caches for sync and async connections.
+    Connections are created on first access and reused for subsequent calls.
+    All connections are closed when the process exits via atexit handler.
+
+    Async connections are tracked with their event loop - if the loop changes
+    or closes, the cached connection is invalidated automatically.
+    """
+
+    _instance: Optional["ConnectionCache"] = None
+
+    def __new__(cls) -> "ConnectionCache":
+        if cls._instance is None:
+            cls._instance = super().__new__(cls)
+            cls._instance._initialized = False
+        return cls._instance
+
+    def __init__(self) -> None:
+        if self._initialized:
+            return
+        self._initialized = True
+        self._sync_connections: Dict[CacheKey, Any] = {}
+        # Store (connection, event_loop) tuple for async connections
+        self._async_connections: Dict[CacheKey, Tuple[Any, Any]] = {}
+        self._sync_close_funcs: Dict[CacheKey, Any] = {}
+        self._async_close_funcs: Dict[CacheKey, Any] = {}
+
+    def get_sync(
+        self,
+        config: "SqlTestConfig",
+        connect_func: Any,
+        connect_params: Dict[str, Any],
+    ) -> Any:
+        """
+        Get or create a sync connection.
+
+        Args:
+            config: Database configuration
+            connect_func: Function to create connection (e.g., driver.connect)
+            connect_params: Parameters to pass to connect_func
+
+        Returns:
+            Database connection object
+        """
+        key = CacheKey.from_config(config)
+
+        if key not in self._sync_connections:
+            connection = connect_func(**connect_params)
+            self._sync_connections[key] = connection
+
+        return self._sync_connections[key]
+
+    async def get_async(
+        self,
+        config: "SqlTestConfig",
+        connect_factory: Any,
+    ) -> Any:
+        """
+        Get or create an async connection.
+
+        Tracks the event loop - if the cached connection was created in a
+        different or closed loop, it's invalidated and a new one is created.
+
+        Args:
+            config: Database configuration
+            connect_factory: Callable that returns a coroutine when called
+
+        Returns:
+            Database connection object
+        """
+        key = CacheKey.from_config(config)
+        current_loop = asyncio.get_running_loop()
+
+        if key in self._async_connections:
+            connection, cached_loop = self._async_connections[key]
+            # Check if loop is the same and still running
+            if cached_loop is current_loop and not cached_loop.is_closed():
+                return connection
+            # Loop changed or closed - remove stale connection
+            del self._async_connections[key]
+
+        # Create new connection and track with current loop
+        connection = await connect_factory()
+        self._async_connections[key] = (connection, current_loop)
+        return connection
+
+    def register_sync_closer(
+        self,
+        config: "SqlTestConfig",
+        close_func: Any,
+    ) -> None:
+        """Register a close function for a sync connection."""
+        key = CacheKey.from_config(config)
+        if key not in self._sync_close_funcs:
+            self._sync_close_funcs[key] = close_func
+
+    def register_async_closer(
+        self,
+        config: "SqlTestConfig",
+        close_func: Any,
+    ) -> None:
+        """Register a close function for an async connection."""
+        key = CacheKey.from_config(config)
+        if key not in self._async_close_funcs:
+            self._async_close_funcs[key] = close_func
+
+    def close_all_sync(self) -> None:
+        """Close all cached sync connections."""
+        for key, connection in list(self._sync_connections.items()):
+            try:
+                if key in self._sync_close_funcs:
+                    self._sync_close_funcs[key](connection)
+                elif hasattr(connection, "close"):
+                    connection.close()
+            except Exception:
+                pass  # Best effort cleanup
+        self._sync_connections.clear()
+        self._sync_close_funcs.clear()
+
+    def close_all_async_sync(self) -> None:
+        """
+        Close all async connections from sync context.
+
+        This is called by atexit handler which runs in sync context.
+        We need to handle async cleanup carefully.
+        """
+        for key, (connection, _loop) in list(self._async_connections.items()):
+            try:
+                if hasattr(connection, "close"):
+                    # Some async connections have sync close()
+                    result = connection.close()
+                    # If close() returns a coroutine, we need to run it
+                    if asyncio.iscoroutine(result):
+                        try:
+                            loop = asyncio.get_event_loop()
+                            if loop.is_running():
+                                # Can't run from within running loop
+                                pass
+                            else:
+                                loop.run_until_complete(result)
+                        except RuntimeError:
+                            # No event loop, create new one
+                            asyncio.run(result)
+            except Exception:
+                pass  # Best effort cleanup
+        self._async_connections.clear()
+        self._async_close_funcs.clear()
+
+    async def close_all_async(self) -> None:
+        """Close all cached async connections from async context."""
+        for key, (connection, _loop) in list(self._async_connections.items()):
+            try:
+                if key in self._async_close_funcs:
+                    await self._async_close_funcs[key](connection)
+                elif hasattr(connection, "close"):
+                    result = connection.close()
+                    if asyncio.iscoroutine(result):
+                        await result
+                    # Handle wait_closed for aiomysql-style connections
+                    if hasattr(connection, "wait_closed"):
+                        await connection.wait_closed()
+            except Exception:
+                pass  # Best effort cleanup
+        self._async_connections.clear()
+        self._async_close_funcs.clear()
+
+    def clear(self) -> None:
+        """Clear all connections (for testing purposes)."""
+        self.close_all_sync()
+        self.close_all_async_sync()
+
+
+# Global cache instance
+_cache: Optional[ConnectionCache] = None
+
+
+def get_connection_cache() -> ConnectionCache:
+    """Get the global connection cache instance."""
+    global _cache
+    if _cache is None:
+        _cache = ConnectionCache()
+    return _cache
+
+
+def _cleanup_connections() -> None:
+    """Cleanup handler called at process exit."""
+    global _cache
+    if _cache is not None:
+        _cache.close_all_sync()
+        _cache.close_all_async_sync()
+
+
+# Register cleanup handler
+atexit.register(_cleanup_connections)

{fixturify-0.1.10 → fixturify-0.1.12}/fixturify/sql_d/_strategies/_aiomysql.py

@@ -26,17 +26,14 @@ class AiomysqlStrategy(AsyncSqlExecutionStrategy):
         """Execute SQL using aiomysql."""
         driver = self.get_driver_module()
         params = self.build_connection_params(config)
-        
-        connection = await driver.connect(**params)
-        try:
-            async with connection.cursor() as cursor:
-                # aiomysql doesn't support multi-statement by default
-                await self._execute_statements(cursor, sql_content)
-            await connection.commit()
-        finally:
-            connection.close()
-            if hasattr(connection, "wait_closed"):
-                await connection.wait_closed()
+
+        connection = await self.get_cached_connection_async(
+            config, lambda: driver.connect(**params)
+        )
+        async with connection.cursor() as cursor:
+            # aiomysql doesn't support multi-statement by default
+            await self._execute_statements(cursor, sql_content)
+        await connection.commit()
 
     async def _execute_statements(self, cursor: Any, sql_content: str) -> None:
         """

{fixturify-0.1.10 → fixturify-0.1.12}/fixturify/sql_d/_strategies/_aiosqlite.py

@@ -22,8 +22,11 @@ class AiosqliteStrategy(AsyncSqlExecutionStrategy):
         """Execute SQL using aiosqlite."""
         driver = self.get_driver_module()
         params = self.build_connection_params(config)
-        
+
         database_path = params.get("database", ":memory:")
-        async with driver.connect(database_path) as connection:
-            await connection.executescript(sql_content)
-            await connection.commit()
+
+        connection = await self.get_cached_connection_async(
+            config, lambda: driver.connect(database_path)
+        )
+        await connection.executescript(sql_content)
+        await connection.commit()

{fixturify-0.1.10 → fixturify-0.1.12}/fixturify/sql_d/_strategies/_asyncpg.py

@@ -9,7 +9,11 @@ if TYPE_CHECKING:
 
 
 class AsyncpgStrategy(AsyncSqlExecutionStrategy):
-    """Execution strategy for asyncpg (PostgreSQL async)."""
+    """Execution strategy for asyncpg (PostgreSQL async).
+
+    Uses connection pools instead of single connections to support
+    concurrent operations across multiple tests.
+    """
 
     driver_name = "asyncpg"
     is_async = True
@@ -23,12 +27,13 @@ class AsyncpgStrategy(AsyncSqlExecutionStrategy):
     }
 
     async def execute_async(self, sql_content: str, config: "SqlTestConfig") -> None:
-        """Execute SQL using asyncpg."""
+        """Execute SQL using asyncpg with connection pool."""
         driver = self.get_driver_module()
         params = self.build_connection_params(config)
-        
-        connection = await driver.connect(**params)
-        try:
+
+        # Use pool instead of single connection for concurrency support
+        pool = await self.get_cached_connection_async(
+            config, lambda: driver.create_pool(**params, min_size=1, max_size=5)
+        )
+        async with pool.acquire() as connection:
             await connection.execute(sql_content)
-        finally:
-            await connection.close()

{fixturify-0.1.10 → fixturify-0.1.12}/fixturify/sql_d/_strategies/_base.py

@@ -1,7 +1,7 @@
 """Base classes for SQL execution strategies."""
 
 from abc import ABC, abstractmethod
-from typing import Any, Dict, TYPE_CHECKING
+from typing import Any, Callable, Dict, TYPE_CHECKING
 
 if TYPE_CHECKING:
     from .._config import SqlTestConfig
@@ -92,6 +92,28 @@ class SqlExecutionStrategy(ABC):
                 f"Install it with: pip install {self.driver_name}"
             ) from e
 
+    def get_cached_connection(
+        self,
+        config: "SqlTestConfig",
+        connect_func: Callable[..., Any],
+        connect_params: Dict[str, Any],
+    ) -> Any:
+        """
+        Get a cached connection or create a new one.
+
+        Args:
+            config: Database configuration
+            connect_func: Function to create connection
+            connect_params: Parameters for connect_func
+
+        Returns:
+            Database connection (cached or newly created)
+        """
+        from .._connection_cache import get_connection_cache
+
+        cache = get_connection_cache()
+        return cache.get_sync(config, connect_func, connect_params)
+
 
 class AsyncSqlExecutionStrategy(SqlExecutionStrategy):
     """
@@ -116,3 +138,29 @@ class AsyncSqlExecutionStrategy(SqlExecutionStrategy):
         raise RuntimeError(
             f"Strategy {self.driver_name} is async. Use execute_async() instead."
         )
+
+    async def get_cached_connection_async(
+        self,
+        config: "SqlTestConfig",
+        connect_factory: Any,
+    ) -> Any:
+        """
+        Get a cached async connection or create a new one.
+
+        Note: Async connections are tied to the event loop. For caching to work,
+        pytest must use session-scoped event loop:
+
+            [tool.pytest.ini_options]
+            asyncio_default_fixture_loop_scope = "session"
+
+        Args:
+            config: Database configuration
+            connect_factory: Callable that returns a coroutine when called
+
+        Returns:
+            Database connection (cached or newly created)
+        """
+        from .._connection_cache import get_connection_cache
+
+        cache = get_connection_cache()
+        return await cache.get_async(config, connect_factory)

{fixturify-0.1.10 → fixturify-0.1.12}/fixturify/sql_d/_strategies/_mysql.py

@@ -26,18 +26,15 @@ class MysqlConnectorStrategy(SqlExecutionStrategy):
         """Execute SQL using mysql.connector."""
         driver = self.get_driver_module()
         params = self.build_connection_params(config)
-        
-        connection = driver.connect(**params)
+
+        connection = self.get_cached_connection(config, driver.connect, params)
+        cursor = connection.cursor()
         try:
-            cursor = connection.cursor()
-            try:
-                # MySQL connector doesn't support multi-statement by default
-                self._execute_statements(cursor, sql_content, driver)
-                connection.commit()
-            finally:
-                cursor.close()
+            # MySQL connector doesn't support multi-statement by default
+            self._execute_statements(cursor, sql_content, driver)
+            connection.commit()
         finally:
-            connection.close()
+            cursor.close()
 
     def _execute_statements(self, cursor: Any, sql_content: str, driver: Any) -> None:
         """

{fixturify-0.1.10 → fixturify-0.1.12}/fixturify/sql_d/_strategies/_psycopg.py

@@ -27,9 +27,8 @@ class PsycopgStrategy(AsyncSqlExecutionStrategy):
         driver = self.get_driver_module()
         params = self.build_connection_params(config)
 
-        connection = await driver.AsyncConnection.connect(**params)
-        try:
-            await connection.execute(sql_content)
-            await connection.commit()
-        finally:
-            await connection.close()
+        connection = await self.get_cached_connection_async(
+            config, lambda: driver.AsyncConnection.connect(**params)
+        )
+        await connection.execute(sql_content)
+        await connection.commit()