fix: remove async things from sync interface (#391)

beanie/__init__.py

@@ -26,7 +26,7 @@
 from beanie.odm.views import View
 from beanie.odm.union_doc import UnionDoc
 
-__version__ = "1.13.0"
+__version__ = "1.13.1"
 __all__ = [
     # ODM
     "Document",

beanie/sync/odm/actions.py

@@ -1,5 +1,3 @@
-import asyncio
-import inspect
 from functools import wraps
 from typing import (
     Callable,
@@ -98,17 +96,11 @@ def run_actions(
         actions_list = cls.get_action_list(
             document_class, event_type, action_direction
         )
-        coros = []
         for action in actions_list:
             if action.__name__ in exclude:
                 continue
 
-            if inspect.iscoroutinefunction(action):
-                coros.append(action(instance))
-            elif inspect.isfunction(action):
-                action(instance)
-
-        asyncio.gather(*coros)
+            action(instance)
 
 
 def register_action(

beanie/sync/odm/documents.py

@@ -15,7 +15,6 @@
 from uuid import UUID, uuid4
 
 from bson import ObjectId, DBRef
-from motor.motor_asyncio import AsyncIOMotorDatabase
 from pydantic import (
     ValidationError,
     PrivateAttr,
@@ -25,6 +24,7 @@
 from pydantic.main import BaseModel
 from pymongo import InsertOne
 from pymongo.client_session import ClientSession
+from pymongo.database import Database
 from pymongo.results import (
     DeleteResult,
     InsertManyResult,
@@ -841,12 +841,12 @@ def init_fields(cls) -> None:
 
     @classmethod
     def init_settings(
-        cls, database: AsyncIOMotorDatabase, allow_index_dropping: bool
+        cls, database: Database, allow_index_dropping: bool
     ) -> None:
         """
         Init document settings (collection and models)
 
-        :param database: AsyncIOMotorDatabase - motor database
+        :param database: Database - pymongo database
         :param allow_index_dropping: bool
         :return: None
         """
@@ -876,11 +876,11 @@ def init_actions(cls):
 
     @classmethod
     def init_model(
-        cls, database: AsyncIOMotorDatabase, allow_index_dropping: bool
+        cls, database: Database, allow_index_dropping: bool
     ) -> None:
         """
         Init wrapper
-        :param database: AsyncIOMotorDatabase
+        :param database: Database
         :param allow_index_dropping: bool
         :return: None
         """

beanie/sync/odm/interfaces/getters.py

@@ -1,4 +1,4 @@
-from motor.motor_asyncio import AsyncIOMotorCollection
+from pymongo.collection import Collection
 
 from beanie.sync.odm.settings.base import ItemSettings
 
@@ -9,7 +9,7 @@ def get_settings(cls) -> ItemSettings:
         pass
 
     @classmethod
-    def get_motor_collection(cls) -> AsyncIOMotorCollection:
+    def get_motor_collection(cls) -> Collection:
         return cls.get_settings().motor_collection
 
     @classmethod

beanie/sync/odm/queries/cursor.py

@@ -20,7 +20,7 @@
 
 class BaseCursorQuery(Generic[CursorResultType], RunInterface):
     """
-    BaseCursorQuery class. Wrapper over AsyncIOMotorCursor,
+    BaseCursorQuery class. Wrapper over pymongo Cursor,
     which parse result with model
     """
 

beanie/sync/odm/settings/base.py

@@ -1,8 +1,9 @@
 from datetime import timedelta
 from typing import Optional, Dict, Any, Type
 
-from motor.motor_asyncio import AsyncIOMotorDatabase, AsyncIOMotorCollection
 from pydantic import BaseModel, Field
+from pymongo.collection import Collection
+from pymongo.database import Database
 
 
 class ItemSettings(BaseModel):
@@ -14,8 +15,8 @@ class ItemSettings(BaseModel):
     bson_encoders: Dict[Any, Any] = Field(default_factory=dict)
     projection: Optional[Dict[str, Any]] = None
 
-    motor_db: Optional[AsyncIOMotorDatabase]
-    motor_collection: Optional[AsyncIOMotorCollection] = None
+    motor_db: Optional[Database]
+    motor_collection: Optional[Collection] = None
 
     union_doc: Optional[Type] = None
 

beanie/sync/odm/settings/document.py

@@ -1,9 +1,9 @@
 import warnings
 from typing import Optional, Type, List
 
-from motor.motor_asyncio import AsyncIOMotorDatabase
 from pydantic import Field
 from pymongo import IndexModel
+from pymongo.database import Database
 
 from beanie.exceptions import MongoDBVersionError
 from beanie.sync.odm.settings.base import ItemSettings
@@ -35,7 +35,7 @@ class DocumentSettings(ItemSettings):
     @classmethod
     def init(
         cls,
-        database: AsyncIOMotorDatabase,
+        database: Database,
         document_model: Type,
         allow_index_dropping: bool,
     ) -> "DocumentSettings":

beanie/sync/odm/settings/union_doc.py

@@ -1,15 +1,13 @@
 from typing import Type
 
-from motor.motor_asyncio import AsyncIOMotorDatabase
+from pymongo.database import Database
 
 from beanie.sync.odm.settings.base import ItemSettings
 
 
 class UnionDocSettings(ItemSettings):
     @classmethod
-    def init(
-        cls, doc_class: Type, database: AsyncIOMotorDatabase
-    ) -> "UnionDocSettings":
+    def init(cls, doc_class: Type, database: Database) -> "UnionDocSettings":
         settings_class = getattr(doc_class, "Settings", None)
 
         multi_doc_settings = cls.parse_obj(vars(settings_class))

beanie/sync/odm/settings/view.py

@@ -1,7 +1,7 @@
 from inspect import isclass
 from typing import List, Dict, Any, Union, Type
 
-from motor.motor_asyncio import AsyncIOMotorDatabase
+from pymongo.database import Database
 
 from beanie.exceptions import ViewHasNoSettings
 from beanie.sync.odm.settings.base import ItemSettings
@@ -12,9 +12,7 @@ class ViewSettings(ItemSettings):
     pipeline: List[Dict[str, Any]]
 
     @classmethod
-    def init(
-        cls, view_class: Type, database: AsyncIOMotorDatabase
-    ) -> "ViewSettings":
+    def init(cls, view_class: Type, database: Database) -> "ViewSettings":
         settings_class = getattr(view_class, "Settings", None)
         if settings_class is None:
             raise ViewHasNoSettings("View must have Settings inner class")

beanie/sync/odm/union_doc.py

@@ -1,6 +1,6 @@
 from typing import ClassVar, Type, Dict, Optional
 
-from motor.motor_asyncio import AsyncIOMotorDatabase
+from pymongo.database import Database
 
 from beanie.exceptions import UnionDocNotInited
 from beanie.sync.odm.interfaces.aggregate import AggregateInterface
@@ -25,7 +25,7 @@ def get_settings(cls) -> UnionDocSettings:
         return cls._settings
 
     @classmethod
-    def init(cls, database: AsyncIOMotorDatabase):
+    def init(cls, database: Database):
         cls._settings = UnionDocSettings.init(database=database, doc_class=cls)
         cls._is_inited = True
 

beanie/sync/odm/utils/general.py

@@ -45,7 +45,7 @@ def init_beanie(
     """
     Beanie initialization
 
-    :param database: AsyncIOMotorDatabase - motor database instance
+    :param database: Database - pymongo database instance
     :param connection_string: str - MongoDB connection string
     :param document_models: List[Union[Type[DocType], str]] - model classes
     or strings with dot separated paths

beanie/sync/odm/views.py

@@ -1,7 +1,7 @@
 from typing import ClassVar
 
-from motor.motor_asyncio import AsyncIOMotorDatabase
 from pydantic import BaseModel
+from pymongo.database import Database
 
 from beanie.exceptions import ViewWasNotInitialized
 from beanie.odm.fields import ExpressionField
@@ -48,7 +48,7 @@ def init_view(cls, database, recreate_view: bool):
             )
 
     @classmethod
-    def init_settings(cls, database: AsyncIOMotorDatabase) -> None:
+    def init_settings(cls, database: Database) -> None:
         cls._settings = ViewSettings.init(database=database, view_class=cls)
 
     @classmethod

docs/changelog.md

@@ -2,6 +2,16 @@
 
 Beanie project
 
+## [1.13.1] - 2022-10-26
+
+### Fix
+
+- Remove redundant async things from sync interface
+
+### Implementation
+
+- ISSUE <https://github.com/roman-right/beanie/issues/390>
+
 ## [1.13.0] - 2022-10-22
 
 ### Improvement
@@ -1008,4 +1018,8 @@ how specific type should be presented in the database
 
 [1.12.0]: https://pypi.org/project/beanie/1.12.0
 
-[1.12.1]: https://pypi.org/project/beanie/1.12.1
+[1.12.1]: https://pypi.org/project/beanie/1.12.1
+
+[1.13.0]: https://pypi.org/project/beanie/1.13.0
+
+[1.13.1]: https://pypi.org/project/beanie/1.13.1

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "beanie"
-version = "1.13.0"
+version = "1.13.1"
 description = "Python ODM for MongoDB"
 authors = ["Roman <roman-right@protonmail.com>"]
 license = "Apache-2.0"

tests/test_beanie.py

@@ -2,4 +2,4 @@
 
 
 def test_version():
-    assert __version__ == "1.13.0"
+    assert __version__ == "1.13.1"