Merge pull request 'master' (#18) from master into prod

Reviewed-on: #18

.deploy/deploy-dev.yaml

@@ -4,37 +4,25 @@ version: "3.4"
 services:
 
   platform-nginx:
-    image: mathwave/sprint-repo:platform-nginx
-    networks:
-      - net
-      - common-infra-nginx
-    deploy:
-      mode: replicated
-      restart_policy:
-        condition: any
-      update_config:
-        parallelism: 1
-        order: start-first
-
-  app:
     image: mathwave/sprint-repo:platform
     networks:
-      - net
+      - common-infra-nginx-development
+      - configurator-development
+      - postgres-development
+      - minio-development
     environment:
-      DB_HOST: "pg.develop.sprinthub.ru"
+      DB_HOST: "postgres"
       DB_PASSWORD: $DB_PASSWORD_DEV
-      MINIO_HOST: "minio.develop.sprinthub.ru"
+      MINIO_HOST: "minio"
       MINIO_SECRET_KEY: $MINIO_SECRET_KEY_DEV
-      REDIS_HOST: "redis.develop.sprinthub.ru"
+      REDIS_HOST: "redis.dev.chocomarsh.com"
       REDIS_PASSWORD: $REDIS_PASSWORD_DEV
-      RABBITMQ_HOST: "rabbitmq.develop.sprinthub.ru"
-      RABBITMQ_PASSWORD: $RABBITMQ_PASSWORD_DEV
       VK_SERVICE_TOKEN: $VK_SERVICE_TOKEN
       YANDEX_SERVICE_TOKEN: $YANDEX_SERVICE_TOKEN
       PLATFORM_SECURITY_TOKEN: $PLATFORM_SECURITY_TOKEN
-    command: runserver 0.0.0.0:8000
+    command: runserver 0.0.0.0:1238
     healthcheck:
-      test: curl --fail http://0.0.0.0:8000/ping || exit 1
+      test: curl --fail http://0.0.0.0:1238/ping || exit 1
       interval: 60s
       retries: 5
       start_period: 10s
@@ -50,16 +38,15 @@ services:
   fetch_stats:
     image: mathwave/sprint-repo:platform
     networks:
-      - net
+      - postgres-development
+      - minio-development
     environment:
-      DB_HOST: "pg.develop.sprinthub.ru"
+      DB_HOST: "postgres"
       DB_PASSWORD: $DB_PASSWORD_DEV
-      MINIO_HOST: "minio.develop.sprinthub.ru"
+      MINIO_HOST: "minio"
       MINIO_SECRET_KEY: $MINIO_SECRET_KEY_DEV
-      REDIS_HOST: "redis.develop.sprinthub.ru"
+      REDIS_HOST: "redis.dev.chocomarsh.com"
       REDIS_PASSWORD: $REDIS_PASSWORD_DEV
-      RABBITMQ_HOST: "rabbitmq.develop.sprinthub.ru"
-      RABBITMQ_PASSWORD: $RABBITMQ_PASSWORD_DEV
       VK_SERVICE_TOKEN: $VK_SERVICE_TOKEN
       YANDEX_SERVICE_TOKEN: $YANDEX_SERVICE_TOKEN
       PLATFORM_SECURITY_TOKEN: $PLATFORM_SECURITY_TOKEN
@@ -74,11 +61,19 @@ services:
 
   migrate:
     image: mathwave/sprint-repo:platform
+    networks:
+      - postgres-development
+      - minio-development
     environment:
-      DB_HOST: "pg.develop.sprinthub.ru"
+      DB_HOST: "postgres"
       DB_PASSWORD: $DB_PASSWORD_DEV
-      MINIO_HOST: "minio.develop.sprinthub.ru"
+      MINIO_HOST: "minio"
       MINIO_SECRET_KEY: $MINIO_SECRET_KEY_DEV
+      REDIS_HOST: "redis.dev.chocomarsh.com"
+      REDIS_PASSWORD: $REDIS_PASSWORD_DEV
+      VK_SERVICE_TOKEN: $VK_SERVICE_TOKEN
+      YANDEX_SERVICE_TOKEN: $YANDEX_SERVICE_TOKEN
+      PLATFORM_SECURITY_TOKEN: $PLATFORM_SECURITY_TOKEN
     command: migrate
     deploy:
       mode: replicated
@@ -89,7 +84,11 @@ services:
         order: start-first
 
 networks:
-  net:
+  common-infra-nginx-development:
-    driver: overlay
+    external: true
-  common-infra-nginx:
+  configurator-development:
+    external: true
+  postgres-development:
+    external: true
+  minio-development:
     external: true

.deploy/deploy-prod.yaml

@@ -4,42 +4,27 @@ version: "3.4"
 services:
 
   platform-nginx:
-    image: mathwave/sprint-repo:platform-nginx
-    networks:
-      - net
-      - common-infra-nginx
-    deploy:
-      mode: replicated
-      restart_policy:
-        condition: any
-      placement:
-        constraints:
-          # - node.role == worker
-          - node.labels.zone == ru
-      update_config:
-        parallelism: 1
-        order: start-first
-
-  app:
     image: mathwave/sprint-repo:platform
     networks:
-      - net
+      - common-infra-nginx
+      - configurator
+      - postgres
+      - minio
     environment:
-      DB_HOST: "pg.sprinthub.ru"
+      DB_HOST: "postgres"
       DB_PASSWORD: $DB_PASSWORD_PROD
-      MINIO_HOST: "minio.sprinthub.ru"
+      MINIO_HOST: "minio"
       MINIO_SECRET_KEY: $MINIO_SECRET_KEY_PROD
-      REDIS_HOST: "redis.sprinthub.ru"
+      REDIS_HOST: "redis.chocomarsh.com"
       REDIS_PASSWORD: $REDIS_PASSWORD_PROD
-      RABBITMQ_HOST: "rabbitmq.sprinthub.ru"
+      RABBITMQ_HOST: "rabbitmq.chocomarsh.com"
       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:8000
+    command: runserver 0.0.0.0:1238
     healthcheck:
-      test: curl --fail http://0.0.0.0:8000/ping || exit 1
+      test: curl --fail http://0.0.0.0:1238/ping || exit 1
       interval: 60s
       retries: 5
       start_period: 10s
@@ -48,10 +33,6 @@ services:
       mode: replicated
       restart_policy:
         condition: any
-      placement:
-        constraints:
-          # - node.role == worker
-          - node.labels.zone == ru
       update_config:
         parallelism: 1
         order: start-first
@@ -59,15 +40,16 @@ services:
   fetch_stats:
     image: mathwave/sprint-repo:platform
     networks:
-      - net
+      - postgres
+      - minio
     environment:
-      DB_HOST: "pg.sprinthub.ru"
+      DB_HOST: "postgres"
       DB_PASSWORD: $DB_PASSWORD_PROD
-      MINIO_HOST: "minio.sprinthub.ru"
+      MINIO_HOST: "minio"
       MINIO_SECRET_KEY: $MINIO_SECRET_KEY_PROD
-      REDIS_HOST: "redis.sprinthub.ru"
+      REDIS_HOST: "redis.chocomarsh.com"
       REDIS_PASSWORD: $REDIS_PASSWORD_PROD
-      RABBITMQ_HOST: "rabbitmq.sprinthub.ru"
+      RABBITMQ_HOST: "rabbitmq.chocomarsh.com"
       RABBITMQ_PASSWORD: $RABBITMQ_PASSWORD_PROD
       VK_SERVICE_TOKEN: $VK_SERVICE_TOKEN
       YANDEX_SERVICE_TOKEN: $YANDEX_SERVICE_TOKEN
@@ -83,27 +65,29 @@ services:
 
   migrate:
     image: mathwave/sprint-repo:platform
+    networks:
+      - postgres
+      - minio
     environment:
-      DB_HOST: "pg.sprinthub.ru"
+      DB_HOST: "postgres"
       DB_PASSWORD: $DB_PASSWORD_PROD
-      MINIO_HOST: "minio.sprinthub.ru"
+      MINIO_HOST: "minio"
       MINIO_SECRET_KEY: $MINIO _SECRET_KEY_PROD
-      TELEGRAM_TOKEN: $TELEGRAM_TOKEN
     command: migrate
     deploy:
       mode: replicated
       restart_policy:
         condition: on-failure
-      placement:
-        constraints:
-          # - node.role == worker
-          - node.labels.zone == ru
       update_config:
         parallelism: 1
         order: start-first
 
 networks:
-  net:
-    driver: overlay
   common-infra-nginx:
     external: true
+  configurator:
+    external: true
+  postgres:
+    external: true
+  minio:
+    external: true

.gitea/workflows/deploy-dev.yaml

@@ -0,0 +1,49 @@
+name: Deploy Dev
+
+on:
+  pull_request:
+    branches:
+      - dev
+    types: [closed]
+
+jobs:
+  build:
+    name: Build
+    runs-on: [ dev ]
+    steps:
+      - name: login
+        run: docker login -u mathwave -p ${{ secrets.DOCKERHUB_PASSWORD }}
+      - name: checkout
+        uses: actions/checkout@v4
+        with:
+          ref: dev
+      - name: build
+        run: docker build -t mathwave/sprint-repo:platform .
+  push:
+    name: Push
+    runs-on: [ dev ]
+    needs: build
+    steps:
+      - name: push
+        run: docker push mathwave/sprint-repo:platform
+  deploy-dev:
+    name: Deploy dev
+    runs-on: [prod]
+    needs: push
+    steps:
+      - name: login
+        run: docker login -u mathwave -p ${{ secrets.DOCKERHUB_PASSWORD }}
+      - name: checkout
+        uses: actions/checkout@v4
+        with:
+          ref: dev
+      - name: deploy
+        env:
+          PLATFORM_SECURITY_TOKEN: ${{ secrets.PLATFORM_SECURITY_TOKEN }}
+          DB_PASSWORD_DEV: ${{ secrets.POSTGRES_PASSWORD_DEV }}
+          MINIO_SECRET_KEY: ${{ secrets.MINIO_SECRET_KEY_DEV }}
+          REDIS_PASSWORD: ${{ secrets.REDIS_PASSWORD_DEV }}
+          RABBITMQ_PASSWORD: ${{ secrets.RABBITMQ_PASSWORD_DEV }}
+          VK_SERVICE_TOKEN: ${{ secrets.VK_SERVICE_TOKEN }}
+          YANDEX_SERVICE_TOKEN: ${{ secrets.YANDEX_SERVICE_TOKEN }}
+        run: docker stack deploy --with-registry-auth -c ./.deploy/deploy-dev.yaml platform-development

.gitea/workflows/deploy-prod.yaml

@@ -0,0 +1,49 @@
+name: Deploy Prod
+
+on:
+  pull_request:
+    branches:
+      - prod
+    types: [closed]
+
+jobs:
+  build:
+    name: Build
+    runs-on: [ dev ]
+    steps:
+      - name: login
+        run: docker login -u mathwave -p ${{ secrets.DOCKERHUB_PASSWORD }}
+      - name: checkout
+        uses: actions/checkout@v4
+        with:
+          ref: prod
+      - name: build
+        run: docker build -t mathwave/sprint-repo:platform .
+  push:
+    name: Push
+    runs-on: [ dev ]
+    needs: build
+    steps:
+      - name: push
+        run: docker push mathwave/sprint-repo:platform
+  deploy-prod:
+    name: Deploy prod
+    runs-on: [prod]
+    needs: push
+    steps:
+      - name: login
+        run: docker login -u mathwave -p ${{ secrets.DOCKERHUB_PASSWORD }}
+      - name: checkout
+        uses: actions/checkout@v4
+        with:
+            ref: prod
+      - name: deploy
+        env:
+          PLATFORM_SECURITY_TOKEN: ${{ secrets.PLATFORM_SECURITY_TOKEN }}
+          DB_PASSWORD_PROD: ${{ secrets.POSTGRES_PASSWORD_PROD }}
+          MINIO_SECRET_KEY: ${{ secrets.MINIO_SECRET_KEY_PROD }}
+          REDIS_PASSWORD: ${{ secrets.REDIS_PASSWORD_PROD }}
+          RABBITMQ_PASSWORD: ${{ secrets.RABBITMQ_PASSWORD_PROD }}
+          VK_SERVICE_TOKEN: ${{ secrets.VK_SERVICE_TOKEN }}
+          YANDEX_SERVICE_TOKEN: ${{ secrets.YANDEX_SERVICE_TOKEN }}
+        run: docker stack deploy --with-registry-auth -c ./.deploy/deploy-prod.yaml platform

.gitlab-ci.yml

@@ -15,9 +15,7 @@ build:
     - .deploy
   script:
     - docker build -t mathwave/sprint-repo:platform .
-    - docker build -t mathwave/sprint-repo:platform-nginx nginx
     - docker push mathwave/sprint-repo:platform
-    - docker push mathwave/sprint-repo:platform-nginx
 
 deploy-dev:
   extends:

BaseLib/configurator.py

@@ -0,0 +1,58 @@
+from requests import get, put, post, delete
+from json import dumps
+
+
+URL_CONFIGS = 'http://configurator/api/v1/configs'
+URL_EXPERIMENTS = 'http://configurator/api/v1/experiments'
+
+
+def get_configs(project, stage):
+    response = get(URL_CONFIGS, params={'project': project, 'stage': stage})
+    if response.status_code != 200:
+        return []
+    data = response.json()
+    for config in data:
+        config['value_pretty'] = dumps(config['value'], indent=4, ensure_ascii=False)
+    return data
+
+
+def create_config(project, stage, name):
+    post(URL_CONFIGS, json={'project': project, 'stage': stage, 'name': name})
+
+
+def update_config(id, value):
+    put(URL_CONFIGS, json={'id': id, 'value': value})
+
+
+def delete_config(id):
+    delete(URL_CONFIGS, json={'id': id})
+
+
+def get_experiments(project, stage):
+    response = get(URL_EXPERIMENTS, params={'project': project, 'stage': stage})
+    if response.status_code != 200:
+        return []
+    data = response.json()
+    for exp in data:
+        if exp['condition'] == 'False':
+            exp['exp_type'] = 0
+        elif exp['condition'] == 'user.is_superuser':
+            exp['exp_type'] = 1
+        elif exp['condition'] == 'user.platform_staff':
+            exp['exp_type'] = 2
+        elif exp['condition'] == 'True':
+            exp['exp_type'] = 3
+        else:
+            exp['exp_type'] = 4
+    return data
+
+def create_experiment(project, stage, name):
+    post(URL_EXPERIMENTS, json={'project': project, 'stage': stage, 'name': name})
+
+
+def update_experiment(id, enabled, condition):
+    put(URL_EXPERIMENTS, json={'id': id, 'enabled': enabled, 'condition': condition})
+
+
+def delete_experiment(id):
+    delete(URL_CONFIGS, json={'id': id})

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'))
 ]

