programgarden 1.22.2__tar.gz → 1.22.4__tar.gz

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

@@ -1,6 +1,6 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: programgarden
-Version: 1.22.2
+Version: 1.22.4
 Summary: ProgramGarden - 노드 기반 자동매매 DSL 실행 엔진
 Author: 프로그램동산
 Author-email: coding@programgarden.com
@@ -8,14 +8,15 @@ Requires-Python: >=3.12
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Requires-Dist: aiohttp (>=3.9.0,<4.0.0)
 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.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: programgarden-community (>=1.13.8,<2.0.0)
+Requires-Dist: programgarden-core (>=1.14.3,<2.0.0)
+Requires-Dist: programgarden-finance (>=1.6.10,<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.2 → programgarden-1.22.4}/programgarden/context.py

@@ -150,12 +150,17 @@ class ExecutionContext:
         workflow_edges: Optional[List[Any]] = None,  # List[ResolvedEdge]
         workflow_nodes: Optional[Dict[str, Any]] = None,  # Dict[str, ResolvedNode]
         storage_dir: Optional[str] = None,
+        ls_token_provider: Optional[Any] = None,  # sync (appkey, product, paper_trading) -> (token, expires_at_epoch)
     ):
         self.job_id = job_id
         self.workflow_id = workflow_id
         self._storage_dir = storage_dir
         self.context_params = context_params or {}
 
+        # Opt-in LS token provider (Verified League §3.2.3). When set, broker
+        # logins consume a server-issued token instead of self-issuing.
+        self.ls_token_provider = ls_token_provider
+
         # Secrets storage (never logged, separate from context_params)
         self._secrets: Dict[str, Any] = secrets or {}
         

{programgarden-1.22.2 → programgarden-1.22.4}/programgarden/executor.py

@@ -277,7 +277,23 @@ class LSClientManager:
         # 새 인스턴스 생성 (싱글톤 우회)
         ls = object.__new__(LS)
         ls.__init__()
