finterion-investing-algorithm-framework 0.11.1__py3-none-any.whl → 0.11.2__py3-none-any.whl

finterion_investing_algorithm_framework/create_app.py

@@ -2,7 +2,7 @@ import logging
 
 from finterion import Finterion
 from investing_algorithm_framework import create_app as framework_create_app, \
-    Task, TimeUnit, App
+    Task, TimeUnit, App, MarketCredential
 
 from finterion_investing_algorithm_framework.market_service import \
     FinterionMarketService
@@ -23,13 +23,23 @@ def create_app(
     client.ping()
     model = client.get_algorithm_model()
     portfolio_configuration = FinterionPortfolioConfiguration(
-        api_key=api_key,
         trading_symbol=model['profile']['trading_symbol'],
         market_data_markets=model['profile']['markets'],
     )
     app = framework_create_app(config=config, web=web, stateless=stateless)
+    app.add_market_credential(
+        MarketCredential(
+            market="finterion",
+            api_key=api_key,
+            secret_key=None,
+        )
+    )
     app.container.market_service.override(
-        FinterionMarketService(api_key=api_key, base_url=base_url)
+        FinterionMarketService(
+            api_key=api_key,
+            base_url=base_url,
+            market_credential_service=app.container.market_credential_service,
+        )
     )
     app.add_portfolio_configuration(portfolio_configuration)
 

finterion_investing_algorithm_framework/market_service.py

@@ -1,5 +1,4 @@
 from datetime import datetime
-from decimal import Decimal
 
 from dateutil import parser
 from finterion import Finterion
@@ -10,18 +9,27 @@ from investing_algorithm_framework.infrastructure import CCXTMarketService
 
 class FinterionMarketService(CCXTMarketService):
 
-    def cancel_order(self, order):
+    def cancel_order(self, order, market):
         pass
 
-    def get_open_orders(self, target_symbol: str = None,
-                        trading_symbol: str = None):
+    def get_open_orders(
+        self, market, target_symbol: str = None, trading_symbol: str = None
+    ):
         pass
 
-    def get_closed_orders(self, target_symbol: str = None,
-                          trading_symbol: str = None):
+    def get_closed_orders(
+        self, market, target_symbol: str = None, trading_symbol: str = None
+    ):
         pass
 
-    def __init__(self, api_key, base_url=None, initialize=True):
+    def __init__(
+        self,
+        api_key,
+        market_credential_service,
+        base_url=None,
+        initialize=True
+    ):
+        super().__init__(market_credential_service)
         self._api_key = api_key
         self._market = "finterion"
 
@@ -34,23 +42,23 @@ class FinterionMarketService(CCXTMarketService):
     def initialize(self, portfolio_configuration):
         pass
 
-    def get_order(self, order):
-        order = self._finterion.get_order(order.external_id)
+    def get_order(self, order, market):
+        order = self._finterion.get_order(order.get_external_id())
         return self._convert_order(order)
 
-    def get_orders(self, symbol, since: datetime = None):
+    def get_orders(self, symbol, market, since: datetime = None):
         orders = self._finterion.get_orders(target_symbol=symbol)
         return [self._convert_order(order) for order in orders]
 
-    def get_balance(self):
+    def get_balance(self, market):
         positions = self._finterion.get_positions()
         entries = {"free": {}}
 
         for position in positions:
             entries[position["symbol"]] = {
-                "free": Decimal(position["amount"]),
+                "free": position["amount"],
             }
-            entries["free"][position["symbol"]] = Decimal(position["amount"])
+            entries["free"][position["symbol"]] = float(position["amount"])
 
         return entries
 
@@ -59,6 +67,7 @@ class FinterionMarketService(CCXTMarketService):
         target_symbol: str,
         trading_symbol: str,
         amount: float,
+        market
     ):
         order = self._finterion.create_market_order(
             order_side="sell",
@@ -72,7 +81,8 @@ class FinterionMarketService(CCXTMarketService):
         target_symbol: str,
         trading_symbol: str,
         amount,
-        price
+        price,
+        market
     ):
         order = self._finterion.create_limit_order(
             order_side="sell",
@@ -87,7 +97,8 @@ class FinterionMarketService(CCXTMarketService):
         target_symbol: str,
         trading_symbol: str,
         amount: float,
-        price: float
+        price: float,
+        market
     ):
         order = self._finterion.create_limit_order(
             order_side="buy",
@@ -125,5 +136,3 @@ class FinterionMarketService(CCXTMarketService):
             order.updated_at = parser.parse(finterion_order.get("updated_at"))
 
         return order
-
-

finterion_investing_algorithm_framework/models/portfolio_configuration.py

@@ -4,13 +4,11 @@ from investing_algorithm_framework.domain import ImproperlyConfigured
 
 class FinterionPortfolioConfiguration(PortfolioConfiguration):
 
-    def __init__(self, api_key, trading_symbol, market_data_markets):
+    def __init__(self, trading_symbol, market_data_markets):
         try:
             super().__init__(
                 market="finterion",
                 trading_symbol=trading_symbol,
-                api_key=api_key,
-                secret_key=None,
             )
         except ImproperlyConfigured:
             pass
@@ -24,5 +22,3 @@ class FinterionPortfolioConfiguration(PortfolioConfiguration):
     @property
     def identifier(self):
         return "finterion"
-
-

{finterion_investing_algorithm_framework-0.11.1.dist-info → finterion_investing_algorithm_framework-0.11.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: finterion-investing-algorithm-framework
-Version: 0.11.1
+Version: 0.11.2
 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.7.4
+Requires-Dist: investing-algorithm-framework >=2.0.2
 Requires-Dist: finterion >=0.7.4
 
 # Finterion Investing Algorithm Framework Plugin

{finterion_investing_algorithm_framework-0.11.1.dist-info → finterion_investing_algorithm_framework-0.11.2.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/create_app.py,sha256=TnWWKuQEpLtX23XC1-KOflrriidJoti0CMd1mSRw6bM,1654
 finterion_investing_algorithm_framework/exceptions.py,sha256=KOaDjHQC7vNpKwYYNxJ2nuaJYceMmvExW3BLSzPSWJk,197
-finterion_investing_algorithm_framework/market_service.py,sha256=wHHPSioLNT9VvwoybywK9sLHMYGruNSE6M_TTQKGniM,4119
+finterion_investing_algorithm_framework/market_service.py,sha256=b1KddReiKO70A2yjjny4yvhB7zTVCdAm_h-TafmZCZs,4282
 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=NFGMXRgfiLY2byxi_5yjUgdlV2Fy7DLG48B1hMw-QK4,851
-finterion_investing_algorithm_framework-0.11.1.dist-info/LICENSE,sha256=wbVEDvoZiMPHufRY3sLEffvAr7GH5hOIngHF8y4HFQg,11343
-finterion_investing_algorithm_framework-0.11.1.dist-info/METADATA,sha256=ElnV7NSUGapRzNhdgiCjmLHP8-Sa3TrS48Q4U6zxFUE,2146
-finterion_investing_algorithm_framework-0.11.1.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-finterion_investing_algorithm_framework-0.11.1.dist-info/top_level.txt,sha256=B97hJPQAFX_vRhcLE8uVZ6ac3a5ndS79p-O8-C2y-zw,40
-finterion_investing_algorithm_framework-0.11.1.dist-info/RECORD,,
+finterion_investing_algorithm_framework/models/portfolio_configuration.py,sha256=ahRMjEWaymBn_z9ROBeU9jYmNANonqiXyqQf8hoYNEU,774
+finterion_investing_algorithm_framework-0.11.2.dist-info/LICENSE,sha256=wbVEDvoZiMPHufRY3sLEffvAr7GH5hOIngHF8y4HFQg,11343
+finterion_investing_algorithm_framework-0.11.2.dist-info/METADATA,sha256=xWFTB9KWLczzxidmd0lGdEJWejucw_klzxkbbT_96fo,2146
+finterion_investing_algorithm_framework-0.11.2.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+finterion_investing_algorithm_framework-0.11.2.dist-info/top_level.txt,sha256=B97hJPQAFX_vRhcLE8uVZ6ac3a5ndS79p-O8-C2y-zw,40
+finterion_investing_algorithm_framework-0.11.2.dist-info/RECORD,,