Fix API tests (#581)

* Fix RAG streaming CLIs

* Fixed, all tests pass

tests/unit/test_cli/test_config_commands.py

@@ -108,7 +108,8 @@ class TestListConfigItems:
             mock_list.assert_called_once_with(
                 url='http://custom.com',
                 config_type='prompt',
-                format_type='json'
+                format_type='json',
+                token=None
             )
 
     def test_list_main_uses_defaults(self):
@@ -126,7 +127,8 @@ class TestListConfigItems:
             mock_list.assert_called_once_with(
                 url='http://localhost:8088/',
                 config_type='prompt',
-                format_type='text'
+                format_type='text',
+                token=None
             )
 
 
@@ -193,7 +195,8 @@ class TestGetConfigItem:
                 url='http://custom.com',
                 config_type='prompt',
                 key='template-1',
-                format_type='json'
+                format_type='json',
+                token=None
             )
 
 
@@ -249,7 +252,8 @@ class TestPutConfigItem:
                 url='http://custom.com',
                 config_type='prompt',
                 key='new-template',
-                value='Custom prompt: {input}'
+                value='Custom prompt: {input}',
+                token=None
             )
 
     def test_put_main_with_stdin_arg(self):
@@ -273,7 +277,8 @@ class TestPutConfigItem:
                 url='http://localhost:8088/',
                 config_type='prompt',
                 key='stdin-template',
-                value=stdin_content
+                value=stdin_content,
+                token=None
             )
 
     def test_put_main_mutually_exclusive_args(self):
@@ -328,7 +333,8 @@ class TestDeleteConfigItem:
             mock_delete.assert_called_once_with(
                 url='http://custom.com',
                 config_type='prompt',
-                key='old-template'
+                key='old-template',
+                token=None
             )
 
 

tests/unit/test_cli/test_load_knowledge.py

@@ -2,17 +2,16 @@
 Unit tests for the load_knowledge CLI module.
 
 Tests the business logic of loading triples and entity contexts from Turtle files
