Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

if sys.version_info < (3, 7):
raise RuntimeError("skyflow requires Python 3.7+")
current_version = '2.1.0b1.dev0+8efd1cd'
current_version = '1.15.4.dev0+ef26f0d'

setup(
name='skyflow',
Expand Down
29 changes: 25 additions & 4 deletions skyflow/vault/_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
import types
import requests
import asyncio
from urllib3.util.retry import Retry
from requests.adapters import HTTPAdapter
from skyflow.vault._insert import getInsertRequestBody, processResponse, convertResponse
from skyflow.vault._update import sendUpdateRequests, createUpdateResponseBody
from skyflow.vault._config import Configuration, ConnectionConfig, DeleteOptions, DetokenizeOptions, GetOptions, InsertOptions, UpdateOptions, QueryOptions
Expand Down Expand Up @@ -36,6 +38,18 @@ def __init__(self, config: Configuration):
raise SkyflowError(SkyflowErrorCodes.INVALID_INPUT, SkyflowErrorMessages.TOKEN_PROVIDER_ERROR.value % (
str(type(config.tokenProvider))), interface=interface)

retry_strategy = Retry(
total=3,
connect=5,
backoff_factor=0.5,
status_forcelist=[500, 502, 503, 504],
raise_on_status=True,
)

self.session = requests.Session()
adapter = HTTPAdapter(pool_connections=1, pool_maxsize=20, pool_block=False, max_retries=retry_strategy)
self.session.mount("https://", adapter)

self.vaultID = config.vaultID
self.vaultURL = config.vaultURL.rstrip('/')
self.tokenProvider = config.tokenProvider
Expand All @@ -45,7 +59,6 @@ def __init__(self, config: Configuration):
def insert(self, records: dict, options: InsertOptions = InsertOptions()):
interface = InterfaceName.INSERT.value
log_info(InfoMessages.INSERT_TRIGGERED.value, interface=interface)

self._checkConfig(interface)

jsonBody = getInsertRequestBody(records, options)
Expand All @@ -54,11 +67,19 @@ def insert(self, records: dict, options: InsertOptions = InsertOptions()):
self.storedToken, self.tokenProvider, interface)
headers = {
"Authorization": "Bearer " + self.storedToken,
"sky-metadata": json.dumps(getMetrics())
"sky-metadata": json.dumps(getMetrics()),
# "User-Agent": 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.110 Safari/537.36'
}

response = requests.post(requestURL, data=jsonBody, headers=headers)
# response = requests.post(requestURL, data=jsonBody, headers=headers)
response = self.session.post(
requestURL,
data=jsonBody,
headers=headers,
# timeout=(5, 300),
)
print(">>> raw response: ", response.history)
processedResponse = processResponse(response)
print(">>> processedResponse local: ", processedResponse)
result, partial = convertResponse(records, processedResponse, options)
if partial:
log_error(SkyflowErrorMessages.BATCH_INSERT_PARTIAL_SUCCESS.value, interface)
Expand Down
2 changes: 1 addition & 1 deletion skyflow/version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
SDK_VERSION = '2.1.0b1.dev0+8efd1cd'
SDK_VERSION = '1.15.4.dev0+ef26f0d'