rmanach/mumui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add progress bar

Browse Source
This commit is contained in:
rmanach 2023-09-22 16:42:34 +02:00
parent b9e87bd0ad
commit 1d9c4e0164
9 changed files with 244 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
deployment/migrations/0001_initial.py
View File

@ -1,4 +1,4 @@
# Generated by Django 4.2.5 on 2023-09-20 17:23
# Generated by Django 4.2.5 on 2023-09-22 14:39
from django.conf import settings
from django.db import migrations, models
@ -46,6 +46,8 @@ class Migration(migrations.Migration):
),
("created_at", models.DateTimeField(auto_now_add=True)),
("updated_at", models.DateTimeField(auto_now=True)),
("error", models.TextField(null=True)),
("task_id", models.UUIDField(null=True)),
(
"user",
models.ForeignKey(

7
deployment/models.py
View File

@ -1,4 +1,5 @@
from enum import Enum
from typing import Any
from django.contrib.auth.models import User
@ -38,7 +39,13 @@ class Deployment(models.Model):
)
created_at = models.DateTimeField(auto_now_add=True)
updated_at = models.DateTimeField(auto_now=True)
error = models.TextField(null=True, blank=False)
task_id = models.UUIDField(null=True)
user = models.ForeignKey(User, on_delete=models.CASCADE)
def __str__(self):
return f"{self.name} | {self.type} | {self.status}"
def __init__(self, *args: Any, **kwargs: Any):
self.progress = None
super().__init__(*args, **kwargs)

3
deployment/static/deployment/js/event_source.js
View File

@ -1,6 +1,8 @@
var start = function (url) {
var es = new ReconnectingEventSource(url);
console.log("url: " + url);
es.onopen = function () {
console.log('connected');
};
@ -36,6 +38,5 @@ var start = function (url) {
window.location.reload();
}
}
}, false);
};

37
deployment/static/deployment/js/event_source_details.js Normal file
View File

@ -0,0 +1,37 @@
var start = function (url) {
var es = new ReconnectingEventSource(url);
console.log("url: " + url);
es.onopen = function () {
console.log('connected');
};
es.addEventListener('stream-error', function (e) {
es.close();
message = JSON.parse(e.data);
console.log('stream error: ' + message.condition + ': ' + message.text);
}, false);
es.onerror = function (e) {
console.log('connection error');
};
es.addEventListener('message', function (e) {
message = JSON.parse(e.data);
console.log("id: " + message.id);
console.log("status: " + message.status);
console.log("progress: " + message.progress);
var progress = document.getElementById("deployment-progress");
progress.style["width"] = message.progress+"%";
if (message.status == "SUCCESS") {
setTimeout(() => window.location.reload(), 1000);
}
if (message.status == "FAILED") {
window.location.reload();
}
}, false);
};

140
deployment/tasks.py
View File

@ -2,31 +2,135 @@ import time
import random
from uuid import UUID
from celery import shared_task
from celery import Task, shared_task
from django_eventstream import send_event
from deployment.models import Deployment, Type, Status
@shared_task
def deploy(deployment_id: UUID):
deploy = Deployment.objects.get(id=deployment_id)
class DeploymentTask(Task):
def try_exec(self, stop: int):
if stop == 0:
stop = 1
deploy.status = Status.RUNNING.name
deploy.save()
for i in range(1, stop):
time.sleep(5 * stop - 2 * i)
match deploy.type:
case Type.SLIM.name:
time.sleep(10)
case Type.MEDIUM.name:
time.sleep(60)
case Type.LARGE.name:
time.sleep(120)
if random.randint(0, 10) == 10:
raise Exception("unable to perform the deployment")
deploy.status = (
Status.FAILED.name if random.randint(0, 10) % 2 != 0 else Status.SUCCESS.name
yield i
def run_slim(self):
progress = 95
self.update_state(meta={"progress": progress})
time.sleep(5)
status = Status.SUCCESS.name
progress = 100
self.update_state(meta={"progress": progress})
self.deploy.status = status
send_event(
f"deployment-{self.deploy.id}",
"message",
{
"id": self.deploy.id,
"status": self.deploy.status,
"progress": progress,
},
)
deploy.save()
send_event("deployment", "message", {"id": deploy.id, "status": deploy.status})
print("event sent")
def run_medium(self):
progress = 62
self.update_state(meta={"progress": progress})
time.sleep(10)
if random.randint(0, 10) % 2 != 0:
status = Status.FAILED.name
self.deploy.error = "arg.. no chance"
else:
status = Status.SUCCESS.name
progress = 100
self.update_state(meta={"progress": progress})
self.deploy.status = status
send_event(
f"deployment-{self.deploy.id}",
"message",
{
"id": self.deploy.id,
"status": self.deploy.status,
"progress": progress,
},
)
def run_large(self):
progress = 0
try:
for i in self.try_exec(6):
progress = i * 20
self.update_state(meta={"progress": progress})
if progress != 100:
send_event(
f"deployment-{self.deploy.id}",
"message",
{
"id": self.deploy.id,
"status": self.deploy.status
if i != 5
else Status.SUCCESS.name,
"progress": progress,
},
)
except Exception as e:
self.deploy.status = Status.FAILED.name
self.deploy.error = e
else:
self.deploy.status = Status.SUCCESS.name
send_event(
f"deployment-{self.deploy.id}",
"message",
{
"id": self.deploy.id,
"status": self.deploy.status,
"progress": progress,
},
)
@property
def progress(self):
return self.request.get("meta", {}).get("progress", 0)
def launch(self, deployment_id: UUID):
progress = 0
self.update_state(meta={"progress": progress})
self.deploy = Deployment.objects.get(id=deployment_id)
self.deploy.task_id = self.request.id
self.deploy.status = Status.RUNNING.name
self.deploy.save()
match self.deploy.type:
case Type.SLIM.name:
self.run_slim()
case Type.MEDIUM.name:
self.run_medium()
case Type.LARGE.name:
self.run_large()
self.deploy.task_id = None
self.deploy.save()
send_event(
"deployment",
"message",
{"id": self.deploy.id, "status": self.deploy.status},
)
@shared_task(base=DeploymentTask, bind=True, ignore_result=True)
def deploy(self, deployment_id: UUID):
self.launch(deployment_id)

5
deployment/urls.py
View File

@ -14,4 +14,9 @@ urlpatterns = [
{"channels": ["deployment"]},
name="deployment-events",
),
path(
"<deployment_id>/events/",
include(django_eventstream.urls),
{"format-channels": ["deployment-{deployment_id}"]},
),
]

