diff --git a/prediction_service/__pycache__/admin.cpython-310.pyc b/prediction_service/__pycache__/admin.cpython-310.pyc
index f32988f00890cc4e85e932a2de2b2516a64553e1..e101eaff39255a47b8750a12422fcaa767b49283 100644
Binary files a/prediction_service/__pycache__/admin.cpython-310.pyc and b/prediction_service/__pycache__/admin.cpython-310.pyc differ
diff --git a/prediction_service/__pycache__/models.cpython-310.pyc b/prediction_service/__pycache__/models.cpython-310.pyc
index a2ab8dfaa0c5be60ee3d2dd14713c2e86efb6167..a816c8d5f45461aab09635255c5b3db20fb18242 100644
Binary files a/prediction_service/__pycache__/models.cpython-310.pyc and b/prediction_service/__pycache__/models.cpython-310.pyc differ
diff --git a/prediction_service/admin.py b/prediction_service/admin.py
index 848a0ca6e38733e18ccbd092251eba08ab79ea55..640d4b813599dca7adae6c92145203c6f8f0b0aa 100644
--- a/prediction_service/admin.py
+++ b/prediction_service/admin.py
@@ -1,8 +1,11 @@
from django.contrib import admin
from .models import Post
from .models import UserProfile
+from .models import MLModel
+
# Register your models here to the admin page
admin.site.register(Post)
+admin.site.register(MLModel)
admin.site.register(UserProfile)
\ No newline at end of file
diff --git a/prediction_service/migrations/0005_alter_post_id_delete_financeteam.py b/prediction_service/migrations/0005_alter_post_id_delete_financeteam.py
new file mode 100644
index 0000000000000000000000000000000000000000..ff8e11201a68c1f71caf3fa53467a01dc59e5433
--- /dev/null
+++ b/prediction_service/migrations/0005_alter_post_id_delete_financeteam.py
@@ -0,0 +1,21 @@
+# Generated by Django 4.1.4 on 2024-03-26 10:43
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('prediction_service', '0004_alter_userprofile_role'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='post',
+ name='id',
+ field=models.AutoField(primary_key=True, serialize=False),
+ ),
+ migrations.DeleteModel(
+ name='FinanceTeam',
+ ),
+ ]
diff --git a/prediction_service/migrations/0006_mlmodel.py b/prediction_service/migrations/0006_mlmodel.py
new file mode 100644
index 0000000000000000000000000000000000000000..61a952257b98af16926a8fdd9819fffbd7e27974
--- /dev/null
+++ b/prediction_service/migrations/0006_mlmodel.py
@@ -0,0 +1,21 @@
+# Generated by Django 4.1.4 on 2024-03-26 10:44
+
+import django.core.validators
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('prediction_service', '0005_alter_post_id_delete_financeteam'),
+ ]
+
+ operations = [
+ migrations.CreateModel(
+ name='MLModel',
+ fields=[
+ ('id', models.AutoField(primary_key=True, serialize=False)),
+ ('layers', models.IntegerField(default=1, validators=[django.core.validators.MinValueValidator(1)], verbose_name='Number of Layers')),
+ ],
+ ),
+ ]
diff --git a/prediction_service/migrations/0007_post_mlmodel.py b/prediction_service/migrations/0007_post_mlmodel.py
new file mode 100644
index 0000000000000000000000000000000000000000..6ffc0f38d867be70543d5f739ec239e19bc00336
--- /dev/null
+++ b/prediction_service/migrations/0007_post_mlmodel.py
@@ -0,0 +1,19 @@
+# Generated by Django 4.1.4 on 2024-03-26 10:46
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('prediction_service', '0006_mlmodel'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='post',
+ name='mlmodel',
+ field=models.ForeignKey(default=None, on_delete=django.db.models.deletion.CASCADE, to='prediction_service.mlmodel'),
+ ),
+ ]
diff --git a/prediction_service/migrations/__pycache__/0005_alter_post_id_delete_financeteam.cpython-310.pyc b/prediction_service/migrations/__pycache__/0005_alter_post_id_delete_financeteam.cpython-310.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..7a3020892f0b9171eb32fd21a830f99e36c866e7
Binary files /dev/null and b/prediction_service/migrations/__pycache__/0005_alter_post_id_delete_financeteam.cpython-310.pyc differ
diff --git a/prediction_service/migrations/__pycache__/0005_mlmodel_alter_post_id_delete_financeteam_and_more.cpython-310.pyc b/prediction_service/migrations/__pycache__/0005_mlmodel_alter_post_id_delete_financeteam_and_more.cpython-310.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..e64c2966935fd89977d47dc2dee72875ff31d1a5
Binary files /dev/null and b/prediction_service/migrations/__pycache__/0005_mlmodel_alter_post_id_delete_financeteam_and_more.cpython-310.pyc differ
diff --git a/prediction_service/migrations/__pycache__/0006_mlmodel.cpython-310.pyc b/prediction_service/migrations/__pycache__/0006_mlmodel.cpython-310.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..e7c8d3c08cb15e5f24aa750ef199ce095323dea5
Binary files /dev/null and b/prediction_service/migrations/__pycache__/0006_mlmodel.cpython-310.pyc differ
diff --git a/prediction_service/migrations/__pycache__/0007_post_mlmodel.cpython-310.pyc b/prediction_service/migrations/__pycache__/0007_post_mlmodel.cpython-310.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..43acfbd3b3ac2f7c11e51015651db9e12a2fdc4b
Binary files /dev/null and b/prediction_service/migrations/__pycache__/0007_post_mlmodel.cpython-310.pyc differ
diff --git a/prediction_service/migrations/__pycache__/0007_remove_mlmodel_linkedpost_post_mlmodel.cpython-310.pyc b/prediction_service/migrations/__pycache__/0007_remove_mlmodel_linkedpost_post_mlmodel.cpython-310.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..0b56a493170f674f4c2b8153e3988195d55dfe62
Binary files /dev/null and b/prediction_service/migrations/__pycache__/0007_remove_mlmodel_linkedpost_post_mlmodel.cpython-310.pyc differ
diff --git a/prediction_service/migrations/__pycache__/0008_rename_id_mlmodel_mlmodel_id.cpython-310.pyc b/prediction_service/migrations/__pycache__/0008_rename_id_mlmodel_mlmodel_id.cpython-310.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..4c022221e2225901da74af13abd31ba0a865c238
Binary files /dev/null and b/prediction_service/migrations/__pycache__/0008_rename_id_mlmodel_mlmodel_id.cpython-310.pyc differ
diff --git a/prediction_service/migrations/__pycache__/0009_rename_mlmodel_id_mlmodel_id.cpython-310.pyc b/prediction_service/migrations/__pycache__/0009_rename_mlmodel_id_mlmodel_id.cpython-310.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..bd54f30c8bedc6255eee3720a825fed5f16f8577
Binary files /dev/null and b/prediction_service/migrations/__pycache__/0009_rename_mlmodel_id_mlmodel_id.cpython-310.pyc differ
diff --git a/prediction_service/migrations/__pycache__/0010_remove_post_mlmodel.cpython-310.pyc b/prediction_service/migrations/__pycache__/0010_remove_post_mlmodel.cpython-310.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..a1c832e5bdf0854e74fe6001d86daf4fe1b44708
Binary files /dev/null and b/prediction_service/migrations/__pycache__/0010_remove_post_mlmodel.cpython-310.pyc differ
diff --git a/prediction_service/migrations/__pycache__/0011_post_mlmodel.cpython-310.pyc b/prediction_service/migrations/__pycache__/0011_post_mlmodel.cpython-310.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..2ba4d9be536f6e937cba16aaeb77e9a3fa2297d9
Binary files /dev/null and b/prediction_service/migrations/__pycache__/0011_post_mlmodel.cpython-310.pyc differ
diff --git a/prediction_service/migrations/__pycache__/0012_alter_post_mlmodel.cpython-310.pyc b/prediction_service/migrations/__pycache__/0012_alter_post_mlmodel.cpython-310.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..0dca3b20a7cb453671c7f54f4189f2a83fbb5332
Binary files /dev/null and b/prediction_service/migrations/__pycache__/0012_alter_post_mlmodel.cpython-310.pyc differ
diff --git a/prediction_service/migrations/__pycache__/0013_alter_post_mlmodel.cpython-310.pyc b/prediction_service/migrations/__pycache__/0013_alter_post_mlmodel.cpython-310.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..49b0dcc56b133a0981a6e84258ed8681776c090c
Binary files /dev/null and b/prediction_service/migrations/__pycache__/0013_alter_post_mlmodel.cpython-310.pyc differ
diff --git a/prediction_service/migrations/__pycache__/0014_remove_post_mlmodel_mlmodel_linkedpost.cpython-310.pyc b/prediction_service/migrations/__pycache__/0014_remove_post_mlmodel_mlmodel_linkedpost.cpython-310.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..5fdff533501333562d71ae5f4dec97d793a3ade1
Binary files /dev/null and b/prediction_service/migrations/__pycache__/0014_remove_post_mlmodel_mlmodel_linkedpost.cpython-310.pyc differ
diff --git a/prediction_service/migrations/__pycache__/0015_alter_mlmodel_linkedpost.cpython-310.pyc b/prediction_service/migrations/__pycache__/0015_alter_mlmodel_linkedpost.cpython-310.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..144d5ff854509d6c121c0938c97261ef15c3ed01
Binary files /dev/null and b/prediction_service/migrations/__pycache__/0015_alter_mlmodel_linkedpost.cpython-310.pyc differ
diff --git a/prediction_service/migrations/__pycache__/0016_delete_mlmodel.cpython-310.pyc b/prediction_service/migrations/__pycache__/0016_delete_mlmodel.cpython-310.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..d955ffa44ee3ee0b3b360fbc6f73465b54f374fc
Binary files /dev/null and b/prediction_service/migrations/__pycache__/0016_delete_mlmodel.cpython-310.pyc differ
diff --git a/prediction_service/migrations/__pycache__/0017_mlmodel_post_mlmodel.cpython-310.pyc b/prediction_service/migrations/__pycache__/0017_mlmodel_post_mlmodel.cpython-310.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..2cffa877e846bbcccb981bfd8e5c7ebb104a8a8b
Binary files /dev/null and b/prediction_service/migrations/__pycache__/0017_mlmodel_post_mlmodel.cpython-310.pyc differ
diff --git a/prediction_service/migrations/__pycache__/0018_rename_mlmodel_post_mlmodel_id.cpython-310.pyc b/prediction_service/migrations/__pycache__/0018_rename_mlmodel_post_mlmodel_id.cpython-310.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..f8df1289491830bda1e73ecc85eed689375c1eb1
Binary files /dev/null and b/prediction_service/migrations/__pycache__/0018_rename_mlmodel_post_mlmodel_id.cpython-310.pyc differ
diff --git a/prediction_service/migrations/__pycache__/0019_rename_mlmodel_id_post_mlmodel.cpython-310.pyc b/prediction_service/migrations/__pycache__/0019_rename_mlmodel_id_post_mlmodel.cpython-310.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..1b0a156311be783416a202f87dd2bbe1e7893254
Binary files /dev/null and b/prediction_service/migrations/__pycache__/0019_rename_mlmodel_id_post_mlmodel.cpython-310.pyc differ
diff --git a/prediction_service/models.py b/prediction_service/models.py
index 21bf3bb6b5fb89fdfc716a6ac94737640e09f5b5..bf14a76f093c297ddb0551010b8eae60fc755b01 100644
--- a/prediction_service/models.py
+++ b/prediction_service/models.py
@@ -1,4 +1,7 @@
from django.db import models
+
+from django.core.validators import MinValueValidator
+
from django.contrib.auth.models import User
@@ -25,12 +28,18 @@ class Administrator(models.Model):
user = models.OneToOneField(UserProfile, on_delete=models.CASCADE)
# Add fields for administrative tasks
+class MLModel(models.Model):
+ id = models.AutoField(primary_key=True)
+ layers = models.IntegerField(default=1, verbose_name='Number of Layers', validators=[MinValueValidator(1)])
+
class Post(models.Model):
+ id = models.AutoField(primary_key=True)
title = models.CharField(max_length = 100)
content = models.TextField()
date_posted = models.DateTimeField(default = timezone.now)
author = models.ForeignKey(User, on_delete=models.CASCADE)
+ mlmodel = models.ForeignKey(MLModel, on_delete=models.CASCADE, default=None)
def __str__(self) -> str:
return self.title
\ No newline at end of file
diff --git a/prediction_service/templates/prediction_service/home.html b/prediction_service/templates/prediction_service/home.html
index 6ca5209facdb318b9ee5f0235b33f86658b7ec58..8bfd38c25258a0e2b474dfa3fa7cf4817ac44df7 100644
--- a/prediction_service/templates/prediction_service/home.html
+++ b/prediction_service/templates/prediction_service/home.html
@@ -11,7 +11,7 @@
{% for post in posts %}
<div class="card" style="width: 18rem; margin-right: 15px;">
<div class="card-body">
- <h5 class="card-title">{{post.title}}</h5>
+ <h5 class="card-title">{{post.title}} ID: {{post.id}}</h5>
<h6 class="card-subtitle mb-2 text-muted">By {{ post.author }} on {{ post.date_posted }}</h6>
<p class="card-text">{{ post.content }}</p>
<a href="/mlmodel/" class="card-link">Ml-Model</a>