Merge pull request #1 from GNS-Science/feature/hazard_solutions

Feature/hazard solutions

Author: chrisbc

README.md

@@ -1 +1,27 @@
 ref: https://docs.graphene-python.org/projects/django/en/latest/tutorial-relay/
+
+
+## Some Useful commands
+
+### build an ERM model
+requires graphviz libraries installed `sudo apt install graphviz`
+
+```
+poetry run python manage.py graph_models -o nshm_model.png nshm pipeline
+```
+
+### Load data using djanog-extension helpers
+
+```
+# build the script
+ poetry run python manage.py dumpscript nshm.OpenquakeHazardTask >scripts/nshm_openquake_hazard_task.py
+# edit then run script ...
+ poetry run python manage.py runscript scripts.nshm_openquake_hazard_task
+```
+
+### Dump/Load data to json
+
+```
+poetry run python manage.py dumpdata nshm.OpenquakeHazardTask -o pipeline/fixtures/oht.json --indent=2
+poetry run python manage.py loaddata pipeline/fixtures/oht.json
+```

nshm/admin.py

@@ -5,11 +5,14 @@
     SourceLogicTree, 
     SourceLogicTreeComponent,
     SourceLogicTreeWeightedComponent,
-    GMCMLogicTree
+    GMCMLogicTree,
+    LocationList,
+    HazardSolution,
 )
 
 class SeismicHazardModelAdmin(admin.ModelAdmin):
-    fields = ["version", "notes", "source_logic_tree", "gmcm_logic_tree" ]
+    fields = ["version", "notes", "source_logic_tree", "gmcm_logic_tree"]
+    list_display = ["version", "notes", "source_logic_tree", "gmcm_logic_tree"]
 
 class SourceLogicTreeAdmin(admin.ModelAdmin):
     fields = ["version", "notes"]
@@ -19,12 +22,26 @@ class GMCMLogicTreeAdmin(admin.ModelAdmin):
 
 class SourceLogicTreeComponentAdmin(admin.ModelAdmin):
     fields = ["tag", "notes", "inversion_toshi_id", "background_toshi_id", "tectonic_region", "group" ]
+    list_display = ["tag", "notes", "tectonic_region", "group" ]
+    list_filter = ["tectonic_region", "group" ]
 
 class SourceLogicTreeWeightedComponentAdmin(admin.ModelAdmin):
     fields = ["weight", "source_logic_tree", "source_logic_tree_component"]
 
+class LocationListAdmin(admin.ModelAdmin):
+    fields = ["list_id", "notes", "length"]
+
+class HazardSolutionAdmin(admin.ModelAdmin):
+    fields = ["solution_id", "created", "vs30", "notes", "location_lists", "slt_components"]
+    list_display = ["solution_id", "created", "vs30", "notes"]
+    list_filter = ["vs30", "created"]
+
+
 admin.site.register(SeismicHazardModel, SeismicHazardModelAdmin)
 admin.site.register(SourceLogicTree, SourceLogicTreeAdmin)
 admin.site.register(GMCMLogicTree, GMCMLogicTreeAdmin)
 admin.site.register(SourceLogicTreeComponent, SourceLogicTreeComponentAdmin)
-admin.site.register(SourceLogicTreeWeightedComponent, SourceLogicTreeWeightedComponentAdmin)
+admin.site.register(SourceLogicTreeWeightedComponent, SourceLogicTreeWeightedComponentAdmin)
+
+admin.site.register(LocationList, LocationListAdmin)
+admin.site.register(HazardSolution, HazardSolutionAdmin)

nshm/migrations/0011_locationlist_hazardsolution.py

@@ -0,0 +1,34 @@
+# Generated by Django 4.2.4 on 2023-08-27 22:19
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('nshm', '0010_rename_gmcm_logictree_gmcmlogictree'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='LocationList',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('list_id', models.CharField(max_length=10)),
+                ('notes', models.TextField(blank=True, null=True)),
+                ('length', models.SmallIntegerField()),
+            ],
+        ),
+        migrations.CreateModel(
+            name='HazardSolution',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('solution_id', models.CharField(max_length=50)),
+                ('created', models.DateTimeField()),
+                ('vs30', models.SmallIntegerField()),
+                ('notes', models.TextField(blank=True, null=True)),
+                ('location_lists', models.ManyToManyField(related_name='hazard_solutions', to='nshm.locationlist')),
+                ('slt_components', models.ManyToManyField(related_name='hazard_solutions', to='nshm.sourcelogictreeweightedcomponent')),
+            ],
+        ),
+    ]

nshm/migrations/0012_openquakehazardtask.py

