finterion-investing-algorithm-framework 0.10.10__py3-none-any.whl → 0.11__py3-none-any.whl

finterion_investing_algorithm_framework/market_service.py

@@ -1,16 +1,25 @@
 from datetime import datetime
-import ccxt
-from dateutil import parser
 from decimal import Decimal
 
-from investing_algorithm_framework.infrastructure.services import MarketService
-from investing_algorithm_framework import Order
-from investing_algorithm_framework.domain import OperationalException, \
-    parse_decimal_to_string
+from dateutil import parser
 from finterion import Finterion
+from investing_algorithm_framework import Order
+from investing_algorithm_framework.domain import parse_decimal_to_string
+from investing_algorithm_framework.infrastructure import CCXTMarketService
+
 
+class FinterionMarketService(CCXTMarketService):
+
+    def cancel_order(self, order):
+        pass
+
+    def get_open_orders(self, target_symbol: str = None,
+                        trading_symbol: str = None):
+        pass
 
-class FinterionMarketService(MarketService):
+    def get_closed_orders(self, target_symbol: str = None,
+                          trading_symbol: str = None):
+        pass
 
     def __init__(self, api_key, base_url=None, initialize=True):
         self._api_key = api_key
@@ -22,29 +31,6 @@ class FinterionMarketService(MarketService):
             else:
                 self._finterion = Finterion(api_key)
 
-    @property
-    def market(self):
-        return self._market
-
-    @market.setter
-    def market(self, value):
-
-        if not isinstance(value, str):
-            raise OperationalException("Market must be a string")
-
-        if value == "finterion":
-            return
-
-        self._market = value.lower()
-
-        if not hasattr(ccxt, self._market):
-            raise OperationalException(
-                f"No market service found for market id {self._market}"
-            )
-
-        self.exchange_class = getattr(ccxt, self._market)
-        self.exchange = self.exchange_class()
-
     def initialize(self, portfolio_configuration):
         pass
 
@@ -114,15 +100,15 @@ class FinterionMarketService(MarketService):
         order = Order(
             external_id=finterion_order.get("id"),
             order_type=finterion_order.get("order_type"),
-            side=finterion_order.get("order_side"),
+            order_side=finterion_order.get("order_side"),
             status=finterion_order.get("status"),
             amount=finterion_order.get("amount"),
             target_symbol=finterion_order.get("target_symbol"),
             trading_symbol=finterion_order.get("trading_symbol"),
             price=finterion_order.get("price"),
             trade_closed_price=finterion_order.get("trade_closed_price"),
-            filled_amount=finterion_order.get("filled"),
-            remaining_amount=finterion_order.get("remaining"),
+            filled=finterion_order.get("filled"),
+            remaining=finterion_order.get("remaining"),
             cost=finterion_order.get("cost"),
         )
 

finterion_investing_algorithm_framework/models/portfolio_configuration.py

@@ -21,8 +21,6 @@ class FinterionPortfolioConfiguration(PortfolioConfiguration):
                 "least one market to your algorithm on the finterion platform."
             )
 
-        self._market = market_data_markets[0]
-
     @property
     def identifier(self):
         return "finterion"

