Make matcher dir the build context for docker images

- Refactor frontend imports as result, also to facilitate pytest testing
- Will facilitate importing shared files (e.g. scripts) to both backend and frontend

backend/Dockerfile

@@ -6,11 +6,11 @@ RUN apt-get update -y && apt-get install libxrender1 -y
 
 WORKDIR /opt
 
-COPY environment.yml requirements.txt ./backend/
+COPY ./backend/environment.yml ./backend/requirements.txt ./backend/
 
 RUN conda env create -f ./backend/environment.yml
 
-COPY . ./backend
+COPY ./backend ./backend
 
 EXPOSE 8001
 

docker-compose.yml

@@ -13,7 +13,8 @@ services:
       - matcher-network
   backend:
     build:
-      context: ./backend
+      context: .
+      dockerfile: ./backend/Dockerfile
     ports:
       - 8001:8001
     environment:
@@ -29,7 +30,8 @@ services:
       - matcher-network
   frontend:
     build:
-      context: ./frontend
+      context: .
+      dockerfile: ./frontend/Dockerfile
     ports:
       - 8000:8000
     environment:

frontend/.dockerignore

@@ -0,0 +1,7 @@
+.env
+.env.example
+Makefile
+__pycache__
+assets
+requirements.dev.txt
+venv

frontend/Dockerfile

@@ -2,18 +2,14 @@ FROM condaforge/miniforge3
 
 WORKDIR /opt
 
-COPY environment.yml requirements.txt ./
+COPY ./frontend/environment.yml ./frontend/requirements.txt ./frontend/
 
-RUN conda env create -f /opt/environment.yml
+RUN conda env create -f ./frontend/environment.yml
 
-COPY frontend_api.py monkey.py config.py dash_app.py ./
-COPY examples/ ./examples/
-COPY css/ ./css/
-COPY js/* ./js/
-COPY ketcher/ ./ketcher/
-COPY pages/ ./pages/
-COPY templates/ ./templates/
+COPY ./frontend ./frontend
 
 EXPOSE 8000
 
-ENTRYPOINT ["conda", "run", "--no-capture-output", "-n", "matcher-frontend", "gunicorn", "--worker-class", "gevent", "--workers", "2", "--bind", "0.0.0.0:8000", "monkey:server"]
+ENV PYTHONPATH=/opt
+
+ENTRYPOINT ["conda", "run", "--no-capture-output", "-n", "matcher-frontend", "gunicorn", "--worker-class", "gevent", "--workers", "2", "--bind", "0.0.0.0:8000", "frontend.monkey:server"]

frontend/dash_app.py

@@ -1,10 +1,10 @@
 from dash import Dash
 
-from frontend_api import app as Flask_app
+from frontend.frontend_api import app as Flask_app
 
 # imports callbacks required to register callbacks with the app
-import pages.rep.callbacks as rep_callbacks  # noqa
-import pages.snap.callbacks as snap_callbacks  # noqa
+import frontend.pages.rep.callbacks as rep_callbacks  # noqa
+import frontend.pages.snap.callbacks as snap_callbacks  # noqa
 
 
 app_dash = Dash(

frontend/monkey.py

@@ -1,4 +1,4 @@
 from gevent import monkey
 monkey.patch_all()
 
-from dash_app import server  # noqa
+from frontend.dash_app import server  # noqa

frontend/pages/common/callbacks.py

@@ -10,8 +10,8 @@
 import pandas as pd
 import plotly.graph_objects as go
 
-from config import backend_root
-from pages.common.pairplot import (
+from frontend.config import backend_root
+from frontend.pages.common.pairplot import (
     get_individual_transforms_df,
     get_group_by_fragment_df,
     get_group_by_fragment_table,

frontend/pages/common/pairplot.py

@@ -2,7 +2,7 @@
 import pandas as pd
 import urllib
 import logging
-from config import external_backend_root
+from frontend.config import external_backend_root
 
 logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)

frontend/pages/rep/callbacks.py

@@ -7,9 +7,9 @@
 from dash import callback, clientside_callback
 from dash.dependencies import Input, Output, State, ALL
 
-from config import backend_root
-from pages.rep.constants import create_id
-from pages.common.callbacks import (instantiate_output_elements, aggregate_statistics_by_rule, selected_point_to_pair_tables, update_graph)
+from frontend.config import backend_root
+from frontend.pages.rep.constants import create_id
+from frontend.pages.common.callbacks import (instantiate_output_elements, aggregate_statistics_by_rule, selected_point_to_pair_tables, update_graph)
 
 logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)

frontend/pages/rep/layout.py

@@ -2,7 +2,7 @@
 from dash import dcc, html
 
 import logging
-from pages.rep.constants import DASH_PAGE_PREFIX, create_id
+from frontend.pages.rep.constants import DASH_PAGE_PREFIX, create_id
 
 logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)

frontend/pages/snap/callbacks.py

@@ -8,9 +8,9 @@
 import pandas as pd
 import requests
 
-from pages.common.callbacks import (run_persistent_query, instantiate_output_elements, aggregate_statistics_by_rule, selected_point_to_pair_tables, update_graph)
-from config import backend_root, external_frontend_root
-from pages.snap.constants import create_id
+from frontend.pages.common.callbacks import (run_persistent_query, instantiate_output_elements, aggregate_statistics_by_rule, selected_point_to_pair_tables, update_graph)
+from frontend.config import backend_root, external_frontend_root
+from frontend.pages.snap.constants import create_id
 
 logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)

frontend/pages/snap/layout.py

@@ -1,7 +1,7 @@
 import dash
 from dash import dcc, html
 
-from pages.snap.constants import DASH_PAGE_PREFIX
+from frontend.pages.snap.constants import DASH_PAGE_PREFIX
 
 dash.register_page(__name__, path=f'/{DASH_PAGE_PREFIX}/')