diff --git a/prediction_service/__pycache__/models.cpython-310.pyc b/prediction_service/__pycache__/models.cpython-310.pyc
index a816c8d5f45461aab09635255c5b3db20fb18242..15590b8ccf50e016329f9c1ec0390f98530e20b8 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/__pycache__/urls.cpython-310.pyc b/prediction_service/__pycache__/urls.cpython-310.pyc
index 6bf177723f1d0bf87a5345a8a1cfc8157772fefc..9f2994d2839fc75aa767c828c4981c8223b8366f 100644
Binary files a/prediction_service/__pycache__/urls.cpython-310.pyc and b/prediction_service/__pycache__/urls.cpython-310.pyc differ
diff --git a/prediction_service/__pycache__/views.cpython-310.pyc b/prediction_service/__pycache__/views.cpython-310.pyc
index 437076524b6908ca7b4458e7e053daadbcbc497f..0dc6061a5ae930dd20530bcc4a1593620eaa8778 100644
Binary files a/prediction_service/__pycache__/views.cpython-310.pyc and b/prediction_service/__pycache__/views.cpython-310.pyc differ
diff --git a/prediction_service/migrations/0008_post_slug.py b/prediction_service/migrations/0008_post_slug.py
new file mode 100644
index 0000000000000000000000000000000000000000..b91f7c3405931af0d841b5a1668b9c5827ff3b23
--- /dev/null
+++ b/prediction_service/migrations/0008_post_slug.py
@@ -0,0 +1,18 @@
+# Generated by Django 4.1.4 on 2024-03-26 11:05
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('prediction_service', '0007_post_mlmodel'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='post',
+ name='slug',
+ field=models.SlugField(default=None),
+ ),
+ ]
diff --git a/prediction_service/migrations/__pycache__/0008_post_slug.cpython-310.pyc b/prediction_service/migrations/__pycache__/0008_post_slug.cpython-310.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..c55ea3f9c19189f3acf952c4eafae7bb8abaf704
Binary files /dev/null and b/prediction_service/migrations/__pycache__/0008_post_slug.cpython-310.pyc differ
diff --git a/prediction_service/models.py b/prediction_service/models.py
index bf14a76f093c297ddb0551010b8eae60fc755b01..22fa64aca7ba1d8f631083985409c1958e0617bd 100644
--- a/prediction_service/models.py
+++ b/prediction_service/models.py
@@ -35,6 +35,8 @@ class MLModel(models.Model):
class Post(models.Model):
id = models.AutoField(primary_key=True)
title = models.CharField(max_length = 100)
+ slug = models.SlugField(default=None)
+
content = models.TextField()
date_posted = models.DateTimeField(default = timezone.now)
author = models.ForeignKey(User, on_delete=models.CASCADE)
diff --git a/prediction_service/templates/prediction_service/home.html b/prediction_service/templates/prediction_service/home.html
index 8bfd38c25258a0e2b474dfa3fa7cf4817ac44df7..295a48d47d5ab92fea4069764d399d5bb0904160 100644
--- a/prediction_service/templates/prediction_service/home.html
+++ b/prediction_service/templates/prediction_service/home.html
@@ -11,10 +11,10 @@
{% for post in posts %}
<div class="card" style="width: 18rem; margin-right: 15px;">
<div class="card-body">
- <h5 class="card-title">{{post.title}} ID: {{post.id}}</h5>
+ <h5 class="card-title">{{post.title}} ID: {{post.mlmodel.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>
+ <a href="/mlmodel/{{post.mlmodel.id}}" class="card-link">Ml-Model</a>
<a href="#" class="card-link">Another link</a>
</div>
</div>
diff --git a/prediction_service/templates/prediction_service/model.html b/prediction_service/templates/prediction_service/model.html
index 28dad7b7ab1e8cb7a239035ca4d220bd70465b39..8aabd3efb3e6a2e713ed9ea8ed267d664d9d490c 100644
--- a/prediction_service/templates/prediction_service/model.html
+++ b/prediction_service/templates/prediction_service/model.html
@@ -8,6 +8,8 @@
<h1>ML-Model</h1>
<img src="data:image/png;base64,{{ img_str }}" alt="PIL Image">
+
+ <h1>{{ layer }}</h1>
</div>
diff --git a/prediction_service/urls.py b/prediction_service/urls.py
index 3c49ac2ec8700cb6749197bcb209f03b0370d2e7..154dbe9491aecdf6014a175ecd3d54a41f0e453a 100644
--- a/prediction_service/urls.py
+++ b/prediction_service/urls.py
@@ -12,5 +12,5 @@ urlpatterns = [
path('about/', views.about, name='MLAAS-about'),
path('home/', views.home, name='MLAAS-home'),
- path('mlmodel/', views.mlmodel, name='MLAAS-model')
+ path('mlmodel/<str:pk>/', views.mlmodel, name='MLAAS-model'),
]
diff --git a/prediction_service/views.py b/prediction_service/views.py
index 9baf72e1c7d0ea85345480d34902482d5452247b..d6cf0aac8f118a384bcf26f94401fbb908790a89 100644
--- a/prediction_service/views.py
+++ b/prediction_service/views.py
@@ -10,6 +10,7 @@ from django.contrib.auth.decorators import login_required
from .forms import UserRegisterForm
from .models import Post
+from .models import MLModel
from django.contrib.auth.models import User
@login_required
@@ -54,7 +55,10 @@ from PIL import Image
import base64
@login_required
-def mlmodel(request):
+def mlmodel(request, pk):
+
+ mlmodel = MLModel.objects.get(id=pk)
+ layercount = str(mlmodel.layers)
matrix = np.asarray([[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
@@ -99,4 +103,5 @@ def mlmodel(request):
img.save(buffered, format='PNG')
img_str = base64.b64encode(buffered.getvalue()).decode('utf-8')
- return render(request, "prediction_service/model.html", {'img_str': img_str})
+ return render(request, "prediction_service/model.html", {'img_str': img_str,
+ 'layer': layercount,})