configs/views.py

@@ -3,6 +3,7 @@ from json import loads
 from django.http import HttpResponse, JsonResponse
 
 from BaseLib.BaseView import BaseView
+from BaseLib.configurator import *
 from Platform import settings
 from configs.models import Config
 
@@ -20,30 +21,35 @@ class ConfigsView(BaseView):
             return '/configs/?stage=production'
         self.stage = self.request.GET['stage']
         self.context['stage'] = self.stage
-
+        # self.context['configs'] = Config.objects.filter(project=self.request.user.selected_project,
-    def get(self):
+        #                                                 stage=self.stage).order_by('name')
-        self.context['configs'] = Config.objects.filter(project=self.request.user.selected_project, stage=self.stage).order_by('name')
+        self.context['configs'] = get_configs(self.request.user.selected_project.name, self.stage)
-        self.context['error'] = 'error' in self.request.GET
 
     def post_create_config(self):
-        Config.objects.create(name=self.request.POST['name'], project=self.request.user.selected_project, stage=self.stage)
+        create_config(self.request.user.selected_project.name, self.stage, self.request.POST['name'])
+        # Config.objects.create(name=self.request.POST['name'], project=self.request.user.selected_project, stage=self.stage)
         return '/configs/?stage=' + self.stage
 
     def post_delete(self):