{finterion_investing_algorithm_framework-0.10.10.dist-info → finterion_investing_algorithm_framework-0.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: finterion-investing-algorithm-framework
-Version: 0.10.10
+Version: 0.11
 Summary: Official Finterion plugin for the investing algorithm framework
 Home-page: https://github.com/finterion/finterion-investing-algorithm-framework.git
 Author: Finterion
@@ -17,7 +17,7 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: investing-algorithm-framework >=1.4.2
+Requires-Dist: investing-algorithm-framework >=1.7.4
 Requires-Dist: finterion >=0.7.4
 
 # Finterion Investing Algorithm Framework Plugin
@@ -39,42 +39,16 @@ algorithm framework configured with the finterion platform.
 > your algorithm on the finterion platform.
 
 ```python
-import os
-import pathlib
-from datetime import datetime, timedelta
-
 from finterion_investing_algorithm_framework import create_app
-from investing_algorithm_framework import RESOURCE_DIRECTORY, TimeUnit, \
-    TradingTimeFrame, TradingDataType, OrderSide
 
-dir_path = os.path.abspath(os.path.join(os.path.realpath(__file__), os.pardir))
-app = create_app(
-    api_key="<your_api_key>", 
-    config={RESOURCE_DIRECTORY: pathlib.Path(__file__).parent.resolve()}
-)
+app = create_app(api_key="<YOUR_TRADING_BOT_FINTERION_API_KEY>")
 
+# Add your investing algorithm framework market data sources
+# ..... 
 
-@app.strategy(
-    time_unit=TimeUnit.SECOND, # Algorithm will be executed every 5 seconds
-    interval=5,
-    market="binance", # Will retrieve trading data from binance
-    symbols=["BTC/USDT", "ETH/USDT", ["DOT/USDT"]], # Symbols must be in the format of TARGET/TRADE symbol (e.g. BTC/USDT)
-    trading_data_types=[TradingDataType.OHLCV, TradingDataType.TICKER, TradingDataType.ORDER_BOOK],
-    trading_time_frame_start_date=datetime.utcnow() - timedelta(days=1), # Will retrieve data from the last 24 hours
-    trading_time_frame=TradingTimeFrame.ONE_MINUTE # Will retrieve data on 1m interval (OHLCV)
-)
-def perform_strategy(algorithm, market_data):
-    print(algorithm.get_allocated())
-    print(algorithm.get_unallocated())
-    print(market_data)
-    algorithm.create_limit_order(
-        target_symbol="BTC", 
-        side=OrderSide.BUY,
-        price=market_data["TICKER"]["BTC/USDT"]["BID"], 
-        amount_target_symbol=0.00001
-    )
+# Add your investing algorithm framework trading strategies
+# ....
 
-    
 if __name__ == "__main__":
     app.run()
 ```

{finterion_investing_algorithm_framework-0.10.10.dist-info → finterion_investing_algorithm_framework-0.11.dist-info}/RECORD

@@ -1,13 +1,13 @@
 finterion_investing_algorithm_framework/__init__.py,sha256=u-srn87VlLUPUJHWR5hgMAHqw2BWtb1v0eH0tQ8M16w,107
 finterion_investing_algorithm_framework/create_app.py,sha256=tIQAhrWLGDf7d7TQyI48mKTGrSc_QtcpdYAbn073k_Y,1384
 finterion_investing_algorithm_framework/exceptions.py,sha256=KOaDjHQC7vNpKwYYNxJ2nuaJYceMmvExW3BLSzPSWJk,197
-finterion_investing_algorithm_framework/market_service.py,sha256=hWwBTnHOh5f2WAYmLzXNF5il78fPf4vAeGOiCryue5M,4366
+finterion_investing_algorithm_framework/market_service.py,sha256=01S0jYDnDQln4aoaUPMxEZZbwIr9W3GPn3MQoK4L7ew,4031
 finterion_investing_algorithm_framework/configuration/__init__.py,sha256=yz9TVm7RoGgF3EJ95-iLJrMup7eYoRvTXY1TyfEiGf4,42
 finterion_investing_algorithm_framework/configuration/constants.py,sha256=bhabsdZ8omPvAZlQmdPGM70vHQHS2pcJm2olpkSEciU,93
 finterion_investing_algorithm_framework/models/__init__.py,sha256=waEhKjOtg3oSSoyWHNFsQCcRklQm5EeOoAVCyEaMxSs,174
-finterion_investing_algorithm_framework/models/portfolio_configuration.py,sha256=cjkD_3VVGRPbsDbsRkY_0eKoTSdB7jADFL_I8hdArg4,898
-finterion_investing_algorithm_framework-0.10.10.dist-info/LICENSE,sha256=wbVEDvoZiMPHufRY3sLEffvAr7GH5hOIngHF8y4HFQg,11343
-finterion_investing_algorithm_framework-0.10.10.dist-info/METADATA,sha256=foH9m8tH_mRTW0HBRODLBDgf5IQRO8NTAJsXF5kQOVg,3289
-finterion_investing_algorithm_framework-0.10.10.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-finterion_investing_algorithm_framework-0.10.10.dist-info/top_level.txt,sha256=B97hJPQAFX_vRhcLE8uVZ6ac3a5ndS79p-O8-C2y-zw,40
-finterion_investing_algorithm_framework-0.10.10.dist-info/RECORD,,
+finterion_investing_algorithm_framework/models/portfolio_configuration.py,sha256=NFGMXRgfiLY2byxi_5yjUgdlV2Fy7DLG48B1hMw-QK4,851
+finterion_investing_algorithm_framework-0.11.dist-info/LICENSE,sha256=wbVEDvoZiMPHufRY3sLEffvAr7GH5hOIngHF8y4HFQg,11343
+finterion_investing_algorithm_framework-0.11.dist-info/METADATA,sha256=Hg_UCUkDsJpUqMgRgM0fMwmG9IfxZtOhc-TYbHAPVRI,2144
+finterion_investing_algorithm_framework-0.11.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+finterion_investing_algorithm_framework-0.11.dist-info/top_level.txt,sha256=B97hJPQAFX_vRhcLE8uVZ6ac3a5ndS79p-O8-C2y-zw,40
+finterion_investing_algorithm_framework-0.11.dist-info/RECORD,,

{finterion_investing_algorithm_framework-0.10.10.dist-info → finterion_investing_algorithm_framework-0.11.dist-info}/WHEEL

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