fix tests and styling

Author: Murat Kaan Meral

src/strands_agents_builder/strands.py

@@ -5,8 +5,7 @@
 
 import argparse
 import os
-import sys
-from typing import Optional, Tuple
+from typing import Optional
 
 # Strands
 from strands import Agent
@@ -16,18 +15,13 @@
 from strands_agents_builder.tools import get_tools
 from strands_agents_builder.utils import model_utils
 from strands_agents_builder.utils.kb_utils import load_system_prompt, store_conversation_in_kb
-from strands_agents_builder.utils.welcome_utils import render_goodbye_message, render_welcome_message
 from strands_agents_builder.utils.session_utils import (
-    create_session_manager,
-    list_available_sessions,
-    session_exists,
-    get_session_info,
-    list_sessions_command,
     display_agent_history,
-    setup_session_management,
     handle_session_commands,
+    list_sessions_command,
+    setup_session_management,
 )
-
+from strands_agents_builder.utils.welcome_utils import render_goodbye_message, render_welcome_message
 
 os.environ["STRANDS_TOOL_CONSOLE_MODE"] = "enabled"
 

src/strands_agents_builder/utils/session_utils.py

@@ -4,17 +4,16 @@
 """
 
 import datetime
-import os
 import time
 import uuid
 from pathlib import Path
 from typing import Optional, Tuple
 
 from colorama import Fore, Style
-from rich.console import Console
-from rich.panel import Panel
 from rich.align import Align
 from rich.box import ROUNDED
+from rich.console import Console
+from rich.panel import Panel
 from strands.session.file_session_manager import FileSessionManager
 
 # Create console for rich formatting
@@ -126,7 +125,8 @@ def list_sessions_command(session_base_path: Optional[str]) -> None:
     """Handle the --list-sessions command."""
     if not session_base_path:
         console.print(
-            "[red]Error: Session management not enabled. Use --session-path or set STRANDS_SESSION_PATH environment variable.[/red]"
+            "[red]Error: Session management not enabled. Use --session-path or "
+            "set STRANDS_SESSION_PATH environment variable.[/red]"
         )
         return
 
@@ -192,7 +192,7 @@ def display_agent_history(agent, session_id: str) -> None:
                     print(f"{Fore.WHITE}{content}{Style.RESET_ALL}")
                     print()  # Empty line after assistant message
 
-    except Exception as e:
+    except Exception:
         # If we can't load history, just continue silently
         pass
 

tests/test_strands.py

@@ -5,17 +5,15 @@
 
 import os
 import sys
-import tempfile
-from pathlib import Path
 from unittest import mock
 
 import pytest
 
 from strands_agents_builder import strands
 from strands_agents_builder.utils.session_utils import (
+    handle_session_commands,
     list_sessions_command,
     setup_session_management,
-    handle_session_commands,
 )
 
 
@@ -440,9 +438,9 @@ def test_welcome_message_failure(
 class TestSessionManagement:
     """Test cases for session management functionality"""
 
-    @mock.patch("builtins.print")
+    @mock.patch("strands_agents_builder.utils.session_utils.console.print")
     @mock.patch("strands_agents_builder.utils.session_utils.list_available_sessions")
-    def test_list_sessions_command_no_sessions(self, mock_list_sessions, mock_print):
+    def test_list_sessions_command_no_sessions(self, mock_list_sessions, mock_console_print):
         """Test list-sessions command when no sessions exist"""
         # Setup mocks
         mock_list_sessions.return_value = []
@@ -452,12 +450,12 @@ def test_list_sessions_command_no_sessions(self, mock_list_sessions, mock_print)
             strands.main()
 
         # Verify appropriate message was called
-        mock_print.assert_any_call("No sessions found.")
+        mock_console_print.assert_any_call("[yellow]No sessions found.[/yellow]")
 
-    @mock.patch("builtins.print")
+    @mock.patch("strands_agents_builder.utils.session_utils.console.print")
     @mock.patch("strands_agents_builder.utils.session_utils.get_session_info")
     @mock.patch("strands_agents_builder.utils.session_utils.list_available_sessions")
-    def test_list_sessions_command_with_sessions(self, mock_list_sessions, mock_get_info, mock_print):
+    def test_list_sessions_command_with_sessions(self, mock_list_sessions, mock_get_info, mock_console_print):
         """Test list-sessions command when sessions exist"""
         # Setup mocks
         mock_list_sessions.return_value = ["session1", "session2"]
@@ -471,21 +469,22 @@ def test_list_sessions_command_with_sessions(self, mock_list_sessions, mock_get_
             strands.main()
 
         # Verify sessions were listed
-        mock_print.assert_any_call("Available sessions:")
+        mock_console_print.assert_any_call("[bold cyan]Available sessions:[/bold cyan]")
         # Check that session info was called for each session
         mock_get_info.assert_any_call("session1", "/tmp/sessions")
         mock_get_info.assert_any_call("session2", "/tmp/sessions")
 
-    @mock.patch("builtins.print")
-    def test_list_sessions_command_no_base_path(self, mock_print):
+    @mock.patch("strands_agents_builder.utils.session_utils.console.print")
+    def test_list_sessions_command_no_base_path(self, mock_console_print):
         """Test list-sessions command when no session path is configured"""
         # Mock sys.argv without session path
         with mock.patch.object(sys, "argv", ["strands", "--list-sessions"]):
             strands.main()
 
         # Verify appropriate error message was called
-        mock_print.assert_called_with(
-            "Error: Session management not enabled. Use --session-path or set STRANDS_SESSION_PATH environment variable."
+        mock_console_print.assert_called_with(
+            "[red]Error: Session management not enabled. Use --session-path or "
+            "set STRANDS_SESSION_PATH environment variable.[/red]"
         )
 
     @mock.patch("strands_agents_builder.utils.session_utils.create_session_manager")

tests/tools/test_strand.py

@@ -105,25 +105,11 @@ def test_strand_env_system_prompt(self):
     def test_strand_file_system_prompt(self):
         """Test loading system prompt from file"""
         with (
-            mock.patch("src.strands_agents_builder.utils.kb_utils.os.getenv", return_value=None),
-            mock.patch("src.strands_agents_builder.utils.kb_utils.os.getcwd", return_value="/test/dir"),
-            mock.patch("src.strands_agents_builder.utils.kb_utils.Path") as mock_path_class,
+            mock.patch("pathlib.Path.exists", return_value=True),
+            mock.patch("pathlib.Path.is_file", return_value=True),
+            mock.patch("pathlib.Path.read_text", return_value="Prompt from file\n"),
             mock.patch("tools.strand.Agent") as mock_agent_class,
         ):
-            # Setup mock path instances
-            mock_cwd_path = mock.MagicMock()
-            mock_prompt_file = mock.MagicMock()
-
-            # Mock Path constructor to return mock_cwd_path
-            mock_path_class.return_value = mock_cwd_path
-
-            # Mock the / operator to return mock_prompt_file
-            mock_cwd_path.__truediv__.return_value = mock_prompt_file
-
-            # Setup mock_prompt_file behavior
-            mock_prompt_file.exists.return_value = True
-            mock_prompt_file.is_file.return_value = True
-            mock_prompt_file.read_text.return_value = "Prompt from file\n"
             # Setup mock agent
             mock_agent_instance = mock.MagicMock()
             mock_agent_class.return_value = mock_agent_instance
@@ -183,26 +169,12 @@ def test_strand_tool_with_file_prompt(self):
 
         # Create a temporary prompt file
         with (
-            mock.patch("src.strands_agents_builder.utils.kb_utils.os.getenv", return_value=None),
-            mock.patch("src.strands_agents_builder.utils.kb_utils.os.getcwd", return_value="/test/dir"),
-            mock.patch("src.strands_agents_builder.utils.kb_utils.Path") as mock_path_class,
+            mock.patch("pathlib.Path.exists", return_value=True),
+            mock.patch("pathlib.Path.is_file", return_value=True),
+            mock.patch("pathlib.Path.read_text", return_value="Test prompt from file"),
             mock.patch("sys.stdout", new_callable=StringIO),
             mock.patch("tools.strand.Agent") as mock_agent_class,
         ):
-            # Setup mock path instances
-            mock_cwd_path = mock.MagicMock()
-            mock_prompt_file = mock.MagicMock()
-
-            # Mock Path constructor to return mock_cwd_path
-            mock_path_class.return_value = mock_cwd_path
-
-            # Mock the / operator to return mock_prompt_file
-            mock_cwd_path.__truediv__.return_value = mock_prompt_file
-
-            # Setup mock_prompt_file behavior
-            mock_prompt_file.exists.return_value = True
-            mock_prompt_file.is_file.return_value = True
-            mock_prompt_file.read_text.return_value = "Test prompt from file"
             # Mock the agent instance
             mock_agent_instance = mock.MagicMock()
             mock_agent_class.return_value = mock_agent_instance

tests/utils/test_kb_utils.py

@@ -19,24 +19,14 @@ def test_load_system_prompt_from_env(temp_env):
 def test_load_system_prompt_from_file():
     """Test loading system prompt from .prompt file"""
     with (
-        mock.patch("src.strands_agents_builder.utils.kb_utils.os.getenv", return_value=None),
-        mock.patch("src.strands_agents_builder.utils.kb_utils.os.getcwd", return_value="/test/dir"),
-        mock.patch("src.strands_agents_builder.utils.kb_utils.Path") as mock_path_class,
+        mock.patch("pathlib.Path.exists") as mock_exists,
+        mock.patch("pathlib.Path.is_file") as mock_is_file,
+        mock.patch("pathlib.Path.read_text") as mock_read_text,
     ):
-        # Setup mock path instances
-        mock_cwd_path = mock.MagicMock()
-        mock_prompt_file = mock.MagicMock()
-
-        # Mock Path constructor to return mock_cwd_path
-        mock_path_class.return_value = mock_cwd_path
-
-        # Mock the / operator to return mock_prompt_file
-        mock_cwd_path.__truediv__.return_value = mock_prompt_file
-
-        # Setup mock_prompt_file behavior
-        mock_prompt_file.exists.return_value = True
-        mock_prompt_file.is_file.return_value = True
-        mock_prompt_file.read_text.return_value = "Test prompt from file\n"
+        # Setup mocks
+        mock_exists.return_value = True
+        mock_is_file.return_value = True
+        mock_read_text.return_value = "Test prompt from file\n"
 
         # Load prompt
         prompt = load_system_prompt()
@@ -47,23 +37,9 @@ def test_load_system_prompt_from_file():
 
 def test_load_default_system_prompt():
     """Test loading default system prompt when env and file are not available"""
-    with (
-        mock.patch("src.strands_agents_builder.utils.kb_utils.os.getenv", return_value=None),
-        mock.patch("src.strands_agents_builder.utils.kb_utils.os.getcwd", return_value="/test/dir"),
-        mock.patch("src.strands_agents_builder.utils.kb_utils.Path") as mock_path_class,
-    ):
-        # Setup mock path instances
-        mock_cwd_path = mock.MagicMock()
-        mock_prompt_file = mock.MagicMock()
-
-        # Mock Path constructor to return mock_cwd_path
-        mock_path_class.return_value = mock_cwd_path
-
-        # Mock the / operator to return mock_prompt_file
-        mock_cwd_path.__truediv__.return_value = mock_prompt_file
-
-        # Setup mock_prompt_file behavior - file doesn't exist
-        mock_prompt_file.exists.return_value = False
+    with mock.patch("pathlib.Path.exists") as mock_exists:
+        # Setup mock
+        mock_exists.return_value = False
 
         # Load prompt
         prompt = load_system_prompt()

tests/utils/test_session_utils.py

@@ -3,24 +3,21 @@
 Unit tests for the session_utils module using pytest
 """
 
