lint3

Author: GuillaumeDSM

packages/node/tests/functional_tests/test_accounts_CRUD_operations.py

@@ -19,6 +19,7 @@
 import octobot_node.scheduler.tasks as scheduler_tasks
 import octobot_node.scheduler.user_actions.user_actions_executor.util.account_state_updater as account_state_updater_module
 import octobot_protocol.models as protocol_models
+import octobot_trading.enums as trading_enums
 import octobot_trading.errors as trading_errors
 import octobot_trading.exchanges.connectors.ccxt.ccxt_connector as ccxt_connector_module
 
@@ -30,6 +31,16 @@
 _WORKFLOW_RESULT_TIMEOUT_SECONDS = 120.0
 _USER_ACTION_LIST_POLL_TIMEOUT_SECONDS = 15.0
 
+_FUNCTIONAL_USDT_HOLDINGS = 1000.0
+_FUNCTIONAL_BTC_HOLDINGS = 0.5
+_FUNCTIONAL_ETH_HOLDINGS = 2.0
+_FUNCTIONAL_BTC_USDT_CLOSE = 50000.0
+_EXPECTED_PORTFOLIO_UNIT = "USDT"
+_EXPECTED_USDT_VALUE = _FUNCTIONAL_USDT_HOLDINGS
+_EXPECTED_BTC_VALUE = _FUNCTIONAL_BTC_HOLDINGS * _FUNCTIONAL_BTC_USDT_CLOSE
+_EXPECTED_ETH_VALUE = 0.0
+_EXPECTED_PORTFOLIO_TOTAL = _EXPECTED_USDT_VALUE + _EXPECTED_BTC_VALUE + _EXPECTED_ETH_VALUE
+
 _REAL_UPDATE_ACCOUNT_STATE = account_state_updater_module.update_account_state
 
 
@@ -68,14 +79,29 @@ async def _stub_load_symbol_markets_no_network(self, reload=False, market_filter
 async def _stub_get_balance_no_network(self, **kwargs):
     return {
         "USDT": {
-            commons_constants.PORTFOLIO_TOTAL: 1000.0,
-            commons_constants.PORTFOLIO_AVAILABLE: 1000.0,
-        }
+            commons_constants.PORTFOLIO_TOTAL: _FUNCTIONAL_USDT_HOLDINGS,
+            commons_constants.PORTFOLIO_AVAILABLE: _FUNCTIONAL_USDT_HOLDINGS,
+        },
+        "BTC": {
+            commons_constants.PORTFOLIO_TOTAL: _FUNCTIONAL_BTC_HOLDINGS,
+            commons_constants.PORTFOLIO_AVAILABLE: _FUNCTIONAL_BTC_HOLDINGS,
+        },
+        "ETH": {
+            commons_constants.PORTFOLIO_TOTAL: _FUNCTIONAL_ETH_HOLDINGS,
+            commons_constants.PORTFOLIO_AVAILABLE: _FUNCTIONAL_ETH_HOLDINGS,
+        },
     }
 
 
 async def _stub_get_all_currencies_price_ticker_no_network(self, symbols=None, **kwargs):
