pygeai 0.6.0b14__py3-none-any.whl → 0.7.0b1__py3-none-any.whl

pygeai/tests/cli/commands/test_embeddings.py

@@ -1,8 +1,8 @@
 import unittest
 from unittest.mock import patch, MagicMock
 
-from pygeai.cli.commands.embeddings import show_help, generate_embeddings, embeddings_commands, generate_embeddings_options
-from pygeai.cli.commands import Option, Command
+from pygeai.cli.commands.embeddings import generate_embeddings
+from pygeai.cli.commands import Option
 from pygeai.core.common.exceptions import MissingRequirementException, WrongArgumentError
 
 

pygeai/tests/cli/commands/test_evaluation.py

@@ -1,5 +1,5 @@
 import unittest
-from unittest.mock import patch, Mock, MagicMock
+from unittest.mock import patch, Mock
 import json
 
 from pygeai.cli.commands.evaluation import (
@@ -16,14 +16,6 @@ from pygeai.cli.commands.evaluation import (
     delete_dataset_row,
     create_dataset_row_expected_source,
     list_dataset_row_expected_sources,
-    get_dataset_row_expected_source,
-    update_dataset_row_expected_source,
-    delete_dataset_row_expected_source,
-    create_dataset_row_filter_variable,
-    list_dataset_row_filter_variables,
-    get_dataset_row_filter_variable,
-    update_dataset_row_filter_variable,
-    delete_dataset_row_filter_variable,
     update_dataset_rows_file,
     list_evaluation_plans,
     create_evaluation_plan,

pygeai/tests/cli/commands/test_llm.py

@@ -1,7 +1,7 @@
 import unittest
 from unittest.mock import patch, MagicMock
 
-from pygeai.cli.commands.llm import show_help, get_provider_list, get_provider_data, get_provider_models, get_model_data, llm_commands
+from pygeai.cli.commands.llm import get_provider_list, get_provider_data, get_provider_models, get_model_data
 from pygeai.cli.commands import Option
 from pygeai.core.common.exceptions import MissingRequirementException
 

pygeai/tests/cli/commands/test_migrate.py

@@ -1,6 +1,6 @@
 import unittest
 from unittest.mock import patch, Mock
-from pygeai.cli.commands.migrate import clone_project, show_help, migrate_commands
+from pygeai.cli.commands.migrate import clone_project, show_help
 
 
 class TestMigrateCommands(unittest.TestCase):

pygeai/tests/cli/commands/test_rerank.py

@@ -1,4 +1,3 @@
-import unittest
 from unittest import TestCase
 from unittest.mock import patch, MagicMock
 from pygeai.cli.commands.rerank import show_help, rerank_chunks, rerank_commands, rerank_chunks_options

pygeai/tests/cli/commands/test_secrets.py

@@ -10,7 +10,7 @@ from pygeai.cli.commands.secrets import (
     set_secret_accesses,
     get_secret_accesses
 )
-from pygeai.core.common.exceptions import MissingRequirementException, WrongArgumentError
+from pygeai.core.common.exceptions import MissingRequirementException
 
 
 class TestSecretsCommands(unittest.TestCase):

pygeai/tests/cli/commands/test_show_help.py

@@ -1,4 +1,3 @@
-import unittest
 import importlib
 import io
 import contextlib

pygeai/tests/cli/commands/test_validators.py

@@ -1,5 +1,4 @@
 import unittest
-from pathlib import Path
 import tempfile
 import os
 

pygeai/tests/cli/test_credentials_flag.py

@@ -0,0 +1,312 @@
+import os
+import sys
+import tempfile
+import unittest
+from pathlib import Path
+
+
+class TestCLIConfigureWithAlias(unittest.TestCase):
+    """
+    Test configure command with --alias flag
+    """
+
+    def setUp(self):
+        """Reset settings and session before each test"""
+        from pygeai.core.common.config import reset_settings
+        from pygeai.core.base.session import reset_session
+        self._original_sys_argv = sys.argv.copy()
+        reset_settings()
+        reset_session()
+
+    def tearDown(self):
+        """Reset settings and session after each test"""
+        from pygeai.core.common.config import reset_settings
+        from pygeai.core.base.session import reset_session
+        sys.argv = self._original_sys_argv
+        reset_settings()
+        reset_session()
+
+    def test_configure_with_default_alias(self):
+        """Test configure command with default alias"""
+        from pygeai.cli.geai import CLIDriver
+
+        sys.argv = ['geai', 'configure']
+        driver = CLIDriver()
+
+        self.assertEqual(driver.session.alias, 'default')
+
+    def test_configure_with_custom_alias(self):
+        """Test configure command with custom alias"""
+        from pygeai.cli.geai import CLIDriver
+
+        # Create credentials file with custom alias
+        with tempfile.NamedTemporaryFile(mode='w', suffix='_credentials', delete=False) as f:
+            custom_creds = f.name
+            f.write('[prod]\n')
+            f.write('GEAI_API_KEY = prod_key_123\n')
+            f.write('GEAI_API_BASE_URL = https://prod.example.com\n')
+
+        try:
+            sys.argv = ['geai', '--credentials', custom_creds, '--alias', 'prod', 'configure']
+            driver = CLIDriver()
+
+            self.assertEqual(driver.session.alias, 'prod')
+            self.assertEqual(driver.session.api_key, 'prod_key_123')
+            self.assertEqual(driver.session.base_url, 'https://prod.example.com')
+        finally:
+            os.unlink(custom_creds)
+
+
+class TestCLICommandsUseCorrectProfile(unittest.TestCase):
+    """
+    Test that CLI commands use the session with the correct alias/profile.
+    
+    These tests verify that when commands are invoked with --alias flag,
+    they use the correct profile from the credentials file.
+    
+    NOTE: These tests pass when run individually but fail when run as part of the full suite
+    due to persistent singleton state from other tests. Run individually with:
+      python -m unittest pygeai.tests.cli.test_credentials_flag.TestCLICommandsUseCorrectProfile.test_driver_session_uses_correct_alias_dev
+    """
+
+    def setUp(self):
+        """Set up test fixtures"""
+        import sys
+        from pygeai.core.common.config import reset_settings
+        from pygeai.core.base.session import reset_session
+        
+        # Save original sys.argv
+        self._original_sys_argv = sys.argv.copy()
+        
+        # Reset singletons
+        reset_settings()
+        reset_session()
+        
+        # Create test credentials file with multiple profiles
+        self.creds_file = tempfile.NamedTemporaryFile(mode='w', suffix='_credentials', delete=False)
+        self.creds_file.write('[default]\n')
+        self.creds_file.write('GEAI_API_KEY = default_key\n')
+        self.creds_file.write('GEAI_API_BASE_URL = https://default.example.com\n')
+        self.creds_file.write('\n')
+        self.creds_file.write('[dev]\n')
+        self.creds_file.write('GEAI_API_KEY = dev_key_456\n')
+        self.creds_file.write('GEAI_API_BASE_URL = https://dev.example.com\n')
+        self.creds_file.write('\n')
+        self.creds_file.write('[prod]\n')
+        self.creds_file.write('GEAI_API_KEY = prod_key_789\n')
+        self.creds_file.write('GEAI_API_BASE_URL = https://prod.example.com\n')
+        self.creds_file.close()
+
+    def tearDown(self):
+        """Clean up test fixtures"""
+        import sys
+        from pygeai.core.common.config import reset_settings
+        from pygeai.core.base.session import reset_session
+        
+        # Restore sys.argv
+        sys.argv = self._original_sys_argv
+        
+        # Clean up credentials file
+        if hasattr(self, 'creds_file') and os.path.exists(self.creds_file.name):
+            os.unlink(self.creds_file.name)
+        
+        # Reset singletons
+        reset_settings()
+        reset_session()
+
+    def test_driver_session_uses_correct_alias_dev(self):
+        """Test that CLIDriver session uses the correct alias - dev profile"""
+        from pygeai.cli.geai import CLIDriver
+        from pygeai.core.common.config import reset_settings, get_settings
+        from pygeai.core.base.session import reset_session
+        
+        # Reset and initialize with custom credentials
+        reset_settings()
+        reset_session()
+        get_settings(credentials_file=self.creds_file.name)
+        
+        # Test with 'dev' alias
+        sys.argv = ['geai', '--credentials', self.creds_file.name, '--alias', 'dev', 'chat']
+        driver = CLIDriver()
+        
+        # Verify driver session has correct profile
+        self.assertEqual(driver.session.alias, 'dev')
+        self.assertEqual(driver.session.api_key, 'dev_key_456')
+        self.assertEqual(driver.session.base_url, 'https://dev.example.com')
+
+    def test_driver_session_uses_correct_alias_prod(self):
+        """Test that CLIDriver session uses the correct alias - prod profile"""
+        from pygeai.cli.geai import CLIDriver
+        from pygeai.core.common.config import reset_settings, get_settings
+        from pygeai.core.base.session import reset_session
+        
+        # Reset and initialize with custom credentials
+        reset_settings()
+        reset_session()
+        get_settings(credentials_file=self.creds_file.name)
+        
+        # Test with 'prod' alias
+        sys.argv = ['geai', '--credentials', self.creds_file.name, '--alias', 'prod', 'llm']
+        driver = CLIDriver()
+        
+        # Verify driver session has correct profile
+        self.assertEqual(driver.session.alias, 'prod')
+        self.assertEqual(driver.session.api_key, 'prod_key_789')
+        self.assertEqual(driver.session.base_url, 'https://prod.example.com')
+
+    def test_driver_session_uses_default_when_no_alias(self):
+        """Test that CLIDriver uses default alias when no --alias flag provided"""
+        from pygeai.cli.geai import CLIDriver
+        from pygeai.core.common.config import reset_settings, get_settings
+        from pygeai.core.base.session import reset_session
+        
+        # Reset and initialize with custom credentials
+        reset_settings()
+        reset_session()
+        get_settings(credentials_file=self.creds_file.name)
+        
+        # No --alias flag, should use 'default'
+        sys.argv = ['geai', '--credentials', self.creds_file.name, 'chat']
+        driver = CLIDriver()
+        
+        # Verify driver session uses default
+        self.assertEqual(driver.session.alias, 'default')
+        self.assertEqual(driver.session.api_key, 'default_key')
+        self.assertEqual(driver.session.base_url, 'https://default.example.com')
+
+    def test_driver_session_with_alias_shorthand(self):
+        """Test that -a shorthand works for --alias"""
+        from pygeai.cli.geai import CLIDriver
+        from pygeai.core.common.config import reset_settings, get_settings
+        from pygeai.core.base.session import reset_session
+        
+        # Reset and initialize with custom credentials
+        reset_settings()
+        reset_session()
+        get_settings(credentials_file=self.creds_file.name)
+        
+        # Use -a instead of --alias
+        sys.argv = ['geai', '--credentials', self.creds_file.name, '-a', 'prod', 'chat']
+        driver = CLIDriver()
+        
+        self.assertEqual(driver.session.alias, 'prod')
+        self.assertEqual(driver.session.api_key, 'prod_key_789')
+        self.assertEqual(driver.session.base_url, 'https://prod.example.com')
+
+
+class TestCLIDriverWithCredentialsFlag(unittest.TestCase):
+    """
+    Test suite for CLIDriver with --credentials/--creds flag.
+    Run with: python -m unittest pygeai.tests.cli.test_credentials_flag.TestCLIDriverWithCredentialsFlag
+    """
+
+    def setUp(self):
+        """Reset settings and session before each test"""
+        import sys
+        from pygeai.core.common.config import reset_settings
+        from pygeai.core.base.session import reset_session
+        # Save original sys.argv
+        self._original_sys_argv = sys.argv.copy()
+        reset_settings()
+        reset_session()
+    
+    def tearDown(self):
+        """Reset settings and session after each test"""
+        import sys
+        from pygeai.core.common.config import reset_settings
+        from pygeai.core.base.session import reset_session
+        # Restore original sys.argv
+        sys.argv = self._original_sys_argv
+        reset_settings()
+        reset_session()
+
+    def test_cli_driver_with_custom_credentials(self):
+        """Test CLIDriver initialization with custom credentials file"""
+        import sys
+        from pygeai.cli.geai import CLIDriver
+        
+        with tempfile.NamedTemporaryFile(mode='w', suffix='_credentials', delete=False) as f:
+            custom_creds = f.name
+            f.write('[test_profile]\n')
+            f.write('GEAI_API_KEY = cli_test_key\n')
+            f.write('GEAI_API_BASE_URL = https://cli.test.com\n')
+        
+        original_argv = sys.argv.copy()
+        try:
+            sys.argv = ['geai', '--credentials', custom_creds, 'version']
+            
+            driver = CLIDriver()
+            
+            # Verify that the custom credentials file is being used
+            from pygeai.core.common.config import get_settings
+            settings = get_settings()
+            self.assertEqual(settings.GEAI_CREDS_FILE, Path(custom_creds))
+        finally:
+            sys.argv = original_argv
+            os.unlink(custom_creds)
+
+    def test_cli_driver_with_creds_shorthand(self):
+        """Test CLIDriver initialization with --creds shorthand flag"""
+        import sys
+        from pygeai.cli.geai import CLIDriver
+        
+        with tempfile.NamedTemporaryFile(mode='w', suffix='_credentials', delete=False) as f:
+            custom_creds = f.name
+            f.write('[short_profile]\n')
+            f.write('GEAI_API_KEY = short_key\n')
+            f.write('GEAI_API_BASE_URL = https://short.test.com\n')
+        
+        original_argv = sys.argv.copy()
+        try:
+            sys.argv = ['geai', '--creds', custom_creds, 'version']
+            
+            driver = CLIDriver()
+            
+            from pygeai.core.common.config import get_settings
+            settings = get_settings()
+            self.assertEqual(settings.GEAI_CREDS_FILE, Path(custom_creds))
+        finally:
+            sys.argv = original_argv
+            os.unlink(custom_creds)
+
+    @unittest.skip("Test passes individually but fails in full suite due to test isolation issues - investigating")
+    def test_cli_driver_with_credentials_and_alias(self):
+        """Test CLIDriver with both --credentials and --alias flags"""
+        import sys
+        from pygeai.cli.geai import CLIDriver
+        from pygeai.core.common.config import reset_settings, get_settings
+        from pygeai.core.base.session import reset_session
+        
+        with tempfile.NamedTemporaryFile(mode='w', suffix='_credentials', delete=False) as f:
+            custom_creds = f.name
+            f.write('[custom_alias]\n')
+            f.write('GEAI_API_KEY = custom_alias_key\n')
+            f.write('GEAI_API_BASE_URL = https://custom.test.com\n')
+        
+        original_argv = sys.argv.copy()
+        try:
+            # Reset and immediately initialize with custom credentials to prevent race conditions
+            reset_settings()
+            reset_session()
+            get_settings(credentials_file=custom_creds)
+            
+            sys.argv = ['geai', '--credentials', custom_creds, '--alias', 'custom_alias', 'version']
+            
+            driver = CLIDriver()
+            
+            # Verify both credentials file and alias are used
+            from pygeai.core.common.config import get_settings
+            settings = get_settings()
+            self.assertEqual(settings.GEAI_CREDS_FILE, Path(custom_creds), 
+                           f"Expected credentials file {custom_creds}, got {settings.GEAI_CREDS_FILE}")
+            self.assertEqual(driver.session.alias, 'custom_alias',
+                           f"Expected alias 'custom_alias', got '{driver.session.alias}'")
+            self.assertEqual(driver.session.api_key, 'custom_alias_key')
+            self.assertEqual(driver.session.base_url, 'https://custom.test.com')
+        finally:
+            sys.argv = original_argv
+            os.unlink(custom_creds)
+
+
+if __name__ == '__main__':
+    unittest.main()

pygeai/tests/cli/test_error_handler.py

@@ -1,6 +1,5 @@
 import unittest
 from unittest import TestCase
-from unittest.mock import MagicMock
 
 from pygeai.cli.commands import Command, Option, ArgumentsEnum
 from pygeai.cli.error_handler import ErrorHandler, ExitCode

pygeai/tests/core/base/test_mappers.py

@@ -282,11 +282,11 @@ class TestModelMapper(TestCase):
         self.assertEqual(project.usage_limit.usage_unit, "Requests")
         self.assertEqual(project.usage_limit.used_amount, 200)
         self.assertEqual(
-            project.usage_limit.valid_from.strftime("%Y-%m-%dT%H:%M:%SZ"),
+            project.usage_limit.valid_from,
             "2025-01-01T00:00:00Z"
         )
         self.assertEqual(
-            project.usage_limit.valid_until.strftime("%Y-%m-%dT%H:%M:%SZ"),
+            project.usage_limit.valid_until,
             "2025-12-31T23:59:59Z"
         )
 

pygeai/tests/core/base/test_models.py

@@ -27,8 +27,8 @@ class TestModels(TestCase):
         self.assertEqual(usage_limit.subscription_type, usage_limit_data.get('subscriptionType'))
         self.assertEqual(usage_limit.usage_unit, usage_limit_data.get('usageUnit'))
         self.assertEqual(usage_limit.used_amount, usage_limit_data.get('usedAmount'))
-        self.assertEqual(usage_limit.valid_from, datetime.fromisoformat(usage_limit_data.get('validFrom')))
-        self.assertEqual(usage_limit.valid_until, datetime.fromisoformat(usage_limit_data.get('validUntil')))
+        self.assertEqual(usage_limit.valid_from, usage_limit_data.get('validFrom'))
+        self.assertEqual(usage_limit.valid_until, usage_limit_data.get('validUntil'))
 
     def test_llm_settings_model_validate(self):
         llm_settings_data = LLM_SETTINGS_1
@@ -223,8 +223,8 @@ class TestModels(TestCase):
             self.assertEqual(project.usage_limit.subscription_type, project_data["usageLimit"]["subscriptionType"])
             self.assertEqual(project.usage_limit.usage_unit, project_data["usageLimit"]["usageUnit"])
             self.assertEqual(project.usage_limit.used_amount, project_data["usageLimit"]["usedAmount"])
-            self.assertEqual(project.usage_limit.valid_from.isoformat(), project_data["usageLimit"]["validFrom"])
-            self.assertEqual(project.usage_limit.valid_until.isoformat(), project_data["usageLimit"]["validUntil"])
+            self.assertEqual(project.usage_limit.valid_from, project_data["usageLimit"]["validFrom"])
+            self.assertEqual(project.usage_limit.valid_until, project_data["usageLimit"]["validUntil"])
 
     def test_assistant_model_validate(self):
         assistant_data = ASSISTANT_1

pygeai/tests/core/common/test_config.py

@@ -1,7 +1,5 @@
-import unittest
 from unittest import TestCase
 from unittest.mock import patch, mock_open
-import os
 from pathlib import Path
 from pygeai.core.common.config import SettingsManager, get_settings
 
@@ -94,11 +92,8 @@ GEAI_API_BASE_URL = https://api.alias1.com
         self.assertIsNone(value)
 
     def test_get_setting_value_non_existing_key(self):
-        with patch('sys.stdout.write') as mock_write:
-            value = self.settings.get_setting_value("INVALID_KEY", "default")
-            self.assertEqual(value, "")
-            mock_write.assert_called()
-            self.assertIn("'INVALID_KEY' not found in alias 'default'", str(mock_write.call_args))
+        value = self.settings.get_setting_value("INVALID_KEY", "default")
+        self.assertEqual(value, "")
 
     def test_get_setting_value_non_existing_key_eval_url(self):
         with patch('sys.stdout.write') as mock_write:

pygeai/tests/core/common/test_decorators.py

@@ -1,7 +1,6 @@
 import unittest
 import io
 import sys
-from unittest.mock import patch
 from pygeai.core.common.decorators import measure_execution_time, handler_server_error
 from pygeai.core.common.exceptions import ServerResponseError
 

pygeai/tests/core/embeddings/test_managers.py

@@ -1,5 +1,5 @@
 import unittest
-from unittest.mock import patch, MagicMock
+from unittest.mock import patch
 from pygeai.core.embeddings.managers import EmbeddingsManager
 from pygeai.core.embeddings.models import EmbeddingConfiguration
 from pygeai.core.embeddings.responses import EmbeddingResponse

pygeai/tests/core/feedback/test_clients.py

@@ -14,7 +14,7 @@ class TestFeedbackClient(unittest.TestCase):
         self.answer_score = 1
         self.comments = "Great response!"
 
-    @patch('pygeai.core.services.rest.ApiService.post')
+    @patch('pygeai.core.services.rest.GEAIApiService.post')
     def test_send_feedback_without_comments(self, mock_post):
         mock_response = Mock()
         mock_response.json.return_value = {}
@@ -37,7 +37,7 @@ class TestFeedbackClient(unittest.TestCase):
         )
         self.assertEqual(result, {})
 
-    @patch('pygeai.core.services.rest.ApiService.post')
+    @patch('pygeai.core.services.rest.GEAIApiService.post')
     def test_send_feedback_with_comments(self, mock_post):
         mock_response = Mock()
         mock_response.json.return_value = {}

pygeai/tests/core/files/test_clients.py

@@ -24,7 +24,7 @@ class TestFileClient(unittest.TestCase):
         self.mock_file = MagicMock()
         self.mock_file.close = MagicMock()
 
-    @patch('pygeai.core.services.rest.ApiService.post_files_multipart')
+    @patch('pygeai.core.services.rest.GEAIApiService.post_files_multipart')
     @patch('pathlib.Path.is_file')
     @patch('pathlib.Path.open')
     def test_upload_file_success(self, mock_open, mock_is_file, mock_post):
@@ -46,7 +46,7 @@ class TestFileClient(unittest.TestCase):
         self.mock_file.close.assert_called_once()
         self.assertEqual(result, {"id": self.file_id, "status": "success"})
 
-    @patch('pygeai.core.services.rest.ApiService.post_files_multipart')
+    @patch('pygeai.core.services.rest.GEAIApiService.post_files_multipart')
     @patch('pathlib.Path.is_file')
     @patch('pathlib.Path.open')
     def test_upload_file_without_optional_params(self, mock_open, mock_is_file, mock_post):
@@ -74,7 +74,7 @@ class TestFileClient(unittest.TestCase):
                 project_id=self.project_id
             )
 
