fix

Reviewed-on: #11

.deploy/deploy-prod.yaml

@@ -19,7 +19,6 @@ services:
       RABBITMQ_PASSWORD: $RABBITMQ_PASSWORD_PROD
       VK_SERVICE_TOKEN: $VK_SERVICE_TOKEN
       YANDEX_SERVICE_TOKEN: $YANDEX_SERVICE_TOKEN
-      TELEGRAM_TOKEN: $TELEGRAM_TOKEN
       PLATFORM_SECURITY_TOKEN: $PLATFORM_SECURITY_TOKEN
     command: runserver 0.0.0.0:1238
     healthcheck:
@@ -32,10 +31,6 @@ services:
       mode: replicated
       restart_policy:
         condition: any
-      placement:
-        constraints:
-          - node.role == worker
-          - node.labels.zone == ru
       update_config:
         parallelism: 1
         order: start-first
@@ -70,7 +65,6 @@ services:
       DB_PASSWORD: $DB_PASSWORD_PROD
       MINIO_HOST: "minio.sprinthub.ru"
       MINIO_SECRET_KEY: $MINIO _SECRET_KEY_PROD
-      TELEGRAM_TOKEN: $TELEGRAM_TOKEN
     command: migrate
     deploy:
       mode: replicated

Platform/settings.py

@@ -48,7 +48,8 @@ INSTALLED_APPS = [
     'web.apps.WebConfig',
     'configs.apps.ConfigsConfig',
     'experiments.apps.ExperimentsConfig',
-    'stats.apps.StatsConfig'
+    'stats.apps.StatsConfig',
+    'schemas.apps.SchemasConfig',
 ]
 
 MIDDLEWARE = [

Platform/urls.py

@@ -21,5 +21,6 @@ urlpatterns = [
     path('configs/', include('configs.urls')),
     path('experiments/', include('experiments.urls')),
     path('stats/', include('stats.urls')),
+    path('schemas/', include('schemas.urls')),
     path('', include('web.urls'))
 ]

generator.py

@@ -0,0 +1,37 @@
+import json
+import urllib.request
+import os
+import shutil
+
+
+projects = {
+    'queues': 'tasks.proto'
+}
+
+
+try:
+    shutil.rmtree('schemas')
+except:
+    pass
+
+try:
+    os.mkdir('schemas')
+except:
+    pass
+
+for project in projects:
+    response = urllib.request.urlopen(f'https://platform.sprinthub.ru/schemas/get?project={project}').read()
+    data = json.loads(response)
+    os.mkdir(f'schemas/{project}')
+for key, value in data.items():
+    with open(f'schemas/{project}/{key}', 'w+') as fp:
+        fp.write(value)
+
+
+for key, value in projects.items():
+    os.system(f'python -m grpc_tools.protoc --proto_path schemas --python_out=. --pyi_out=. --grpc_python_out=. ./schemas/{key}/{value}')
+
+try:
+    shutil.rmtree('schemas')
+except:
+    pass

schemas/admin.py

@@ -0,0 +1,6 @@
+from django.contrib import admin
+
+# Register your models here.
+from .models import Schema
+
+admin.site.register(Schema)

schemas/apps.py

@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class SchemasConfig(AppConfig):
+    default_auto_field = 'django.db.models.BigAutoField'
+    name = 'schemas'

schemas/migrations/0001_initial.py

@@ -0,0 +1,28 @@
+# Generated by Django 5.1.4 on 2024-12-08 11:56
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ('web', '0007_customuser_telegram_id_customuser_telegram_username'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Schema',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.TextField()),
+                ('data', models.BinaryField(blank=True, null=True)),
+                ('project', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='web.project')),
+            ],
+            options={
+                'indexes': [models.Index(fields=['project'], name='schemas_sch_project_18fee8_idx')],
+            },
+        ),
+    ]

schemas/migrations/0002_alter_schema_data.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.1.4 on 2024-12-08 12:05
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('schemas', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='schema',
+            name='data',
+            field=models.TextField(blank=True, null=True),
+        ),
+    ]

