Add vuejs in agents_state (update informations every 4 secs)

Alexis Koralewski
1 parent 9cd82394
Showing 7 changed files with 91 additions and 9 deletions Show diff stats
CHANGELOG
VERSION
src/core/pyros_django/api/serializers.py
src/core/pyros_django/api/urls.py
src/core/pyros_django/api/views.py
src/core/pyros_django/dashboard/templates/dashboard/agents_state.html
src/core/pyros_django/pyros/settings.py
-20-09-2022 (AKo): v0.5.5.0
+28-09-2022 (AKo): v0.5.6.0
+	- Add vuejs in agents_state (update informations every 4 secs)
+	- Add new option for agentSST : start a specific agent
+
+23-09-2022 (AKo): v0.5.5.0
 	- Add flexible form for sending agent cmd
 	- New implementation of Agent get_specific_cmds()	
 	- Adapt agentSST to new signature of specific_cmds, add type hints to cmd functions
-0.5.5.0
 \ No newline at end of file
+0.5.6.0
 \ No newline at end of file
-from common.models import Institute, Period, PyrosUser, SP_Period, ScienceTheme, ScientificProgram, Sequence, Plan, Album
+from common.models import AgentSurvey, Institute, Period, PyrosUser, SP_Period, ScienceTheme, ScientificProgram, Sequence, Plan, Album, AgentCmd
 from rest_framework import serializers
-
-
+import datetime
+from datetime import timezone
  
 class InstituteSerializer(serializers.ModelSerializer):
     class Meta:
@@ -97,3 +97,29 @@ class FullSequenceSerializer(serializers.ModelSerializer):
         model = Sequence
         fields = "__all__"
         extra_fields = ["pyros_user", "albums"]
+
+
+
+class AgentSurveySerializer(serializers.ModelSerializer):
+    class Meta:
+        model = AgentSurvey
+        fields = "__all__"
+
+    is_out_of_date = serializers.SerializerMethodField()
+    running_cmd = serializers.SerializerMethodField()
+
+    def get_is_out_of_date(self, obj):
+        datetime_now = datetime.datetime.utcnow()
+        datetime_now_minus_thirty_sec = datetime_now - datetime.timedelta(seconds=30)
+        datetime_now_minus_thirty_sec =  datetime_now_minus_thirty_sec.replace(tzinfo=timezone.utc)
+        
+        if datetime_now_minus_thirty_sec >= obj.updated:
+            return True
+        else:
+            return False
+
+    def get_running_cmd(self,obj):
+        try:
+            return AgentCmd.objects.get(state="CMD_RUNNING",sender=obj.name).full_name
+        except AgentCmd.DoesNotExist:
+            return "None"
 \ No newline at end of file
@@ -11,6 +11,7 @@ router.register(r&#39;plans&#39;, views.PlanViewSet)
 router.register(r'full_sequences', views.FullSequenceViewSet)
 router.register(r'scientific_programs', views.ScientificProgramViewSet)
 router.register(r'sp_period', views.SPPeriodViewSet)
+router.register(r'agent_survey', views.AgentSurveyViewSet)
  
 urlpatterns = [
     path('', include(router.urls)),
@@ -6,8 +6,8 @@ from rest_framework.permissions import IsAuthenticated, AllowAny
 from rest_framework.decorators import api_view, permission_classes, action
 from django.core.validators import ValidationError
 from src.core.pyros_django.user_manager import views as user_views
-from api.serializers import AlbumSerializer, FullSequenceSerializer, PlanSerializer, SPPeriodSerializer, ScientificProgramSerializer, SequenceSerializer, UserSerializer
-from common.models import PyrosUser, SP_Period, ScientificProgram, Sequence, Album, Plan, UserLevel, SP_Period_User
+from api.serializers import AgentSurveySerializer, AlbumSerializer, FullSequenceSerializer, PlanSerializer, SPPeriodSerializer, ScientificProgramSerializer, SequenceSerializer, UserSerializer
+from common.models import PyrosUser, SP_Period, ScientificProgram, Sequence, Album, Plan, UserLevel, SP_Period_User, AgentSurvey
 from routine_manager.functions import check_sequence_file_validity
 from rest_framework.request import Request
 from django.db.models import Q
@@ -238,3 +238,14 @@ def submit_sequence_with_json(request):
         log.info(
             f"User {request.user} did action submit sequence {seq} for period {seq.period} ")
     return Response(response)
+
+
+
+class AgentSurveyViewSet(viewsets.ModelViewSet):
+    """
+    API endpoint that allows users to view their sequences.
+    """
+    queryset = AgentSurvey.objects.all()
+    serializer_class = AgentSurveySerializer
+    permission_classes = [IsAuthenticated]
+    http_method_names = ["get"]
 \ No newline at end of file
@@ -7,13 +7,18 @@
 	Agents status :
 {% endblock %}
  
-{% block content %}
+{% block head %}
 <style>
     .red{
         color: red;
     }
 </style>
  
+<script src="../public/static/js/vue.min.js"></script>
+{% endblock %}
+{% block content %}
+
+
 <div class="table-responsive">
     <table
         class="table table-bordered table-hover table-striped tablesorter" id="agents_state_table">
@@ -28,6 +33,7 @@
             </tr>
         </thead>
         <tbody>
+        {% comment %}
         {% for agent in agents %}
         <tr>
             <td> <a href={% url 'agent_detail' agent.name %}>{{ agent.name }}</a></td>
@@ -43,6 +49,20 @@
             <td> {{ agent.current_nb_restart }} </td>
         </tr>
         {% endfor %}
+        {% endcomment %}
+
+        <tr v-for="agent in agents">
+
+            <td> <a v-bind:href="`/dashboard/agent_detail/${agent.name}`"> [[agent.name ]]</a></td>
+            
+            <td> [[ agent.status ]]</td>
+            <td> [[ agent.mode ]]</td>
+            
+            <td v-if="agent.is_out_of_date" class="red"> [[ agent.updated ]]</td>
+            <td v-else> [[ agent.updated ]] </td>
+            <td class="running_commands"> [[agent.running_cmd]] </td>
+            <td> [[ agent.current_nb_restart ]] </td>
+        </tr>
         </tbody>
     </table>
 </div>
@@ -61,6 +81,25 @@
         });
     }
  
-    setInterval(refresh_command_column,5000);
+    function refresh_status_table(){
+        
+        fetch("/api/agent_survey/?format=json").then(response => response.json()).then(function(data){
+            console.log(data);
+            app.agents = data;
+        });
+    }
+    $(document).ready(function() {
+        
+        refresh_status_table();
+        //setInterval(refresh_command_column,5000);
+        setInterval(refresh_status_table,4000);
+    });
+    var app = new Vue({
+        delimiters:["[[","]]"],
+        el: '#agents_state_table',
+        data: {
+            agents: []
+        }
+    })
 </script>
 {% endblock %}
 \ No newline at end of file
@@ -234,6 +234,7 @@ REST_FRAMEWORK = {
         'rest_framework.authentication.TokenAuthentication',  
         'rest_framework.authentication.SessionAuthentication',
     ],
+    'DATETIME_FORMAT': "%Y-%m-%dT%H:%M:%S",
 }
  
 MIDDLEWARE = [