Skip to content

Commit

Permalink
Prepare server deploy (#476)
Browse files Browse the repository at this point in the history 
* update dependencies according to dependabot alerts

* reset database migrations
  • Loading branch information
@hasan7n
hasan7n authored Aug 4, 2023
1 parent 79650db commit 1a5aebf
Show file tree
Hide file tree
Showing 15 changed files with 125 additions and 539 deletions.
109 changes: 26 additions & 83 deletions server/benchmark/migrations/0001_initial.py
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Generated by Django 3.2.10 on 2022-03-07 09:34
# Generated by Django 3.2.20 on 2023-08-03 19:03

from django.conf import settings
from django.db import migrations, models
Expand All @@ -10,94 +10,37 @@ class Migration(migrations.Migration):
initial = True

dependencies = [
('mlcube', '0001_initial'),
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
("mlcube", "0001_initial"),
]

operations = [
migrations.CreateModel(
name="Benchmark",
name='Benchmark',
fields=[
(
"id",
models.BigAutoField(
auto_created=True,
primary_key=True,
serialize=False,
verbose_name="ID",
),
),
("name", models.CharField(max_length=20, unique=True)),
("description", models.CharField(blank=True, max_length=100)),
("docs_url", models.CharField(blank=True, max_length=100)),
("demo_dataset_tarball_url", models.CharField(max_length=256)),
("demo_dataset_tarball_hash", models.CharField(max_length=100)),
("demo_dataset_generated_uid", models.CharField(max_length=128)),
("metadata", models.JSONField(blank=True, default=dict, null=True)),
(
"state",
models.CharField(
choices=[
("DEVELOPMENT", "DEVELOPMENT"),
("OPERATION", "OPERATION"),
],
default="DEVELOPMENT",
max_length=100,
),
),
("is_valid", models.BooleanField(default=True)),
("is_active", models.BooleanField(default=True)),
(
"approval_status",
models.CharField(
choices=[
("PENDING", "PENDING"),
("APPROVED", "APPROVED"),
("REJECTED", "REJECTED"),
],
default="PENDING",
max_length=100,
),
),
(
"user_metadata",
models.JSONField(blank=True, default=dict, null=True),
),
("approved_at", models.DateTimeField(blank=True, null=True)),
("created_at", models.DateTimeField(auto_now_add=True)),
("modified_at", models.DateTimeField(auto_now=True)),
(
"data_evaluator_mlcube",
models.ForeignKey(
on_delete=django.db.models.deletion.PROTECT,
related_name="data_evaluator_mlcube",
to="mlcube.mlcube",
),
),
(
"data_preparation_mlcube",
models.ForeignKey(
on_delete=django.db.models.deletion.PROTECT,
related_name="data_preprocessor_mlcube",
to="mlcube.mlcube",
),
),
(
"owner",
models.ForeignKey(
on_delete=django.db.models.deletion.PROTECT,
to=settings.AUTH_USER_MODEL,
),
),
(
"reference_model_mlcube",
models.ForeignKey(
on_delete=django.db.models.deletion.PROTECT,
related_name="reference_model_mlcube",
to="mlcube.mlcube",
),
),
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.CharField(max_length=20, unique=True)),
('description', models.CharField(blank=True, max_length=100)),
('docs_url', models.CharField(blank=True, max_length=100)),
('demo_dataset_tarball_url', models.CharField(blank=True, max_length=256)),
('demo_dataset_tarball_hash', models.CharField(max_length=100)),
('demo_dataset_generated_uid', models.CharField(max_length=128)),
('metadata', models.JSONField(blank=True, default=dict, null=True)),
('state', models.CharField(choices=[('DEVELOPMENT', 'DEVELOPMENT'), ('OPERATION', 'OPERATION')], default='DEVELOPMENT', max_length=100)),
('is_valid', models.BooleanField(default=True)),
('is_active', models.BooleanField(default=True)),
('approval_status', models.CharField(choices=[('PENDING', 'PENDING'), ('APPROVED', 'APPROVED'), ('REJECTED', 'REJECTED')], default='PENDING', max_length=100)),
('user_metadata', models.JSONField(blank=True, default=dict, null=True)),
('approved_at', models.DateTimeField(blank=True, null=True)),
('created_at', models.DateTimeField(auto_now_add=True)),
('modified_at', models.DateTimeField(auto_now=True)),
('data_evaluator_mlcube', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='data_evaluator_mlcube', to='mlcube.mlcube')),
('data_preparation_mlcube', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='data_preprocessor_mlcube', to='mlcube.mlcube')),
('owner', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL)),
('reference_model_mlcube', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='reference_model_mlcube', to='mlcube.mlcube')),
],
options={"ordering": ["modified_at"],},
options={
'ordering': ['modified_at'],
},
),
]
18 changes: 0 additions & 18 deletions server/benchmark/migrations/0002_alter_benchmark_demo_dataset_tarball_url.py
View file

This file was deleted.