-        config = Config.objects.get(id=self.request.POST['config'])
+        # config = Config.objects.get(id=self.request.POST['config'])
-        config.delete()
+        # config.delete()
-        return '/configs/?stage=' + config.stage
+        delete_config(self.request.POST['config'])
+        return '/configs/?stage=' + self.stage
 
     def post_save(self):
         data = self.request.POST['data']
+        # config = Config.objects.get(id=self.request.POST['config'])
         try:
             data = loads(data)
         except:
-            return '/configs?error=config_is_not_json'
+            self.context['incorrect_config'] = self.request.POST['config']
-        config = Config.objects.get(id=self.request.POST['config'])
+            self.context['incorrect_data'] = data
-        config.data = data
+            self.context['error'] = True
-        config.save()
+            return
-        return '/configs/?stage=' + config.stage
+        update_config(self.request.POST['config'], data)
+        # config.data = data
+        # config.save()
+        return '/configs/?stage=' + self.stage
 
 
 def get_config(request):

experiments/views.py

@@ -1,6 +1,7 @@
 from django.http import HttpResponse, JsonResponse
 
 from BaseLib.BaseView import BaseView
+from BaseLib.configurator import *
 from Platform import settings
 from experiments.models import Experiment
 
@@ -17,31 +18,48 @@ class ExperimentsView(BaseView):
         self.context['stage'] = self.stage
 
     def get(self):
