Merge branch 'refactor/account_balance_param' into 'master'

Author: Yvictor

control/site/prod

@@ -1 +1 @@
-8wmjjm8Lucb7G1yhuFCXeapnEZ5nbnV2gkb1LuXJDYPeY71Yht2kd3A1as3NKN56D51AG5dxxgn2jDtVLd1dFvrBmSQiBD1dEpzcMM7rEk8ZZ5NLLUnYsgXxQAch8tr5kkBo2xvRwUTbV81SHzAbk
+TPEsEp2abx47S3qmhLL5H5LdMgYavgpmigUFmKLUic8VYkf3zwugbd9S1Qn8hec2wBoSTtYzB3NBiLgJswwaCbUEf4jzBdjt89xdQtWZukcsaUzcGzqpdqbn9QCo7dENid5JAk55upZAHrsK6GKoL

control/site/stag

@@ -1 +1 @@
-bqNaoyiAaY25Z8HYj1MGUe3QLF2fA1q2RmCE5YiLmjJyTWUos79DbJbHh8na85urWxAthMWFUcnM9ahe9bPGwkVusvEsXSzAL6Xbo24PrXfL1f3JhHyjZ1tYrCfcZiKCRvRqgF4gksJusqt2ZE4
+3gWyb2ZcyTYPfwHWJHn7bVLbKyt2H6FrSDRYL2kWt3yCg25YYvzkN3mgKKfzt1egUtQcc3wReBYydC8PJSn2Lh8BhepqUoU7dVyyE5oiATFoV8WL6U7TJjUKyqGsoJqquCbuV2veo1X2ZL6qXcUq

control/site/vpn

@@ -1 +1 @@
-4YDmA2Aze2TcWbP5y6aYQZvkR1NHbA1EcpZwMHctpo266v3rY75fCGNMmBdSuxasxHADtx361FdUG1djzdsmiMPUpWnfpTSM4wVeKzFX7ZNNeU1UpKpXPHWADBr9YsLhssEo1RsQHJ27sDB58
+47UQ2ZPceWSJrUP6dwjQBVH2AkyrTQdyr93QXjq8qDoAq3aRBgQe1TichHYt7dRQ2CMDQe4p8EgyL3ZuY9cDqEg6MqGa3BUN9tLzt87fb88DAntAwzNs8XyAzTa7hADzbb6KeMM9SKUgsW66D

llms-full.txt

@@ -657,10 +657,11 @@ Out
 ```
 Signature:
     api.account_balance(
+        account: shioaji.account.Account = None,
         timeout: int = 5000,
         cb: Callable[[shioaji.position.AccountBalance], NoneType] = None,
     )
-Docstring: query stock account balance 
+Docstring: query stock account balance
 
 ```
 
