p123api 2.0.0__tar.gz → 2.2.0__tar.gz

{p123api-2.0.0 → p123api-2.2.0}/PKG-INFO

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

{p123api-2.0.0 → p123api-2.2.0}/p123api/client.py

@@ -18,8 +18,13 @@ RANK_RANKS_PATH = "/rank/ranks"
 RANK_PERF_PATH = "/rank/performance"
 RANK_TOUCH_PATH = Template("/rank/$id/touch")
 DATA_UNIVERSE_PATH = "/data/universe"
+DATA_PRICES_PATH = Template("/data/prices/$identifier")
 STRATEGY_DETAILS_PATH = Template("/strategy/$id")
 STRATEGY_HOLDINGS_PATH = Template("/strategy/$id/holdings")
+STRATEGY_TRADING_SYSTEM_PATH = Template("/strategy/$id/trading-system")
+BOOK_TRADING_SYSTEM_PATH = Template("/strategy/$id/book-trading-system")
+SIM_RERUN_PATH = Template("/strategy/$id/rerun")
+BOOK_SIM_RERUN_PATH = Template("/strategy/$id/book-rerun")
 STRATEGY_REBALANCE_PATH = Template("/strategy/$id/rebalance")
 STRATEGY_REBALANCE_COMMIT_PATH = Template("/strategy/$id/rebalance/commit")
 STRATEGY_TRANS_PATH = Template("/strategy/$id/transactions")
@@ -130,6 +135,7 @@ class Client:
         name: str,
         method: str = "POST",
         url: str,
+        json=None,
         params=None,
         data=None,
         headers=None,
@@ -140,6 +146,7 @@ class Client:
         :param name: request action
         :param method: request method
         :param url: request url
+        :param json: request json
         :param params: request params
         :param data: request data
         :param headers: request headers
@@ -153,7 +160,8 @@ class Client:
                     self._session.post,
                     self._max_req_retries,
                     url=url,
-                    json=params,
+                    json=json,
+                    params=params,
                     verify=self._verify_requests,
                     timeout=self._timeout,
                     data=data,
@@ -167,18 +175,20 @@ class Client:
                     req_type,
                     self._max_req_retries,
                     url=url,
-                    json=params,
+                    json=json,
+                    params=params,
                     verify=self._verify_requests,
                     timeout=self._timeout,
                     headers=headers,
                 )
-        if resp is None or resp.status_code == 403:
+        if resp is None or resp.status_code == 401 or resp.status_code == 403:
             if not stop:
                 self.auth()
                 return self._req_with_auth_fallback(
                     name=name,
                     method=method,
                     url=url,
+                    json=json,
                     params=params,
                     data=data,
                     headers=headers,
@@ -204,7 +214,7 @@ class Client:
         ret = self._req_with_auth_fallback(
             name="screen rolling backtest",
             url=self._endpoint + SCREEN_ROLLING_BACKTEST_PATH,
-            params=params,
+            json=params,
         ).json()
 
         if to_pandas:
@@ -229,7 +239,7 @@ class Client:
         ret = self._req_with_auth_fallback(
             name="screen backtest",
             url=self._endpoint + SCREEN_BACKTEST_PATH,
-            params=params,
+            json=params,
         ).json()
 
         if to_pandas:
@@ -323,7 +333,7 @@ class Client:
         :return:
         """
         ret = self._req_with_auth_fallback(
-            name="screen backtest", url=self._endpoint + SCREEN_RUN_PATH, params=params
+            name="screen backtest", url=self._endpoint + SCREEN_RUN_PATH, json=params
         ).json()
 
         if to_pandas:
@@ -338,7 +348,7 @@ class Client:
         :return:
         """
         return self._req_with_auth_fallback(
-            name="universe update", url=self._endpoint + UNIVERSE_PATH, params=params
+            name="universe update", url=self._endpoint + UNIVERSE_PATH, json=params
         ).json()
 
     def rank_update(self, params: dict):
@@ -348,7 +358,7 @@ class Client:
         :return:
         """
         return self._req_with_auth_fallback(
-            name="ranking system update", url=self._endpoint + RANK_PATH, params=params
+            name="ranking system update", url=self._endpoint + RANK_PATH, json=params
         ).json()
 
     def data(self, params: dict, to_pandas=False):
@@ -359,7 +369,7 @@ class Client:
         :return:
         """
         ret = self._req_with_auth_fallback(
-            name="data", url=self._endpoint + DATA_PATH, params=params
+            name="data", url=self._endpoint + DATA_PATH, json=params
         ).json()
 
         if to_pandas:
@@ -397,7 +407,7 @@ class Client:
         :return:
         """
         ret = self._req_with_auth_fallback(
-            name="data universe", url=self._endpoint + DATA_UNIVERSE_PATH, params=params
+            name="data universe", url=self._endpoint + DATA_UNIVERSE_PATH, json=params
         ).json()
 
         if to_pandas:
@@ -459,7 +469,7 @@ class Client:
         ret = self._req_with_auth_fallback(
             name="ranking system ranks",
             url=self._endpoint + RANK_RANKS_PATH,
-            params=params,
+            json=params,
         ).json()
 
         if to_pandas:
@@ -503,7 +513,7 @@ class Client:
         return self._req_with_auth_fallback(
             name="ranking system performance",
             url=self._endpoint + RANK_PERF_PATH,
-            params=params,
+            json=params,
         ).json()
 
     def rank_touch(self, rank_id: int):
@@ -596,7 +606,7 @@ class Client:
             name="strategy transaction delete",
             method="DELETE",
             url=self._endpoint + STRATEGY_TRANS_PATH.substitute(id=strategy_id),
-            params=params,
+            json=params,
         ).json()
 
     def strategy_holdings(
@@ -619,6 +629,77 @@ class Client:
         ).json()
 
         return pandas.DataFrame(ret["holdings"]) if to_pandas else ret
+    
+    def strategy_trading_system(
+        self, strategy_id: int
+    ):
+        """
+        Strategy trading system
+        :param strategy_id:
+        :return:
+        """
+
+        return self._req_with_auth_fallback(
+            name="strategy trading system",
+            method="GET",
+            url=self._endpoint + STRATEGY_TRADING_SYSTEM_PATH.substitute(id=strategy_id)
+        ).json()
+    
+    def strategy_trading_system_update(self, strategy_id: int, params: dict):
+        """
+        Live strategy trading system update
+        :param strategy_id:
+        :param params:
+        :return:
+        """
+
+        return self._req_with_auth_fallback(
+            name="live strategy trading system update",
+            url=self._endpoint + STRATEGY_TRADING_SYSTEM_PATH.substitute(id=strategy_id),
+            json=params,
+        ).json()
+    
+    def book_trading_system_update(self, strategy_id: int, params: dict):
+        """
+        Live book trading system update
+        :param strategy_id:
+        :param params:
+        :return:
+        """
+
+        return self._req_with_auth_fallback(
+            name="live book trading system update",
+            url=self._endpoint + BOOK_TRADING_SYSTEM_PATH.substitute(id=strategy_id),
+            json=params,
+        ).json()
+    
+    def strategy_rerun(self, strategy_id: int, params: dict):
+        """
+        Simulated strategy rerun
+        :param strategy_id:
+        :param params:
+        :return:
+        """
+
+        return self._req_with_auth_fallback(
+            name="simulated strategy rerun",
+            url=self._endpoint + SIM_RERUN_PATH.substitute(id=strategy_id),
+            json=params,
+        ).json()
+    
+    def book_rerun(self, strategy_id: int, params: dict):
+        """
+        Simulated book rerun
+        :param strategy_id:
+        :param params:
+        :return:
+        """
+
+        return self._req_with_auth_fallback(
+            name="simulated book rerun",
+            url=self._endpoint + BOOK_SIM_RERUN_PATH.substitute(id=strategy_id),
+            json=params,
+        ).json()
 
     def strategy_rebalance(self, strategy_id: int, params: dict):
         """
@@ -631,7 +712,7 @@ class Client:
         ret = self._req_with_auth_fallback(
             name="strategy rebalance",
             url=self._endpoint + STRATEGY_REBALANCE_PATH.substitute(id=strategy_id),
-            params=params,
+            json=params,
         ).json()
 
         return ret
@@ -648,7 +729,7 @@ class Client:
             name="strategy rebalance commit",
             url=self._endpoint
             + STRATEGY_REBALANCE_COMMIT_PATH.substitute(id=strategy_id),
-            params=params,
+            json=params,
         ).json()
 
         return ret
@@ -707,7 +788,7 @@ class Client:
         return self._req_with_auth_fallback(
             name="stock factor create/update",
             url=self._endpoint + STOCK_FACTOR_CREATE_UPDATE_PATH,
-            params=params,
+            json=params,
         ).json()
 
     def stock_factor_delete(self, factor_id: int):
@@ -776,7 +857,7 @@ class Client:
         return self._req_with_auth_fallback(
             name="data series create/update",
             url=self._endpoint + DATA_SERIES_CREATE_UPDATE_PATH,
-            params=params,
+            json=params,
         ).json()
 
     def data_series_delete(self, series_id: int):
@@ -804,7 +885,7 @@ class Client:
         ret = self._req_with_auth_fallback(
             name="AI Factor predict",
             url=self._endpoint + AIFACTOR_PREDICT_PATH.substitute(id=predictor_id),
-            params=params,
+            json=params,
         ).json()
 
         if to_pandas:
@@ -848,6 +929,20 @@ class Client:
             method="GET",
             url=self._endpoint + STOCK_FACTOR_DOWNLOAD_PATH.substitute(id=factor_id),
         ).json()
+    
+    def data_prices(self, identifier: Union[int, str], start: str, end: Optional[str], to_pandas=False):
+        """
+        """
+        get_params = [("start", start)]
+        if end is not None:
+            get_params.append(("end", end))
+        ret = self._req_with_auth_fallback(
+            name="download security prices",
+            method="GET",
+            url=self._endpoint + DATA_PRICES_PATH.substitute(identifier=identifier),
+            params=get_params
+        ).json()
+        return pandas.DataFrame(ret["prices"]) if to_pandas else ret
 
 
 def req_with_retry(req: Callable[..., requests.Response], max_tries=None, **kwargs):

{p123api-2.0.0 → p123api-2.2.0}/p123api.egg-info/PKG-INFO

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

{p123api-2.0.0 → p123api-2.2.0}/setup.py

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