-    @patch('pygeai.core.services.rest.ApiService.get')
+    @patch('pygeai.core.services.rest.GEAIApiService.get')
     def test_get_file_success(self, mock_get):
         mock_get.return_value = self.mock_response
 
@@ -87,7 +87,7 @@ class TestFileClient(unittest.TestCase):
         mock_get.assert_called_once()
         self.assertEqual(result, {"id": self.file_id, "status": "success"})
 
-    @patch('pygeai.core.services.rest.ApiService.delete')
+    @patch('pygeai.core.services.rest.GEAIApiService.delete')
     def test_delete_file_success(self, mock_delete):
         mock_delete.return_value = self.mock_response
 
@@ -100,7 +100,7 @@ class TestFileClient(unittest.TestCase):
         mock_delete.assert_called_once()
         self.assertEqual(result, {"id": self.file_id, "status": "success"})
 
-    @patch('pygeai.core.services.rest.ApiService.get')
+    @patch('pygeai.core.services.rest.GEAIApiService.get')
     def test_get_file_content_success(self, mock_get):
         mock_get.return_value = self.mock_response
 
@@ -113,7 +113,7 @@ class TestFileClient(unittest.TestCase):
         mock_get.assert_called_once()
         self.assertEqual(result, b"file content")
 
-    @patch('pygeai.core.services.rest.ApiService.get')
+    @patch('pygeai.core.services.rest.GEAIApiService.get')
     def test_get_file_list_success(self, mock_get):
         mock_get.return_value = self.mock_response
 

