Skip to content

Commit

Permalink
🎉 🎈 Formatted with black
Browse files Browse the repository at this point in the history
  • Loading branch information
MarzaElise committed Oct 14, 2021
1 parent 1ab6c71 commit 34f2cba
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 19 deletions.
34 changes: 20 additions & 14 deletions cats/mixins/images.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
from .base import BaseMixin
from ..utils import _resolve_query, Image, Response, Analysis, ValidateArguments
from ..utils import (
_resolve_query,
Image,
Response,
Analysis,
ValidateArguments,
)
from typing import List, Optional


Expand Down Expand Up @@ -38,7 +44,7 @@ def get_all_images(
limit=limit,
mime_types=mime_types,
page=page,
format=format
format=format,
)

query = _resolve_query(
Expand Down Expand Up @@ -68,7 +74,7 @@ def get_own_image( # needs a better name
original_filename: str = None,
format: str = None,
include_vote: int = None,
include_favourite: Optional[int] = None
include_favourite: Optional[int] = None,
):
"""Get all the images uploaded by you
Expand All @@ -89,17 +95,17 @@ def get_own_image( # needs a better name
"""

ValidateArguments(
limit = limit,
page = page,
order = order,
sub_id = sub_id,
breed_ids = breed_ids,
category_ids = category_ids,
original_filename = original_filename,
format = format,
include_vote = include_vote,
include_favourite = include_favourite
) # i dont need the return value, just need to validate them
limit=limit,
page=page,
order=order,
sub_id=sub_id,
breed_ids=breed_ids,
category_ids=category_ids,
original_filename=original_filename,
format=format,
include_vote=include_vote,
include_favourite=include_favourite,
) # i dont need the return value, just need to validate them

category_ids = list(set(category_ids))
breed_ids = list(set(breed_ids))
Expand Down
2 changes: 1 addition & 1 deletion cats/utils/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,5 +49,5 @@ def _raise_for_status(status_code: int):
"Forbidden",
"ServerError",
"HTTPException",
"ValidateArguments"
"ValidateArguments",
)
12 changes: 8 additions & 4 deletions cats/utils/validator.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,11 @@ def validate_mime_types(cls, mime_types: List[str]):
return mime_types
for type_ in mime_types:
if type_.lower() not in {"jpg", "png", "gif"}:
raise ValueError("Expected jpg, png or gif. Received {} instead".format(type_.lower()))
raise ValueError(
"Expected jpg, png or gif. Received {} instead".format(
type_.lower()
)
)
return mime_types

@validator("size")
Expand All @@ -34,20 +38,20 @@ def validate_size(cls, size: str):

@validator("include_favourite")
def validate_favourite(cls, item: int):
if item in {0, 1, None}:
if item in {0, 1, None}:
return item
raise ValueError("include_favourite must be either 0, 1 or None")

@validator("include_vote")
def validate_vote(cls, item: int):
if item in {0, 1, None}:
if item in {0, 1, None}:
return item
raise ValueError("include_vote must be either 0, 1 or None")

@validator("limit")
def validate_limit(cls, limit: int):
if limit is None:
return limit # early return
return limit # early return
if limit > 100:
raise ValueError("limit must be below 100")
if limit < 1:
Expand Down

0 comments on commit 34f2cba

Please sign in to comment.