pre commit

src/spiffworkflow_backend/routes/process_api_blueprint.py

@@ -20,7 +20,6 @@ from flask_bpmn.api.api_error import ApiError
 from flask_bpmn.models.db import db
 from SpiffWorkflow import Task as SpiffTask  # type: ignore
 from SpiffWorkflow import TaskState
-from spiffworkflow_backend.models.secret_model import SecretModel
 from sqlalchemy import desc
 
 from spiffworkflow_backend.exceptions.process_entity_not_found_error import (
@@ -43,6 +42,7 @@ from spiffworkflow_backend.models.process_instance_report import (
 )
 from spiffworkflow_backend.models.process_model import ProcessModelInfo
 from spiffworkflow_backend.models.process_model import ProcessModelInfoSchema
+from spiffworkflow_backend.models.secret_model import SecretModel
 from spiffworkflow_backend.models.spiff_logging import SpiffLoggingModel
 from spiffworkflow_backend.services.error_handling_service import ErrorHandlingService
 from spiffworkflow_backend.services.file_system_service import FileSystemService

src/spiffworkflow_backend/services/secret_service.py

@@ -1,6 +1,6 @@
 """Secret_service."""
-from typing import Any
 from typing import Optional
+
 from flask_bpmn.api.api_error import ApiError
 from flask_bpmn.models.db import db
 
@@ -36,15 +36,19 @@ class SecretService:
     @staticmethod
     def get_secret(service: str, client: str) -> str | None:
         """Get_secret."""
-        secret: str = db.session.query(SecretModel.key).\
-            filter(SecretModel.service == service).\
-            filter(SecretModel.client == client).\
-            scalar()
-        assert secret
-        return secret
+        secret: str = (
+            db.session.query(SecretModel)
+            .filter(SecretModel.service == service)
+            .filter(SecretModel.client == client)
+            .first()
+        )
+        if secret is not None:
+            return secret.key
 
     @staticmethod
-    def add_allowed_process(secret_id: int, allowed_relative_path: str) -> SecretAllowedProcessPathModel:
+    def add_allowed_process(
+        secret_id: int, allowed_relative_path: str
+    ) -> SecretAllowedProcessPathModel:
         """Add_allowed_process."""
         secret_process_model = SecretAllowedProcessPathModel(
             secret_id=secret_id, allowed_relative_path=allowed_relative_path

tests/spiffworkflow_backend/integration/test_secret_service.py

@@ -1,11 +1,11 @@
 """Test_secret_service."""
 from flask.app import Flask
 from flask.testing import FlaskClient
-from spiffworkflow_backend.models.user import UserModel
-
 from tests.spiffworkflow_backend.helpers.base_test import BaseTest
 
-from spiffworkflow_backend.models.secret_model import SecretAllowedProcessPathModel, SecretModel
+from spiffworkflow_backend.models.secret_model import SecretAllowedProcessPathModel
+from spiffworkflow_backend.models.secret_model import SecretModel
+from spiffworkflow_backend.models.user import UserModel
 from spiffworkflow_backend.services.file_system_service import FileSystemService
 from spiffworkflow_backend.services.process_model_service import ProcessModelService
 from spiffworkflow_backend.services.secret_service import SecretService