fix issue where certain fields were unintentionally being indexed

Author: sethbuff

.vscode/settings.json

@@ -0,0 +1,4 @@
+{
+    "python.testing.unittestEnabled": false,
+    "python.testing.pytestEnabled": true,
+}

aredis_om/model/model.py

@@ -1060,12 +1060,12 @@ def __dataclass_transform__(
 class FieldInfo(PydanticFieldInfo):
     name: str
 
-    def __init__(self, default: Any = Undefined, **kwargs: Any) -> None:
+    def __init__(self, default: Any = ..., **kwargs: Any) -> None:
         primary_key = kwargs.pop("primary_key", False)
-        sortable = kwargs.pop("sortable", Undefined)
-        case_sensitive = kwargs.pop("case_sensitive", Undefined)
-        index = kwargs.pop("index", Undefined)
-        full_text_search = kwargs.pop("full_text_search", Undefined)
+        sortable = kwargs.pop("sortable", None)
+        case_sensitive = kwargs.pop("case_sensitive", None)
+        index = kwargs.pop("index", None)
+        full_text_search = kwargs.pop("full_text_search", None)
         vector_options = kwargs.pop("vector_options", None)
         super().__init__(default=default, **kwargs)
         self.primary_key = primary_key
@@ -1372,7 +1372,13 @@ def outer_type_or_annotation(field: FieldInfo):
 
 
 class RedisModel(BaseModel, abc.ABC, metaclass=ModelMeta):
-    pk: Optional[str] = Field(default=None, primary_key=True, validate_default=True)
+    pk: Optional[str] = Field(
+        # Indexing for backwards compatibility, we might not want this in the future
+        default=None,
+        primary_key=True,
+        validate_default=True,
+        index=True,
+    )
     Meta = DefaultMeta
 
     model_config = ConfigDict(from_attributes=True)
@@ -1939,7 +1945,10 @@ def schema_for_type(
         field_info: PydanticFieldInfo,
         parent_type: Optional[Any] = None,
     ) -> str:
-        should_index = getattr(field_info, "index", False)
+        should_index = (
+            getattr(field_info, "index", False) is True
+            or getattr(field_info, "vector_options", None) is not None
+        )
         is_container_type = is_supported_container_type(typ)
         parent_is_container_type = is_supported_container_type(parent_type)
         parent_is_model = False

tests/test_json_model.py

@@ -6,6 +6,7 @@
 import decimal
 import uuid
 from collections import namedtuple
+from enum import Enum
 from typing import Dict, List, Optional, Set, Union
 from unittest import mock
 
@@ -951,6 +952,45 @@ class TypeWithUuid(JsonModel, index=True):
     await item.save()
 
 
+@py_test_mark_asyncio
+async def test_type_with_enum():
+    class TestEnum(Enum):
+        FOO = "foo"
+        BAR = "bar"
+
+    class TypeWithEnum(JsonModel, index=True):
+        enum: TestEnum
+
+    await Migrator().run()
+
+    item = TypeWithEnum(enum=TestEnum.FOO)
+
+    await item.save()
+
+    assert await TypeWithEnum.get(item.pk) == item
+
+
+@py_test_mark_asyncio
+async def test_type_with_list_of_enums(key_prefix, redis):
+    class TestEnum(Enum):
+        FOO = "foo"
+        BAR = "bar"
+
+    class BaseWithEnums(JsonModel):
+        enums: list[TestEnum]
+
+    class TypeWithEnums(BaseWithEnums, index=True):
+        pass
+
+    await Migrator().run()
+
+    item = TypeWithEnums(enums=[TestEnum.FOO])
+
+    await item.save()
+
+    assert await TypeWithEnums.get(item.pk) == item
+
+
 @py_test_mark_asyncio
 async def test_xfix_queries(m):
     await m.Member(