Updates

Author: hakbailey

.pre-commit-config.yaml

@@ -23,15 +23,17 @@ repos:
         args: [--indent=4, --no-sort-keys]
       - id: trailing-whitespace
 
-  - repo: https://github.com/psf/black
+  - repo: https://github.com/psf/black-pre-commit-mirror
     rev: 25.1.0
     hooks:
       - id: black
+        args: [--config, pyproject.toml]
 
   - repo: https://github.com/PyCQA/flake8
     rev: 7.3.0
     hooks:
       - id: flake8
+        args: [--max-line-length, "90"]
 
   - repo: https://github.com/ikamensh/flynt/
     rev: 1.0.1
@@ -42,9 +44,11 @@ repos:
     rev: 6.0.1
     hooks:
       - id: isort
-        name: isort (python)
+        args: [--settings-path, pyproject.toml]
 
   - repo: https://github.com/pre-commit/mirrors-mypy
     rev: v1.17.0
     hooks:
       - id: mypy
+        pass_filenames: false
+        args: [--config-file=pyproject.toml, --ignore-missing-imports, "."]

Makefile

@@ -14,7 +14,9 @@ help: ## Show this help message
 CONTAINER_RUNTIME ?= podman
 IMAGE_NAME ?= pattern-service
 IMAGE_TAG ?= latest
-QUAY_NAMESPACE ?= ansible
+
+ensure-namespace:
+	@test -n "$$QUAY_NAMESPACE" || (echo "Error: QUAY_NAMESPACE is required to push quay.io" && exit 1)
 
 .PHONY: build
 build: ## Build the container image

core/tests/test_views.py

@@ -89,7 +89,10 @@ def test_pattern_create_view(self):
     def test_pattern_delete_view(self):
         # Create a separate pattern for deletion
         pattern_to_delete = Pattern.objects.create(
-            collection_name="delete.test", collection_version="1.0.0", pattern_name="deletable_pattern", pattern_definition={}
+            collection_name="delete.test",
+            collection_version="1.0.0",
+            pattern_name="deletable_pattern",
+            pattern_definition={},
         )
 
         url = reverse("pattern-detail", args=[pattern_to_delete.pk])
@@ -118,9 +121,9 @@ def test_label_detail_view(self):
         url = reverse("controllerlabel-detail", args=[self.label.id])
         response = self.client.get(url)
         self.assertEqual(response.status_code, status.HTTP_200_OK)
-        self.assertIn('id', response.data)
-        self.assertIn('label_id', response.data)
-        self.assertEqual(response.data['label_id'], 5)
+        self.assertIn("id", response.data)
+        self.assertIn("label_id", response.data)
+        self.assertEqual(response.data["label_id"], 5)
 
     def test_label_create_view(self):
         url = reverse("controllerlabel-list")
@@ -191,19 +194,29 @@ def test_pattern_instance_create_view(self):
     def test_pattern_instance_delete_view(self):
         # Create a separate instance for deletion
         instance_to_delete = PatternInstance.objects.create(
-            organization_id=999, controller_project_id=111, controller_ee_id=222, credentials={"user": "deletable"}, pattern=self.pattern
+            organization_id=999,
+            controller_project_id=111,
+            controller_ee_id=222,
+            credentials={"user": "deletable"},
+            pattern=self.pattern,
         )
 
         url = reverse("patterninstance-detail", args=[instance_to_delete.pk])
         response = self.client.delete(url)
         self.assertEqual(response.status_code, status.HTTP_204_NO_CONTENT)
 
         # Verify database change - instance should be deleted
-        self.assertFalse(PatternInstance.objects.filter(pk=instance_to_delete.pk).exists())
+        self.assertFalse(
+            PatternInstance.objects.filter(pk=instance_to_delete.pk).exists()
+        )
 
     def test_pattern_instance_create_view_with_invalid_pattern(self):
         url = reverse("patterninstance-list")
-        data = {"organization_id": 999, "credentials": {"user": "test"}, "pattern": 99999}  # Non-existent pattern ID
+        data = {
+            "organization_id": 999,
+            "credentials": {"user": "test"},
+            "pattern": 99999,
+        }  # Non-existent pattern ID
 
         response = self.client.post(url, data, format="json")
         self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