-while mocking WebSocket connections and external dependencies.
+using the BulkClient API.
 """
 
 import pytest
-import json
 import tempfile
-import asyncio
-from unittest.mock import AsyncMock, Mock, patch, mock_open, MagicMock
+from unittest.mock import Mock, patch, MagicMock, call
 from pathlib import Path
 
 from trustgraph.cli.load_knowledge import KnowledgeLoader, main
+from trustgraph.api import Triple
 
 
 @pytest.fixture
@@ -38,159 +37,80 @@ def temp_turtle_file(sample_turtle_content):
         f.write(sample_turtle_content)
         f.flush()
         yield f.name
-    
+
     # Cleanup
     Path(f.name).unlink(missing_ok=True)
 
 
-@pytest.fixture
-def mock_websocket():
-    """Mock WebSocket connection."""
-    mock_ws = MagicMock()
-    
-    async def async_send(data):
-        return None
-    
-    async def async_recv():
-        return ""
-        
-    async def async_close():
-        return None
-    
-    mock_ws.send = Mock(side_effect=async_send)
-    mock_ws.recv = Mock(side_effect=async_recv) 
-    mock_ws.close = Mock(side_effect=async_close)
-    return mock_ws
-
-
 @pytest.fixture
 def knowledge_loader():
     """Create a KnowledgeLoader instance with test parameters."""
     return KnowledgeLoader(
         files=["test.ttl"],
         flow="test-flow",
-        user="test-user", 
+        user="test-user",
         collection="test-collection",
         document_id="test-doc-123",
-        url="ws://test.example.com/"
+        url="http://test.example.com/",
+        token=None
     )
 
 
 class TestKnowledgeLoader:
     """Test the KnowledgeLoader class business logic."""
 
-    def test_init_constructs_urls_correctly(self):
-        """Test that URLs are constructed properly."""
+    def test_init_stores_parameters_correctly(self):
+        """Test that initialization stores parameters correctly."""
         loader = KnowledgeLoader(
-            files=["test.ttl"],
+            files=["file1.ttl", "file2.ttl"],
             flow="my-flow",
             user="user1",
-            collection="col1", 
-            document_id="doc1",
-            url="ws://example.com/"
-        )
-        
-        assert loader.triples_url == "ws://example.com/api/v1/flow/my-flow/import/triples"
-        assert loader.entity_contexts_url == "ws://example.com/api/v1/flow/my-flow/import/entity-contexts"
-        assert loader.user == "user1"
-        assert loader.collection == "col1"
-        assert loader.document_id == "doc1"
-
-    def test_init_adds_trailing_slash(self):
-        """Test that trailing slash is added to URL if missing."""
-        loader = KnowledgeLoader(
-            files=["test.ttl"],
-            flow="my-flow", 
-            user="user1",
             collection="col1",
             document_id="doc1",
-            url="ws://example.com"  # No trailing slash
+            url="http://example.com/",
+            token="test-token"
         )
-        
-        assert loader.triples_url == "ws://example.com/api/v1/flow/my-flow/import/triples"
 
-    @pytest.mark.asyncio
-    async def test_load_triples_sends_correct_messages(self, temp_turtle_file, mock_websocket):
-        """Test that triple loading sends correctly formatted messages."""
-        loader = KnowledgeLoader(
-            files=[temp_turtle_file],
-            flow="test-flow",
-            user="test-user",
-            collection="test-collection", 
-            document_id="test-doc"
-        )
-        
-        await loader.load_triples(temp_turtle_file, mock_websocket)
-        
-        # Verify WebSocket send was called
-        assert mock_websocket.send.call_count > 0
-        
-        # Check message format for one of the calls
-        sent_messages = [json.loads(call.args[0]) for call in mock_websocket.send.call_args_list]
-        
-        # Verify message structure
-        sample_message = sent_messages[0]
-        assert "metadata" in sample_message
-        assert "triples" in sample_message
-        
-        metadata = sample_message["metadata"]
-        assert metadata["id"] == "test-doc"
-        assert metadata["user"] == "test-user"
-        assert metadata["collection"] == "test-collection"
-        assert isinstance(metadata["metadata"], list)
-        
-        triple = sample_message["triples"][0]
-        assert "s" in triple
-        assert "p" in triple
-        assert "o" in triple
-        
-        # Check Value structure
-        assert "v" in triple["s"]
-        assert "e" in triple["s"]
-        assert triple["s"]["e"] is True  # Subject should be URI
+        assert loader.files == ["file1.ttl", "file2.ttl"]
+        assert loader.flow == "my-flow"
+        assert loader.user == "user1"
+        assert loader.collection == "col1"
+        assert loader.document_id == "doc1"
+        assert loader.url == "http://example.com/"
+        assert loader.token == "test-token"
 
-    @pytest.mark.asyncio
-    async def test_load_entity_contexts_processes_literals_only(self, temp_turtle_file, mock_websocket):
+    def test_load_triples_from_file_yields_triples(self, temp_turtle_file, knowledge_loader):
+        """Test that load_triples_from_file yields Triple objects."""
+        triples = list(knowledge_loader.load_triples_from_file(temp_turtle_file))
+
+        # Should have triples for all statements in the file
+        assert len(triples) > 0
+
+        # Verify they are Triple objects
+        for triple in triples:
+            assert isinstance(triple, Triple)
+            assert hasattr(triple, 's')
+            assert hasattr(triple, 'p')
+            assert hasattr(triple, 'o')
+            assert isinstance(triple.s, str)
+            assert isinstance(triple.p, str)
+            assert isinstance(triple.o, str)
+
+    def test_load_entity_contexts_from_file_yields_literals_only(self, temp_turtle_file, knowledge_loader):
         """Test that entity contexts are created only for literals."""
-        loader = KnowledgeLoader(
-            files=[temp_turtle_file],
-            flow="test-flow",
-            user="test-user",
-            collection="test-collection",
-            document_id="test-doc"
-        )
-        
-        await loader.load_entity_contexts(temp_turtle_file, mock_websocket)
-        
-        # Get all sent messages
-        sent_messages = [json.loads(call.args[0]) for call in mock_websocket.send.call_args_list]
-        
-        # Verify we got entity context messages
-        assert len(sent_messages) > 0
-        
-        for message in sent_messages:
-            assert "metadata" in message
-            assert "entities" in message
-            
-            metadata = message["metadata"]
-            assert metadata["id"] == "test-doc"
-            assert metadata["user"] == "test-user"
-            assert metadata["collection"] == "test-collection"
-            
-            entity_context = message["entities"][0]
-            assert "entity" in entity_context
-            assert "context" in entity_context
-            
-            entity = entity_context["entity"]
-            assert "v" in entity
-            assert "e" in entity
-            assert entity["e"] is True  # Entity should be URI (subject)
-            
-            # Context should be a string (the literal value)
-            assert isinstance(entity_context["context"], str)
+        contexts = list(knowledge_loader.load_entity_contexts_from_file(temp_turtle_file))
 
-    @pytest.mark.asyncio 
-    async def test_load_entity_contexts_skips_uri_objects(self, mock_websocket):
+        # Should have contexts for literal objects (foaf:name, foaf:age, foaf:email)
+        assert len(contexts) > 0
+
+        # Verify format: (entity, context) tuples
+        for entity, context in contexts:
+            assert isinstance(entity, str)
+            assert isinstance(context, str)
+            # Entity should be a URI (subject)
+            assert entity.startswith("http://")
+
+    def test_load_entity_contexts_skips_uri_objects(self):
         """Test that URI objects don't generate entity contexts."""
         # Create turtle with only URI objects (no literals)
         turtle_content = """
@@ -198,242 +118,229 @@ class TestKnowledgeLoader:
 ex:john ex:knows ex:mary .
 ex:mary ex:knows ex:bob .
 """
