Skip to content

Replace execute_command with specific redis functions when possible #346

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.

Sign up for GitHub

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 2 commits into from
Aug 22, 2022
Merged

Replace execute_command with specific redis functions when possible #346

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a38a21e
replace execute_command
dvora-h Aug 11, 2022
74ce54e
change to root_path
dvora-h Aug 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions aredis_om/model/migrations/migrator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ async def create_index(conn: redis.Redis, index_name, schema, current_hash):
f"You attempted to create an index in database {db_number}"
)
try:
await conn.execute_command(f"ft.info {index_name}")
await conn.ft(index_name).info()
except redis.ResponseError:
await conn.execute_command(f"ft.create {index_name} {schema}")
# TODO: remove "type: ignore" when type stubs will be fixed
Expand Down Expand Up @@ -85,7 +85,7 @@ async def create(self):

async def drop(self):
try:
await self.conn.execute_command(f"FT.DROPINDEX {self.index_name}")
await self.conn.ft(self.index_name).dropindex()
except redis.ResponseError:
log.info("Index does not exist: %s", self.index_name)

Expand Down Expand Up @@ -115,7 +115,7 @@ async def detect_migrations(self):
current_hash = hashlib.sha1(schema.encode("utf-8")).hexdigest() # nosec

try:
await conn.execute_command("ft.info", cls.Meta.index_name)
await conn.ft(cls.Meta.index_name).info()
except redis.ResponseError:
self.migrations.append(
IndexMigration(
Expand Down
6 changes: 3 additions & 3 deletions aredis_om/model/model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1490,7 +1490,7 @@ async def save(
db = self._get_db(pipeline)

# TODO: Wrap response errors in a custom exception?
await db.execute_command("JSON.SET", self.key(), ".", self.json())
await db.json().set(self.key(), ".", json.loads(self.json()))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

instead of "." perhaps we should use the json.root_path?

return self

@classmethod
Expand Down Expand Up @@ -1535,8 +1535,8 @@ async def update(self, **field_values):

@classmethod
async def get(cls, pk: Any) -> "JsonModel":
document = await cls.db().execute_command("JSON.GET", cls.make_primary_key(pk))
if not document:
document = json.dumps(await cls.db().json().get(cls.make_key(pk)))
if document == "null":
raise NotFoundError
return cls.parse_raw(document)

Expand Down
2 changes: 1 addition & 1 deletion tests/test_json_model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ async def test_saves_many_explicit_transaction(address, m):
async with m.Member.db().pipeline(transaction=True) as pipeline:
await m.Member.add(members, pipeline=pipeline)
assert result == [member1, member2]
assert await pipeline.execute() == ["OK", "OK"]
assert await pipeline.execute() == [True, True]

assert await m.Member.get(pk=member1.pk) == member1
assert await m.Member.get(pk=member2.pk) == member2
Expand Down