Skip to content

Commit 39396ca

Browse files
committed
Fix warnings
1 parent d6c0120 commit 39396ca

File tree

2 files changed

+22
-10
lines changed

2 files changed

+22
-10
lines changed

src/pdl/pdl_dumper.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
DataBlock,
2121
EmptyBlock,
2222
ErrorBlock,
23-
FileAggregatorConfig,
2423
ExpressionType,
24+
FileAggregatorConfig,
2525
FunctionBlock,
2626
GetBlock,
2727
GraniteioModelBlock,

src/pdl/pdl_interpreter.py

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1078,8 +1078,7 @@ def process_contribute_old(
10781078
block: BlockTypeTVarProcessContributeOld, scope: ScopeType, loc: PdlLocationType
10791079
) -> tuple[Any, BlockTypeTVarProcessContributeOld]:
10801080
result: list[ContributeElement]
1081-
value_trace: LocalizedExpression[
1082-
list[ContributeElement]]
1081+
value_trace: LocalizedExpression[list[ContributeElement]]
10831082
value = get_contribute_value(block.contribute)
10841083
if value is None:
10851084
return None, block
@@ -2020,22 +2019,35 @@ def process_aggregator(
20202019
case FileAggregatorConfig():
20212020
try:
20222021
cfg = block.aggregator
2022+
file: str
2023+
file_trace: ExpressionType[str]
20232024
file, file_trace = process_expr(scope, cfg.file, loc)
2025+
mode: str
2026+
mode_trace: ExpressionType[str]
20242027
mode, mode_trace = process_expr(scope, cfg.mode, loc)
2028+
encoding: Optional[str]
2029+
encoding_trace: ExpressionType[Optional[str]]
20252030
encoding, encoding_trace = process_expr(scope, cfg.encoding, loc)
2031+
prefix: str
2032+
prefix_trace: ExpressionType[str]
20262033
prefix, prefix_trace = process_expr(scope, cfg.prefix, loc)
2034+
suffix: str
2035+
suffix_trace: ExpressionType[str]
20272036
suffix, suffix_trace = process_expr(scope, cfg.suffix, loc)
2037+
flush: bool
2038+
flush_trace: ExpressionType[bool]
20282039
flush, flush_trace = process_expr(scope, cfg.flush, loc)
20292040
cfg = block.aggregator.model_copy(
20302041
update={
2031-
"file": file,
2032-
"mode": mode,
2033-
"encoding": encoding,
2034-
"prefix": prefix,
2035-
"suffix": suffix,
2036-
"flush": flush,
2042+
"file": file_trace,
2043+
"mode": mode_trace,
2044+
"encoding": encoding_trace,
2045+
"prefix": prefix_trace,
2046+
"suffix": suffix_trace,
2047+
"flush": flush_trace,
20372048
}
20382049
)
2050+
trace = block.model_copy(update={"aggregator": cfg})
20392051
except PDLRuntimeExpressionError as exc:
20402052
raise PDLRuntimeError(
20412053
exc.message,
@@ -2049,7 +2061,7 @@ def process_aggregator(
20492061
case _:
20502062
assert False, "Unexpected aggregator"
20512063
background: LazyMessages = PdlList([])
2052-
trace = block.model_copy(update={})
2064+
trace = block.model_copy()
20532065
return PdlConst(aggregator), background, scope, trace
20542066

20552067

0 commit comments

Comments
 (0)