From 78f3f9aa56e9c05dc7608597cecbdb138a919197 Mon Sep 17 00:00:00 2001 From: Mehmed Mustafa Date: Mon, 22 Dec 2025 15:05:45 +0100 Subject: [PATCH 1/3] update: beanie version --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 0e8180d17..353d15296 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ atomicwrites >= 1.3.0 -beanie~=1.7 +beanie>=2.0.1 click >=7 cryptography < 43.0.0 Deprecated == 1.2.0 From fabf0e613cef8267422fec714492abff0328279d Mon Sep 17 00:00:00 2001 From: Mehmed Mustafa Date: Mon, 22 Dec 2025 15:43:57 +0100 Subject: [PATCH 2/3] add: motor requirement --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index 353d15296..ee20bc8da 100644 --- a/requirements.txt +++ b/requirements.txt @@ -18,6 +18,7 @@ jsonschema>=4 loky lxml memory-profiler >= 0.58.0 +motor >= 3.7.1 # XXX explicitly do not restrict the numpy version because different # tensorflow versions might require different versions numpy From a890d203dd56b132815837e3b17704aad8656932 Mon Sep 17 00:00:00 2001 From: Mehmed Mustafa Date: Mon, 22 Dec 2025 16:23:07 +0100 Subject: [PATCH 3/3] try: replacing motor with pymongo native async --- requirements.txt | 2 +- src/ocrd_network/database.py | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/requirements.txt b/requirements.txt index ee20bc8da..9e0a0a7b9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -18,7 +18,6 @@ jsonschema>=4 loky lxml memory-profiler >= 0.58.0 -motor >= 3.7.1 # XXX explicitly do not restrict the numpy version because different # tensorflow versions might require different versions numpy @@ -29,6 +28,7 @@ paramiko pika>=1.2.0 Pillow >= 7.2.0 pydantic >= 2.0.0 +pymongo >= 4.15.5 python-magic python-multipart pyyaml diff --git a/src/ocrd_network/database.py b/src/ocrd_network/database.py index a29e5c39d..d29db011f 100644 --- a/src/ocrd_network/database.py +++ b/src/ocrd_network/database.py @@ -14,9 +14,8 @@ """ from beanie import init_beanie from beanie.operators import In -from motor.motor_asyncio import AsyncIOMotorClient from pathlib import Path -from pymongo import MongoClient, uri_parser as mongo_uri_parser +from pymongo import AsyncMongoClient, MongoClient, uri_parser as mongo_uri_parser from re import sub as re_sub from typing import List from uuid import uuid4 @@ -26,7 +25,7 @@ async def initiate_database(db_url: str, db_name: str = 'ocrd'): - client = AsyncIOMotorClient(db_url) + client = AsyncMongoClient(db_url) await init_beanie( database=client.get_default_database(default=db_name), document_models=[DBProcessorJob, DBWorkflowJob, DBWorkspace, DBWorkflowScript]