-import os
 import tempfile
 from pathlib import Path
 from unittest import mock
 
-import pytest
-
 from strands_agents_builder.utils.session_utils import (
-    get_sessions_directory,
-    list_available_sessions,
     create_session_manager,
+    display_agent_history,
     generate_session_id,
-    session_exists,
     get_session_info,
+    get_sessions_directory,
+    handle_session_commands,
+    list_available_sessions,
     list_sessions_command,
-    display_agent_history,
+    session_exists,
     setup_session_management,
-    handle_session_commands,
 )
 
 
@@ -156,7 +153,7 @@ def test_generates_session_id_when_none_provided(self, mock_file_session_manager
         mock_file_session_manager.return_value = mock_manager_instance
 
         with tempfile.TemporaryDirectory() as temp_dir:
-            result = create_session_manager(base_path=temp_dir)
+            create_session_manager(base_path=temp_dir)
 
             # Verify FileSessionManager was called with a generated session ID
             mock_file_session_manager.assert_called_once()
@@ -288,7 +285,7 @@ def test_full_session_workflow(self):
 
             # Test create_session_manager creates directory and manager
             with mock.patch("strands_agents_builder.utils.session_utils.FileSessionManager") as mock_fsm:
-                manager = create_session_manager(session_id="test-session", base_path=base_path)
+                create_session_manager(session_id="test-session", base_path=base_path)
                 mock_fsm.assert_called_once()
 
             # Create some test session directories
@@ -369,7 +366,8 @@ def test_list_sessions_command_no_base_path(self, mock_console_print):
 
         # Verify appropriate error message was called
         mock_console_print.assert_called_with(
-            "[red]Error: Session management not enabled. Use --session-path or set STRANDS_SESSION_PATH environment variable.[/red]"
+            "[red]Error: Session management not enabled. Use --session-path or "
+            "set STRANDS_SESSION_PATH environment variable.[/red]"
         )
 
     @mock.patch("strands_agents_builder.utils.session_utils.console.print")