investfly-sdk 1.2__py3-none-any.whl → 1.4__py3-none-any.whl

investfly/api/StrategyApiClient.py

@@ -15,7 +15,7 @@ class StrategyApiClient:
 
     def listStrategies(self) -> List[TradingStrategyModel]:
         strategiesList: List[Dict[str, Any]] = self.restApiClient.doGet('/strategy/list')
-        strategiesList = list(filter(lambda jsonDict: jsonDict['type'] == 'CUSTOM', strategiesList))
+        strategiesList = list(filter(lambda jsonDict: jsonDict['type'] == 'SCRIPT', strategiesList))
         return list(map(lambda jsonDict: TradingStrategyModel.fromDict(jsonDict), strategiesList))
 
     def getStrategy(self, strategyId: int) -> TradingStrategyModel:
@@ -24,7 +24,7 @@ class StrategyApiClient:
 
     def createStrategy(self, strategyModel: TradingStrategyModel) -> TradingStrategyModel:
         strategyDict = strategyModel.toDict()
-        strategyDict['type'] = 'CUSTOM'
+        strategyDict['type'] = 'SCRIPT'
         strategyDict = self.restApiClient.doPost('/strategy/create', strategyDict)
         return TradingStrategyModel.fromDict(strategyDict)
         

investfly/cli/InvestflyCli.py

@@ -2,7 +2,7 @@ import argparse
 import pickle
 import os.path
 import time
-from typing import List
+from typing import List, cast
 
 from investfly.api.InvestflyApiClient import InvestflyApiClient
 from investfly.models import Session, IndicatorSpec
@@ -63,8 +63,9 @@ class InvestflyCli:
         strategyId = int(args.id)
         path = args.file
         strategyModel: TradingStrategyModel = self.investflyApi.strategyApi.getStrategy(strategyId)
+        code: str = cast(str, strategyModel.pythonCode)
         with open(path, 'w') as out_file:
-            out_file.write(strategyModel.pythonCode)
+            out_file.write(code)
         return f"Strategy saved to {path}"
 
     def __updateCode(self, args: argparse.Namespace) -> str:
@@ -94,8 +95,8 @@ class InvestflyCli:
         try:
             while notFinished:
                 time.sleep(3)
-                backtestResult: BacktestResult = self.investflyApi.strategyApi.getBacktestResult(strategyId)
-                backtestStatus: BacktestResultStatus = backtestResult.status
+                backtestResult = self.investflyApi.strategyApi.getBacktestResult(strategyId)
+                backtestStatus = backtestResult.status
                 print(str(backtestStatus.toDict()))
                 notFinished = backtestStatus.jobStatus == BacktestStatus.QUEUED or backtestStatus.jobStatus == BacktestStatus.INITIALIZING or backtestStatus.jobStatus == BacktestStatus.RUNNING
         except KeyboardInterrupt as e:

investfly/models/Indicator.py

@@ -122,7 +122,7 @@ class IndicatorSpec:
         name = json_dict['name']
         indicatorSpec: IndicatorSpec = IndicatorSpec(name)
         indicatorSpec.indicatorId = json_dict['indicatorId']
-        indicatorSpec.description = json_dict.get('description')
+        indicatorSpec.description = json_dict['description']
         indicatorSpec.valueType = IndicatorValueType[json_dict['valueType']]
         for key, value in json_dict['params'].items():
             indicatorSpec.params[key] = IndicatorParamSpec.fromDict(value)

investfly/models/TradingStrategy.py

