- Modernized authentication with the introduction of TenantProject

- Created a base mail template
- Adapt and improve document API to usage of catalogs and processors
- Adapt eveai_sync to new authentication mechanism and usage of catalogs and processors

eveai_app/views/user_forms.py

@@ -6,51 +6,24 @@ from wtforms.validators import DataRequired, Length, Email, NumberRange, Optiona
 import pytz
 
 from common.models.user import Role
+from config.type_defs.service_types import SERVICE_TYPES
 
 
 class TenantForm(FlaskForm):
     name = StringField('Name', validators=[DataRequired(), Length(max=80)])
+    type = SelectField('Tenant Type', validators=[Optional()], default='Active')
     website = StringField('Website', validators=[DataRequired(), Length(max=255)])
     # language fields
     default_language = SelectField('Default Language', choices=[], validators=[DataRequired()])
     allowed_languages = SelectMultipleField('Allowed Languages', choices=[], validators=[DataRequired()])
     # invoicing fields
     currency = SelectField('Currency', choices=[], validators=[DataRequired()])
-    usage_email = EmailField('Usage Email', validators=[DataRequired(), Email()])
     # Timezone
     timezone = SelectField('Timezone', choices=[], validators=[DataRequired()])
-    # RAG context
-    rag_context = TextAreaField('RAG Context', validators=[Optional()])
-    # Tenant Type
-    type = SelectField('Tenant Type', validators=[Optional()], default='Active')
     # LLM fields
     embedding_model = SelectField('Embedding Model', choices=[], validators=[DataRequired()])
     llm_model = SelectField('Large Language Model', choices=[], validators=[DataRequired()])
     # Embedding variables
-    html_tags = StringField('HTML Tags', validators=[DataRequired()],
-                            default='p, h1, h2, h3, h4, h5, h6, li')
-    html_end_tags = StringField('HTML End Tags', validators=[DataRequired()],
-                                default='p, li')
-    html_included_elements = StringField('HTML Included Elements', validators=[Optional()])
-    html_excluded_elements = StringField('HTML Excluded Elements', validators=[Optional()])
-    html_excluded_classes = StringField('HTML Excluded Classes', validators=[Optional()])
-    min_chunk_size = IntegerField('Minimum Chunk Size (2000)', validators=[NumberRange(min=0), Optional()], default=2000)
-    max_chunk_size = IntegerField('Maximum Chunk Size (3000)', validators=[NumberRange(min=0), Optional()], default=3000)
-    # Embedding Search variables
-    es_k = IntegerField('Limit for Searching Embeddings (5)',
-                        default=5,
-                        validators=[NumberRange(min=0)])
-    es_similarity_threshold = FloatField('Similarity Threshold for Searching Embeddings (0.5)',
-                                         default=0.5,
-                                         validators=[NumberRange(min=0, max=1)])
-    # Chat Variables
-    chat_RAG_temperature = FloatField('RAG Temperature', default=0.3, validators=[NumberRange(min=0, max=1)])
-    chat_no_RAG_temperature = FloatField('No RAG Temperature', default=0.5, validators=[NumberRange(min=0, max=1)])
-    fallback_algorithms = SelectMultipleField('Fallback Algorithms', choices=[], validators=[Optional()])
-    # Tuning variables
-    embed_tuning = BooleanField('Enable Embedding Tuning', default=False)
-    rag_tuning = BooleanField('Enable RAG Tuning', default=False)
-
     submit = SubmitField('Submit')
 
     def __init__(self, *args, **kwargs):
@@ -66,8 +39,6 @@ class TenantForm(FlaskForm):
         self.embedding_model.choices = [(model, model) for model in current_app.config['SUPPORTED_EMBEDDINGS']]
         self.llm_model.choices = [(model, model) for model in current_app.config['SUPPORTED_LLMS']]
         # Initialize fallback algorithms
-        self.fallback_algorithms.choices = \
-            [(algorithm, algorithm.lower()) for algorithm in current_app.config['FALLBACK_ALGORITHMS']]
         self.type.choices = [(t, t) for t in current_app.config['TENANT_TYPES']]
 
 
@@ -79,6 +50,8 @@ class BaseUserForm(FlaskForm):
     valid_to = DateField('Valid to', id='form-control datepicker', validators=[Optional()])
     tenant_id = IntegerField('Tenant ID', validators=[NumberRange(min=0)])
     roles = SelectMultipleField('Roles', coerce=int)
+    is_primary_contact = BooleanField('Primary Contact')
+    is_financial_contact = BooleanField('Financial Contact')
 
     def __init__(self, *args, **kwargs):
         super(BaseUserForm, self).__init__(*args, **kwargs)
@@ -90,6 +63,12 @@ class CreateUserForm(BaseUserForm):
 
 
 class EditUserForm(BaseUserForm):
+    # Some R/O informational fields
+    confirmed_at = DateField('Confirmed At', id='form-control datepicker', validators=[Optional()],
+                             render_kw={'readonly': True})
+    last_login_at = DateField('Last Login At', id='form-control datepicker', validators=[Optional()],
+                              render_kw={'readonly': True})
+    login_count = IntegerField('Login Count', validators=[Optional()], render_kw={'readonly': True})
     submit = SubmitField('Save User')
 
 
@@ -121,4 +100,30 @@ class TenantSelectionForm(FlaskForm):
         self.types.choices = [(t, t) for t in current_app.config['TENANT_TYPES']]
 
 
+class TenantProjectForm(FlaskForm):
+    name = StringField('Name', validators=[DataRequired(), Length(max=50)])
+    description = TextAreaField('Description', validators=[Optional()])
+    services = SelectMultipleField('Allowed Services', choices=[], validators=[DataRequired()])
+    unencrypted_api_key = StringField('Unencrypted API Key', validators=[DataRequired()], render_kw={'readonly': True})
+    visual_api_key = StringField('Visual API Key', validators=[DataRequired()], render_kw={'readonly': True})
+    active = BooleanField('Active', validators=[DataRequired()], default=True)
+    responsible_email = EmailField('Responsible Email', validators=[Optional(), Email()])
 
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        # Initialize choices for the services field
+        self.services.choices = [(key, value['description']) for key, value in SERVICE_TYPES.items()]
+
+
+class EditTenantProjectForm(FlaskForm):
+    name = StringField('Name', validators=[DataRequired(), Length(max=50)])
+    description = TextAreaField('Description', validators=[Optional()])
+    services = SelectMultipleField('Allowed Services', choices=[], validators=[DataRequired()])
+    visual_api_key = StringField('Visual API Key', validators=[DataRequired()], render_kw={'readonly': True})
+    active = BooleanField('Active', validators=[DataRequired()], default=True)
+    responsible_email = EmailField('Responsible Email', validators=[Optional(), Email()])
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        # Initialize choices for the services field
+        self.services.choices = [(key, value['description']) for key, value in SERVICE_TYPES.items()]