From 3d3a943ed04e7c55e51fc6578030b3aa3ea283bd Mon Sep 17 00:00:00 2001 From: Aaron <Aaron8.jones@live.uwe.ac.uk> Date: Thu, 27 Mar 2025 15:56:17 +0000 Subject: [PATCH] 1) added more database stuff (mlModel, Billings, Interactions, Records). 2) New Directory (mlModels) for storage of mlModels in the future. 3) Addeds separate dashboard htmls in new directory (templates/dashboards) in hopes of getting modelforms to work in the future. --- .../migrations/0002_profile_delete_user.py | 27 ++++++++++ .../core/migrations/0003_mlmodels.py | 21 ++++++++ .../0004_billings_interactions_records.py | 40 +++++++++++++++ .../0005_rename_billings_billing_and_more.py | 29 +++++++++++ .../core/migrations/0006_record_chosenml.py | 18 +++++++ .../migrations/0007_alter_record_chosenml.py | 18 +++++++ ...cord_chosenml_alter_record_responsebyml.py | 23 +++++++++ ...erid_remove_interaction_userid_and_more.py | 49 +++++++++++++++++++ 8 files changed, 225 insertions(+) create mode 100644 ActualProjectCode/DjangoProject/core/migrations/0002_profile_delete_user.py create mode 100644 ActualProjectCode/DjangoProject/core/migrations/0003_mlmodels.py create mode 100644 ActualProjectCode/DjangoProject/core/migrations/0004_billings_interactions_records.py create mode 100644 ActualProjectCode/DjangoProject/core/migrations/0005_rename_billings_billing_and_more.py create mode 100644 ActualProjectCode/DjangoProject/core/migrations/0006_record_chosenml.py create mode 100644 ActualProjectCode/DjangoProject/core/migrations/0007_alter_record_chosenml.py create mode 100644 ActualProjectCode/DjangoProject/core/migrations/0008_alter_record_chosenml_alter_record_responsebyml.py create mode 100644 ActualProjectCode/DjangoProject/core/migrations/0009_remove_billing_userid_remove_interaction_userid_and_more.py diff --git a/ActualProjectCode/DjangoProject/core/migrations/0002_profile_delete_user.py b/ActualProjectCode/DjangoProject/core/migrations/0002_profile_delete_user.py new file mode 100644 index 00000000..4d7d239d --- /dev/null +++ b/ActualProjectCode/DjangoProject/core/migrations/0002_profile_delete_user.py @@ -0,0 +1,27 @@ +# Generated by Django 5.1.7 on 2025-03-21 09:51 + +import django.db.models.deletion +from django.conf import settings +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('core', '0001_initial'), + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ] + + operations = [ + migrations.CreateModel( + name='Profile', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('role', models.CharField(choices=[('admin', 'Admin'), ('user', 'User'), ('ai_engineer', 'AI Engineer'), ('finance', 'Finance Team')], max_length=100)), + ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), + ], + ), + migrations.DeleteModel( + name='user', + ), + ] diff --git a/ActualProjectCode/DjangoProject/core/migrations/0003_mlmodels.py b/ActualProjectCode/DjangoProject/core/migrations/0003_mlmodels.py new file mode 100644 index 00000000..0bc2121c --- /dev/null +++ b/ActualProjectCode/DjangoProject/core/migrations/0003_mlmodels.py @@ -0,0 +1,21 @@ +# Generated by Django 5.1.7 on 2025-03-27 10:14 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('core', '0002_profile_delete_user'), + ] + + operations = [ + migrations.CreateModel( + name='mlModels', + fields=[ + ('modelID', models.AutoField(primary_key=True, serialize=False)), + ('userID', models.IntegerField()), + ('modelName', models.CharField(max_length=100)), + ], + ), + ] diff --git a/ActualProjectCode/DjangoProject/core/migrations/0004_billings_interactions_records.py b/ActualProjectCode/DjangoProject/core/migrations/0004_billings_interactions_records.py new file mode 100644 index 00000000..53271fa4 --- /dev/null +++ b/ActualProjectCode/DjangoProject/core/migrations/0004_billings_interactions_records.py @@ -0,0 +1,40 @@ +# Generated by Django 5.1.7 on 2025-03-27 10:38 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('core', '0003_mlmodels'), + ] + + operations = [ + migrations.CreateModel( + name='Billings', + fields=[ + ('billingID', models.AutoField(primary_key=True, serialize=False)), + ('amount', models.FloatField()), + ('userID', models.IntegerField()), + ('companyName', models.CharField(max_length=100)), + ], + ), + migrations.CreateModel( + name='Interactions', + fields=[ + ('interactionID', models.AutoField(primary_key=True, serialize=False)), + ('userID', models.IntegerField()), + ('date', models.DateTimeField()), + ('interaction', models.CharField(max_length=1000)), + ], + ), + migrations.CreateModel( + name='Records', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('userID', models.IntegerField()), + ('uploadedFile', models.FileField(upload_to='./records/')), + ('responseByML', models.CharField(max_length=100)), + ], + ), + ] diff --git a/ActualProjectCode/DjangoProject/core/migrations/0005_rename_billings_billing_and_more.py b/ActualProjectCode/DjangoProject/core/migrations/0005_rename_billings_billing_and_more.py new file mode 100644 index 00000000..1d9cef4d --- /dev/null +++ b/ActualProjectCode/DjangoProject/core/migrations/0005_rename_billings_billing_and_more.py @@ -0,0 +1,29 @@ +# Generated by Django 5.1.7 on 2025-03-27 10:40 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('core', '0004_billings_interactions_records'), + ] + + operations = [ + migrations.RenameModel( + old_name='Billings', + new_name='Billing', + ), + migrations.RenameModel( + old_name='Interactions', + new_name='Interaction', + ), + migrations.RenameModel( + old_name='mlModels', + new_name='mlModel', + ), + migrations.RenameModel( + old_name='Records', + new_name='Record', + ), + ] diff --git a/ActualProjectCode/DjangoProject/core/migrations/0006_record_chosenml.py b/ActualProjectCode/DjangoProject/core/migrations/0006_record_chosenml.py new file mode 100644 index 00000000..827f94dd --- /dev/null +++ b/ActualProjectCode/DjangoProject/core/migrations/0006_record_chosenml.py @@ -0,0 +1,18 @@ +# Generated by Django 5.1.7 on 2025-03-27 11:42 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('core', '0005_rename_billings_billing_and_more'), + ] + + operations = [ + migrations.AddField( + model_name='record', + name='chosenML', + field=models.CharField(default='baseML', max_length=100), + ), + ] diff --git a/ActualProjectCode/DjangoProject/core/migrations/0007_alter_record_chosenml.py b/ActualProjectCode/DjangoProject/core/migrations/0007_alter_record_chosenml.py new file mode 100644 index 00000000..1d69ee9c --- /dev/null +++ b/ActualProjectCode/DjangoProject/core/migrations/0007_alter_record_chosenml.py @@ -0,0 +1,18 @@ +# Generated by Django 5.1.7 on 2025-03-27 13:16 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('core', '0006_record_chosenml'), + ] + + operations = [ + migrations.AlterField( + model_name='record', + name='chosenML', + field=models.CharField(max_length=100), + ), + ] diff --git a/ActualProjectCode/DjangoProject/core/migrations/0008_alter_record_chosenml_alter_record_responsebyml.py b/ActualProjectCode/DjangoProject/core/migrations/0008_alter_record_chosenml_alter_record_responsebyml.py new file mode 100644 index 00000000..8babf310 --- /dev/null +++ b/ActualProjectCode/DjangoProject/core/migrations/0008_alter_record_chosenml_alter_record_responsebyml.py @@ -0,0 +1,23 @@ +# Generated by Django 5.1.7 on 2025-03-27 15:04 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('core', '0007_alter_record_chosenml'), + ] + + operations = [ + migrations.AlterField( + model_name='record', + name='chosenML', + field=models.CharField(default='baseML', max_length=100), + ), + migrations.AlterField( + model_name='record', + name='responseByML', + field=models.CharField(default='PLACEHOLDER RESPONSE', max_length=100), + ), + ] diff --git a/ActualProjectCode/DjangoProject/core/migrations/0009_remove_billing_userid_remove_interaction_userid_and_more.py b/ActualProjectCode/DjangoProject/core/migrations/0009_remove_billing_userid_remove_interaction_userid_and_more.py new file mode 100644 index 00000000..8d215a44 --- /dev/null +++ b/ActualProjectCode/DjangoProject/core/migrations/0009_remove_billing_userid_remove_interaction_userid_and_more.py @@ -0,0 +1,49 @@ +# Generated by Django 5.1.7 on 2025-03-27 15:09 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('core', '0008_alter_record_chosenml_alter_record_responsebyml'), + ] + + operations = [ + migrations.RemoveField( + model_name='billing', + name='userID', + ), + migrations.RemoveField( + model_name='interaction', + name='userID', + ), + migrations.RemoveField( + model_name='mlmodel', + name='userID', + ), + migrations.RemoveField( + model_name='record', + name='userID', + ), + migrations.AddField( + model_name='billing', + name='username', + field=models.CharField(default='company', max_length=100), + ), + migrations.AddField( + model_name='interaction', + name='username', + field=models.CharField(default='default', max_length=100), + ), + migrations.AddField( + model_name='mlmodel', + name='username', + field=models.CharField(default='default', max_length=100), + ), + migrations.AddField( + model_name='record', + name='username', + field=models.CharField(default='default', max_length=100), + ), + ] -- GitLab