refactor: Fix response_hook error when logging request id

Author: enisgayretli

botanalytics/.env

@@ -17,7 +17,7 @@ BA_API_KEY=""
 
 # Base URL for the Botanalytics REST API
 # This default should not be changed unless you are directed to do so.
-BA_BASE_URL="https://api.botanalytics.co"
+BA_BASE_URL="https://api.botanalytics.co/v2/"
 
 # Global timeout for requests in milliseconds
 BA_REQUEST_TIMEOUT=30000

botanalytics/__init__.py

@@ -2,7 +2,9 @@
 import re
 import sys
 import json
+import toml
 import base64
+import pathlib
 import pkg_resources
 import multiprocessing
 from loguru import logger
@@ -15,20 +17,16 @@
 from requests.adapters import HTTPAdapter
 from concurrent.futures import ThreadPoolExecutor
 
-if 'unittest' in sys.modules.keys():
 
-    import toml
-    import pathlib
-
-    pyproject_text = pathlib.Path('pyproject.toml').read_text()
-    pyproject_data = toml.loads(pyproject_text)
+pyproject_text = pathlib.Path('pyproject.toml').read_text()
+pyproject_data = toml.loads(pyproject_text)
 
+if 'poetry' in pyproject_data['tool']:
     __version__ = pyproject_data['tool']['poetry']['version']
-
 else:
-
     __version__ = pkg_resources.get_distribution('botanalytics').version
 
+
 load_dotenv()
 
 ip_middle_octet = u"(?:\.(?:1?\d{1,2}|2[0-4]\d|25[0-5]))"
@@ -169,7 +167,7 @@ def __init__(self, debug=None, api_key=None, base_url=None, channel=None,
 
         request_retry_limit = (default_request_retry_limit if os.getenv('BA_REQUEST_RETRY_LIMIT')
                                                               is None else int(os.getenv('BA_REQUEST_RETRY_LIMIT'))) \
-            if 'request_retry_limit' not in kwargs else kwargs['request_retry_limit']
+            if 'request_retry_limit' not in kwargs else int(kwargs['request_retry_limit'])
 
         request_timeout = (default_request_timeout if os.getenv('BA_REQUEST_TIMEOUT')
                                                       is None else int(os.getenv('BA_REQUEST_TIMEOUT'))) \
@@ -274,7 +272,7 @@ def send_messages(self, messages=None):
 
         headers['X-Botanalytics-Client-Version'] = __version__
 
-        self.http.post('/messages',
+        self.http.post('messages',
                        data=request_json,
                        headers=headers,
                        allow_redirects=False,
@@ -324,11 +322,12 @@ def response_hook(self, response, *args, **kwargs):
 
             try:
 
+
                 data = response.json()
 
                 # Log request ID if available
                 if 'request_id' in data:
-                    logger.debug('Message(s) successfully sent with the request ID \'%s\'.' % data.request_id)
+                    logger.debug('Message(s) successfully sent with the request ID \'%s\'.' % data['request_id'])
 
             except:
 

pyproject.toml

@@ -29,4 +29,5 @@ python = ">=3.7,<3.10"
 requests = "^2.28.0"
 requests-toolbelt = "^0.9.1"
 python-dotenv = "^0.20.0"
-loguru = "^0.6.0"
+loguru = "^0.6.0"
+toml = "^0.10.0"