Merge branch 'main' into 950_export_collaboration_level

.github/workflows/docker-publish.yaml

@@ -1,33 +1,26 @@
 name: Docker
 
-on:
-  pull_request:
-    branches:
-      - main
-  push:
-    branches:
-      - main
-    tags:
-      - v*
-  schedule:
-    - cron: '0 16 * * *' # Every day at 16:00 UTC (~09:00 PT)
+on: [pull_request, workflow_dispatch]
+#  schedule:
+#    - cron: '0 16 * * *' # Every day at 16:00 UTC (~09:00 PT)
 
 jobs:
   # Push container image to GitHub Packages and Docker Hub.
   # See also https://docs.docker.com/docker-hub/builds/
   deploy:
+    if: github.event.pull_request.head.repo.full_name == github.repository
     name: Docker image build
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
-        if: github.event_name == 'schedule'
-        with:
-          submodules: true
-          ref: main
+ #     - uses: actions/checkout@v2
+ #       if: github.event_name == 'schedule'
+ #       with:
+ #         submodules: true
+ #         ref: main
 
       - uses: actions/checkout@v2
-        if: github.event_name != 'schedule'
+ #       if: github.event_name != 'schedule'
         with:
           submodules: true
 
@@ -51,11 +44,11 @@ jobs:
           ./scripts/codex/buildx.sh
 
       # Log into container registries
-      - name: Login to DockerHub
-        uses: docker/login-action@v1
+      - name: Docker Login
+        uses: docker/login-action@v3.0.0
         with:
-          username: wildmeorg
-          password: ${{ secrets.WBIA_WILDMEBOT_DOCKER_HUB_TOKEN }}
+          username: ${{ secrets.DOCKER_USER_SECRET }}
+          password: ${{ secrets.DOCKER_TOKEN_SECRET }}
 
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v1
@@ -81,56 +74,20 @@ jobs:
 
       # Push bleeding-edge image (main tag) to registries
       - name: Bleeding Edge Docker Hub
-        if: github.ref == 'refs/heads/main'
         run: |
           ./scripts/utils/buildx.docker.sh -t main
 
       - name: Bleeding Edge GHCR
-        if: github.ref == 'refs/heads/main'
         run: |
           ./scripts/utils/buildx.docker.sh -t main -r ghcr.io/wildmeorg/houston
 
       # Push nightly image (nightly tag) to registries
