From 0c0edd3763169f0b93fa20348aff0a60820376fd Mon Sep 17 00:00:00 2001
From: Robert Bartel <robert.bartel@noaa.gov>
Date: Fri, 2 Aug 2024 14:53:20 -0400
Subject: [PATCH 1/9] Deprecate non-working communication pkg funcs.

Marking several utility functions (used by some broken places in GUI
code) as deprecated, largely because they don't actually work.
---
 .../dmod/communication/maas_request/utilities.py              | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/python/lib/communication/dmod/communication/maas_request/utilities.py b/python/lib/communication/dmod/communication/maas_request/utilities.py
index dc78924c5..fe1b5f69f 100644
--- a/python/lib/communication/dmod/communication/maas_request/utilities.py
+++ b/python/lib/communication/dmod/communication/maas_request/utilities.py
@@ -1,6 +1,8 @@
 from .model_exec_request import ModelExecRequest, get_available_models
+from deprecated import deprecated
 
 
+@deprecated("Avoid broken util functions not updated for recent message changes")
 def get_available_outputs() -> set:
     """
     :return: A collection of all valid outputs across any model
@@ -13,6 +15,7 @@ def get_available_outputs() -> set:
     return all_outputs
 
 
+@deprecated("Avoid broken util functions not updated for recent message changes")
 def get_distribution_types() -> set:
     """
     :return: The distribution types used across any model
@@ -25,6 +28,7 @@ def get_distribution_types() -> set:
     return all_types
 
 