-        self.context['experiments'] = Experiment.objects.filter(project=self.request.user.selected_project,
+        # self.context['experiments'] = Experiment.objects.filter(project=self.request.user.selected_project,
-                                                        stage=self.stage).order_by('name')
+        #                                                 stage=self.stage).order_by('name')
+        self.context['experiments'] = get_experiments(self.request.user.selected_project.name, self.stage)
 
     def post_create(self):
-        Experiment.objects.create(project=self.request.user.selected_project, stage=self.stage, name=self.request.POST['name'])
+        # Experiment.objects.create(project=self.request.user.selected_project, stage=self.stage, name=self.request.POST['name'])
+        create_experiment(self.request.user.selected_project.name, self.stage, self.request.POST['name'])
         return '/experiments/?stage=' + self.stage
 
     def post_delete(self):
-        Experiment.objects.get(id=self.request.POST['experiment_id']).delete()
+        # Experiment.objects.get(id=self.request.POST['experiment_id']).delete()
+        delete_experiment(self.request.POST['experiment_id'])
         return '/experiments/?stage=' + self.stage
+    
     def post_change(self):
-        exp = Experiment.objects.get(id=self.request.POST['experiment_id'])
+        # exp = Experiment.objects.get(id=self.request.POST['experiment_id'])
-        exp.enabled = 'enabled' in self.request.POST
+        # exp.enabled = 'enabled' in self.request.POST
+        # condition = self.request.POST['condition_select']
+        # if condition == 'Другое (только для техлидов)':
+        #     exp.condition = self.request.POST['condition']
+        # elif condition == 'Никому':
+        #     exp.condition = 'False'
+        # elif condition == 'Только админам':
+        #     exp.condition = 'user.is_superuser'
+        # elif condition == 'Только сотрудникам':
+        #     exp.condition = 'user.platform_staff'
+        # else:
+        #     exp.condition = 'True'
+        # exp.save()
+        enabled = 'enabled' in self.request.POST
         condition = self.request.POST['condition_select']
         if condition == 'Другое (только для техлидов)':
