Homogenize errors (#5)

* bug: fix catching of errors

* fix: ensure return statement

Author: jannisborn

pymed_paperscraper/__init__.py

@@ -1,4 +1,4 @@
 from .api import PubMed
 
 __all__ = ["PubMed"]
-__version__ = "1.0.2"
+__version__ = "1.0.3"

pymed_paperscraper/api.py

@@ -7,8 +7,9 @@
 from typing import Union
 
 import requests
-from requests.exceptions import ChunkedEncodingError
+from requests.exceptions import ChunkedEncodingError, ConnectionError, HTTPError
 from tqdm import tqdm
+from urllib3.exceptions import ProtocolError
 
 from .article import PubMedArticle
 from .book import PubMedBookArticle
@@ -164,38 +165,28 @@ def _get(
                 # Check for any errors
                 response.raise_for_status()
                 need_to_call = False
-            except ChunkedEncodingError as e:
+            except (
+                ConnectionError,
+                HTTPError,
+                ChunkedEncodingError,
+                OSError,
+                ProtocolError,
+            ) as e:
+                error_type = type(e).__name__
+                tolog = "term" if "term" in parameters.keys() else "id"
                 logger.info(
-                    f"ChunkedEncodingError: {e}.\tNow at {tries+1} attempts for {parameters['id']}: "
+                    f"{error_type}: {e}.\tNow at {tries+1} attempts for {parameters[tolog]}: "
                 )
                 tries += 1
                 self._requestsMade.append(datetime.datetime.now())
                 sleep(0.01)
                 continue
-            except requests.HTTPError as e:
-                logger.info(
-                    f"HTTPError request error: {e}.\tNow at {tries+1} attempts for {parameters['id']}: "
-                )
-                tries += 1
-                # Add this request to the list of requests made
-                self._requestsMade.append(datetime.datetime.now())
-                sleep(0.01)
-                continue
-            except ConnectionError as e:
-                logger.info(
-                    f"ConnectionError: {e}.\tNow at {tries+1} attempts for {parameters['id']}: "
-                )
-                tries += 1
-                # Add this request to the list of requests made
-                self._requestsMade.append(datetime.datetime.now())
-                sleep(0.01)
-                continue
 
-            # Return the response
-            if output == "json":
-                return response.json()
-            else:
-                return response.text
+        # Return the response
+        if output == "json":
+            return response.json()
+        else:
+            return response.text
 
     def _getArticles(self: object, article_ids: list) -> list:
         """Helper method that batches a list of article IDs and retrieves the content.