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

investfly/api/IndicatorApiClient.py

@@ -9,13 +9,24 @@ class IndicatorApiClient:
     def __init__(self, restApiClient: RestApiClient) -> None:
         self.restApiClient = restApiClient
 
-    def listIndicators(self) -> List[IndicatorSpec]:
+    def listCustomIndicators(self) -> List[IndicatorSpec]:
         indicatorsListDict = self.restApiClient.doGet('/indicator/list/custom')
         result: List[IndicatorSpec] = []
         for indicatorDict in indicatorsListDict:
             result.append(IndicatorSpec.fromDict(indicatorDict))
         return result
 
+    def listStandardIndicators(self) -> List[IndicatorSpec]:
+        indicatorsListDict = self.restApiClient.doGet('/indicator/list/standard')
+        result: List[IndicatorSpec] = []
+        for indicatorDict in indicatorsListDict:
+            result.append(IndicatorSpec.fromDict(indicatorDict))
+        return result
+
+    def getIndicatorSpec(self, indicatorId: str) -> IndicatorSpec:
+        specDict = self.restApiClient.doGet(f'/indicator/{indicatorId}')
+        return IndicatorSpec.fromDict(specDict)
+
     def getIndicatorCode(self, indicatorId: str) -> str:
         return self.restApiClient.doGet(f'/indicator/custom/{indicatorId}/code')
 

investfly/api/RestApiClient.py

@@ -19,11 +19,12 @@ class RestApiClient:
 
     def __init__(self, baseUrl: str) -> None:
         self.headers: Dict[str, str] = {}
+        self.headers['client-mode'] = 'api'
         self.baseUrl = baseUrl
         self.log = logging.getLogger(self.__class__.__name__)
 
     def login(self, username: str, password: str) -> Session:
-        res = requests.post(self.baseUrl + "/user/login", auth=(username, password), verify=False)
+        res = requests.post(self.baseUrl + "/user/login", auth=(username, password), headers=self.headers, verify=False)
         if res.status_code == 200:
             self.headers['investfly-client-id'] = res.headers['investfly-client-id']
             self.headers['investfly-client-token'] = res.headers['investfly-client-token']

investfly/cli/InvestflyCli.py

@@ -1,6 +1,4 @@
 import argparse
-import pickle
-import os.path
 import time
 from typing import List, cast
 
@@ -12,6 +10,8 @@ from investfly import samples
 import inspect
 from pathlib import Path
 import shutil
+import json
+import re
 
 
 class InvestflyCli:
@@ -20,6 +20,15 @@ class InvestflyCli:
         self.running: bool = True
         self.investflyApi = InvestflyApiClient()
 
+    @staticmethod
+    def extract_class_name(source_code: str, base_class: str) -> str|None:
+        class_pattern = re.compile(r'class\s+(\w+)\s*\(\s*' + base_class + r'\s*\)\s*:', re.IGNORECASE)
+        for line in source_code.splitlines():
+            match = class_pattern.search(line)
+            if match:
+                return match.group(1)
+        return None
+
 
     def __loginAction(self, args: argparse.Namespace) -> Session:
         username = args.username
@@ -51,10 +60,12 @@ class InvestflyCli:
         return "\n".join(strategiesDictList)
 
     def __createStrategy(self, args: argparse.Namespace) -> str:
-        name = args.name
         path = args.file
         with open(path, 'r') as source_file:
             code = source_file.read()
+        name = InvestflyCli.extract_class_name(code, "TradingStrategy")
+        if name is None:
+            return "Provided file does not contain class that extends from TradingStrategy"
         tradingStrategyModel = TradingStrategyModel(strategyName=name, strategyDesc=name, pythonCode=code)
         tradingStrategyModel = self.investflyApi.strategyApi.createStrategy(tradingStrategyModel)
         return f'Created strategy {tradingStrategyModel.strategyId}'
@@ -106,16 +117,28 @@ class InvestflyCli:
 
     # ==== INDICATOR COMMAND HANDLERS
 
-    def __listIndicators(self, args: argparse.Namespace) -> str:
-        indicators: List[IndicatorSpec] = self.investflyApi.indicatorApi.listIndicators()
+    def __listCustomIndicators(self, args: argparse.Namespace) -> str:
+        indicators: List[IndicatorSpec] = self.investflyApi.indicatorApi.listCustomIndicators()
+        idList = list(map(lambda spec: spec.indicatorId, indicators))
+        return str(idList)
+
+    def __listStandardIndicators(self, args: argparse.Namespace) -> str:
+        indicators: List[IndicatorSpec] = self.investflyApi.indicatorApi.listStandardIndicators()
         idList = list(map(lambda spec: spec.indicatorId, indicators))
         return str(idList)
 
+    def __getIndicatorSpec(self,  args: argparse.Namespace) -> str:
+        spec = self.investflyApi.indicatorApi.getIndicatorSpec(args.id)
+        jsonDict = spec.toJsonDict()
+        return json.dumps(jsonDict, indent=2)
+
     def __createUpdateIndicator(self, args: argparse.Namespace):
         path = args.file
         with open(path, 'r') as source_file:
             code = source_file.read()
