From f6498f4952b1b64ebeebb594ee8410713211a4f5 Mon Sep 17 00:00:00 2001 From: mhh Date: Mon, 27 Nov 2023 15:20:27 +0100 Subject: [PATCH 1/2] Add tags field to all messages (Issue #52) --- aleph_message/models/__init__.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/aleph_message/models/__init__.py b/aleph_message/models/__init__.py index 045a8f2..9e2074b 100644 --- a/aleph_message/models/__init__.py +++ b/aleph_message/models/__init__.py @@ -216,6 +216,9 @@ class BaseMessage(BaseModel): ) item_hash: ItemHash = Field(description="Hash of the content (sha256 by default)") content: BaseContent = Field(description="Content of the message, ready to be used") + tags: Optional[List[str]] = Field( + default=None, description="Tags associated with the message" + ) forgotten_by: Optional[List[str]] From 11ee30c440942fbded1e929ea3a82ef5c2ba2e79 Mon Sep 17 00:00:00 2001 From: mhh Date: Mon, 27 Nov 2023 15:43:51 +0100 Subject: [PATCH 2/2] Move tags to BaseContent --- aleph_message/models/__init__.py | 3 --- aleph_message/models/abstract.py | 7 ++++++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/aleph_message/models/__init__.py b/aleph_message/models/__init__.py index 9e2074b..045a8f2 100644 --- a/aleph_message/models/__init__.py +++ b/aleph_message/models/__init__.py @@ -216,9 +216,6 @@ class BaseMessage(BaseModel): ) item_hash: ItemHash = Field(description="Hash of the content (sha256 by default)") content: BaseContent = Field(description="Content of the message, ready to be used") - tags: Optional[List[str]] = Field( - default=None, description="Tags associated with the message" - ) forgotten_by: Optional[List[str]] diff --git a/aleph_message/models/abstract.py b/aleph_message/models/abstract.py index f272dbd..0a66dc7 100644 --- a/aleph_message/models/abstract.py +++ b/aleph_message/models/abstract.py @@ -1,4 +1,6 @@ -from pydantic import BaseModel, Extra +from typing import List, Optional + +from pydantic import BaseModel, Extra, Field def hashable(obj): @@ -23,6 +25,9 @@ class BaseContent(BaseModel): address: str time: float + tags: Optional[List[str]] = Field( + default=None, description="Tags associated with the message" + ) class Config: extra = Extra.forbid