Skip to content

Commit f95221d

Browse files
committed
using abstract channel not blocking channel
1 parent 0017661 commit f95221d

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

backend/app/routers/datasets.py

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,8 @@
7070
from fastapi.security import HTTPBearer
7171
from minio import Minio
7272
from pika.adapters.blocking_connection import BlockingChannel
73+
import aio_pika
74+
from aio_pika.abc import AbstractChannel
7375
from pymongo import DESCENDING
7476
from rocrate.model.person import Person
7577
from rocrate.rocrate import ROCrate
@@ -944,7 +946,7 @@ async def save_file(
944946
fs: Minio = Depends(dependencies.get_fs),
945947
file: UploadFile = File(...),
946948
es=Depends(dependencies.get_elasticsearchclient),
947-
rabbitmq_client: BlockingChannel = Depends(dependencies.get_rabbitmq),
949+
rabbitmq_client: AbstractChannel = Depends(dependencies.get_rabbitmq),
948950
allow: bool = Depends(Authorization("uploader")),
949951
):
950952
if (dataset := await DatasetDB.get(PydanticObjectId(dataset_id))) is not None:
@@ -996,7 +998,7 @@ async def save_files(
996998
user=Depends(get_current_user),
997999
fs: Minio = Depends(dependencies.get_fs),
9981000
es=Depends(dependencies.get_elasticsearchclient),
999-
rabbitmq_client: BlockingChannel = Depends(dependencies.get_rabbitmq),
1001+
rabbitmq_client: AbstractChannel = Depends(dependencies.get_rabbitmq),
10001002
allow: bool = Depends(Authorization("uploader")),
10011003
):
10021004
if (dataset := await DatasetDB.get(PydanticObjectId(dataset_id))) is not None:
@@ -1056,7 +1058,7 @@ async def save_local_file(
10561058
folder_id: Optional[str] = None,
10571059
user=Depends(get_current_user),
10581060
es=Depends(dependencies.get_elasticsearchclient),
1059-
rabbitmq_client: BlockingChannel = Depends(dependencies.get_rabbitmq),
1061+
rabbitmq_client: AbstractChannel = Depends(dependencies.get_rabbitmq),
10601062
allow: bool = Depends(Authorization("uploader")),
10611063
):
10621064
if (dataset := await DatasetDB.get(PydanticObjectId(dataset_id))) is not None:
@@ -1110,7 +1112,7 @@ async def create_dataset_from_zip(
11101112
fs: Minio = Depends(dependencies.get_fs),
11111113
file: UploadFile = File(...),
11121114
es: Elasticsearch = Depends(dependencies.get_elasticsearchclient),
1113-
rabbitmq_client: BlockingChannel = Depends(dependencies.get_rabbitmq),
1115+
rabbitmq_client: AbstractChannel = Depends(dependencies.get_rabbitmq),
11141116
token: str = Depends(get_token),
11151117
):
11161118
if file.filename.endswith(".zip") is False:
@@ -1427,7 +1429,7 @@ async def get_dataset_extract(
14271429
# parameters don't have a fixed model shape
14281430
parameters: dict = None,
14291431
user=Depends(get_current_user),
1430-
rabbitmq_client: BlockingChannel = Depends(dependencies.get_rabbitmq),
1432+
rabbitmq_client: AbstractChannel = Depends(dependencies.get_rabbitmq),
14311433
allow: bool = Depends(Authorization("uploader")),
14321434
):
14331435
if extractorName is None:

0 commit comments

Comments
 (0)