btgsolutions-dataservices-python-client 3.2.1__tar.gz → 3.2.3__tar.gz

{btgsolutions_dataservices_python_client-3.2.1/btgsolutions_dataservices_python_client.egg-info → btgsolutions_dataservices_python_client-3.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: btgsolutions_dataservices_python_client
-Version: 3.2.1
+Version: 3.2.3
 Summary: Python package containing several classes and data for extracting and manipulating market and trading data.
 Home-page: https://github.com/BTG-Pactual-Solutions/btgsolutions-dataservices-python-client
 Author: BTG Solutions Data Services powered by BTG Pactual Solutions
@@ -184,7 +184,7 @@ ws.run(on_message=lambda message: print(message))
 ```python
 import btgsolutions_dataservices as btg
 int_candles = btg.IntradayCandles(api_key='YOUR_API_KEY')
-int_candles.get_intraday_candles(market_type='stocks', tickers=['PETR4', 'VALE3'], candle_period='1m', delay='delayed', mode='relative', timezone='UTC', raw_data=True)
+int_candles.get_intraday_candles(market_type='stocks', tickers=['PETR4', 'VALE3'], candle_period='1m', delay='delayed', mode='relative', timezone='UTC', market_status='regular', raw_data=True)
 ```
 
 #### Intraday Tick Data

{btgsolutions_dataservices_python_client-3.2.1 → btgsolutions_dataservices_python_client-3.2.3}/README.md

@@ -161,7 +161,7 @@ ws.run(on_message=lambda message: print(message))
 ```python
 import btgsolutions_dataservices as btg
 int_candles = btg.IntradayCandles(api_key='YOUR_API_KEY')
-int_candles.get_intraday_candles(market_type='stocks', tickers=['PETR4', 'VALE3'], candle_period='1m', delay='delayed', mode='relative', timezone='UTC', raw_data=True)
+int_candles.get_intraday_candles(market_type='stocks', tickers=['PETR4', 'VALE3'], candle_period='1m', delay='delayed', mode='relative', timezone='UTC', market_status='regular', raw_data=True)
 ```
 
 #### Intraday Tick Data

{btgsolutions_dataservices_python_client-3.2.1 → btgsolutions_dataservices_python_client-3.2.3}/btgsolutions_dataservices/__init__.py

@@ -1,3 +1,5 @@
+__version__ = "3.2.3" 
+
 from .websocket import *
 from .rest import *
 from .exceptions import *

{btgsolutions_dataservices_python_client-3.2.1 → btgsolutions_dataservices_python_client-3.2.3}/btgsolutions_dataservices/rest/authenticator.py

@@ -1,14 +1,19 @@
+import uuid
 import requests
 import json
 import jwt
 import time
 from ..config import url_apis
 from ..exceptions import BadResponse
+from .. import __version__
 
 class Authenticator:
     def __init__(self, api_key) -> None:
         self.api_key = api_key
+
+        self._id = uuid.uuid4().hex[:8]
         self._token = self.get_new_token()
+        self._expiration = self._get_expiration()
 
     def get_new_token(self):
         url = f"{url_apis}/authenticate"
@@ -17,7 +22,7 @@ class Authenticator:
         }
         payload = json.dumps({
             "api_key": self.api_key,
-            "client_id": f"btgsolutions-client-python"
+            "client_id": f"btgsolutions-client-python/{__version__}/{self._id}"
         })
         response = requests.request("POST", url, data=payload,  headers=headersList)
         if response.status_code == 200:
@@ -30,13 +35,16 @@ class Authenticator:
         
         return token
     
-    @property
-    def token(self):
+    def _get_expiration(self):
         token_decoded = jwt.decode(self._token, options={"verify_signature": False})
         exp = token_decoded.get("exp")
-        
-        if int(time.time()) >= exp:
+        return exp
+
+    @property
+    def token(self):
+        if int(time.time()) - 5 >= self._expiration: ## Subtracting 5 seconds to avoid edge cases of token expiration during request processing.
             self._token = self.get_new_token()
+            self._expiration = self._get_expiration()
         
         return self._token
     

{btgsolutions_dataservices_python_client-3.2.1 → btgsolutions_dataservices_python_client-3.2.3}/btgsolutions_dataservices/rest/intraday_candles.py

@@ -60,6 +60,7 @@ class IntradayCandles:
         mode:str='absolute',
         raw_data:bool=False,
         cross_filter:str='',
