Index merging improvements

[mikelei8291]

I was trying to create two indexes on the same field for my model:

class Order(OrderInit, Document):
    created_at: Annotated[
        AwareDatetime,
        Field(default_factory=lambda: datetime.now(UTC))
    ]
    status: Annotated[OrderStatus, Indexed()]

    class Settings:
        indexes = [
            IndexModel(
                "created_at", name="processing_expire_30", expireAfterSeconds=30, partialFilterExpression={"status": "processing"}
            ),
            IndexModel(
                "created_at", name="unpaid_expire_900", expireAfterSeconds=900, partialFilterExpression={"status": "unpaid"}
            )
        ]

However, the current implementation will overwrite the first index definition with the second one because they have the same dict key if the key is index.fields. I changed the key to index.name so by providing a different name than the default one, the indexes will no longer overwrite each others.

Also I was trying to make it work with Annotated too:

class Order(OrderInit, Document):
    created_at: Annotated[
        AwareDatetime,
        Indexed(name="processing_expire_30", expireAfterSeconds=30, partialFilterExpression={"status": "processing"}),
        Indexed(name="unpaid_expire_900", expireAfterSeconds=900, partialFilterExpression={"status": "unpaid"}),
        Field(default_factory=lambda: datetime.now(UTC))
    ]
    status: Annotated[OrderStatus, Indexed()]

but it would change the return type of get_index_attributes() so I didn't go further.

[adeelsohailahmed]

Hi @mikelei8291, thanks for spotting and fixing this bug. Your implementation looks sound to me. Could you please add a test for this case too?

[staticxterm]

Hi @mikelei8291, thank you for the PR.
As Adeel mentioned, please fix any failing tests and write some new ones with example models and indexes so that we have this behavior (what was previously a bug) covered with tests.

[github-actions]

This PR is stale because it has been open 45 days with no activity.

[github-actions]

This PR is stale because it has been open 45 days with no activity.

[staticxterm]

I am still working on this. It's tricky. Sometimes we want to merge the indexes, sometimes not.

Comments not valid anymore.

[github-actions]

This PR is stale because it has been open 45 days with no activity.

[github-actions]

This PR is stale because it has been open 45 days with no activity.