- Getting containers ready for the cloud

eveai_app/__init__.py

@@ -6,8 +6,8 @@ from flask_security.signals import user_authenticated
 from werkzeug.middleware.proxy_fix import ProxyFix
 import logging.config
 
-from common.extensions import (db, migrate, bootstrap, security, mail, login_manager, cors, kms_client, csrf, session,
-                               minio_client)
+from common.extensions import (db, migrate, bootstrap, security, mail, login_manager, cors, csrf, session,
+                               minio_client, simple_encryption)
 from common.models.user import User, Role, Tenant, TenantDomain
 import common.models.interaction
 from config.logging_config import LOGGING
@@ -15,6 +15,7 @@ from common.utils.security import set_tenant_session_data
 from .errors import register_error_handlers
 from common.utils.celery_utils import make_celery, init_celery
 from common.utils.template_filters import register_filters
+from config.config import get_config
 
 
 def create_app(config_file=None):
@@ -23,10 +24,16 @@ def create_app(config_file=None):
     # Ensure all necessary headers are handled
     app.wsgi_app = ProxyFix(app.wsgi_app, x_for=1, x_proto=1, x_host=1, x_port=1)
 
-    if config_file is None:
-        app.config.from_object('config.config.DevConfig')
-    else:
-        app.config.from_object(config_file)
+    environment = os.getenv('FLASK_ENV', 'development')
+    print(environment)
+
+    match environment:
+        case 'development':
+            app.config.from_object(get_config('dev'))
+        case 'production':
+            app.config.from_object(get_config('prod'))
+        case _:
+            app.config.from_object(get_config('dev'))
 
     app.config['SESSION_KEY_PREFIX'] = 'eveai_app_'
 
@@ -39,14 +46,13 @@ def create_app(config_file=None):
     logger = logging.getLogger(__name__)
 
     logger.info("eveai_app starting up")
+    logger.debug("start config")
+    logger.debug(app.config)
 
     # Register extensions
 
     register_extensions(app)
 
-    # Check GCloud availability
-    kms_client.check_kms_access_and_latency()
-
     app.celery = make_celery(app.name, app.config)
     init_celery(app.celery, app)
 
@@ -101,7 +107,8 @@ def register_extensions(app):
     csrf.init_app(app)
     login_manager.init_app(app)
     cors.init_app(app)
-    kms_client.init_app(app)
+    # kms_client.init_app(app)
+    simple_encryption.init_app(app)
     session.init_app(app)
     minio_client.init_app(app)
 

eveai_app/templates/header.html

@@ -1,5 +1,5 @@
 <header class="header-2">
-    <div class="page-header min-vh-25" style="background-image: url({{url_for('static', filename='/assets/img/EveAI_bg2.jpg')}})" loading="lazy">
+    <div class="page-header min-vh-25" style="background-image: url({{url_for('static', filename='/assets/img/EveAI_bg.jpg')}})" loading="lazy">
         <span class="mask bg-gradient-primary opacity-4"></span>
         <div class="container">
             <div class="row">

eveai_app/views/user_views.py

@@ -8,7 +8,7 @@ from sqlalchemy.exc import SQLAlchemyError
 import ast
 
 from common.models.user import User, Tenant, Role, TenantDomain
-from common.extensions import db, kms_client, security, minio_client
+from common.extensions import db, security, minio_client, simple_encryption
 from common.utils.security_utils import send_confirmation_email, send_reset_email
 from .user_forms import TenantForm, CreateUserForm, EditUserForm, TenantDomainForm
 from common.utils.database import Database
@@ -427,7 +427,7 @@ def generate_chat_api_key():
     tenant = Tenant.query.get_or_404(session['tenant']['id'])
 
     new_api_key = generate_api_key(prefix="EveAI-CHAT")
-    tenant.encrypted_chat_api_key = kms_client.encrypt_api_key(new_api_key)
+    tenant.encrypted_chat_api_key = simple_encryption.encrypt_api_key(new_api_key)
     update_logging_information(tenant, dt.now(tz.utc))
 
     try: