Merge branch 'main' into fix-pk

Author: chayim

aredis_om/model/migrations/migrator.py

@@ -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
@@ -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)
 
@@ -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(

aredis_om/model/model.py

@@ -31,6 +31,7 @@
 from pydantic.main import ModelMetaclass, validate_model
 from pydantic.typing import NoArgAnyCallable
 from pydantic.utils import Representation
+from redis.commands.json.path import Path
 from typing_extensions import Protocol, get_args, get_origin
 from ulid import ULID
 
@@ -1495,7 +1496,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(), Path.root_path(), json.loads(self.json()))
         return self
 
     @classmethod
@@ -1540,8 +1541,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)
 

pyproject.toml

@@ -1,26 +1,39 @@
 [tool.poetry]
 name = "redis-om"
 version = "0.0.27"
-description = "Objecting mapping, and more, for Redis."
-authors = ["Andrew Brookins <andrew.brookins@redis.com>"]
-maintainers = ["Andrew Brookins <andrew.brookins@redis.com>"]
+description = "Object mappings, and more, for Redis."
+authors = ["Redis OSS <oss@redis.com>"]
+maintainers = ["Redis OSS <oss@redis.com>"]
 license = "BSD-3-Clause"
 readme = "README.md"
-repository = "https://github.com/redis-developer/redis-om-python"
+repository = "https://github.com/redis/redis-om-python"
 packages = [
     { "include" = "aredis_om" },
 ]
 classifiers = [
     "Development Status :: 3 - Alpha",
+    "Environment :: Console",
     "Intended Audience :: Developers",
-    "Topic :: Database :: Front-Ends",
+    "Operating System :: OS Independent",
+    "Topic :: Database",
+    'License :: OSI Approved :: BSD License',
+    'Programming Language :: Python :: 3.10',
+    'Programming Language :: Python :: 3.6',
+    'Programming Language :: Python :: 3.7',
+    'Programming Language :: Python :: 3.8',
+    'Programming Language :: Python :: 3.9',
+    'Programming Language :: Python',
 ]
 include=[
     "docs/*",
     "images/*",
     "redis_om/**/*",
 ]
 
+[tool.poetry.urls]
+"Code" = "https://github.com/redis/redis-om-python"
+"Issue tracker" = "https://github.com/redis/redis-om-python/issues"
+
 [tool.poetry.dependencies]
 python = "^3.7,<=3.11"
 redis = ">=3.5.3,<5.0.0"
@@ -29,7 +42,6 @@ pydantic = "^1.8.2"
 click = "^8.0.1"
 pptree = "^3.1"
 types-redis = ">=3.5.9,<5.0.0"
-types-six = "^1.16.1"
 python-ulid = "^1.0.3"
 cleo = "1.0.0a5"
 typing-extensions = "^4.0.0"
@@ -40,7 +52,6 @@ more-itertools = "^8.14.0"
 mypy = "^0.971"
 pytest = "^7.1.2"
 ipdb = "^0.13.9"
-pylint = "^2.13.9"
 black = "^22.6"
 isort = "^5.9.3"
 flake8 = "^5.0.4"
@@ -60,4 +71,4 @@ migrate = "redis_om.model.cli.migrate:migrate"
 
 [build-system]
 requires = ["poetry-core>=1.0.0"]
-build-backend = "poetry.core.masonry.api"
+build-backend = "poetry.core.masonry.api"

tests/test_json_model.py

@@ -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