Fixed broken journal search

Simplified the code by:
1. Using the `requests` `params` keyword argument instead of manually
constructing query string.
2. Accepting query, limit, offset, etc. directly as arguments to the
search method. This way, when you do `help(bugout_client.search)`, you
see immediately what the structure of the input should be.
3. Removing unnecessary Pydantic model for search fields.

Author: zomglings

bugout/app.py

@@ -525,8 +525,11 @@ def search(
         self,
         token: Union[str, uuid.UUID],
         journal_id: Union[str, uuid.UUID],
+        query: str,
+        limit: int = 10,
+        offset: int = 0,
+        content: bool = True,
         timeout: float = REQUESTS_TIMEOUT,
-        **queries: Dict[str, Any],
     ) -> data.BugoutSearchResults:
         self.journal.timeout = timeout
-        return self.journal.search(token=token, journal_id=journal_id, **queries)
+        return self.journal.search(token, journal_id, query, limit, offset, content)

bugout/data.py

@@ -153,14 +153,6 @@ class BugoutJournalEntryTags(BaseModel):
     tags: List[str]
 
 
-class BugoutSearchFields(BaseModel):
-    query: str = ""
-    filters: Optional[List[str]] = None
-    limit: int = 10
-    offset: int = 0
-    content: Optional[bool] = True
-
-
 class BugoutSearchResult(BaseModel):
     entry_url: str
     content_url: str

bugout/journal.py

@@ -11,7 +11,6 @@
     BugoutJournalEntries,
     BugoutJournalEntryContent,
     BugoutJournalEntryTags,
-    BugoutSearchFields,
     BugoutSearchResults,
     HolderType,
     Method,
@@ -344,34 +343,26 @@ def delete_tag(
         return BugoutJournalEntryTags(**result)
 
     # Search module
-    def _search_query(self, search_path: str, **queries: Dict[str, Any]) -> str:
-        """
-        Validate search arguments with pydantic model BugoutSearchFields and
-        generate search_path with queries.
-        """
-        field_queries = BugoutSearchFields(**queries)
-        fields_list = list(BugoutSearchFields.schema().get("properties").keys())  # type: ignore
-
-        search_path += f"?{fields_list[0]}={getattr(field_queries, fields_list[0])}"
-        for field in fields_list[1:]:
-            attr = getattr(field_queries, field)
-            if type(attr) is list:
-                attr = ",".join(attr)
-            search_path += f"&{field}={attr}"
-
-        return search_path
-
     def search(
         self,
         token: Union[str, uuid.UUID],
         journal_id: Union[str, uuid.UUID],
-        **queries: Dict[str, Any],
+        query: str,
+        limit: int = 10,
+        offset: int = 0,
+        content: bool = True,
     ) -> BugoutSearchResults:
-        search_path_org = f"journals/{journal_id}/search"
-        search_path = self._search_query(search_path=search_path_org, **queries)
-
+        search_path = f"journals/{journal_id}/search"
         headers = {
             "Authorization": f"Bearer {token}",
         }
-        result = self._call(method=Method.get, path=search_path, headers=headers)
+        query_params = {
+            "q": query,
+            "limit": limit,
+            "offset": offset,
+            "content": content,
+        }
+        result = self._call(
+            method=Method.get, path=search_path, params=query_params, headers=headers
+        )
         return BugoutSearchResults(**result)