@@ -78,7 +78,7 @@ class TradingStrategy(ABC):
         :param tradeSignals: Trade Signals correspoding to stocks matching open trade condition
         :return:  List of TradeOrders to execute
         """
-        portfolioAllocator = PercentBasedPortfolioAllocator(10, PositionType.LONG)
+        portfolioAllocator = PercentBasedPortfolioAllocator(10)
         return portfolioAllocator.allocatePortfolio(portfolio, tradeSignals)
 
     def getStandardCloseCondition(self) -> StandardCloseCriteria | None:

investfly/samples/strategies/SmaCrossOverStrategy.py

@@ -30,6 +30,6 @@ class SmaCrossOverStrategy(TradingStrategy):
 
 
     def processOpenTradeSignals(self, portfolio: Portfolio, tradeSignals: List[TradeSignal]) -> List[TradeOrder]:
-        portfolioAllocator = PercentBasedPortfolioAllocator(5, PositionType.LONG)
+        portfolioAllocator = PercentBasedPortfolioAllocator(5)
         return portfolioAllocator.allocatePortfolio(portfolio, tradeSignals)
 

investfly/samples/strategies/SmaCrossOverTemplate.py

@@ -95,7 +95,7 @@ class SmaCrossOverTemplate(TradingStrategy):
         """
 
         # We provide a convenience utility that allocates given percent (10% set below) of portfolio in the given stock
-        portfolioAllocator = PercentBasedPortfolioAllocator(10, PositionType.LONG)
+        portfolioAllocator = PercentBasedPortfolioAllocator(10)
         return portfolioAllocator.allocatePortfolio(portfolio, tradeSignals)
 
     def getStandardCloseCondition(self) -> StandardCloseCriteria | None:

investfly/utils/PercentBasedPortfolioAllocator.py

@@ -6,17 +6,15 @@ from investfly.models.StrategyModels import PortfolioSecurityAllocator, TradeSig
 
 class PercentBasedPortfolioAllocator(PortfolioSecurityAllocator):
 
-    BROKER_FEE = 5.0
+    BROKER_FEE = 1.0
 
-    def __init__(self, percent: float, positionType: PositionType) -> None:
+    def __init__(self, percent: float) -> None:
         self.percent = percent
-        self.positionType = positionType
 
     def allocatePortfolio(self, portfolio: Portfolio, tradeSignals: List[TradeSignal]) -> List[TradeOrder]:
 
-        tradeType = TradeType.BUY if self.positionType == PositionType.LONG else TradeType.SHORT
-        openPositionSecurities = {p.security for p in portfolio.openPositions if p.position == self.positionType}
-        pendingOrdersSecurities = {o.security for o in portfolio.pendingOrders if o.tradeType == tradeType}
+        openPositionSecurities = {p.security for p in portfolio.openPositions}
+        pendingOrdersSecurities = {o.security for o in portfolio.pendingOrders}
         openAndPendingSecurities = openPositionSecurities.union(pendingOrdersSecurities)
 
         tradeOrders: List[TradeOrder] = []
@@ -28,6 +26,7 @@ class PercentBasedPortfolioAllocator(PortfolioSecurityAllocator):
         while buyingPower > allocatedAmountPerSecurity and len(tradeSignals) > 0:
             tradeSignal = tradeSignals.pop(0)
             if tradeSignal.security not in openAndPendingSecurities:
+                tradeType = TradeType.BUY if tradeSignal.position == PositionType.LONG else TradeType.SHORT
                 tradeOrder = TradeOrder(tradeSignal.security, tradeType, maxAmount=allocatedAmountPerSecurity)
                 tradeOrders.append(tradeOrder)
                 buyingPower = buyingPower - allocatedAmountPerSecurity - PercentBasedPortfolioAllocator.BROKER_FEE