-        self.investflyApi.indicatorApi.createUpdateIndicator(code)
+        spec = self.investflyApi.indicatorApi.createUpdateIndicator(code)
+        jsonDict = spec.toJsonDict()
+        return json.dumps(jsonDict, indent=2)
 
     def __downloadIndicatorCode(self, args: argparse.Namespace):
         indicatorId = args.id
@@ -149,7 +172,6 @@ class InvestflyCli:
         parser_listStrategies.set_defaults(func=self.__listStrategies)
 
         parser_createStrategy = subparser.add_parser('strategy.create', help='Create a new trading strategy')
-        parser_createStrategy.add_argument('-n', '--name', required=True, help='Strategy Name')
         parser_createStrategy.add_argument('-f', '--file', required=True, help='Python File Path relative to the project root that contains strategy code')
         parser_createStrategy.set_defaults(func=self.__createStrategy)
 
@@ -177,15 +199,22 @@ class InvestflyCli:
 
         # ====== INDICATOR COMMANDS ====
 
-        parser_listIndicators = subparser.add_parser('indicator.list', help='List Custom Indicators')
-        parser_listIndicators.set_defaults(func=self.__listIndicators)
+        parser_listCustomIndicators = subparser.add_parser('indicator.listCustom', help='List Custom Indicators')
+        parser_listCustomIndicators.set_defaults(func=self.__listCustomIndicators)
+
+        parser_listStandardIndicators = subparser.add_parser('indicator.listStandard', help='List Custom Indicators')
+        parser_listStandardIndicators.set_defaults(func=self.__listStandardIndicators)
+
+        parser_getIndicatorSpec = subparser.add_parser('indicator.getIndicator', help="Get Indicator Specification")
+        parser_getIndicatorSpec.add_argument('-i', '--id', required=True, help='Indicator ID')
+        parser_getIndicatorSpec.set_defaults(func=self.__getIndicatorSpec)
 
         parser_downloadIndicator = subparser.add_parser('indicator.download', help='Download indicator python code and save it to a file')
-        parser_downloadIndicator.add_argument('-i', '--id', required=True, help='IndicatorId ID')
+        parser_downloadIndicator.add_argument('-i', '--id', required=True, help='Indicator ID')
         parser_downloadIndicator.add_argument('-f', '--file', required=True,  help='File path (with file name) to save indicator python code')
         parser_downloadIndicator.set_defaults(func=self.__downloadIndicatorCode)
 
-        parser_createUpdateIndicator = subparser.add_parser('indicator.update', help='Create or update indicator. Indicator ID is retried from ClassName')
+        parser_createUpdateIndicator = subparser.add_parser('indicator.createupdate', help='Create or update indicator. Indicator ID is retried from ClassName')
         parser_createUpdateIndicator.add_argument('-f', '--file', required=True, help='File path (with file name) that contains indicator code')
         parser_createUpdateIndicator.set_defaults(func=self.__createUpdateIndicator)
 

investfly/samples/indicators/RsiOfSma.py

@@ -14,14 +14,10 @@ from investfly.utils import *
 
 class RsiOfSma(Indicator):
 
-
-    # To implement a price-based indicator (i.e. indicator that uses price bars [open,high,low,close,volume]),
-    # you extend from PriceBasedIndicator and implement methods shown below
-
     def getIndicatorSpec(self) -> IndicatorSpec:
-        # In this method, you must construct and return IndicatorDefinition object that specifies
-        # indicator name, description and any parameters it needs. BarSize parameter is automatically
-        # added from the parent class
+        # In this method, you must construct and return IndicatorSpec object that specifies
+        # indicator name, description and any parameters it needs. Stanard parameters like (barinterval, count, lookback)
+        #  are automatically added
         indicator = IndicatorSpec("RSI of SMA")
         indicator.addParam("sma_period", IndicatorParamSpec(ParamType.INTEGER, True, 5, IndicatorParamSpec.PERIOD_VALUES))
         indicator.addParam("rsi_period", IndicatorParamSpec(ParamType.INTEGER, True, 10, IndicatorParamSpec.PERIOD_VALUES))

investfly/samples/indicators/SmaEmaAverage.py

@@ -12,13 +12,10 @@ from investfly.utils import *
 
 class SmaEmaAverage(Indicator):
 
-    # To implement a price-based indicator (i.e indicator that uses price bars [open,high,low,close,volume]) in
-    # computation you extend from PriceBasedIndicator and implement  methods shown below
-
     def getIndicatorSpec(self) -> IndicatorSpec:
