Merge branch 'main' into optimization

Merge from main

Author: brian-kim31

.github/workflows/build-and-deploy-dev.yml

@@ -4,7 +4,7 @@
 # It builds Docker images from the current branch and deploys them to dev only.
 #
 # When to use:
-# - Testing feature branches before merging to master
+# - Testing feature branches before merging to main
 # - Manual testing of changes in a controlled environment
 # - Debugging issues that need to be tested in dev
 #

.github/workflows/build-edge.yml

@@ -1,14 +1,14 @@
 # Build and Push Edge Images
 #
-# This workflow builds Docker images from the master branch and pushes them to the registry.
+# This workflow builds Docker images from the main branch and pushes them to the registry.
 # These images are tagged as 'edge' and represent the latest production-ready code.
 #
 # When to use:
-# - Automatically triggered when code is pushed to master
+# - Automatically triggered when code is pushed to main
 # - Manually triggered to rebuild edge images
 #
 # What it does:
-# - Builds backend, frontend, and Airflow images from master branch
+# - Builds backend, frontend, and Airflow images from main branch
 # - Tags images as 'edge', commit SHA, and timestamp
 # - Pushes images to GitHub Container Registry
 # - Triggers the deploy.test.yml workflow when completed
@@ -18,7 +18,7 @@ name: Build and Push Edge Images
 on:
   push:
     branches:
-      - master
+      - main
   workflow_dispatch:
 
 env:

.github/workflows/dependency-review.yml

@@ -2,7 +2,7 @@ name: Dependency Review
 
 on:
   pull_request:
-    branches: [master]
+    branches: [main]
 
 permissions:
   contents: read

app/airflow/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "carrot-airflow"
-version = "4.2.5"
+version = "4.2.8"
 description = "Add your description here"
 readme = "README.md"
 requires-python = ">=3.11"

app/airflow/uv.lock

@@ -240,7 +240,10 @@
 
 # Auth
 
-ACCOUNT_EMAIL_REQUIRED = False
+ACCOUNT_SIGNUP_FIELDS = [
+    "username*",
+    "password1*",
+]
 ACCOUNT_EMAIL_VERIFICATION = "none"
 
 SIMPLE_JWT = {

app/api/config/settings.py

@@ -1,9 +1,8 @@
 import os
 
-from azure.storage.blob import BlobServiceClient  # type: ignore
-from azure.storage.queue import QueueServiceClient  # type: ignore
-from django.core.management.base import BaseCommand  # type: ignore
-from minio import Minio  # type: ignore
+from azure.storage.blob import BlobServiceClient
+from django.core.management.base import BaseCommand
+from minio import Minio
 
 
 class Command(BaseCommand):
@@ -29,42 +28,7 @@ class Command(BaseCommand):
 
     CONTAINERS = ["scan-reports", "data-dictionaries", "rules-exports", "airflow-logs"]
 
-    def _create_azure_queues(self, queue_service: str):
-        """
-        Creates the required Azure Queues.
-
-        Args:
-            queue_service: QueueServiceClient instance.
-
-        Returns:
-            - Creates queue if it doesn't exist
-            - If the queue exists, it will skip and
-            returns a message.
-        """
-        try:
-            for queue_name in self.QUEUES:
-                queue_client = queue_service.get_queue_client(queue_name)
-                try:
-                    # Check if the queue exists
-                    queue_client.get_queue_properties()
-                    self.stdout.write(
-                        self.style.WARNING(
-                            f"Queue '{queue_name}' already exists. Skipping creation."
-                        )
-                    )
-                # If the queue does not exist, create it
-                except Exception:
-                    queue_client.create_queue()
-                    self.stdout.write(
-                        self.style.SUCCESS(
-                            f"Queue '{queue_name}' created successfully."
-                        )
-                    )
-
-        except Exception as e:
-            raise ValueError(f"Error when creating Azure Queue: {e}")
-
-    def _create_blob_containers(self, blob_service: str):
+    def _create_blob_containers(self, blob_service: BlobServiceClient):
         """
         Creates the required Azure Blob Containers.
 
@@ -96,7 +60,7 @@ def _create_blob_containers(self, blob_service: str):
         except Exception as e:
             raise ValueError(f"Error when creating Azure Blob Container: {e}")
 
-    def _create_minio_buckets(self, minio_client: str):
+    def _create_minio_buckets(self, minio_client: Minio):
         """
         Creates the required MinIO Buckets.
 
@@ -145,15 +109,11 @@ def _create_azure_resources(self):
             return
 
         try:
-            queue_service = QueueServiceClient.from_connection_string(
-                self.AZURE_CONN_STRING
-            )
             blob_service = BlobServiceClient.from_connection_string(
                 self.AZURE_CONN_STRING
             )
 
-            # Create Queues and Blob Containers
-            self._create_azure_queues(queue_service)
+            # Create Blob Containers
             self._create_blob_containers(blob_service)
 
             self.stdout.write(self.style.SUCCESS("Azurite Storage setup complete."))

app/api/mapping/management/commands/automatic_queue_and_containers_creation.py

@@ -1,6 +1,6 @@
 [project]
 name = "api"
-version = "4.2.5"
+version = "4.2.8"
 description = "Web app for Carrot-Mapper"
 
 authors = [