p123api 1.4.2__tar.gz → 1.4.4__tar.gz

{p123api-1.4.2 → p123api-1.4.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: p123api
-Version: 1.4.2
+Version: 1.4.4
 Summary: Portfolio123 API wrapper
 Home-page: https://github.com/portfolio-123/p123api-py
 Author: Portfolio123

{p123api-1.4.2 → p123api-1.4.4}/p123api/client.py

@@ -44,12 +44,21 @@ class Client(object):
     class for interfacing with P123 API
     """
 
-    def __init__(self, *, api_id, api_key):
+    def __init__(
+        self,
+        *,
+        api_id,
+        api_key,
+        auth_param_name: str = None,
+        auth_param_value=None,
+    ):
         self._endpoint = ENDPOINT
         self._verify_requests = True
         self._max_req_retries = 5
         self._timeout = 300
         self._token = None
+        self._auth_param_name = auth_param_name
+        self._auth_param_value = auth_param_value
 
         if not isinstance(api_id, str) or not api_id:
             raise ClientException("api_id needs to be a non empty str")
@@ -89,11 +98,14 @@ class Client(object):
         if session expires.
         :return: bool
         """
+        json = {"apiId": self._api_id, "apiKey": self._api_key}
+        if self._auth_param_name is not None and self._auth_param_value is not None:
+            json[self._auth_param_name] = self._auth_param_value
         resp = req_with_retry(
             self._session.post,
             self._max_req_retries,
             url=self._endpoint + AUTH_PATH,
-            auth=(self._api_id, self._api_key),
+            json=json,
             verify=self._verify_requests,
             timeout=30,
         )
@@ -183,7 +195,7 @@ class Client(object):
                 message = ": " + message
             raise ClientException(f"API request failed{message}", resp=resp)
 
-    def screen_rolling_backtest(self, params: dict, to_pandas: bool = False):
+    def screen_rolling_backtest(self, params: dict, to_pandas=False):
         """
         Screen rolling backtest
         :param params:
@@ -208,7 +220,7 @@ class Client(object):
 
         return ret
 
-    def screen_backtest(self, params: dict, to_pandas: bool = False):
+    def screen_backtest(self, params: dict, to_pandas=False):
         """
         Screen backtest
         :param params:
@@ -304,7 +316,7 @@ class Client(object):
 
         return ret
 
-    def screen_run(self, params: dict, to_pandas: bool = False):
+    def screen_run(self, params: dict, to_pandas=False):
         """
         Screen run
         :param params:
@@ -340,7 +352,7 @@ class Client(object):
             name="ranking system update", url=self._endpoint + RANK_PATH, params=params
         ).json()
 
-    def data(self, params: dict, to_pandas: bool = False):
+    def data(self, params: dict, to_pandas=False):
         """
         Data
         :param params:
@@ -378,7 +390,7 @@ class Client(object):
 
         return ret
 
-    def data_universe(self, params: dict, to_pandas: bool = False):
+    def data_universe(self, params: dict, to_pandas=False):
         """
         Universe data
         :param params:
@@ -392,8 +404,9 @@ class Client(object):
         if to_pandas:
             raw_obj = ret
             names = params.get("names")
+            f_indices = range(len(params["formulas"]))
             if params.get("asOfDt"):
-                for formula_idx, _ in enumerate(params["formulas"]):
+                for formula_idx in f_indices:
                     name = (
                         names[formula_idx]
                         if names is not None
@@ -414,16 +427,18 @@ class Client(object):
                     includeFigi = True
                 formulas = defaultdict(list)
                 for dtObj in ret["dates"]:
-                    data["dates"] += len(dtObj["p123Uids"]) * [dtObj["dt"]]
-                    data["p123Uids"] += dtObj["p123Uids"]
-                    data["tickers"] += dtObj["tickers"]
+                    data["dates"].extend(
+                        dtObj["dt"] for _ in range(len(dtObj["p123Uids"]))
+                    )
+                    data["p123Uids"].extend(dtObj["p123Uids"])
+                    data["tickers"].extend(dtObj["tickers"])
                     if includeNames:
-                        data["names"] += dtObj["names"]
+                        data["names"].extend(dtObj["names"])
                     if includeFigi:
-                        data["figi"] += dtObj["figi"]
-                    for formula_idx, _ in enumerate(params["formulas"]):
-                        formulas[formula_idx] += dtObj["data"][formula_idx]
-                for formula_idx, _ in enumerate(params["formulas"]):
+                        data["figi"].extend(dtObj["figi"])
+                    for formula_idx in f_indices:
+                        formulas[formula_idx].extend(dtObj["data"][formula_idx])
+                for formula_idx in f_indices:
                     name = (
                         names[formula_idx]
                         if names is not None
@@ -435,7 +450,7 @@ class Client(object):
 
         return ret
 
-    def rank_ranks(self, params: dict, to_pandas: bool = False):
+    def rank_ranks(self, params: dict, to_pandas=False):
         """
         Ranking system ranks
         :param params:

{p123api-1.4.2 → p123api-1.4.4}/p123api.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: p123api
-Version: 1.4.2
+Version: 1.4.4
 Summary: Portfolio123 API wrapper
 Home-page: https://github.com/portfolio-123/p123api-py
 Author: Portfolio123

{p123api-1.4.2 → p123api-1.4.4}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
 
 setuptools.setup(
     name="p123api",
-    version="1.4.2",
+    version="1.4.4",
     author="Portfolio123",
     author_email="info@portfolio123.com",
     description="Portfolio123 API wrapper",