Refactor position model to utilize instance variable for instrument checks, improving code clarity and consistency. Simplify order_target_portfolio_smart function call by removing unnecessary parentheses.

Author: Cuizi7

rqalpha/mod/rqalpha_mod_sys_accounts/api/order_target_portfolio.py

@@ -303,8 +303,7 @@ def _get_style(order_book_id) -> OrderStyle:
         target_weights=Series(target_weights),
         valuation_prices=prices,
         env=env
-    )(
-    )
+    )()
 
     orders = []
 

rqalpha/mod/rqalpha_mod_sys_accounts/position_model.py

@@ -166,9 +166,8 @@ def settlement(self, trading_date):
         if self.direction != POSITION_DIRECTION.LONG:
             raise RuntimeError("direction of stock position {} is not supposed to be short".format(self._order_book_id))
         next_date = self._env.data_proxy.get_next_trading_date(trading_date, trading_calendar_type=self.calendar_type)
-        instrument = self._env.data_proxy.instrument_not_none(self._order_book_id)
         delta_cash = 0
-        if instrument.de_listed_at(next_date):
+        if self._instrument.de_listed_at(next_date):
             try:
                 transform_data = self._env.data_proxy.get_share_transformation(self._order_book_id)
             except NotImplementedError:
@@ -372,14 +371,13 @@ def settlement(self, trading_date):
         if self._quantity == 0:
             return delta_cash
         data_proxy = self._env.data_proxy
-        instrument = data_proxy.instrument(self._order_book_id)
         next_date = data_proxy.get_next_trading_date(trading_date)
         if self._env.config.mod.sys_accounts.futures_settlement_price_type == "settlement":
             # 逐日盯市按照结算价结算
             self._last_price = self._env.data_proxy.get_settle_price(self._order_book_id, self._env.trading_dt)
         delta_cash += self.equity
         self._avg_price = self.last_price
-        if instrument.de_listed_at(next_date):
+        if self._instrument.de_listed_at(next_date):
             user_system_log.warn(_(u"{order_book_id} is expired, close all positions by system").format(
                 order_book_id=self._order_book_id
             ))