-        
+
         with tempfile.NamedTemporaryFile(mode='w', suffix='.ttl', delete=False) as f:
             f.write(turtle_content)
             f.flush()
-            
+
             loader = KnowledgeLoader(
                 files=[f.name],
                 flow="test-flow",
-                user="test-user", 
+                user="test-user",
                 collection="test-collection",
-                document_id="test-doc"
+                document_id="test-doc",
+                url="http://test.example.com/"
             )
-            
-            await loader.load_entity_contexts(f.name, mock_websocket)
-            
-        Path(f.name).unlink(missing_ok=True)
-        
-        # Should not send any messages since there are no literals
-        mock_websocket.send.assert_not_called()
 
-    @pytest.mark.asyncio
-    @patch('trustgraph.cli.load_knowledge.connect')
-    async def test_run_calls_both_loaders(self, mock_connect, knowledge_loader, temp_turtle_file):
-        """Test that run() calls both triple and entity context loaders."""
-        knowledge_loader.files = [temp_turtle_file]
-        
-        # Create a simple mock websocket
-        mock_ws = MagicMock()
-        async def mock_send(data):
-            pass
-        mock_ws.send = mock_send
-        
-        # Create async context manager mock
-        async def mock_aenter(self):
-            return mock_ws
-            
-        async def mock_aexit(self, exc_type, exc_val, exc_tb):
-            return None
-            
-        mock_connection = MagicMock()
-        mock_connection.__aenter__ = mock_aenter
-        mock_connection.__aexit__ = mock_aexit
-        mock_connect.return_value = mock_connection
-        
-        # Create AsyncMock objects that can track calls properly
-        mock_load_triples = AsyncMock(return_value=None)
-        mock_load_contexts = AsyncMock(return_value=None)
-        
-        with patch.object(knowledge_loader, 'load_triples', mock_load_triples), \
-             patch.object(knowledge_loader, 'load_entity_contexts', mock_load_contexts):
-            
-            await knowledge_loader.run()
-            
-            # Verify both methods were called
-            mock_load_triples.assert_called_once_with(temp_turtle_file, mock_ws)
-            mock_load_contexts.assert_called_once_with(temp_turtle_file, mock_ws)
-            
-            # Verify WebSocket connections were made to both URLs
-            assert mock_connect.call_count == 2
+            contexts = list(loader.load_entity_contexts_from_file(f.name))
+
+        Path(f.name).unlink(missing_ok=True)
+
+        # Should have no contexts since there are no literals
+        assert len(contexts) == 0
+
+    @patch('trustgraph.cli.load_knowledge.Api')
+    def test_run_calls_bulk_api(self, mock_api_class, temp_turtle_file):
+        """Test that run() uses BulkClient API."""
+        # Setup mocks
+        mock_api = MagicMock()
+        mock_bulk = MagicMock()
+        mock_api_class.return_value = mock_api
+        mock_api.bulk.return_value = mock_bulk
+
+        loader = KnowledgeLoader(
+            files=[temp_turtle_file],
+            flow="test-flow",
+            user="test-user",
+            collection="test-collection",
+            document_id="test-doc",
+            url="http://test.example.com/",
+            token="test-token"
+        )
+
+        loader.run()
+
+        # Verify Api was created with correct parameters
+        mock_api_class.assert_called_once_with(
+            url="http://test.example.com/",
+            token="test-token"
+        )
+
+        # Verify bulk client was obtained
+        mock_api.bulk.assert_called_once()
+
+        # Verify import_triples was called
+        assert mock_bulk.import_triples.call_count == 1
+        call_args = mock_bulk.import_triples.call_args
+        assert call_args[1]['flow'] == "test-flow"
+        assert call_args[1]['metadata']['id'] == "test-doc"
+        assert call_args[1]['metadata']['user'] == "test-user"
+        assert call_args[1]['metadata']['collection'] == "test-collection"
+
+        # Verify import_entity_contexts was called
+        assert mock_bulk.import_entity_contexts.call_count == 1
+        call_args = mock_bulk.import_entity_contexts.call_args
+        assert call_args[1]['flow'] == "test-flow"
+        assert call_args[1]['metadata']['id'] == "test-doc"
 
 
 class TestCLIArgumentParsing:
     """Test CLI argument parsing and main function."""
 
     @patch('trustgraph.cli.load_knowledge.KnowledgeLoader')
