mirror of
https://git.anonymousland.org/anonymousland/synapse.git
synced 2025-05-05 01:35:07 -04:00
Clean up types for PaginationConfig (#8250)
This removes `SourcePaginationConfig` and `get_pagination_rows`. The reasoning behind this is that these generic classes/functions erased the types of the IDs it used (i.e. instead of passing around `StreamToken` it'd pass in e.g. `token.room_key`, which don't have uniform types).
This commit is contained in:
parent
703e2b8a96
commit
0f545e6b96
7 changed files with 52 additions and 86 deletions
|
@ -14,9 +14,13 @@
|
|||
# limitations under the License.
|
||||
|
||||
import logging
|
||||
from typing import Optional
|
||||
|
||||
import attr
|
||||
|
||||
from synapse.api.errors import SynapseError
|
||||
from synapse.http.servlet import parse_integer, parse_string
|
||||
from synapse.http.site import SynapseRequest
|
||||
from synapse.types import StreamToken
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
@ -25,38 +29,22 @@ logger = logging.getLogger(__name__)
|
|||
MAX_LIMIT = 1000
|
||||
|
||||
|
||||
class SourcePaginationConfig:
|
||||
|
||||
"""A configuration object which stores pagination parameters for a
|
||||
specific event source."""
|
||||
|
||||
def __init__(self, from_key=None, to_key=None, direction="f", limit=None):
|
||||
self.from_key = from_key
|
||||
self.to_key = to_key
|
||||
self.direction = "f" if direction == "f" else "b"
|
||||
self.limit = min(int(limit), MAX_LIMIT) if limit is not None else None
|
||||
|
||||
def __repr__(self):
|
||||
return "StreamConfig(from_key=%r, to_key=%r, direction=%r, limit=%r)" % (
|
||||
self.from_key,
|
||||
self.to_key,
|
||||
self.direction,
|
||||
self.limit,
|
||||
)
|
||||
|
||||
|
||||
@attr.s(slots=True)
|
||||
class PaginationConfig:
|
||||
|
||||
"""A configuration object which stores pagination parameters."""
|
||||
|
||||
def __init__(self, from_token=None, to_token=None, direction="f", limit=None):
|
||||
self.from_token = from_token
|
||||
self.to_token = to_token
|
||||
self.direction = "f" if direction == "f" else "b"
|
||||
self.limit = min(int(limit), MAX_LIMIT) if limit is not None else None
|
||||
from_token = attr.ib(type=Optional[StreamToken])
|
||||
to_token = attr.ib(type=Optional[StreamToken])
|
||||
direction = attr.ib(type=str)
|
||||
limit = attr.ib(type=Optional[int])
|
||||
|
||||
@classmethod
|
||||
def from_request(cls, request, raise_invalid_params=True, default_limit=None):
|
||||
def from_request(
|
||||
cls,
|
||||
request: SynapseRequest,
|
||||
raise_invalid_params: bool = True,
|
||||
default_limit: Optional[int] = None,
|
||||
) -> "PaginationConfig":
|
||||
direction = parse_string(request, "dir", default="f", allowed_values=["f", "b"])
|
||||
|
||||
from_tok = parse_string(request, "from")
|
||||
|
@ -78,8 +66,11 @@ class PaginationConfig:
|
|||
|
||||
limit = parse_integer(request, "limit", default=default_limit)
|
||||
|
||||
if limit and limit < 0:
|
||||
raise SynapseError(400, "Limit must be 0 or above")
|
||||
if limit:
|
||||
if limit < 0:
|
||||
raise SynapseError(400, "Limit must be 0 or above")
|
||||
|
||||
limit = min(int(limit), MAX_LIMIT)
|
||||
|
||||
try:
|
||||
return PaginationConfig(from_tok, to_tok, direction, limit)
|
||||
|
@ -87,20 +78,10 @@ class PaginationConfig:
|
|||
logger.exception("Failed to create pagination config")
|
||||
raise SynapseError(400, "Invalid request.")
|
||||
|
||||
def __repr__(self):
|
||||
def __repr__(self) -> str:
|
||||
return ("PaginationConfig(from_tok=%r, to_tok=%r, direction=%r, limit=%r)") % (
|
||||
self.from_token,
|
||||
self.to_token,
|
||||
self.direction,
|
||||
self.limit,
|
||||
)
|
||||
|
||||
def get_source_config(self, source_name):
|
||||
keyname = "%s_key" % source_name
|
||||
|
||||
return SourcePaginationConfig(
|
||||
from_key=getattr(self.from_token, keyname),
|
||||
to_key=getattr(self.to_token, keyname) if self.to_token else None,
|
||||
direction=self.direction,
|
||||
limit=self.limit,
|
||||
)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue