Merge branch 'main' into dependabot/github_actions/codecov/codecov-action-5

Author: abrookins

.github/wordlist.txt

@@ -56,3 +56,7 @@ validator
 validators
 virtualenv
 http
+AMR
+EntraID
+entraid
+metamodel

.github/workflows/ci.yml

@@ -76,7 +76,7 @@ jobs:
     strategy:
       matrix:
         os: [ ubuntu-latest ]
-        pyver: [ "3.8", "3.9", "3.10", "3.11", "3.12", "pypy-3.8", "pypy-3.9", "pypy-3.10" ]
+        pyver: [ "3.9", "3.10", "3.11", "3.12", "pypy-3.9", "pypy-3.10" ]
         redisstack: [ "latest" ]
       fail-fast: false
     services:

.github/workflows/pypi-publish.yaml

@@ -42,7 +42,7 @@ jobs:
 
       - name: Set Poetry config
         run: |
-          pip install --upgrade pip poetry
+          pip install --upgrade pip poetry==1.8.4
           poetry config virtualenvs.in-project false
           poetry config virtualenvs.path ~/.virtualenvs
           poetry export --dev --without-hashes -o requirements.txt

README.md

@@ -1,7 +1,7 @@
 <div align="center">
   <br/>
   <br/>
-  <img width="360" src="https://raw.githubusercontent.com/redis-developer/redis-om-python/main/images/logo.svg?token=AAAXXHUYL6RHPESRRAMBJOLBSVQXE" alt="Redis OM" />
+  <img width="360" src="docs/images/logo.svg" alt="Redis OM" />
   <br/>
   <br/>
 </div>
@@ -370,6 +370,36 @@ You can run these modules in your self-hosted Redis deployment, or you can use [
 
 To learn more, read [our documentation](docs/redis_modules.md).
 
+## Connecting to Azure Managed Redis with EntraID
+
+Once you have EntraID setup for your Azure Managed Redis (AMR) deployment, you can use Redis OM Python with it by leveraging the [redis-py-entraid](https://github.com/redis/redis-py-entraid) library.
+Simply install the library with:
+
+```
+pip install redis-entraid
+```
+
+Then you'll initialize your credentials provider, connect to redis, and pass the database object into your metamodel:
+
+```python
+
+from redis import Redis
+from redis_entraid.cred_provider import create_from_default_azure_credential
+from redis_om import HashModel, Field
+credential_provider = create_from_default_azure_credential(
+        ("https://redis.azure.com/.default",),
+    )
+
+db = Redis(host="cluster-name.region.redis.azure.net", port=10000, ssl=True, ssl_cert_reqs=None, credential_provider=credential_provider)
+db.flushdb()
+class User(HashModel):
+    first_name: str
+    last_name: str = Field(index=True)
+
+    class Meta:
+        database = db
+```
+
 ## ❤️ Contributing
 
 We'd love your contributions!

aredis_om/_compat.py

@@ -1,5 +1,4 @@
 from functools import lru_cache
-from typing import List
 
 from aredis_om.connections import get_redis_connection
 

aredis_om/checks.py

@@ -31,7 +31,9 @@
 from types import GeneratorType
 from typing import Any, Callable, Dict, List, Optional, Set, Tuple, Union
 
-from .._compat import ENCODERS_BY_TYPE, BaseModel
+from pydantic import BaseModel
+from pydantic.deprecated.json import ENCODERS_BY_TYPE
+from pydantic_core import PydanticUndefined
 
 
 SetIntStr = Set[Union[int, str]]
@@ -72,7 +74,7 @@ def jsonable_encoder(
         encoder = getattr(obj.__config__, "json_encoders", {})
         if custom_encoder:
             encoder.update(custom_encoder)
-        obj_dict = obj.dict(
+        obj_dict = obj.model_dump(
             include=include,  # type: ignore # in Pydantic
             exclude=exclude,  # type: ignore # in Pydantic
             by_alias=by_alias,
@@ -106,6 +108,7 @@ def jsonable_encoder(
                     or (not isinstance(key, str))
                     or (not key.startswith("_sa"))
                 )
+                and value is not PydanticUndefined
                 and (value is not None or not exclude_none)
                 and ((include and key in include) or not exclude or key not in exclude)
             ):

aredis_om/model/encoders.py

@@ -130,6 +130,9 @@ async def detect_migrations(self):
                 continue
 
             stored_hash = await conn.get(hash_key)
+            if isinstance(stored_hash, bytes):
+                stored_hash = stored_hash.decode("utf-8")
+
             schema_out_of_date = current_hash != stored_hash
 
             if schema_out_of_date: