From 7334b278496c014fe0ef7e6a03ec3aed2c64f0f7 Mon Sep 17 00:00:00 2001 From: Brian Bjarke Jensen Date: Sun, 25 Feb 2024 17:56:55 +0100 Subject: [PATCH] updated relative imports --- src/__init__.py | 0 src/database/classes.py | 27 ++++++++++++++------------- src/main.py | 3 ++- src/web/__init__.py | 8 ++++---- src/web/app.py | 10 +++++----- src/web/layout/labels.py | 25 ++++++++++++------------- 6 files changed, 37 insertions(+), 36 deletions(-) create mode 100644 src/__init__.py diff --git a/src/__init__.py b/src/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/src/database/classes.py b/src/database/classes.py index eceff66..e3106cc 100644 --- a/src/database/classes.py +++ b/src/database/classes.py @@ -5,24 +5,25 @@ from base64 import b64encode from io import BytesIO from pathlib import Path -from model_experiential import ( - VisualSyntaxModelOutput, -) -from model_interpersonal import AngleModelOutput -from model_interpersonal import ContactModelOutput -from model_interpersonal import DistanceModelOutput -from model_interpersonal import ModalityColorModelOutput -from model_interpersonal import ModalityDepthModelOutput -from model_interpersonal import ModalityLightingModelOutput -from model_interpersonal import PointOfViewModelOutput -from model_textual import FramingModelOutput -from model_textual import InformationValueModelOutput -from model_textual import SalienceModelOutput from PIL import Image from pydantic import BaseModel from pydantic import field_serializer from pydantic import field_validator +from src.model_experiential import ( + VisualSyntaxModelOutput, +) +from src.model_interpersonal import AngleModelOutput +from src.model_interpersonal import ContactModelOutput +from src.model_interpersonal import DistanceModelOutput +from src.model_interpersonal import ModalityColorModelOutput +from src.model_interpersonal import ModalityDepthModelOutput +from src.model_interpersonal import ModalityLightingModelOutput +from src.model_interpersonal import PointOfViewModelOutput +from src.model_textual import FramingModelOutput +from src.model_textual import InformationValueModelOutput +from src.model_textual import SalienceModelOutput + class NoDocumentFoundException(Exception): pass diff --git a/src/main.py b/src/main.py index 9177f3c..803d203 100644 --- a/src/main.py +++ b/src/main.py @@ -5,7 +5,8 @@ import os from pathlib import Path from dotenv import load_dotenv -from web import app + +from src.web import app # prepare optional local setup env_path = Path(__file__).parent.parent / 'local.env' diff --git a/src/web/__init__.py b/src/web/__init__.py index 2bbf8b9..3bb26dd 100644 --- a/src/web/__init__.py +++ b/src/web/__init__.py @@ -1,4 +1,4 @@ -from .app import ( - app, - server -) +from __future__ import annotations + +from src.web.app import app +from src.web.app import server diff --git a/src/web/app.py b/src/web/app.py index fb94d05..b6ece1c 100644 --- a/src/web/app.py +++ b/src/web/app.py @@ -10,14 +10,14 @@ from dash import Input from dash import Output from dash import State from dash_auth import BasicAuth -from database import connect -from database import get_visual_communication -from database import ModelOutputs -from database import NoDocumentFoundException -from database import upsert_annotations from pydantic import ValidationError from .layout import app_layout +from src.database import connect +from src.database import get_visual_communication +from src.database import ModelOutputs +from src.database import NoDocumentFoundException +from src.database import upsert_annotations # setup app app = Dash(__name__, external_stylesheets=[dbc.themes.BOOTSTRAP]) diff --git a/src/web/layout/labels.py b/src/web/layout/labels.py index f89519b..b7081d7 100644 --- a/src/web/layout/labels.py +++ b/src/web/layout/labels.py @@ -3,19 +3,18 @@ from __future__ import annotations import dash_mantine_components as dmc from dash import dcc from dash import html -from model_experiential import ( - VisualSyntaxModelOutput, -) -from model_interpersonal import AngleModelOutput -from model_interpersonal import ContactModelOutput -from model_interpersonal import DistanceModelOutput -from model_interpersonal import ModalityColorModelOutput -from model_interpersonal import ModalityDepthModelOutput -from model_interpersonal import ModalityLightingModelOutput -from model_interpersonal import PointOfViewModelOutput -from model_textual import FramingModelOutput -from model_textual import InformationValueModelOutput -from model_textual import SalienceModelOutput + +from src.model_experiential import VisualSyntaxModelOutput +from src.model_interpersonal import AngleModelOutput +from src.model_interpersonal import ContactModelOutput +from src.model_interpersonal import DistanceModelOutput +from src.model_interpersonal import ModalityColorModelOutput +from src.model_interpersonal import ModalityDepthModelOutput +from src.model_interpersonal import ModalityLightingModelOutput +from src.model_interpersonal import PointOfViewModelOutput +from src.model_textual import FramingModelOutput +from src.model_textual import InformationValueModelOutput +from src.model_textual import SalienceModelOutput def generate_option_labels(model) -> list[str]: