rapyer 1.1.5__tar.gz → 1.1.6__tar.gz

{rapyer-1.1.5 → rapyer-1.1.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rapyer
-Version: 1.1.5
+Version: 1.1.6
 Summary: Pydantic models with Redis as the backend
 License: MIT
 Keywords: redis,redis-json,pydantic,pydantic-v2,orm,database,async,nosql,cache,key-value,data-modeling,python,backend,storage,serialization,validation

{rapyer-1.1.5 → rapyer-1.1.6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [project]
 name = "rapyer"
-version = "1.1.5"
+version = "1.1.6"
 description = "Pydantic models with Redis as the backend"
 authors = [{name = "YedidyaHKfir", email = "yedidyakfir@gmail.com"}]
 readme = "README.md"
@@ -75,6 +75,10 @@ packages = [{include = "rapyer"}]
 black = "^25.9.0"
 mypy = "^1.0.0"
 
+[tool.bandit]
+exclude_dirs = ["tests"]
+skips = ["B101"]  # assert_used - valid in test files
+
 [tool.coverage.run]
 source = ["rapyer"]
 omit = ["*/tests/*", "*/test_*"]

{rapyer-1.1.5 → rapyer-1.1.6}/rapyer/base.py

@@ -15,13 +15,9 @@ from pydantic import (
     model_validator,
     field_serializer,
     field_validator,
+    ValidationError,
 )
 from pydantic_core.core_schema import FieldSerializationInfo, ValidationInfo
-from redis.commands.search.index_definition import IndexDefinition, IndexType
-from redis.commands.search.query import Query
-from redis.exceptions import NoScriptError
-from typing_extensions import deprecated
-
 from rapyer.config import RedisConfig
 from rapyer.context import _context_var, _context_xx_pipe
 from rapyer.errors.base import (
@@ -56,6 +52,10 @@ from rapyer.utils.redis import (
     update_keys_in_pipeline,
     refresh_ttl_if_needed,
 )
+from redis.commands.search.index_definition import IndexDefinition, IndexType
+from redis.commands.search.query import Query
+from redis.exceptions import NoScriptError, ResponseError
+from typing_extensions import deprecated
 
 logger = logging.getLogger("rapyer")
 
@@ -169,6 +169,9 @@ class AtomicRedisModel(BaseModel):
         field_path = self.field_path
         return f"${field_path}" if field_path else "$"
 
+    def should_refresh(self):
+        return self.Meta.refresh_ttl and self.Meta.ttl is not None
+
     @classmethod
     def redis_schema(cls, redis_name: str = ""):
         fields = []
@@ -399,6 +402,11 @@ class AtomicRedisModel(BaseModel):
             self.Meta.redis, self.key, self.Meta.ttl, self.Meta.refresh_ttl
         )
 
+    async def aset_ttl(self, ttl: int) -> None:
+        if self.is_inner_model():
+            raise RuntimeError("Can only set TTL from top level model")
+        await self.Meta.redis.expire(self.key, ttl)
+
     @classmethod
     @deprecated(
         "get() classmethod is deprecated and will be removed in rapyer 1.2.0, use aget instead"
@@ -446,49 +454,66 @@ class AtomicRedisModel(BaseModel):
         return instance
 
     @classmethod
-    async def afind(cls, *expressions):
-        # Original behavior when no expressions provided - return all
-        if not expressions:
-            keys = await cls.afind_keys()
-            if not keys:
-                return []
+    async def afind(cls, *args):
+        # Separate keys (str) from expressions (Expression)
+        provided_keys = [arg for arg in args if isinstance(arg, str)]
+        expressions = [arg for arg in args if isinstance(arg, Expression)]
+
+        if provided_keys and expressions:
+            logger.warning(
+                "afind called with both keys and expressions; expressions ignored"
+            )
 
-            models = await cls.Meta.redis.json().mget(keys=keys, path="$")
-        else:
-            # With expressions - use Redis Search
-            # Combine all expressions with & operator
+        if provided_keys:
+            # Case 1: Extract by keys
+            targeted_keys = [
+                k if ":" in k else f"{cls.class_key_initials()}:{k}"
+                for k in provided_keys
+            ]
+        elif expressions:
+            # Case 2: Extract by expressions
             combined_expression = functools.reduce(lambda a, b: a & b, expressions)
             query_string = combined_expression.create_filter()
-
-            # Create a Query object
             query = Query(query_string).no_content()
-
-            # Try to search using the index
             index_name = cls.index_name()
             search_result = await cls.Meta.redis.ft(index_name).search(query)
-
             if not search_result.docs:
                 return []
+            targeted_keys = [doc.id for doc in search_result.docs]
+        else:
+            # Case 3: Extract all
+            targeted_keys = await cls.afind_keys()
 
-            # Get the keys from search results
-            keys = [doc.id for doc in search_result.docs]
-
-            # Fetch the actual documents
-            models = await cls.Meta.redis.json().mget(keys=keys, path="$")
+        if not targeted_keys:
+            return []
 
-        if cls.Meta.ttl is not None and cls.Meta.refresh_ttl:
-            async with cls.Meta.redis.pipeline() as pipe:
-                for key in keys:
-                    pipe.expire(key, cls.Meta.ttl)
-                await pipe.execute()
+        # Fetch the actual documents
+        models = await cls.Meta.redis.json().mget(keys=targeted_keys, path="$")
 
         instances = []
-        for model, key in zip(models, keys):
+        for model, key in zip(models, targeted_keys):
+            if model is None:
+                continue
             context = {REDIS_DUMP_FLAG_NAME: True, FAILED_FIELDS_KEY: set()}
-            model = cls.model_validate(model[0], context=context)
+            try:
+                model = cls.model_validate(model[0], context=context)
+            except ValidationError as exc:
+                logger.debug(
+                    "Skipping key %s due to validation error during afind: %s",
+                    key,
+                    exc,
+                )
+                continue
             model.key = key
             model._failed_fields = context.get(FAILED_FIELDS_KEY, set())
             instances.append(model)
+
+        if cls.Meta.ttl is not None and cls.Meta.refresh_ttl:
+            async with cls.Meta.redis.pipeline() as pipe:
+                for model in instances:
+                    pipe.expire(model.key, cls.Meta.ttl)
+                await pipe.execute()
+
         return instances
 
     @classmethod
@@ -616,9 +641,21 @@ class AtomicRedisModel(BaseModel):
             noscript_on_retry = False
 
             try:
+                if self.should_refresh():
+                    pipe.expire(self.key, self.Meta.ttl)
                 await pipe.execute()
             except NoScriptError:
                 noscript_on_first_attempt = True
+            except ResponseError as exc:
+                if ignore_if_deleted:
+                    logger.warning(
+                        "Swallowed ResponseError during pipeline.execute() with "
+                        "ignore_if_deleted=True for key %r: %s",
+                        getattr(self, "key", None),
+                        exc,
+                    )
+                else:
+                    raise
 
             if noscript_on_first_attempt:
                 await handle_noscript_error(self.Meta.redis)
@@ -642,9 +679,6 @@ class AtomicRedisModel(BaseModel):
                     "This indicates a server-side problem with Redis."
                 )
 
-            await refresh_ttl_if_needed(
-                self.Meta.redis, self.key, self.Meta.ttl, self.Meta.refresh_ttl
-            )
             _context_var.set(None)
             _context_xx_pipe.set(False)
 

{rapyer-1.1.5 → rapyer-1.1.6}/rapyer/fields/expression.py

@@ -1,7 +1,6 @@
 from typing import Any
 
 from pydantic import TypeAdapter
-
 from rapyer.errors import BadFilterError
 from rapyer.types.base import REDIS_DUMP_FLAG_NAME
 from rapyer.typing_support import Unpack

{rapyer-1.1.5 → rapyer-1.1.6}/rapyer/init.py

@@ -1,9 +1,10 @@
-import redis.asyncio as redis_async
-from redis import ResponseError
-from redis.asyncio.client import Redis
+import logging
 
+import redis.asyncio as redis_async
 from rapyer.base import REDIS_MODELS
 from rapyer.scripts import register_scripts
+from redis import ResponseError
+from redis.asyncio.client import Redis
 
 
 async def init_rapyer(
@@ -11,7 +12,15 @@ async def init_rapyer(
     ttl: int = None,
     override_old_idx: bool = True,
     prefer_normal_json_dump: bool = None,
+    logger: logging.Logger = None,
 ):
+    if logger is not None:
+        rapyer_logger = logging.getLogger("rapyer")
+        rapyer_logger.setLevel(logger.level)
+        rapyer_logger.handlers.clear()
+        for handler in logger.handlers:
+            rapyer_logger.addHandler(handler)
+
     if isinstance(redis, str):
         redis = redis_async.from_url(redis, decode_responses=True, max_connections=20)
 

{rapyer-1.1.5 → rapyer-1.1.6}/rapyer/types/base.py

@@ -8,13 +8,12 @@ from typing import get_args, Any, TypeVar, Generic
 from pydantic import GetCoreSchemaHandler, TypeAdapter
 from pydantic_core import core_schema
 from pydantic_core.core_schema import ValidationInfo, CoreSchema, SerializationInfo
-from redis.commands.search.field import TextField
-from typing_extensions import deprecated
-
 from rapyer.context import _context_var
 from rapyer.errors.base import CantSerializeRedisValueError
 from rapyer.typing_support import Self
 from rapyer.utils.redis import refresh_ttl_if_needed
+from redis.commands.search.field import TextField
+from typing_extensions import deprecated
 
 logger = logging.getLogger("rapyer")
 

{rapyer-1.1.5 → rapyer-1.1.6}/rapyer/types/byte.py

@@ -2,7 +2,6 @@ from typing import TypeAlias, TYPE_CHECKING
 
 from pydantic_core import core_schema
 from pydantic_core.core_schema import ValidationInfo, SerializationInfo
-
 from rapyer.types.base import RedisType, REDIS_DUMP_FLAG_NAME
 
 

{rapyer-1.1.5 → rapyer-1.1.6}/rapyer/types/convert.py

@@ -1,7 +1,6 @@
 from typing import get_origin
 
 from pydantic import BaseModel, PrivateAttr, TypeAdapter
-
 from rapyer.types.base import RedisType
 from rapyer.utils.annotation import TypeConverter, DYNAMIC_CLASS_DOC
 from rapyer.utils.pythonic import safe_issubclass

{rapyer-1.1.5 → rapyer-1.1.6}/rapyer/types/datetime.py

@@ -3,9 +3,8 @@ from typing import TYPE_CHECKING
 
 from pydantic_core import core_schema
 from pydantic_core.core_schema import ValidationInfo, SerializationInfo
-from redis.commands.search.field import NumericField
-
 from rapyer.types.base import RedisType, REDIS_DUMP_FLAG_NAME
+from redis.commands.search.field import NumericField
 
 
 class RedisDatetime(datetime, RedisType):

{rapyer-1.1.5 → rapyer-1.1.6}/rapyer/types/dct.py

@@ -1,7 +1,6 @@
 from typing import TypeVar, Generic, get_args, Any, TypeAlias, TYPE_CHECKING
 
 from pydantic_core import core_schema
-
 from rapyer.types.base import (
     GenericRedisType,
     RedisType,

{rapyer-1.1.5 → rapyer-1.1.6}/rapyer/types/float.py

@@ -1,9 +1,8 @@
 from typing import TypeAlias, TYPE_CHECKING
 
-from redis.commands.search.field import NumericField
-
 from rapyer.types.base import RedisType
 from rapyer.utils.redis import refresh_ttl_if_needed
+from redis.commands.search.field import NumericField
 
 
 class RedisFloat(float, RedisType):

{rapyer-1.1.5 → rapyer-1.1.6}/rapyer/types/integer.py

@@ -1,10 +1,9 @@
 from typing import TypeAlias, TYPE_CHECKING
 
-from redis.commands.search.field import NumericField
-from typing_extensions import deprecated
-
 from rapyer.types.base import RedisType
 from rapyer.utils.redis import refresh_ttl_if_needed
+from redis.commands.search.field import NumericField
+from typing_extensions import deprecated
 
 
 class RedisInt(int, RedisType):

{rapyer-1.1.5 → rapyer-1.1.6}/rapyer/types/lst.py

@@ -4,8 +4,6 @@ from typing import TypeVar, TYPE_CHECKING
 
 from pydantic_core import core_schema
 from pydantic_core.core_schema import ValidationInfo, SerializationInfo
-from typing_extensions import TypeAlias
-
 from rapyer.scripts import run_sha, REMOVE_RANGE_SCRIPT_NAME
 from rapyer.types.base import (
     GenericRedisType,
@@ -14,6 +12,7 @@ from rapyer.types.base import (
     SKIP_SENTINEL,
 )
 from rapyer.utils.redis import refresh_ttl_if_needed
+from typing_extensions import TypeAlias
 
 logger = logging.getLogger("rapyer")