-    @patch('trustgraph.cli.load_knowledge.asyncio.run')
-    def test_main_parses_args_correctly(self, mock_asyncio_run, mock_loader_class):
+    @patch('trustgraph.cli.load_knowledge.time.sleep')
+    def test_main_parses_args_correctly(self, mock_sleep, mock_loader_class):
         """Test that main() parses arguments correctly."""
         mock_loader_instance = MagicMock()
         mock_loader_class.return_value = mock_loader_instance
-        
+
         test_args = [
             'tg-load-knowledge',
             '-i', 'doc-123',
-            '-f', 'my-flow', 
+            '-f', 'my-flow',
             '-U', 'my-user',
             '-C', 'my-collection',
-            '-u', 'ws://custom.example.com/',
+            '-u', 'http://custom.example.com/',
+            '-t', 'my-token',
             'file1.ttl',
             'file2.ttl'
         ]
-        
+
         with patch('sys.argv', test_args):
             main()
-        
+
         # Verify KnowledgeLoader was instantiated with correct args
         mock_loader_class.assert_called_once_with(
             document_id='doc-123',
-            url='ws://custom.example.com/',
+            url='http://custom.example.com/',
+            token='my-token',
             flow='my-flow',
             files=['file1.ttl', 'file2.ttl'],
             user='my-user',
             collection='my-collection'
         )
-        
-        # Verify asyncio.run was called once
-        mock_asyncio_run.assert_called_once()
+
+        # Verify run was called
+        mock_loader_instance.run.assert_called_once()
 
     @patch('trustgraph.cli.load_knowledge.KnowledgeLoader')
-    @patch('trustgraph.cli.load_knowledge.asyncio.run')
-    def test_main_uses_defaults(self, mock_asyncio_run, mock_loader_class):
+    @patch('trustgraph.cli.load_knowledge.time.sleep')
+    def test_main_uses_defaults(self, mock_sleep, mock_loader_class):
         """Test that main() uses default values when not specified."""
         mock_loader_instance = MagicMock()
         mock_loader_class.return_value = mock_loader_instance
-        
+
         test_args = [
             'tg-load-knowledge',
             '-i', 'doc-123',
             'file1.ttl'
         ]
-        
+
         with patch('sys.argv', test_args):
             main()
-        
+
         # Verify defaults were used
         call_args = mock_loader_class.call_args[1]
         assert call_args['flow'] == 'default'
         assert call_args['user'] == 'trustgraph'
         assert call_args['collection'] == 'default'
-        assert call_args['url'] == 'ws://localhost:8088/'
+        assert call_args['url'] == 'http://localhost:8088/'
+        assert call_args['token'] is None
 
 
 class TestErrorHandling:
     """Test error handling scenarios."""
 
