Handle URL tests

Author: jlowin

tests/resources/test_file_resources.py

@@ -3,6 +3,7 @@
 import pytest
 from pathlib import Path
 from tempfile import NamedTemporaryFile
+from pydantic import FileUrl
 
 from fastmcp.resources import FileResource
 
@@ -30,7 +31,7 @@ class TestFileResource:
     def test_file_resource_creation(self, temp_file: Path):
         """Test creating a FileResource."""
         resource = FileResource(
-            uri=temp_file.as_uri(),
+            uri=FileUrl(temp_file.as_uri()),
             name="test",
             description="test file",
             path=temp_file,
@@ -45,17 +46,17 @@ def test_file_resource_creation(self, temp_file: Path):
     def test_file_resource_str_path_conversion(self, temp_file: Path):
         """Test FileResource handles string paths."""
         resource = FileResource(
-            uri=f"file://{temp_file}",
+            uri=FileUrl(f"file://{temp_file}"),
             name="test",
-            path=str(temp_file),
+            path=Path(str(temp_file)),
         )
         assert isinstance(resource.path, Path)
         assert resource.path.is_absolute()
 
     async def test_read_text_file(self, temp_file: Path):
         """Test reading a text file."""
         resource = FileResource(
-            uri=f"file://{temp_file}",
+            uri=FileUrl(f"file://{temp_file}"),
             name="test",
             path=temp_file,
         )
@@ -66,7 +67,7 @@ async def test_read_text_file(self, temp_file: Path):
     async def test_read_binary_file(self, temp_file: Path):
         """Test reading a file as binary."""
         resource = FileResource(
-            uri=f"file://{temp_file}",
+            uri=FileUrl(f"file://{temp_file}"),
             name="test",
             path=temp_file,
             is_binary=True,
@@ -79,7 +80,7 @@ def test_relative_path_error(self):
         """Test error on relative path."""
         with pytest.raises(ValueError, match="Path must be absolute"):
             FileResource(
-                uri="file:///test.txt",
+                uri=FileUrl("file:///test.txt"),
                 name="test",
                 path=Path("test.txt"),
             )
@@ -89,7 +90,7 @@ async def test_missing_file_error(self, temp_file: Path):
         # Create path to non-existent file
         missing = temp_file.parent / "missing.txt"
         resource = FileResource(
-            uri="file:///missing.txt",
+            uri=FileUrl("file:///missing.txt"),
             name="test",
             path=missing,
         )
@@ -104,7 +105,7 @@ async def test_permission_error(self, temp_file: Path):
         temp_file.chmod(0o000)  # Remove all permissions
         try:
             resource = FileResource(
-                uri=temp_file.as_uri(),
+                uri=FileUrl(temp_file.as_uri()),
                 name="test",
                 path=temp_file,
             )

tests/resources/test_function_resources.py

@@ -1,4 +1,4 @@
-from pydantic import BaseModel
+from pydantic import BaseModel, AnyUrl
 import pytest
 from fastmcp.resources import FunctionResource
 
@@ -13,7 +13,7 @@ def my_func() -> str:
             return "test content"
 
         resource = FunctionResource(
-            uri="fn://test",
+            uri=AnyUrl("fn://test"),
             name="test",
             description="test function",
             fn=my_func,
@@ -31,7 +31,7 @@ def get_data() -> str:
             return "Hello, world!"
 
         resource = FunctionResource(
-            uri="function://test",
+            uri=AnyUrl("function://test"),
             name="test",
             fn=get_data,
         )
@@ -46,7 +46,7 @@ def get_data() -> bytes:
             return b"Hello, world!"
 
         resource = FunctionResource(
-            uri="function://test",
+            uri=AnyUrl("function://test"),
             name="test",
             fn=get_data,
         )
@@ -60,11 +60,12 @@ def get_data() -> dict:
             return {"key": "value"}
 
         resource = FunctionResource(
-            uri="function://test",
+            uri=AnyUrl("function://test"),
             name="test",
             fn=get_data,
         )
         content = await resource.read()
+        assert isinstance(content, str)
         assert '"key": "value"' in content
 
     async def test_error_handling(self):
@@ -74,7 +75,7 @@ def failing_func() -> str:
             raise ValueError("Test error")
 
         resource = FunctionResource(
-            uri="function://test",
+            uri=AnyUrl("function://test"),
             name="test",
             fn=failing_func,
         )
@@ -88,7 +89,7 @@ class MyModel(BaseModel):
             name: str
 
         resource = FunctionResource(
-            uri="function://test",
+            uri=AnyUrl("function://test"),
             name="test",
             fn=lambda: MyModel(name="test"),
         )
@@ -106,7 +107,7 @@ def get_data() -> CustomData:
             return CustomData()
 
         resource = FunctionResource(
-            uri="function://test",
+            uri=AnyUrl("function://test"),
             name="test",
             fn=get_data,
         )

tests/resources/test_resource_manager.py

@@ -1,6 +1,7 @@
 import pytest
 from pathlib import Path
 from tempfile import NamedTemporaryFile
+from pydantic import AnyUrl, FileUrl
 
 from fastmcp.resources import (
     FileResource,
@@ -34,7 +35,7 @@ def test_add_resource(self, temp_file: Path):
         """Test adding a resource."""
         manager = ResourceManager()
         resource = FileResource(
-            uri=f"file://{temp_file}",
+            uri=FileUrl(f"file://{temp_file}"),
             name="test",
             path=temp_file,
         )
@@ -46,7 +47,7 @@ def test_add_duplicate_resource(self, temp_file: Path):
         """Test adding the same resource twice."""
         manager = ResourceManager()
         resource = FileResource(
-            uri=f"file://{temp_file}",
+            uri=FileUrl(f"file://{temp_file}"),
             name="test",
             path=temp_file,
         )
@@ -59,7 +60,7 @@ def test_warn_on_duplicate_resources(self, temp_file: Path, caplog):
         """Test warning on duplicate resources."""
         manager = ResourceManager()
         resource = FileResource(
-            uri=f"file://{temp_file}",
+            uri=FileUrl(f"file://{temp_file}"),
             name="test",
             path=temp_file,
         )
@@ -71,7 +72,7 @@ def test_disable_warn_on_duplicate_resources(self, temp_file: Path, caplog):
         """Test disabling warning on duplicate resources."""
         manager = ResourceManager(warn_on_duplicate_resources=False)
         resource = FileResource(
-            uri=f"file://{temp_file}",
+            uri=FileUrl(f"file://{temp_file}"),
             name="test",
             path=temp_file,
         )
@@ -83,7 +84,7 @@ async def test_get_resource(self, temp_file: Path):
         """Test getting a resource by URI."""
         manager = ResourceManager()
         resource = FileResource(
-            uri=f"file://{temp_file}",
+            uri=FileUrl(f"file://{temp_file}"),
             name="test",
             path=temp_file,
         )
@@ -105,7 +106,7 @@ def greet(name: str) -> str:
         )
         manager._templates[template.uri_template] = template
 
-        resource = await manager.get_resource("greet://world")
+        resource = await manager.get_resource(AnyUrl("greet://world"))
         assert isinstance(resource, FunctionResource)
         content = await resource.read()
         assert content == "Hello, world!"
@@ -114,18 +115,18 @@ async def test_get_unknown_resource(self):
         """Test getting a non-existent resource."""
         manager = ResourceManager()
         with pytest.raises(ValueError, match="Unknown resource"):
-            await manager.get_resource("unknown://test")
+            await manager.get_resource(AnyUrl("unknown://test"))
 
     def test_list_resources(self, temp_file: Path):
         """Test listing all resources."""
         manager = ResourceManager()
         resource1 = FileResource(
-            uri=f"file://{temp_file}",
+            uri=FileUrl(f"file://{temp_file}"),
             name="test1",
             path=temp_file,
         )
         resource2 = FileResource(
-            uri=f"file://{temp_file}2",
+            uri=FileUrl(f"file://{temp_file}2"),
             name="test2",
             path=temp_file,
         )