Pylint Fixes

Author: Vemarthula-Microsoft

src/ContentProcessor/conftest.py

@@ -12,7 +12,7 @@
 pytest_plugins = ["pytest_mock"]
 
 
-@pytest.fixture(autouse=True, scope="function") 
+@pytest.fixture(autouse=True, scope="function")
 def mock_azure_credentials_for_helpers(request):
     """
     Mock Azure credentials for azure_helper classes only.
@@ -22,13 +22,13 @@ def mock_azure_credentials_for_helpers(request):
     if "test_azure_credential_utils" in str(request.fspath):
         yield
         return
-    
+
     with patch("helpers.azure_credential_utils.get_azure_credential") as mock_get_cred, \
          patch("helpers.azure_credential_utils.get_azure_credential_async") as mock_get_cred_async:
-        
+
         # Create mock credential objects
         mock_credential = MagicMock()
         mock_get_cred.return_value = mock_credential
         mock_get_cred_async.return_value = mock_credential
-        
+
         yield mock_credential

src/ContentProcessor/src/helpers/azure_credential_utils.py

@@ -9,13 +9,13 @@
 async def get_azure_credential_async(client_id=None):
     """
     Returns an Azure credential asynchronously based on the application environment.
-    
+
     If the environment is 'dev', it uses AioDefaultAzureCredential.
     Otherwise, it uses AioManagedIdentityCredential.
-    
+
     Args:
         client_id (str, optional): The client ID for the Managed Identity Credential.
-    
+
     Returns:
         Credential object: Either AioDefaultAzureCredential or AioManagedIdentityCredential.
     """
@@ -28,13 +28,13 @@ async def get_azure_credential_async(client_id=None):
 def get_azure_credential(client_id=None):
     """
     Returns an Azure credential based on the application environment.
-    
+
     If the environment is 'dev', it uses DefaultAzureCredential.
     Otherwise, it uses ManagedIdentityCredential.
-    
+
     Args:
         client_id (str, optional): The client ID for the Managed Identity Credential.
-    
+
     Returns:
         Credential object: Either DefaultAzureCredential or ManagedIdentityCredential.
     """

src/ContentProcessor/src/libs/application/application_context.py

@@ -2,8 +2,6 @@
 # Licensed under the MIT License.
 from typing import Any
 
-from helpers.azure_credential_utils import get_azure_credential
-
 from libs.application.application_configuration import AppConfiguration
 from libs.base.application_models import AppModelBase
 

src/ContentProcessor/src/tests/helpers/test_azure_credential_utils.py

@@ -9,10 +9,13 @@
 # Ensure src directory is on the Python path for imports
 sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..')))
 
-import helpers.azure_credential_utils as azure_credential_utils
+# Import after path modification (flake8: noqa)
+import helpers.azure_credential_utils as azure_credential_utils  # noqa: E402
+
 
 # Synchronous tests
 
+
 @patch("helpers.azure_credential_utils.os.getenv")
 @patch("helpers.azure_credential_utils.DefaultAzureCredential")
 @patch("helpers.azure_credential_utils.ManagedIdentityCredential")
@@ -29,6 +32,7 @@ def test_get_azure_credential_dev_env(mock_managed_identity_credential, mock_def
     mock_managed_identity_credential.assert_not_called()
     assert credential == mock_default_credential
 
+
 @patch("helpers.azure_credential_utils.os.getenv")
 @patch("helpers.azure_credential_utils.DefaultAzureCredential")
 @patch("helpers.azure_credential_utils.ManagedIdentityCredential")
@@ -44,8 +48,10 @@ def test_get_azure_credential_non_dev_env(mock_managed_identity_credential, mock
     mock_default_azure_credential.assert_not_called()
     assert credential == mock_managed_credential
 
+
 # Asynchronous tests
 
+
 @pytest.mark.asyncio
 @patch("helpers.azure_credential_utils.os.getenv")
 @patch("helpers.azure_credential_utils.AioDefaultAzureCredential")
@@ -63,6 +69,7 @@ async def test_get_azure_credential_async_dev_env(mock_aio_managed_identity_cred
     mock_aio_managed_identity_credential.assert_not_called()
     assert credential == mock_aio_default_credential
 
+
 @pytest.mark.asyncio
 @patch("helpers.azure_credential_utils.os.getenv")
 @patch("helpers.azure_credential_utils.AioDefaultAzureCredential")

src/ContentProcessorAPI/conftest.py

@@ -12,7 +12,7 @@
 pytest_plugins = ["pytest_mock"]
 
 
-@pytest.fixture(autouse=True, scope="function") 
+@pytest.fixture(autouse=True, scope="function")
 def mock_azure_credentials_for_helpers(request):
     """
     Mock Azure credentials for azure_helper classes only.
@@ -22,13 +22,13 @@ def mock_azure_credentials_for_helpers(request):
     if "test_azure_credential_utils" in str(request.fspath):
         yield
         return
-    
+
     with patch("helpers.azure_credential_utils.get_azure_credential") as mock_get_cred, \
          patch("helpers.azure_credential_utils.get_azure_credential_async") as mock_get_cred_async:
-        
+
         # Create mock credential objects
         mock_credential = MagicMock()
         mock_get_cred.return_value = mock_credential
         mock_get_cred_async.return_value = mock_credential
-        
+
         yield mock_credential

src/ContentProcessorAPI/helpers/azure_credential_utils.py

@@ -32,4 +32,4 @@ def get_azure_credential(client_id=None):
     if os.getenv("APP_ENV", "prod").lower() == 'dev':
         return DefaultAzureCredential()  # CodeQL [SM05139] Okay use of DefaultAzureCredential as it is only used in development
     else:
-        return ManagedIdentityCredential(client_id=client_id)
+        return ManagedIdentityCredential(client_id=client_id)

src/ContentProcessorAPI/tests/helpers/test_azure_credential_utils.py

@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
 import pytest
 import sys
 import os
@@ -6,7 +9,9 @@
 # Ensure src/backend is on the Python path for imports
 sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..')))
 
-import helpers.azure_credential_utils as azure_credential_utils
+# Import after path modification (flake8: noqa)
+import helpers.azure_credential_utils as azure_credential_utils  # noqa: E402
+
 
 # Synchronous tests
 
@@ -80,4 +85,4 @@ async def test_get_azure_credential_async_non_dev_env(mock_aio_managed_identity_
     mock_getenv.assert_called_once_with("APP_ENV", "prod")
     mock_aio_managed_identity_credential.assert_called_once_with(client_id="test-client-id")
     mock_aio_default_azure_credential.assert_not_called()
-    assert credential == mock_aio_managed_credential
+    assert credential == mock_aio_managed_credential