-        
+
+        # Verified League §3.2.3: when a token provider is configured, route this
+        # LS instance through it (server = single issuer) so login consumes a
+        # server-issued token instead of self-issuing via GenerateToken. login()
+        # is synchronous, so we register a sync provider (it is also reused by the
+        # async refresh path as a fallback). Bound to this instance's
+        # appkey/product/paper_trading; returns (access_token, expires_at_epoch).
+        token_provider = getattr(context, "ls_token_provider", None)
+        if token_provider is not None:
+            def _sync_token_provider(
+                _appkey=appkey, _product=product, _paper=paper_trading,
+            ):
+                return token_provider(_appkey, _product, _paper)
+
+            ls.set_token_provider(provider=_sync_token_provider)
+            context.log("info", f"LS token provider attached for {product}", node_id)
+
         # 로그인
         login_result = ls.login(
             appkey=appkey,
@@ -8364,39 +8380,48 @@ class LogicNodeExecutor(NodeExecutorBase):
         condition_results: List[Dict[str, Any]] = []
         all_passed_symbols: List[List[str]] = []
         weights: Dict[int, float] = {}  # index -> weight
-        
+
         for idx, cond in enumerate(conditions):
             # 조건 객체 검증
             if not isinstance(cond, dict):
                 context.log("warning", f"Condition at index {idx} is not a dict, skipping", node_id)
                 continue
-            
+
             # is_condition_met 필수
+            # 다종목 auto-iterate 시 is_condition_met 바인딩이 병합 리스트
+            # ([False, False, ...]) 로 해석될 수 있다. 리스트는 "통과 여부"가
+            # 아니라 "실행 여부"를 뜻하게 되므로, any() 로 스칼라화해 per-condition
+            # 통과 여부로 환원한다. (None 은 미제공 → 기존처럼 False + 경고)
             is_met = cond.get("is_condition_met")
             if is_met is None:
                 context.log("warning", f"Condition at index {idx} missing 'is_condition_met', treating as False", node_id)
-                is_met = False
-            
-            # passed_symbols 필수
-            passed_symbols = cond.get("passed_symbols")
-            if passed_symbols is None:
-                passed_symbols = []
-            if not isinstance(passed_symbols, list):
-                passed_symbols = []
-            
+                is_met_scalar = False
+            elif isinstance(is_met, list):
+                is_met_scalar = any(bool(x) for x in is_met)
+            else:
+                is_met_scalar = bool(is_met)
+
+            # passed_symbols: None(미제공) 과 [](명시 빈 리스트) 를 구분한다.
+            #   - 명시 리스트(빈 리스트 포함) → "symbol-bearing" 조건 (교집합 참여)
+            #   - 미제공/None/비리스트 → "boolean-gate" 조건 (bool 게이팅만)
+            raw_passed = cond.get("passed_symbols")
+            symbols_provided = isinstance(raw_passed, list)
+            passed_symbols = raw_passed if symbols_provided else []
+
             # weight (optional, default 1.0)
             weight = cond.get("weight", 1.0)
             if not isinstance(weight, (int, float)):
                 weight = 1.0
             weights[idx] = float(weight)
-            
+
             condition_results.append({
                 "index": idx,
-                "result": bool(is_met),
+                "result": is_met_scalar,
                 "passed_symbols": passed_symbols,
+                "symbols_provided": symbols_provided,
                 "weight": weight,
             })
-            all_passed_symbols.append(passed_symbols if isinstance(passed_symbols, list) else [])
+            all_passed_symbols.append(passed_symbols)
         
         if not condition_results:
             context.log("warning", "No valid condition results to combine", node_id)
@@ -8486,8 +8511,16 @@ class LogicNodeExecutor(NodeExecutorBase):
                     elif isinstance(s, str):
                         codes.add(s)
                 return codes
-            
-            sets = [extract_codes(s) for s in all_passed_symbols if s]
+
+            # symbol-bearing 조건(passed_symbols 명시 제공)만 교집합에 참여한다.
+            # 빈 리스트도 명시 제공이면 포함 → AND 교집합을 [] 로 영점화한다.
+            # boolean-gate 조건(미제공)은 심볼 의미가 없으므로 교집합에서 제외하고
+            # bool(result) 로만 게이팅된다.
+            sets = [
+                extract_codes(r["passed_symbols"])
+                for r in results
+                if r.get("symbols_provided")
+            ]
             if not sets:
                 return []
             common = sets[0]
@@ -9968,11 +10001,18 @@ class BacktestEngineNodeExecutor(NodeExecutorBase):
                     context.log("warning", f"External binding evaluation failed for {target_field}: {e}", node_id)
                     external_values[target_field] = source_expr
 
+        # 기본 컨텍스트 dict (row 제외) — ExpressionContext 는 mapping 이 아니므로
+        # 반드시 to_dict() 로 평탄화해야 한다. 이전엔 {**expr_context} 로 객체를
+        # 직접 언팩하려다 비어있지 않은 from_data 의 첫 row 에서 TypeError 로
+        # 크래시했다 (dry_run 은 mock 이 빈 time_series 를 줘 루프가 안 돌아 은폐됨).
+        base_dict = expr_context.to_dict()
+
         # 각 row 처리
         for row in from_data:
             record = {}
-            row_context = {**expr_context, "row": row}
-            row_evaluator = ExpressionEvaluator(row_context)
+            row_ctx = ExpressionContext()
+            row_ctx.variables = {**base_dict, "row": row}
+            row_evaluator = ExpressionEvaluator(row_ctx)
 
             for target_field, source_expr in extract.items():
                 if target_field in external_values:
@@ -12891,6 +12931,7 @@ class ModifyOrderNodeExecutor(NodeExecutorBase):
             )
             return {
                 "order_id": order_id,
+                "modified_order_id": order_id,
                 "status": "simulated",
                 "dry_run": True,
                 "requested": config,
@@ -13038,13 +13079,33 @@ class ModifyOrderNodeExecutor(NodeExecutorBase):
                         "original_order_id": original_order_id,
                         "product": "overseas_stock",
                     },
+                    "modified_order_id": "",
                     "modified_order": None,
                 }
             
             new_order_no = ""
             if response.block2:
                 new_order_no = str(response.block2.OrdNo) if response.block2.OrdNo else ""
