logos-sdk 0.0.24.dev1__tar.gz → 0.0.25.dev2__tar.gz

{logos_sdk-0.0.24.dev1 → logos_sdk-0.0.25.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: logos-sdk
-Version: 0.0.24.dev1
+Version: 0.0.25.dev2
 Summary: SDK for Logos platform
 Home-page: https://bitbucket.org/databy/logos-sdk-pip/src/master/
 Author: Databy.io
@@ -243,10 +243,11 @@ Development of new features/refactor/debug follow the naming convention of:
 ```
   
 Pull requests are directed do the current development branch, which always bears the number of the newest version, for example `development-0.0.2`.  After adding a major feature, or a number of less significant refactors and hot-fixes, the current development branch is merged into master and deployed into Google Artifact Registry. The old development branch is then deleted and a new branch with the following version `development-0.0.3` will be created. Version is not controled throught an env variable VERSION.
+For fixing minor bugs, dev version is used, e.g 0.0.24.dev1
 
 Manual build, with optional build number
 ```
-export VERSION=x.x.x
+export VERSION=x.x.x.dev[x]
 python setup.py sdist bdist_wheel --build-number=$BUILD_NUMBER
 ```
 

{logos_sdk-0.0.24.dev1 → logos_sdk-0.0.25.dev2}/README.md

@@ -221,10 +221,11 @@ Development of new features/refactor/debug follow the naming convention of:
 ```
   
 Pull requests are directed do the current development branch, which always bears the number of the newest version, for example `development-0.0.2`.  After adding a major feature, or a number of less significant refactors and hot-fixes, the current development branch is merged into master and deployed into Google Artifact Registry. The old development branch is then deleted and a new branch with the following version `development-0.0.3` will be created. Version is not controled throught an env variable VERSION.
+For fixing minor bugs, dev version is used, e.g 0.0.24.dev1
 
 Manual build, with optional build number
 ```
-export VERSION=x.x.x
+export VERSION=x.x.x.dev[x]
 python setup.py sdist bdist_wheel --build-number=$BUILD_NUMBER
 ```
 

{logos_sdk-0.0.24.dev1 → logos_sdk-0.0.25.dev2}/logos_sdk/services/GoogleAds.py

@@ -1,9 +1,12 @@
 from requests import request
+from requests.exceptions import Timeout
 from typing import List, Union, Dict
 from logos_sdk.services import get_headers
 from http import HTTPStatus
 from dotenv import load_dotenv
 import os
+import time
+import random
 
 
 class GoogleAdsServiceException(Exception):
@@ -19,6 +22,18 @@ class GoogleAdsService:
         self._EXCLUDE_FOR_ACCOUNT = self._URL + "/exclude-for-account"
         self._EXCLUDE_FOR_AD_GROUP = self._URL + "/exclude-for-ad-group"
 
+    @staticmethod
+    def fetch_with_retry_on_timeout(url, json, headers):
+        for attempt in range(5):
+            try:
+                return request("post", url, json=json, headers=headers, timeout=25)
+            except Timeout:
+                delay = 2 * (2 ** attempt) + random.randint(0, 9)
+                print(f"there was a timeout when contacting the service, going to sleep for {delay} seconds")
+                time.sleep(delay)
+
+        raise Exception("The service is not able to reply within 30 seconds.")
+
     def search_stream(
         self,
         query: str,
@@ -38,7 +53,7 @@ class GoogleAdsService:
         }
 
         header = get_headers(self._SEARCH_STREAM)
-        response = request("post", url=self._SEARCH_STREAM, json=body, headers=header)
+        response = self.fetch_with_retry_on_timeout(url=self._SEARCH_STREAM, json=body, headers=header)
 
         if response.status_code == HTTPStatus.OK:
             service_response = response.json()
@@ -69,7 +84,7 @@ class GoogleAdsService:
         }
 
         header = get_headers(self._SEARCH)
-        response = request("post", url=self._SEARCH, json=body, headers=header)
+        response = self.fetch_with_retry_on_timeout(url=self._SEARCH, json=body, headers=header)
 
         if response.status_code != HTTPStatus.OK:
             raise GoogleAdsServiceException(response.content)

{logos_sdk-0.0.24.dev1 → logos_sdk-0.0.25.dev2}/logos_sdk.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: logos-sdk
-Version: 0.0.24.dev1
+Version: 0.0.25.dev2
 Summary: SDK for Logos platform
 Home-page: https://bitbucket.org/databy/logos-sdk-pip/src/master/
 Author: Databy.io
@@ -243,10 +243,11 @@ Development of new features/refactor/debug follow the naming convention of:
 ```
   
 Pull requests are directed do the current development branch, which always bears the number of the newest version, for example `development-0.0.2`.  After adding a major feature, or a number of less significant refactors and hot-fixes, the current development branch is merged into master and deployed into Google Artifact Registry. The old development branch is then deleted and a new branch with the following version `development-0.0.3` will be created. Version is not controled throught an env variable VERSION.
+For fixing minor bugs, dev version is used, e.g 0.0.24.dev1
 
 Manual build, with optional build number
 ```
-export VERSION=x.x.x
+export VERSION=x.x.x.dev[x]
 python setup.py sdist bdist_wheel --build-number=$BUILD_NUMBER
 ```