Skip to content

Fix: allow partial user objects for created_by and last_edited_by page properties #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 15, 2025
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
4 changes: 4 additions & 0 deletions devenv.nix
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,8 @@
scripts.format.exec = ''
pre-commit run --all-files
'';

enterTest = ''
poetry run pytest
'';
}
132 changes: 128 additions & 4 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
from pydantic import AnyUrl, Field, EmailStr

from pydantic_api.base import BaseModel
from ..user import UserObject, UserObjectFactory
from ..user import DeletedUserObject, UserObject, UserObjectFactory
from ..file import FileObject, FileObjectFactory
from ..block import RichTextObject, RichTextObjectFactory
from .common import (
Expand Down Expand Up @@ -55,7 +55,7 @@ def new(
# created_by, Refer to https://developers.notion.com/reference/page-property-values#created_by
class CreatedByProperty(BasePageProperty):
type: Literal["created_by"] = "created_by"
created_by: UserObject
created_by: Union[UserObject, DeletedUserObject]

@classmethod
def new_from_person(
Expand Down Expand Up @@ -192,7 +192,7 @@ class FormulaProperty(BasePageProperty):
# last_edited_by: Refer to https://developers.notion.com/reference/page-property-values#last_edited_by
class LastEditedByProperty(BasePageProperty):
type: Literal["last_edited_by"] = "last_edited_by"
last_edited_by: UserObject
last_edited_by: Union[UserObject, DeletedUserObject]

@classmethod
def new_from_person(
Expand Down
5 changes: 5 additions & 0 deletions pydantic_api/notion/models/objects/user.py
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,11 @@ class BotUserObject(_BaseUserObject):
)


class DeletedUserObject(PartialUser):
"""A deleted user object."""
pass


UserObject = Annotated[
Union[PersonUserObject, BotUserObject], Field(discriminator="type")
]
Expand Down
1 change: 1 addition & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ pydantic-api-models = "^0.0.2"

[tool.poetry.group.dev.dependencies]
mypy = "^1.15.0"
pytest = "^8.0.0"

[build-system]
requires = ["poetry-core>=1.5.0"]
Expand Down
Empty file added tests/__init__.py
Empty file.
18 changes: 18 additions & 0 deletions tests/test_user_object.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
import uuid
from pydantic_api.notion.models.objects.properties.page_property import CreatedByProperty
from pydantic_api.notion.models.objects.user import UserObject, DeletedUserObject


def test_userobject_accepts_deleteduser():
user_id = uuid.uuid4()
data = {
"type": "created_by",
"created_by": {
"object": "user",
"id": user_id,
}
}
created_by = CreatedByProperty.model_validate(data)
assert isinstance(created_by.created_by, DeletedUserObject)
assert created_by.created_by.object == "user"
assert created_by.created_by.id == user_id
Loading