mirror of
https://github.com/dnlbauer/cordra-mcp.git
synced 2026-09-10 21:55:30 +00:00
fix: linter and unit tests
This commit is contained in:
@@ -8,7 +8,6 @@ from mcp_cordra.client import (
|
||||
CordraClient,
|
||||
CordraClientError,
|
||||
CordraNotFoundError,
|
||||
CordraAuthenticationError,
|
||||
DigitalObject,
|
||||
)
|
||||
from mcp_cordra.config import CordraConfig
|
||||
@@ -47,7 +46,7 @@ def mock_cordra_object():
|
||||
"mediaType": "text/plain"
|
||||
},
|
||||
{
|
||||
"name": "file2.pdf",
|
||||
"name": "file2.pdf",
|
||||
"filename": "file2.pdf",
|
||||
"size": 2048,
|
||||
"mediaType": "application/pdf"
|
||||
@@ -175,14 +174,14 @@ class TestCordraClient:
|
||||
mock_response.status_code = 200
|
||||
mock_response.json.return_value = mock_response_data
|
||||
mock_response.raise_for_status.return_value = None
|
||||
|
||||
|
||||
result = await client.find("type:Schema")
|
||||
|
||||
|
||||
assert len(result) == 3
|
||||
assert result[0]["name"] == "User"
|
||||
assert result[1]["name"] == "Project"
|
||||
assert result[2]["name"] == "Document"
|
||||
|
||||
|
||||
mock_get.assert_called_once_with(
|
||||
"https://test.example.com/search",
|
||||
params={"query": "type:Schema"},
|
||||
@@ -197,9 +196,9 @@ class TestCordraClient:
|
||||
mock_response.status_code = 200
|
||||
mock_response.json.return_value = mock_response_data
|
||||
mock_response.raise_for_status.return_value = None
|
||||
|
||||
|
||||
result = await client.find("type:NonExistent")
|
||||
|
||||
|
||||
assert result == []
|
||||
mock_get.assert_called_once_with(
|
||||
"https://test.example.com/search",
|
||||
@@ -215,9 +214,9 @@ class TestCordraClient:
|
||||
mock_response.status_code = 200
|
||||
mock_response.json.return_value = mock_response_data
|
||||
mock_response.raise_for_status.return_value = None
|
||||
|
||||
|
||||
result = await client.find("type:Schema")
|
||||
|
||||
|
||||
assert result == []
|
||||
|
||||
@patch('mcp_cordra.client.requests.Session.get')
|
||||
@@ -225,10 +224,10 @@ class TestCordraClient:
|
||||
"""Test find error handling."""
|
||||
from requests import RequestException
|
||||
mock_get.side_effect = RequestException("Search failed")
|
||||
|
||||
|
||||
with pytest.raises(CordraClientError) as exc_info:
|
||||
await client.find("invalid:query")
|
||||
|
||||
|
||||
assert "Failed to search with query 'invalid:query'" in str(exc_info.value)
|
||||
assert "Search failed" in str(exc_info.value)
|
||||
|
||||
|
||||
@@ -40,9 +40,9 @@ class TestGetCordraObject:
|
||||
async def test_get_object_success(self, mock_client, sample_digital_object):
|
||||
"""Test successful object retrieval."""
|
||||
mock_client.get_object = AsyncMock(return_value=sample_digital_object)
|
||||
|
||||
|
||||
result = await get_cordra_object("people", "john-doe-123")
|
||||
|
||||
|
||||
# Verify the result is valid JSON
|
||||
parsed_result = json.loads(result)
|
||||
assert parsed_result["id"] == "people/john-doe-123"
|
||||
@@ -52,7 +52,7 @@ class TestGetCordraObject:
|
||||
assert parsed_result["metadata"]["created"] == "2023-01-01"
|
||||
assert len(parsed_result["payloads"]) == 1
|
||||
assert parsed_result["payloads"][0]["name"] == "profile_photo"
|
||||
|
||||
|
||||
# Verify the client was called with the correct object ID
|
||||
mock_client.get_object.assert_called_once_with("people/john-doe-123")
|
||||
|
||||
@@ -62,10 +62,10 @@ class TestGetCordraObject:
|
||||
mock_client.get_object = AsyncMock(
|
||||
side_effect=CordraNotFoundError("Object not found: people/nonexistent")
|
||||
)
|
||||
|
||||
|
||||
with pytest.raises(RuntimeError) as exc_info:
|
||||
await get_cordra_object("people", "nonexistent")
|
||||
|
||||
|
||||
assert "Object not found: people/nonexistent" in str(exc_info.value)
|
||||
mock_client.get_object.assert_called_once_with("people/nonexistent")
|
||||
|
||||
@@ -75,10 +75,10 @@ class TestGetCordraObject:
|
||||
mock_client.get_object = AsyncMock(
|
||||
side_effect=CordraClientError("Connection failed")
|
||||
)
|
||||
|
||||
|
||||
with pytest.raises(RuntimeError) as exc_info:
|
||||
await get_cordra_object("people", "john-doe-123")
|
||||
|
||||
|
||||
assert "Failed to retrieve object people/john-doe-123" in str(exc_info.value)
|
||||
assert "Connection failed" in str(exc_info.value)
|
||||
mock_client.get_object.assert_called_once_with("people/john-doe-123")
|
||||
@@ -87,14 +87,14 @@ class TestGetCordraObject:
|
||||
async def test_object_id_construction(self, mock_client, sample_digital_object):
|
||||
"""Test that object ID is correctly constructed from prefix and suffix."""
|
||||
mock_client.get_object = AsyncMock(return_value=sample_digital_object)
|
||||
|
||||
|
||||
# Test various prefix/suffix combinations
|
||||
test_cases = [
|
||||
("people", "john-doe-123", "people/john-doe-123"),
|
||||
("documents", "report-2023", "documents/report-2023"),
|
||||
("items", "item_with_underscores", "items/item_with_underscores"),
|
||||
]
|
||||
|
||||
|
||||
for prefix, suffix, expected_id in test_cases:
|
||||
await get_cordra_object(prefix, suffix)
|
||||
mock_client.get_object.assert_called_with(expected_id)
|
||||
@@ -103,16 +103,16 @@ class TestGetCordraObject:
|
||||
async def test_json_formatting(self, mock_client, sample_digital_object):
|
||||
"""Test that the returned JSON is properly formatted."""
|
||||
mock_client.get_object = AsyncMock(return_value=sample_digital_object)
|
||||
|
||||
|
||||
result = await get_cordra_object("people", "john-doe-123")
|
||||
|
||||
|
||||
# Verify it's valid JSON with proper indentation
|
||||
parsed_result = json.loads(result)
|
||||
assert isinstance(parsed_result, dict)
|
||||
|
||||
|
||||
# Check that the result contains indentation (pretty-printed)
|
||||
assert " " in result # Should have 2-space indentation
|
||||
|
||||
|
||||
# Verify all expected fields are present
|
||||
assert "id" in parsed_result
|
||||
assert "type" in parsed_result
|
||||
@@ -133,10 +133,10 @@ class TestGetCordraObject:
|
||||
payloads=None
|
||||
)
|
||||
mock_client.get_object = AsyncMock(return_value=minimal_object)
|
||||
|
||||
|
||||
result = await get_cordra_object("test", "minimal")
|
||||
parsed_result = json.loads(result)
|
||||
|
||||
|
||||
assert parsed_result["id"] == "test/minimal"
|
||||
assert parsed_result["type"] == ""
|
||||
assert parsed_result["content"]["id"] == "test/minimal"
|
||||
@@ -145,103 +145,88 @@ class TestGetCordraObject:
|
||||
assert parsed_result["payloads"] is None
|
||||
|
||||
|
||||
class TestListCordraSchemas:
|
||||
"""Test the list_cordra_schemas resource handler."""
|
||||
class TestSchemaResourceFunctions:
|
||||
"""Test the schema resource functions."""
|
||||
|
||||
@patch('mcp_cordra.server.cordra_client')
|
||||
async def test_list_schemas_success(self, mock_client):
|
||||
"""Test successful schema listing."""
|
||||
mock_schemas = [
|
||||
{"content": {"name": "User"}, "identifier": "test/user-schema"},
|
||||
{"content": {"name": "Project"}, "identifier": "test/project-schema"},
|
||||
{"content": {"name": "Document"}, "identifier": "test/doc-schema"},
|
||||
{"content": {"name": "CaptureEvent"}, "identifier": "test/capture-schema"}
|
||||
]
|
||||
mock_client.find = AsyncMock(return_value=mock_schemas)
|
||||
|
||||
from mcp_cordra.server import list_cordra_schemas
|
||||
result = await list_cordra_schemas()
|
||||
|
||||
async def test_create_schema_resource_success(self, mock_client):
|
||||
"""Test successful schema resource creation."""
|
||||
mock_schema = DigitalObject(
|
||||
id="test/user-schema",
|
||||
type="Schema",
|
||||
content={"name": "User", "type": "object", "properties": {}}
|
||||
)
|
||||
mock_client.get_schema = AsyncMock(return_value=mock_schema)
|
||||
|
||||
from mcp_cordra.server import create_schema_resource
|
||||
result = await create_schema_resource("User")
|
||||
|
||||
# Verify the result is valid JSON
|
||||
parsed_result = json.loads(result)
|
||||
assert "schemas" in parsed_result
|
||||
assert "count" in parsed_result
|
||||
assert parsed_result["count"] == 4
|
||||
assert "User" in parsed_result["schemas"]
|
||||
assert "Project" in parsed_result["schemas"]
|
||||
assert "Document" in parsed_result["schemas"]
|
||||
assert "CaptureEvent" in parsed_result["schemas"]
|
||||
|
||||
assert parsed_result["id"] == "test/user-schema"
|
||||
assert parsed_result["type"] == "Schema"
|
||||
assert parsed_result["content"]["name"] == "User"
|
||||
|
||||
# Verify the client was called with correct schema name
|
||||
mock_client.get_schema.assert_called_once_with("User")
|
||||
|
||||
@patch('mcp_cordra.server.cordra_client')
|
||||
async def test_create_schema_resource_not_found(self, mock_client):
|
||||
"""Test schema resource creation with schema not found."""
|
||||
mock_client.get_schema = AsyncMock(side_effect=CordraNotFoundError("Schema not found"))
|
||||
|
||||
from mcp_cordra.server import create_schema_resource
|
||||
with pytest.raises(RuntimeError) as exc_info:
|
||||
await create_schema_resource("NonExistent")
|
||||
|
||||
assert "Schema not found: NonExistent" in str(exc_info.value)
|
||||
mock_client.get_schema.assert_called_once_with("NonExistent")
|
||||
|
||||
@patch('mcp_cordra.server.cordra_client')
|
||||
async def test_register_schema_resources_success(self, mock_client):
|
||||
"""Test successful schema resource registration."""
|
||||
mock_schemas = [
|
||||
{"content": {"name": "User"}, "id": "test/user-schema"},
|
||||
{"content": {"name": "Project"}, "id": "test/project-schema"},
|
||||
{"content": {"name": "Document"}, "id": "test/doc-schema"}
|
||||
]
|
||||
mock_client.find = AsyncMock(return_value=mock_schemas)
|
||||
|
||||
# Mock the mcp.add_resource method
|
||||
with patch('mcp_cordra.server.mcp') as mock_mcp:
|
||||
from mcp_cordra.server import register_schema_resources
|
||||
await register_schema_resources()
|
||||
|
||||
# Verify the client was called with correct query
|
||||
mock_client.find.assert_called_once_with("type:Schema")
|
||||
|
||||
# Verify add_resource was called for each schema
|
||||
assert mock_mcp.add_resource.call_count == 3
|
||||
|
||||
@patch('mcp_cordra.server.cordra_client')
|
||||
async def test_list_schemas_empty(self, mock_client):
|
||||
"""Test schema listing with no results."""
|
||||
mock_client.find = AsyncMock(return_value=[])
|
||||
|
||||
from mcp_cordra.server import list_cordra_schemas
|
||||
result = await list_cordra_schemas()
|
||||
|
||||
parsed_result = json.loads(result)
|
||||
assert parsed_result["schemas"] == []
|
||||
assert parsed_result["count"] == 0
|
||||
|
||||
mock_client.find.assert_called_once_with("type:Schema")
|
||||
|
||||
@patch('mcp_cordra.server.cordra_client')
|
||||
async def test_list_schemas_missing_name_field(self, mock_client):
|
||||
"""Test schema listing with objects missing name field."""
|
||||
async def test_register_schema_resources_missing_name(self, mock_client):
|
||||
"""Test schema resource registration with objects missing name field."""
|
||||
mock_schemas = [
|
||||
{"content": {"name": "User"}, "identifier": "test/user-schema"},
|
||||
{"content": {}, "identifier": "test/no-name-schema"}, # Missing name field
|
||||
{"content": {"name": "Project"}, "identifier": "test/project-schema"},
|
||||
{"content": {"other": "field"}} # No name or identifier
|
||||
{"content": {"name": "User"}, "id": "test/user-schema"},
|
||||
{"content": {}, "id": "test/no-name-schema"}, # Missing name field
|
||||
{"content": {"name": "Project"}, "id": "test/project-schema"}
|
||||
]
|
||||
mock_client.find = AsyncMock(return_value=mock_schemas)
|
||||
|
||||
from mcp_cordra.server import list_cordra_schemas
|
||||
result = await list_cordra_schemas()
|
||||
|
||||
parsed_result = json.loads(result)
|
||||
assert parsed_result["count"] == 2 # Only objects with name field
|
||||
assert "User" in parsed_result["schemas"]
|
||||
assert "Project" in parsed_result["schemas"]
|
||||
assert len(parsed_result["schemas"]) == 2
|
||||
|
||||
with patch('mcp_cordra.server.mcp') as mock_mcp:
|
||||
from mcp_cordra.server import register_schema_resources
|
||||
await register_schema_resources()
|
||||
|
||||
# Only 2 schemas should be registered (those with name field)
|
||||
assert mock_mcp.add_resource.call_count == 2
|
||||
|
||||
@patch('mcp_cordra.server.cordra_client')
|
||||
async def test_list_schemas_client_error(self, mock_client):
|
||||
"""Test schema listing with client error."""
|
||||
from mcp_cordra.client import CordraClientError
|
||||
async def test_register_schema_resources_client_error(self, mock_client):
|
||||
"""Test schema resource registration with client error."""
|
||||
mock_client.find = AsyncMock(side_effect=CordraClientError("Search failed"))
|
||||
|
||||
from mcp_cordra.server import list_cordra_schemas
|
||||
with pytest.raises(RuntimeError) as exc_info:
|
||||
await list_cordra_schemas()
|
||||
|
||||
assert "Failed to list schemas" in str(exc_info.value)
|
||||
assert "Search failed" in str(exc_info.value)
|
||||
|
||||
@patch('mcp_cordra.server.cordra_client')
|
||||
async def test_list_schemas_json_format(self, mock_client):
|
||||
"""Test that the returned JSON is properly formatted."""
|
||||
mock_schemas = [
|
||||
{"content": {"name": "TestSchema"}, "identifier": "test/schema"}
|
||||
]
|
||||
mock_client.find = AsyncMock(return_value=mock_schemas)
|
||||
|
||||
from mcp_cordra.server import list_cordra_schemas
|
||||
result = await list_cordra_schemas()
|
||||
|
||||
# Verify it's valid JSON with proper indentation
|
||||
parsed_result = json.loads(result)
|
||||
assert isinstance(parsed_result, dict)
|
||||
|
||||
# Check that the result contains indentation (pretty-printed)
|
||||
assert " " in result # Should have 2-space indentation
|
||||
|
||||
# Verify expected structure
|
||||
assert "schemas" in parsed_result
|
||||
assert "count" in parsed_result
|
||||
assert isinstance(parsed_result["schemas"], list)
|
||||
assert isinstance(parsed_result["count"], int)
|
||||
# Should not raise an exception, just log a warning
|
||||
from mcp_cordra.server import register_schema_resources
|
||||
await register_schema_resources() # Should complete without raising
|
||||
|
||||
mock_client.find.assert_called_once_with("type:Schema")
|
||||
|
||||
Reference in New Issue
Block a user