@@ -675,9 +676,28 @@ Out
 
 ```
 AccountBalance(
-    status=<FetchStatus.Fetched: 'Fetched'>, 
-    acc_balance=100000.0, 
-    date='2023-01-06 13:30:00.000000', 
+    status=<FetchStatus.Fetched: 'Fetched'>,
+    acc_balance=100000.0,
+    date='2023-01-06 13:30:00.000000',
+    errmsg=''
+)
+
+```
+
+In - 帶 account 參數
+
+```
+api.account_balance(account=api.stock_account)
+
+```
+
+Out
+
+```
+AccountBalance(
+    status=<FetchStatus.Fetched: 'Fetched'>,
+    acc_balance=100000.0,
+    date='2023-01-06 13:30:00.000000',
     errmsg=''
 )
 

search/search_index.json

@@ -1768,10 +1768,11 @@ <h1>Account Balance</h1>
 <p class="admonition-title">Out</p>
 <div class="highlight"><pre><span></span><code><span class="n">Signature</span><span class="p">:</span>
     <span class="n">api</span><span class="o">.</span><span class="n">account_balance</span><span class="p">(</span>
+        <span class="n">account</span><span class="p">:</span> <span class="n">shioaji</span><span class="o">.</span><span class="n">account</span><span class="o">.</span><span class="n">Account</span> <span class="o">=</span> <span class="kc">None</span><span class="p">,</span>
         <span class="n">timeout</span><span class="p">:</span> <span class="nb">int</span> <span class="o">=</span> <span class="mi">5000</span><span class="p">,</span>
         <span class="n">cb</span><span class="p">:</span> <span class="n">Callable</span><span class="p">[[</span><span class="n">shioaji</span><span class="o">.</span><span class="n">position</span><span class="o">.</span><span class="n">AccountBalance</span><span class="p">],</span> <span class="n">NoneType</span><span class="p">]</span> <span class="o">=</span> <span class="kc">None</span><span class="p">,</span>
     <span class="p">)</span>
-<span class="n">Docstring</span><span class="p">:</span> <span class="n">query</span> <span class="n">stock</span> <span class="n">account</span> <span class="n">balance</span> 
+<span class="n">Docstring</span><span class="p">:</span> <span class="n">query</span> <span class="n">stock</span> <span class="n">account</span> <span class="n">balance</span>
 </code></pre></div>
 </div>
 <div class="admonition info">
@@ -1782,9 +1783,24 @@ <h1>Account Balance</h1>
 <div class="admonition done">
 <p class="admonition-title">Out</p>
 <div class="highlight"><pre><span></span><code><span class="n">AccountBalance</span><span class="p">(</span>
-    <span class="n">status</span><span class="o">=&lt;</span><span class="n">FetchStatus</span><span class="o">.</span><span class="n">Fetched</span><span class="p">:</span> <span class="s1">&#39;Fetched&#39;</span><span class="o">&gt;</span><span class="p">,</span> 
-    <span class="n">acc_balance</span><span class="o">=</span><span class="mf">100000.0</span><span class="p">,</span> 
-    <span class="n">date</span><span class="o">=</span><span class="s1">&#39;2023-01-06 13:30:00.000000&#39;</span><span class="p">,</span> 
+    <span class="n">status</span><span class="o">=&lt;</span><span class="n">FetchStatus</span><span class="o">.</span><span class="n">Fetched</span><span class="p">:</span> <span class="s1">&#39;Fetched&#39;</span><span class="o">&gt;</span><span class="p">,</span>
+    <span class="n">acc_balance</span><span class="o">=</span><span class="mf">100000.0</span><span class="p">,</span>
+    <span class="n">date</span><span class="o">=</span><span class="s1">&#39;2023-01-06 13:30:00.000000&#39;</span><span class="p">,</span>
+    <span class="n">errmsg</span><span class="o">=</span><span class="s1">&#39;&#39;</span>
+<span class="p">)</span>
+</code></pre></div>
+</div>
+<div class="admonition info">
+<p class="admonition-title">In - with account parameter</p>
+<div class="highlight"><pre><span></span><code><span class="n">api</span><span class="o">.</span><span class="n">account_balance</span><span class="p">(</span><span class="n">account</span><span class="o">=</span><span class="n">api</span><span class="o">.</span><span class="n">stock_account</span><span class="p">)</span>
+</code></pre></div>
+</div>
+<div class="admonition done">
+<p class="admonition-title">Out</p>
+<div class="highlight"><pre><span></span><code><span class="n">AccountBalance</span><span class="p">(</span>
+    <span class="n">status</span><span class="o">=&lt;</span><span class="n">FetchStatus</span><span class="o">.</span><span class="n">Fetched</span><span class="p">:</span> <span class="s1">&#39;Fetched&#39;</span><span class="o">&gt;</span><span class="p">,</span>
+    <span class="n">acc_balance</span><span class="o">=</span><span class="mf">100000.0</span><span class="p">,</span>
+    <span class="n">date</span><span class="o">=</span><span class="s1">&#39;2023-01-06 13:30:00.000000&#39;</span><span class="p">,</span>
     <span class="n">errmsg</span><span class="o">=</span><span class="s1">&#39;&#39;</span>
 <span class="p">)</span>
 </code></pre></div>
@@ -1794,7 +1810,7 @@ <h1>Account Balance</h1>
 <div class="highlight"><pre><span></span><code><span class="n">status</span> <span class="p">(</span><span class="n">FetchStatus</span><span class="p">):</span> <span class="n">fetch</span> <span class="n">status</span>
 <span class="n">acc_balance</span> <span class="p">(</span><span class="nb">float</span><span class="p">):</span> <span class="n">account</span> <span class="n">balance</span>
 <span class="n">date</span> <span class="p">(</span><span class="nb">str</span><span class="p">):</span> <span class="n">query</span> <span class="n">date</span>
-<span class="n">errmsg</span> <span class="p">(</span><span class="nb">str</span><span class="p">):</span> <span class="n">error</span> <span class="n">message</span>    
+<span class="n">errmsg</span> <span class="p">(</span><span class="nb">str</span><span class="p">):</span> <span class="n">error</span> <span class="n">message</span>
 </code></pre></div>
 </div>
 

shioaji.pdf

@@ -12,10 +12,11 @@ Out
 ```
 Signature:
     api.account_balance(
+        account: shioaji.account.Account = None,
         timeout: int = 5000,
         cb: Callable[[shioaji.position.AccountBalance], NoneType] = None,
     )
-Docstring: query stock account balance 
+Docstring: query stock account balance
 
 ```
 
@@ -30,9 +31,28 @@ Out
 
 ```
 AccountBalance(
-    status=<FetchStatus.Fetched: 'Fetched'>, 
-    acc_balance=100000.0, 
-    date='2023-01-06 13:30:00.000000', 
+    status=<FetchStatus.Fetched: 'Fetched'>,
+    acc_balance=100000.0,
+    date='2023-01-06 13:30:00.000000',
+    errmsg=''
+)
+
+```
+
+In - with account parameter
+
+```
+api.account_balance(account=api.stock_account)
+
+```
+
+Out
+
+```
+AccountBalance(
+    status=<FetchStatus.Fetched: 'Fetched'>,
+    acc_balance=100000.0,
+    date='2023-01-06 13:30:00.000000',
     errmsg=''
 )
 
