diff --git a/server/benchmark/migrations/0001_initial.py b/server/benchmark/migrations/0001_initial.py index 9f864fa1b..d8c447f37 100644 --- a/server/benchmark/migrations/0001_initial.py +++ b/server/benchmark/migrations/0001_initial.py @@ -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 @@ -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'], + }, ), ] diff --git a/server/benchmark/migrations/0002_alter_benchmark_demo_dataset_tarball_url.py b/server/benchmark/migrations/0002_alter_benchmark_demo_dataset_tarball_url.py deleted file mode 100644 index 404985e7b..000000000 --- a/server/benchmark/migrations/0002_alter_benchmark_demo_dataset_tarball_url.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.2.10 on 2022-03-19 07:58 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ("benchmark", "0001_initial"), - ] - - operations = [ - migrations.AlterField( - model_name="benchmark", - name="demo_dataset_tarball_url", - field=models.CharField(blank=True, max_length=256), - ), - ] diff --git a/server/benchmarkdataset/migrations/0001_initial.py b/server/benchmarkdataset/migrations/0001_initial.py index ba02bd616..2a96c1504 100644 --- a/server/benchmarkdataset/migrations/0001_initial.py +++ b/server/benchmarkdataset/migrations/0001_initial.py @@ -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 @@ -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'], + }, ), ] diff --git a/server/benchmarkdataset/migrations/0002_benchmarkdataset_metadata.py b/server/benchmarkdataset/migrations/0002_benchmarkdataset_metadata.py deleted file mode 100644 index 732886ccc..000000000 --- a/server/benchmarkdataset/migrations/0002_benchmarkdataset_metadata.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 3.2.16 on 2022-11-03 03:02 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('benchmarkdataset', '0001_initial'), - ] - - operations = [ - migrations.AddField( - model_name='benchmarkdataset', - name='metadata', - field=models.JSONField(default={}), - preserve_default=False, - ), - ] diff --git a/server/benchmarkmodel/migrations/0001_initial.py b/server/benchmarkmodel/migrations/0001_initial.py index 9870f484f..831082b22 100644 --- a/server/benchmarkmodel/migrations/0001_initial.py +++ b/server/benchmarkmodel/migrations/0001_initial.py @@ -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 @@ -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'], + }, ), ] diff --git a/server/benchmarkmodel/migrations/0002_rename_results_benchmarkmodel_metadata.py b/server/benchmarkmodel/migrations/0002_rename_results_benchmarkmodel_metadata.py deleted file mode 100644 index e72c36a91..000000000 --- a/server/benchmarkmodel/migrations/0002_rename_results_benchmarkmodel_metadata.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.2.16 on 2022-11-03 03:02 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('benchmarkmodel', '0001_initial'), - ] - - operations = [ - migrations.RenameField( - model_name='benchmarkmodel', - old_name='results', - new_name='metadata', - ), - ] diff --git a/server/benchmarkmodel/migrations/0003_auto_20230120_2341.py b/server/benchmarkmodel/migrations/0003_auto_20230120_2341.py deleted file mode 100644 index 989d85ad2..000000000 --- a/server/benchmarkmodel/migrations/0003_auto_20230120_2341.py +++ /dev/null @@ -1,22 +0,0 @@ -# Generated by Django 3.2.16 on 2023-01-20 23:41 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('benchmarkmodel', '0002_rename_results_benchmarkmodel_metadata'), - ] - - operations = [ - migrations.AlterModelOptions( - name='benchmarkmodel', - options={'ordering': ['-priority']}, - ), - migrations.AddField( - model_name='benchmarkmodel', - name='priority', - field=models.IntegerField(default=0), - ), - ] diff --git a/server/dataset/migrations/0001_initial.py b/server/dataset/migrations/0001_initial.py index 30a80a03b..a624b26a8 100644 --- a/server/dataset/migrations/0001_initial.py +++ b/server/dataset/migrations/0001_initial.py @@ -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 @@ -10,67 +10,32 @@ class Migration(migrations.Migration): initial = True dependencies = [ - ("mlcube", "0001_initial"), + ('mlcube', '0001_initial'), migrations.swappable_dependency(settings.AUTH_USER_MODEL), ] operations = [ migrations.CreateModel( - name="Dataset", + name='Dataset', fields=[ - ( - "id", - models.BigAutoField( - auto_created=True, - primary_key=True, - serialize=False, - verbose_name="ID", - ), - ), - ("name", models.CharField(max_length=20)), - ("description", models.CharField(blank=True, max_length=20)), - ("location", models.CharField(blank=True, max_length=100)), - ("input_data_hash", models.CharField(max_length=128)), - ("generated_uid", models.CharField(max_length=128, unique=True)), - ("split_seed", models.IntegerField()), - ("is_valid", models.BooleanField(default=True)), - ( - "state", - models.CharField( - choices=[ - ("DEVELOPMENT", "DEVELOPMENT"), - ("OPERATION", "OPERATION"), - ], - default="DEVELOPMENT", - max_length=100, - ), - ), - ( - "generated_metadata", - models.JSONField(blank=True, default=dict, null=True), - ), - ( - "user_metadata", - models.JSONField(blank=True, default=dict, null=True), - ), - ("created_at", models.DateTimeField(auto_now_add=True)), - ("modified_at", models.DateTimeField(auto_now=True)), - ( - "data_preparation_mlcube", - models.ForeignKey( - on_delete=django.db.models.deletion.PROTECT, - related_name="benchmark_preprocessor_mlcube", - to="mlcube.mlcube", - ), - ), - ( - "owner", - 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')), + ('name', models.CharField(max_length=20)), + ('description', models.CharField(blank=True, max_length=20)), + ('location', models.CharField(blank=True, max_length=100)), + ('input_data_hash', models.CharField(max_length=128)), + ('generated_uid', models.CharField(max_length=128, unique=True)), + ('split_seed', models.IntegerField()), + ('is_valid', models.BooleanField(default=True)), + ('state', models.CharField(choices=[('DEVELOPMENT', 'DEVELOPMENT'), ('OPERATION', 'OPERATION')], default='DEVELOPMENT', max_length=100)), + ('generated_metadata', models.JSONField(blank=True, default=dict, null=True)), + ('user_metadata', models.JSONField(blank=True, default=dict, null=True)), + ('created_at', models.DateTimeField(auto_now_add=True)), + ('modified_at', models.DateTimeField(auto_now=True)), + ('data_preparation_mlcube', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='benchmark_preprocessor_mlcube', to='mlcube.mlcube')), + ('owner', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL)), ], - options={"ordering": ["modified_at"],}, + options={ + 'ordering': ['modified_at'], + }, ), ] diff --git a/server/mlcube/migrations/0001_initial.py b/server/mlcube/migrations/0001_initial.py index aefd6d6b7..9a65ced9a 100644 --- a/server/mlcube/migrations/0001_initial.py +++ b/server/mlcube/migrations/0001_initial.py @@ -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 @@ -15,49 +15,31 @@ class Migration(migrations.Migration): operations = [ migrations.CreateModel( - name="MlCube", + name='MlCube', fields=[ - ( - "id", - models.BigAutoField( - auto_created=True, - primary_key=True, - serialize=False, - verbose_name="ID", - ), - ), - ("name", models.CharField(max_length=20, unique=True)), - ("git_mlcube_url", models.CharField(max_length=256)), - ("git_parameters_url", models.CharField(max_length=256)), - ("tarball_url", models.CharField(blank=True, max_length=256)), - ("tarball_hash", models.CharField(blank=True, max_length=100)), - ( - "state", - models.CharField( - choices=[ - ("DEVELOPMENT", "DEVELOPMENT"), - ("OPERATION", "OPERATION"), - ], - default="DEVELOPMENT", - max_length=100, - ), - ), - ("is_valid", models.BooleanField(default=True)), - ("metadata", models.JSONField(blank=True, default=dict, null=True)), - ( - "user_metadata", - models.JSONField(blank=True, default=dict, null=True), - ), - ("created_at", models.DateTimeField(auto_now_add=True)), - ("modified_at", models.DateTimeField(auto_now=True)), - ( - "owner", - 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')), + ('name', models.CharField(max_length=20, unique=True)), + ('git_mlcube_url', models.CharField(max_length=256)), + ('mlcube_hash', models.CharField(max_length=100)), + ('git_parameters_url', models.CharField(blank=True, max_length=256)), + ('parameters_hash', models.CharField(blank=True, max_length=100)), + ('image_tarball_url', models.CharField(blank=True, max_length=256)), + ('image_tarball_hash', models.CharField(blank=True, max_length=100)), + ('image_hash', models.CharField(blank=True, max_length=100)), + ('additional_files_tarball_url', models.CharField(blank=True, max_length=256)), + ('additional_files_tarball_hash', models.CharField(blank=True, max_length=100)), + ('state', models.CharField(choices=[('DEVELOPMENT', 'DEVELOPMENT'), ('OPERATION', 'OPERATION')], default='DEVELOPMENT', max_length=100)), + ('is_valid', models.BooleanField(default=True)), + ('metadata', models.JSONField(blank=True, default=dict, null=True)), + ('user_metadata', models.JSONField(blank=True, default=dict, null=True)), + ('created_at', models.DateTimeField(auto_now_add=True)), + ('modified_at', models.DateTimeField(auto_now=True)), + ('owner', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL)), ], - options={"verbose_name_plural": "MlCubes", "ordering": ["modified_at"],}, + options={ + 'verbose_name_plural': 'MlCubes', + 'ordering': ['modified_at'], + 'unique_together': {('image_tarball_url', 'image_tarball_hash', 'image_hash', 'additional_files_tarball_url', 'additional_files_tarball_hash', 'git_mlcube_url', 'mlcube_hash', 'git_parameters_url', 'parameters_hash')}, + }, ), ] diff --git a/server/mlcube/migrations/0002_auto_20220624_0853.py b/server/mlcube/migrations/0002_auto_20220624_0853.py deleted file mode 100644 index a8bade893..000000000 --- a/server/mlcube/migrations/0002_auto_20220624_0853.py +++ /dev/null @@ -1,46 +0,0 @@ -# Generated by Django 3.2.10 on 2022-06-24 08:53 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ("mlcube", "0001_initial"), - ] - - operations = [ - migrations.RenameField( - model_name="mlcube", - old_name="tarball_hash", - new_name="additional_files_tarball_hash", - ), - migrations.RenameField( - model_name="mlcube", - old_name="tarball_url", - new_name="additional_files_tarball_url", - ), - migrations.AddField( - model_name="mlcube", - name="image_tarball_hash", - field=models.CharField(blank=True, max_length=100), - ), - migrations.AddField( - model_name="mlcube", - name="image_tarball_url", - field=models.CharField(blank=True, max_length=256), - ), - migrations.AlterUniqueTogether( - name="mlcube", - unique_together={ - ( - "image_tarball_url", - "image_tarball_hash", - "additional_files_tarball_url", - "additional_files_tarball_hash", - "git_mlcube_url", - "git_parameters_url", - ) - }, - ), - ] diff --git a/server/mlcube/migrations/0003_auto_20221109_1340.py b/server/mlcube/migrations/0003_auto_20221109_1340.py deleted file mode 100644 index ae816a7f2..000000000 --- a/server/mlcube/migrations/0003_auto_20221109_1340.py +++ /dev/null @@ -1,33 +0,0 @@ -# Generated by Django 3.2.16 on 2022-11-09 13:40 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('mlcube', '0002_auto_20220624_0853'), - ] - - operations = [ - migrations.AddField( - model_name='mlcube', - name='mlcube_hash', - field=models.CharField(default='', max_length=100), - preserve_default=False, - ), - migrations.AddField( - model_name='mlcube', - name='parameters_hash', - field=models.CharField(blank=True, max_length=100), - ), - migrations.AlterField( - model_name='mlcube', - name='git_parameters_url', - field=models.CharField(blank=True, max_length=256), - ), - migrations.AlterUniqueTogether( - name='mlcube', - unique_together={('image_tarball_url', 'image_tarball_hash', 'additional_files_tarball_url', 'additional_files_tarball_hash', 'git_mlcube_url', 'mlcube_hash', 'git_parameters_url', 'parameters_hash')}, - ), - ] diff --git a/server/mlcube/migrations/0004_auto_20230727_1954.py b/server/mlcube/migrations/0004_auto_20230727_1954.py deleted file mode 100644 index ebb98264f..000000000 --- a/server/mlcube/migrations/0004_auto_20230727_1954.py +++ /dev/null @@ -1,22 +0,0 @@ -# Generated by Django 3.2.16 on 2023-07-27 19:54 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('mlcube', '0003_auto_20221109_1340'), - ] - - operations = [ - migrations.AddField( - model_name='mlcube', - name='image_hash', - field=models.CharField(blank=True, max_length=100), - ), - migrations.AlterUniqueTogether( - name='mlcube', - unique_together={('image_tarball_url', 'image_tarball_hash', 'image_hash', 'additional_files_tarball_url', 'additional_files_tarball_hash', 'git_mlcube_url', 'mlcube_hash', 'git_parameters_url', 'parameters_hash')}, - ), - ] diff --git a/server/requirements.txt b/server/requirements.txt index f1533bcd9..2c49bfc06 100644 --- a/server/requirements.txt +++ b/server/requirements.txt @@ -1,4 +1,4 @@ -Django==3.2.16 +Django==3.2.20 djangorestframework==3.14.0 drf-spectacular==0.25.1 drf-spectacular-sidecar==2022.12.1 @@ -9,9 +9,7 @@ psycopg2-binary==2.9.2 gunicorn==20.1.0 google-cloud-secret-manager==2.8.0 whitenoise==6.2.0 -pyOpenSSL==22.0.0 -#Temporary fix for pyOpenSSL. https://github.com/aws/aws-sam-cli/issues/4527#issuecomment-1369776818 -cryptography==38.0.4 +pyOpenSSL==23.2.0 Werkzeug==2.2.3 django-extensions==3.2.1 djangorestframework-simplejwt==5.2.2 diff --git a/server/result/migrations/0001_initial.py b/server/result/migrations/0001_initial.py index fb37934e4..ad12384d8 100644 --- a/server/result/migrations/0001_initial.py +++ b/server/result/migrations/0001_initial.py @@ -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 @@ -10,74 +10,31 @@ class Migration(migrations.Migration): initial = True dependencies = [ - ("dataset", "0001_initial"), + ('dataset', '0001_initial'), + ('mlcube', '0001_initial'), + ('benchmark', '0001_initial'), migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ("benchmark", "__first__"), - ("mlcube", "0001_initial"), ] operations = [ migrations.CreateModel( - name="ModelResult", + name='ModelResult', fields=[ - ( - "id", - models.BigAutoField( - auto_created=True, - primary_key=True, - serialize=False, - verbose_name="ID", - ), - ), - ("name", models.CharField(blank=True, max_length=20)), - ("results", models.JSONField()), - ("metadata", models.JSONField(default=dict)), - ( - "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", - ), - ), - ( - "model", - models.ForeignKey( - on_delete=django.db.models.deletion.PROTECT, to="mlcube.mlcube" - ), - ), - ( - "owner", - 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')), + ('name', models.CharField(blank=True, max_length=20)), + ('results', models.JSONField()), + ('metadata', models.JSONField(default=dict)), + ('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')), + ('model', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='mlcube.mlcube')), + ('owner', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL)), ], options={ - "ordering": ["modified_at"], - "unique_together": {("benchmark", "model", "dataset")}, + 'ordering': ['modified_at'], }, ), ] diff --git a/server/result/migrations/0002_alter_modelresult_unique_together.py b/server/result/migrations/0002_alter_modelresult_unique_together.py deleted file mode 100644 index e1ce6bb6f..000000000 --- a/server/result/migrations/0002_alter_modelresult_unique_together.py +++ /dev/null @@ -1,14 +0,0 @@ -# Generated by Django 3.2.10 on 2022-06-24 05:54 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ("result", "0001_initial"), - ] - - operations = [ - migrations.AlterUniqueTogether(name="modelresult", unique_together=set(),), - ]