programgarden 2.6.2__tar.gz → 2.6.4__tar.gz

{programgarden-2.6.2 → programgarden-2.6.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: programgarden
-Version: 2.6.2
+Version: 2.6.4
 Summary: ProgramGarden - 노드 기반 자동매매 DSL 실행 엔진
 License-Expression: AGPL-3.0-or-later
 Author: 프로그램동산
@@ -17,7 +17,7 @@ Requires-Dist: litellm (>=1.40.0)
 Requires-Dist: lxml (>=6.0.2,<7.0.0)
 Requires-Dist: programgarden-community (>=2.3.1,<3.0.0)
 Requires-Dist: programgarden-core (>=2.6.2,<3.0.0)
-Requires-Dist: programgarden-finance (>=2.0.1,<3.0.0)
+Requires-Dist: programgarden-finance (>=2.0.2,<3.0.0)
 Requires-Dist: psutil (>=6.0.0,<7.0.0)
 Requires-Dist: psycopg2-binary (>=2.9.11,<3.0.0)
 Requires-Dist: pydantic (>=2.0.1,<3.0.0)
@@ -31,6 +31,14 @@ The 2.6.2 release candidate [futures minute alias correction](../../docs/futures
 
 # ProgramGarden
 
+The 2.6.4 release candidate [paper futures account correction](../../docs/paper-futures-business-date.md#account-node-and-rejection-messages-264-candidate)
+returns an empty futures account for the paper empty-account answer and names
+the broker message in unaccepted response errors. Live behavior is unchanged.
+
+The 2.6.3 release candidate [paper futures business-date correction](../../docs/paper-futures-business-date.md)
+uses a fresh account-scoped broker date for startup pending orders, OpenOrdersNode
+and legacy fill observation. Missing or mismatched evidence remains unavailable.
+
 An unreleased [stock history interval correction](../../docs/stock-history-interval-contract.md)
 rejects unsupported intraday periods instead of silently querying daily bars.
 Supported g3204 periods retain their existing requests and output contract.

{programgarden-2.6.2 → programgarden-2.6.4}/README.md

@@ -2,6 +2,14 @@ The 2.6.2 release candidate [futures minute alias correction](../../docs/futures
 
 # ProgramGarden
 
+The 2.6.4 release candidate [paper futures account correction](../../docs/paper-futures-business-date.md#account-node-and-rejection-messages-264-candidate)
+returns an empty futures account for the paper empty-account answer and names
+the broker message in unaccepted response errors. Live behavior is unchanged.
+
+The 2.6.3 release candidate [paper futures business-date correction](../../docs/paper-futures-business-date.md)
+uses a fresh account-scoped broker date for startup pending orders, OpenOrdersNode
+and legacy fill observation. Missing or mismatched evidence remains unavailable.
+
 An unreleased [stock history interval correction](../../docs/stock-history-interval-contract.md)
 rejects unsupported intraday periods instead of silently querying daily bars.
 Supported g3204 periods retain their existing requests and output contract.

{programgarden-2.6.2 → programgarden-2.6.4}/programgarden/database/broker_evidence.py

@@ -5,6 +5,7 @@ not turn a missing detail block, partial page or rejection into an empty account
 """
 
 import inspect
+import unicodedata
 from decimal import Decimal, InvalidOperation
 from datetime import datetime, timedelta, timezone
 
@@ -30,17 +31,50 @@ _OBSERVED_RESPONSE_CODES = {
 }
 
 
+_BROKER_MESSAGE_LIMIT = 80
+
+# Exact empty-result wording observed with rsp_cd 02679 on the stock reads below
+# and on paper CIDBQ01500/CIDBQ02400 reads (2026-10-14). Not a generic success.
+NO_RESULT_MESSAGE = "조회내역이 없습니다."
+# The paper server's own empty-result wording, observed with rsp_cd 00707 on
+# the two futures TRs below.
+PAPER_NO_RESULT_MESSAGE = "모의투자 조회할 내역(자료)이 없습니다."
+# The paper CIDBQ01500/CIDBQ02400 02679 branch accepts either exact wording:
+# the same set the dsl-api startup gate uses for these two TRs
+# (cloudrun/dsl-api/app/services/startup_broker.py, _NO_DATA_MESSAGES), so a
+# start the server admits is not rejected by the engine. Stock branches keep
+# the single NO_RESULT_MESSAGE, as the server gate does.
+PAPER_FUTURES_NO_RESULT_MESSAGES = frozenset({NO_RESULT_MESSAGE, PAPER_NO_RESULT_MESSAGE})
+
+
 class StartupEvidenceUnavailable(RuntimeError):
     """An incomplete response must never authorize execution."""
 
 
+def broker_message(value):
+    """Return the broker's diagnostic text as one bounded log-safe line.
+
+    Matches the server startup gate's ``str(rsp_msg or '')[:80]`` for ordinary
+    messages; control/format characters become spaces and outer whitespace is
+    stripped so a broker message cannot inject extra log lines.
+    """
+    text = "".join(" " if unicodedata.category(char).startswith("C") else char
+                   for char in str(value or ""))
+    return text.strip()[:_BROKER_MESSAGE_LIMIT]
+
+
+def unverified_response_code(tr, code, message):
+    """Keep the stable ``<TR>: unverified_response_code=<code>`` prefix."""
+    return f"{tr}: unverified_response_code={code} rsp_msg={broker_message(message)}"
+
+
 class StartupQueryDateMismatch(StartupEvidenceUnavailable):
     def __init__(self, business_day):
         super().__init__("COSAQ00102: query_echo_mismatch:OrdDt")
         self.business_day = business_day
 
 
-async def checked_body(response, tr, request=None):
+async def checked_body(response, tr, request=None, *, paper_trading=False):
     """Read original broker blocks so SDK defaults cannot manufacture success."""
     if response.status_code != 200 or response.error_msg:
         raise StartupEvidenceUnavailable(f"{tr}: transport_failure")
@@ -95,18 +129,25 @@ async def checked_body(response, tr, request=None):
     if tr == "COSOQ00201" and code == "02679":
         # Observed authenticated empty stock balance, 2026-09-21. Explicit
         # blocks, terminal pagination and matching query scope remain required.
-        accepted = not rows and response.rsp_msg == "조회내역이 없습니다."
+        accepted = not rows and response.rsp_msg == NO_RESULT_MESSAGE
     if tr == "COSAQ00102" and code == "02679":
         echo = body["COSAQ00102OutBlock1"]
         accepted = (not rows and isinstance(echo, dict)
-                    and response.rsp_msg == "조회내역이 없습니다."
+                    and response.rsp_msg == NO_RESULT_MESSAGE
                     and echo.get("OrdMktCode") == "%"
                     and echo.get("ThdayBnsAppYn") == "1"
                     and echo.get("BnsTpCode") == "0" and echo.get("CrcyCode") == "000")
     elif tr in {"CIDBQ01500", "CIDBQ02400"} and code == "00707":
-        accepted = (not rows and response.rsp_msg == "모의투자 조회할 내역(자료)이 없습니다.")
+        accepted = (not rows and response.rsp_msg == PAPER_NO_RESULT_MESSAGE)
+    elif paper_trading is True and tr in {"CIDBQ01500", "CIDBQ02400"} and code == "02679":
+        # Observed paper response with complete raw blocks, explicit empty rows
+        # and terminal continuation. The caller still binds date/account scope.
+        # The wording set matches the server startup gate for these two TRs.
+        accepted = not rows and response.rsp_msg in PAPER_FUTURES_NO_RESULT_MESSAGES
     if not accepted:
-        raise StartupEvidenceUnavailable(f"{tr}: unverified_response_code={code}")
+        # The broker message distinguishes, for example, an unrecognized empty
+        # wording from a rejected query; the stable reason prefix is unchanged.
+        raise StartupEvidenceUnavailable(unverified_response_code(tr, code, response.rsp_msg))
     if tr in {"t0424", "t0425"}:
         cursor = "cts_expcode" if tr == "t0424" else "cts_ordno"
         summary = body[_BLOCKS[tr][0]]

{programgarden-2.6.2 → programgarden-2.6.4}/programgarden/database/broker_snapshot.py

@@ -110,12 +110,18 @@ async def read_broker_snapshot(ls, *, execution_key, product, provider, trading_
         source = "COSOQ00201+COSAQ00102"
     elif product == "overseas_futures":
         from programgarden_finance import CIDBQ01500, CIDBQ02400
+        from programgarden.paper_futures_business_date import PaperFuturesScope, from_current_positions
 
         accno = ls.overseas_futureoption().accno()
+        paper_scope = PaperFuturesScope.capture(ls) if trading_mode == "paper" else None
         query = accno.CIDBQ01500(body=CIDBQ01500.CIDBQ01500InBlock1(
             RecCnt=1, AcntTpCode="1", FcmAcntNo="", QryDt="", BalTpCode="2"))
         response = await query.req_async()
-        await checked_body(response, "CIDBQ01500", query)
+        paper_day = None
+        if paper_scope is not None:
+            paper_day = await from_current_positions(ls, response, query, paper_scope)
+        else:
+            await checked_body(response, "CIDBQ01500", query)
         for row in response.block2:
             symbol = normalized_symbol(str(required(row, "IsuCodeVal")), product)
             side = str(required(row, "BnsTpCode"))
@@ -127,11 +133,17 @@ async def read_broker_snapshot(ls, *, execution_key, product, provider, trading_
             if side == "2":
                 positions[symbol] = positions.get(symbol, Decimal(0)) + amount
         await asyncio.sleep(2)
+        if paper_day is not None:
+            paper_day.scope.check(ls)
+        query_day = paper_day.day if paper_day is not None else ""
         query = accno.CIDBQ02400(body=CIDBQ02400.CIDBQ02400InBlock1(
-            RecCnt=1, IsuCodeVal="", QrySrtDt="", QryEndDt="", ThdayTpCode="1",
+            RecCnt=1, IsuCodeVal="", QrySrtDt=query_day, QryEndDt=query_day, ThdayTpCode="1",
             OrdStatCode="2", BnsTpCode="0", QryTpCode="2", OrdPtnCode="00", OvrsDrvtFnoTpCode="A"))
         response = await query.req_async()
-        await checked_body(response, "CIDBQ02400", query)
+        if paper_day is not None:
+            await paper_day.check_orders(ls, response, query)
+        else:
+            await checked_body(response, "CIDBQ02400", query)
         pending = [value for row in response.block2 if (value := pending_row(row, product)) is not None]
         source = "CIDBQ01500+CIDBQ02400"
     else:

{programgarden-2.6.2 → programgarden-2.6.4}/programgarden/executor.py

@@ -6142,6 +6142,7 @@ class AccountNodeExecutor(NodeExecutorBase):
         from datetime import datetime
         from zoneinfo import ZoneInfo
         from programgarden.futures_read_evidence import require_complete_rows, require_position_identity
+        from programgarden.paper_futures_business_date import is_paper_client
 
         try:
             from programgarden_finance.ls.overseas_futureoption.accno.CIDBQ01500.blocks import CIDBQ01500InBlock1
@@ -6157,7 +6158,11 @@ class AccountNodeExecutor(NodeExecutorBase):
             response = await ls.overseas_futureoption().accno().CIDBQ01500(
                 body=position_request,
             ).req_async()
-            position_rows = require_complete_rows(response, position_request, "CIDBQ01500")
+            # A paper server answers an empty account with 02679; only that
+            # exact empty envelope is accepted, and only for a paper client.
+            position_rows = require_complete_rows(
+                response, position_request, "CIDBQ01500", paper_trading=is_paper_client(ls),
+            )
 
             # block2 = 종목별 잔고 (list 형태로 변환, NewOrderNode 호환)
             positions = []
@@ -6659,21 +6664,33 @@ class OpenOrdersNodeExecutor(NodeExecutorBase):
         from datetime import datetime
         from zoneinfo import ZoneInfo
         from programgarden.futures_read_evidence import require_complete_rows, require_pending_identity
+        from programgarden.paper_futures_business_date import is_paper_client, read_current_business_date
+        from programgarden.database.broker_evidence import StartupEvidenceUnavailable
         from programgarden_finance.ls.overseas_futureoption.accno.CIDBQ02400.blocks import CIDBQ02400InBlock1
 
 
-        today = datetime.now(ZoneInfo("Asia/Seoul")).strftime("%Y%m%d")
+        paper_day = None
+        try:
+            if is_paper_client(ls):
+                paper_day = await read_current_business_date(ls)
+        except StartupEvidenceUnavailable as exc:
+            return self._empty_result(str(exc))
+        today = paper_day.day if paper_day else datetime.now(ZoneInfo("Asia/Seoul")).strftime("%Y%m%d")
         request = CIDBQ02400InBlock1(
             RecCnt=1, IsuCodeVal="", QrySrtDt=today, QryEndDt=today,
             ThdayTpCode="1", OrdStatCode="2", BnsTpCode="0", QryTpCode="2",
             OrdPtnCode="00", OvrsDrvtFnoTpCode="A",
         )
-        response = await ls.overseas_futureoption().accno().CIDBQ02400(body=request).req_async()
         try:
-            rows = require_complete_rows(response, request, "CIDBQ02400")
+            if paper_day:
+                paper_day.scope.check(ls)
+            query = ls.overseas_futureoption().accno().CIDBQ02400(body=request)
+            response = await query.req_async()
+            rows = (await paper_day.check_orders(ls, response, query) if paper_day else
+                    require_complete_rows(response, request, "CIDBQ02400"))
             for row in rows:
                 require_pending_identity(row)
-        except ValueError as exc:
+        except (ValueError, StartupEvidenceUnavailable) as exc:
             return self._empty_result(str(exc))
 
         open_orders = []
@@ -16849,17 +16866,21 @@ class NewOrderNodeExecutor(NodeExecutorBase):
             from programgarden_finance.ls.overseas_futureoption.accno.CIDBQ02400.blocks import (
                 CIDBQ02400InBlock1,
             )
-            # 당일조회(ThdayTpCode="1")에는 날짜를 싣지 않는다 — 브로커의 "당일"은
-            # 그쪽 영업일이고, 실행 머신의 달력 날짜와 다를 수 있다. 야간 세션에서
-            # 로컬이 자정을 넘기면 브로커는 아직 전 영업일이라(2026-09-10 00:39 KST
-            # 접수 주문이 OrdDt/ExecDt=20260909 로 조회됨) 로컬 날짜를 창으로 주면
-            # 방금 낸 주문의 체결을 스스로 잘라낸다. 아래 매칭은 주문번호로만 하므로
-            # 날짜 창은 필요 없다.
-            response = await ls.overseas_futureoption().accno().CIDBQ02400(
+            from programgarden.paper_futures_business_date import is_paper_client, read_current_business_date
+
+            # A paper server can reject the documented blank same-day dates.
+            # Use its fresh account-scoped date, including overnight sessions;
+            # never replace missing evidence with the machine's calendar date.
+            paper_day = await read_current_business_date(ls) if is_paper_client(ls) else None
+            query_day = paper_day.day if paper_day else ""
+            if paper_day:
+                paper_day.scope.check(ls)
+            query = ls.overseas_futureoption().accno().CIDBQ02400(
                 body=CIDBQ02400InBlock1(
+                    RecCnt=1,
                     IsuCodeVal="",          # 전체 종목
-                    QrySrtDt="",
-                    QryEndDt="",
+                    QrySrtDt=query_day,
+                    QryEndDt=query_day,
                     ThdayTpCode="1",        # 1: 당일조회
                     OrdStatCode="0",        # 0: 전체(체결+미체결) — 상태 판정에 필요
                     BnsTpCode="0",          # 0: 전체
@@ -16867,7 +16888,11 @@ class NewOrderNodeExecutor(NodeExecutorBase):
                     OrdPtnCode="00",        # 00: 전체
                     OvrsDrvtFnoTpCode="A",  # A: 전체(선물+옵션)
                 )
-            ).req_async()
+            )
+            response = await query.req_async()
+
+            if paper_day:
+                await paper_day.check_orders(ls, response, query)
 
             if getattr(response, "error_msg", None):
                 context.log("debug", f"CIDBQ02400 fill query error: {response.error_msg}", node_id)

{programgarden-2.6.2 → programgarden-2.6.4}/programgarden/futures_read_evidence.py

@@ -2,19 +2,40 @@
 
 import math
 
+from programgarden.database.broker_evidence import (
+    PAPER_FUTURES_NO_RESULT_MESSAGES,
+    unverified_response_code,
+)
 
-def require_complete_rows(response, request, tr):
+_NO_DATA_TRS = {"CIDBQ01500", "CIDBQ02400"}
+
+
+def require_complete_rows(response, request, tr, *, paper_trading=False):
     """Validate the observed terminal envelope and return its detail rows.
 
     00707 is accepted only for an explicitly empty, matching terminal response
     for the two position/pending TRs observed on the paper server. It is not a
     generic success code. Continuation pages remain unavailable in this reader.
+
+    For a paper client only, 02679 with one of the exact paper empty-result
+    messages (the startup gate's set for these two TRs) and explicitly empty
+    rows is the same complete empty result on those two TRs. Live clients and
+    other TRs still reject it.
     """
+    if response.status_code != 200 or response.error_msg:
+        raise ValueError(f"{tr} did not return a complete terminal response")
+    code = response.rsp_cd
+    accepted = code in {"00000", "00136", "00707"} or (
+        paper_trading is True
+        and tr in _NO_DATA_TRS
+        and code == "02679"
+        and not response.block2
+        and response.rsp_msg in PAPER_FUTURES_NO_RESULT_MESSAGES
+    )
+    if not accepted:
+        raise ValueError(unverified_response_code(tr, code, response.rsp_msg))
     if (
-        response.status_code != 200
-        or response.error_msg
-        or response.rsp_cd not in {"00000", "00136", "00707"}
-        or response.header is None
+        response.header is None
         or response.header.tr_cd not in {tr, "CIDBQ"}
         or response.header.tr_cont != "N"
         or response.header.tr_cont_key
@@ -29,9 +50,7 @@ def require_complete_rows(response, request, tr):
         or any(getattr(echo, field) != value for field, value in expected.items())
     ):
         raise ValueError(f"{tr} query echo is missing or mismatched")
-    if response.rsp_cd == "00707" and (
-        tr not in {"CIDBQ01500", "CIDBQ02400"} or response.block2
-    ):
+    if code == "00707" and (tr not in _NO_DATA_TRS or response.block2):
         raise ValueError(f"{tr} no-data response is inconsistent")
     return response.block2
 

programgarden-2.6.4/programgarden/paper_futures_business_date.py

@@ -0,0 +1,96 @@
+"""Use fresh account-scoped broker dates for paper futures order inquiries.
+
+The published same-day blank-date contract conflicts with an observed paper
+response. This adapter uses CIDBQ01500's explicit current-date echo, never a
+machine date, and does not cache it across calls or relax unavailable evidence.
+"""
+from dataclasses import dataclass, field
+from datetime import datetime
+import hashlib
+import re
+import time
+
+from programgarden.database.broker_evidence import StartupEvidenceUnavailable, checked_body
+
+
+def is_paper_client(ls):
+    return getattr(getattr(ls, "token_manager", None), "paper_trading", None) is True
+
+
+@dataclass(frozen=True)
+class PaperFuturesScope:
+    manager: object = field(repr=False)
+    key_digest: str = field(repr=False)
+    started: float
+
+    @classmethod
+    def capture(cls, ls):
+        manager = getattr(ls, "token_manager", None)
+        key = getattr(manager, "appkey", None)
+        if not is_paper_client(ls) or not isinstance(key, str) or not key:
+            raise StartupEvidenceUnavailable("paper_futures_business_date: unavailable_client_scope")
+        return cls(manager, hashlib.sha256(key.encode()).hexdigest(), time.monotonic())
+
+    def check(self, ls):
+        current = self.capture(ls)
+        if current.manager is not self.manager or current.key_digest != self.key_digest:
+            raise StartupEvidenceUnavailable("paper_futures_business_date: client_scope_changed")
+        age = time.monotonic() - self.started
+        if age < 0 or age > 60:
+            raise StartupEvidenceUnavailable("paper_futures_business_date: expired_observation")
+
+
+@dataclass(frozen=True)
+class PaperFuturesBusinessDate:
+    day: str
+    account: str = field(repr=False)
+    scope: PaperFuturesScope = field(repr=False)
+
+    async def check_orders(self, ls, response, query):
+        self.scope.check(ls)
+        body = await checked_body(response, "CIDBQ02400", query, paper_trading=True)
+        echo = body["CIDBQ02400OutBlock1"]
+        request = next(iter(query.request_data.body.values()))
+        expected = request.model_dump(exclude={"RecCnt"})
+        if (request.ThdayTpCode != "1" or request.QrySrtDt != self.day
+                or request.QryEndDt != self.day or not isinstance(echo, dict)
+                or echo.get("AcntNo") != self.account
+                or any(name not in echo or echo[name] != value for name, value in expected.items())):
+            raise StartupEvidenceUnavailable("CIDBQ02400: business_date_scope_mismatch")
+        self.scope.check(ls)
+        return response.block2
+
+
+async def from_current_positions(ls, response, query, scope):
+    """Validate a just-fetched positions response without making another call."""
+    scope.check(ls)
+    body = await checked_body(response, "CIDBQ01500", query, paper_trading=True)
+    echo = body["CIDBQ01500OutBlock1"]
+    request = next(iter(query.request_data.body.values()))
+    expected = {"AcntTpCode": "1", "QryDt": "", "BalTpCode": "2", "FcmAcntNo": ""}
+    if any(getattr(request, name) != value for name, value in expected.items()):
+        raise StartupEvidenceUnavailable("CIDBQ01500: current_date_query_required")
+    if not isinstance(echo, dict) or any(echo.get(name) != value for name, value in expected.items() if name != "QryDt"):
+        raise StartupEvidenceUnavailable("CIDBQ01500: business_date_scope_mismatch")
+    day, account = echo.get("QryDt"), echo.get("AcntNo")
+    if not isinstance(day, str) or not re.fullmatch(r"[0-9]{8}", day):
+        raise StartupEvidenceUnavailable("CIDBQ01500: unavailable_business_date")
+    try:
+        datetime.strptime(day, "%Y%m%d")
+    except ValueError:
+        raise StartupEvidenceUnavailable("CIDBQ01500: invalid_business_date") from None
+    if not isinstance(account, str) or not account.strip():
+        raise StartupEvidenceUnavailable("CIDBQ01500: unavailable_account_echo")
+    scope.check(ls)
+    return PaperFuturesBusinessDate(day, account, scope)
+
+
+async def read_current_business_date(ls):
+    """One bounded read; the SDK retains its existing shared-key rate limiter."""
+    from programgarden_finance import CIDBQ01500
+
+    scope = PaperFuturesScope.capture(ls)
+    query = ls.overseas_futureoption().accno().CIDBQ01500(body=CIDBQ01500.CIDBQ01500InBlock1(
+        RecCnt=1, AcntTpCode="1", FcmAcntNo="", QryDt="", BalTpCode="2"))
+    response = await query.req_async()
+    return await from_current_positions(ls, response, query, scope)

{programgarden-2.6.2 → programgarden-2.6.4}/pyproject.toml

@@ -5,7 +5,7 @@ authors = [
 homepage = "https://programgarden.com"
 requires-python = ">=3.12"
 name = "programgarden"
-version = "2.6.2"
+version = "2.6.4"
 license = "AGPL-3.0-or-later"
 description = "ProgramGarden - 노드 기반 자동매매 DSL 실행 엔진"
 readme = "README.md"
@@ -37,7 +37,7 @@ litellm = ">=1.40.0"
 # (1.26.0 이후로도 context.py 는 WorkflowPnLEvent(**event_data) 에 personal_metrics
 #  를 무조건 실으므로 그 하한 근거도 이 상한에 포함된다.)
 programgarden-core = "^2.6.2"
-programgarden-finance = "^2.0.1"
+programgarden-finance = "^2.0.2"
 programgarden-community = "^2.3.1"
 
 [tool.poetry.group.dev.dependencies]