Skip to content
Open
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
3 changes: 3 additions & 0 deletions integration/test_backup_v4.py
Original file line number Diff line number Diff line change
Expand Up @@ -662,6 +662,9 @@ def test_list_backup(client: weaviate.WeaviateClient, request: SubRequest) -> No

backups = client.backup.list_backups(backend=BACKEND)
assert backup_id.lower() in [b.backup_id.lower() for b in backups]
backup = next(b for b in backups if b.backup_id.lower() == backup_id.lower())
if backup.status in (BackupStatus.STARTED, BackupStatus.TRANSFERRING):
assert backup.completed_at is None

# wait until created
while True:
Expand Down
2 changes: 2 additions & 0 deletions integration/test_export.py
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,9 @@ def test_create_export_without_waiting(
ExportStatus.SUCCESS,
]
if status.status == ExportStatus.SUCCESS:
assert status.completed_at is not None
break
assert status.completed_at is None
time.sleep(0.1)

assert status.export_id.lower() == export_id.lower()
Expand Down
17 changes: 17 additions & 0 deletions test/test_backup.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
from datetime import datetime, timezone
from typing import Any, Dict

import pytest
Expand Down Expand Up @@ -39,3 +40,19 @@ def test_list_return_defaults_incremental_base_backup_id_to_none(entry: Dict[str
# The server omits the field for non-incremental backups, and only populates
# it for callers it has confirmed as root, so absent must not be an error.
assert BackupListReturn(**entry).incremental_base_backup_id is None


def test_list_return_maps_unset_completed_at_to_none() -> None:
# A running backup is listed with Go's zero time as its completedAt.
backup = BackupListReturn(
**_list_entry(status="STARTED", completedAt="0001-01-01T00:00:00.000Z")
)

assert backup.completed_at is None
assert backup.started_at == datetime(2026, 8, 1, 10, 0, tzinfo=timezone.utc)


def test_list_return_keeps_set_completed_at() -> None:
backup = BackupListReturn(**_list_entry())

assert backup.completed_at == datetime(2026, 8, 1, 10, 5, tzinfo=timezone.utc)
36 changes: 36 additions & 0 deletions test/test_export.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
from datetime import datetime, timezone
from typing import Any, Dict

from weaviate.export.export import ExportStatus, ExportStatusReturn


def _status(**overrides: Any) -> Dict[str, Any]:
"""An export status as Weaviate's ``GET /export/{backend}/{id}`` returns it."""
status: Dict[str, Any] = {
"id": "my-export",
"backend": "filesystem",
"path": "/tmp/exports/my-export",
"classes": ["Article"],
"status": "SUCCESS",
"startedAt": "2026-08-01T10:00:00.000Z",
"completedAt": "2026-08-01T10:05:00.000Z",
"tookInMs": 300000,
}
status.update(overrides)
return status


def test_status_return_maps_unset_completed_at_to_none() -> None:
# A running export reports Go's zero time as its completedAt.
status = ExportStatusReturn(
**_status(status="TRANSFERRING", completedAt="0001-01-01T00:00:00.000Z", tookInMs=None)
)

assert status.status == ExportStatus.TRANSFERRING
assert status.completed_at is None


def test_status_return_keeps_set_completed_at() -> None:
status = ExportStatusReturn(**_status())

assert status.completed_at == datetime(2026, 8, 1, 10, 5, tzinfo=timezone.utc)
8 changes: 7 additions & 1 deletion weaviate/backup/backup.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@
from enum import Enum
from typing import Any, Dict, List, Optional, cast

from pydantic import BaseModel, Field
from pydantic import BaseModel, Field, field_validator

from weaviate.backup.backup_location import _BackupLocationConfig
from weaviate.util import _zero_time_to_none

STORAGE_NAMES = {
"filesystem",
Expand Down Expand Up @@ -107,3 +108,8 @@ class BackupListReturn(BaseModel):
# None when the backup is not incremental, and also when the server omits the
# field: it is only returned to callers Weaviate has confirmed as root.
incremental_base_backup_id: Optional[str] = Field(default=None)

@field_validator("completed_at")
@classmethod
def _completed_at_unset_to_none(cls, v: Optional[datetime]) -> Optional[datetime]:
return _zero_time_to_none(v)
8 changes: 7 additions & 1 deletion weaviate/export/export.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@
from enum import Enum
from typing import Dict, List, Optional

from pydantic import BaseModel, Field
from pydantic import BaseModel, Field, field_validator

from weaviate.backup.backup import BackupStorage
from weaviate.util import _zero_time_to_none

ExportStorage = BackupStorage

Expand Down Expand Up @@ -69,3 +70,8 @@ class ExportStatusReturn(ExportCreateReturn):
)
error: Optional[str] = None
took_in_ms: Optional[int] = Field(alias="tookInMs", default=None)

@field_validator("completed_at")
@classmethod
def _completed_at_unset_to_none(cls, v: Optional[datetime]) -> Optional[datetime]:
return _zero_time_to_none(v)
10 changes: 3 additions & 7 deletions weaviate/users/base.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from datetime import datetime, timezone
from datetime import datetime
from typing import Any, Dict, Generic, List, Literal, Optional, Union, cast, overload

from httpx import Response
Expand All @@ -19,17 +19,13 @@
OwnUser,
UserDB,
)
from weaviate.util import _decode_json_response_dict, escape_string

# Go's zero time value, returned by the server when a timestamp is not set
_GO_ZERO_TIME = datetime(1, 1, 1, 0, 0, tzinfo=timezone.utc)
from weaviate.util import _decode_json_response_dict, _zero_time_to_none, escape_string


def _parse_optional_timestamp(value: Optional[str]) -> Optional[datetime]:
if value is None:
return None
dt = datetime.fromisoformat(value.replace("Z", "+00:00"))
return None if dt == _GO_ZERO_TIME else dt
return _zero_time_to_none(datetime.fromisoformat(value.replace("Z", "+00:00")))


class _BaseExecutor(Generic[ConnectionType]):
Expand Down
8 changes: 8 additions & 0 deletions weaviate/util.py
Original file line number Diff line number Diff line change
Expand Up @@ -789,6 +789,14 @@ def _datetime_from_weaviate_str(string: str) -> Optional[datetime.datetime]:
raise e


def _zero_time_to_none(value: Optional[datetime.datetime]) -> Optional[datetime.datetime]:
# Weaviate sends Go's zero time (0001-01-01T00:00:00Z) for timestamps it has not set yet,
# for example `completedAt` while a backup or export is still running.
if value is not None and value.replace(tzinfo=None) == datetime.datetime.min:
return None
return value


class _WeaviateUUIDInt(uuid_lib.UUID):
def __init__(self, hex_: int) -> None:
object.__setattr__(self, "int", hex_)
Expand Down
Loading