Merge pull request #23 from bugout-dev/entries-pack

Added handler create entries pack

Author: zomglings

bugout/__init__.py

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

bugout/app.py

@@ -211,12 +211,11 @@ def get_group(
     def find_group(
         self,
         token: Union[str, uuid.UUID],
-        group_id: Optional[Union[str, uuid.UUID]] = None,
-        name: Optional[str] = None,
+        group_id: Union[str, uuid.UUID],
         timeout: float = REQUESTS_TIMEOUT,
     ) -> data.BugoutGroup:
         self.user.timeout = timeout
-        return self.group.find_group(token=token, group_id=group_id, name=name)
+        return self.group.find_group(token=token, group_id=group_id)
 
     def get_user_groups(
         self, token: Union[str, uuid.UUID], timeout: float = REQUESTS_TIMEOUT
@@ -422,6 +421,23 @@ def create_entry(
             context_type=context_type,
         )
 
+    def create_entries_pack(
+        self,
+        token: Union[str, uuid.UUID],
+        journal_id: Union[str, uuid.UUID],
+        entries: List[Dict[str, Any]],
+        timeout: float = REQUESTS_TIMEOUT,
+    ) -> data.BugoutJournalEntries:
+        self.journal.timeout = timeout
+        entries_obj = data.BugoutJournalEntriesRequest(
+            entries=[data.BugoutJournalEntryRequest(**entry) for entry in entries]
+        )
+        return self.journal.create_entries_pack(
+            token=token,
+            journal_id=journal_id,
+            entries=entries_obj,
+        )
+
     def get_entry(
         self,
         token: Union[str, uuid.UUID],
@@ -552,13 +568,16 @@ def search(
         token: Union[str, uuid.UUID],
         journal_id: Union[str, uuid.UUID],
         query: str,
+        filters: Optional[List[str]] = None,
         limit: int = 10,
         offset: int = 0,
         content: bool = True,
         timeout: float = REQUESTS_TIMEOUT,
     ) -> data.BugoutSearchResults:
         self.journal.timeout = timeout
-        return self.journal.search(token, journal_id, query, limit, offset, content)
+        return self.journal.search(
+            token, journal_id, query, filters, limit, offset, content
+        )
 
     # Humbug
     def get_humbug_integrations(

bugout/data.py

@@ -75,7 +75,7 @@ class BugoutUserTokens(BaseModel):
 
 class BugoutGroup(BaseModel):
     id: uuid.UUID
-    group_name: Optional[str]
+    group_name: Optional[str] = Field(alias="name")
     autogenerated: bool
 
 
@@ -133,13 +133,13 @@ class BugoutJournals(BaseModel):
 
 class BugoutJournalEntry(BaseModel):
     id: uuid.UUID
-    journal_url: str
+    journal_url: Optional[str]
     content_url: Optional[str]
     title: Optional[str]
     content: Optional[str]
     tags: List[str] = Field(default_factory=list)
-    created_at: datetime
-    updated_at: datetime
+    created_at: Optional[datetime]
+    updated_at: Optional[datetime]
     context_url: Optional[str]
     context_type: Optional[str]
 
@@ -148,6 +148,19 @@ class BugoutJournalEntries(BaseModel):
     entries: List[BugoutJournalEntry]
 
 
+class BugoutJournalEntryRequest(BaseModel):
+    title: str
+    content: str
+    tags: List[str] = Field(default_factory=list)
+    context_url: Optional[str]
+    context_id: Optional[str]
+    context_type: Optional[str]
+
+
+class BugoutJournalEntriesRequest(BaseModel):
+    entries: List[BugoutJournalEntryRequest] = Field(default_factory=list)
+
+
 class BugoutJournalEntryContent(BaseModel):
     title: str
     content: str

bugout/group.py

@@ -50,19 +50,10 @@ def get_group(
     def find_group(
         self,
         token: Union[str, uuid.UUID],
-        group_id: Optional[Union[str, uuid.UUID]] = None,
-        name: Optional[str] = None,
+        group_id: Union[str, uuid.UUID],
     ) -> BugoutGroup:
-        find_group_path = f"group/find"
-        if group_id is None and name is None:
-            raise GroupInvalidParameters(
-                "In order to find group, at least one of name, or id must be specified"
-            )
-        query_params = {}
-        if group_id is not None:
-            query_params.update({"group_id": group_id})
-        if name is not None:
-            query_params.update({"name": name})
+        find_group_path = f"groups/find"
+        query_params = {"group_id": group_id}
         headers = {
             "Authorization": f"Bearer {token}",
         }

bugout/journal.py

@@ -9,6 +9,7 @@
     BugoutJournalScopeSpecs,
     BugoutJournalEntry,
     BugoutJournalEntries,
+    BugoutJournalEntriesRequest,
     BugoutJournalEntryContent,
     BugoutJournalEntryTags,
     BugoutSearchResults,
@@ -196,6 +197,34 @@ def create_entry(
         )
         return BugoutJournalEntry(**result)
 
+    def create_entries_pack(
+        self,
+        token: Union[str, uuid.UUID],
+        journal_id: Union[str, uuid.UUID],
+        entries: BugoutJournalEntriesRequest,
+    ) -> BugoutJournalEntries:
+        entry_path = f"journals/{journal_id}/bulk"
+        headers = {
+            "Authorization": f"Bearer {token}",
+        }
+        json = {
+            "entries": [
+                {
+                    "title": entry.title,
+                    "content": entry.content,
+                    "tags": entry.tags,
+                    "context_url": entry.context_url,
+                    "context_id": entry.context_id,
+                    "context_type": entry.context_type,
+                }
+                for entry in entries.entries
+            ]
+        }
+        result = self._call(
+            method=Method.post, path=entry_path, headers=headers, json=json
+        )
+        return BugoutJournalEntries(**result)
+
     def get_entry(
         self,
         token: Union[str, uuid.UUID],
@@ -352,6 +381,7 @@ def search(
         token: Union[str, uuid.UUID],
         journal_id: Union[str, uuid.UUID],
         query: str,
+        filters: Optional[List[str]] = None,
         limit: int = 10,
         offset: int = 0,
         content: bool = True,
@@ -362,6 +392,7 @@ def search(
         }
         query_params = {
             "q": query,
+            "filters": filters if filters is not None else [],
             "limit": limit,
             "offset": offset,
             "content": content,