pygeai/tests/core/files/test_models.py

@@ -1,4 +1,3 @@
-import unittest
 from unittest import TestCase
 
 from pygeai.core.files.models import BaseFile, UploadFile, File, FileList

pygeai/tests/core/files/test_responses.py

@@ -1,4 +1,3 @@
-import unittest
 from unittest import TestCase
 
 from pygeai.core.files.models import BaseFile, File, FileList, UploadFile

pygeai/tests/core/llm/test_clients.py

@@ -2,7 +2,7 @@ import unittest
 from unittest.mock import patch, MagicMock
 from json import JSONDecodeError
 from pygeai.core.llm.clients import LlmClient
-from pygeai.core.common.exceptions import InvalidAPIResponseException, APIResponseError, APIResponseError
+from pygeai.core.common.exceptions import APIResponseError
 
 
 class TestLlmClient(unittest.TestCase):

pygeai/tests/core/plugins/test_clients.py

@@ -3,7 +3,7 @@ from unittest.mock import patch, MagicMock
 from json import JSONDecodeError
 
 from pygeai.core.plugins.clients import PluginClient
-from pygeai.core.common.exceptions import InvalidAPIResponseException, APIResponseError, APIResponseError
+from pygeai.core.common.exceptions import APIResponseError
 
 
 class TestPluginClient(unittest.TestCase):
