-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Add the Store API and initial documentation. #1784
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,120 @@ | ||
import contextlib | ||
import json | ||
from collections import defaultdict, deque | ||
from typing import Any, Dict, Iterable | ||
|
||
from django.core.serializers.json import DjangoJSONEncoder | ||
from django.utils.module_loading import import_string | ||
|
||
from debug_toolbar import settings as dt_settings | ||
|
||
|
||
def serialize(data: Any) -> str: | ||
# If this starts throwing an exceptions, consider | ||
# Subclassing DjangoJSONEncoder and using force_str to | ||
# make it JSON serializable. | ||
return json.dumps(data, cls=DjangoJSONEncoder) | ||
|
||
|
||
def deserialize(data: str) -> Any: | ||
return json.loads(data) | ||
|
||
|
||
class BaseStore: | ||
_config = dt_settings.get_config().copy() | ||
|
||
@classmethod | ||
def request_ids(cls) -> Iterable: | ||
"""The stored request ids""" | ||
raise NotImplementedError | ||
|
||
@classmethod | ||
def exists(cls, request_id: str) -> bool: | ||
"""Does the given request_id exist in the store""" | ||
raise NotImplementedError | ||
|
||
@classmethod | ||
def set(cls, request_id: str): | ||
"""Set a request_id in the store""" | ||
raise NotImplementedError | ||
|
||
@classmethod | ||
def clear(cls): | ||
"""Remove all requests from the request store""" | ||
raise NotImplementedError | ||
|
||
@classmethod | ||
def delete(cls, request_id: str): | ||
"""Delete the store for the given request_id""" | ||
raise NotImplementedError | ||
|
||
@classmethod | ||
def save_panel(cls, request_id: str, panel_id: str, data: Any = None): | ||
"""Save the panel data for the given request_id""" | ||
raise NotImplementedError | ||
|
||
@classmethod | ||
def panel(cls, request_id: str, panel_id: str) -> Any: | ||
"""Fetch the panel data for the given request_id""" | ||
raise NotImplementedError | ||
|
||
|
||
class MemoryStore(BaseStore): | ||
# ids is the collection of storage ids that have been used. | ||
# Use a dequeue to support O(1) appends and pops | ||
# from either direction. | ||
_request_ids: deque = deque() | ||
_request_store: Dict[str, Dict] = defaultdict(dict) | ||
|
||
@classmethod | ||
def request_ids(cls) -> Iterable: | ||
"""The stored request ids""" | ||
return cls._request_ids | ||
|
||
@classmethod | ||
def exists(cls, request_id: str) -> bool: | ||
"""Does the given request_id exist in the request store""" | ||
return request_id in cls._request_ids | ||
|
||
@classmethod | ||
def set(cls, request_id: str): | ||
"""Set a request_id in the request store""" | ||
if request_id not in cls._request_ids: | ||
cls._request_ids.append(request_id) | ||
for _ in range(len(cls._request_ids) - cls._config["RESULTS_CACHE_SIZE"]): | ||
removed_id = cls._request_ids.popleft() | ||
cls._request_store.pop(removed_id, None) | ||
|
||
@classmethod | ||
def clear(cls): | ||
"""Remove all requests from the request store""" | ||
cls._request_ids.clear() | ||
cls._request_store.clear() | ||
|
||
@classmethod | ||
def delete(cls, request_id: str): | ||
"""Delete the stored request for the given request_id""" | ||
cls._request_store.pop(request_id, None) | ||
# Suppress when request_id doesn't exist in the collection of ids. | ||
with contextlib.suppress(ValueError): | ||
cls._request_ids.remove(request_id) | ||
|
||
@classmethod | ||
def save_panel(cls, request_id: str, panel_id: str, data: Any = None): | ||
"""Save the panel data for the given request_id""" | ||
cls.set(request_id) | ||
cls._request_store[request_id][panel_id] = serialize(data) | ||
|
||
@classmethod | ||
def panel(cls, request_id: str, panel_id: str) -> Any: | ||
"""Fetch the panel data for the given request_id""" | ||
try: | ||
data = cls._request_store[request_id][panel_id] | ||
except KeyError: | ||
return {} | ||
else: | ||
return deserialize(data) | ||
|
||
|
||
def get_store(): | ||
return import_string(dt_settings.get_config()["TOOLBAR_STORE_CLASS"]) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,114 @@ | ||
from django.test import TestCase | ||
from django.test.utils import override_settings | ||
|
||
from debug_toolbar import store | ||
|
||
|
||
class SerializationTestCase(TestCase): | ||
def test_serialize(self): | ||
self.assertEqual( | ||
store.serialize({"hello": {"foo": "bar"}}), | ||
'{"hello": {"foo": "bar"}}', | ||
) | ||
|
||
def test_deserialize(self): | ||
self.assertEqual( | ||
store.deserialize('{"hello": {"foo": "bar"}}'), | ||
{"hello": {"foo": "bar"}}, | ||
) | ||
|
||
|
||
class BaseStoreTestCase(TestCase): | ||
def test_methods_are_not_implemented(self): | ||
# Find all the non-private and dunder class methods | ||
methods = [ | ||
member for member in vars(store.BaseStore) if not member.startswith("_") | ||
] | ||
self.assertEqual(len(methods), 7) | ||
with self.assertRaises(NotImplementedError): | ||
store.BaseStore.request_ids() | ||
with self.assertRaises(NotImplementedError): | ||
store.BaseStore.exists("") | ||
with self.assertRaises(NotImplementedError): | ||
store.BaseStore.set("") | ||
with self.assertRaises(NotImplementedError): | ||
store.BaseStore.clear() | ||
with self.assertRaises(NotImplementedError): | ||
store.BaseStore.delete("") | ||
with self.assertRaises(NotImplementedError): | ||
store.BaseStore.save_panel("", "", None) | ||
with self.assertRaises(NotImplementedError): | ||
store.BaseStore.panel("", "") | ||
|
||
|
||
class MemoryStoreTestCase(TestCase): | ||
@classmethod | ||
def setUpTestData(cls) -> None: | ||
cls.store = store.MemoryStore | ||
|
||
def tearDown(self) -> None: | ||
self.store.clear() | ||
|
||
def test_ids(self): | ||
self.store.set("foo") | ||
self.store.set("bar") | ||
self.assertEqual(list(self.store.request_ids()), ["foo", "bar"]) | ||
|
||
def test_exists(self): | ||
self.assertFalse(self.store.exists("missing")) | ||
self.store.set("exists") | ||
self.assertTrue(self.store.exists("exists")) | ||
|
||
def test_set(self): | ||
self.store.set("foo") | ||
self.assertEqual(list(self.store.request_ids()), ["foo"]) | ||
|
||
def test_set_max_size(self): | ||
existing = self.store._config["RESULTS_CACHE_SIZE"] | ||
self.store._config["RESULTS_CACHE_SIZE"] = 1 | ||
self.store.save_panel("foo", "foo.panel", "foo.value") | ||
self.store.save_panel("bar", "bar.panel", {"a": 1}) | ||
self.assertEqual(list(self.store.request_ids()), ["bar"]) | ||
self.assertEqual(self.store.panel("foo", "foo.panel"), {}) | ||
self.assertEqual(self.store.panel("bar", "bar.panel"), {"a": 1}) | ||
# Restore the existing config setting since this config is shared. | ||
self.store._config["RESULTS_CACHE_SIZE"] = existing | ||
|
||
def test_clear(self): | ||
self.store.save_panel("bar", "bar.panel", {"a": 1}) | ||
self.store.clear() | ||
self.assertEqual(list(self.store.request_ids()), []) | ||
self.assertEqual(self.store.panel("bar", "bar.panel"), {}) | ||
|
||
def test_delete(self): | ||
self.store.save_panel("bar", "bar.panel", {"a": 1}) | ||
self.store.delete("bar") | ||
self.assertEqual(list(self.store.request_ids()), []) | ||
self.assertEqual(self.store.panel("bar", "bar.panel"), {}) | ||
# Make sure it doesn't error | ||
self.store.delete("bar") | ||
|
||
def test_save_panel(self): | ||
self.store.save_panel("bar", "bar.panel", {"a": 1}) | ||
self.assertEqual(list(self.store.request_ids()), ["bar"]) | ||
self.assertEqual(self.store.panel("bar", "bar.panel"), {"a": 1}) | ||
|
||
def test_panel(self): | ||
self.assertEqual(self.store.panel("missing", "missing"), {}) | ||
self.store.save_panel("bar", "bar.panel", {"a": 1}) | ||
self.assertEqual(self.store.panel("bar", "bar.panel"), {"a": 1}) | ||
|
||
|
||
class StubStore(store.BaseStore): | ||
pass | ||
|
||
|
||
class GetStoreTestCase(TestCase): | ||
def test_get_store(self): | ||
self.assertIs(store.get_store(), store.MemoryStore) | ||
|
||
@override_settings( | ||
DEBUG_TOOLBAR_CONFIG={"TOOLBAR_STORE_CLASS": "tests.test_store.StubStore"} | ||
) | ||
def test_get_store_with_setting(self): | ||
self.assertIs(store.get_store(), StubStore) |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.