π The fast, Pythonic way to build MCP servers and clients.
Fix typing and static issues
Jeremiah Lowin3ccf27930f0e
diff --git a/tests/utilities/test_cache.py b/tests/utilities/test_cache.pyindex 722910405..0d4974cd6 100644--- a/tests/utilities/test_cache.py+++ b/tests/utilities/test_cache.py@@ -22,13 +22,13 @@ class TestTimedCache:"""Test that values can be set in the cache."""cache = TimedCache(datetime.timedelta(seconds=10))key, value = "test_key", "test_value"-+with patch("datetime.datetime") as mock_datetime:- now = datetime.datetime(2023, 1, 1, tzinfo=datetime.UTC)+ now = datetime.datetime(2023, 1, 1, tzinfo=datetime.timezone.utc)mock_datetime.now.return_value = now-+cache.set(key, value)-+# Check that the value is stored with the correct expirationassert key in cache.cachestored_value, expiration = cache.cache[key]@@ -39,11 +39,13 @@ class TestTimedCache:"""Test retrieving a value that exists and has not expired."""cache = TimedCache(datetime.timedelta(seconds=10))key, value = "test_key", "test_value"-+# Set a future expiration time- future = datetime.datetime.now(datetime.UTC) + datetime.timedelta(seconds=30)+ future = datetime.datetime.now(datetime.timezone.utc) + datetime.timedelta(+ seconds=30+ )cache.cache[key] = (value, future)-+# The value should be returnedassert cache.get(key) == value@@ -51,30 +53,32 @@ class TestTimedCache:"""Test retrieving a value that exists but has expired."""cache = TimedCache(datetime.timedelta(seconds=10))key, value = "test_key", "test_value"-+# Set a past expiration time- past = datetime.datetime.now(datetime.UTC) - datetime.timedelta(seconds=1)+ past = datetime.datetime.now(datetime.timezone.utc) - datetime.timedelta(+ seconds=1+ )cache.cache[key] = (value, past)-+# Should return NOT_FOUNDassert cache.get(key) is TimedCache.NOT_FOUNDdef test_get_not_found(self):"""Test retrieving a value that doesn't exist in the cache."""cache = TimedCache(datetime.timedelta(seconds=10))-+# Key doesn't existassert cache.get("nonexistent_key") is TimedCache.NOT_FOUNDdef test_clear(self):"""Test that the cache can be cleared."""cache = TimedCache(datetime.timedelta(seconds=10))-+# Add some itemscache.set("key1", "value1")cache.set("key2", "value2")assert len(cache.cache) == 2-+# Clear the cachecache.clear()assert len(cache.cache) == 0@@ -84,14 +88,14 @@ class TestTimedCache:# Use a very short expiration for the testcache = TimedCache(datetime.timedelta(milliseconds=50))key, value = "test_key", "test_value"-+cache.set(key, value)# Value should be available immediatelyassert cache.get(key) == value-+# Wait for expirationtime.sleep(0.06) # 60 milliseconds, slightly longer than expiration-+# Value should now be expiredassert cache.get(key) is TimedCache.NOT_FOUND@@ -99,11 +103,11 @@ class TestTimedCache:"""Test that setting a key that already exists overwrites the old value."""cache = TimedCache(datetime.timedelta(seconds=10))key = "test_key"-+# Set initial valuecache.set(key, "initial_value")assert cache.get(key) == "initial_value"-+# Overwrite with new valuecache.set(key, "new_value")assert cache.get(key) == "new_value"@@ -112,21 +116,21 @@ class TestTimedCache:"""Test that overwriting a key extends its expiration time."""cache = TimedCache(datetime.timedelta(seconds=10))key = "test_key"-+with patch("datetime.datetime") as mock_datetime:# Set initial value at t=0- initial_time = datetime.datetime(2023, 1, 1, tzinfo=datetime.UTC)+ initial_time = datetime.datetime(2023, 1, 1, tzinfo=datetime.timezone.utc)mock_datetime.now.return_value = initial_timecache.set(key, "initial_value")-+initial_expiration = cache.cache[key][1]assert initial_expiration == initial_time + datetime.timedelta(seconds=10)-+# Overwrite at t=5later_time = initial_time + datetime.timedelta(seconds=5)mock_datetime.now.return_value = later_timecache.set(key, "new_value")-+# Expiration should be extendednew_expiration = cache.cache[key][1]assert new_expiration == later_time + datetime.timedelta(seconds=10)@@ -134,7 +138,7 @@ class TestTimedCache:def test_different_key_types(self):"""Test that different types of keys can be used."""cache = TimedCache(datetime.timedelta(seconds=10))-+# Test various key typeskeys_and_values = [(42, "int_value"),@@ -142,7 +146,7 @@ class TestTimedCache:((1, 2), "tuple_value"),(frozenset({1, 2, 3}), "frozenset_value"),]-+for key, value in keys_and_values:cache.set(key, value)assert cache.get(key) == value@@ -151,7 +155,7 @@ class TestTimedCache:"""Test that None can be stored as a value."""cache = TimedCache(datetime.timedelta(seconds=10))key = "none_key"-+cache.set(key, None)# The stored value is None, but get() should return None, not NOT_FOUNDassert cache.get(key) is None@@ -160,7 +164,7 @@ class TestTimedCache:"""Test with a zero expiration time."""cache = TimedCache(datetime.timedelta(seconds=0))key, value = "test_key", "test_value"-+cache.set(key, value)# The value might already be expired by the time we call get()# We can't make strong assertions here due to timing variability@@ -171,7 +175,7 @@ class TestTimedCache:"""Test with a negative expiration time."""cache = TimedCache(datetime.timedelta(seconds=-1))key, value = "test_key", "test_value"-+cache.set(key, value)# Value should be immediately expiredassert cache.get(key) is TimedCache.NOT_FOUND@@ -179,52 +183,51 @@ class TestTimedCache:def test_cache_consistency(self):"""Test cache consistency with multiple operations."""cache = TimedCache(datetime.timedelta(seconds=10))-+# Add multiple itemscache.set("key1", "value1")cache.set("key2", "value2")cache.set("key3", "value3")-+# Check all itemsassert cache.get("key1") == "value1"assert cache.get("key2") == "value2"assert cache.get("key3") == "value3"-+# Overwrite one itemcache.set("key2", "updated_value")-+# Check againassert cache.get("key1") == "value1"assert cache.get("key2") == "updated_value"assert cache.get("key3") == "value3"-+# Clear and verify all items are gonecache.clear()assert cache.get("key1") is TimedCache.NOT_FOUNDassert cache.get("key2") is TimedCache.NOT_FOUNDassert cache.get("key3") is TimedCache.NOT_FOUND-def test_large_expiration(self):"""Test with a very large expiration time."""# One year expirationcache = TimedCache(datetime.timedelta(days=365))key, value = "test_key", "test_value"-+cache.set(key, value)assert cache.get(key) == valuedef test_many_items(self):"""Test cache with many items."""cache = TimedCache(datetime.timedelta(seconds=10))-+# Add 1000 itemsfor i in range(1000):cache.set(f"key{i}", f"value{i}")-+# Check sizeassert len(cache.cache) == 1000-+# Check some random itemsfor i in [0, 123, 456, 789, 999]:assert cache.get(f"key{i}") == f"value{i}"