investing-algorithm-framework 6.0.0__tar.gz → 6.0.1__tar.gz

{investing_algorithm_framework-6.0.0 → investing_algorithm_framework-6.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: investing-algorithm-framework
-Version: 6.0.0
+Version: 6.0.1
 Summary: A framework for creating trading bots
 Author: MDUYN
 Requires-Python: >=3.9

{investing_algorithm_framework-6.0.0 → investing_algorithm_framework-6.0.1}/investing_algorithm_framework/app/context.py

@@ -74,7 +74,7 @@ class Context:
         execute=True,
         validate=True,
         sync=True
-    ):
+    ) -> Order:
         """
         Function to create an order. This function will create an order
         and execute it if the execute parameter is set to True. If the
@@ -157,7 +157,7 @@ class Context:
         execute=True,
         validate=True,
         sync=True
-    ):
+    ) -> Order:
         """
         Function to create a limit order. This function will create a limit
         order and execute it if the execute parameter is set to True. If the
@@ -516,7 +516,7 @@ class Context:
         amount_gte=None,
         amount_lt=None,
         amount_lte=None
-    ):
+    ) -> bool:
         """
         Function to check if a position exists. This function will return
         True if a position exists, False otherwise. This function will check
@@ -677,7 +677,7 @@ class Context:
 
     def close_position(
         self, symbol, market=None, identifier=None, precision=None
-    ):
+    ) -> Order:
         """
         Function to close a position. This function will close a position
         by creating a market order to sell the position. If the precision
@@ -716,7 +716,7 @@ class Context:
         ticker = self.market_data_source_service.get_ticker(
             symbol=symbol, market=market
         )
-        self.create_limit_order(
+        return self.create_limit_order(
             target_symbol=position.symbol,
             amount=position.get_amount(),
             order_side=OrderSide.SELL.value,
@@ -1137,7 +1137,7 @@ class Context:
         )
         return self.trade_service.get(trade.id)
 
-    def close_trade(self, trade, precision=None) -> None:
+    def close_trade(self, trade, precision=None) -> Order:
         """
         Function to close a trade. This function will close a trade by
         creating a market order to sell the position. If the precision
@@ -1183,7 +1183,7 @@ class Context:
             symbol=trade.symbol, market=portfolio.market
         )
 
-        self.order_service.create(
+        return self.order_service.create(
             {
                 "portfolio_id": portfolio.id,
                 "trading_symbol": trade.trading_symbol,

{investing_algorithm_framework-6.0.0 → investing_algorithm_framework-6.0.1}/investing_algorithm_framework/app/strategy.py

@@ -2,10 +2,9 @@ from typing import List
 import pandas as pd
 from datetime import datetime, timezone
 
-from investing_algorithm_framework.domain import OperationalException, Position
-from investing_algorithm_framework.domain import \
-    TimeUnit, StrategyProfile, Trade, ENVIRONMENT, Environment, \
-    BACKTESTING_INDEX_DATETIME
+from investing_algorithm_framework.domain import TimeUnit, StrategyProfile, \
+    Trade, ENVIRONMENT, Environment, BACKTESTING_INDEX_DATETIME, Order, \
+    OperationalException, Position
 from .context import Context
 
 
@@ -310,7 +309,7 @@ class TradingStrategy:
         execute=True,
         validate=True,
         sync=True
-    ):
+    ) -> Order:
         """
         Function to create a limit order. This function will create
         a limit order and execute it if the execute parameter is set to True.
@@ -342,7 +341,7 @@ class TradingStrategy:
         Returns:
             Order: Instance of the order created
         """
-        self.context.create_limit_order(
+        return self.context.create_limit_order(
             target_symbol=target_symbol,
             price=price,
             order_side=order_side,
@@ -358,47 +357,9 @@ class TradingStrategy:
             sync=sync
         )
 
-    def create_market_order(
-        self,
-        target_symbol,
-        order_side,
-        amount,
-        market=None,
-        execute=False,
-        validate=False,
-        sync=True
-    ):
-        """
-        Function to create a market order. This function will create a market
-        order and execute it if the execute parameter is set to True. If the
-        validate parameter is set to True, the order will be validated
-
-        Args:
-            target_symbol: The symbol of the asset to trade
-            order_side: The side of the order
-            amount: The amount of the asset to trade
-            market: The market to trade the asset
-            execute: If set to True, the order will be executed
-            validate: If set to True, the order will be validated
-            sync: If set to True, the created order will be synced with the
-                portfolio of the context
-
-        Returns:
-            Order: Instance of the order created
-        """
-        self.context.create_market_order(
-            target_symbol=target_symbol,
-            order_side=order_side,
-            amount=amount,
-            market=market,
-            execute=execute,
-            validate=validate,
-            sync=sync
-        )
-
     def close_position(
         self, symbol, market=None, identifier=None, precision=None
-    ):
+    ) -> Order:
         """
         Function to close a position. This function will close a position
         by creating a market order to sell the position. If the precision
@@ -414,7 +375,7 @@ class TradingStrategy:
         Returns:
             None
         """
-        self.context.close_position(
+        return self.context.close_position(
             symbol=symbol,
             market=market,
             identifier=identifier,
@@ -509,7 +470,7 @@ class TradingStrategy:
         """
         return self.context.get_open_trades(target_symbol, market)
 
-    def close_trade(self, trade, market=None, precision=None) -> None:
+    def close_trade(self, trade, market=None, precision=None) -> Order:
         """
         Function to close a trade. This function will close a trade by
         creating a market order to sell the position. If the precision
@@ -524,11 +485,11 @@ class TradingStrategy:
         Returns:
             None
         """
-        self.context.close_trade(
+        return self.context.close_trade(
             trade=trade, market=market, precision=precision
         )
 
-    def get_number_of_positions(self):
+    def get_number_of_positions(self) -> int:
         """
         Returns the number of positions that have a positive amount.
 
@@ -571,7 +532,7 @@ class TradingStrategy:
         amount_gte=None,
         amount_lt=None,
         amount_lte=None
-    ):
+    ) -> bool:
         """
         Function to check if a position exists. This function will return
         True if a position exists, False otherwise. This function will check
@@ -601,7 +562,7 @@ class TradingStrategy:
             amount_lte=amount_lte
         )
 
-    def has_balance(self, symbol, amount, market=None):
+    def has_balance(self, symbol, amount, market=None) -> bool:
         """
         Function to check if the portfolio has enough balance to
         create an order. This function will return True if the

{investing_algorithm_framework-6.0.0 → investing_algorithm_framework-6.0.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "investing-algorithm-framework"
-version = "v6.0.0"
+version = "v6.0.1"
 description = "A framework for creating trading bots"
 authors = ["MDUYN"]
 readme = "README.md"