From 657e9c4b1dc48880004612fe975b8af4b9217913 Mon Sep 17 00:00:00 2001 From: Brian Bjarke Jensen Date: Wed, 20 Mar 2024 19:13:31 +0100 Subject: [PATCH] updated imports --- tests/generate_random_prediction_test.py | 2 +- tests/get_visual_communication_test.py | 5 +++-- tests/image_download_test.py | 5 +++-- tests/image_upload_test.py | 5 +++-- tests/image_upload_to_server_test.py | 4 ++-- tests/model_outputs_from_annotation_test.py | 4 ++-- tests/prediction_upload_test.py | 7 ++++--- tests/total_annotated_test.py | 9 ++++++--- tests/total_documents_test.py | 9 ++++++--- 9 files changed, 30 insertions(+), 20 deletions(-) diff --git a/tests/generate_random_prediction_test.py b/tests/generate_random_prediction_test.py index ead903a..c97e54c 100644 --- a/tests/generate_random_prediction_test.py +++ b/tests/generate_random_prediction_test.py @@ -2,7 +2,7 @@ from __future__ import annotations from pathlib import Path -from database import VisualCommunication +from core.database.classes import VisualCommunication if __name__ == '__main__': diff --git a/tests/get_visual_communication_test.py b/tests/get_visual_communication_test.py index f701f2a..6cd29cc 100644 --- a/tests/get_visual_communication_test.py +++ b/tests/get_visual_communication_test.py @@ -3,10 +3,11 @@ from __future__ import annotations import os from pathlib import Path -from database import connect -from database import get_visual_communication from dotenv import load_dotenv +from core.database import connect +from core.database import get_visual_communication + if __name__ == '__main__': # prepare env vars env_path = Path(__file__).parent.parent / 'local.env' diff --git a/tests/image_download_test.py b/tests/image_download_test.py index 76a166f..8f94244 100644 --- a/tests/image_download_test.py +++ b/tests/image_download_test.py @@ -3,10 +3,11 @@ from __future__ import annotations import os from pathlib import Path -from database import connect -from database import VisualCommunication from dotenv import load_dotenv +from core.database import connect +from core.database.classes import VisualCommunication + if __name__ == '__main__': # prepare env vars env_path = Path(__file__).parent.parent / 'local.env' diff --git a/tests/image_upload_test.py b/tests/image_upload_test.py index 30447e7..4a99c71 100644 --- a/tests/image_upload_test.py +++ b/tests/image_upload_test.py @@ -3,11 +3,12 @@ from __future__ import annotations import os from pathlib import Path -from database import connect -from database import VisualCommunication from dotenv import load_dotenv from pymongo.errors import DuplicateKeyError +from core.database import connect +from core.database.classes import VisualCommunication + if __name__ == '__main__': # get list of image paths test_dir = Path(__file__).parent diff --git a/tests/image_upload_to_server_test.py b/tests/image_upload_to_server_test.py index 3ce29b2..5db75e2 100644 --- a/tests/image_upload_to_server_test.py +++ b/tests/image_upload_to_server_test.py @@ -5,8 +5,8 @@ from pathlib import Path from dotenv import load_dotenv from pymongo.errors import DuplicateKeyError -from src.database import connect -from src.database import VisualCommunication +from core.database import connect +from core.database import VisualCommunication if __name__ == '__main__': # get list of image paths diff --git a/tests/model_outputs_from_annotation_test.py b/tests/model_outputs_from_annotation_test.py index e3dc04e..c4844fb 100644 --- a/tests/model_outputs_from_annotation_test.py +++ b/tests/model_outputs_from_annotation_test.py @@ -1,12 +1,12 @@ from __future__ import annotations -from database import ModelOutputs +from core.dto import ModelData if __name__ == '__main__': # instantiate data object vis_com_list = [ - ModelOutputs.from_random() + ModelData.from_random() for i in range(3) ] diff --git a/tests/prediction_upload_test.py b/tests/prediction_upload_test.py index e517b84..94246c0 100644 --- a/tests/prediction_upload_test.py +++ b/tests/prediction_upload_test.py @@ -4,11 +4,12 @@ import logging import os from pathlib import Path -from database import connect -from database import upsert_predictions -from database import VisualCommunication from dotenv import load_dotenv +from core.database import connect +from core.database import upsert_predictions +from core.database.classes import VisualCommunication + if __name__ == '__main__': # setup logging fmt = ( diff --git a/tests/total_annotated_test.py b/tests/total_annotated_test.py index 355a90d..0dafadb 100644 --- a/tests/total_annotated_test.py +++ b/tests/total_annotated_test.py @@ -3,10 +3,11 @@ from __future__ import annotations import os from pathlib import Path -from database import connect -from database import total_annotated from dotenv import load_dotenv +from core.database import connect +from core.database import total_documents + if __name__ == '__main__': # prepare env vars env_path = Path(__file__).parent.parent / 'local.env' @@ -16,5 +17,7 @@ if __name__ == '__main__': # connect to database collection, db, client = connect() # get visual communication - num_docs = total_annotated(collection) + num_docs = total_documents( + collection=collection, + ) print(f"number of annotated documents in database: {num_docs}") diff --git a/tests/total_documents_test.py b/tests/total_documents_test.py index 7a150f4..e6e04a7 100644 --- a/tests/total_documents_test.py +++ b/tests/total_documents_test.py @@ -3,10 +3,11 @@ from __future__ import annotations import os from pathlib import Path -from database import connect -from database import total_documents from dotenv import load_dotenv +from core.database import connect +from core.database import total_documents + if __name__ == '__main__': # prepare env vars env_path = Path(__file__).parent.parent / 'local.env' @@ -16,5 +17,7 @@ if __name__ == '__main__': # connect to database collection, db, client = connect() # get visual communication - num_docs = total_documents(collection) + num_docs = total_documents( + collection=collection, + ) print(f"total number of documents in database: {num_docs}")