nexusquant-cli 0.6.0__tar.gz → 0.6.1__tar.gz

{nexusquant_cli-0.6.0 → nexusquant_cli-0.6.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: nexusquant-cli
-Version: 0.6.0
+Version: 0.6.1
 Summary: NexusQuant CLI for users, strategy providers and admins
 Requires-Python: >=3.10
 Requires-Dist: httpx>=0.27

nexusquant_cli-0.6.1/nexusquant_cli/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.6.1"

{nexusquant_cli-0.6.0 → nexusquant_cli-0.6.1}/nexusquant_cli/data/signal_codes.json

@@ -139,6 +139,16 @@
         "en": "The broker didn't respond in time, so the order was not sent (not filled). If this keeps happening, please check the broker connection in My strategies."
       }
     },
+    "in_doubt_absent": {
+      "label": {
+        "zh": "未执行 · 券商查无此单",
+        "en": "Not executed · Broker has no such order"
+      },
+      "detail": {
+        "zh": "下单结果当时未能确认，之后向券商核实，券商没有这笔订单（未成交）。本次信号不会补下。",
+        "en": "The result of this order couldn't be confirmed at the time. The broker later confirmed it has no such order (not filled). This signal will not be placed again."
+      }
+    },
     "broker_not_connected": {
       "label": {
         "zh": "未执行 · 券商未连接",

{nexusquant_cli-0.6.0 → nexusquant_cli-0.6.1}/nexusquant_cli/roles/investor.py

@@ -344,15 +344,11 @@ def list_signals(
     for col in ("time", "strategy", "ticker", "side", "price", "status", "your result"):
         table.add_column(col, overflow="fold")
     for s in logs:
-        res = s.get("viewer_broker_result") or {}
-        if res.get("error"):
-            detail = f"[red]{res.get('error')}[/red]"
-        elif res.get("skipped"):
-            detail = f"[yellow]skipped[/yellow] {res.get('risk_code') or ''}"
-        elif res.get("is_filled"):
-            detail = "[green]filled[/green]"
+        results = s.get("viewer_broker_results") or []
+        if len({r.get("account_tail") or "" for r in results}) > 1:
+            detail = "\n".join(f"{r.get('account_tail')} {_result_detail(s, r)}" for r in results)
         else:
-            detail = str(s.get("viewer_no_result_reason") or "")
+            detail = _result_detail(s, s.get("viewer_broker_result") or {})
         table.add_row(
             str(s.get("signal_time") or s.get("received_at"))[:19],
             str(s.get("strategy_id")), str(s.get("ticker")), str(s.get("direction")),
@@ -366,6 +362,16 @@ def list_signals(
         )
 
 
+def _result_detail(signal: dict, res: dict) -> str:
+    if res.get("error"):
+        return f"[red]{res.get('error')}[/red]"
+    if res.get("skipped"):
+        return f"[yellow]skipped[/yellow] {res.get('risk_code') or ''}"
+    if res.get("is_filled"):
+        return "[green]filled[/green]"
+    return str(signal.get("viewer_no_result_reason") or "")
+
+
 @read_app.command("signal", help="One signal you received, and why it did or didn't place an order.")
 def read_signal(
     signal_id: Annotated[str, typer.Argument(help="Signal id (from `list signals`).")],
@@ -397,6 +403,8 @@ def read_signal(
                 console.print(f"[dim]{key}.{sub}[/dim]  {txt.get('zh') if isinstance(txt, dict) else txt}")
     if ex.get("broker_message"):
         console.print(f"[dim]broker[/dim]  {ex['broker_message']}")
+    for acct in ex.get("accounts", []):
+        console.print(f"account  {acct['account']}  {acct['outcome']}")
 
 
 @read_app.command("stats", help="Your signal counts and broker success rate.")

{nexusquant_cli-0.6.0 → nexusquant_cli-0.6.1}/nexusquant_cli/signal_explain.py

@@ -52,6 +52,17 @@ def _upper_lookup(table: dict[str, Any], code: str | None) -> Any:
 
 
 def explain(row: dict[str, Any]) -> dict[str, Any]:
+    """The account the backend picked (a failed one, if any failed), plus every account when there are several."""
+    out = _explain_one(row)
+    results = row.get("viewer_broker_results") or []
+    if len({r.get("account_tail") or "" for r in results}) > 1:
+        out["accounts"] = [
+            {"account": r.get("account_tail"), **_explain_one({**row, "viewer_broker_result": r})} for r in results
+        ]
+    return out
+
+
+def _explain_one(row: dict[str, Any]) -> dict[str, Any]:
     g = glossary()
     vbr = row.get("viewer_broker_result") or None
     listening = row.get("viewer_was_listening_at_signal_time")

{nexusquant_cli-0.6.0 → nexusquant_cli-0.6.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "nexusquant-cli"
-version = "0.6.0"
+version = "0.6.1"
 description = "NexusQuant CLI for users, strategy providers and admins"
 readme = "README.md"
 requires-python = ">=3.10"

{nexusquant_cli-0.6.0 → nexusquant_cli-0.6.1}/tests/test_signal_explain.py

@@ -162,3 +162,22 @@ def test_embedded_runs_admin_read(http: Recorder, monkeypatch, capsys):
         config.set_token_override(None)
     out = capsys.readouterr().out
     assert rc == 0 and '"u@x.test"' in out
+
+
+def test_two_accounts_are_listed_separately():
+    filled = {"success": True, "is_filled": True, "account_tail": "****0001"}
+    failed = {"success": False, "error": "x", "account_tail": "****0002"}
+    out = explain(row(viewer_broker_result=failed, viewer_broker_results=[filled, failed]))
+    assert out["outcome"] == "failed"
+    assert [(a["account"], a["outcome"]) for a in out["accounts"]] == [("****0001", "filled"), ("****0002", "failed")]
+
+
+def test_same_account_twice_is_not_listed():
+    one = {"success": True, "is_filled": True, "account_tail": "****0001"}
+    out = explain(row(viewer_broker_result=one, viewer_broker_results=[one, {**one}]))
+    assert "accounts" not in out
+
+
+def test_one_result_has_no_accounts_key():
+    out = explain(row(viewer_broker_result={"success": True, "is_filled": True}))
+    assert "accounts" not in out

nexusquant_cli-0.6.0/nexusquant_cli/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.6.0"