- Refined entitlements to work with MiB for both embeddings and storage
- Improved DocumentVersion storage attributes to reflect Minio settings - Added size to DocumentVersions to easily calculate usage - License / LicenseTier forms and views added
This commit is contained in:
Josako
76
eveai_app/views/entitlements_forms.py
Normal file
76
eveai_app/views/entitlements_forms.py
Normal file
@@ -0,0 +1,76 @@
|
||||
from flask import current_app
|
||||
from flask_wtf import FlaskForm
|
||||
from wtforms import (StringField, PasswordField, BooleanField, SubmitField, EmailField, IntegerField, DateField,
|
||||
SelectField, SelectMultipleField, FieldList, FormField, FloatField, TextAreaField)
|
||||
from wtforms.validators import DataRequired, Length, Email, NumberRange, Optional, ValidationError, InputRequired
|
||||
import pytz
|
||||
|
||||
|
||||
class LicenseTierForm(FlaskForm):
|
||||
name = StringField('Name', validators=[DataRequired(), Length(max=50)])
|
||||
version = StringField('Version', validators=[DataRequired(), Length(max=50)])
|
||||
start_date = DateField('Start Date', id='form-control datepicker', validators=[DataRequired()])
|
||||
end_date = DateField('End Date', id='form-control datepicker', validators=[Optional()])
|
||||
basic_fee_d = FloatField('Basic Fee ($)', validators=[InputRequired(), NumberRange(min=0)])
|
||||
basic_fee_e = FloatField('Basic Fee (€)', validators=[InputRequired(), NumberRange(min=0)])
|
||||
max_storage_mb = IntegerField('Max Storage (MiB)', validators=[DataRequired(), NumberRange(min=1)])
|
||||
additional_storage_price_d = FloatField('Additional Storage Fee ($)',
|
||||
validators=[InputRequired(), NumberRange(min=0)])
|
||||
additional_storage_price_e = FloatField('Additional Storage Fee (€)',
|
||||
validators=[InputRequired(), NumberRange(min=0)])
|
||||
additional_storage_bucket = IntegerField('Additional Storage Bucket Size (MiB)',
|
||||
validators=[DataRequired(), NumberRange(min=1)])
|
||||
included_embedding_mb = IntegerField('Included Embeddings (MiB)',
|
||||
validators=[DataRequired(), NumberRange(min=1)])
|
||||
additional_embedding_price_d = FloatField('Additional Embedding Fee ($)',
|
||||
validators=[InputRequired(), NumberRange(min=0)])
|
||||
additional_embedding_price_e = FloatField('Additional Embedding Fee (€)',
|
||||
validators=[InputRequired(), NumberRange(min=0)])
|
||||
additional_embedding_bucket = IntegerField('Additional Embedding Bucket Size (MiB)',
|
||||
validators=[DataRequired(), NumberRange(min=1)])
|
||||
included_interaction_tokens = IntegerField('Included Embedding Tokens',
|
||||
validators=[DataRequired(), NumberRange(min=1)])
|
||||
additional_interaction_token_price_d = FloatField('Additional Interaction Token Fee ($)',
|
||||
validators=[InputRequired(), NumberRange(min=0)])
|
||||
additional_interaction_token_price_e = FloatField('Additional Interaction Token Fee (€)',
|
||||
validators=[InputRequired(), NumberRange(min=0)])
|
||||
additional_interaction_bucket = IntegerField('Additional Interaction Bucket Size',
|
||||
validators=[DataRequired(), NumberRange(min=1)])
|
||||
standard_overage_embedding = FloatField('Standard Overage Embedding (%)',
|
||||
validators=[DataRequired(), NumberRange(min=0)],
|
||||
default=0)
|
||||
standard_overage_interaction = FloatField('Standard Overage Interaction (%)',
|
||||
validators=[DataRequired(), NumberRange(min=0)],
|
||||
default=0)
|
||||
|
||||
|
||||
class LicenseForm(FlaskForm):
|
||||
start_date = DateField('Start Date', id='form-control datepicker', validators=[DataRequired()])
|
||||
end_date = DateField('End Date', id='form-control datepicker', validators=[DataRequired()])
|
||||
currency = StringField('Currency', validators=[Optional(), Length(max=20)])
|
||||
yearly_payment = BooleanField('Yearly Payment', validators=[DataRequired()], default=False)
|
||||
basic_fee = FloatField('Basic Fee', validators=[InputRequired(), NumberRange(min=0)])
|
||||
max_storage_mb = IntegerField('Max Storage (MiB)', validators=[DataRequired(), NumberRange(min=1)])
|
||||
additional_storage_price = FloatField('Additional Storage Token Fee',
|
||||
validators=[InputRequired(), NumberRange(min=0)])
|
||||
additional_storage_bucket = IntegerField('Additional Storage Bucket Size (MiB)',
|
||||
validators=[DataRequired(), NumberRange(min=1)])
|
||||
included_embedding_mb = IntegerField('Included Embedding Tokens (MiB)',
|
||||
validators=[DataRequired(), NumberRange(min=1)])
|
||||
additional_embedding_price = FloatField('Additional Embedding Token Fee',
|
||||
validators=[InputRequired(), NumberRange(min=0)])
|
||||
additional_embedding_bucket = IntegerField('Additional Embedding Bucket Size (MiB)',
|
||||
validators=[DataRequired(), NumberRange(min=1)])
|
||||
included_interaction_tokens = IntegerField('Included Interaction Tokens',
|
||||
validators=[DataRequired(), NumberRange(min=1)])
|
||||
additional_interaction_token_price = FloatField('Additional Interaction Token Fee',
|
||||
validators=[InputRequired(), NumberRange(min=0)])
|
||||
additional_interaction_bucket = IntegerField('Additional Interaction Bucket Size',
|
||||
validators=[DataRequired(), NumberRange(min=1)])
|
||||
overage_embedding = FloatField('Overage Embedding (%)',
|
||||
validators=[DataRequired(), NumberRange(min=0)],
|
||||
default=0)
|
||||
overage_interaction = FloatField('Overage Interaction (%)',
|
||||
validators=[DataRequired(), NumberRange(min=0)],
|
||||
default=0)
|
||||
|
||||
217
eveai_app/views/entitlements_views.py
Normal file
217
eveai_app/views/entitlements_views.py
Normal file
@@ -0,0 +1,217 @@
|
||||
import uuid
|
||||
from datetime import datetime as dt, timezone as tz
|
||||
from flask import request, redirect, flash, render_template, Blueprint, session, current_app, jsonify
|
||||
from flask_security import hash_password, roles_required, roles_accepted, current_user
|
||||
from itsdangerous import URLSafeTimedSerializer
|
||||
from sqlalchemy.exc import SQLAlchemyError
|
||||
from sqlalchemy import or_
|
||||
import ast
|
||||
|
||||
from common.models.entitlements import License, LicenseTier, LicenseUsage, BusinessEventLog
|
||||
from common.extensions import db, security, minio_client, simple_encryption
|
||||
from common.utils.security_utils import send_confirmation_email, send_reset_email
|
||||
from .entitlements_forms import LicenseTierForm, LicenseForm
|
||||
from common.utils.database import Database
|
||||
from common.utils.view_assistants import prepare_table_for_macro, form_validation_failed
|
||||
from common.utils.simple_encryption import generate_api_key
|
||||
from common.utils.nginx_utils import prefixed_url_for
|
||||
|
||||
entitlements_bp = Blueprint('entitlements_bp', __name__, url_prefix='/entitlements')
|
||||
|
||||
|
||||
@entitlements_bp.route('/license_tier', methods=['GET', 'POST'])
|
||||
@roles_accepted('Super User')
|
||||
def license_tier():
|
||||
form = LicenseTierForm()
|
||||
if form.validate_on_submit():
|
||||
current_app.logger.info("Adding License Tier")
|
||||
|
||||
new_license_tier = LicenseTier()
|
||||
form.populate_obj(new_license_tier)
|
||||
|
||||
try:
|
||||
db.session.add(new_license_tier)
|
||||
db.session.commit()
|
||||
except SQLAlchemyError as e:
|
||||
db.session.rollback()
|
||||
current_app.logger.error(f'Failed to add license tier to database. Error: {str(e)}')
|
||||
flash(f'Failed to add license tier to database. Error: {str(e)}', 'success')
|
||||
return render_template('entitlements/license_tier.html', form=form)
|
||||
|
||||
current_app.logger.info(f"Successfully created license tier {new_license_tier.id}")
|
||||
flash(f"Successfully created tenant license tier {new_license_tier.id}")
|
||||
|
||||
return redirect(prefixed_url_for('entitlements_bp.view_license_tiers'))
|
||||
else:
|
||||
form_validation_failed(request, form)
|
||||
|
||||
return render_template('entitlements/license_tier.html', form=form)
|
||||
|
||||
|
||||
@entitlements_bp.route('/view_license_tiers', methods=['GET', 'POST'])
|
||||
@roles_required('Super User')
|
||||
def view_license_tiers():
|
||||
page = request.args.get('page', 1, type=int)
|
||||
per_page = request.args.get('per_page', 10, type=int)
|
||||
today = dt.now(tz.utc)
|
||||
|
||||
query = LicenseTier.query.filter(
|
||||
or_(
|
||||
LicenseTier.end_date == None,
|
||||
LicenseTier.end_date >= today
|
||||
)
|
||||
).order_by(LicenseTier.start_date.desc(), LicenseTier.id)
|
||||
|
||||
pagination = query.paginate(page=page, per_page=per_page, error_out=False)
|
||||
license_tiers = pagination.items
|
||||
|
||||
rows = prepare_table_for_macro(license_tiers, [('id', ''), ('name', ''), ('version', ''), ('start_date', ''),
|
||||
('end_date', '')])
|
||||
|
||||
return render_template('entitlements/view_license_tiers.html', rows=rows, pagination=pagination)
|
||||
|
||||
|
||||
@entitlements_bp.route('/handle_license_tier_selection', methods=['POST'])
|
||||
@roles_required('Super User')
|
||||
def handle_license_tier_selection():
|
||||
license_tier_identification = request.form['selected_row']
|
||||
license_tier_id = ast.literal_eval(license_tier_identification).get('value')
|
||||
the_license_tier = LicenseTier.query.get(license_tier_id)
|
||||
|
||||
action = request.form['action']
|
||||
|
||||
match action:
|
||||
case 'edit_license_tier':
|
||||
return redirect(prefixed_url_for('entitlements_bp.edit_license_tier',
|
||||
license_tier_id=license_tier_id))
|
||||
case 'create_license_for_tenant':
|
||||
return redirect(prefixed_url_for('entitlements_bp.create_license',
|
||||
license_tier_id=license_tier_id))
|
||||
# Add more conditions for other actions
|
||||
return redirect(prefixed_url_for('entitlements_bp.view_license_tiers'))
|
||||
|
||||
|
||||
@entitlements_bp.route('/license_tier/<int:license_tier_id>', methods=['GET', 'POST'])
|
||||
@roles_accepted('Super User')
|
||||
def edit_license_tier(license_tier_id):
|
||||
license_tier = LicenseTier.query.get_or_404(license_tier_id) # This will return a 404 if no license tier is found
|
||||
form = LicenseTierForm(obj=license_tier)
|
||||
|
||||
if form.validate_on_submit():
|
||||
# Populate the license_tier with form data
|
||||
form.populate_obj(license_tier)
|
||||
|
||||
try:
|
||||
db.session.add(license_tier)
|
||||
db.session.commit()
|
||||
except SQLAlchemyError as e:
|
||||
db.session.rollback()
|
||||
current_app.logger.error(f'Failed to edit License Tier. Error: {str(e)}')
|
||||
flash(f'Failed to edit License Tier. Error: {str(e)}', 'danger')
|
||||
return render_template('entitlements/license_tier.html', form=form, license_tier_id=license_tier.id)
|
||||
|
||||
flash('License Tier updated successfully.', 'success')
|
||||
return redirect(
|
||||
prefixed_url_for('entitlements_bp.edit_license_tier', license_tier_id=license_tier_id))
|
||||
else:
|
||||
form_validation_failed(request, form)
|
||||
|
||||
return render_template('entitlements/license_tier.html', form=form, license_tier_id=license_tier.id)
|
||||
|
||||
|
||||
@entitlements_bp.route('/create_license/<int:license_tier_id>', methods=['GET', 'POST'])
|
||||
@roles_accepted('Super User')
|
||||
def create_license(license_tier_id):
|
||||
form = LicenseForm()
|
||||
tenant_id = session.get('tenant').get('id')
|
||||
currency = session.get('tenant').get('currency')
|
||||
|
||||
if request.method == 'GET':
|
||||
# Fetch the LicenseTier
|
||||
license_tier = LicenseTier.query.get_or_404(license_tier_id)
|
||||
|
||||
# Prefill the form with LicenseTier data
|
||||
# Currency depending data
|
||||
if currency == '$':
|
||||
form.basic_fee.data = license_tier.basic_fee_d
|
||||
form.additional_storage_price.data = license_tier.additional_storage_price_d
|
||||
form.additional_embedding_price.data = license_tier.additional_embedding_price_d
|
||||
form.additional_interaction_token_price.data = license_tier.additional_interaction_token_price_d
|
||||
elif currency == '€':
|
||||
form.basic_fee.data = license_tier.basic_fee_e
|
||||
form.additional_storage_price.data = license_tier.additional_storage_price_e
|
||||
form.additional_embedding_price.data = license_tier.additional_embedding_price_e
|
||||
form.additional_interaction_token_price.data = license_tier.additional_interaction_token_price_e
|
||||
else:
|
||||
current_app.logger.error(f'Invalid currency {currency} for tenant {tenant_id} while creating license.')
|
||||
flash(f"Invalid currency {currency} for tenant {tenant_id} while creating license. "
|
||||
f"Check tenant's currency and try again.", 'danger')
|
||||
return redirect(prefixed_url_for('user_bp.edit_tenant', tenant_id=tenant_id))
|
||||
# General data
|
||||
form.currency.data = currency
|
||||
form.max_storage_mb.data = license_tier.max_storage_mb
|
||||
form.additional_storage_bucket.data = license_tier.additional_storage_bucket
|
||||
form.included_embedding_mb.data = license_tier.included_embedding_mb
|
||||
form.additional_embedding_bucket.data = license_tier.additional_embedding_bucket
|
||||
form.included_interaction_tokens.data = license_tier.included_interaction_tokens
|
||||
form.additional_interaction_bucket.data = license_tier.additional_interaction_bucket
|
||||
form.overage_embedding.data = license_tier.standard_overage_embedding
|
||||
form.overage_interaction.data = license_tier.standard_overage_interaction
|
||||
else: # POST
|
||||
# Create a new License instance
|
||||
new_license = License(
|
||||
tenant_id=tenant_id,
|
||||
tier_id=license_tier_id,
|
||||
)
|
||||
current_app.logger.debug(f"Currency data in form: {form.currency.data}")
|
||||
if form.validate_on_submit():
|
||||
# Update the license with form data
|
||||
form.populate_obj(new_license)
|
||||
# Currency is added here again, as a form doesn't include disabled fields when passing it in the request
|
||||
new_license.currency = currency
|
||||
|
||||
try:
|
||||
db.session.add(new_license)
|
||||
db.session.commit()
|
||||
flash('License created successfully', 'success')
|
||||
return redirect(prefixed_url_for('entitlements_bp/edit_license', license_id=new_license.id))
|
||||
except Exception as e:
|
||||
db.session.rollback()
|
||||
flash(f'Error creating license: {str(e)}', 'error')
|
||||
else:
|
||||
form_validation_failed(request, form)
|
||||
|
||||
return render_template('entitlements/license.html', form=form)
|
||||
|
||||
|
||||
@entitlements_bp.route('/license/<int:license_id>', methods=['GET', 'POST'])
|
||||
@roles_accepted('Super User')
|
||||
def edit_license(license_id):
|
||||
license = License.query.get_or_404(license_id) # This will return a 404 if no license tier is found
|
||||
form = LicenseForm(obj=license)
|
||||
disabled_fields = []
|
||||
if len(license.usages) > 0: # There already are usage records linked to this license
|
||||
# Define which fields should be disabled
|
||||
disabled_fields = [field.name for field in form if field.name != 'end_date']
|
||||
|
||||
if form.validate_on_submit():
|
||||
# Populate the license with form data
|
||||
form.populate_obj(license)
|
||||
|
||||
try:
|
||||
db.session.add(license)
|
||||
db.session.commit()
|
||||
except SQLAlchemyError as e:
|
||||
db.session.rollback()
|
||||
current_app.logger.error(f'Failed to edit License. Error: {str(e)}')
|
||||
flash(f'Failed to edit License. Error: {str(e)}', 'danger')
|
||||
return render_template('entitlements/license.html', form=form)
|
||||
|
||||
flash('License updated successfully.', 'success')
|
||||
return redirect(
|
||||
prefixed_url_for('entitlements_bp.edit_license', license_tier_id=license_id))
|
||||
else:
|
||||
form_validation_failed(request, form)
|
||||
|
||||
return render_template('entitlements/license.html', form=form, license_tier_id=license_tier.id,
|
||||
ext_disabled_fields=disabled_fields)
|
||||
@@ -14,6 +14,9 @@ class TenantForm(FlaskForm):
|
||||
# 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
|
||||
@@ -23,10 +26,6 @@ class TenantForm(FlaskForm):
|
||||
# LLM fields
|
||||
embedding_model = SelectField('Embedding Model', choices=[], validators=[DataRequired()])
|
||||
llm_model = SelectField('Large Language Model', choices=[], validators=[DataRequired()])
|
||||
# license fields
|
||||
license_start_date = DateField('License Start Date', id='form-control datepicker', validators=[Optional()])
|
||||
license_end_date = DateField('License End Date', id='form-control datepicker', validators=[Optional()])
|
||||
allowed_monthly_interactions = IntegerField('Allowed Monthly Interactions', validators=[NumberRange(min=0)])
|
||||
# Embedding variables
|
||||
html_tags = StringField('HTML Tags', validators=[DataRequired()],
|
||||
default='p, h1, h2, h3, h4, h5, h6, li')
|
||||
@@ -59,6 +58,8 @@ class TenantForm(FlaskForm):
|
||||
# initialise language fields
|
||||
self.default_language.choices = [(lang, lang.lower()) for lang in current_app.config['SUPPORTED_LANGUAGES']]
|
||||
self.allowed_languages.choices = [(lang, lang.lower()) for lang in current_app.config['SUPPORTED_LANGUAGES']]
|
||||
# initialise currency field
|
||||
self.currency.choices = [(curr, curr) for curr in current_app.config['SUPPORTED_CURRENCIES']]
|
||||
# initialise timezone
|
||||
self.timezone.choices = [(tz, tz) for tz in pytz.all_timezones]
|
||||
# initialise LLM fields
|
||||
|
||||
@@ -47,18 +47,6 @@ def tenant():
|
||||
# Handle the required attributes
|
||||
new_tenant = Tenant()
|
||||
form.populate_obj(new_tenant)
|
||||
# new_tenant = Tenant(name=form.name.data,
|
||||
# website=form.website.data,
|
||||
# default_language=form.default_language.data,
|
||||
# allowed_languages=form.allowed_languages.data,
|
||||
# timezone=form.timezone.data,
|
||||
# embedding_model=form.embedding_model.data,
|
||||
# llm_model=form.llm_model.data,
|
||||
# license_start_date=form.license_start_date.data,
|
||||
# license_end_date=form.license_end_date.data,
|
||||
# allowed_monthly_interactions=form.allowed_monthly_interactions.data,
|
||||
# embed_tuning=form.embed_tuning.data,
|
||||
# rag_tuning=form.rag_tuning.data)
|
||||
|
||||
# Handle Embedding Variables
|
||||
new_tenant.html_tags = [tag.strip() for tag in form.html_tags.data.split(',')] if form.html_tags.data else []
|
||||
@@ -87,7 +75,7 @@ def tenant():
|
||||
db.session.commit()
|
||||
except SQLAlchemyError as e:
|
||||
current_app.logger.error(f'Failed to add tenant to database. Error: {str(e)}')
|
||||
flash(f'Failed to add tenant to database. Error: {str(e)}')
|
||||
flash(f'Failed to add tenant to database. Error: {str(e)}', 'danger')
|
||||
return render_template('user/tenant.html', form=form)
|
||||
|
||||
current_app.logger.info(f"Successfully created tenant {new_tenant.id} in Database")
|
||||
@@ -152,7 +140,7 @@ def edit_tenant(tenant_id):
|
||||
current_app.logger.debug(f'Tenant update failed with errors: {form.errors}')
|
||||
form_validation_failed(request, form)
|
||||
|
||||
return render_template('user/edit_tenant.html', form=form, tenant_id=tenant_id)
|
||||
return render_template('user/tenant.html', form=form, tenant_id=tenant_id)
|
||||
|
||||
|
||||
@user_bp.route('/user', methods=['GET', 'POST'])
|
||||
|
||||
Reference in New Issue
Block a user