+@deprecated("Avoid broken util functions not updated for recent message changes")
 def get_parameters() -> dict:
     """
     Maps each model to the natural and human readable forms of all of their parameters

From 9ed1d8558074726d390140a1e5c0ec2f8f1a3f86 Mon Sep 17 00:00:00 2001
From: Robert Bartel <robert.bartel@noaa.gov>
Date: Fri, 2 Aug 2024 14:54:02 -0400
Subject: [PATCH 2/9] Bump communication version to 0.21.1.

---
 python/lib/communication/dmod/communication/_version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/python/lib/communication/dmod/communication/_version.py b/python/lib/communication/dmod/communication/_version.py
index e45337122..8c306aa66 100644
--- a/python/lib/communication/dmod/communication/_version.py
+++ b/python/lib/communication/dmod/communication/_version.py
@@ -1 +1 @@
-__version__ = '0.21.0'
+__version__ = '0.21.1'

From 14564a03df45e518200be20501c246cd828cdfe3 Mon Sep 17 00:00:00 2001
From: Robert Bartel <robert.bartel@noaa.gov>
Date: Fri, 2 Aug 2024 14:59:38 -0400
Subject: [PATCH 3/9] Fix GUI config for django.contrib.staticfiles.

Adding required STATIC_ROOT to be main static directory, and removing
the addition of this directory in things scanned by the static file
finders (i.e., since root, have other found things put here); this was
needed to fix issues with static files from main model exec GUI app,
which were not being found with previous config.
---
 python/gui/maas_experiment/application_values.py | 2 ++
 python/gui/maas_experiment/settings.py           | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/python/gui/maas_experiment/application_values.py b/python/gui/maas_experiment/application_values.py
index 39f7344a8..297a6ae36 100644
--- a/python/gui/maas_experiment/application_values.py
+++ b/python/gui/maas_experiment/application_values.py
@@ -173,6 +173,8 @@ def get_full_localtimezone():
 BASE_DIRECTORY = Path(__file__).resolve().parent.parent
 """The path to the base directory of the service"""
 
+STATIC_ROOT = BASE_DIRECTORY / "static"
+
 STATIC_RESOURCE_DIRECTORY = BASE_DIRECTORY / "static" / "resources"
 
 APPLICATION_NAME = os.environ.get("APPLICATION_NAME", "Model as a Service")
diff --git a/python/gui/maas_experiment/settings.py b/python/gui/maas_experiment/settings.py
index 42938835a..589b5e444 100644
--- a/python/gui/maas_experiment/settings.py
+++ b/python/gui/maas_experiment/settings.py
@@ -134,5 +134,4 @@
 
 STATIC_URL = '/static/'
 STATICFILES_DIRS = [
-    BASE_DIRECTORY / "static"
 ]

From 7b72d01d5c0ab78adcfc854773cd194669e17c37 Mon Sep 17 00:00:00 2001
From: Robert Bartel <robert.bartel@noaa.gov>
Date: Fri, 2 Aug 2024 15:01:06 -0400
Subject: [PATCH 4/9] Adding required daphne dependency for GUI.

Adding daphne to dependencies.txt to install this requirment in GUI
image build.
---
 python/gui/dependencies.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/python/gui/dependencies.txt b/python/gui/dependencies.txt
index 82c66ba24..63daec4a2 100644
--- a/python/gui/dependencies.txt
+++ b/python/gui/dependencies.txt
@@ -18,3 +18,4 @@ channels-redis
 djangorestframework
 psycopg2-binary  # TODO: get source package in future. Note that psycopg2 cannot be used on Mac; psycopg2-binary must be used
 numpy
+daphne

From 94bda9b8b80829d571b8472d7fe9f5e784b3329d Mon Sep 17 00:00:00 2001
From: Robert Bartel <robert.bartel@noaa.gov>
Date: Fri, 2 Aug 2024 15:03:49 -0400
Subject: [PATCH 5/9] Have base maas GUI template use new CSS standard.

Moving base maas config html template to use css/master.css instead of
common/css/base.css for consistent presentation.
---
 python/gui/MaaS/templates/base.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/python/gui/MaaS/templates/base.html b/python/gui/MaaS/templates/base.html
index 2d7d4fc7c..103ca5684 100644
--- a/python/gui/MaaS/templates/base.html
+++ b/python/gui/MaaS/templates/base.html
@@ -1,12 +1,12 @@
+{% load static %}
 <!DOCTYPE html>
 <html lang="en">
     <head>
         <meta charset="UTF-8">
         <title>{{ title|default:"Distributed Model on Demand" }}</title>
-        {% load static %}
         <link rel="shortcut icon" type="image/png" href="{% static 'common/img/favicon.png' %}"/>
         <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js"></script>
-        <link rel="stylesheet" href="{% static 'common/css/base.css' %}"/>
+        <link rel="stylesheet" href="{% static 'css/master.css' %}"/>
         {% block styles %}{% endblock styles %}
         <script>
             var startup_scripts = [];

From e0a67069ab84c9f37d90ab0f768cbca0a77acb29 Mon Sep 17 00:00:00 2001
From: Robert Bartel <robert.bartel@noaa.gov>
Date: Fri, 2 Aug 2024 15:05:40 -0400
Subject: [PATCH 6/9] Adjust banner of ngen config GUI view.

---
 python/gui/MaaS/templates/maas/configuration/ngen.html | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/python/gui/MaaS/templates/maas/configuration/ngen.html b/python/gui/MaaS/templates/maas/configuration/ngen.html
index 53b1140eb..fd7f0c84b 100644
--- a/python/gui/MaaS/templates/maas/configuration/ngen.html
+++ b/python/gui/MaaS/templates/maas/configuration/ngen.html
@@ -20,6 +20,10 @@
     <link rel="stylesheet" href="{% static 'maas/css/configuration/ngen.css' %}"/>
 {% endblock styles %}
 
+{% block bannercontent %}
+    <h1>Configuration</h1>
+{% endblock bannercontent %}
+
 {% block content %}
 <div id="content" style="padding: 5px;">
     <form id="configuration-wrapper" method="post" action="{% url 'MaaS:execute' %}">

From 2f398b2123417d390e824e9d51d5e52daa705491 Mon Sep 17 00:00:00 2001
From: Robert Bartel <robert.bartel@noaa.gov>
Date: Fri, 2 Aug 2024 15:07:26 -0400
Subject: [PATCH 7/9] Fix out-of-date GUI classes to add URLs back.

Fixing some GUI classes that were broken and not update after changes to
dmod.communication package, and then re-added URL to Django config that
were taken out due to the previous classes breaking.
---
 python/gui/MaaS/cbv/DMODProxy.py | 11 +++++----
 python/gui/MaaS/cbv/EditView.py  | 40 +++++++++++++++++---------------
 python/gui/MaaS/client.py        |  8 +++----
 python/gui/MaaS/urls.py          |  6 ++---
 4 files changed, 34 insertions(+), 31 deletions(-)

diff --git a/python/gui/MaaS/cbv/DMODProxy.py b/python/gui/MaaS/cbv/DMODProxy.py
index fc0fcb7a1..28a7551c8 100644
--- a/python/gui/MaaS/cbv/DMODProxy.py
+++ b/python/gui/MaaS/cbv/DMODProxy.py
@@ -11,8 +11,9 @@
 import logging
 logger = logging.getLogger("gui_log")
 
-from dmod.communication import Distribution, get_available_models, get_available_outputs, get_request, get_parameters, \
-    NWMRequestJsonValidator, NWMRequest, ExternalRequest, ExternalRequestResponse, ModelExecRequestClient, Scalar, MessageEventType
+from dmod.communication import (Distribution, get_available_models, get_available_outputs, get_request, get_parameters,
+                                NWMRequestJsonValidator, NWMRequest, ExternalRequest, ExternalRequestClient,
+                                ExternalRequestResponse, Scalar, MessageEventType)
 from pathlib import Path
 from typing import List, Optional, Tuple, Type
 
@@ -200,7 +201,7 @@ def maas_request(self) -> ExternalRequest:
         return self._maas_request
 
 
-class PostFormRequestClient(ModelExecRequestClient):
+class PostFormRequestClient(ExternalRequestClient):
     """
     A client for websocket interaction with the MaaS request handler as initiated by a POST form HTTP request.
     """
@@ -251,7 +252,7 @@ def _acquire_session_info(self, use_current_values: bool = True, force_new: bool
             return self._session_id and self._session_secret and self._session_created
         else:
             logger.info("Session from {}: force_new={}".format(self.__class__.__name__, force_new))
-            tmp = self._acquire_new_session()
+            tmp = self._auth_client._acquire_session()
             logger.info("Session Info Return: {}".format(tmp))
             return tmp
 
@@ -259,7 +260,7 @@ def _init_maas_job_request(self):
         pass
 
     def generate_request(self, form_proc_class: Type[RequestFormProcessor]) -> ExternalRequest:
-        self.form_proc = form_proc_class(post_request=self.http_request, maas_secret=self.session_secret)
+        self.form_proc = form_proc_class(post_request=self.http_request, maas_secret=self._auth_client._session_secret)
         return self.form_proc.maas_request
 
     @property
diff --git a/python/gui/MaaS/cbv/EditView.py b/python/gui/MaaS/cbv/EditView.py
index 780c7e8e9..0bab07b61 100644
--- a/python/gui/MaaS/cbv/EditView.py
+++ b/python/gui/MaaS/cbv/EditView.py
@@ -42,30 +42,32 @@ def humanize(words: str) -> str:
 
         models = list(communication.get_available_models().keys())
         domains = ['example-domain-A', 'example-domain-B'] #FIXME map this from supported domains
-        outputs = list()
-        distribution_types = list()
-
-        # Create a mapping between each output type and a friendly representation of it
-        for output in maas_request.get_available_outputs():
-            output_definition = dict()
-            output_definition['name'] = humanize(output)
-            output_definition['value'] = output
-            outputs.append(output_definition)
-
-        # Create a mapping between each distribution type and a friendly representation of it
-        for distribution_type in maas_request.get_distribution_types():
-            type_definition = dict()
-            type_definition['name'] = humanize(distribution_type)
-            type_definition['value'] = distribution_type
-            distribution_types.append(type_definition)
+        #outputs = list()
+        #distribution_types = list()
+
+        ### Note that these are now broken, and also probably no longer applicable
+        #
+        # # Create a mapping between each output type and a friendly representation of it
+        # for output in maas_request.get_available_outputs():
+        #     output_definition = dict()
+        #     output_definition['name'] = humanize(output)
+        #     output_definition['value'] = output
+        #     outputs.append(output_definition)
+        #
+        # # Create a mapping between each distribution type and a friendly representation of it
+        # for distribution_type in maas_request.get_distribution_types():
+        #     type_definition = dict()
+        #     type_definition['name'] = humanize(distribution_type)
+        #     type_definition['value'] = distribution_type
+        #     distribution_types.append(type_definition)
 
         # Package everything up to be rendered for the client
         payload = {
             'models': models,
             'domains': domains,
-            'outputs': outputs,
-            'parameters': maas_request.get_parameters(),
-            'distribution_types': distribution_types,
+            #'outputs': outputs,
+            #'parameters': maas_request.get_parameters(),
+            #'distribution_types': distribution_types,
             'errors': errors,
             'info': info,
             'warnings': warnings
diff --git a/python/gui/MaaS/client.py b/python/gui/MaaS/client.py
index f13a57208..456bd6799 100644
--- a/python/gui/MaaS/client.py
+++ b/python/gui/MaaS/client.py
@@ -13,7 +13,7 @@
 
 from dmod.communication import ExternalRequest
 from dmod.communication import ExternalRequestResponse
-from dmod.communication import ModelExecRequestClient
+from dmod.communication import ExternalRequestClient
 
 from . import utilities
 from .processors.processor import BaseProcessor
@@ -21,7 +21,7 @@
 logger = logging.getLogger("gui_log")
 
 
-class JobRequestClient(ModelExecRequestClient):
+class JobRequestClient(ExternalRequestClient):
     """
     A client for websocket interaction with the MaaS request handler, specifically for performing a job request based on
     details provided in a particular HTTP POST request (i.e., with form info on the parameters of the job execution).