@@ -224,7 +237,12 @@ def test_automation_detail_view(self):
 
     def test_automation_create_view(self):
         url = reverse("automation-list")
-        data = {"automation_type": "job_template", "automation_id": 1234, "primary": False, "pattern_instance": self.pattern_instance.id}
+        data = {
+            "automation_type": "job_template",
+            "automation_id": 1234,
+            "primary": False,
+            "pattern_instance": self.pattern_instance.id,
+        }
 
         response = self.client.post(url, data, format="json")
         self.assertEqual(response.status_code, status.HTTP_201_CREATED)
@@ -238,7 +256,10 @@ def test_automation_create_view(self):
     def test_automation_delete_view(self):
         # Create a separate automation for deletion
         automation_to_delete = Automation.objects.create(
-            automation_type="job_template", automation_id=5555, primary=False, pattern_instance=self.pattern_instance
+            automation_type="job_template",
+            automation_id=5555,
+            primary=False,
+            pattern_instance=self.pattern_instance,
         )
 
         url = reverse("automation-detail", args=[automation_to_delete.pk])
@@ -250,7 +271,11 @@ def test_automation_delete_view(self):
 
     def test_automation_create_view_with_invalid_pattern_instance(self):
         url = reverse("automation-list")
-        data = {"automation_type": "job_template", "automation_id": 1234, "pattern_instance": 99999}  # Non-existent pattern instance ID
+        data = {
+            "automation_type": "job_template",
+            "automation_id": 1234,
+            "pattern_instance": 99999,
+        }  # Non-existent pattern instance ID
 
         response = self.client.post(url, data, format="json")
         self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)

core/views.py

@@ -38,7 +38,9 @@ def create(self, request: Request, *args: tuple, **kwargs: dict) -> Response:
         return Response(
             {
                 "task_id": task.id,
-                "message": "Pattern creation initiated. Check task status for progress.",
+                "message": (
+                    "Pattern creation initiated. Check task status for progress."
+                ),
             },
             status=status.HTTP_202_ACCEPTED,
         )

pattern_service/settings/defaults.py

@@ -101,3 +101,10 @@
 # https://docs.djangoproject.com/en/5.2/ref/settings/#default-auto-field
 
 DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField"
+
+DATABASES = {
+    "default": {
+        "ENGINE": "django.db.backends.sqlite3",
+        "NAME": BASE_DIR / "db.sqlite3",
+    }
+}

pattern_service/settings/development_defaults.py

@@ -3,16 +3,7 @@
 ALLOWED_HOSTS = ["localhost", "pattern-service", "127.0.0.1"]
 BASE_DIR = Path(__file__).resolve().parent.parent
 DEBUG = True
-SECRET_KEY = (
-    "django-insecure-_f^+pc=x%dd&p8ht4qv7rqr8&a%@j#lda6v!x9353m+)fm8&gk"  # notsecret
-)
-
-DATABASES = {
-    "default": {
-        "ENGINE": "django.db.backends.sqlite3",
-        "NAME": BASE_DIR / "db.sqlite3",
-    }
-}
+SECRET_KEY = "insecure"
 
 # Logging
 LOGGING = {

pattern_service/settings/testing_defaults.py

@@ -2,13 +2,4 @@
 
 ALLOWED_HOSTS = ["localhost", "pattern-service", "127.0.0.1"]
 BASE_DIR = Path(__file__).resolve().parent.parent
-SECRET_KEY = (
-    "django-insecure-_f^+pc=x%dd&p8ht4qv7rqr8&a%@j#lda6v!x9353m+)fm8&gk"  # notsecret
-)
-
-DATABASES = {
-    "default": {
-        "ENGINE": "django.db.backends.sqlite3",
-        "NAME": BASE_DIR / "db.sqlite3",
-    }
-}
+SECRET_KEY = "insecure"

pyproject.toml

@@ -69,6 +69,7 @@ exclude_gitignore = true
 strict = true
 disallow_any_generics = false
 disallow_subclassing_any = false
+disallow_untyped_decorators = false
 
 [[tool.mypy.overrides]]
 module = ["ansible_base.*", "dotenv.*"]