Merge branch 'main' into asyncio
This commit is contained in:
Andrew Brookins
commit
ca6ae7d6e9
47 changed files with 3285 additions and 760 deletions
|
|
@ -8,20 +8,24 @@ from unittest import mock
|
|||
import pytest
|
||||
from pydantic import ValidationError
|
||||
|
||||
from redis_om.model import Field, HashModel
|
||||
from redis_om.model.migrations.migrator import Migrator
|
||||
from redis_om.model.model import (
|
||||
NotFoundError,
|
||||
from aredis_om import (
|
||||
Field,
|
||||
HashModel,
|
||||
Migrator,
|
||||
QueryNotSupportedError,
|
||||
RedisModelError,
|
||||
has_redisearch,
|
||||
)
|
||||
|
||||
|
||||
if not has_redisearch():
|
||||
pytestmark = pytest.mark.skip
|
||||
|
||||
today = datetime.date.today()
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def m(key_prefix):
|
||||
async def m(key_prefix, redis):
|
||||
class BaseHashModel(HashModel, abc.ABC):
|
||||
class Meta:
|
||||
global_key_prefix = key_prefix
|
||||
|
|
@ -42,7 +46,7 @@ def m(key_prefix):
|
|||
model_key_prefix = "member"
|
||||
primary_key_pattern = ""
|
||||
|
||||
Migrator().run()
|
||||
await Migrator(redis).run()
|
||||
|
||||
return namedtuple("Models", ["BaseHashModel", "Order", "Member"])(
|
||||
BaseHashModel, Order, Member
|
||||
|
|
@ -50,7 +54,7 @@ def m(key_prefix):
|
|||
|
||||
|
||||
@pytest.fixture
|
||||
def members(m):
|
||||
async def members(m):
|
||||
member1 = m.Member(
|
||||
first_name="Andrew",
|
||||
last_name="Brookins",
|
||||
|
|
@ -74,149 +78,32 @@ def members(m):
|
|||
age=100,
|
||||
join_date=today,
|
||||
)
|
||||
member1.save()
|
||||
member2.save()
|
||||
member3.save()
|
||||
await member1.save()
|
||||
await member2.save()
|
||||
await member3.save()
|
||||
|
||||
yield member1, member2, member3
|
||||
|
||||
|
||||
def test_validates_required_fields(m):
|
||||
# Raises ValidationError: last_name is required
|
||||
with pytest.raises(ValidationError):
|
||||
m.Member(first_name="Andrew", zipcode="97086", join_date=today)
|
||||
|
||||
|
||||
def test_validates_field(m):
|
||||
# Raises ValidationError: join_date is not a date
|
||||
with pytest.raises(ValidationError):
|
||||
m.Member(first_name="Andrew", last_name="Brookins", join_date="yesterday")
|
||||
|
||||
|
||||
# Passes validation
|
||||
def test_validation_passes(m):
|
||||
member = m.Member(
|
||||
first_name="Andrew",
|
||||
last_name="Brookins",
|
||||
email="a@example.com",
|
||||
join_date=today,
|
||||
age=38,
|
||||
)
|
||||
assert member.first_name == "Andrew"
|
||||
|
||||
|
||||
def test_saves_model_and_creates_pk(m):
|
||||
member = m.Member(
|
||||
first_name="Andrew",
|
||||
last_name="Brookins",
|
||||
email="a@example.com",
|
||||
join_date=today,
|
||||
age=38,
|
||||
)
|
||||
# Save a model instance to Redis
|
||||
member.save()
|
||||
|
||||
member2 = m.Member.get(member.pk)
|
||||
assert member2 == member
|
||||
|
||||
|
||||
def test_raises_error_with_embedded_models(m):
|
||||
class Address(m.BaseHashModel):
|
||||
address_line_1: str
|
||||
address_line_2: Optional[str]
|
||||
city: str
|
||||
country: str
|
||||
postal_code: str
|
||||
|
||||
with pytest.raises(RedisModelError):
|
||||
|
||||
class InvalidMember(m.BaseHashModel):
|
||||
address: Address
|
||||
|
||||
|
||||
@pytest.mark.skip("Not implemented yet")
|
||||
def test_saves_many(m):
|
||||
members = [
|
||||
m.Member(
|
||||
first_name="Andrew",
|
||||
last_name="Brookins",
|
||||
email="a@example.com",
|
||||
join_date=today,
|
||||
),
|
||||
m.Member(
|
||||
first_name="Kim",
|
||||
last_name="Brookins",
|
||||
email="k@example.com",
|
||||
join_date=today,
|
||||
),
|
||||
]
|
||||
m.Member.add(members)
|
||||
|
||||
|
||||
@pytest.mark.skip("Not ready yet")
|
||||
def test_updates_a_model(members, m):
|
||||
@pytest.mark.asyncio
|
||||
async def test_exact_match_queries(members, m):
|
||||
member1, member2, member3 = members
|
||||
|
||||
# Or, with an implicit save:
|
||||
member1.update(last_name="Smith")
|
||||
assert m.Member.find(m.Member.pk == member1.pk).first() == member1
|
||||
|
||||
# Or, affecting multiple model instances with an implicit save:
|
||||
m.Member.find(m.Member.last_name == "Brookins").update(last_name="Smith")
|
||||
results = m.Member.find(m.Member.last_name == "Smith")
|
||||
assert results == members
|
||||
|
||||
|
||||
def test_paginate_query(members, m):
|
||||
member1, member2, member3 = members
|
||||
actual = m.Member.find().sort_by("age").all(batch_size=1)
|
||||
assert actual == [member2, member1, member3]
|
||||
|
||||
|
||||
def test_access_result_by_index_cached(members, m):
|
||||
member1, member2, member3 = members
|
||||
query = m.Member.find().sort_by("age")
|
||||
# Load the cache, throw away the result.
|
||||
assert query._model_cache == []
|
||||
query.execute()
|
||||
assert query._model_cache == [member2, member1, member3]
|
||||
|
||||
# Access an item that should be in the cache.
|
||||
with mock.patch.object(query.model, "db") as mock_db:
|
||||
assert query[0] == member2
|
||||
assert not mock_db.called
|
||||
|
||||
|
||||
def test_access_result_by_index_not_cached(members, m):
|
||||
member1, member2, member3 = members
|
||||
query = m.Member.find().sort_by("age")
|
||||
|
||||
# Assert that we don't have any models in the cache yet -- we
|
||||
# haven't made any requests of Redis.
|
||||
assert query._model_cache == []
|
||||
assert query[0] == member2
|
||||
assert query[1] == member1
|
||||
assert query[2] == member3
|
||||
|
||||
|
||||
def test_exact_match_queries(members, m):
|
||||
member1, member2, member3 = members
|
||||
|
||||
actual = m.Member.find(m.Member.last_name == "Brookins").sort_by("age").all()
|
||||
actual = await m.Member.find(m.Member.last_name == "Brookins").sort_by("age").all()
|
||||
assert actual == [member2, member1]
|
||||
|
||||
actual = m.Member.find(
|
||||
actual = await m.Member.find(
|
||||
(m.Member.last_name == "Brookins") & ~(m.Member.first_name == "Andrew")
|
||||
).all()
|
||||
assert actual == [member2]
|
||||
|
||||
actual = m.Member.find(~(m.Member.last_name == "Brookins")).all()
|
||||
actual = await m.Member.find(~(m.Member.last_name == "Brookins")).all()
|
||||
assert actual == [member3]
|
||||
|
||||
actual = m.Member.find(m.Member.last_name != "Brookins").all()
|
||||
actual = await m.Member.find(m.Member.last_name != "Brookins").all()
|
||||
assert actual == [member3]
|
||||
|
||||
actual = (
|
||||
actual = await (
|
||||
m.Member.find(
|
||||
(m.Member.last_name == "Brookins") & (m.Member.first_name == "Andrew")
|
||||
| (m.Member.first_name == "Kim")
|
||||
|
|
@ -226,16 +113,17 @@ def test_exact_match_queries(members, m):
|
|||
)
|
||||
assert actual == [member2, member1]
|
||||
|
||||
actual = m.Member.find(
|
||||
actual = await m.Member.find(
|
||||
m.Member.first_name == "Kim", m.Member.last_name == "Brookins"
|
||||
).all()
|
||||
assert actual == [member2]
|
||||
|
||||
|
||||
def test_recursive_query_resolution(members, m):
|
||||
@pytest.mark.asyncio
|
||||
async def test_recursive_query_resolution(members, m):
|
||||
member1, member2, member3 = members
|
||||
|
||||
actual = (
|
||||
actual = await (
|
||||
m.Member.find(
|
||||
(m.Member.last_name == "Brookins")
|
||||
| (m.Member.age == 100) & (m.Member.last_name == "Smith")
|
||||
|
|
@ -246,10 +134,11 @@ def test_recursive_query_resolution(members, m):
|
|||
assert actual == [member2, member1, member3]
|
||||
|
||||
|
||||
def test_tag_queries_boolean_logic(members, m):
|
||||
@pytest.mark.asyncio
|
||||
async def test_tag_queries_boolean_logic(members, m):
|
||||
member1, member2, member3 = members
|
||||
|
||||
actual = (
|
||||
actual = await (
|
||||
m.Member.find(
|
||||
(m.Member.first_name == "Andrew") & (m.Member.last_name == "Brookins")
|
||||
| (m.Member.last_name == "Smith")
|
||||
|
|
@ -260,7 +149,8 @@ def test_tag_queries_boolean_logic(members, m):
|
|||
assert actual == [member1, member3]
|
||||
|
||||
|
||||
def test_tag_queries_punctuation(m):
|
||||
@pytest.mark.asyncio
|
||||
async def test_tag_queries_punctuation(m):
|
||||
member1 = m.Member(
|
||||
first_name="Andrew, the Michael",
|
||||
last_name="St. Brookins-on-Pier",
|
||||
|
|
@ -268,7 +158,7 @@ def test_tag_queries_punctuation(m):
|
|||
age=38,
|
||||
join_date=today,
|
||||
)
|
||||
member1.save()
|
||||
await member1.save()
|
||||
|
||||
member2 = m.Member(
|
||||
first_name="Bob",
|
||||
|
|
@ -277,24 +167,26 @@ def test_tag_queries_punctuation(m):
|
|||
age=38,
|
||||
join_date=today,
|
||||
)
|
||||
member2.save()
|
||||
await member2.save()
|
||||
|
||||
assert (
|
||||
m.Member.find(m.Member.first_name == "Andrew, the Michael").first() == member1
|
||||
)
|
||||
assert (
|
||||
m.Member.find(m.Member.last_name == "St. Brookins-on-Pier").first() == member1
|
||||
)
|
||||
result = await (m.Member.find(m.Member.first_name == "Andrew, the Michael").first())
|
||||
assert result == member1
|
||||
|
||||
result = await (m.Member.find(m.Member.last_name == "St. Brookins-on-Pier").first())
|
||||
assert result == member1
|
||||
|
||||
# Notice that when we index and query multiple values that use the internal
|
||||
# TAG separator for single-value exact-match fields, like an indexed string,
|
||||
# the queries will succeed. We apply a workaround that queries for the union
|
||||
# of the two values separated by the tag separator.
|
||||
assert m.Member.find(m.Member.email == "a|b@example.com").all() == [member1]
|
||||
assert m.Member.find(m.Member.email == "a|villain@example.com").all() == [member2]
|
||||
results = await m.Member.find(m.Member.email == "a|b@example.com").all()
|
||||
assert results == [member1]
|
||||
results = await m.Member.find(m.Member.email == "a|villain@example.com").all()
|
||||
assert results == [member2]
|
||||
|
||||
|
||||
def test_tag_queries_negation(members, m):
|
||||
@pytest.mark.asyncio
|
||||
async def test_tag_queries_negation(members, m):
|
||||
member1, member2, member3 = members
|
||||
|
||||
"""
|
||||
|
|
@ -304,7 +196,7 @@ def test_tag_queries_negation(members, m):
|
|||
|
||||
"""
|
||||
query = m.Member.find(~(m.Member.first_name == "Andrew"))
|
||||
assert query.all() == [member2]
|
||||
assert await query.all() == [member2]
|
||||
|
||||
"""
|
||||
┌first_name
|
||||
|
|
@ -319,7 +211,7 @@ def test_tag_queries_negation(members, m):
|
|||
query = m.Member.find(
|
||||
~(m.Member.first_name == "Andrew") & (m.Member.last_name == "Brookins")
|
||||
)
|
||||
assert query.all() == [member2]
|
||||
assert await query.all() == [member2]
|
||||
|
||||
"""
|
||||
┌first_name
|
||||
|
|
@ -338,7 +230,7 @@ def test_tag_queries_negation(members, m):
|
|||
~(m.Member.first_name == "Andrew")
|
||||
& ((m.Member.last_name == "Brookins") | (m.Member.last_name == "Smith"))
|
||||
)
|
||||
assert query.all() == [member2]
|
||||
assert await query.all() == [member2]
|
||||
|
||||
"""
|
||||
┌first_name
|
||||
|
|
@ -357,64 +249,184 @@ def test_tag_queries_negation(members, m):
|
|||
~(m.Member.first_name == "Andrew") & (m.Member.last_name == "Brookins")
|
||||
| (m.Member.last_name == "Smith")
|
||||
)
|
||||
assert query.sort_by("age").all() == [member2, member3]
|
||||
assert await query.sort_by("age").all() == [member2, member3]
|
||||
|
||||
actual = m.Member.find(
|
||||
actual = await m.Member.find(
|
||||
(m.Member.first_name == "Andrew") & ~(m.Member.last_name == "Brookins")
|
||||
).all()
|
||||
assert actual == [member3]
|
||||
|
||||
|
||||
def test_numeric_queries(members, m):
|
||||
@pytest.mark.asyncio
|
||||
async def test_numeric_queries(members, m):
|
||||
member1, member2, member3 = members
|
||||
|
||||
actual = m.Member.find(m.Member.age == 34).all()
|
||||
actual = await m.Member.find(m.Member.age == 34).all()
|
||||
assert actual == [member2]
|
||||
|
||||
actual = m.Member.find(m.Member.age > 34).sort_by("age").all()
|
||||
actual = await m.Member.find(m.Member.age > 34).sort_by("age").all()
|
||||
assert actual == [member1, member3]
|
||||
|
||||
actual = m.Member.find(m.Member.age < 35).all()
|
||||
actual = await m.Member.find(m.Member.age < 35).all()
|
||||
assert actual == [member2]
|
||||
|
||||
actual = m.Member.find(m.Member.age <= 34).all()
|
||||
actual = await m.Member.find(m.Member.age <= 34).all()
|
||||
assert actual == [member2]
|
||||
|
||||
actual = m.Member.find(m.Member.age >= 100).all()
|
||||
actual = await m.Member.find(m.Member.age >= 100).all()
|
||||
assert actual == [member3]
|
||||
|
||||
actual = m.Member.find(m.Member.age != 34).sort_by("age").all()
|
||||
actual = await m.Member.find(m.Member.age != 34).sort_by("age").all()
|
||||
assert actual == [member1, member3]
|
||||
|
||||
actual = m.Member.find(~(m.Member.age == 100)).sort_by("age").all()
|
||||
actual = await m.Member.find(~(m.Member.age == 100)).sort_by("age").all()
|
||||
assert actual == [member2, member1]
|
||||
|
||||
actual = m.Member.find(m.Member.age > 30, m.Member.age < 40).sort_by("age").all()
|
||||
actual = (
|
||||
await m.Member.find(m.Member.age > 30, m.Member.age < 40).sort_by("age").all()
|
||||
)
|
||||
assert actual == [member2, member1]
|
||||
|
||||
|
||||
def test_sorting(members, m):
|
||||
@pytest.mark.asyncio
|
||||
async def test_sorting(members, m):
|
||||
member1, member2, member3 = members
|
||||
|
||||
actual = m.Member.find(m.Member.age > 34).sort_by("age").all()
|
||||
actual = await m.Member.find(m.Member.age > 34).sort_by("age").all()
|
||||
assert actual == [member1, member3]
|
||||
|
||||
actual = m.Member.find(m.Member.age > 34).sort_by("-age").all()
|
||||
actual = await m.Member.find(m.Member.age > 34).sort_by("-age").all()
|
||||
assert actual == [member3, member1]
|
||||
|
||||
with pytest.raises(QueryNotSupportedError):
|
||||
# This field does not exist.
|
||||
m.Member.find().sort_by("not-a-real-field").all()
|
||||
await m.Member.find().sort_by("not-a-real-field").all()
|
||||
|
||||
with pytest.raises(QueryNotSupportedError):
|
||||
# This field is not sortable.
|
||||
m.Member.find().sort_by("join_date").all()
|
||||
await m.Member.find().sort_by("join_date").all()
|
||||
|
||||
|
||||
def test_not_found(m):
|
||||
with pytest.raises(NotFoundError):
|
||||
# This ID does not exist.
|
||||
m.Member.get(1000)
|
||||
def test_validates_required_fields(m):
|
||||
# Raises ValidationError: last_name is required
|
||||
# TODO: Test the error value
|
||||
with pytest.raises(ValidationError):
|
||||
m.Member(first_name="Andrew", zipcode="97086", join_date=today)
|
||||
|
||||
|
||||
def test_validates_field(m):
|
||||
# Raises ValidationError: join_date is not a date
|
||||
# TODO: Test the error value
|
||||
with pytest.raises(ValidationError):
|
||||
m.Member(first_name="Andrew", last_name="Brookins", join_date="yesterday")
|
||||
|
||||
|
||||
def test_validation_passes(m):
|
||||
member = m.Member(
|
||||
first_name="Andrew",
|
||||
last_name="Brookins",
|
||||
email="a@example.com",
|
||||
join_date=today,
|
||||
age=38,
|
||||
)
|
||||
assert member.first_name == "Andrew"
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_saves_model_and_creates_pk(m):
|
||||
member = m.Member(
|
||||
first_name="Andrew",
|
||||
last_name="Brookins",
|
||||
email="a@example.com",
|
||||
join_date=today,
|
||||
age=38,
|
||||
)
|
||||
# Save a model instance to Redis
|
||||
await member.save()
|
||||
|
||||
member2 = await m.Member.get(member.pk)
|
||||
assert member2 == member
|
||||
|
||||
|
||||
def test_raises_error_with_embedded_models(m):
|
||||
class Address(m.BaseHashModel):
|
||||
address_line_1: str
|
||||
address_line_2: Optional[str]
|
||||
city: str
|
||||
country: str
|
||||
postal_code: str
|
||||
|
||||
with pytest.raises(RedisModelError):
|
||||
|
||||
class InvalidMember(m.BaseHashModel):
|
||||
address: Address
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_saves_many(m):
|
||||
member1 = m.Member(
|
||||
first_name="Andrew",
|
||||
last_name="Brookins",
|
||||
email="a@example.com",
|
||||
join_date=today,
|
||||
age=38,
|
||||
)
|
||||
member2 = m.Member(
|
||||
first_name="Kim",
|
||||
last_name="Brookins",
|
||||
email="k@example.com",
|
||||
join_date=today,
|
||||
age=34,
|
||||
)
|
||||
members = [member1, member2]
|
||||
result = await m.Member.add(members)
|
||||
assert result == [member1, member2]
|
||||
|
||||
assert await m.Member.get(pk=member1.pk) == member1
|
||||
assert await m.Member.get(pk=member2.pk) == member2
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_updates_a_model(members, m):
|
||||
member1, member2, member3 = members
|
||||
await member1.update(last_name="Smith")
|
||||
member = await m.Member.get(member1.pk)
|
||||
assert member.last_name == "Smith"
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_paginate_query(members, m):
|
||||
member1, member2, member3 = members
|
||||
actual = await m.Member.find().sort_by("age").all(batch_size=1)
|
||||
assert actual == [member2, member1, member3]
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_access_result_by_index_cached(members, m):
|
||||
member1, member2, member3 = members
|
||||
query = m.Member.find().sort_by("age")
|
||||
# Load the cache, throw away the result.
|
||||
assert query._model_cache == []
|
||||
await query.execute()
|
||||
assert query._model_cache == [member2, member1, member3]
|
||||
|
||||
# Access an item that should be in the cache.
|
||||
with mock.patch.object(query.model, "db") as mock_db:
|
||||
assert await query.get_item(0) == member2
|
||||
assert not mock_db.called
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_access_result_by_index_not_cached(members, m):
|
||||
member1, member2, member3 = members
|
||||
query = m.Member.find().sort_by("age")
|
||||
|
||||
# Assert that we don't have any models in the cache yet -- we
|
||||
# haven't made any requests of Redis.
|
||||
assert query._model_cache == []
|
||||
assert await query.get_item(0) == member2
|
||||
assert await query.get_item(1) == member1
|
||||
assert await query.get_item(2) == member3
|
||||
|
||||
|
||||
def test_schema(m, key_prefix):
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue