Merge pull request #73 from grillazz/69-switch-to-pymongo-for-async

69 switch to pymongo for async

Author: grillazz

Dockerfile.old

@@ -4,31 +4,31 @@ help: ## Show this help
 
 .PHONY: build
 build:	## Build project with compose
-	docker compose build
+	docker compose -f compose.yml up
 
 .PHONY: up
 up:	## Run project with compose
-	docker compose up
+	docker compose -f compose.yml up
 
 .PHONY: down
 down: ## Reset project containers with compose
-	docker compose down -v --remove-orphans
+	docker compose -f compose.yml down -v --remove-orphans
 
 .PHONY: test
 test:	## Run project tests
 	docker compose -f compose.yml run --rm web pytest -vv tests
 
 .PHONY: test-snapshot
 test-snapshot:	## Run project tests
-	docker compose -f compose.yml run web pytest --inline-snapshot=create tests
+	docker compose -f compose.yml run --rm web pytest --inline-snapshot=fix tests
 
 .PHONY: mypy
 mypy:	## mypy check.
 	mypy --ignore-missing-imports .
 
 .PHONY: lint
 lint:  ## Lint project code.
-	poetry run ruff check --fix .
+	uv run ruff check --fix .
 
 .PHONY: safety
 safety:  ## apply safety check in project.
@@ -41,5 +41,5 @@ format:  ## format project code.
 
 .PHONY: clean
 clean: ## Clean Reset project containers and volumes with compose
-	docker compose down -v --remove-orphans | true
-	docker compose rm -f
+	docker compose -f compose.yml down -v --remove-orphans | true
+	docker compose -f compose.yml rm -f

Makefile

@@ -15,12 +15,10 @@
 async def lifespan(app: FastAPI):
     app.state.logger = get_logger(__name__)
     app.state.logger.info("Starting greens on your farmland...mmm")
-    app.state.mongo_client, app.state.mongo_db, app.state.mongo_collection = (
-        await init_mongo(
-            global_settings.mongodb_database,
-            global_settings.mongodb_url.unicode_string(),
-            global_settings.mongodb_collection,
-        )
+    app.state.mongo_client, app.state.mongo_db, app.state.mongo_collection = await init_mongo(
+        global_settings.mongodb_database,
+        global_settings.mongodb_url.unicode_string(),
+        global_settings.mongodb_collection,
     )
     try:
         yield
@@ -42,4 +40,3 @@ async def health_check():
     # except Exception:
     #     app.state.logger.exception("My way or highway...")
     return await get_mongo_meta()
-

greens/main.py

@@ -19,9 +19,7 @@ async def retrieve_document(document_id: str, collection: str) -> dict:
     :return:
     """
     document_filter = {"_id": ObjectId(document_id)}
-    if document := await greens.app.state.mongo_collection[collection].find_one(
-        document_filter
-    ):
+    if document := await greens.app.state.mongo_collection[collection].find_one(document_filter):
         return await document_id_helper(document)
     else:
         raise ValueError(f"No document found for {document_id=} in {collection=}")
@@ -35,9 +33,9 @@ async def create_document(document, collection: str) -> InsertOneResult:
     :return:
     """
     try:
-        document: InsertOneResult = await greens.app.state.mongo_collection[
-            collection
-        ].insert_one(document.model_dump())
+        document: InsertOneResult = await greens.app.state.mongo_collection[collection].insert_one(
+            document.model_dump()
+        )
         return document
     except WriteError as e:
         # TODO: this not make sense as id from mongo will be always unique if we not pass it
@@ -48,9 +46,7 @@ async def get_mongo_meta() -> dict:
     list_databases = await greens.app.state.mongo_client.list_database_names()
     list_of_collections = {}
     for db in list_databases:
-        list_of_collections[db] = await greens.app.state.mongo_client[
-            db
-        ].list_collection_names()
+        list_of_collections[db] = await greens.app.state.mongo_client[db].list_collection_names()
     mongo_meta = await greens.app.state.mongo_client.server_info()
     return {
         "version": mongo_meta["version"],

greens/services/repository.py

@@ -19,14 +19,8 @@ def get_logger(module_name):
 
     """
     logger = logging.getLogger(module_name)
-    handler = RichHandler(
-        rich_tracebacks=True, console=console, tracebacks_show_locals=True
-    )
-    handler.setFormatter(
-        logging.Formatter(
-            "%(name)s - [ %(threadName)s:%(funcName)s:%(lineno)d ] - %(message)s"
-        )
-    )
+    handler = RichHandler(rich_tracebacks=True, console=console, tracebacks_show_locals=True)
+    handler.setFormatter(logging.Formatter("%(name)s - [ %(threadName)s:%(funcName)s:%(lineno)d ] - %(message)s"))
     logger.addHandler(handler)
     logger.setLevel(logging.DEBUG)
     return logger

greens/utils.py

@@ -20,18 +20,16 @@ def anyio_backend(request):
 @pytest.fixture
 async def client() -> AsyncGenerator[AsyncClient]:
     transport = ASGITransport(
-            app=app,
-        )
+        app=app,
+    )
     async with AsyncClient(
         base_url="http://testserver",
         transport=transport,
     ) as client:
         app.state.logger = get_logger(__name__)
-        app.state.mongo_client, app.state.mongo_db, app.state.mongo_collection = (
-            await init_mongo(
-                global_settings.mongodb_test,
-                global_settings.mongodb_url.unicode_string(),
-                global_settings.mongodb_collection,
-            )
+        app.state.mongo_client, app.state.mongo_db, app.state.mongo_collection = await init_mongo(
+            global_settings.mongodb_test,
+            global_settings.mongodb_url.unicode_string(),
+            global_settings.mongodb_collection,
         )
         yield client

tests/conftest.py

@@ -13,7 +13,7 @@ async def test_health_check(client: AsyncClient):
             "version": "7.0.8",
             "databases": ["admin", "config", "local"],
             "collections": {
-                "admin": ["system.users", "system.version"],
+                "admin": ["system.version", "system.users"],
                 "config": ["system.sessions"],
                 "local": ["startup_log"],
             },

tests/test_routers.py

@@ -58,6 +58,4 @@ def test_document_response_with_invalid_id(test_id, object_id, expected_exceptio
     with pytest.raises(expected_exception) as exc_info:
         DocumentResponse(id=object_id)
 
-    assert str(
-        exc_info.value
-    ), f"Test case {test_id} failed: Expected exception {expected_exception} was not raised."
+    assert str(exc_info.value), f"Test case {test_id} failed: Expected exception {expected_exception} was not raised."