fix: merge

Signed-off-by: Louis Mandel <lmandel@us.ibm.com>

Author: mandel

src/pdl/pdl.py

@@ -104,7 +104,7 @@ def exec_program(
     if score is not None and not isinstance(score, Ref):
         config["score"] = Ref(score)
     assert config.get("score") is None or isinstance(config.get("score"), Ref)
-    state = InterpreterState(**config)
+    state = InterpreterState(**config)  # pyright: ignore
     if not isinstance(scope, ScopeType):
         scope = ScopeType(scope or {})
     loc = loc or empty_block_location
@@ -330,7 +330,7 @@ def main():
 
     exit_code = pdl_interpreter.generate(
         pdl_file,
-        InterpreterState(**config),
+        InterpreterState(**config),  # pyright: ignore
         ScopeType(initial_scope),
         trace_file,
     )

src/pdl/pdl_infer.py

@@ -11,7 +11,6 @@
     PdlLocationType,
     PdlUsage,
     Program,
-    ScopeType,
     get_default_model_parameters,
 )
 from .pdl_distributions import Categorical, viz
@@ -25,6 +24,7 @@
     infer_smc,
     infer_smc_parallel,
 )
+from .pdl_interpreter_state import ScopeType
 from .pdl_parser import parse_dict, parse_file, parse_str
 from .pdl_scheduler import create_event_loop_thread
 from .pdl_utils import validate_scope

src/pdl/pdl_inference.py

@@ -7,8 +7,9 @@
 
 from .pdl import InterpreterConfig, Result
 from .pdl import exec_program as pdl_exec_program
-from .pdl_ast import BlockType, PdlLocationType, Program, ScopeType
+from .pdl_ast import BlockType, PdlLocationType, Program
 from .pdl_distributions import Categorical
+from .pdl_interpreter_state import ScopeType
 from .pdl_utils import Resample
 
 T = TypeVar("T")