@@ -36,7 +36,7 @@ def __init__(
         if ssl_dir is None:
             ssl_dir = Path(__file__).resolve().parent.parent.parent.joinpath('ssl')
             ssl_dir = Path('/usr/maas_portal/ssl') #Fixme
-        logger.debug("endpoing_uri: {}".format(endpoint_uri))
+        logger.debug("endpoint_uri: {}".format(endpoint_uri))
         super().__init__(endpoint_uri=endpoint_uri, ssl_directory=ssl_dir)
         self._processor = processor
         self._cookies = None
@@ -74,7 +74,7 @@ def _acquire_session_info(self, use_current_values: bool = True, force_new: bool
             return self._session_id and self._session_secret and self._session_created
         else:
             logger.info("Session from JobRequestClient: force_new={}".format(force_new))
-            tmp = self._acquire_new_session()
+            tmp = self._auth_client._acquire_session()
             logger.info("Session Info Return: {}".format(tmp))
             return tmp
 
diff --git a/python/gui/MaaS/urls.py b/python/gui/MaaS/urls.py
index ab731d963..8a519cd0a 100644
--- a/python/gui/MaaS/urls.py
+++ b/python/gui/MaaS/urls.py
@@ -1,12 +1,12 @@
 from maas_experiment import application_values
 
 from django.urls import re_path
-#from .cbv.EditView import EditView
+from .cbv.EditView import EditView
 from .cbv.MapView import MapView, Fabrics, FabricNames, FabricTypes, ConnectedFeatures
 from .cbv.evaluation import ReadyListenEvaluation
 from .cbv.evaluation import EvaluationListing
 from .cbv.configuration import CreateConfiguration
-#from .cbv.execution import Execute
+from .cbv.execution import Execute
 from .cbv.crosswalk import Crosswalk
 from .cbv.prototyping import RuntimePrototype
 
@@ -22,7 +22,7 @@
     re_path(r'fabric/types$', FabricTypes.as_view(), name='fabric-types'),
     re_path(r'fabric/(?P<fabric>[a-zA-Z0-9_-]+(\s\([a-zA-Z0-9_-]+\))*)?', Fabrics.as_view(), name='fabrics'),
     re_path(r'config/edit', CreateConfiguration.as_view(), name='create_config'),
-    #re_path(r'config/execute', Execute.as_view(), name='execute'),
+    re_path(r'config/execute', Execute.as_view(), name='execute'),
     re_path(r'crosswalk/(?P<crosswalk>[a-zA-Z0-9_-]+(\s\([a-zA-Z0-9_-]+\))*)?', Crosswalk.as_view(), name='crosswalk')
 ]
 

From f969bc14577b85381659584038a75d9f46e96b41 Mon Sep 17 00:00:00 2001
From: Robert Bartel <robert.bartel@noaa.gov>
Date: Fri, 2 Aug 2024 15:08:37 -0400
Subject: [PATCH 8/9] Fix first Django MaaS app migration.

Hard-coding reasonable defaults for superuser setup values needed to get
previously existing migration to work.
---
 python/gui/MaaS/migrations/0001_initial.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/python/gui/MaaS/migrations/0001_initial.py b/python/gui/MaaS/migrations/0001_initial.py
index 26e05aaba..b6a7ab59e 100644
--- a/python/gui/MaaS/migrations/0001_initial.py
+++ b/python/gui/MaaS/migrations/0001_initial.py
@@ -10,9 +10,9 @@ class Migration(migrations.Migration):
     def create_superuser(apps, schema_editor):
         from django.contrib.auth.models import User
 
-        SU_NAME = os.environ.get('DMOD_SU_NAME')
-        SU_EMAIL = os.environ.get('DMOD_SU_EMAIL')
-        SU_PASSWORD = os.environ.get('DMOD_SU_PASSWORD')
+        SU_NAME = os.environ.get('DMOD_SU_NAME', "dmod_admin")
+        SU_EMAIL = os.environ.get('DMOD_SU_EMAIL', "dmod_admin@noaa.gov")
+        SU_PASSWORD = os.environ.get('DMOD_SU_PASSWORD', f"{SU_NAME}{os.environ.get('SQL_PASSWORD')}")
 
         superuser = User.objects.create_superuser(
             username=SU_NAME,

From 208e190dcd7cf8b2cdd3f339039b9e961237a445 Mon Sep 17 00:00:00 2001
From: Robert Bartel <robert.bartel@noaa.gov>
Date: Fri, 2 Aug 2024 15:09:18 -0400
Subject: [PATCH 9/9] Add running of migrations back to GUI entrypoint.

Making sure to put it after lines that export the SQL_PASSWORD as
needed.
---
 docker/nwm_gui/app_server/entrypoint.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docker/nwm_gui/app_server/entrypoint.sh b/docker/nwm_gui/app_server/entrypoint.sh
index a2d8a531c..7a67b3cb5 100755
--- a/docker/nwm_gui/app_server/entrypoint.sh
+++ b/docker/nwm_gui/app_server/entrypoint.sh
@@ -28,13 +28,13 @@ echo "Starting dmod app"
 #python manage.py migrate
 #########
 
-# Execute the migration scripts on the designated database
-#python manage.py migrate
-
 #Extract the DB secrets into correct ENV variables
 POSTGRES_SECRET_FILE="/run/secrets/${DOCKER_SECRET_POSTGRES_PASS:?}"
 export SQL_PASSWORD="$(cat ${POSTGRES_SECRET_FILE})"
 
+# Execute the migration scripts on the designated database
+python manage.py migrate
+
 # Handle for debugging when appropriate
 if [ "$(echo "${PYCHARM_REMOTE_DEBUG_ACTIVE:-false}" | tr '[:upper:]' '[:lower:]' | tr -d '[:space:]')" == "true" ]; then
     # Set the timeout to longer when debugging