19
deployment/views.py
View File

@ -1,5 +1,6 @@
from uuid import uuid4
from celery.result import AsyncResult
from django.core.paginator import Paginator
from django.http import (
HttpResponseRedirect,
@ -37,6 +38,10 @@ def deploy(request, deployment_id):
deployment = get_object_or_404(Deployment, id=deployment_id)
if request.method == "POST":
# override previous errors
if deployment.error:
deployment.error = None
deployment.status = Status.PENDING.name
deployment.save()
launch_deploy.delay(deployment_id)
@ -49,17 +54,29 @@ def deploy(request, deployment_id):
def details(request, deployment_id):
deployment = get_object_or_404(Deployment, id=deployment_id)
if deployment.status == Status.RUNNING.name:
# retrieve the progression in the backend task
res = AsyncResult(str(deployment.task_id))
deployment.progress = res.info.get("progress", 0)
if request.method == "POST":
if deployment.status == Status.RUNNING.name:
return HttpResponseBadRequest("deployment is running")
if deployment.status == Status.PENDING.name:
return HttpResponseBadRequest("deployment is pending")
try:
deployment.delete()
except Exception as e:
return HttpResponseServerError(e)
return HttpResponseRedirect("/deployment")
return render(request, "deployment/details.html", {"deployment": deployment})
return render(
request,
"deployment/details.html",
{"deployment": deployment, "url": f"{deployment.id}/events/"},
)
def create(request):

2
mumui/celery.py
View File

@ -4,7 +4,7 @@ from celery import Celery
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "mumui.settings")
app = Celery("mumui", broker="redis://redis:6379/0")
app = Celery("mumui", broker="redis://redis:6379/0", backend="redis://redis:6379/0")
app.config_from_object("django.conf:settings", namespace="CELERY")
app.autodiscover_tasks()

43
templates/deployment/details.html
View File

@ -1,7 +1,27 @@
{% extends 'base.html' %}
{% load static %}
{% block title %} Deployment details: {{ deployment.name }} {% endblock %}
{% if deployment.status == "RUNNING" %}
{% block bodyattr %}
{% if deployment.status == "RUNNING" %}
onload="start('{{ url|safe }}');"
{% endif %}
{% endblock %}
{% block headscript %}
{% if deployment.status == "RUNNING" %}
<script src="{% static 'django_eventstream/json2.js' %}"></script>
<script src="{% static 'django_eventstream/eventsource.min.js' %}"></script>
<script src="{% static 'django_eventstream/reconnecting-eventsource.js' %}"></script>
{% endif %}
{% endblock %}
{% endif %}
{% block content %}
<div class="container-fluid">
<div class="row justify-content-md-center">
@ -19,6 +39,13 @@
<input type="text" readonly class="form-control-plaintext" id="status" value="{{ deployment.status }}">
<label for="status">Status</label>
</div>
{% if deployment.status == "RUNNING" %}
<div class="form-floating mb-3">
<div class="progress" role="progressbar" aria-label="deployment-progress" aria-valuenow="{{ deployment.progress }}" aria-valuemin="0" aria-valuemax="100">
<div id="deployment-progress" class="progress-bar progress-bar-striped progress-bar-animated" style="width: {{ deployment.progress }}%"></div>
</div>
</div>
{% endif %}
<div class="form-floating mb-3">
<input type="text" readonly class="form-control-plaintext" id="created_at" value="{{ deployment.created_at }}">
<label for="created-at">Created at</label>
@ -27,6 +54,18 @@
<input type="text" readonly class="form-control-plaintext" id="updated_at" value="{{ deployment.updated_at }}">
<label for="updated-at">Updated at</label>
</div>
{% if deployment.status == "RUNNING" %}
<div class="form-floating mb-3">
<input type="text" readonly class="form-control-plaintext" id="updated_at" value="{{ deployment.task_id }}">
<label for="updated-at">Task UUID</label>
</div>
{% endif %}
{% if deployment.status == "FAILED" %}
<div class="form-floating mb-3">
<input type="text" readonly class="form-control-plaintext" id="updated_at" value="{{ deployment.error }}">
<label for="updated-at">Error</label>
</div>
{% endif %}
<form action="" method="post">
{% csrf_token %}
<button type="button" onclick="goBack()" class="btn btn-secondary">Back</button>
@ -43,6 +82,10 @@
{% endblock %}
{% block script %}
{% if deployment.status == "RUNNING" %}
<script src="{% static 'deployment/js/event_source_details.js' %}" />
</script>
{% endif %}
<script>
function goBack() {
window.location=document.referrer;