Merge master into branch

Author: nwatson22

docs/conf.py

@@ -9,8 +9,8 @@
 project = 'pyk'
 author = 'Runtime Verification, Inc'
 copyright = '2024, Runtime Verification, Inc'
-version = '0.1.621'
-release = '0.1.621'
+version = '0.1.623'
+release = '0.1.623'
 
 # -- General configuration ---------------------------------------------------
 # https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration

package/version

@@ -1 +1 @@
-0.1.621
+0.1.623

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "pyk"
-version = "0.1.621"
+version = "0.1.623"
 description = ""
 authors = [
     "Runtime Verification, Inc. <contact@runtimeverification.com>",

src/pyk/kast/outer.py

@@ -1088,7 +1088,7 @@ def sentence_by_unique_id(self) -> dict[str, KSentence]:
         for module in self.all_modules:
             for unique_id, sent in module.sentence_by_unique_id.items():
                 if unique_id in unique_id_map and sent != unique_id_map[unique_id]:
-                    _LOGGER.warning(
+                    _LOGGER.debug(
                         f'Same UNIQUE_ID found for two different sentences: {(sent, unique_id_map[unique_id])}'
                     )
                 else:

src/pyk/proof/reachability.py

@@ -210,7 +210,9 @@ def from_dict(cls: type[APRProof], dct: Mapping[str, Any], proof_dir: Path | Non
         node_refutations: dict[int, str] = {}
         checked_for_subsumption = set(dct['checked_for_subsumption'])
         if 'node_refutation' in dct:
-            node_refutations = {kcfg._resolve(node_id): proof_id for (node_id, proof_id) in dct['node_refutations']}
+            node_refutations = {
+                kcfg._resolve(int(node_id)): proof_id for node_id, proof_id in dct['node_refutations'].items()
+            }
         if 'logs' in dct:
             logs = {int(k): tuple(LogEntry.from_dict(l) for l in ls) for k, ls in dct['logs'].items()}
         else:
@@ -419,7 +421,9 @@ def read_proof_data(proof_dir: Path, id: str) -> APRProof:
         logs = {int(k): tuple(LogEntry.from_dict(l) for l in ls) for k, ls in proof_dict['logs'].items()}
         subproof_ids = proof_dict['subproof_ids']
         checked_for_subsumption = proof_dict['checked_for_subsumption']
-        node_refutations = {kcfg._resolve(node_id): proof_id for (node_id, proof_id) in proof_dict['node_refutations']}
+        node_refutations = {
+            kcfg._resolve(int(node_id)): proof_id for node_id, proof_id in proof_dict['node_refutations'].items()
+        }
 
         return APRProof(
             id=id,
@@ -491,6 +495,10 @@ def unrefute_node(self, node: KCFG.Node) -> None:
         _LOGGER.info(f'Disabled refutation of node {node.id}.')
 
     def construct_node_refutation(self, node: KCFG.Node) -> RefutationProof | None:  # TODO put into prover class
+        if len(self.kcfg.successors(node.id)) > 0:
+            _LOGGER.error(f'Cannot refute node {node.id} that already has successors')
+            return None
+
         path = single(self.kcfg.paths_between(source_id=self.init, target_id=node.id))
         branches_on_path = list(filter(lambda x: type(x) is KCFG.Split or type(x) is KCFG.NDBranch, reversed(path)))
         if len(branches_on_path) == 0:

src/pyk/proof/show.py

@@ -36,6 +36,8 @@ def node_attrs(self, kcfg: KCFG, node: KCFG.Node) -> list[str]:
             attrs.append('target')
         if self.proof.is_pending(node.id):
             attrs.append('pending')
+        if self.proof.is_refuted(node.id):
+            attrs.append('refuted')
         if self.proof.is_terminal(node.id):
             attrs.append('terminal')
             if 'stuck' in attrs: