Merge pull request #42 from bugout-dev/journal-content-with-tags

Journal content with tags

Author: kompotkot

bugout/__init__.py

@@ -7,7 +7,7 @@
 
 __email__ = "engineering@bugout.dev"
 __license__ = "MIT"
-__version__ = "0.2.2"
+__version__ = "0.2.3"
 
 __all__ = (
     "__author__",

bugout/app.py

@@ -91,7 +91,7 @@ def get_user_by_id(
     def find_user(
         self,
         username: str,
-        token: Union[str, uuid.UUID] = None,
+        token: Optional[Union[str, uuid.UUID]] = None,
         timeout: float = REQUESTS_TIMEOUT,
         **kwargs: Dict[str, Any],
     ) -> data.BugoutUser:
@@ -670,6 +670,9 @@ def update_entry_content(
         timeout: float = REQUESTS_TIMEOUT,
         tags: Optional[List[str]] = None,
         tags_action: TagsAction = TagsAction.merge,
+        context_url: Optional[str] = None,
+        context_id: Optional[str] = None,
+        context_type: Optional[str] = None,
         auth_type: str = data.AuthType.bearer.name,
         **kwargs: Dict[str, Any],
     ) -> data.BugoutJournalEntryContent:
@@ -682,6 +685,9 @@ def update_entry_content(
             content=content,
             tags=tags,
             tags_action=tags_action,
+            context_url=context_url,
+            context_id=context_id,
+            context_type=context_type,
             auth_type=data.AuthType[auth_type],
             **kwargs,
         )

bugout/data.py

@@ -205,6 +205,8 @@ class BugoutJournalEntriesRequest(BaseModel):
 class BugoutJournalEntryContent(BaseModel):
     title: str
     content: str
+    tags: List[str] = Field(default_factory=list)
+    locked_by: Optional[str] = None
 
 
 class BugoutJournalEntryTags(BaseModel):

bugout/journal.py

@@ -371,6 +371,9 @@ def update_entry_content(
         content: str,
         tags: Optional[List[str]] = None,
         tags_action: TagsAction = TagsAction.merge,
+        context_url: Optional[str] = None,
+        context_id: Optional[str] = None,
+        context_type: Optional[str] = None,
         auth_type: AuthType = AuthType.bearer,
         **kwargs: Dict[str, Any],
     ) -> BugoutJournalEntryContent:
@@ -379,6 +382,9 @@ def update_entry_content(
         json: Dict[str, Any] = {
             "title": title,
             "content": content,
+            "context_url": context_url,
+            "context_id": context_id,
+            "context_type": context_type,
         }
         if tags is not None:
             json["tags"] = tags

bugout/user.py

@@ -87,7 +87,7 @@ def get_user_by_id(
     def find_user(
         self,
         username: str,
-        token: Union[str, uuid.UUID] = None,
+        token: Optional[Union[str, uuid.UUID]] = None,
         **kwargs: Dict[str, Any],
     ) -> BugoutUser:
         find_user_path = f"user/find?username={username}"