schemas/migrations/0003_alter_schema_data.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.1.4 on 2024-12-08 12:15
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('schemas', '0002_alter_schema_data'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='schema',
+            name='data',
+            field=models.TextField(blank=True, default=''),
+        ),
+    ]

schemas/models.py

@@ -0,0 +1,14 @@
+from django.db import models
+
+# Create your models here.
+
+
+class Schema(models.Model):
+    project = models.ForeignKey('web.Project', on_delete=models.CASCADE)
+    name = models.TextField()
+    data = models.TextField(default='', blank=True)
+
+    class Meta:
+        indexes = [
+            models.Index(fields=['project'])
+        ]

schemas/tests.py

@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.

schemas/urls.py

@@ -0,0 +1,9 @@
+from django.contrib import admin
+from django.urls import path
+
+from .views import *
+
+urlpatterns = [
+    path(*SchemasView.as_path()),
+    path('get', get_schemas)
+]

schemas/views.py

@@ -0,0 +1,46 @@
+from json import loads
+
+from django.http import HttpResponse, JsonResponse
+
+from BaseLib.BaseView import BaseView
+from BaseLib.configurator import *
+from Platform import settings
+from schemas.models import Schema
+
+
+# Create your views here.
+
+
+class SchemasView(BaseView):
+    required_login = True
+    endpoint = ''
+    view_file = 'schemas.html'
+
+    def pre_handle(self):
+        self.context['schemas'] = Schema.objects.filter(project=self.request.user.selected_project)
+
+    def post_create_schema(self):
+        Schema.objects.create(project=self.request.user.selected_project, name=self.request.POST['name'])
+        return '/schemas'
+
+    def post_delete(self):
+        Schema.objects.get(id=self.request.POST['schema']).delete()
+        return '/schemas'
+
+
+    def post_save(self):
+        schema = Schema.objects.get(id=self.request.POST['schema'])
+        schema.data = self.request.POST['data']
+        schema.save()
+        return '/schemas'
+
+
+def get_schemas(request):
+    project = request.GET.get('project')
+    if project is None:
+        return HttpResponse('', status=400)
+    data = {
+        schema.name: schema.data
+        for schema in Schema.objects.filter(project__name=project)
+    }
+    return JsonResponse(data, safe=False)

stats/management/commands/fetch_stats.py

@@ -24,6 +24,8 @@ class Command(BaseCommand):
                     if response.status_code != 200:
                         continue
                     Snapshot.objects.create(project=project, data=response.json())
+                if not project.stats_cron:
+                    continue
                 cron = croniter.croniter(project.stats_cron, timezone.now())
                 next_date = cron.get_next(datetime.datetime)
                 project.next_stats_fetch_time = next_date

templates/includes/sidebar.html

@@ -98,6 +98,14 @@
           <span class="sidebar-text">Статистика</span>
         </a>
       </li>
+      <li class="nav-item">
+        <a href="/schemas" class="nav-link">
+          <span class="sidebar-icon">
+            <i class="fa fa-file-code-o"></i>
+          </span>
+          <span class="sidebar-text">Схемы</span>
+        </a>
+      </li>
       <li class="nav-item">
         <button class="btn btn-secondary d-flex align-items-center justify-content-center btn-upgrade-pro">
           {{ user.selected_project.name }}

templates/schemas.html