-            
+
+            # 정정 빈-주문번호 가드 (거래시간 외/정정 불가 상태 silent no-op 차단)
+            if not new_order_no:
+                msg = response.rsp_msg or "정정 미반영"
+                context.log(
+                    "warning",
+                    f"Modify order returned no OrderNo: {symbol} - {msg}",
+                    node_id,
+                )
+                return {
+                    "modify_result": {
+                        "success": False,
+                        "error": f"Empty modify order number: {msg} (거래시간 외/정정 불가 상태 가능)",
+                        "original_order_id": original_order_id,
+                        "product": "overseas_stock",
+                    },
+                    "modified_order_id": "",
+                    "modified_order": None,
+                }
+
             context.log(
                 "info",
                 f"Order modified: {symbol} original={original_order_id} → new={new_order_no}",
@@ -13058,6 +13119,7 @@ class ModifyOrderNodeExecutor(NodeExecutorBase):
                     "new_order_id": new_order_no,
                     "product": "overseas_stock",
                 },
+                "modified_order_id": new_order_no,
                 "modified_order": {
                     "symbol": symbol,
                     "exchange": exchange,
@@ -13137,14 +13199,34 @@ class ModifyOrderNodeExecutor(NodeExecutorBase):
                         "original_order_id": original_order_id,
                         "product": "overseas_futures",
                     },
+                    "modified_order_id": "",
                     "modified_order": None,
                 }
-            
+
             new_order_no = ""
             if response.block2:
                 # 해외선물 정정 주문번호 필드: OvrsFutsOrdNo
                 new_order_no = str(response.block2.OvrsFutsOrdNo) if hasattr(response.block2, "OvrsFutsOrdNo") and response.block2.OvrsFutsOrdNo else ""
 
+            # 정정 빈-주문번호 가드 (거래시간 외/정정 불가 상태 silent no-op 차단)
+            if not new_order_no:
+                msg = response.rsp_msg or "정정 미반영"
+                context.log(
+                    "warning",
+                    f"Modify futures order returned no OrderNo: {symbol} - {msg}",
+                    node_id,
+                )
+                return {
+                    "modify_result": {
+                        "success": False,
+                        "error": f"Empty modify order number: {msg} (거래시간 외/정정 불가 상태 가능)",
+                        "original_order_id": original_order_id,
+                        "product": "overseas_futures",
+                    },
+                    "modified_order_id": "",
+                    "modified_order": None,
+                }
+
             context.log(
                 "info",
                 f"Futures order modified: {symbol} original={original_order_id} → new={new_order_no}",
@@ -13158,6 +13240,7 @@ class ModifyOrderNodeExecutor(NodeExecutorBase):
                     "new_order_id": new_order_no,
                     "product": "overseas_futures",
                 },
+                "modified_order_id": new_order_no,
                 "modified_order": {
                     "symbol": symbol,
                     "exchange": exchange_code,
@@ -13220,6 +13303,7 @@ class ModifyOrderNodeExecutor(NodeExecutorBase):
                         "original_order_id": original_order_id,
                         "product": "korea_stock",
                     },
+                    "modified_order_id": "",
                     "modified_order": None,
                 }
 
@@ -13227,6 +13311,25 @@ class ModifyOrderNodeExecutor(NodeExecutorBase):
             if response.block2:
                 new_order_no = str(response.block2.OrdNo) if response.block2.OrdNo else ""
 
+            # 정정 빈-주문번호 가드 (거래시간 외/정정 불가 상태 silent no-op 차단)
+            if not new_order_no:
+                msg = response.rsp_msg or "정정 미반영"
+                context.log(
+                    "warning",
+                    f"Korea stock modify order returned no OrderNo: {symbol} - {msg}",
+                    node_id,
+                )
+                return {
+                    "modify_result": {
+                        "success": False,
+                        "error": f"Empty modify order number: {msg} (거래시간 외/정정 불가 상태 가능)",
+                        "original_order_id": original_order_id,
+                        "product": "korea_stock",
+                    },
+                    "modified_order_id": "",
+                    "modified_order": None,
+                }
+
             context.log(
                 "info",
                 f"Korea stock order modified: {symbol} original={original_order_id} → new={new_order_no}",
@@ -13240,6 +13343,7 @@ class ModifyOrderNodeExecutor(NodeExecutorBase):
                     "new_order_id": new_order_no,
                     "product": "korea_stock",
                 },
