Merge pull request #53 from bugout-dev/fix-connection-error-handling

Fix error handling.

Author: Andrei-Dolgolev

bugout/__init__.py

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

bugout/calls.py

@@ -12,7 +12,7 @@ def make_request(method: Method, url: str, **kwargs) -> Any:
         response.raise_for_status()
     except requests.exceptions.RequestException as err:
         r = err.response
-        if not err.response:
+        if err.response is None:
             # Connection errors, timepouts, etc...
             raise BugoutResponseException(
                 "Network error", status_code=599, detail=str(err)

bugout/jobs.py

@@ -8,11 +8,16 @@
 from enum import Enum
 import json
 import os
-import requests
+import requests  # type: ignore
 from typing import Callable, Optional, List
 
 from .app import Bugout
-from .data import AuthType, BugoutSearchResultWithEntryID
+from .data import (
+    AuthType,
+    BugoutSearchResultWithEntryID,
+    BugoutSearchResult,
+    BugoutSearchResult,
+)
 from .journal import SearchOrder
 from .settings import BUGOUT_BROOD_URL, BUGOUT_SPIRE_URL, REQUESTS_TIMEOUT
 
@@ -175,7 +180,10 @@ def list_jobs(
 
         results = [
             BugoutSearchResultWithEntryID(
-                **dict(raw_result), id=raw_result.entry_url.split("/")[-1]
+                **dict(raw_result),
+                id=raw_result.entry_url.split("/")[-1]
+                if isinstance(raw_result, BugoutSearchResult)
+                else raw_result.entity_url.split("/")[-1],
             )
             for raw_result in job_results.results
         ]