|
70 | 70 | from fastapi.security import HTTPBearer |
71 | 71 | from minio import Minio |
72 | 72 | from pika.adapters.blocking_connection import BlockingChannel |
| 73 | +import aio_pika |
| 74 | +from aio_pika.abc import AbstractChannel |
73 | 75 | from pymongo import DESCENDING |
74 | 76 | from rocrate.model.person import Person |
75 | 77 | from rocrate.rocrate import ROCrate |
@@ -944,7 +946,7 @@ async def save_file( |
944 | 946 | fs: Minio = Depends(dependencies.get_fs), |
945 | 947 | file: UploadFile = File(...), |
946 | 948 | es=Depends(dependencies.get_elasticsearchclient), |
947 | | - rabbitmq_client: BlockingChannel = Depends(dependencies.get_rabbitmq), |
| 949 | + rabbitmq_client: AbstractChannel = Depends(dependencies.get_rabbitmq), |
948 | 950 | allow: bool = Depends(Authorization("uploader")), |
949 | 951 | ): |
950 | 952 | if (dataset := await DatasetDB.get(PydanticObjectId(dataset_id))) is not None: |
@@ -996,7 +998,7 @@ async def save_files( |
996 | 998 | user=Depends(get_current_user), |
997 | 999 | fs: Minio = Depends(dependencies.get_fs), |
998 | 1000 | es=Depends(dependencies.get_elasticsearchclient), |
999 | | - rabbitmq_client: BlockingChannel = Depends(dependencies.get_rabbitmq), |
| 1001 | + rabbitmq_client: AbstractChannel = Depends(dependencies.get_rabbitmq), |
1000 | 1002 | allow: bool = Depends(Authorization("uploader")), |
1001 | 1003 | ): |
1002 | 1004 | if (dataset := await DatasetDB.get(PydanticObjectId(dataset_id))) is not None: |
@@ -1056,7 +1058,7 @@ async def save_local_file( |
1056 | 1058 | folder_id: Optional[str] = None, |
1057 | 1059 | user=Depends(get_current_user), |
1058 | 1060 | es=Depends(dependencies.get_elasticsearchclient), |
1059 | | - rabbitmq_client: BlockingChannel = Depends(dependencies.get_rabbitmq), |
| 1061 | + rabbitmq_client: AbstractChannel = Depends(dependencies.get_rabbitmq), |
1060 | 1062 | allow: bool = Depends(Authorization("uploader")), |
1061 | 1063 | ): |
1062 | 1064 | if (dataset := await DatasetDB.get(PydanticObjectId(dataset_id))) is not None: |
@@ -1110,7 +1112,7 @@ async def create_dataset_from_zip( |
1110 | 1112 | fs: Minio = Depends(dependencies.get_fs), |
1111 | 1113 | file: UploadFile = File(...), |
1112 | 1114 | es: Elasticsearch = Depends(dependencies.get_elasticsearchclient), |
1113 | | - rabbitmq_client: BlockingChannel = Depends(dependencies.get_rabbitmq), |
| 1115 | + rabbitmq_client: AbstractChannel = Depends(dependencies.get_rabbitmq), |
1114 | 1116 | token: str = Depends(get_token), |
1115 | 1117 | ): |
1116 | 1118 | if file.filename.endswith(".zip") is False: |
@@ -1427,7 +1429,7 @@ async def get_dataset_extract( |
1427 | 1429 | # parameters don't have a fixed model shape |
1428 | 1430 | parameters: dict = None, |
1429 | 1431 | user=Depends(get_current_user), |
1430 | | - rabbitmq_client: BlockingChannel = Depends(dependencies.get_rabbitmq), |
| 1432 | + rabbitmq_client: AbstractChannel = Depends(dependencies.get_rabbitmq), |
1431 | 1433 | allow: bool = Depends(Authorization("uploader")), |
1432 | 1434 | ): |
1433 | 1435 | if extractorName is None: |
|
0 commit comments