-    @pytest.mark.asyncio
-    async def test_load_triples_handles_invalid_turtle(self, mock_websocket):
+    def test_load_triples_handles_invalid_turtle(self, knowledge_loader):
         """Test handling of invalid Turtle content."""
         # Create file with invalid Turtle content
         with tempfile.NamedTemporaryFile(mode='w', suffix='.ttl', delete=False) as f:
             f.write("Invalid Turtle Content {{{")
             f.flush()
-            
-            loader = KnowledgeLoader(
-                files=[f.name],
-                flow="test-flow",
-                user="test-user",
-                collection="test-collection",
-                document_id="test-doc"
-            )
-            
+
             # Should raise an exception for invalid Turtle
             with pytest.raises(Exception):
-                await loader.load_triples(f.name, mock_websocket)
-                
+                list(knowledge_loader.load_triples_from_file(f.name))
+
         Path(f.name).unlink(missing_ok=True)
 
-    @pytest.mark.asyncio
-    async def test_load_entity_contexts_handles_invalid_turtle(self, mock_websocket):
+    def test_load_entity_contexts_handles_invalid_turtle(self, knowledge_loader):
         """Test handling of invalid Turtle content in entity contexts."""
         # Create file with invalid Turtle content
         with tempfile.NamedTemporaryFile(mode='w', suffix='.ttl', delete=False) as f:
             f.write("Invalid Turtle Content {{{")
             f.flush()
-            
-            loader = KnowledgeLoader(
-                files=[f.name],
-                flow="test-flow",
-                user="test-user", 
-                collection="test-collection",
-                document_id="test-doc"
-            )
-            
+
             # Should raise an exception for invalid Turtle
             with pytest.raises(Exception):
-                await loader.load_entity_contexts(f.name, mock_websocket)
-                
+                list(knowledge_loader.load_entity_contexts_from_file(f.name))
+
         Path(f.name).unlink(missing_ok=True)
 
-    @pytest.mark.asyncio
-    @patch('trustgraph.cli.load_knowledge.connect')
+    @patch('trustgraph.cli.load_knowledge.Api')
     @patch('builtins.print')  # Mock print to avoid output during tests
-    async def test_run_handles_connection_errors(self, mock_print, mock_connect, knowledge_loader, temp_turtle_file):
-        """Test handling of WebSocket connection errors."""
-        knowledge_loader.files = [temp_turtle_file]
-        
-        # Mock connection failure
-        mock_connect.side_effect = ConnectionError("Failed to connect")
-        
-        # Should not raise exception, just print error
-        await knowledge_loader.run()
+    def test_run_handles_api_errors(self, mock_print, mock_api_class, temp_turtle_file):
+        """Test handling of API errors."""
+        # Mock API to raise an error
+        mock_api_class.side_effect = Exception("API connection failed")
+
+        loader = KnowledgeLoader(
+            files=[temp_turtle_file],
+            flow="test-flow",
+            user="test-user",
+            collection="test-collection",
+            document_id="test-doc",
+            url="http://test.example.com/"
+        )
+
+        # Should raise the exception
+        with pytest.raises(Exception, match="API connection failed"):
+            loader.run()
 
     @patch('trustgraph.cli.load_knowledge.KnowledgeLoader')
-    @patch('trustgraph.cli.load_knowledge.asyncio.run')
     @patch('trustgraph.cli.load_knowledge.time.sleep')
     @patch('builtins.print')  # Mock print to avoid output during tests
-    def test_main_retries_on_exception(self, mock_print, mock_sleep, mock_asyncio_run, mock_loader_class):
+    def test_main_retries_on_exception(self, mock_print, mock_sleep, mock_loader_class):
         """Test that main() retries on exceptions."""
         mock_loader_instance = MagicMock()
         mock_loader_class.return_value = mock_loader_instance
-        
+
         # First call raises exception, second succeeds
-        mock_asyncio_run.side_effect = [Exception("Test error"), None]
-        
+        mock_loader_instance.run.side_effect = [Exception("Test error"), None]
+
         test_args = [
             'tg-load-knowledge',
-            '-i', 'doc-123', 
+            '-i', 'doc-123',
             'file1.ttl'
         ]