{investfly_sdk-1.2.dist-info → investfly_sdk-1.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: investfly-sdk
-Version: 1.2
+Version: 1.4
 Summary: Investfly SDK
 Author-email: "Investfly.com" <admin@investfly.com>
 License: The MIT License (MIT)

{investfly_sdk-1.2.dist-info → investfly_sdk-1.4.dist-info}/RECORD

@@ -4,12 +4,12 @@ investfly/api/InvestflyApiClient.py,sha256=I_hi1Uw8EGa3jr06cNkrGbhjIT90BPr_YN5EF
 investfly/api/MarketDataApiClient.py,sha256=bOlMzzZzN5A35oo0Iml2xCekV0jOig8Q_L66xi6n0n0,611
 investfly/api/PortfolioApiClient.py,sha256=llNISIHWSx3wvf83usGhwPhVr-3RYGAndBNpZV9w3W0,1858
 investfly/api/RestApiClient.py,sha256=XjvJCqAqUMPa7tXkhxGwaOj1xgHkfLcA8Q0027Z6xm8,3236
-investfly/api/StrategyApiClient.py,sha256=6HmCv7Q_yynVinWIrLfyhCATnqMaJfsqEdiNizqaWiY,2087
+investfly/api/StrategyApiClient.py,sha256=w5_hQrxtQ7-1C1uu0UKL37ZbcjXmtdBAYXPtEiM-MC4,2087
 investfly/api/__init__.py,sha256=JeeOmrsPbVk4B26DT3hbvBoxAvkMEhJ-PeKeloNGF08,600
-investfly/cli/InvestflyCli.py,sha256=GB_5QxiifXDRwy2MxV8Wq_WykVgcZbpeQ_UfhJFMWhs,10561
+investfly/cli/InvestflyCli.py,sha256=SCRqC4GpaVPB7RDzMAgr7_GpEl0ai4GF1qlBKXsjUws,10565
 investfly/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 investfly/models/CommonModels.py,sha256=kbyWsez1voii2K2wyflYCW7i9lYQh49nbrts4bTvvG4,2348
-investfly/models/Indicator.py,sha256=R98Lkxjw5pnpMgucL-GxgQHoF-mP8qsylC_FtVMQ1wc,10664
+investfly/models/Indicator.py,sha256=9v46Ozs2O8UPUjDzVC1MpoGx2iwnA__ZyrySVXxX8Qo,10660
 investfly/models/MarketData.py,sha256=NbyOh472uIXyHaTW9eYCBbiTu2szSq47iCz8i3qI1v0,6081
 investfly/models/MarketDataIds.py,sha256=CTNCb7G8NgLb84LYCqqxwlhO8e6RV-AUGwJH9GDv53A,3248
 investfly/models/ModelUtils.py,sha256=pnrVIDM26LqK0Wuw7gTs0c97lCLIV_fm0EUtlEfT7j4,964
@@ -17,7 +17,7 @@ investfly/models/PortfolioModels.py,sha256=wEHzaxEMEmliNR1OXS0WNzzao7ZA5qhKIPzAj
 investfly/models/SecurityFilterModels.py,sha256=4baTBBI-XOKh8uTpvqVvk3unD-xHoyooO3dd5lKWbXA,5806
 investfly/models/SecurityUniverseSelector.py,sha256=N2cYhgRz3PTh6T98liiiTbJNg27SBpaUaIQGgDHFbF4,8645
 investfly/models/StrategyModels.py,sha256=n9MVOJFPtc_Wkiq5TyhdQnaiTUeXGMYqLmBE9IEiW10,5553
-investfly/models/TradingStrategy.py,sha256=uUgQpZRgioVADIKerdC5VD0LEy9LvDqEEGvtRTgWASM,6381
+investfly/models/TradingStrategy.py,sha256=N1V0dZX6T2buVyg5NZL8inAKlLZSHZnrv-x2g9kxQBk,6362
 investfly/models/__init__.py,sha256=6uMfJwcYaH1r-T-bbh6gMud0VpnoSQTkPNDVMDE3JXo,1383
 investfly/samples/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 investfly/samples/indicators/IndicatorTemplate.py,sha256=X0AlStLnL1SBSnTwrtW_sthm00tmuN5V7N-GrtiarmM,4454
@@ -25,15 +25,15 @@ investfly/samples/indicators/NewsSentiment.py,sha256=fcpAqOcNWmqYsP-xwJquCX_6G7N
 investfly/samples/indicators/RsiOfSma.py,sha256=kiLvMhrsbc_lV0EEpERGW2im19u5XmyJk88aTDGSBis,1719
 investfly/samples/indicators/SmaEmaAverage.py,sha256=9pp3TtEKJADD_bfufwrWlwMswlTLoN7Nj6BC_jJ1sRs,1749
 investfly/samples/indicators/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-investfly/samples/strategies/SmaCrossOverStrategy.py,sha256=szjmnqQN8O7CRIS1vc-fRONKg4Dy1d59dZhiSEpEJAI,1699
-investfly/samples/strategies/SmaCrossOverTemplate.py,sha256=HSyVh89_d-k1aAzqs_WFt8EDxs809OjWq6V3VJVUNQw,8200
+investfly/samples/strategies/SmaCrossOverStrategy.py,sha256=e_gR8gwHJ5m6lU_Ib8jeQrER3cD6q569IIhwglKePew,1680
+investfly/samples/strategies/SmaCrossOverTemplate.py,sha256=rLYVT8dYDx7TKx5PFI8nN4JzTHtx4pPlnZ9JvxWnBfo,8181
 investfly/samples/strategies/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 investfly/utils/CommonUtils.py,sha256=lCXAdI8-6PgbutcXJqUmSfuuLXp82FcnlxNVjCJpqLU,2631
-investfly/utils/PercentBasedPortfolioAllocator.py,sha256=oKaSjq5L_3NfRo2iayepCZtZnCevsx4XpsxFfZMTnV8,1684
+investfly/utils/PercentBasedPortfolioAllocator.py,sha256=EHrOyHbaYHLwE-4vUSQCVXwbEgLs-nDjLVRH3cdgslI,1563
 investfly/utils/__init__.py,sha256=2BqXoOQElv-GIU6wvmf2aaAABAcNny2TETcj7kf9rzM,129
-investfly_sdk-1.2.dist-info/LICENSE.txt,sha256=Jmd2U7G7Z1oNdnRERRzFXN6C--bEo_K56j4v9EpJSTg,1090
-investfly_sdk-1.2.dist-info/METADATA,sha256=5SO14Syv4-fKY4ggso8X7RwuJd_vM4zu5Ji5ANtAdH4,7507
-investfly_sdk-1.2.dist-info/WHEEL,sha256=y4mX-SOX4fYIkonsAGA5N0Oy-8_gI4FXw5HNI1xqvWg,91
-investfly_sdk-1.2.dist-info/entry_points.txt,sha256=GDRF4baJQXTh90DvdJJx1DeRezWfPt26E567lTs3g6U,66
-investfly_sdk-1.2.dist-info/top_level.txt,sha256=dlEJ2OGWA3prqMvXELeydS5RTdpSzh7hz1LwR3NMc7A,10
-investfly_sdk-1.2.dist-info/RECORD,,
+investfly_sdk-1.4.dist-info/LICENSE.txt,sha256=Jmd2U7G7Z1oNdnRERRzFXN6C--bEo_K56j4v9EpJSTg,1090
+investfly_sdk-1.4.dist-info/METADATA,sha256=V4g8ckW2EKMQw6XXoyT-MONak8Mrn-KJF113rYrl74E,7507
+investfly_sdk-1.4.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+investfly_sdk-1.4.dist-info/entry_points.txt,sha256=GDRF4baJQXTh90DvdJJx1DeRezWfPt26E567lTs3g6U,66
+investfly_sdk-1.4.dist-info/top_level.txt,sha256=dlEJ2OGWA3prqMvXELeydS5RTdpSzh7hz1LwR3NMc7A,10
+investfly_sdk-1.4.dist-info/RECORD,,

{investfly_sdk-1.2.dist-info → investfly_sdk-1.4.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (70.2.0)
+Generator: setuptools (75.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any