-        # In this method, you must construct and return IndicatorDefinition object that spefies
-        # indicator name, description and any parameters it needs. BarSize parameter is automatically
-        # added from the parent class
+        # In this method, you must construct and return IndicatorSpec object that specifies
+        # indicator name, description and any parameters it needs. Stanard parameters like (barinterval, count, lookback)
+        #  are automatically added
         indicator = IndicatorSpec("SMA EMA Average")
         indicator.addParam('period', IndicatorParamSpec(ParamType.INTEGER, True, 5, IndicatorParamSpec.PERIOD_VALUES))
         return indicator

{investfly_sdk-1.5.dist-info → investfly_sdk-1.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: investfly-sdk
-Version: 1.5
+Version: 1.6
 Summary: Investfly SDK
 Author-email: "Investfly.com" <admin@investfly.com>
 License: The MIT License (MIT)
@@ -46,6 +46,7 @@ Requires-Dist: tzdata ==2023.3
 Requires-Dist: urllib3 ==1.26.15
 Requires-Dist: numpy ==1.26.4
 Requires-Dist: TA-Lib ==0.4.28
+Requires-Dist: mypy ==1.12.1
 
 # About
 

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

@@ -1,13 +1,13 @@
 investfly/__init__.py,sha256=Ku0IZu4VYvNGui70Xu-bG1fB8XtVNQxBey6f5nLIKVU,71
-investfly/api/IndicatorApiClient.py,sha256=G2bEWaCvcmotp4jx-IoiqHblZZWAdwaUjDNP5ZoaagM,931
+investfly/api/IndicatorApiClient.py,sha256=y9Dr2LpbgxcetY2s45bBGGjzUk6ZT3TzwR-vQ_TU3hw,1447
 investfly/api/InvestflyApiClient.py,sha256=I_hi1Uw8EGa3jr06cNkrGbhjIT90BPr_YN5EFilykwQ,2111
 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/RestApiClient.py,sha256=ZHt_9gGZTW3krQyz2_o4w0I6SfQ6K32RTl2RcG95u3g,3302
 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/InvestflyCli.py,sha256=2dnJuGOL_qe3HeWqc0cyLss4H3HxDTXrvsHtJ6sIYSw,12114
 investfly/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 investfly/models/CommonModels.py,sha256=kbyWsez1voii2K2wyflYCW7i9lYQh49nbrts4bTvvG4,2348
 investfly/models/Indicator.py,sha256=9v46Ozs2O8UPUjDzVC1MpoGx2iwnA__ZyrySVXxX8Qo,10660
@@ -24,8 +24,8 @@ investfly/models/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 investfly/samples/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 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=fSPKYPF8vJqhRs2LvMZJp_e7pb5rBPpsXF7Fu3ZdS04,1735
-investfly/samples/indicators/SmaEmaAverage.py,sha256=DrKPrcV4QaxKAp8lwQmFue-_LVteKnB-zgIgwx_25Bk,1765
+investfly/samples/indicators/RsiOfSma.py,sha256=KewPi89ecZ0H0Ymj0FI72XgfWSvVLebuUHsfkr6WgwU,1557
+investfly/samples/indicators/SmaEmaAverage.py,sha256=daoaKl9F1MWuOIOQInq9_M3P2A9E3bzFHaQ5TgsZ4ds,1576
 investfly/samples/indicators/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 investfly/samples/strategies/SmaCrossOverStrategy.py,sha256=e_gR8gwHJ5m6lU_Ib8jeQrER3cD6q569IIhwglKePew,1680
 investfly/samples/strategies/SmaCrossOverTemplate.py,sha256=5wDg1ecAC75ijnKs8hP6hG5EG9P58jLK_RRKTIrQnCI,8197
@@ -34,9 +34,9 @@ investfly/utils/CommonUtils.py,sha256=lCXAdI8-6PgbutcXJqUmSfuuLXp82FcnlxNVjCJpqL
 investfly/utils/PercentBasedPortfolioAllocator.py,sha256=EHrOyHbaYHLwE-4vUSQCVXwbEgLs-nDjLVRH3cdgslI,1563
 investfly/utils/__init__.py,sha256=2BqXoOQElv-GIU6wvmf2aaAABAcNny2TETcj7kf9rzM,129
 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.6.dist-info/LICENSE.txt,sha256=Jmd2U7G7Z1oNdnRERRzFXN6C--bEo_K56j4v9EpJSTg,1090
+investfly_sdk-1.6.dist-info/METADATA,sha256=A1ebvr32y2SEMEd5jnuqHIxZMyn6kcpt9y--QDiu62c,7536
+investfly_sdk-1.6.dist-info/WHEEL,sha256=a7TGlA-5DaHMRrarXjVbQagU3Man_dCnGIWMJr5kRWo,91
+investfly_sdk-1.6.dist-info/entry_points.txt,sha256=GDRF4baJQXTh90DvdJJx1DeRezWfPt26E567lTs3g6U,66
+investfly_sdk-1.6.dist-info/top_level.txt,sha256=dlEJ2OGWA3prqMvXELeydS5RTdpSzh7hz1LwR3NMc7A,10
+investfly_sdk-1.6.dist-info/RECORD,,

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

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