investfly-sdk 1.3__py3-none-any.whl → 1.5__py3-none-any.whl

investfly/models/ModelUtils.py

@@ -15,7 +15,8 @@ class ModelUtils:
 
     @staticmethod
     def parseDatetime(date_str: str) -> datetime:
-        dt = datetime.strptime(date_str, '%Y-%m-%dT%H:%M:%S.%f')
+        dateFormat = '%Y-%m-%dT%H:%M:%S.%f' if "." in date_str else '%Y-%m-%dT%H:%M:%S'
+        dt = datetime.strptime(date_str, dateFormat)
         dt = dt.astimezone(ModelUtils.est_tz)
         return dt
 

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/indicators/IndicatorTemplate.py

@@ -11,7 +11,7 @@ from typing import Any, List, Dict
 import math
 import statistics
 import numpy as np
-import talib
+import talib  # type: ignore
 import pandas
 
 # ! WARN ! Imports other than listed above are disallowed and won't pass validation

investfly/samples/indicators/RsiOfSma.py

@@ -1,7 +1,7 @@
 import datetime
 from typing import Any, List, Dict
 import numpy as np
-import talib
+import talib  # type: ignore
 
 from investfly.models import *
 from investfly.utils import *

investfly/samples/indicators/SmaEmaAverage.py

@@ -1,7 +1,7 @@
 from typing import Any, List, Dict
 
 import numpy as np
-import talib
+import talib  # type: ignore
 
 from investfly.models import *
 from investfly.utils import *

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

@@ -12,7 +12,9 @@ from typing import Any, List, Dict
 import math
 import statistics
 import numpy as np
-import talib  # https://pypi.org/project/TA-Lib/
+
+# https://pypi.org/project/TA-Lib/
+import talib  # type: ignore
 import pandas
 # ! WARN ! Imports other than listed above are disallowed and won't pass validation
 
@@ -95,7 +97,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.3.dist-info → investfly_sdk-1.5.dist-info}/METADATA

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

{investfly_sdk-1.3.dist-info → investfly_sdk-1.5.dist-info}/RECORD

@@ -6,34 +6,37 @@ investfly/api/PortfolioApiClient.py,sha256=llNISIHWSx3wvf83usGhwPhVr-3RYGAndBNpZ
 investfly/api/RestApiClient.py,sha256=XjvJCqAqUMPa7tXkhxGwaOj1xgHkfLcA8Q0027Z6xm8,3236
 investfly/api/StrategyApiClient.py,sha256=w5_hQrxtQ7-1C1uu0UKL37ZbcjXmtdBAYXPtEiM-MC4,2087
 investfly/api/__init__.py,sha256=JeeOmrsPbVk4B26DT3hbvBoxAvkMEhJ-PeKeloNGF08,600
+investfly/api/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 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=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
+investfly/models/ModelUtils.py,sha256=fdKO0hswgRALfSj8UvNSdtQyDo0QzDc10j3YXa0YIIA,1040
 investfly/models/PortfolioModels.py,sha256=wEHzaxEMEmliNR1OXS0WNzzao7ZA5qhKIPzAjWQuUOM,8658
 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/models/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 investfly/samples/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-investfly/samples/indicators/IndicatorTemplate.py,sha256=X0AlStLnL1SBSnTwrtW_sthm00tmuN5V7N-GrtiarmM,4454
+investfly/samples/indicators/IndicatorTemplate.py,sha256=Pn3jGVjMVwhqN1-F5FTAUPm4caFa3ORORNtvL353iEc,4470
 investfly/samples/indicators/NewsSentiment.py,sha256=fcpAqOcNWmqYsP-xwJquCX_6G7Ntr3A1-m31eJHAUOE,65095
-investfly/samples/indicators/RsiOfSma.py,sha256=kiLvMhrsbc_lV0EEpERGW2im19u5XmyJk88aTDGSBis,1719
-investfly/samples/indicators/SmaEmaAverage.py,sha256=9pp3TtEKJADD_bfufwrWlwMswlTLoN7Nj6BC_jJ1sRs,1749
+investfly/samples/indicators/RsiOfSma.py,sha256=fSPKYPF8vJqhRs2LvMZJp_e7pb5rBPpsXF7Fu3ZdS04,1735
+investfly/samples/indicators/SmaEmaAverage.py,sha256=DrKPrcV4QaxKAp8lwQmFue-_LVteKnB-zgIgwx_25Bk,1765
 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=5wDg1ecAC75ijnKs8hP6hG5EG9P58jLK_RRKTIrQnCI,8197
 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.3.dist-info/LICENSE.txt,sha256=Jmd2U7G7Z1oNdnRERRzFXN6C--bEo_K56j4v9EpJSTg,1090
-investfly_sdk-1.3.dist-info/METADATA,sha256=Nxdk0L1ZE5eKcJzRVbofnXgfkQs6NGEUAMRFOimKZqo,7507
-investfly_sdk-1.3.dist-info/WHEEL,sha256=Z4pYXqR_rTB7OWNDYFOm1qRk0RX6GFP2o8LgvP453Hk,91
-investfly_sdk-1.3.dist-info/entry_points.txt,sha256=GDRF4baJQXTh90DvdJJx1DeRezWfPt26E567lTs3g6U,66
-investfly_sdk-1.3.dist-info/top_level.txt,sha256=dlEJ2OGWA3prqMvXELeydS5RTdpSzh7hz1LwR3NMc7A,10
-investfly_sdk-1.3.dist-info/RECORD,,
+investfly/utils/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+investfly_sdk-1.5.dist-info/LICENSE.txt,sha256=Jmd2U7G7Z1oNdnRERRzFXN6C--bEo_K56j4v9EpJSTg,1090
+investfly_sdk-1.5.dist-info/METADATA,sha256=mf8Zji3FmIY8S0Lk2hJocJftq1oNr604BdKhp_SFx3s,7507
+investfly_sdk-1.5.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
+investfly_sdk-1.5.dist-info/entry_points.txt,sha256=GDRF4baJQXTh90DvdJJx1DeRezWfPt26E567lTs3g6U,66
+investfly_sdk-1.5.dist-info/top_level.txt,sha256=dlEJ2OGWA3prqMvXELeydS5RTdpSzh7hz1LwR3NMc7A,10
+investfly_sdk-1.5.dist-info/RECORD,,

{investfly_sdk-1.3.dist-info → investfly_sdk-1.5.dist-info}/WHEEL

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