Fix stale server.* imports in all test files

All test files under common/ and conserver/ were still importing from the
old server.* namespace (server.lib., server.storage., server.links.,
server.vcon, server.tracers.*). Updated to match the new structure:
  server.lib.       -> lib.
  server.storage.   -> storage.
  server.links.     -> links.
  server.tracers.   -> tracers.
  server.vcon       -> vcon

Also fixes patch() target strings so mock paths resolve correctly.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: pavanputhra

common/storage/dataverse/test_dataverse.py

@@ -2,9 +2,9 @@
 import json
 from unittest.mock import patch, MagicMock, ANY
 
-from server.lib.vcon_redis import VconRedis
-from server.vcon import Vcon
-from server.storage.dataverse import (
+from lib.vcon_redis import VconRedis
+from vcon import Vcon
+from storage.dataverse import (
     save,
     get,
     get_access_token,
@@ -55,7 +55,7 @@ def sample_vcon():
 # Mock Redis
 @pytest.fixture
 def mock_vcon_redis(sample_vcon):
-    with patch('server.lib.vcon_redis.VconRedis') as MockVconRedis:
+    with patch('lib.vcon_redis.VconRedis') as MockVconRedis:
         mock_redis = MagicMock()
         mock_redis.get_vcon.return_value = sample_vcon
         MockVconRedis.return_value = mock_redis
@@ -65,7 +65,7 @@ def mock_vcon_redis(sample_vcon):
 # Mock MSAL
 @pytest.fixture
 def mock_msal():
-    with patch('server.storage.dataverse.msal') as mock_msal:
+    with patch('storage.dataverse.msal') as mock_msal:
         mock_client_app = MagicMock()
         mock_msal.ConfidentialClientApplication.return_value = mock_client_app
 
@@ -82,7 +82,7 @@ def mock_msal():
 # Mock Requests
 @pytest.fixture
 def mock_requests():
-    with patch('server.storage.dataverse.requests') as mock_requests:
+    with patch('storage.dataverse.requests') as mock_requests:
         mock_session = MagicMock()
         mock_requests.Session.return_value = mock_session
 
@@ -169,7 +169,7 @@ def test_create_dataverse_session(mock_msal, mock_requests):
     assert session is None
 
 
-@patch('server.storage.dataverse.create_dataverse_session')
+@patch('storage.dataverse.create_dataverse_session')
 def test_save_new_entity(mock_create_session, mock_requests, mock_vcon_redis, sample_vcon):
     """Test saving a new vCon entity to Dataverse."""
     # Setup mocks
@@ -195,7 +195,7 @@ def test_save_new_entity(mock_create_session, mock_requests, mock_vcon_redis, sa
     }
 
     # Call save
-    with patch('server.storage.dataverse.VconRedis', return_value=mock_instance):
+    with patch('storage.dataverse.VconRedis', return_value=mock_instance):
         save("test-uuid", test_options)
 
     # Verify entity was created (POST request)
@@ -211,7 +211,7 @@ def test_save_new_entity(mock_create_session, mock_requests, mock_vcon_redis, sa
     assert "vcon_created_at" in post_data
 
 
-@patch('server.storage.dataverse.create_dataverse_session')
+@patch('storage.dataverse.create_dataverse_session')
 def test_save_existing_entity(mock_create_session, mock_requests, mock_vcon_redis, sample_vcon):
     """Test updating an existing vCon entity in Dataverse."""
     # Setup mocks
@@ -242,7 +242,7 @@ def test_save_existing_entity(mock_create_session, mock_requests, mock_vcon_redi
     }
 
     # Call save
-    with patch('server.storage.dataverse.VconRedis', return_value=mock_instance):
+    with patch('storage.dataverse.VconRedis', return_value=mock_instance):
         save("test-uuid", test_options)
 
     # Verify entity was updated (PATCH request)
@@ -258,7 +258,7 @@ def test_save_existing_entity(mock_create_session, mock_requests, mock_vcon_redi
     assert "vcon_created_at" in patch_data
 
 
-@patch('server.storage.dataverse.create_dataverse_session')
+@patch('storage.dataverse.create_dataverse_session')
 def test_get_vcon(mock_create_session, mock_requests):
     """Test retrieving a vCon from Dataverse."""
     # Setup mocks
@@ -305,7 +305,7 @@ def test_get_vcon(mock_create_session, mock_requests):
     assert result is None
 
 
-@patch('server.storage.dataverse.create_dataverse_session')
+@patch('storage.dataverse.create_dataverse_session')
 def test_get_vcon_error_handling(mock_create_session, mock_requests):
     """Test error handling when retrieving a vCon."""
     # Setup mocks

common/storage/file/test_file_storage.py

@@ -17,7 +17,7 @@
 from pathlib import Path
 from unittest.mock import patch, MagicMock
 
-from server.storage.file import (
+from storage.file import (
     save,
     get,
     delete,
@@ -28,7 +28,7 @@
     _find_vcon_file,
     _cleanup_empty_dirs,
 )
-from server.vcon import Vcon
+from vcon import Vcon
 
 
 @pytest.fixture
@@ -50,7 +50,7 @@ def sample_vcon():
 @pytest.fixture
 def mock_vcon_redis(sample_vcon):
     """Mock VconRedis to return sample vCon."""
-    with patch("server.storage.file.VconRedis") as MockVconRedis:
+    with patch("storage.file.VconRedis") as MockVconRedis:
         mock_redis = MagicMock()
         mock_redis.get_vcon.return_value = sample_vcon
         MockVconRedis.return_value = mock_redis

common/storage/milvus/test_milvus.py

@@ -1,9 +1,9 @@
 import pytest
 from unittest.mock import patch, MagicMock, mock_open
 
-from server.lib.vcon_redis import VconRedis
-from server.vcon import Vcon
-from server.storage.milvus import (
+from lib.vcon_redis import VconRedis
+from vcon import Vcon
+from storage.milvus import (
     save, 
     get,
     extract_text_from_vcon,
@@ -63,7 +63,7 @@ def sample_vcon():
 # Mock Redis
 @pytest.fixture
 def mock_vcon_redis(sample_vcon):
-    with patch('server.lib.vcon_redis.VconRedis') as MockVconRedis:
+    with patch('lib.vcon_redis.VconRedis') as MockVconRedis:
         mock_redis = MagicMock()
         mock_redis.get_vcon.return_value = sample_vcon
         MockVconRedis.return_value = mock_redis
@@ -72,9 +72,9 @@ def mock_vcon_redis(sample_vcon):
 # Mock Milvus connections and utility
 @pytest.fixture
 def mock_milvus():
-    with patch('server.storage.milvus.connections') as mock_connections, \
-         patch('server.storage.milvus.utility') as mock_utility, \
-         patch('server.storage.milvus.Collection') as mock_collection_class:
+    with patch('storage.milvus.connections') as mock_connections, \
+         patch('storage.milvus.utility') as mock_utility, \
+         patch('storage.milvus.Collection') as mock_collection_class:
 
         # Setup utility mocks
         mock_utility.has_collection.return_value = True
@@ -103,7 +103,7 @@ def mock_openai():
     mock_response.data = [mock_data]
     mock_client.embeddings.create.return_value = mock_response
 
-    with patch('server.storage.milvus.get_openai_client', return_value=mock_client):
+    with patch('storage.milvus.get_openai_client', return_value=mock_client):
         yield mock_client
 
 def test_extract_text_from_vcon(sample_vcon):
@@ -171,9 +171,9 @@ def test_check_vcon_exists(mock_milvus):
     mock_milvus['collection'].query.return_value = [{"vcon_uuid": "test-uuid"}]
     assert check_vcon_exists(mock_milvus['collection'], "test-uuid") is True
 
-@patch('server.storage.milvus.extract_text_from_vcon')
-@patch('server.storage.milvus.extract_party_id')
-@patch('server.storage.milvus.get_embedding')
+@patch('storage.milvus.extract_text_from_vcon')
+@patch('storage.milvus.extract_party_id')
+@patch('storage.milvus.get_embedding')
 def test_save(mock_get_embedding, mock_extract_party_id, mock_extract_text,
               mock_milvus, mock_openai, mock_vcon_redis, sample_vcon):
     """Test saving a vCon to Milvus."""
@@ -187,7 +187,7 @@ def test_save(mock_get_embedding, mock_extract_party_id, mock_extract_text,
     mock_instance.get_vcon.return_value = sample_vcon
 
     # Also patch VconRedis to ensure our mock is used
-    with patch('server.storage.milvus.VconRedis', return_value=mock_instance):
+    with patch('storage.milvus.VconRedis', return_value=mock_instance):
         # Test options
         test_options = {
             "host": "localhost",
@@ -215,7 +215,7 @@ def test_save(mock_get_embedding, mock_extract_party_id, mock_extract_text,
         assert insert_args[0]["text"] == "Extracted text content"
         assert len(insert_args[0]["embedding"]) == 1536
 
-@patch('server.storage.milvus.ensure_milvus_connection')
+@patch('storage.milvus.ensure_milvus_connection')
 def test_get_vcon_from_milvus(mock_ensure_connection, mock_milvus):
     """Test retrieving a vCon from Milvus."""
     # Setup mocks

conserver/links/analyze/tests/test_analyze.py

@@ -12,14 +12,14 @@
 import os
 import pytest
 from unittest.mock import Mock, patch
-from server.links.analyze import (
+from links.analyze import (
     generate_analysis,
     run,
     default_options,
     navigate_dict,
     get_analysis_for_type,
 )
-from server.vcon import Vcon
+from vcon import Vcon
 from dotenv import load_dotenv
 
 # Load environment variables from .env file for API keys, etc.
@@ -35,7 +35,7 @@
 @pytest.fixture
 def mock_vcon_redis():
     """Mock the VconRedis class"""
-    with patch('server.links.analyze.VconRedis', autospec=True) as mock:
+    with patch('links.analyze.VconRedis', autospec=True) as mock:
         yield mock
 
 
@@ -140,7 +140,7 @@ def test_get_analysis_for_type_not_found(self):
 class TestGenerateAnalysis:
     """Test the generate_analysis function"""
 
-    @patch('server.links.analyze.send_ai_usage_data_for_tracking')
+    @patch('links.analyze.send_ai_usage_data_for_tracking')
     def test_generate_analysis_basic(self, mock_send_usage):
         """Test basic analysis generation with mocked client"""
         # Setup mock client (injected into generate_analysis)
@@ -170,7 +170,7 @@ def test_generate_analysis_basic(self, mock_send_usage):
         assert result == "This is a test analysis."
         mock_client.chat.completions.create.assert_called_once()
 
-    @patch('server.links.analyze.send_ai_usage_data_for_tracking')
+    @patch('links.analyze.send_ai_usage_data_for_tracking')
     def test_generate_analysis_with_custom_system_prompt(self, mock_send_usage):
         """Test analysis generation with custom system prompt"""
         # Setup mock client (injected into generate_analysis)
@@ -209,7 +209,7 @@ def test_generate_analysis_with_custom_system_prompt(self, mock_send_usage):
         assert messages[1]['role'] == 'user'
         assert 'Analyze this financial data' in messages[1]['content']
 
-    @patch('server.links.analyze.send_ai_usage_data_for_tracking')
+    @patch('links.analyze.send_ai_usage_data_for_tracking')
     def test_generate_analysis_with_empty_prompt(self, mock_send_usage):
         """Test analysis generation with empty prompt"""
         # Setup mock client (injected into generate_analysis)
@@ -243,7 +243,7 @@ def test_generate_analysis_with_empty_prompt(self, mock_send_usage):
         messages = call_args[1]['messages']
         assert messages[1]['content'] == "\n\nTest transcript"
 
-    @patch('server.links.analyze.send_ai_usage_data_for_tracking')
+    @patch('links.analyze.send_ai_usage_data_for_tracking')
     def test_generate_analysis_with_default_system_prompt(self, mock_send_usage):
         """Test analysis generation uses default system prompt when not provided"""
         # Setup mock client (injected into generate_analysis)
@@ -303,10 +303,10 @@ def test_default_options_values(self):
 class TestRunFunction:
     """Test the main run function"""
 
-    @patch('server.links.analyze.get_openai_client')
-    @patch('server.links.analyze.generate_analysis')
-    @patch('server.links.analyze.is_included', return_value=True)
-    @patch('server.links.analyze.randomly_execute_with_sampling', return_value=True)
+    @patch('links.analyze.get_openai_client')
+    @patch('links.analyze.generate_analysis')
+    @patch('links.analyze.is_included', return_value=True)
+    @patch('links.analyze.randomly_execute_with_sampling', return_value=True)
     def test_run_basic(self, mock_sampling, mock_is_included, mock_generate_analysis, mock_get_client, mock_redis_with_vcon, sample_vcon):
         """Test the basic run functionality with mocked analysis generation"""
         mock_get_client.return_value = Mock()
@@ -334,10 +334,10 @@ def test_run_basic(self, mock_sampling, mock_is_included, mock_generate_analysis
         # Check the vCon has an analysis
         sample_vcon.add_analysis.assert_called_once()
 
-    @patch('server.links.analyze.get_openai_client')
-    @patch('server.links.analyze.generate_analysis')
-    @patch('server.links.analyze.is_included', return_value=True)
-    @patch('server.links.analyze.randomly_execute_with_sampling', return_value=True)
+    @patch('links.analyze.get_openai_client')
+    @patch('links.analyze.generate_analysis')
+    @patch('links.analyze.is_included', return_value=True)
+    @patch('links.analyze.randomly_execute_with_sampling', return_value=True)
     def test_run_with_custom_system_prompt(
         self, mock_sampling, mock_is_included, mock_generate_analysis, mock_get_client, 
         mock_redis_with_vcon, sample_vcon
@@ -369,8 +369,8 @@ def test_run_with_custom_system_prompt(
         assert call_args[1]['opts']['system_prompt'] == "You are a specialized customer service analyst."
         assert call_args[1]['opts']['prompt'] == "Analyze this customer interaction."
 
-    @patch('server.links.analyze.get_openai_client')
-    @patch('server.links.analyze.is_included', return_value=False)
+    @patch('links.analyze.get_openai_client')
+    @patch('links.analyze.is_included', return_value=False)
     def test_run_skipped_due_to_filters(self, mock_is_included, mock_get_client, mock_redis_with_vcon):
         """Test that run is skipped when filters exclude the vCon"""
         mock_get_client.return_value = Mock()
@@ -386,9 +386,9 @@ def test_run_skipped_due_to_filters(self, mock_is_included, mock_get_client, moc
         # Should have called get_vcon but then skipped due to filters
         mock_redis_with_vcon.get_vcon.assert_called_once_with("test-uuid")
 
-    @patch('server.links.analyze.get_openai_client')
-    @patch('server.links.analyze.is_included', return_value=True)
-    @patch('server.links.analyze.randomly_execute_with_sampling', return_value=False)
+    @patch('links.analyze.get_openai_client')
+    @patch('links.analyze.is_included', return_value=True)
+    @patch('links.analyze.randomly_execute_with_sampling', return_value=False)
     def test_run_skipped_due_to_sampling(self, mock_sampling, mock_is_included, mock_get_client, mock_redis_with_vcon):
         """Test that run is skipped when sampling excludes the vCon"""
         mock_get_client.return_value = Mock()
@@ -404,10 +404,10 @@ def test_run_skipped_due_to_sampling(self, mock_sampling, mock_is_included, mock
         # Should have called get_vcon but then skipped due to sampling
         mock_redis_with_vcon.get_vcon.assert_called_once_with("test-uuid")
 
-    @patch('server.links.analyze.get_openai_client')
-    @patch('server.links.analyze.generate_analysis')
-    @patch('server.links.analyze.is_included', return_value=True)
-    @patch('server.links.analyze.randomly_execute_with_sampling', return_value=True)
+    @patch('links.analyze.get_openai_client')
+    @patch('links.analyze.generate_analysis')
+    @patch('links.analyze.is_included', return_value=True)
+    @patch('links.analyze.randomly_execute_with_sampling', return_value=True)
     def test_run_with_azure_openai(
         self, mock_sampling, mock_is_included, mock_generate_analysis, mock_get_client,
         mock_redis_with_vcon, sample_vcon
@@ -439,10 +439,10 @@ def test_run_missing_credentials(self, mock_redis_with_vcon):
         with pytest.raises(ValueError, match="LITELLM_PROXY_URL|OPENAI_API_KEY|AZURE_OPENAI"):
             run("test-uuid", "analyze", {})
 
-    @patch('server.links.analyze.get_openai_client')
-    @patch('server.links.analyze.generate_analysis')
-    @patch('server.links.analyze.is_included', return_value=True)
-    @patch('server.links.analyze.randomly_execute_with_sampling', return_value=True)
+    @patch('links.analyze.get_openai_client')
+    @patch('links.analyze.generate_analysis')
+    @patch('links.analyze.is_included', return_value=True)
+    @patch('links.analyze.randomly_execute_with_sampling', return_value=True)
     def test_run_already_has_analysis(
         self, mock_sampling, mock_is_included, mock_generate_analysis, mock_get_client,
         mock_redis_with_vcon, sample_vcon
@@ -467,10 +467,10 @@ def test_run_already_has_analysis(
         assert result == "test-uuid"
         mock_generate_analysis.assert_not_called()
 
-    @patch('server.links.analyze.get_openai_client')
-    @patch('server.links.analyze.generate_analysis')
-    @patch('server.links.analyze.is_included', return_value=True)
-    @patch('server.links.analyze.randomly_execute_with_sampling', return_value=True)
+    @patch('links.analyze.get_openai_client')
+    @patch('links.analyze.generate_analysis')
+    @patch('links.analyze.is_included', return_value=True)
+    @patch('links.analyze.randomly_execute_with_sampling', return_value=True)
     def test_run_analysis_failure(
         self, mock_sampling, mock_is_included, mock_generate_analysis, mock_get_client,
         mock_redis_with_vcon, sample_vcon