improve mock for edge cases.

always parse lastUsedAt regardless of parameter

Author: dudanogueira

integration/test_users.py

@@ -222,7 +222,7 @@ def test_get_user_created_at_and_api_key_first_letters(client_factory: ClientFac
             pytest.skip("This test requires Weaviate 1.30.0 or higher")
 
         randomUserName = "new-user" + str(random.randint(1, 1000))
-        apiKey = client.users.db.create(user_id=randomUserName)
+        client.users.db.create(user_id=randomUserName)
         try:
             user = client.users.db.get(user_id=randomUserName)
             assert user is not None

mock_tests/test_users.py

@@ -17,11 +17,18 @@
     "userId": "test-user",
 }
 
+USER_DATA_NO_LAST_USED = {k: v for k, v in USER_DATA.items() if k != "lastUsedAt"}
+
 USERS_DATA = [
     USER_DATA,
     {**USER_DATA, "userId": "test-user-2"},
 ]
 
+USERS_DATA_NO_LAST_USED = [
+    USER_DATA_NO_LAST_USED,
+    {**USER_DATA_NO_LAST_USED, "userId": "test-user-2"},
+]
+
 EXPECTED_CREATED_AT = datetime(2026, 2, 24, 19, 15, 18, 574000, tzinfo=timezone.utc)
 EXPECTED_LAST_USED_AT = datetime(2026, 2, 25, 20, 57, 36, 419000, tzinfo=timezone.utc)
 
@@ -33,7 +40,7 @@ def test_get_user_without_last_used_time(
 
     def handler(request: Request) -> Response:
         captured["params"] = dict(request.args)
-        return Response(json.dumps(USER_DATA), content_type="application/json", status=200)
+        return Response(json.dumps(USER_DATA_NO_LAST_USED), content_type="application/json", status=200)
 
     weaviate_no_auth_mock.expect_request("/v1/users/db/test-user").respond_with_handler(handler)
 
@@ -95,7 +102,7 @@ def test_list_all_without_last_used_time(
 
     def handler(request: Request) -> Response:
         captured["params"] = dict(request.args)
-        return Response(json.dumps(USERS_DATA), content_type="application/json", status=200)
+        return Response(json.dumps(USERS_DATA_NO_LAST_USED), content_type="application/json", status=200)
 
     weaviate_no_auth_mock.expect_request("/v1/users/db").respond_with_handler(handler)
 
@@ -133,3 +140,61 @@ def handler(request: Request) -> Response:
         assert user.last_used_time == EXPECTED_LAST_USED_AT
         assert user.created_at == EXPECTED_CREATED_AT
     assert captured["params"].get("includeLastUsedTime") in ("True", "true")
+
+
+def test_get_user_missing_created_at(
+    weaviate_no_auth_mock: HTTPServer, start_grpc_server: grpc.Server
+) -> None:
+    data = {k: v for k, v in USER_DATA.items() if k != "createdAt"}
+    weaviate_no_auth_mock.expect_request("/v1/users/db/test-user").respond_with_response(
+        Response(json.dumps(data), content_type="application/json", status=200)
+    )
+
+    with weaviate.connect_to_local(
+        host=MOCK_IP, port=MOCK_PORT, grpc_port=MOCK_PORT_GRPC
+    ) as client:
+        user = client.users.db.get(user_id="test-user")
+
+    assert user is not None
+    assert user.created_at is None
+    assert user.last_used_time == EXPECTED_LAST_USED_AT
+
+
+def test_get_user_missing_api_key_first_letters(
+    weaviate_no_auth_mock: HTTPServer, start_grpc_server: grpc.Server
+) -> None:
+    data = {k: v for k, v in USER_DATA.items() if k != "apiKeyFirstLetters"}
+    weaviate_no_auth_mock.expect_request("/v1/users/db/test-user").respond_with_response(
+        Response(json.dumps(data), content_type="application/json", status=200)
+    )
+
+    with weaviate.connect_to_local(
+        host=MOCK_IP, port=MOCK_PORT, grpc_port=MOCK_PORT_GRPC
+    ) as client:
+        user = client.users.db.get(user_id="test-user")
+
+    assert user is not None
+    assert user.api_key_first_letters is None
+    assert user.created_at == EXPECTED_CREATED_AT
+
+
+def test_get_user_last_used_time_parsed_when_include_false(
+    weaviate_no_auth_mock: HTTPServer, start_grpc_server: grpc.Server
+) -> None:
+    """If the API returns lastUsedAt the client must parse it regardless of include_last_used_time."""
+    captured: dict = {}
+
+    def handler(request: Request) -> Response:
+        captured["params"] = dict(request.args)
+        return Response(json.dumps(USER_DATA), content_type="application/json", status=200)
+
+    weaviate_no_auth_mock.expect_request("/v1/users/db/test-user").respond_with_handler(handler)
+
+    with weaviate.connect_to_local(
+        host=MOCK_IP, port=MOCK_PORT, grpc_port=MOCK_PORT_GRPC
+    ) as client:
+        user = client.users.db.get(user_id="test-user")  # include_last_used_time defaults to False
+
+    assert user is not None
+    assert user.last_used_time == EXPECTED_LAST_USED_AT
+    assert captured["params"].get("includeLastUsedTime") in ("False", "false")

weaviate/users/base.py

@@ -468,7 +468,7 @@ def resp(res: Response) -> Optional[UserDB]:
             parsed = _decode_json_response_dict(res, "Get user")
             assert parsed is not None
             created_at = parsed.get("createdAt")
-            last_used_at = parsed.get("lastUsedAt") if include_last_used_time else None
+            last_used_at = parsed.get("lastUsedAt")
             return UserDB(
                 user_id=parsed["userId"],
                 role_names=parsed["roles"],
@@ -519,7 +519,7 @@ def resp(res: Response) -> List[UserDB]:
                     ),
                     last_used_time=(
                         datetime.fromisoformat(lua.replace("Z", "+00:00"))
-                        if include_last_used_time and (lua := user.get("lastUsedAt")) is not None
+                        if (lua := user.get("lastUsedAt")) is not None
                         else None
                     ),
                     api_key_first_letters=user.get("apiKeyFirstLetters"),