@@ -44,6 +64,6 @@ AccountBalance
 status (FetchStatus): fetch status
 acc_balance (float): account balance
 date (str): query date
-errmsg (str): error message    
+errmsg (str): error message
 
 ```

tutor/accounting/account_balance/index.html

@@ -1768,10 +1768,11 @@ <h1>銀行餘額</h1>
 <p class="admonition-title">Out</p>
 <div class="highlight"><pre><span></span><code><span class="n">Signature</span><span class="p">:</span>
     <span class="n">api</span><span class="o">.</span><span class="n">account_balance</span><span class="p">(</span>
+        <span class="n">account</span><span class="p">:</span> <span class="n">shioaji</span><span class="o">.</span><span class="n">account</span><span class="o">.</span><span class="n">Account</span> <span class="o">=</span> <span class="kc">None</span><span class="p">,</span>
         <span class="n">timeout</span><span class="p">:</span> <span class="nb">int</span> <span class="o">=</span> <span class="mi">5000</span><span class="p">,</span>
         <span class="n">cb</span><span class="p">:</span> <span class="n">Callable</span><span class="p">[[</span><span class="n">shioaji</span><span class="o">.</span><span class="n">position</span><span class="o">.</span><span class="n">AccountBalance</span><span class="p">],</span> <span class="n">NoneType</span><span class="p">]</span> <span class="o">=</span> <span class="kc">None</span><span class="p">,</span>
     <span class="p">)</span>
-<span class="n">Docstring</span><span class="p">:</span> <span class="n">query</span> <span class="n">stock</span> <span class="n">account</span> <span class="n">balance</span> 
+<span class="n">Docstring</span><span class="p">:</span> <span class="n">query</span> <span class="n">stock</span> <span class="n">account</span> <span class="n">balance</span>
 </code></pre></div>
 </div>
 <div class="admonition info">
@@ -1782,9 +1783,24 @@ <h1>銀行餘額</h1>
 <div class="admonition done">
 <p class="admonition-title">Out</p>
 <div class="highlight"><pre><span></span><code><span class="n">AccountBalance</span><span class="p">(</span>
-    <span class="n">status</span><span class="o">=&lt;</span><span class="n">FetchStatus</span><span class="o">.</span><span class="n">Fetched</span><span class="p">:</span> <span class="s1">&#39;Fetched&#39;</span><span class="o">&gt;</span><span class="p">,</span> 
-    <span class="n">acc_balance</span><span class="o">=</span><span class="mf">100000.0</span><span class="p">,</span> 
-    <span class="n">date</span><span class="o">=</span><span class="s1">&#39;2023-01-06 13:30:00.000000&#39;</span><span class="p">,</span> 
+    <span class="n">status</span><span class="o">=&lt;</span><span class="n">FetchStatus</span><span class="o">.</span><span class="n">Fetched</span><span class="p">:</span> <span class="s1">&#39;Fetched&#39;</span><span class="o">&gt;</span><span class="p">,</span>
+    <span class="n">acc_balance</span><span class="o">=</span><span class="mf">100000.0</span><span class="p">,</span>
+    <span class="n">date</span><span class="o">=</span><span class="s1">&#39;2023-01-06 13:30:00.000000&#39;</span><span class="p">,</span>
+    <span class="n">errmsg</span><span class="o">=</span><span class="s1">&#39;&#39;</span>
+<span class="p">)</span>
+</code></pre></div>
+</div>
+<div class="admonition info">
+<p class="admonition-title">In - 帶 account 參數</p>
+<div class="highlight"><pre><span></span><code><span class="n">api</span><span class="o">.</span><span class="n">account_balance</span><span class="p">(</span><span class="n">account</span><span class="o">=</span><span class="n">api</span><span class="o">.</span><span class="n">stock_account</span><span class="p">)</span>
+</code></pre></div>
+</div>
+<div class="admonition done">
+<p class="admonition-title">Out</p>
+<div class="highlight"><pre><span></span><code><span class="n">AccountBalance</span><span class="p">(</span>
+    <span class="n">status</span><span class="o">=&lt;</span><span class="n">FetchStatus</span><span class="o">.</span><span class="n">Fetched</span><span class="p">:</span> <span class="s1">&#39;Fetched&#39;</span><span class="o">&gt;</span><span class="p">,</span>
+    <span class="n">acc_balance</span><span class="o">=</span><span class="mf">100000.0</span><span class="p">,</span>
+    <span class="n">date</span><span class="o">=</span><span class="s1">&#39;2023-01-06 13:30:00.000000&#39;</span><span class="p">,</span>
     <span class="n">errmsg</span><span class="o">=</span><span class="s1">&#39;&#39;</span>
 <span class="p">)</span>
 </code></pre></div>