-    return {}
+    if not symbols:
+        return {}
+    close_column = trading_enums.ExchangeConstantsTickersColumns.CLOSE.value
+    tickers: dict[str, dict] = {}
+    for symbol in symbols:
+        if symbol == f"BTC/{_EXPECTED_PORTFOLIO_UNIT}":
+            tickers[symbol] = {close_column: _FUNCTIONAL_BTC_USDT_CLOSE}
+    return tickers
 
 
 async def _run_user_action_to_completion(
@@ -113,6 +139,31 @@ def _assert_listed_user_actions_match_expected_id_status_pairs(
     assert actual_sorted == expected_sorted
 
 
+def _assert_functional_portfolio_content(
+    portfolio_content: protocol_models.PortfolioContent | None,
+) -> None:
+    assert portfolio_content is not None
+    assert portfolio_content.unit == _EXPECTED_PORTFOLIO_UNIT
+    assert portfolio_content.total == pytest.approx(_EXPECTED_PORTFOLIO_TOTAL)
+    assets_by_symbol = {asset.symbol: asset for asset in portfolio_content.assets}
+    assert set(assets_by_symbol) == {"USDT", "BTC", "ETH"}
+
+    usdt_asset = assets_by_symbol["USDT"]
+    assert usdt_asset.total == pytest.approx(_FUNCTIONAL_USDT_HOLDINGS)
+    assert usdt_asset.available == pytest.approx(_FUNCTIONAL_USDT_HOLDINGS)
+    assert usdt_asset.value == pytest.approx(_EXPECTED_USDT_VALUE)
+
+    bitcoin_asset = assets_by_symbol["BTC"]
+    assert bitcoin_asset.total == pytest.approx(_FUNCTIONAL_BTC_HOLDINGS)
+    assert bitcoin_asset.available == pytest.approx(_FUNCTIONAL_BTC_HOLDINGS)
+    assert bitcoin_asset.value == pytest.approx(_EXPECTED_BTC_VALUE)
+
+    ethereum_asset = assets_by_symbol["ETH"]
+    assert ethereum_asset.total == pytest.approx(_FUNCTIONAL_ETH_HOLDINGS)
+    assert ethereum_asset.available == pytest.approx(_FUNCTIONAL_ETH_HOLDINGS)
+    assert ethereum_asset.value == pytest.approx(_EXPECTED_ETH_VALUE)
+
+
 @pytest.mark.asyncio
 class TestExecuteUserActionAccountCrud:
     async def test_create_edit_refresh_delete_accounts_on_temp_filesystem(
@@ -343,6 +394,7 @@ def build_delete_user_action(*, user_action_id: str, account_id: str) -> protoco
                 assert persisted_created_account.state.status == protocol_models.AccountStatus.VALID
                 assert persisted_created_account.state.message == protocol_models.AccountStatusMessage.VALID
                 assert len(account_provider.list_items(wallet_address)) == 1
+                _assert_functional_portfolio_content(persisted_created_account.portfolio_content)
 
                 # Step 3 — Edit: enqueue workflow only first; poll listings mid retry before awaiting terminal output.
                 edited_account = build_account(
@@ -442,6 +494,7 @@ def build_delete_user_action(*, user_action_id: str, account_id: str) -> protoco
                 assert persisted_refreshed_account.state is not None
                 assert persisted_refreshed_account.state.status == protocol_models.AccountStatus.VALID
                 assert persisted_refreshed_account.state.message == protocol_models.AccountStatusMessage.VALID
+                _assert_functional_portfolio_content(persisted_refreshed_account.portfolio_content)
 
                 # Step 5 — Delete: remove account from provider; listing gains COMPLETED delete row.
                 delete_action = build_delete_user_action(

packages/protocol/docs/Account.md

@@ -13,7 +13,7 @@ Name | Type | Description | Notes
 **state** | [**AccountState**](AccountState.md) |  | [optional] 
 **created_at** | **datetime** |  | 
 **updated_at** | **datetime** |  | 
-**portfolio_content** | [**PortfolioContent**](PortfolioContent.md) | Most up-to-date content in the account portfolio. Includes total and available values | [optional] 
+**portfolio_content** | [**PortfolioContent**](PortfolioContent.md) |  | [optional] 
 **details** | [**AccountDetails**](AccountDetails.md) |  | [optional] 
 
 ## Example

packages/protocol/octobot_protocol/models/account.py

@@ -18,7 +18,7 @@
 import json
 
 from datetime import datetime
-from pydantic import BaseModel, ConfigDict, Field, StrictBool, StrictStr
+from pydantic import BaseModel, ConfigDict, StrictBool, StrictStr
 from typing import Any, ClassVar, Dict, List, Optional
 from octobot_protocol.models.account_details import AccountDetails
 from octobot_protocol.models.account_state import AccountState
@@ -38,7 +38,7 @@ class Account(BaseModel):
     state: Optional[AccountState] = None
     created_at: datetime
     updated_at: datetime
-    portfolio_content: Optional[PortfolioContent] = Field(default=None, description="Most up-to-date content in the account portfolio. Includes total and available values")
+    portfolio_content: Optional[PortfolioContent] = None
     details: Optional[AccountDetails] = None
     __properties: ClassVar[List[str]] = ["id", "name", "is_simulated", "description", "state", "created_at", "updated_at", "portfolio_content", "details"]
 

packages/protocol/openapi.json

@@ -849,8 +849,8 @@
             "format": "date-time"
           },
           "portfolio_content": {
-            "description": "Most up-to-date content in the account portfolio. Includes total and available values",
-            "$ref": "#/components/schemas/PortfolioContent"
+            "$ref": "#/components/schemas/PortfolioContent",
+            "x-field-description": "Most up-to-date content in the account portfolio. Includes total and available values"
           },
           "details": {
             "oneOf": [

packages/protocol/standard.rc

@@ -566,7 +566,7 @@ contextmanager-decorators=contextlib.contextmanager
 # List of members which are set dynamically and missed by pylint inference
 # system, and so shouldn't trigger E1101 when accessed. Python regular
 # expressions are accepted.
-generated-members=.*Account\.portfolio_content
+generated-members=
 
 # Tells whether to warn about missing members when the owner of the attribute
 # is inferred to be None.