-      - name: Nightly Docker Hub
-        if: github.event_name == 'schedule'
-        run: |
-          ./scripts/utils/buildx.docker.sh -t nightly
-
-      - name: Nightly GHCR
-        if: github.event_name == 'schedule'
-        run: |
-          ./scripts/utils/buildx.docker.sh -t nightly -r ghcr.io/wildmeorg/houston
-
-      # Notify status in Slack
-      - name: Slack Notification
-        if: ${{ failure() && github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags/v') }}
-        uses: rtCamp/action-slack-notify@master
-        env:
-          SLACK_CHANNEL: dev-houston
-          SLACK_COLOR: '#FF0000'
-          SLACK_ICON: https://avatars.slack-edge.com/2020-03-02/965719891842_db87aa21ccb61076f236_44.png
-          SLACK_MESSAGE: 'Tagged / Latest Docker build of Houston failed :sob:'
-          SLACK_USERNAME: "GitHub CI"
-          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
-
-      - name: Slack Notification
-        if: ${{ failure() && github.ref == 'refs/heads/main' }}
-        uses: rtCamp/action-slack-notify@master
-        env:
-          SLACK_CHANNEL: dev-houston
-          SLACK_COLOR: '#FF0000'
-          SLACK_ICON: https://avatars.slack-edge.com/2020-03-02/965719891842_db87aa21ccb61076f236_44.png
-          SLACK_MESSAGE: 'Bleeding Edge Docker build of Houston failed :sob:'
-          SLACK_USERNAME: "GitHub CI"
-          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
-
-      - name: Slack Notification
-        if: ${{ failure() && github.event_name == 'schedule' }}
-        uses: rtCamp/action-slack-notify@master
-        env:
-          SLACK_CHANNEL: dev-houston
-          SLACK_COLOR: '#FF0000'
-          SLACK_ICON: https://avatars.slack-edge.com/2020-03-02/965719891842_db87aa21ccb61076f236_44.png
-          SLACK_MESSAGE: 'Nightly Docker build of Houston failed :sob:'
-          SLACK_USERNAME: "GitHub CI"
-          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
+      #- name: Nightly Docker Hub
+      #  if: github.event_name == 'schedule'
+      #  run: |
+      #    ./scripts/utils/buildx.docker.sh -t nightly
+
+      #- name: Nightly GHCR
+      #  if: github.event_name == 'schedule'
+      #  run: |
+      #    ./scripts/utils/buildx.docker.sh -t nightly -r ghcr.io/wildmeorg/houston

app/modules/annotations/models.py

@@ -21,7 +21,9 @@ class AnnotationKeywords(db.Model, HoustonModel):
     annotation_guid = db.Column(
         db.GUID, db.ForeignKey('annotation.guid'), primary_key=True
     )
-    keyword_guid = db.Column(db.GUID, db.ForeignKey('keyword.guid'), primary_key=True)
+    keyword_guid = db.Column(
+        db.GUID, db.ForeignKey('keyword.guid', ondelete='CASCADE'), primary_key=True
+    )
     annotation = db.relationship('Annotation', back_populates='keyword_refs')
     keyword = db.relationship('Keyword')
 

app/modules/assets/models.py

@@ -24,7 +24,9 @@
 
 class AssetTags(db.Model, HoustonModel):
     asset_guid = db.Column(db.GUID, db.ForeignKey('asset.guid'), primary_key=True)
-    tag_guid = db.Column(db.GUID, db.ForeignKey('keyword.guid'), primary_key=True)
+    tag_guid = db.Column(
+        db.GUID, db.ForeignKey('keyword.guid', ondelete='CASCADE'), primary_key=True
+    )
     asset = db.relationship('Asset', back_populates='tag_refs')
     tag = db.relationship('Keyword')
 

app/modules/users/permissions/rules.py

@@ -180,6 +180,7 @@
             'is_admin',
         ],
         ('Keyword', AccessOperation.READ): ['is_active'],
+        ('Keyword', AccessOperation.DELETE): ['is_admin'],
         ('Sighting', AccessOperation.WRITE_INTERNAL): ['is_internal'],
         ('Sighting', AccessOperation.READ_PRIVILEGED): ['is_staff'],
         ('Sighting', AccessOperation.READ): ['is_admin'],

migrations/versions/dc91b517a7a4_.py

@@ -0,0 +1,73 @@
+# -*- coding: utf-8 -*-
+"""empty message
+
+Revision ID: dc91b517a7a4
+Revises: 53b0fec87272
+Create Date: 2024-01-22 22:51:34.690766
+
+"""
+
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = 'dc91b517a7a4'
+down_revision = '53b0fec87272'
+
+
+def upgrade():
+    """
+    Upgrade Semantic Description:
+        ENTER DESCRIPTION HERE
+    """
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('annotation_keywords', schema=None) as batch_op:
+        batch_op.drop_constraint(
+            'fk_annotation_keywords_keyword_guid_keyword', type_='foreignkey'
+        )
+        batch_op.create_foreign_key(
+            batch_op.f('fk_annotation_keywords_keyword_guid_keyword'),
+            'keyword',
+            ['keyword_guid'],
+            ['guid'],
+            ondelete='CASCADE',
+        )
+
+    with op.batch_alter_table('asset_tags', schema=None) as batch_op:
+        batch_op.drop_constraint('fk_asset_tags_tag_guid_keyword', type_='foreignkey')
+        batch_op.create_foreign_key(
+            batch_op.f('fk_asset_tags_tag_guid_keyword'),
+            'keyword',
+            ['tag_guid'],
+            ['guid'],
+            ondelete='CASCADE',
+        )
+
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    """
+    Downgrade Semantic Description:
+        ENTER DESCRIPTION HERE
+    """
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('asset_tags', schema=None) as batch_op:
+        batch_op.drop_constraint(
+            batch_op.f('fk_asset_tags_tag_guid_keyword'), type_='foreignkey'
+        )
+        batch_op.create_foreign_key(
+            'fk_asset_tags_tag_guid_keyword', 'keyword', ['tag_guid'], ['guid']
+        )
+
+    with op.batch_alter_table('annotation_keywords', schema=None) as batch_op:
+        batch_op.drop_constraint(
+            batch_op.f('fk_annotation_keywords_keyword_guid_keyword'), type_='foreignkey'
+        )
+        batch_op.create_foreign_key(
+            'fk_annotation_keywords_keyword_guid_keyword',
+            'keyword',
+            ['keyword_guid'],
+            ['guid'],
+        )
+
+    # ### end Alembic commands ###