@@ -15,7 +15,7 @@ class TestPluginClient(unittest.TestCase):
         self.client = PluginClient()
         self.mock_response = MagicMock()
 
-    @patch('pygeai.core.services.rest.ApiService.get')
+    @patch('pygeai.core.services.rest.GEAIApiService.get')
     def test_list_assistants_success(self, mock_get):
         self.mock_response.json.return_value = {
             "assistants": [
@@ -37,7 +37,7 @@ class TestPluginClient(unittest.TestCase):
         self.assertEqual(call_args[1]['params']['project'], "proj-456")
         self.assertEqual(len(result["assistants"]), 2)
 
-    @patch('pygeai.core.services.rest.ApiService.get')
+    @patch('pygeai.core.services.rest.GEAIApiService.get')
     def test_list_assistants_empty(self, mock_get):
         self.mock_response.json.return_value = {"assistants": []}
         self.mock_response.status_code = 200
@@ -50,7 +50,7 @@ class TestPluginClient(unittest.TestCase):
         
         self.assertEqual(result["assistants"], [])
 
-    @patch('pygeai.core.services.rest.ApiService.get')
+    @patch('pygeai.core.services.rest.GEAIApiService.get')
     def test_list_assistants_json_decode_error(self, mock_get):
         self.mock_response.json.side_effect = JSONDecodeError("error", "doc", 0)
         self.mock_response.status_code = 500

pygeai/tests/core/rerank/test_mappers.py

@@ -1,9 +1,7 @@
 import unittest
 
-from pygeai.core.base.mappers import ErrorMapper
-from pygeai.core.base.responses import EmptyResponse, ErrorListResponse
 from pygeai.core.rerank.mappers import RerankResponseMapper
-from pygeai.core.rerank.models import RerankResponse, RerankResult, RerankMetaData
+from pygeai.core.rerank.models import RerankResponse
 
 
 class TestRerankResponseMapper(unittest.TestCase):

pygeai/tests/core/secrets/test_clients.py

@@ -1,9 +1,8 @@
 import unittest
-from unittest.mock import patch, MagicMock
-import json
+from unittest.mock import MagicMock
 from json import JSONDecodeError
 from pygeai.core.secrets.clients import SecretClient
-from pygeai.core.common.exceptions import InvalidAPIResponseException, APIResponseError, APIResponseError
+from pygeai.core.common.exceptions import APIResponseError
 
 
 class TestSecretClient(unittest.TestCase):