Merge pull request #18 from bugout-dev/fix-journal-search

Fixed broken journal search

Author: kompotkot

bugout/__init__.py

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

bugout/app.py

@@ -192,13 +192,13 @@ def get_group(
 
     def find_group(
         self,
+        token: Union[str, uuid.UUID],
         group_id: Optional[Union[str, uuid.UUID]] = None,
         name: Optional[str] = None,
-        token: Union[str, uuid.UUID] = None,
         timeout: float = REQUESTS_TIMEOUT,
     ) -> data.BugoutGroup:
         self.user.timeout = timeout
-        return self.group.find_group(group_id=group_id, name=name, token=token)
+        return self.group.find_group(token=token, group_id=group_id, name=name)
 
     def get_user_groups(
         self, token: Union[str, uuid.UUID], timeout: float = REQUESTS_TIMEOUT
@@ -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/group.py

@@ -49,21 +49,29 @@ def get_group(
 
     def find_group(
         self,
+        token: Union[str, uuid.UUID],
         group_id: Optional[Union[str, uuid.UUID]] = None,
         name: Optional[str] = None,
-        token: Union[str, uuid.UUID] = None,
     ) -> BugoutGroup:
         find_group_path = f"group/find"
-        if group_id is not None and name is None:
-            find_group_path += f"?group_id={group_id}"
-        elif group_id is None and name is not None:
-            find_group_path += f"?name={name}"
-        elif group_id is not None and name is not None:
-            find_group_path += f"?group_id={group_id}&name={name}"
+        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})
         headers = {
             "Authorization": f"Bearer {token}",
         }
-        result = self._call(method=Method.get, path=find_group_path, headers=headers)
+        result = self._call(
+            method=Method.get,
+            path=find_group_path,
+            params=query_params,
+            headers=headers,
+        )
         return BugoutGroup(**result)
 
     def get_user_groups(self, token: Union[str, uuid.UUID]) -> BugoutUserGroups:

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)

bugout/user.py

@@ -222,13 +222,15 @@ def get_user_tokens(
         headers = {
             "Authorization": f"Bearer {token}",
         }
-        if active is not None and token_type is None:
-            get_user_tokens_path += f"?active={active}"
-        elif active is None and token_type is not None:
-            get_user_tokens_path += f"?token_type={token_type.value}"
-        elif active is not None and token_type is not None:
-            get_user_tokens_path += f"?active={active}&token_type={token_type.value}"
+        query_params = {}
+        if active is not None:
+            query_params.update({"active": str(int(active))})
+        if token_type is not None:
+            query_params.update({"token_type": token_type.value})
         result = self._call(
-            method=Method.get, path=get_user_tokens_path, headers=headers
+            method=Method.get,
+            path=get_user_tokens_path,
+            params=query_params,
+            headers=headers,
         )
         return BugoutUserTokens(**result)

setup.py

@@ -1,6 +1,5 @@
 import os
 from importlib.machinery import SourceFileLoader
-from pkg_resources import parse_requirements
 from setuptools import find_packages, setup
 
 MODULE_NAME = "bugout"