Merge pull request #3 from nullchimp/alert-autofix-1

Potential fix for code scanning alert no. 1: Workflow does not contain permissions

Author: nullchimp

.github/workflows/test-coverage.yml

@@ -1,5 +1,7 @@
 # .github/workflows/test-coverage.yml
 name: Test Coverage
+permissions:
+  contents: read
 
 on:
   push:
@@ -21,16 +23,20 @@ jobs:
 
       - name: Set up environment
         run: |
+          python -m venv .venv
+          source .venv/bin/activate
           pip install --upgrade pip
           pip install -r requirements.txt
-          pip install pytest pytest-cov
-      
+
       - name: Set environment variables
         run: |
           echo "AZURE_OPENAI_API_KEY=dummy-key-for-testing" >> $GITHUB_ENV
-          echo "PYTHONPATH=$(pwd):$(pwd)/src" >> $GITHUB_ENV
+          echo "PYTHONPATH=$PYTHONPATH:$(pwd):$(pwd)/src" >> $GITHUB_ENV
+
       - name: Run tests with coverage
-        run: pytest --cov=src --cov-report=xml --cov-fail-under=80
+        run: |
+          source .venv/bin/activate
+          python -m pytest --cov=src --cov-report=xml --cov-report=term --cov-fail-under=80
 
       - name: Upload coverage report
         uses: actions/upload-artifact@v4

requirements.txt

@@ -9,6 +9,7 @@ charset-normalizer==3.4.2
 click==8.1.8
 coverage==7.8.0
 dill==0.4.0
+fastapi==0.115.12
 flake8==7.2.0
 google-api-core==2.24.2
 google-api-python-client==2.169.0
@@ -48,6 +49,7 @@ Pygments==2.19.1
 pylint==3.3.7
 pyparsing==3.2.3
 pytest==8.3.5
+pytest-asyncio==0.26.0
 pytest-cov==6.1.1
 python-dotenv==1.1.0
 python-multipart==0.0.20

tests/conftest.py

@@ -0,0 +1,65 @@
+import os
+import sys
+import pytest
+import asyncio
+
+
+# Add the src directory to the Python path
+sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), '../src')))
+
+
+# Set standard environment variables for testing
+@pytest.fixture(scope="session", autouse=True)
+def setup_test_environment():
+    """Set up the test environment with consistent environment variables."""
+    # Store original environment variables to restore later
+    original_env = os.environ.copy()
+    
+    # Set standard test environment variables
+    test_env = {
+        "AZURE_OPENAI_API_KEY": "dummy-key-for-testing",
+        # Add any other environment variables needed for tests
+    }
+    
+    # Apply test environment
+    for key, value in test_env.items():
+        os.environ[key] = value
+    
+    # Run the tests
+    yield
+    
+    # Restore original environment
+    for key in test_env.keys():
+        if key in original_env:
+            os.environ[key] = original_env[key]
+        else:
+            del os.environ[key]
+
+
+# Configure asyncio for pytest-asyncio
+@pytest.fixture(scope="session")
+def event_loop_policy():
+    """Return the default event loop policy."""
+    return asyncio.DefaultEventLoopPolicy()
+
+
+@pytest.fixture
+def event_loop(event_loop_policy):
+    """Create an instance of the default event loop for each test case."""
+    loop = event_loop_policy.new_event_loop()
+    asyncio.set_event_loop(loop)
+    yield loop
+    asyncio.set_event_loop(None)
+    loop.close()
+
+
+# Add pytest configuration to set the default loop scope
+def pytest_configure(config):
+    """Configure pytest-asyncio with the default event loop scope."""
+    config.addinivalue_line(
+        "markers", "asyncio: mark test to run using an asyncio event loop"
+    )
+    
+    # Set the default fixture loop scope
+    if hasattr(config, 'asyncio_options'):
+        config.asyncio_options.default_fixture_loop_scope = 'function'

tests/test_main.py

@@ -12,25 +12,27 @@ async def test_process_one():
     """Test the process_one coroutine."""
     import main
 
-    # For this test, we need to directly execute the first iteration of the loop
-    # in process_one to verify that print is called before sleep
+    # Mock the sleep function to avoid waiting and stop the infinite loop
+    mock_sleep = AsyncMock()
 
