Upgrade Odmantic support to v1.0+ (#594)

* Upgrade Odmantic support to v1.0+

* Upgrade Odmantic support to v1.0+

* Upgrade Odmantic support to v1.0+

* Upgrade Odmantic support to v1.0+

* Upgrade Odmantic support to v1.0+

* Upgrade Odmantic support to v1.0+

* Upgrade Odmantic support to v1.0+

* Upgrade Odmantic support to v1.0+

Author: jowilf

.github/workflows/test.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [ "3.8", "3.9", "3.10", "3.11", "3.12" ]
+        python-version: [ "3.9", "3.10", "3.11", "3.12" ]
 
     services:
       mongodb:
@@ -32,7 +32,7 @@ jobs:
         options: --health-cmd "curl http://localhost:9000/minio/health/live" --health-interval 10s --health-timeout 5s --health-retries 10
 
       postgres:
-        image: postgres:14-alpine
+        image: postgres:17-alpine
         env:
           POSTGRES_USER: username
           POSTGRES_PASSWORD: password
@@ -97,6 +97,7 @@ jobs:
           name: coverage-${{ matrix.python-version }}
           path: .coverage*
           retention-days: 1
+          include-hidden-files: true
 
   coverage:
     needs:
@@ -111,7 +112,7 @@ jobs:
       - name: get coverage files
         uses: actions/download-artifact@v4
         with:
-          pattern: coverage-*
+          pattern: coverage*
           merge-multiple: true
       - name: Install Dependencies
         run: pip install hatch

pyproject.toml

@@ -44,14 +44,14 @@ i18n = [
     "babel >=2.13.0"
 ]
 test = [
-    "pytest >=7.2.0, <7.5.0",
-    "pytest-asyncio >=0.20.2, <0.24.0",
-    "mypy ==1.10.0",
-    "ruff ==0.4.8",
-    "black ==24.4.2",
-    "httpx >=0.23.3, <0.27.0",
+    "pytest >=8.3.0, <8.4.0",
+    "pytest-asyncio >=0.24.0, <0.25.0",
+    "mypy ==1.13.0",
+    "ruff ==0.7.1",
+    "black ==24.10.0",
+    "httpx >=0.23.3, <0.28.0",
     "SQLAlchemy-Utils >=0.40.0, <0.42.0",
-    "sqlmodel >=0.0.11, <0.15.0",
+    "sqlmodel >=0.0.11, <0.1.0",
     "arrow >=1.2.3, <1.4.0",
     "colour >=0.1.5, <0.2.0",
     "phonenumbers >=8.13.3, <8.14.0",
@@ -62,27 +62,26 @@ test = [
     "PyMySQL[rsa] >=1.0.2, <1.2.0",
     "psycopg2-binary >=2.9.5, <3.0.0",
     "aiosqlite >=0.17.0, <0.21.0",
-    "asyncpg >=0.27.0, <0.30.0",
+    "asyncpg >=0.27.0, <0.31.0",
     "aiomysql >=0.1.1, <0.3.0",
-    "mongoengine >=0.25.0, <0.29.0",
-    "odmantic >=0.9.0,<0.10.0",
+    "mongoengine >=0.25.0, <0.30.0",
     "tinydb >=4.7.0, <4.9.0",
-    "Pillow >=9.4.0, <9.6.0",
+    "Pillow >=9.4.0, <11.1.0",
     "itsdangerous >=2.2.0, <2.3.0",
-    "pydantic[email] >=1.10.2, <2.8.0",
+    "pydantic[email] >=1.10.2, <2.10.0",
 ]
 cov = [
-    "coverage[toml] >=7.0.0, <7.4.0"
+    "coverage[toml] >=7.0.0, <7.7.0"
 ]
 doc = [
     "mkdocs >=1.4.2, <2.0.0",
     "mkdocs-material >=9.0.0, <10.0.0",
-    "mkdocstrings[python] >=0.19.0, <0.26.0",
+    "mkdocstrings[python] >=0.19.0, <0.27.0",
     "mkdocs-static-i18n >=1.2.3, <1.3"
 ]
 dev = [
-    "pre-commit >=2.20.0, <4.0.0",
-    "uvicorn >=0.20.0, <0.31.0",
+    "pre-commit >=2.20.0, <4.1.0",
+    "uvicorn >=0.20.0, <0.33.0",
 ]
 
 [tool.hatch.envs.default]
@@ -120,11 +119,12 @@ sqla_version = ["sqla14", "sqla2"]
 [tool.hatch.envs.test.overrides]
 matrix.sqla_version.dependencies = [
     { value = "SQLAlchemy[asyncio] >=2.0, <2.1", if = ["sqla2"] },
+    { value = "odmantic >=1.0.0,<1.1.0", if = ["sqla2"] },
     { value = "SQLAlchemy[asyncio] >=1.4, <1.5", if = ["sqla14"] },
 ]
 matrix.sqla_version.scripts = [
-    { key = "all", value = 'coverage run -m pytest tests --ignore=tests/odmantic', if = ["sqla2"] },
-    { key = "sqla", value = 'coverage run -m pytest tests/sqla --ignore=tests/odmantic', if = ["sqla2"] },
+    { key = "all", value = 'coverage run -m pytest tests --ignore=tests/odmantic', if = ["sqla14"] },
+    { key = "sqla", value = 'coverage run -m pytest tests/sqla --ignore=tests/odmantic', if = ["sqla14"] },
 ]
 
 [tool.hatch.envs.cov]
@@ -180,6 +180,14 @@ parallel = true
 concurrency = ["thread", "greenlet"]
 source = ["starlette_admin", "tests"]
 
+[tool.pytest]
+asyncio_mode = "auto"
+
+[tool.pytest.ini_options]
+asyncio_mode="auto"
+asyncio_default_fixture_loop_scope="function"
+
+
 [tool.ruff]
 lint.select = [
     "B", # flake8-bugbear
@@ -217,7 +225,7 @@ known-third-party = ["starlette_admin"]
 [tool.ruff.lint.per-file-ignores]
 "__init__.py" = ["F401", "PLC0414"]
 "examples/**" = ["N805", "N999", "RUF012"]
-"tests/**" = ["RUF012"]
+"tests/**" = ["RUF012", "SIM115"]
 
 [tool.mypy]
 disallow_untyped_defs = true
@@ -236,6 +244,7 @@ module = [
     "starlette_admin.contrib.sqla.helpers",
     "starlette_admin.contrib.sqla.view",
     "starlette_admin.contrib.odmantic.helpers",
+    "starlette_admin.contrib.odmantic.view"
 ]
 warn_unused_ignores = false
 

starlette_admin/contrib/odmantic/converters.py

@@ -23,7 +23,6 @@
 from starlette_admin.fields import (
     BaseField,
     CollectionField,
-    ColorField,
     DateTimeField,
     DecimalField,
     EmailField,
@@ -117,10 +116,6 @@ def conv_bson_datetime(self, *args: Any, **kwargs: Any) -> BaseField:
     def conv_pydantic_email(self, *args: Any, **kwargs: Any) -> BaseField:
         return EmailField(**self._standard_type_common(**kwargs))
 
-    @converts(pydantic.color.Color)
-    def conv_pydantic_color(self, *args: Any, **kwargs: Any) -> BaseField:
-        return ColorField(**self._standard_type_common(**kwargs))
-
     @converts(pydantic.AnyUrl)
     def conv_pydantic_url(self, *args: Any, **kwargs: Any) -> BaseField:
         return URLField(**self._standard_type_common(**kwargs))

starlette_admin/contrib/odmantic/helpers.py

@@ -3,13 +3,12 @@
 import typing as t
 
 import bson
-import pydantic as pyd
-import pydantic.datetime_parse
 from odmantic import Model, query
 from odmantic.field import (
     FieldProxy,
 )
 from odmantic.query import QueryExpression
+from pydantic import TypeAdapter, ValidationError  # type: ignore[attr-defined]
 
 
 def normalize_list(
@@ -74,6 +73,14 @@ def _rec(value: t.Any, regex: str) -> t.Pattern:
 }
 
 
+def parse_datetime(value: str) -> bool:
+    try:
+        TypeAdapter(datetime.datetime).validate_python(value)
+    except ValidationError:
+        return False
+    return True
+
+
 def resolve_proxy(model: t.Type[Model], proxy_name: str) -> t.Optional[FieldProxy]:
     _list = proxy_name.split(".")
     m = model
@@ -88,7 +95,7 @@ def _check_value(v: t.Any, proxy: t.Optional[FieldProxy]) -> t.Any:
     The purpose of this function is to detect datetime string, or ObjectId
     and convert them into the appropriate python type.
     """
-    if isinstance(v, str) and pyd.datetime_parse.datetime_re.match(v):
+    if isinstance(v, str) and parse_datetime(v):
         return datetime.datetime.fromisoformat(v)
     if proxy is not None and +proxy == "_id" and bson.ObjectId.is_valid(v):
         return bson.ObjectId(v)

tests/mongoengine/test_view.py

@@ -136,7 +136,7 @@ def test_api(self, client):
         data = response.json()
         assert data["total"] == 5
         assert len(data["items"]) == 2
-        assert ["OPPOF19", "IPhone X"] == [x["title"] for x in data["items"]]
+        assert [x["title"] for x in data["items"]] == ["OPPOF19", "IPhone X"]
         # Find by pks
         response = client.get(
             "/admin/api/product",
@@ -150,7 +150,7 @@ def test_api_fulltext(self, client):
         )
         data = response.json()
         assert data["total"] == 2
-        assert ["IPhone 9", "IPhone X"] == [x["title"] for x in data["items"]]
+        assert [x["title"] for x in data["items"]] == ["IPhone 9", "IPhone X"]
 
     def test_api_query1(self, client):
         where = (
@@ -160,8 +160,10 @@ def test_api_query1(self, client):
         response = client.get(f"/admin/api/product?where={where}&order_by=price asc")
         data = response.json()
         assert data["total"] == 3
-        assert ["OPPOF19", "Huawei P30", "IPhone 9"] == [
-            x["title"] for x in data["items"]
+        assert [x["title"] for x in data["items"]] == [
+            "OPPOF19",
+            "Huawei P30",
+            "IPhone 9",
         ]
 
     def test_api_query2(self, client):
@@ -172,13 +174,13 @@ def test_api_query2(self, client):
         response = client.get(f"/admin/api/product?where={where}")
         data = response.json()
         assert data["total"] == 1
-        assert ["IPhone X"] == [x["title"] for x in data["items"]]
+        assert [x["title"] for x in data["items"]] == ["IPhone X"]
 
     def test_api_query3(self, client):
         response = client.get("/admin/api/product?order_by=price desc&limit=2")
         data = response.json()
         assert data["total"] == 5
-        assert ["Samsung Universe 9", "IPhone X"] == [x["title"] for x in data["items"]]
+        assert [x["title"] for x in data["items"]] == ["Samsung Universe 9", "IPhone X"]
 
     def test_detail(self, client):
         id = Product.objects(title="IPhone 9").get().id

tests/odmantic/conftest.py

@@ -1,3 +1,5 @@
+import asyncio
+
 import pytest
 import pytest_asyncio
 from motor.motor_asyncio import AsyncIOMotorClient
@@ -8,8 +10,9 @@
 
 
 @pytest_asyncio.fixture
-async def aio_engine(event_loop):
-    client = AsyncIOMotorClient(MONGO_URI, io_loop=event_loop)
+async def aio_engine():
+    client = AsyncIOMotorClient(MONGO_URI)
+    client.get_io_loop = asyncio.get_event_loop
     sess = AIOEngine(client, MONGO_DATABASE)
     yield sess
     await client.drop_database(MONGO_DATABASE)

tests/odmantic/test_async_engine.py

@@ -1,5 +1,4 @@
 import json
-import sys
 from datetime import datetime
 from typing import Any, Dict, List, Optional
 
@@ -11,13 +10,6 @@
 from starlette.applications import Starlette
 from starlette_admin.contrib.odmantic import Admin, ModelView
 
-if sys.version_info < (3, 9):
-    pytest.skip(
-        "Skipping the test due to a segment fault error with odmantic on Python 3.8, and the library is not "
-        "currently maintained",
-        allow_module_level=True,
-    )
-
 pytestmark = pytest.mark.asyncio
 
 
@@ -113,7 +105,7 @@ async def test_api(client: AsyncClient):
     data = response.json()
     assert data["total"] == 3
     assert len(data["items"]) == 2
-    assert ["Sheldon Cole", "Terry Medhurst"] == [x["name"] for x in data["items"]]
+    assert [x["name"] for x in data["items"]] == ["Sheldon Cole", "Terry Medhurst"]
     # Find by pks
     response = await client.get(
         "/admin/api/user", params={"pks": [x["id"] for x in data["items"]]}
@@ -128,7 +120,7 @@ async def test_full_text_search(client: AsyncClient):
     assert response.status_code == 200
     data = response.json()
     assert data["total"] == 2
-    assert ["Hills Terrill", "Terry Medhurst"] == [x["name"] for x in data["items"]]
+    assert [x["name"] for x in data["items"]] == ["Hills Terrill", "Terry Medhurst"]
 
 
 async def test_deep_search(client: AsyncClient, aio_engine: AIOEngine):
@@ -171,7 +163,7 @@ async def test_create(client: AsyncClient, aio_engine: AIOEngine):
     assert response.status_code == 303
     users = await aio_engine.find(User, User.name == "John Doe")
     assert len(users) == 1
-    assert users[0].dict(exclude={"id"}) == {
+    assert users[0].model_dump(exclude={"id"}) == {
         "name": "John Doe",
         "birthday": datetime(1999, 1, 1),
         "address": {
@@ -207,9 +199,9 @@ async def test_create_validation_error(client: AsyncClient, aio_engine: AIOEngin
         follow_redirects=False,
     )
     assert response.text.count('<div class="invalid-feedback">') == 3
-    assert response.text.count("ensure this value has at least 3 characters") == 1
-    assert response.text.count("ensure this value has at least 5 characters") == 1
-    assert response.text.count("ensure this value has at most 10 characters") == 1
+    assert response.text.count("at least 3 characters") == 1
+    assert response.text.count("at least 5 characters") == 1
+    assert response.text.count("at most 10 characters") == 1
     assert response.status_code == 422
     assert (await aio_engine.find_one(User, User.name == "Jo")) is None
 
@@ -231,7 +223,7 @@ async def test_edit(client: AsyncClient, aio_engine: AIOEngine):
     assert response.status_code == 303
     users = await aio_engine.find(User, User.id == id)
     assert len(users) == 1
-    assert users[0] == {
+    assert users[0].model_dump() == {
         "id": id,
         "name": "John Doe",
         "birthday": datetime(1999, 1, 1),
@@ -265,9 +257,9 @@ async def test_edit_validation_error(client: AsyncClient, aio_engine: AIOEngine)
         follow_redirects=False,
     )
     assert response.text.count('<div class="invalid-feedback">') == 3
-    assert response.text.count("ensure this value has at least 3 characters") == 1
-    assert response.text.count("ensure this value has at least 5 characters") == 1
-    assert response.text.count("ensure this value has at most 10 characters") == 1
+    assert response.text.count("at least 3 characters") == 1
+    assert response.text.count("at least 5 characters") == 1
+    assert response.text.count("at most 10 characters") == 1
     assert response.status_code == 422
     assert (await aio_engine.find_one(User, User.name == "Hills Terrill")) is not None
     assert (await aio_engine.find_one(User, User.name == "Jo")) is None

tests/odmantic/test_sync_engine.py

@@ -1,5 +1,4 @@
 import json
-import sys
 
 import pytest
 import pytest_asyncio
@@ -8,13 +7,6 @@
 from starlette.applications import Starlette
 from starlette_admin.contrib.odmantic import Admin, ModelView
 
-if sys.version_info < (3, 9):
-    pytest.skip(
-        "Skipping the test due to a segment fault error with odmantic on Python 3.8, and the library is not "
-        "currently maintained",
-        allow_module_level=True,
-    )
-
 pytestmark = pytest.mark.asyncio
 
 
@@ -66,7 +58,7 @@ async def test_api(client: AsyncClient):
     data = response.json()
     assert data["total"] == 3
     assert len(data["items"]) == 2
-    assert ["Jim Rohn", "Albert Einstein"] == [x["name"] for x in data["items"]]
+    assert [x["name"] for x in data["items"]] == ["Jim Rohn", "Albert Einstein"]
     # Find by pks
     response = await client.get(
         "/admin/api/author", params={"pks": [x["id"] for x in data["items"]]}