programgarden 1.22.0__tar.gz → 1.22.2__tar.gz

{programgarden-1.22.0 → programgarden-1.22.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: programgarden
-Version: 1.22.0
+Version: 1.22.2
 Summary: ProgramGarden - 노드 기반 자동매매 DSL 실행 엔진
 Author: 프로그램동산
 Author-email: coding@programgarden.com
@@ -13,9 +13,9 @@ Requires-Dist: aiosqlite (>=0.20.0,<0.21.0)
 Requires-Dist: croniter (>=6.0.0,<7.0.0)
 Requires-Dist: litellm (>=1.40.0)
 Requires-Dist: lxml (>=6.0.2,<7.0.0)
-Requires-Dist: programgarden-community (>=1.13.5,<2.0.0)
-Requires-Dist: programgarden-core (>=1.13.0,<2.0.0)
-Requires-Dist: programgarden-finance (>=1.6.7,<2.0.0)
+Requires-Dist: programgarden-community (>=1.13.7,<2.0.0)
+Requires-Dist: programgarden-core (>=1.14.2,<2.0.0)
+Requires-Dist: programgarden-finance (>=1.6.9,<2.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.0,<3.0.0)

{programgarden-1.22.0 → programgarden-1.22.2}/programgarden/context.py

@@ -1315,15 +1315,79 @@ class ExecutionContext:
     def set_workflow_job(self, job: Any) -> None:
         """
         Set workflow job reference for start datetime access.
-        
+
         This enables notify_workflow_pnl to include workflow_start_datetime
         and workflow_elapsed_days in events.
-        
+
         Args:
             job: WorkflowJob instance
         """
         self._workflow_job = job
 
+    # ============================================================
+    # A-4: 주문 idempotency 위임 (WorkflowJob → ExecutionContext)
+    # 주문 executor가 context만 받으므로 context를 통해 job 메서드에 접근.
+    # ============================================================
+
+    def check_order_already_submitted(
+        self,
+        node_id: str,
+        item: Optional[Any] = None,
+    ) -> Optional[Any]:
+        """이미 제출된 주문인지 확인 (WorkflowJob.check_order_already_submitted 위임).
+
+        WorkflowJob이 없거나 idempotency가 비활성화된 경우 None 반환.
+
+        Args:
+            node_id: 주문 노드 ID
+            item: 주문 정보 dict (symbol, exchange, quantity, price 등)
+
+        Returns:
+            이미 제출된 경우 주문 결과 dict, 미제출/비활성이면 None
+        """
+        job = self._workflow_job
+        if job is None:
+            return None
+        check_fn = getattr(job, 'check_order_already_submitted', None)
+        if check_fn is None:
+            return None
+        # A-4: ordering 세대(_order_cycle) 사용. flow_executions 는 복구 시 드리프트
+        # 하므로 cycle 로 쓰면 realtime 복구가 동일 주문을 다른 키로 기록해 중복 차단
+        # 실패. _order_cycle 은 entry main flow(초기/복구 재실행) 에서 항상 0.
+        cycle = getattr(job, '_order_cycle', 0)
+        try:
+            return check_fn(node_id=node_id, cycle=cycle, item=item)
+        except Exception:
+            return None
+
+    def record_order_submitted(
+        self,
+        node_id: str,
+        order_result: Any,
+        item: Optional[Any] = None,
+    ) -> None:
+        """주문 제출 성공 후 idempotency 레지스트리에 기록 (WorkflowJob 위임).
+
+        WorkflowJob이 없거나 idempotency가 비활성화된 경우 무시.
+
+        Args:
+            node_id: 주문 노드 ID
+            order_result: 주문 결과 dict (success, order_no 포함)
+            item: 주문 정보 dict
+        """
+        job = self._workflow_job
+        if job is None:
+            return
+        record_fn = getattr(job, 'record_order_submitted', None)
+        if record_fn is None:
+            return
+        # A-4: check 와 동일한 _order_cycle 사용 (드리프트 방지 — 위 check 주석 참조).
+        cycle = getattr(job, '_order_cycle', 0)
+        try:
+            record_fn(node_id=node_id, cycle=cycle, item=item, order_result=order_result)
+        except Exception:
+            pass
+
     async def notify_node_state(
         self,
         node_id: str,

{programgarden-1.22.0 → programgarden-1.22.2}/programgarden/database/checkpoint_manager.py

@@ -63,6 +63,18 @@ class CheckpointManager:
                     PRIMARY KEY (job_id, node_id, port_name)
                 )
             """)
+            # A-4: 주문 idempotency 레지스트리
+            # enable_order_idempotency=True 일 때 주문 중복 방지에 사용.
+            # idempotency_key = workflow_id:node_id:cycle:item_hash
+            conn.execute("""
+                CREATE TABLE IF NOT EXISTS order_idempotency (
+                    job_id TEXT NOT NULL,
+                    idempotency_key TEXT NOT NULL,
+                    order_result_json TEXT NOT NULL,
+                    submitted_at TEXT NOT NULL,
+                    PRIMARY KEY (job_id, idempotency_key)
+                )
+            """)
             conn.commit()
 
     # ============================================================
@@ -240,9 +252,65 @@ class CheckpointManager:
         with sqlite3.connect(self.db_path) as conn:
             conn.execute("DELETE FROM checkpoint_meta WHERE job_id = ?", (job_id,))
             conn.execute("DELETE FROM checkpoint_outputs WHERE job_id = ?", (job_id,))
+            conn.execute("DELETE FROM order_idempotency WHERE job_id = ?", (job_id,))
             conn.commit()
         logger.debug(f"Checkpoint 삭제: job={job_id}")
 
+    # ============================================================
+    # A-4: 주문 idempotency 레지스트리
+    # ============================================================
+
+    def record_order_submission(
+        self,
+        job_id: str,
+        idempotency_key: str,
+        order_result: Dict[str, Any],
+    ) -> None:
+        """주문 제출 결과를 idempotency 레지스트리에 기록.
+
+        enable_order_idempotency=True 인 워크플로우에서 주문 노드가 LS에
+        주문을 제출한 직후 호출됩니다. 동일 idempotency_key가 존재하면
+        IGNORE (멱등, 이미 기록된 것을 덮어쓰지 않음).
+
+        Args:
+            job_id: 워크플로우 job ID
+            idempotency_key: 결정적 키 (workflow_id:node_id:cycle:item_hash)
+            order_result: 주문 결과 dict (order_no 포함)
+        """
+        now = datetime.now(timezone.utc).isoformat()
+        result_json = json.dumps(order_result, default=str)
+        with sqlite3.connect(self.db_path) as conn:
+            conn.execute("""
+                INSERT OR IGNORE INTO order_idempotency
+                    (job_id, idempotency_key, order_result_json, submitted_at)
+                VALUES (?, ?, ?, ?)
+            """, (job_id, idempotency_key, result_json, now))
+            conn.commit()
+        logger.debug(
+            f"Order idempotency 기록: job={job_id}, key={idempotency_key}, "
+            f"order_no={order_result.get('order_no', '?')}"
+        )
+
+    def get_submitted_order(
+        self,
+        job_id: str,
+        idempotency_key: str,
+    ) -> Optional[Dict[str, Any]]:
+        """idempotency_key로 이미 제출된 주문 결과를 조회.
+
+        Returns:
+            주문 결과 dict (order_no 포함) 또는 None (미제출)
+        """
+        with sqlite3.connect(self.db_path) as conn:
+            row = conn.execute(
+                "SELECT order_result_json FROM order_idempotency "
+                "WHERE job_id = ? AND idempotency_key = ?",
+                (job_id, idempotency_key),
+            ).fetchone()
+        if row is None:
+            return None
+        return json.loads(row[0])
+
     def has_checkpoint(self, job_id: str) -> bool:
         """체크포인트 존재 여부."""
         with sqlite3.connect(self.db_path) as conn: