Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 25 additions & 1 deletion test/collection/test_config_update.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from typing import Optional
from datetime import timedelta
from typing import Optional, Union

import pytest

Expand All @@ -11,6 +12,29 @@
from weaviate.exceptions import WeaviateInvalidInputError


@pytest.mark.parametrize(
"offset,expected",
[(None, None), (0, 0), (timedelta(seconds=120), 120)],
)
def test_object_ttl_update_offset(
offset: Optional[Union[int, timedelta]], expected: Optional[int]
) -> None:
update = Reconfigure.ObjectTTL.delete_by_date_property(
filter_expired_objects=True, ttl_offset=offset
)
assert update.defaultTtl == expected
merged = update.merge_with_existing(
{
"enabled": True,
"deleteOn": "expiresAt",
"defaultTtl": 3600,
"filterExpiredObjects": False,
}
)
assert merged["defaultTtl"] == (3600 if expected is None else expected)
assert merged["filterExpiredObjects"] is True


@pytest.mark.parametrize(
"schema,should_error",
[
Expand Down
4 changes: 1 addition & 3 deletions weaviate/collections/classes/config_object_ttl.py
Original file line number Diff line number Diff line change
Expand Up @@ -145,13 +145,11 @@ def delete_by_date_property(

Args:
property_name: The name of the date property to use for object expiration.
ttl_offset: The time-to-live for objects relative to the date (seconds if integer). Can be negative for indicating that objects should expire before the date property value.
ttl_offset: The time-to-live for objects relative to the date (seconds if integer). Can be negative for indicating that objects should expire before the date property value. If `None`, omit the offset from the update. Pass `0` to explicitly reset it.
filter_expired_objects: If enabled, exclude expired but not deleted objects from search results.
"""
if isinstance(ttl_offset, datetime.timedelta):
ttl_offset = int(ttl_offset.total_seconds())
if ttl_offset is None:
ttl_offset = 0
return ObjectTTLConfigUpdate(
enabled=True,
deleteOn=property_name,
Expand Down
Loading