-        
+
         with patch('sys.argv', test_args):
             main()
-        
+
         # Should have been called twice (first failed, second succeeded)
-        assert mock_asyncio_run.call_count == 2
+        assert mock_loader_instance.run.call_count == 2
         mock_sleep.assert_called_once_with(10)
 
 
 class TestDataValidation:
     """Test data validation and edge cases."""
 
-    @pytest.mark.asyncio
-    async def test_empty_turtle_file(self, mock_websocket):
+    def test_empty_turtle_file(self, knowledge_loader):
         """Test handling of empty Turtle files."""
         with tempfile.NamedTemporaryFile(mode='w', suffix='.ttl', delete=False) as f:
             f.write("")  # Empty file
             f.flush()
-            
-            loader = KnowledgeLoader(
-                files=[f.name],
-                flow="test-flow",
-                user="test-user",
-                collection="test-collection",
-                document_id="test-doc"
-            )
-            
-            await loader.load_triples(f.name, mock_websocket)
-            await loader.load_entity_contexts(f.name, mock_websocket)
-            
-            # Should not send any messages for empty file
-            mock_websocket.send.assert_not_called()
-            
+
+            triples = list(knowledge_loader.load_triples_from_file(f.name))
+            contexts = list(knowledge_loader.load_entity_contexts_from_file(f.name))
+
+            # Should return empty lists for empty file
+            assert len(triples) == 0
+            assert len(contexts) == 0
+
         Path(f.name).unlink(missing_ok=True)
 
-    @pytest.mark.asyncio
-    async def test_turtle_with_mixed_literals_and_uris(self, mock_websocket):
+    def test_turtle_with_mixed_literals_and_uris(self, knowledge_loader):
         """Test handling of Turtle with mixed literal and URI objects."""
         turtle_content = """
 @prefix ex: <http://example.org/> .
@@ -443,37 +350,23 @@ ex:john ex:name "John Smith" ;
         ex:city "New York" .
 ex:mary ex:name "Mary Johnson" .
 """
-        
+
         with tempfile.NamedTemporaryFile(mode='w', suffix='.ttl', delete=False) as f:
             f.write(turtle_content)
             f.flush()
-            
-            loader = KnowledgeLoader(
-                files=[f.name],
-                flow="test-flow",
-                user="test-user",
-                collection="test-collection", 
-                document_id="test-doc"
-            )
-            
-            await loader.load_entity_contexts(f.name, mock_websocket)
-            
-            sent_messages = [json.loads(call.args[0]) for call in mock_websocket.send.call_args_list]
-            
+
+            contexts = list(knowledge_loader.load_entity_contexts_from_file(f.name))
+
             # Should have 4 entity contexts (for the 4 literals: "John Smith", "25", "New York", "Mary Johnson")
             # URI ex:mary should be skipped
-            assert len(sent_messages) == 4
-            
+            assert len(contexts) == 4
+
             # Verify all contexts are for literals (subjects should be URIs)
-            contexts = []
-            for message in sent_messages:
-                entity_context = message["entities"][0]
-                assert entity_context["entity"]["e"] is True  # Subject is URI
-                contexts.append(entity_context["context"])
-            
-            assert "John Smith" in contexts
-            assert "25" in contexts  
-            assert "New York" in contexts
-            assert "Mary Johnson" in contexts
-            
-        Path(f.name).unlink(missing_ok=True)
+            context_values = [context for entity, context in contexts]
+
+            assert "John Smith" in context_values
+            assert "25" in context_values
+            assert "New York" in context_values
+            assert "Mary Johnson" in context_values
+
+        Path(f.name).unlink(missing_ok=True)

tests/unit/test_cli/test_tool_commands.py

@@ -135,7 +135,8 @@ class TestSetToolStructuredQuery:
                 arguments=[],
                 group=None,
                 state=None,
-                applicable_states=None
+                applicable_states=None,
+                token=None
             )
 
     def test_set_main_structured_query_no_arguments_needed(self):
@@ -313,7 +314,7 @@ class TestShowToolsStructuredQuery:
             
             show_main()
             
-            mock_show.assert_called_once_with(url='http://custom.com')
+            mock_show.assert_called_once_with(url='http://custom.com', token=None)
 
 
 class TestStructuredQueryToolValidation: