pyalgotrading 2024.1.2__py3-none-any.whl → 2024.12.2__py3-none-any.whl

pyalgotrading/algobulls/api.py

@@ -267,7 +267,7 @@ class AlgoBullsAPI:
 
         return response
 
-    def delete_previous_trades(self, strategy: str):
+    def delete_previous_trades(self, strategy: str, trading_type: TradingType):
         """
         Delete the previous trades of given strategy
 
@@ -280,9 +280,10 @@ class AlgoBullsAPI:
         Info: ENDPOINT
            `DELETE` v3/build/python/user/strategy/deleteAll?strategyId={strategy}
         """
-
-        endpoint = f'v3/build/python/user/strategy/deleteAll?strategyId={strategy}'
-        response = self._send_request(method='delete', endpoint=endpoint)
+        key = self.__get_key(strategy_code=strategy, trading_type=trading_type)
+        params = {'cstcId': key, 'strategyId': strategy}
+        endpoint = f'v3/build/python/user/strategy/deleteAll'
+        response = self._send_request(method='delete', endpoint=endpoint, params=params)
 
         return response
 

pyalgotrading/algobulls/connection.py

@@ -226,18 +226,19 @@ class AlgoBullsConnection:
 
         return response
 
-    def delete_previous_trades(self, strategy):
+    def delete_previous_trades(self, strategy, trading_type):
         """
         Delete all the previous trades and clear the pnl table
 
         Args:
             strategy: Strategy code
         """
-
+        assert isinstance(strategy, str), f'Argument "strategy_code" should be a string'
+        assert isinstance(trading_type, TradingType), f'Argument "trading_type" should be an enum of type {TradingType.__name__}'
         response = {}
         for _ in range(30):
             try:
-                response = self.api.delete_previous_trades(strategy)
+                response = self.api.delete_previous_trades(strategy, trading_type)
                 print(response.get('message'))
                 break
             except AlgoBullsAPIGatewayTimeoutErrorException as ex:
@@ -826,7 +827,7 @@ class AlgoBullsConnection:
 
         # delete previous trades
         if delete_previous_trades and trading_type in [TradingType.BACKTESTING, TradingType.PAPERTRADING]:
-            self.delete_previous_trades(strategy_code)
+            self.delete_previous_trades(strategy_code, trading_type)
 
         # Setup config for starting the job
         strategy_config = {

pyalgotrading/constants.py

@@ -299,14 +299,14 @@ class OptionsInstrumentDirection(Enum):
 
 
 CandleIntervalSecondsMap = {
-    'minute': 60,
-    '3minutes': 180,
-    '5minutes': 300,
-    '10minutes': 600,
-    '15minutes': 900,
-    '30minutes': 1800,
-    '60minutes': 3600,
-    'day': 86400
+    CandleInterval.MINUTE_1.value: 60,
+    CandleInterval.MINUTE_3.value: 180,
+    CandleInterval.MINUTE_5.value: 300,
+    CandleInterval.MINUTE_10.value: 600,
+    CandleInterval.MINUTE_15.value: 900,
+    CandleInterval.MINUTE_30.value: 1800,
+    CandleInterval.MINUTE_60.value: 3600,
+    CandleInterval.DAY_1.value: 86400
 }
 
 KEY_DT_FORMAT_WITH_TIMEZONE = 0

{pyalgotrading-2024.1.2.dist-info → pyalgotrading-2024.12.2.dist-info}/METADATA

@@ -1,17 +1,15 @@
 Metadata-Version: 2.1
 Name: pyalgotrading
-Version: 2024.1.2
+Version: 2024.12.2
 Summary: Official Python Package for Algorithmic Trading APIs powered by AlgoBulls
 Home-page: https://github.com/algobulls/pyalgotrading
 Author: Pushpak Dagade
 Author-email: pushpak@algobulls.com
-License: UNKNOWN
 Project-URL: Source, https://github.com/algobulls/pyalgotrading
 Project-URL: Documentation, https://algobulls.github.io/pyalgotrading/
 Project-URL: Bug Reports, https://github.com/algobulls/pyalgotrading/issues
 Project-URL: Say Thanks!, https://saythanks.io/to/guanidene%40gmail.com
 Keywords: algotrading algorithmictrading trading strategies algostrategies apis
-Platform: UNKNOWN
 Classifier: Development Status :: 3 - Alpha
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Financial and Insurance Industry
@@ -26,8 +24,8 @@ Classifier: Programming Language :: Python :: 3.8
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: pandas >=0.25.3
 Requires-Dist: requests >=2.24.0
+Requires-Dist: pandas >=0.25.3
 
 # pyalgotrading
 
@@ -122,5 +120,3 @@ See [CHANGELOG.md](https://github.com/algobulls/pyalgotrading/blob/master/CHANGE
 ### License
 
 See [LICENSE](https://github.com/algobulls/pyalgotrading/blob/master/LICENSE).
-
-

{pyalgotrading-2024.1.2.dist-info → pyalgotrading-2024.12.2.dist-info}/RECORD

@@ -1,8 +1,8 @@
 pyalgotrading/__init__.py,sha256=UzrsH5H2VlSxwdH8z0MnFqQoj_ggI6nEcVr4dLVFEeI,213
-pyalgotrading/constants.py,sha256=D2PXZnOyO1U6lpmMY7HBo2tJVdxfA9MvSwxfj_QY3i0,7392
+pyalgotrading/constants.py,sha256=EvDHAIFdslw7Iynwl0etwBkbgTaBXWbC8q3iABVtVGo,7548
 pyalgotrading/algobulls/__init__.py,sha256=IRkbWtJfgQnPH7gikjqpa6QsYnmk_NQ1lwtx7LPIC6c,133
-pyalgotrading/algobulls/api.py,sha256=fhW0Ms73FqLGRSzz5HDB95ViNsnstXFig8aqGECODCY,19594
-pyalgotrading/algobulls/connection.py,sha256=uuIsNwsukCweDSF24oRuKSq2WK_JaTEb1z_BotfliVA,59493
+pyalgotrading/algobulls/api.py,sha256=P3BZL43Dv9Ke1vSU4Lv6cCwxibLi3zMXbq6z4hXNna4,19750
+pyalgotrading/algobulls/connection.py,sha256=Wf3UecztkYT8gvrjjQHwrolaOJCerc8krOci2-iEIvE,59753
 pyalgotrading/algobulls/exceptions.py,sha256=B96On8cN8tgtX7i4shKOlYfvjSjvspIRPbOpyF-jn0I,2187
 pyalgotrading/broker/__init__.py,sha256=jXVWBVRlqzevKxNDqrPANJz9WubROBes8gaKcxcYz58,66
 pyalgotrading/broker/broker_connection_base.py,sha256=vAJN5EAQuVfL8Ngf03wsaI5TTGdziCHKCb0bczGgSJ0,7594
@@ -28,8 +28,8 @@ pyalgotrading/utils/candlesticks/__init__.py,sha256=maIn__tvTvJDjldPhU9agBcNNuRO
 pyalgotrading/utils/candlesticks/heikinashi.py,sha256=SpcuK7AYV0sgzcw-DMfLNtTDn2RfWqGvWBt4no7yKD4,2003
 pyalgotrading/utils/candlesticks/linebreak.py,sha256=cYwoETMrenWOa06d03xASZoiou-qRz7n2mZYCi5ilEs,1434
 pyalgotrading/utils/candlesticks/renko.py,sha256=zovQ6D658pBLas86FuTu9fU3-Kkv2hM-4h7OQJjdxng,2089
-pyalgotrading-2024.1.2.dist-info/LICENSE,sha256=-LLEprvixKS-LwHef99YQSOFon_tWeTwJRAWuUwwr1g,1066
-pyalgotrading-2024.1.2.dist-info/METADATA,sha256=XlAcfwu1eLgIvXTOAWQmKgf6_B4dmHOCkWCKX05qbBE,5866
-pyalgotrading-2024.1.2.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-pyalgotrading-2024.1.2.dist-info/top_level.txt,sha256=A12PTnbXqO3gsZ0D0Gkyzf_OYRQxjJvtg3MqN-Ur2zY,14
-pyalgotrading-2024.1.2.dist-info/RECORD,,
+pyalgotrading-2024.12.2.dist-info/LICENSE,sha256=-LLEprvixKS-LwHef99YQSOFon_tWeTwJRAWuUwwr1g,1066
+pyalgotrading-2024.12.2.dist-info/METADATA,sha256=B3VhstjuEuwJ8D-TUqAKQ6cI4qqk25mQPHV9l2Xc-90,5830
+pyalgotrading-2024.12.2.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+pyalgotrading-2024.12.2.dist-info/top_level.txt,sha256=A12PTnbXqO3gsZ0D0Gkyzf_OYRQxjJvtg3MqN-Ur2zY,14
+pyalgotrading-2024.12.2.dist-info/RECORD,,

{pyalgotrading-2024.1.2.dist-info → pyalgotrading-2024.12.2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.2)
+Generator: bdist_wheel (0.43.0)
 Root-Is-Purelib: true
 Tag: py3-none-any