@@ -0,0 +1,61 @@
+{% extends 'layouts/base.html' %}
+
+{% block content %}
+    <h1>Схемы <button class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#create_config">+</button></h1>
+    <div class="modal fade" id="create_config" tabindex="-1" aria-labelledby="modal-default" style="display: none;" aria-hidden="true">
+        <div class="modal-dialog modal-dialog-centered" role="document">
+            <div class="modal-content">
+                <form method="POST">
+                    {% csrf_token %}
+                    <div class="modal-header">
+                        <h2 class="h6 modal-title">Создать схему</h2>
+                        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+                    </div>
+                    <div class="modal-body">
+                        <input type="text" name="name" placeholder="Имя файла" style="width: 100%;" />
+                    </div>
+                    <div class="modal-footer">
+                        <button type="submit" name="action" value="create_schema" class="btn btn-secondary">Создать</button>
+                        <button type="button" class="btn btn-link text-gray-600 ms-auto" data-bs-dismiss="modal">Закрыть</button>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <table class="table">
+        <thead>
+            <th>Название</th>
+            <th>Действие</th>
+        </thead>
+        <tbody>
+            {% for schema in schemas %}
+                <tr>
+                    <td>{{ schema.name }}</td>
+                    <td><button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#edit_{{ schema.id }}">Редактировать</button></td>
+                    <div class="modal fade" id="edit_{{ schema.id }}" tabindex="-1" aria-labelledby="modal-default" style="display: none;" aria-hidden="true">
+                        <div class="modal-dialog modal-dialog-centered" role="document">
+                            <div class="modal-content">
+                                <form method="POST">
+                                    {% csrf_token %}
+                                    <input type="hidden" name="schema" value="{{ schema.id }}" />
+                                    <div class="modal-header">
+                                        <h2 class="h6 modal-title">Редактировать схему {{ config.name }}</h2>
+                                        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+                                    </div>
+                                    <div class="modal-body">
+                                        <textarea style="width: 100%; height: 800px;" name="data">{{ schema.data }}</textarea>
+                                    </div>
+                                    <div class="modal-footer">
+                                        <button type="submit" name="action" value="save" class="btn btn-secondary">Сохранить</button>
+                                        <button type="submit" name="action" value="delete" class="btn btn-danger" onclick="return confirm('Подтверди удаление. Это действие необратимо.');">Удалить</button>
+                                        <button type="button" class="btn btn-link text-gray-600 ms-auto" data-bs-dismiss="modal">Закрыть</button>
+                                    </div>
+                                </form>
+                            </div>
+                        </div>
+                    </div>
+                </tr>
+            {% endfor %}
+        </tbody>
+    </table>
+{% endblock %}

web/migrations/0008_alter_project_next_stats_fetch_time_and_more.py

@@ -0,0 +1,28 @@
+# Generated by Django 5.1.4 on 2024-12-08 12:05
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('web', '0007_customuser_telegram_id_customuser_telegram_username'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='project',
+            name='next_stats_fetch_time',
+            field=models.DateTimeField(blank=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name='project',
+            name='stats_cron',
+            field=models.TextField(blank=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name='project',
+            name='stats_link',
+            field=models.TextField(blank=True, null=True),
+        ),
+    ]

web/models/project.py

@@ -3,10 +3,10 @@ from django.db import models
 
 class Project(models.Model):
     name = models.TextField()
-    stats_link = models.TextField(null=True)
-    stats_cron = models.TextField(null=True)
+    stats_link = models.TextField(null=True, blank=True)
+    stats_cron = models.TextField(null=True, blank=True)
     stats_enabled = models.BooleanField(default=False)
-    next_stats_fetch_time = models.DateTimeField(null=True)
+    next_stats_fetch_time = models.DateTimeField(null=True, blank=True)
 
     class Meta:
         indexes = [

web/urls.py

@@ -15,4 +15,5 @@ urlpatterns = [
     path(*YandexAuthView.as_path()),
     path('is_staff', is_staff),
     path('fetch', fetch),
+    path('generator', generator),
 ]

web/views/__init__.py

@@ -9,3 +9,4 @@ from .vk_auth import VKAuthView
 from .yandex_auth import YandexAuthView
 from .is_staff import is_staff
 from .fetch import fetch
+from .generator import generator

web/views/generator.py

@@ -0,0 +1,5 @@
+from django.http import HttpResponse
+
+
+def generator(request):
+    return HttpResponse(open('generator.py', 'rb').read())