From 30f37b6ca5d9d960ef0f7e0c181c933ff09dd355 Mon Sep 17 00:00:00 2001 From: brian Date: Thu, 24 Oct 2024 16:19:52 +0000 Subject: [PATCH] renamed module --- misc/generate_random_prediction.py | 2 +- misc/get_visual_communication.py | 2 +- misc/image_upload.py | 2 +- misc/image_upload_to_server.py | 2 +- misc/model_io.py | 2 +- misc/new_model_to_minio.py | 2 +- misc/prediction_upload.py | 2 +- model/src/main.py | 2 +- model/src/utils/load_model.py | 2 +- model/src/utils/vcda_dataset.py | 2 +- model/train.py | 2 +- other/transfer_images_minio_subfolder.py | 2 +- other/transfer_images_mongo_minio.py | 2 +- pyproject.toml | 2 +- shared/{data_store => datastore}/__init__.py | 0 shared/{data_store => datastore}/connect_minio.py | 0 shared/{data_store => datastore}/delete.py | 0 shared/{data_store => datastore}/get.py | 0 shared/{data_store => datastore}/get_image.py | 0 shared/{data_store => datastore}/get_model.py | 0 shared/{data_store => datastore}/put.py | 0 shared/{data_store => datastore}/put_image.py | 0 shared/{data_store => datastore}/put_model.py | 0 shared/mongodb/src/classes/visual_communication.py | 2 +- web_ui/src/app/init_app.py | 2 +- web_ui/src/main.py | 2 +- 26 files changed, 17 insertions(+), 17 deletions(-) rename shared/{data_store => datastore}/__init__.py (100%) rename shared/{data_store => datastore}/connect_minio.py (100%) rename shared/{data_store => datastore}/delete.py (100%) rename shared/{data_store => datastore}/get.py (100%) rename shared/{data_store => datastore}/get_image.py (100%) rename shared/{data_store => datastore}/get_model.py (100%) rename shared/{data_store => datastore}/put.py (100%) rename shared/{data_store => datastore}/put_image.py (100%) rename shared/{data_store => datastore}/put_model.py (100%) diff --git a/misc/generate_random_prediction.py b/misc/generate_random_prediction.py index 61376fd..aea921a 100644 --- a/misc/generate_random_prediction.py +++ b/misc/generate_random_prediction.py @@ -4,7 +4,7 @@ from pathlib import Path from dotenv import load_dotenv -from shared.data_store import connect_minio +from shared.datastore import connect_minio from shared.mongodb import connect_mongodb from shared.mongodb.classes import VisualCommunication from shared.utils import check_env, setup_logging diff --git a/misc/get_visual_communication.py b/misc/get_visual_communication.py index 7b62f8d..b8885c5 100644 --- a/misc/get_visual_communication.py +++ b/misc/get_visual_communication.py @@ -4,7 +4,7 @@ from pathlib import Path from dotenv import load_dotenv -from shared.data_store import connect_minio +from shared.datastore import connect_minio from shared.mongodb import connect_mongodb, get_visual_communication from shared.utils import check_env, setup_logging from web_ui.src.main import NECESSARY_ENV_VAR_LIST diff --git a/misc/image_upload.py b/misc/image_upload.py index 7dcf67b..2a85e40 100644 --- a/misc/image_upload.py +++ b/misc/image_upload.py @@ -5,7 +5,7 @@ from pathlib import Path from dotenv import load_dotenv from pymongo.errors import DuplicateKeyError -from shared.data_store import connect_minio +from shared.datastore import connect_minio from shared.mongodb import connect_mongodb from shared.mongodb.classes import VisualCommunication from shared.utils import check_env, setup_logging diff --git a/misc/image_upload_to_server.py b/misc/image_upload_to_server.py index bef91af..4c8f02e 100644 --- a/misc/image_upload_to_server.py +++ b/misc/image_upload_to_server.py @@ -5,7 +5,7 @@ from pathlib import Path from dotenv import load_dotenv from pymongo.errors import DuplicateKeyError -from shared.data_store import connect_minio +from shared.datastore import connect_minio from shared.mongodb import connect_mongodb from shared.mongodb.classes import VisualCommunication from shared.utils import check_env, setup_logging diff --git a/misc/model_io.py b/misc/model_io.py index c66b222..d6d7635 100644 --- a/misc/model_io.py +++ b/misc/model_io.py @@ -7,7 +7,7 @@ from dotenv import load_dotenv from torchinfo import summary from model.src.models import VisualCommunicationModel -from shared.data_store import connect_minio, put_model +from shared.datastore import connect_minio, put_model from shared.utils import setup_logging DEVICE = torch.device('cuda' if torch.cuda.is_available() else 'cpu') diff --git a/misc/new_model_to_minio.py b/misc/new_model_to_minio.py index 33234e3..2f516a0 100644 --- a/misc/new_model_to_minio.py +++ b/misc/new_model_to_minio.py @@ -7,7 +7,7 @@ from dotenv import load_dotenv from torchinfo import summary from model.src.models import VisualCommunicationModel -from shared.data_store import connect_minio, put_model +from shared.datastore import connect_minio, put_model from shared.utils import setup_logging if __name__ == '__main__': diff --git a/misc/prediction_upload.py b/misc/prediction_upload.py index 4590ede..6c27211 100644 --- a/misc/prediction_upload.py +++ b/misc/prediction_upload.py @@ -4,7 +4,7 @@ from pathlib import Path from dotenv import load_dotenv -from shared.data_store import connect_minio +from shared.datastore import connect_minio from shared.mongodb import connect_mongodb, upsert_prediction from shared.mongodb.classes import VisualCommunication from shared.utils import check_env, setup_logging diff --git a/model/src/main.py b/model/src/main.py index 40c6639..45cd7eb 100644 --- a/model/src/main.py +++ b/model/src/main.py @@ -9,7 +9,7 @@ from models import VisualCommunicationModel from tqdm import tqdm from utils import DEVICE, VCDADataset, load_model -from shared.data_store import connect_minio +from shared.datastore import connect_minio from shared.mongodb.classes import ModelData from shared.utils import setup_logging diff --git a/model/src/utils/load_model.py b/model/src/utils/load_model.py index 579421f..311539f 100644 --- a/model/src/utils/load_model.py +++ b/model/src/utils/load_model.py @@ -7,7 +7,7 @@ import torch from minio import Minio from model.src.models import VisualCommunicationModel -from shared.data_store import get_model +from shared.datastore import get_model from .get_model_name import get_model_name diff --git a/model/src/utils/vcda_dataset.py b/model/src/utils/vcda_dataset.py index edb5fc4..8f97a4b 100644 --- a/model/src/utils/vcda_dataset.py +++ b/model/src/utils/vcda_dataset.py @@ -16,7 +16,7 @@ from torchvision.transforms.functional import ( to_tensor, ) -from shared.data_store import get_image +from shared.datastore import get_image # resnet18 original normalization values RESNET_NORMALIZE_MEAN = [0.485, 0.456, 0.406] diff --git a/model/train.py b/model/train.py index 8a13519..d75904e 100644 --- a/model/train.py +++ b/model/train.py @@ -18,7 +18,7 @@ from torch.optim.lr_scheduler import ExponentialLR from torch.utils.data import DataLoader from model.src.utils import VCDADataset, get_class -from shared.data_store import connect_minio +from shared.datastore import connect_minio def parse_arguments(): diff --git a/other/transfer_images_minio_subfolder.py b/other/transfer_images_minio_subfolder.py index 0cba16a..c531892 100644 --- a/other/transfer_images_minio_subfolder.py +++ b/other/transfer_images_minio_subfolder.py @@ -5,7 +5,7 @@ from pathlib import Path from dotenv import load_dotenv from PIL import Image -from shared.data_store import connect_minio, get, put_image +from shared.datastore import connect_minio, get, put_image from shared.utils import setup_logging if __name__ == '__main__': diff --git a/other/transfer_images_mongo_minio.py b/other/transfer_images_mongo_minio.py index d308eed..b8d38c9 100644 --- a/other/transfer_images_mongo_minio.py +++ b/other/transfer_images_mongo_minio.py @@ -10,7 +10,7 @@ from bson import ObjectId from dotenv import load_dotenv from pymongo.collection import Collection -from shared.data_store import connect_minio, put +from shared.datastore import connect_minio, put from shared.mongodb import connect_mongodb from shared.mongodb.classes import VisualCommunication from shared.utils import check_env, setup_logging diff --git a/pyproject.toml b/pyproject.toml index 9783a98..24c6fb4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -108,7 +108,7 @@ module = "utils.*" ignore_missing_imports = true [[tool.mypy.overrides]] -module = "data_store.*" +module = "datastore.*" ignore_missing_imports = true [[tool.mypy.overrides]] diff --git a/shared/data_store/__init__.py b/shared/datastore/__init__.py similarity index 100% rename from shared/data_store/__init__.py rename to shared/datastore/__init__.py diff --git a/shared/data_store/connect_minio.py b/shared/datastore/connect_minio.py similarity index 100% rename from shared/data_store/connect_minio.py rename to shared/datastore/connect_minio.py diff --git a/shared/data_store/delete.py b/shared/datastore/delete.py similarity index 100% rename from shared/data_store/delete.py rename to shared/datastore/delete.py diff --git a/shared/data_store/get.py b/shared/datastore/get.py similarity index 100% rename from shared/data_store/get.py rename to shared/datastore/get.py diff --git a/shared/data_store/get_image.py b/shared/datastore/get_image.py similarity index 100% rename from shared/data_store/get_image.py rename to shared/datastore/get_image.py diff --git a/shared/data_store/get_model.py b/shared/datastore/get_model.py similarity index 100% rename from shared/data_store/get_model.py rename to shared/datastore/get_model.py diff --git a/shared/data_store/put.py b/shared/datastore/put.py similarity index 100% rename from shared/data_store/put.py rename to shared/datastore/put.py diff --git a/shared/data_store/put_image.py b/shared/datastore/put_image.py similarity index 100% rename from shared/data_store/put_image.py rename to shared/datastore/put_image.py diff --git a/shared/data_store/put_model.py b/shared/datastore/put_model.py similarity index 100% rename from shared/data_store/put_model.py rename to shared/datastore/put_model.py diff --git a/shared/mongodb/src/classes/visual_communication.py b/shared/mongodb/src/classes/visual_communication.py index c7ed7ef..9c0383f 100755 --- a/shared/mongodb/src/classes/visual_communication.py +++ b/shared/mongodb/src/classes/visual_communication.py @@ -12,7 +12,7 @@ from PIL import Image from pydantic import BaseModel, ConfigDict from pymongo.collection import Collection -from shared.data_store import get, put +from shared.datastore import get, put from shared.mongodb.classes import ModelData diff --git a/web_ui/src/app/init_app.py b/web_ui/src/app/init_app.py index 632d3d4..1187e73 100644 --- a/web_ui/src/app/init_app.py +++ b/web_ui/src/app/init_app.py @@ -12,7 +12,7 @@ from minio import Minio from pydantic import ValidationError from pymongo.collection import Collection -from shared.data_store import delete as delete_from_minio +from shared.datastore import delete as delete_from_minio from shared.mongodb import count_documents, get_visual_communication, upsert_annotation from shared.mongodb.classes import ModelData, VisualCommunication from shared.mongodb.exceptions import NoDocumentFoundException diff --git a/web_ui/src/main.py b/web_ui/src/main.py index 6d6fbd5..d5a6de7 100644 --- a/web_ui/src/main.py +++ b/web_ui/src/main.py @@ -4,7 +4,7 @@ from __future__ import annotations import os -from shared.data_store import connect_minio +from shared.datastore import connect_minio from shared.mongodb import connect_mongodb from shared.utils import check_env, setup_logging