66 changes: 16 additions & 50 deletions server/benchmarkdataset/migrations/0001_initial.py
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Generated by Django 3.2.10 on 2022-03-07 09:33
# Generated by Django 3.2.20 on 2023-08-03 19:03

from django.conf import settings
from django.db import migrations, models
Expand All @@ -10,61 +10,27 @@ class Migration(migrations.Migration):
initial = True

dependencies = [
("benchmark", "__first__"),
('dataset', '0001_initial'),
('benchmark', '0001_initial'),
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
("dataset", "__first__"),
]

operations = [
migrations.CreateModel(
name="BenchmarkDataset",
name='BenchmarkDataset',
fields=[
(
"id",
models.BigAutoField(
auto_created=True,
primary_key=True,
serialize=False,
verbose_name="ID",
),
),
(
"approval_status",
models.CharField(
choices=[
("PENDING", "PENDING"),
("APPROVED", "APPROVED"),
("REJECTED", "REJECTED"),
],
default="PENDING",
max_length=100,
),
),
("approved_at", models.DateTimeField(blank=True, null=True)),
("created_at", models.DateTimeField(auto_now_add=True)),
("modified_at", models.DateTimeField(auto_now=True)),
(
"benchmark",
models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE,
to="benchmark.benchmark",
),
),
(
"dataset",
models.ForeignKey(
on_delete=django.db.models.deletion.PROTECT,
to="dataset.dataset",
),
),
(
"initiated_by",
models.ForeignKey(
on_delete=django.db.models.deletion.PROTECT,
to=settings.AUTH_USER_MODEL,
),
),
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('metadata', models.JSONField()),
('approval_status', models.CharField(choices=[('PENDING', 'PENDING'), ('APPROVED', 'APPROVED'), ('REJECTED', 'REJECTED')], default='PENDING', max_length=100)),
('approved_at', models.DateTimeField(blank=True, null=True)),
('created_at', models.DateTimeField(auto_now_add=True)),
('modified_at', models.DateTimeField(auto_now=True)),
('benchmark', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='benchmark.benchmark')),
('dataset', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='dataset.dataset')),
('initiated_by', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL)),
],
options={"ordering": ["modified_at"],},
options={
'ordering': ['modified_at'],
},
),
]
19 changes: 0 additions & 19 deletions server/benchmarkdataset/migrations/0002_benchmarkdataset_metadata.py
View file

This file was deleted.

67 changes: 17 additions & 50 deletions server/benchmarkmodel/migrations/0001_initial.py
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Generated by Django 3.2.10 on 2022-03-07 09:34
# Generated by Django 3.2.20 on 2023-08-03 19:03

from django.conf import settings
from django.db import migrations, models
Expand All @@ -10,61 +10,28 @@ class Migration(migrations.Migration):
initial = True

dependencies = [
('benchmark', '0001_initial'),
('mlcube', '0001_initial'),
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
("mlcube", "0001_initial"),
("benchmark", "__first__"),
]

operations = [
migrations.CreateModel(
name="BenchmarkModel",
name='BenchmarkModel',
fields=[
(
"id",
models.BigAutoField(
auto_created=True,
primary_key=True,
serialize=False,
verbose_name="ID",
),
),
("results", models.JSONField()),
(
"approval_status",
models.CharField(
choices=[
("PENDING", "PENDING"),
("APPROVED", "APPROVED"),
("REJECTED", "REJECTED"),
],
default="PENDING",
max_length=100,
),
),
("approved_at", models.DateTimeField(blank=True, null=True)),
("created_at", models.DateTimeField(auto_now_add=True)),
("modified_at", models.DateTimeField(auto_now=True)),
(
"benchmark",
models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE,
to="benchmark.benchmark",
),
),
(
"initiated_by",
models.ForeignKey(
on_delete=django.db.models.deletion.PROTECT,
to=settings.AUTH_USER_MODEL,
),
),
(
"model_mlcube",
models.ForeignKey(
on_delete=django.db.models.deletion.PROTECT, to="mlcube.mlcube"
),
),
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('metadata', models.JSONField()),
('approval_status', models.CharField(choices=[('PENDING', 'PENDING'), ('APPROVED', 'APPROVED'), ('REJECTED', 'REJECTED')], default='PENDING', max_length=100)),
('approved_at', models.DateTimeField(blank=True, null=True)),
('created_at', models.DateTimeField(auto_now_add=True)),
('modified_at', models.DateTimeField(auto_now=True)),
('priority', models.IntegerField(default=0)),
('benchmark', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='benchmark.benchmark')),
('initiated_by', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL)),
('model_mlcube', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='mlcube.mlcube')),
],
options={"ordering": ["modified_at"],},
options={
'ordering': ['-priority'],
},
),
]
18 changes: 0 additions & 18 deletions server/benchmarkmodel/migrations/0002_rename_results_benchmarkmodel_metadata.py
View file

This file was deleted.

22 changes: 0 additions & 22 deletions server/benchmarkmodel/migrations/0003_auto_20230120_2341.py
View file

This file was deleted.

Loading

0 comments on commit 1a5aebf

Please sign in to comment.