+        market_status:str='',
     ):     
         """
         This method provides realtime intraday candles for a given ticker.
@@ -95,9 +96,13 @@ class IntradayCandles:
             Example: 'absolute', 'relative' or 'spark'.
             Default: absolute.
         cross_filter: str
-            Filter trades by cross status. Available only when market_type is derivatives.
+            Filter trades by cross status.
             Options: 'all', 'only_cross' or 'without_cross'.
             Default: 'all'.
+        market_status: str
+            Filter trades by market status. Not available for 'Indices'.
+            Options: 'all' or 'regular'.
+            Default: 'all'.
         raw_data: bool
             If false, returns data in a dict of dataframes. If true, returns raw data.
             Default: False.
@@ -107,8 +112,6 @@ class IntradayCandles:
 
         if delay not in ['delayed', 'realtime']: raise DelayError(f"Must provide a valid 'delay' parameter. Input: '{delay}'. Accepted values: 'delayed' or 'realtime'.")
         
-        if cross_filter and market_type != 'derivatives': raise DelayError(f"The 'cross_filter' flag is only valid for market_type 'derivatives'.")
-
         tickers = ','.join(tickers) if type(tickers) is list else tickers 
 
         url = f"{base_url}/api/v1/marketdata/br/b3/{delay}/intraday-candles/{market_type}?tickers={tickers}&candle_period={candle_period}&mode={mode}&timezone={timezone}"
@@ -119,6 +122,8 @@ class IntradayCandles:
         
         if cross_filter: url += f'&cross_filter={cross_filter}'
 
+        if market_status: url += f'&market_status={market_status}'
+
         response = requests.request("GET", url,  headers=self.headers)
         if response.status_code == 200:
             response_data = json.loads(response.text)

{btgsolutions_dataservices_python_client-3.2.1 → btgsolutions_dataservices_python_client-3.2.3}/btgsolutions_dataservices/rest/ticker_last_event_polling.py

@@ -53,6 +53,7 @@ class TickerLastEventPolling:
 
         self._last_request_datetime = None
         self._cache = {}
+        self._lock = threading.Lock() 
 
         self._available_data_types = {
             "top-of-books": ['stocks', 'derivatives', 'options'],
@@ -106,21 +107,26 @@ class TickerLastEventPolling:
 
 
     def _update_data(self):
-        url = self.url + (f"?dt={(self._last_request_datetime - timedelta(seconds=60)).strftime('%Y-%m-%dT%H:%M:%S.000Z')}" if self._last_request_datetime else "")
+
+        with self._lock:
+            last_dt = self._last_request_datetime
+    
+        url = self.url + (f"?dt={(last_dt - timedelta(seconds=60)).strftime('%Y-%m-%dT%H:%M:%S.000Z')}" if last_dt else "")
 
         request_datetime = datetime.now(timezone.utc)
 
+        self.authenticator.token  # force token refresh if needed
+
         response = requests.request("GET", url, headers={"authorization": f"Bearer {self.authenticator.token}"})
 
         if response.status_code != 200:
             return
 
-
-        self._last_request_datetime = request_datetime
-        
         new_data = { tob["sb"]: tob for tob in response.json() if tob.get("sb")}
 
-        self._cache.update(new_data)
+        with self._lock:
+            self._last_request_datetime = request_datetime
+            self._cache.update(new_data)
 
 
     def get(self, force_update: bool=False, raw_data:bool=False):
@@ -139,11 +145,14 @@ class TickerLastEventPolling:
         """
         if force_update:
             self._update_data()
+        
+        with self._lock:
+            data = list(self._cache.values())
 
         if raw_data:
-            return list(self._cache.values())
+            return data
         else:
-            return pd.DataFrame(self._cache.values())
+            return pd.DataFrame(data)
 
             
 

{btgsolutions_dataservices_python_client-3.2.1 → btgsolutions_dataservices_python_client-3.2.3/btgsolutions_dataservices_python_client.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: btgsolutions_dataservices_python_client
-Version: 3.2.1
+Version: 3.2.3
 Summary: Python package containing several classes and data for extracting and manipulating market and trading data.
 Home-page: https://github.com/BTG-Pactual-Solutions/btgsolutions-dataservices-python-client
 Author: BTG Solutions Data Services powered by BTG Pactual Solutions
@@ -184,7 +184,7 @@ ws.run(on_message=lambda message: print(message))
 ```python
 import btgsolutions_dataservices as btg
 int_candles = btg.IntradayCandles(api_key='YOUR_API_KEY')
-int_candles.get_intraday_candles(market_type='stocks', tickers=['PETR4', 'VALE3'], candle_period='1m', delay='delayed', mode='relative', timezone='UTC', raw_data=True)
+int_candles.get_intraday_candles(market_type='stocks', tickers=['PETR4', 'VALE3'], candle_period='1m', delay='delayed', mode='relative', timezone='UTC', market_status='regular', raw_data=True)
 ```
 
 #### Intraday Tick Data

{btgsolutions_dataservices_python_client-3.2.1 → btgsolutions_dataservices_python_client-3.2.3}/setup.py

@@ -2,6 +2,8 @@ from setuptools import setup, find_packages
 import os
 from pathlib import Path
 
+from btgsolutions_dataservices import __version__
+
 this_directory = Path(__file__).parent
 long_description = (this_directory / "README.md").read_text()
 
@@ -22,7 +24,7 @@ description = "Python package containing several classes and data for extracting
 
 setup(
     name='btgsolutions_dataservices_python_client',
-    version='3.2.1',
+    version=__version__,
     description=description,
     long_description=long_description,
     long_description_content_type='text/markdown',