+                "modified_order_id": new_order_no,
                 "modified_order": {
                     "symbol": symbol,
                     "exchange": "KRX",
@@ -13270,6 +13374,7 @@ class ModifyOrderNodeExecutor(NodeExecutorBase):
                 "success": False,
                 "error": error_msg,
             },
+            "modified_order_id": "",
             "modified_order": None,
         }
 
@@ -13286,6 +13391,8 @@ class CancelOrderNodeExecutor(NodeExecutorBase):
     - original_order_id: 취소할 주문번호 (필수)
     - symbol: 종목코드
     - exchange: 거래소
+
+    주의: LS 가 error_msg 없이 취소 미반영(거래시간 외 등)을 반환할 수 있다. 취소 성공은 사후 OpenOrders 재조회로 확인 권장.
     """
 
     # 해외주식 시장 코드 매핑
@@ -13316,6 +13423,7 @@ class CancelOrderNodeExecutor(NodeExecutorBase):
             )
             return {
                 "order_id": order_id,
+                "cancelled_order_id": order_id,
                 "status": "simulated",
                 "dry_run": True,
                 "requested": config,
@@ -13449,9 +13557,10 @@ class CancelOrderNodeExecutor(NodeExecutorBase):
                         "order_id": order_id,
                         "product": "overseas_stock",
                     },
+                    "cancelled_order_id": "",
                     "cancelled_order": None,
                 }
-            
+
             context.log(
                 "info",
                 f"Order cancelled: {symbol} order_id={order_id}",
@@ -13464,6 +13573,7 @@ class CancelOrderNodeExecutor(NodeExecutorBase):
                     "order_id": order_id,
                     "product": "overseas_stock",
                 },
+                "cancelled_order_id": order_id,
                 "cancelled_order": {
                     "symbol": symbol,
                     "exchange": exchange,
@@ -13481,6 +13591,7 @@ class CancelOrderNodeExecutor(NodeExecutorBase):
                     "order_id": order_id,
                     "product": "overseas_stock",
                 },
+                "cancelled_order_id": "",
                 "cancelled_order": None,
             }
 
@@ -13527,6 +13638,7 @@ class CancelOrderNodeExecutor(NodeExecutorBase):
                         "order_id": order_id,
                         "product": "overseas_futures",
                     },
+                    "cancelled_order_id": "",
                     "cancelled_order": None,
                 }
             
@@ -13542,6 +13654,7 @@ class CancelOrderNodeExecutor(NodeExecutorBase):
                     "order_id": order_id,
                     "product": "overseas_futures",
                 },
+                "cancelled_order_id": order_id,
                 "cancelled_order": {
                     "symbol": symbol,
                     "exchange": exchange_code,
@@ -13559,6 +13672,7 @@ class CancelOrderNodeExecutor(NodeExecutorBase):
                     "order_id": order_id,
                     "product": "overseas_futures",
                 },
+                "cancelled_order_id": "",
                 "cancelled_order": None,
             }
 
@@ -13600,6 +13714,7 @@ class CancelOrderNodeExecutor(NodeExecutorBase):
                         "order_id": order_id,
                         "product": "korea_stock",
                     },
+                    "cancelled_order_id": "",
                     "cancelled_order": None,
                 }
 
@@ -13615,6 +13730,7 @@ class CancelOrderNodeExecutor(NodeExecutorBase):
                     "order_id": order_id,
                     "product": "korea_stock",
                 },
+                "cancelled_order_id": order_id,
                 "cancelled_order": {
                     "symbol": symbol,
                     "exchange": "KRX",
@@ -13632,6 +13748,7 @@ class CancelOrderNodeExecutor(NodeExecutorBase):
                     "order_id": order_id,
                     "product": "korea_stock",
                 },
+                "cancelled_order_id": "",
                 "cancelled_order": None,
             }
 
@@ -13642,6 +13759,7 @@ class CancelOrderNodeExecutor(NodeExecutorBase):
                 "success": False,
                 "error": error_msg,
             },
+            "cancelled_order_id": "",
             "cancelled_order": None,
         }
 
@@ -14874,6 +14992,21 @@ class WorkflowExecutor:
         self._executors: Dict[str, NodeExecutorBase] = self._init_executors()
         # 동적 노드 레지스트리 (지연 임포트로 순환 참조 방지)
         self._dynamic_registry = None
+        # Opt-in LS token provider (Verified League §3.2.3). When set, broker
+        # logins fetch the token from this callback (a remote server) instead of
+        # self-issuing via GenerateToken, so the platform server is the single
+        # token issuer and this executor is a pure consumer. login() is sync, so
+        # the provider is a sync callable:
+        #   (appkey: str, product: str, paper_trading: bool) -> (access_token, expires_at_epoch)
+        # Left None for standalone/public usage (unchanged self-issue path).
+        self.ls_token_provider = None
+
+    def set_ls_token_provider(self, provider) -> None:
+        """Configure the opt-in LS token provider (Verified League §3.2.3).
+
+        Pass None to clear and revert to the default self-issue path.
+        """
+        self.ls_token_provider = provider
 
     def _get_dynamic_registry(self):
         """DynamicNodeRegistry 싱글톤 반환 (지연 로딩)"""
@@ -15129,8 +15262,9 @@ class WorkflowExecutor:
             workflow_edges=resolved.edges,
             workflow_nodes=resolved.nodes,
             storage_dir=storage_dir,
+            ls_token_provider=self.ls_token_provider,
         )
-        
+
         # Set listeners (Option A: inject at creation)
         if listeners:
             context.set_listeners(listeners)
@@ -15253,6 +15387,7 @@ class WorkflowExecutor:
             workflow_edges=resolved.edges,
             workflow_nodes=resolved.nodes,
             storage_dir=storage_dir,
+            ls_token_provider=self.ls_token_provider,
         )
 
         if listeners:
@@ -16264,6 +16399,23 @@ class WorkflowJob:
                 input_data = None
                 for edge in self.workflow.edges:
                     if edge.to_node_id == node_id:
+                        # 명시적 from_port 우선 (예: ExclusionListNode.filtered).
+                        # 이를 지정하지 않으면 auto-iterate 는 소스 노드의 첫 출력
+                        # 포트를 집어버린다 — ExclusionListNode 는 첫 포트가
+                        # `excluded`(블랙리스트)라서, from_port 없이는 제외 종목을
+                        # 순회하게 되는 silent 버그가 생긴다. IfNode 분기 포트
+                        # (true/false/result)는 별도 라우팅 의미라 여기서 제외.
+                        explicit_port = getattr(edge, "from_port", None)
+                        if explicit_port and explicit_port not in (
+                            "output", "true", "false", "result",
+                        ):
+                            port_data = self.context.get_output(
+                                edge.from_node_id, explicit_port
+                            )
+                            if port_data is not None:
+                                input_data = port_data
+                                break
+
                         # symbols 포트 우선 확인 (WatchlistNode 출력)
                         input_data = self.context.get_output(edge.from_node_id, "symbols")
 

{programgarden-1.22.2 → programgarden-1.22.4}/pyproject.toml

@@ -5,7 +5,7 @@ authors = [
 homepage = "https://programgarden.com"
 requires-python = ">=3.12"
 name = "programgarden"
-version = "1.22.2"
+version = "1.22.4"
 description = "ProgramGarden - 노드 기반 자동매매 DSL 실행 엔진"
 readme = "README.md"
 
@@ -28,14 +28,9 @@ lxml = "^6.0.2"
 pytickersymbols = {version = ">=1.17.5", python = ">=3.12,<4.0"}
 aiosqlite = "^0.20.0"
 litellm = ">=1.40.0"
-programgarden-core = { version = "^1.14.2", source = "testpypi" }
-programgarden-finance = { version = "^1.6.9", source = "testpypi" }
-programgarden-community = { version = "^1.13.7", source = "testpypi" }
-
-[[tool.poetry.source]]
-name = "testpypi"
-url = "https://test.pypi.org/simple/"
-priority = "supplemental"
+programgarden-core = "^1.14.3"
+programgarden-finance = "^1.6.10"
+programgarden-community = "^1.13.8"
 
 [tool.poetry.group.dev.dependencies]
 pytest = "^8.0.0"