-            exp.condition = self.request.POST['condition']
+            condition = self.request.POST['condition']
         elif condition == 'Никому':
-            exp.condition = 'False'
+            condition = 'False'
         elif condition == 'Только админам':
-            exp.condition = 'user.is_superuser'
+            condition = 'user.is_superuser'
         elif condition == 'Только сотрудникам':
-            exp.condition = 'user.platform_staff'
+            condition = 'user.platform_staff'
         else:
-            exp.condition = 'True'
+            condition = 'True'
-        exp.save()
+        update_experiment(self.request.POST['experiment_id'], enabled, condition)
         return '/experiments/?stage=' + self.stage
 
 

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

nginx/Dockerfile

@@ -1,2 +0,0 @@
-FROM nginx
-COPY nginx.conf /etc/nginx/nginx.conf

nginx/nginx.conf

@@ -1,11 +0,0 @@
-events {}
-
-http {
-    client_max_body_size 150m;
-    server {
-        listen      1238;
-        location / {
-            proxy_pass http://app:8000/;
-        }
-    }
-}

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/configs.html

@@ -52,11 +52,11 @@
                                         <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">{{ config.data_pretty }}</textarea>
+                                        <textarea style="width: 100%; height: 800px;{% if config.id == incorrect_config %}border: 1px solid #f00;{% endif %}" name="data">{% if config.id == incorrect_config %}{{ incorrect_data }}{% else %}{{ config.value_pretty }}{% endif %}</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">Удалить</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>

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_link = models.TextField(null=True, blank=True)
-    stats_cron = models.TextField(null=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/fetch.py

@@ -3,6 +3,7 @@ from django.http import HttpResponse, JsonResponse
 from Platform import settings
 from configs.models import Config
 from experiments.models import Experiment
+from web.models import CustomUser
 
 
 def fetch(request):
@@ -14,10 +15,26 @@ def fetch(request):
         return HttpResponse('', status=400)
     configs = Config.objects.filter(stage=stage, project__name=project)
     experiments = Experiment.objects.filter(stage=stage, project__name=project)
+    platform_staff = {
+        'vk_id': [],
+        'yandex_id': [],
+        'telegram_id': [],
+        'email': [],
+    }
+    for user in CustomUser.objects.filter(is_active=True):
+        if user.vk_id:
+            platform_staff['vk_id'].append(user.vk_id)
+        if user.yandex_id:
+            platform_staff['yandex_id'].append(user.yandex_id)
+        if user.telegram_id:
+            platform_staff['telegram_id'].append(user.telegram_id)
+        if user.email:
+            platform_staff['email'].append(user.email)
     return JsonResponse(
         data={
             'configs': {config.name: config.data for config in configs},
-            'experiments': {experiment.name: {'enabled': experiment.enabled, 'condition': experiment.condition} for experiment in experiments}
+            'experiments': {experiment.name: {'enabled': experiment.enabled, 'condition': experiment.condition} for experiment in experiments},
+            'platform_staff': platform_staff,
         },
         safe=False,
     )

web/views/generator.py

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