From 7a8eb93c48fa0c399ed623e2dc5d0ec0a139f79c Mon Sep 17 00:00:00 2001 From: brian Date: Sun, 20 Oct 2024 20:15:19 +0000 Subject: [PATCH] updated imports --- misc/model_outputs_from_annotation.py | 4 +- model/src/main.py | 2 +- model/src/models/visual_communication.py | 2 +- shared/mongodb/__init__.py | 6 -- .../mongodb/classes/visual_communication.py | 2 +- .../mongodb/utils/get_visual_communication.py | 2 +- shared/mongodb/utils/upsert_annotation.py | 2 +- shared/mongodb/utils/upsert_prediction.py | 2 +- .../utils/upsert_visual_communication.py | 2 +- web_ui/src/app/init_app.py | 11 +-- web_ui/src/app/layout/labels.py | 84 +++++++++++-------- 11 files changed, 58 insertions(+), 61 deletions(-) diff --git a/misc/model_outputs_from_annotation.py b/misc/model_outputs_from_annotation.py index 1e1ee35..1406b48 100644 --- a/misc/model_outputs_from_annotation.py +++ b/misc/model_outputs_from_annotation.py @@ -1,6 +1,4 @@ -from __future__ import annotations - -from shared.dto import ModelData +from shared.mongodb.classes import ModelData if __name__ == '__main__': # instantiate data object diff --git a/model/src/main.py b/model/src/main.py index b122345..40c6639 100644 --- a/model/src/main.py +++ b/model/src/main.py @@ -10,7 +10,7 @@ from tqdm import tqdm from utils import DEVICE, VCDADataset, load_model from shared.data_store import connect_minio -from shared.dto import ModelData +from shared.mongodb.classes import ModelData from shared.utils import setup_logging if __name__ == '__main__': diff --git a/model/src/models/visual_communication.py b/model/src/models/visual_communication.py index c7403bb..0a841d2 100644 --- a/model/src/models/visual_communication.py +++ b/model/src/models/visual_communication.py @@ -4,7 +4,7 @@ from __future__ import annotations from torch import nn -from shared.dto import ModelData +from shared.mongodb.classes import ModelData from .angle import AngleTail from .contact import ContactTail diff --git a/shared/mongodb/__init__.py b/shared/mongodb/__init__.py index 6ffadda..9550ad5 100644 --- a/shared/mongodb/__init__.py +++ b/shared/mongodb/__init__.py @@ -1,9 +1,3 @@ -"""Database module content.""" - -from __future__ import annotations - -from .classes.dataset import Dataset -from .classes.visual_communication import VisualCommunication from .utils.connect_mongodb import connect_mongodb from .utils.count_documents import count_documents from .utils.get_visual_communication import get_visual_communication diff --git a/shared/mongodb/classes/visual_communication.py b/shared/mongodb/classes/visual_communication.py index 4049a4a..c7ed7ef 100755 --- a/shared/mongodb/classes/visual_communication.py +++ b/shared/mongodb/classes/visual_communication.py @@ -13,7 +13,7 @@ from pydantic import BaseModel, ConfigDict from pymongo.collection import Collection from shared.data_store import get, put -from shared.dto import ModelData +from shared.mongodb.classes import ModelData class VisualCommunication(BaseModel): diff --git a/shared/mongodb/utils/get_visual_communication.py b/shared/mongodb/utils/get_visual_communication.py index edf9d5c..b9c0dbb 100755 --- a/shared/mongodb/utils/get_visual_communication.py +++ b/shared/mongodb/utils/get_visual_communication.py @@ -6,7 +6,7 @@ import logging from pymongo.collection import Collection -from shared.mongodb import VisualCommunication +from shared.mongodb.classes import VisualCommunication from shared.mongodb.exceptions import NoDocumentFoundException diff --git a/shared/mongodb/utils/upsert_annotation.py b/shared/mongodb/utils/upsert_annotation.py index ea7c8ae..9e61bcc 100755 --- a/shared/mongodb/utils/upsert_annotation.py +++ b/shared/mongodb/utils/upsert_annotation.py @@ -4,7 +4,7 @@ import logging from pymongo.collection import Collection -from shared.dto import ModelData +from shared.mongodb.classes import ModelData def upsert_annotation( diff --git a/shared/mongodb/utils/upsert_prediction.py b/shared/mongodb/utils/upsert_prediction.py index 88388d3..0f4d628 100755 --- a/shared/mongodb/utils/upsert_prediction.py +++ b/shared/mongodb/utils/upsert_prediction.py @@ -4,7 +4,7 @@ import logging from pymongo.collection import Collection -from shared.dto import ModelData +from shared.mongodb.classes import ModelData def upsert_prediction( diff --git a/shared/mongodb/utils/upsert_visual_communication.py b/shared/mongodb/utils/upsert_visual_communication.py index b7c9462..a69b9fa 100755 --- a/shared/mongodb/utils/upsert_visual_communication.py +++ b/shared/mongodb/utils/upsert_visual_communication.py @@ -2,7 +2,7 @@ from __future__ import annotations from pymongo.collection import Collection -from shared.mongodb import VisualCommunication +from shared.mongodb.classes import VisualCommunication def upsert_visual_communication( diff --git a/web_ui/src/app/init_app.py b/web_ui/src/app/init_app.py index 9a6c3e5..632d3d4 100644 --- a/web_ui/src/app/init_app.py +++ b/web_ui/src/app/init_app.py @@ -13,14 +13,9 @@ from pydantic import ValidationError from pymongo.collection import Collection from shared.data_store import delete as delete_from_minio -from shared.dto import ModelData -from shared.mongodb import ( - NoDocumentFoundException, - VisualCommunication, - count_documents, - get_visual_communication, - upsert_annotation, -) +from shared.mongodb import count_documents, get_visual_communication, upsert_annotation +from shared.mongodb.classes import ModelData, VisualCommunication +from shared.mongodb.exceptions import NoDocumentFoundException from .layout import app_layout diff --git a/web_ui/src/app/layout/labels.py b/web_ui/src/app/layout/labels.py index c87f4a0..a4ec822 100644 --- a/web_ui/src/app/layout/labels.py +++ b/web_ui/src/app/layout/labels.py @@ -1,20 +1,21 @@ from __future__ import annotations import dash_mantine_components as dmc -from dash import dcc -from dash import html +from dash import dcc, html -from shared.dto import AngleData -from shared.dto import ContactData -from shared.dto import DistanceData -from shared.dto import FramingData -from shared.dto import InformationValueData -from shared.dto import ModalityColorData -from shared.dto import ModalityDepthData -from shared.dto import ModalityLightingData -from shared.dto import PointOfViewData -from shared.dto import SalienceData -from shared.dto import VisualSyntaxData +from shared.mongodb.classes import ( + AngleData, + ContactData, + DistanceData, + FramingData, + InformationValueData, + ModalityColorData, + ModalityDepthData, + ModalityLightingData, + PointOfViewData, + SalienceData, + VisualSyntaxData, +) def generate_visual_syntax_options_map(): @@ -54,54 +55,63 @@ experiential_map = generate_visual_syntax_options_map() experiential_container = dmc.Col( children=[ html.H4('experiential'.title()), - ], span=5, + ], + span=5, ) for title, options in experiential_map.items(): id_dict = {'type': 'annotation', 'index': title.replace('_', '-')} experiential_container.children.append( - dmc.Container([ - html.B(title.title()), - dcc.RadioItems( - options=[text.replace('_', ' ') for text in options], - id=id_dict, - ), - ]), + dmc.Container( + [ + html.B(title.title()), + dcc.RadioItems( + options=[text.replace('_', ' ') for text in options], + id=id_dict, + ), + ], + ), ) # prepare interpersonal container interpersonal_map = generate_interpersonal_options_map() interpersonal_container = dmc.Col( children=[ html.H4('interpersonal'.title()), - ], span=3, + ], + span=3, ) for title, options in interpersonal_map.items(): id_dict = {'type': 'annotation', 'index': title.replace('_', '-')} interpersonal_container.children.append( - dmc.Container([ - html.B(title.title()), - dcc.RadioItems( - options=[text.replace('_', ' ') for text in options], - id=id_dict, - ), - ]), + dmc.Container( + [ + html.B(title.title()), + dcc.RadioItems( + options=[text.replace('_', ' ') for text in options], + id=id_dict, + ), + ], + ), ) # prepare textual container textual_map = generate_textual_options_map() textual_container = dmc.Col( children=[ html.H4('textual'.title()), - ], span=4, + ], + span=4, ) for title, options in textual_map.items(): id_dict = {'type': 'annotation', 'index': title.replace('_', '-')} textual_container.children.append( - dmc.Container([ - html.B(title.title()), - dcc.RadioItems( - options=[text.replace('_', ' ') for text in options], - id=id_dict, - ), - ]), + dmc.Container( + [ + html.B(title.title()), + dcc.RadioItems( + options=[text.replace('_', ' ') for text in options], + id=id_dict, + ), + ], + ), ) labels_element = dmc.Grid(