@@ -0,0 +1,25 @@
+# Generated by Django 4.2.4 on 2023-08-28 04:16
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('nshm', '0011_locationlist_hazardsolution'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='OpenquakeHazardTask',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('general_task_id', models.CharField(max_length=50)),
+                ('date', models.DateField()),
+                ('config_info', models.TextField(blank=True, null=True)),
+                ('notes', models.TextField(blank=True, null=True)),
+                ('part_of', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='hazard_tasks', to='nshm.seismichazardmodel')),
+            ],
+        ),
+    ]

nshm/migrations/0013_delete_openquakehazardtask.py

@@ -0,0 +1,16 @@
+# Generated by Django 4.2.4 on 2023-08-28 22:40
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('nshm', '0012_openquakehazardtask'),
+    ]
+
+    operations = [
+        migrations.DeleteModel(
+            name='OpenquakeHazardTask',
+        ),
+    ]

nshm/models.py

@@ -13,13 +13,12 @@ class SourceLogicTree(models.Model):
     def __str__(self):
         return self.version
 
-
 class SourceLogicTreeComponent(models.Model):
     tag = models.CharField(max_length=50)
     notes = models.TextField(null=True, blank=True)    
     inversion_toshi_id = models.CharField(max_length=50, null=False)
     background_toshi_id = models.CharField(max_length=50, null=True)
-    tectonic_region = models.CharField(choices=TECTONIC_REGIONS.choices, null=False, max_length=10)
+    tectonic_region =    models.CharField(choices=TECTONIC_REGIONS.choices, null=False, max_length=10)
     group = models.CharField(choices=SLT_GROUP.choices, null=False, max_length=10)
 
     def __str__(self):
@@ -43,6 +42,7 @@ class GMCMLogicTree(models.Model):
     def __str__(self):
         return self.version
 
+
 class SeismicHazardModel(models.Model):
     version = models.CharField(max_length=30)
     notes = models.TextField(null=True, blank=True)
@@ -55,3 +55,34 @@ class SeismicHazardModel(models.Model):
     def __str__(self):
         return self.version
 
+class LocationList(models.Model):
+    list_id = models.CharField(max_length=10)
+    notes = models.TextField(null=True, blank=True)    
+    length = models.SmallIntegerField()
+
+    def __str__(self):
+        return self.list_id
+    
+
+class HazardSolution(models.Model):
+    solution_id = models.CharField(max_length=50, null=False)
+    created = models.DateTimeField(auto_now=False, auto_now_add=False)
+    vs30 = models.SmallIntegerField()
+    notes = models.TextField(null=True, blank=True)
+    location_lists = models.ManyToManyField(
+        LocationList, related_name='hazard_solutions')
+    slt_components = models.ManyToManyField(
+        SourceLogicTreeWeightedComponent,
+        related_name='hazard_solutions')
+    
+
+# class OpenquakeHazardTask(models.Model):
+#     general_task_id = models.CharField(max_length=50, null=False)
+#     date = models.DateField(auto_now=False, auto_now_add=False)
+#     config_info = models.TextField(null=True, blank=True)
+#     notes = models.TextField(null=True, blank=True)
+#     part_of = models.ForeignKey(
+#         SeismicHazardModel, related_name='hazard_tasks',null=True, blank=True, on_delete=models.SET_NULL)    
+    
+#     def __str__(self):
+#         return self.general_task_id    

nzshm_model_graphql_api/schema.py

@@ -1,8 +1,9 @@
 import graphene
 
 import nshm.schema
+import pipeline.schema
 
-class Query(nshm.schema.Query, graphene.ObjectType):
+class Query(nshm.schema.Query, pipeline.schema.Query, graphene.ObjectType):
     # This class will inherit from multiple Queries
     # as we begin to add more apps to our project
     pass

nzshm_model_graphql_api/settings.py

@@ -38,7 +38,9 @@
     'django.contrib.messages',
     'django.contrib.staticfiles',
     'nshm',
+    'pipeline',
     'graphene_django',
+    'django_extensions',
 ]
 
 MIDDLEWARE = [
@@ -123,3 +125,9 @@
 # https://docs.djangoproject.com/en/4.2/ref/settings/#default-auto-field
 
 DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
+
+# https://django-extensions.readthedocs.io/en/latest/graph_models.html
+GRAPH_MODELS = {
+  'all_applications': False,
+  'group_models': True,
+}

pipeline/__init__.py

@@ -0,0 +1,12 @@
+from django.contrib import admin
+
+from .models import (
+    OpenquakeHazardTask
+)
+
+class OpenquakeHazardTaskAdmin(admin.ModelAdmin):
+    fields = ["general_task_id", "date", "notes", "config_info", "part_of"]
+    list_display = ("general_task_id", "date", "notes", "config_info", "part_of")
+    list_filter = ("date", "part_of")
+
+admin.site.register(OpenquakeHazardTask, OpenquakeHazardTaskAdmin)

pipeline/admin.py

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