Merge pull request #7 from netdevops/claude/fix-test-import-error-cJ6yo

Fix import error in test configuration

Author: jtdub

.github/workflows/ci.yml

@@ -12,7 +12,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
+        os: [ubuntu-latest, macos-latest]
         python-version: ["3.10", "3.11", "3.12"]
 
     steps:
@@ -39,7 +39,7 @@ jobs:
 
     - name: Install dependencies
       if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true'
-      run: poetry install --no-interaction --no-root --with dev
+      run: poetry install --no-interaction --no-root --with dev,anthropic,chatgpt,ollama
 
     - name: Install project
       run: poetry install --no-interaction
@@ -79,7 +79,7 @@ jobs:
       uses: snok/install-poetry@v1
 
     - name: Install dependencies
-      run: poetry install --no-interaction --with dev
+      run: poetry install --no-interaction --with dev,anthropic,chatgpt,ollama
 
     - name: Run pylint
       run: poetry run pylint hier_config_gpt
@@ -100,7 +100,7 @@ jobs:
       uses: snok/install-poetry@v1
 
     - name: Install dependencies
-      run: poetry install --no-interaction --with dev
+      run: poetry install --no-interaction --with dev,anthropic,chatgpt,ollama
 
     - name: Build documentation
       run: poetry run mkdocs build --strict

tests/test_clients.py

@@ -1,5 +1,7 @@
 from unittest.mock import MagicMock, patch
 
+import pytest
+
 from hier_config_gpt.clients.anthropic import ClaudeGPTClient
 from hier_config_gpt.clients.models import GPTPlanResponse
 from hier_config_gpt.clients.ollama import OllamaGPTClient
@@ -20,7 +22,7 @@ def test_init(self, mock_openai_class):
         assert client.temp == 0
 
         # Check constructor was called
-        mock_openai_class.assert_called_once_with(api_key="test-key")
+        mock_openai_class.assert_called_once_with(api_key="test-key", timeout=60.0)
 
     @patch("hier_config_gpt.clients.openai.OpenAI")
     def test_chat(self, mock_openai_class):
@@ -56,7 +58,7 @@ def test_chat(self, mock_openai_class):
 
         # Verify mock was called with correct parameters
         mock_completions.create.assert_called_once_with(
-            model="gpt-4",
+            model="gpt-4o",
             messages=[{"role": "user", "content": "Test prompt"}],
             max_tokens=1000,
             temperature=0,
@@ -96,7 +98,7 @@ def test_generate_plan(self, mock_openai_class):
 
         # Verify mock was called with correct parameters
         mock_completions.create.assert_called_once_with(
-            model="gpt-4",
+            model="gpt-4o",
             messages=[{"role": "user", "content": "Test prompt"}],
             max_tokens=1000,
             temperature=0,
@@ -145,7 +147,7 @@ def test_init(self, mock_anthropic_class):
         assert client.temp == 0
 
         # Check constructor was called
-        mock_anthropic_class.assert_called_once_with(api_key="test-key")
+        mock_anthropic_class.assert_called_once_with(api_key="test-key", timeout=60.0)
 
     @patch("hier_config_gpt.clients.anthropic.Anthropic")
     def test_chat(self, mock_anthropic_class):
@@ -176,7 +178,7 @@ def test_chat(self, mock_anthropic_class):
 
         # Verify mock was called with correct parameters
         mock_messages.create.assert_called_once_with(
-            model="claude-3-opus-20240229",
+            model="claude-3-5-sonnet-20241022",
             messages=[{"role": "user", "content": "Test prompt"}],
             max_tokens=1024,
             temperature=0,
@@ -211,7 +213,7 @@ def test_generate_plan(self, mock_anthropic_class):
 
         # Verify mock was called with correct parameters
         mock_messages.create.assert_called_once_with(
-            model="claude-3-opus-20240229",
+            model="claude-3-5-sonnet-20241022",
             messages=[{"role": "user", "content": "Test prompt"}],
             max_tokens=1024,
             temperature=0,
@@ -248,7 +250,9 @@ def test_init(self, mock_ollama):
         assert client.temp == 0
 
         # Check client was created correctly
-        mock_ollama.Client.assert_called_once_with(host="http://localhost:12345")
+        mock_ollama.Client.assert_called_once_with(
+            host="http://localhost:12345", timeout=60.0
+        )
 
     @patch("hier_config_gpt.clients.ollama.ollama")
     def test_chat(self, mock_ollama):
@@ -271,9 +275,9 @@ def test_chat(self, mock_ollama):
 
         # Verify mock was called with correct parameters
         mock_client.chat.assert_called_once_with(
-            model="llama3",
+            model="llama3.2",
             messages=[{"role": "user", "content": "Test prompt"}],
-            options={"num_predict": 1024, "temperature": 0},
+            options={"num_predict": 1024, "temperature": 0.0},
         )
 
     @patch("hier_config_gpt.clients.ollama.ollama")
@@ -299,9 +303,9 @@ def test_generate_plan(self, mock_ollama):
 
         # Verify mock was called with correct parameters
         mock_client.chat.assert_called_once_with(
-            model="llama3",
+            model="llama3.2",
             messages=[{"role": "user", "content": "Test prompt"}],
-            options={"num_predict": 1024, "temperature": 0},
+            options={"num_predict": 1024, "temperature": 0.0},
         )
 
     def test_process_response(self):
@@ -344,10 +348,7 @@ def test_generate_plan_exception_handling(self, mock_ollama):
 
         mock_ollama.Client.return_value = mock_client
 
-        # Create client and call method
+        # Create client and verify exception is raised after retries
         client = OllamaGPTClient()
-        result = client.generate_plan("Test prompt")
-
-        # Verify expectations
-        assert len(result.plan) == 1
-        assert "Error generating plan: Connection error" in result.plan[0]
+        with pytest.raises(Exception, match="Connection error"):
+            client.generate_plan("Test prompt")