fastapi-viewsets 1.2.0__tar.gz → 1.2.1__tar.gz

{fastapi_viewsets-1.2.0 → fastapi_viewsets-1.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastapi_viewsets
-Version: 1.2.0
+Version: 1.2.1
 Summary: DRF-style viewsets for FastAPI with SQLAlchemy/Tortoise/Peewee adapters and Pydantic v2 support.
 Author: Alexander Valenchits
 License: MIT

{fastapi_viewsets-1.2.0 → fastapi_viewsets-1.2.1}/fastapi_viewsets/orm/sqlalchemy_adapter.py

@@ -67,19 +67,25 @@ class SQLAlchemyAdapter(BaseORMAdapter):
         
         self.Base.query = self.db_session.query_property()
         
-        # Setup async engine and session
+        # Setup async engine and session.
+        #
+        # The async engine is best-effort: if the matching async DB-API
+        # driver (aiosqlite, asyncpg, aiomysql, ...) is not installed we
+        # fall back to ``async_engine = None`` so that purely synchronous
+        # usage still works. The error is re-raised lazily from
+        # :meth:`get_async_session` with installation hints.
         if async_engine:
             self.async_engine = async_engine
-        elif async_database_url:
-            self.async_engine = create_async_engine(async_database_url, echo=False)
         else:
-            # Auto-convert sync URL to async
-            async_url = self._get_async_database_url()
+            async_url = async_database_url or self._get_async_database_url()
             try:
                 self.async_engine = create_async_engine(async_url, echo=False)
             except Exception:
+                # Missing async DB-API driver (aiosqlite/asyncpg/aiomysql),
+                # or no async dialect for this URL — degrade to sync-only mode.
+                # The error is re-raised lazily from ``get_async_session``.
                 self.async_engine = None
-        
+
         if self.async_engine:
             self.AsyncSessionLocal = async_sessionmaker(
                 self.async_engine,

{fastapi_viewsets-1.2.0 → fastapi_viewsets-1.2.1}/fastapi_viewsets.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastapi_viewsets
-Version: 1.2.0
+Version: 1.2.1
 Summary: DRF-style viewsets for FastAPI with SQLAlchemy/Tortoise/Peewee adapters and Pydantic v2 support.
 Author: Alexander Valenchits
 License: MIT

{fastapi_viewsets-1.2.0 → fastapi_viewsets-1.2.1}/fastapi_viewsets.egg-info/SOURCES.txt

@@ -24,6 +24,7 @@ fastapi_viewsets/orm/sqlalchemy_adapter.py
 fastapi_viewsets/orm/tortoise_adapter.py
 tests/test_adapter_methods_coverage.py
 tests/test_async_base_viewset.py
+tests/test_async_driver_missing.py
 tests/test_async_utils.py
 tests/test_backward_compatibility.py
 tests/test_base_viewset.py

{fastapi_viewsets-1.2.0 → fastapi_viewsets-1.2.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "fastapi_viewsets"
-version = "1.2.0"
+version = "1.2.1"
 description = "DRF-style viewsets for FastAPI with SQLAlchemy/Tortoise/Peewee adapters and Pydantic v2 support."
 readme = "README.md"
 license = { text = "MIT" }
@@ -51,8 +51,10 @@ Homepage = "https://github.com/svalench/fastapi_viewsets"
 Issues = "https://github.com/svalench/fastapi_viewsets/issues"
 Changelog = "https://github.com/svalench/fastapi_viewsets/blob/main/RELEASE_NOTES.md"
 
-[tool.setuptools]
-packages = ["fastapi_viewsets", "fastapi_viewsets.orm"]
+[tool.setuptools.packages.find]
+where = ["."]
+include = ["fastapi_viewsets*"]
+exclude = ["tests*"]
 
 [tool.black]
 line-length = 100

fastapi_viewsets-1.2.1/tests/test_async_driver_missing.py

@@ -0,0 +1,57 @@
+"""Regression test for v1.2.1.
+
+When ``async_database_url`` is provided but the corresponding async DB-API
+driver (e.g. ``aiosqlite``) is not installed, ``SQLAlchemyAdapter.__init__``
+must degrade gracefully to sync-only mode instead of raising
+``ModuleNotFoundError`` at construction time.
+
+Regression introduced in v1.2.0 where ``ORMFactory.get_adapter_from_env``
+started always passing an explicit ``async_database_url`` to the adapter,
+bypassing the existing best-effort ``try/except`` on the URL-conversion path.
+"""
+
+from unittest.mock import patch
+
+import pytest
+
+from fastapi_viewsets.orm.sqlalchemy_adapter import SQLAlchemyAdapter
+
+
+def _import_error(*_args, **_kwargs):
+    raise ModuleNotFoundError("No module named 'aiosqlite'")
+
+
+def test_explicit_async_url_without_driver_falls_back_to_sync():
+    """Adapter must not raise when async driver is missing."""
+    with patch(
+        "fastapi_viewsets.orm.sqlalchemy_adapter.create_async_engine",
+        side_effect=_import_error,
+    ):
+        adapter = SQLAlchemyAdapter(
+            database_url="sqlite:///:memory:",
+            async_database_url="sqlite+aiosqlite:///:memory:",
+        )
+
+    assert adapter.async_engine is None
+    assert adapter.AsyncSessionLocal is None
+
+    # Sync session must keep working.
+    session = adapter.get_session()
+    assert session is not None
+    session.close()
+
+    # Async session must raise a helpful runtime error (not at __init__).
+    with pytest.raises(RuntimeError, match="async database driver"):
+        adapter.get_async_session()
+
+
+def test_auto_converted_async_url_without_driver_falls_back_to_sync():
+    """Same fallback when ``async_database_url`` is auto-derived."""
+    with patch(
+        "fastapi_viewsets.orm.sqlalchemy_adapter.create_async_engine",
+        side_effect=_import_error,
+    ):
+        adapter = SQLAlchemyAdapter(database_url="sqlite:///:memory:")
+
+    assert adapter.async_engine is None
+    assert adapter.AsyncSessionLocal is None