-    # Create a mock for asyncio.sleep that will raise CancelledError after being called
-    async def mock_sleep(seconds):
-        raise asyncio.CancelledError()
+    # Use side_effect to make sleep raise CancelledError after first call
+    # This ensures we exit the while loop after one iteration
+    mock_sleep.side_effect = [None, asyncio.CancelledError()]
 
-    # Apply the mocks - patching at the exact module where sleep is used
     with patch('asyncio.sleep', mock_sleep):
         with patch('builtins.print') as mock_print:
             try:
-                # Run process_one - it should print and then hit our mocked sleep
-                # which raises CancelledError to exit the loop
                 await main.process_one()
             except asyncio.CancelledError:
                 pass
 
             # Verify print was called with the expected message
-            mock_print.assert_called_once_with("Processing one...")
+            mock_print.assert_called_with("Processing one...")
+            assert mock_print.call_count >= 1  # Should be called at least once
+            
+            # Verify sleep was called with expected argument
+            mock_sleep.assert_called_with(1)
+            assert mock_sleep.call_count >= 1  # Should be called at least once
 
 @pytest.mark.asyncio
 async def test_process_two():

tests/utils/test_utils_init.py

@@ -7,7 +7,7 @@
 # Ensure src/ is in sys.path for imports
 sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), '../../src')))
 
-from utils import chatloop
+from src.utils import chatloop
 
 def test_chatloop_decorator_creation():
     """Test that the chatloop decorator returns a proper wrapper function."""
@@ -96,4 +96,74 @@ async def test_func(user_input):
             await wrapped()
 
             # Verify function was called twice (once for each input)
-            assert call_count == 2
+            assert call_count == 2
+
+@pytest.mark.asyncio
+async def test_chatloop_basic_execution():
+    """Test the chatloop decorator runs a function once and exits on KeyboardInterrupt."""
+    # Create a mock function to be decorated
+    mock_func = MagicMock()
+    mock_func.return_value = asyncio.Future()
+    mock_func.return_value.set_result("Test response")
+    
+    # Apply the decorator
+    decorated = chatloop("TestChat")(mock_func)
+    
+    # Mock input/print functions and simulate KeyboardInterrupt after first iteration
+    with patch('builtins.input', side_effect=["Test input", KeyboardInterrupt()]):
+        with patch('builtins.print') as mock_print:
+            await decorated("arg1", kwarg1="value1")
+            
+            # Verify the function was called with correct parameters
+            mock_func.assert_called_once_with("Test input", "arg1", kwarg1="value1")
+            
+            # Verify output was printed
+            assert any("Test response" in str(call) for call in mock_print.call_args_list)
+
+@pytest.mark.asyncio
+async def test_chatloop_exception_handling():
+    """Test the chatloop decorator handles exceptions properly."""
+    # Create a mock function that raises an exception
+    mock_func = MagicMock()
+    mock_func.side_effect = [Exception("Test error"), KeyboardInterrupt()]
+    
+    # Apply the decorator
+    decorated = chatloop("TestChat")(mock_func)
+    
+    # Mock input/print and execute
+    with patch('builtins.input', return_value="Test input"):
+        with patch('builtins.print') as mock_print:
+            await decorated()
+            
+            # Verify error was printed
+            assert any("Error: Test error" in str(call) for call in mock_print.call_args_list)
+
+@pytest.mark.asyncio
+async def test_chatloop_multiple_iterations():
+    """Test the chatloop decorator handles multiple chat iterations."""
+    # Create a sequence of responses
+    mock_func = MagicMock()
+    response_future1 = asyncio.Future()
+    response_future1.set_result("Response 1")
+    response_future2 = asyncio.Future()
+    response_future2.set_result("Response 2")
+    
+    mock_func.side_effect = [response_future1, response_future2]
+    
+    # Apply the decorator
+    decorated = chatloop("TestChat")(mock_func)
+    
+    # Mock inputs and simulate KeyboardInterrupt after second iteration
+    with patch('builtins.input', side_effect=["Input 1", "Input 2", KeyboardInterrupt()]):
+        with patch('builtins.print') as mock_print:
+            await decorated()
+            
+            # Verify the function was called twice with correct inputs
+            assert mock_func.call_count == 2
+            mock_func.assert_any_call("Input 1")
+            mock_func.assert_any_call("Input 2")
+            
+            # Verify both responses were printed
+            printed_strings = [str(call) for call in mock_print.call_args_list]
+            assert any("Response 1" in s for s in printed_strings)
+            assert any("Response 2" in s for s in printed_strings)