itf-py 0.1.1__tar.gz → 0.2.0__tar.gz

{itf_py-0.1.1 → itf_py-0.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: itf-py
-Version: 0.1.1
+Version: 0.2.0
 Summary: Python library to parse and emit Apalache ITF traces
 Keywords: itf,trace,parser,tlaplus,apalache,quint
 Author: Igor Konnov
@@ -9,6 +9,8 @@ Requires-Python: >=3.12,<4.0
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Requires-Dist: frozendict (>=2.4.6,<3.0.0)
+Requires-Dist: frozenlist (>=1.7.0,<2.0.0)
 Project-URL: Homepage, https://github.com/konnov/itf-py
 Description-Content-Type: text/markdown
 

{itf_py-0.1.1 → itf_py-0.2.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "itf-py"
-version = "0.1.1"
+version = "0.2.0"
 description = "Python library to parse and emit Apalache ITF traces"
 homepage = "https://github.com/konnov/itf-py"
 authors = ["Igor Konnov <igor@konnov.phd>"]
@@ -10,6 +10,8 @@ packages = [{include = "itf_py", from = "src"}]
 
 [tool.poetry.dependencies]
 python = "^3.12"
+frozendict = "^2.4.6"
+frozenlist = "^1.7.0"
 
 [tool.poetry.group.dev.dependencies]
 pytest = "^8.0.0"
@@ -18,6 +20,7 @@ black = "^24.0.0"
 isort = "^5.13.0"
 flake8 = "^7.0.0"
 mypy = "^1.8.0"
+markdown-pytest = "^0.3.2"
 
 
 [build-system]

itf_py-0.2.0/src/itf_py/__init__.py

@@ -0,0 +1,17 @@
+"""
+Python library to parse and emit Apalache ITF traces.
+"""
+
+from .itf import ITFState
+
+__version__ = "0.1.0"
+__all__ = [
+    "ITFState",
+    "ITFTrace",
+    "value_to_json",
+    "value_from_json",
+    "state_to_json",
+    "state_from_json",
+    "trace_to_json",
+    "trace_from_json",
+]

{itf_py-0.1.1 → itf_py-0.2.0}/src/itf_py/itf.py

@@ -1,7 +1,10 @@
+from collections import namedtuple
 from dataclasses import dataclass
-from types import SimpleNamespace
 from typing import Any, Dict, List, Optional
 
+from frozendict import frozendict
+from frozenlist import FrozenList
+
 
 @dataclass
 class ITFState:
@@ -39,13 +42,17 @@ def value_from_json(val: Any) -> Any:
         elif "#set" in val:
             return frozenset(value_from_json(v) for v in val["#set"])
         elif "#map" in val:
-            return {value_from_json(k): value_from_json(v) for (k, v) in val["#map"]}
+            d = {value_from_json(k): value_from_json(v) for (k, v) in val["#map"]}
+            return frozendict(d)  # immutable dictionary
         elif "#unserializable" in val:
             return ITFUnserializable(value=val["#unserializable"])
         else:
-            return SimpleNamespace(**{k: value_from_json(v) for k, v in val.items()})
+            tup_type = namedtuple("ITFRecord", val.keys())  # type: ignore
+            return tup_type(**{k: value_from_json(v) for k, v in val.items()})
     elif isinstance(val, list):
-        return [value_from_json(v) for v in val]
+        lst = FrozenList([value_from_json(v) for v in val])
+        lst.freeze()  # make it immutable
+        return lst
     else:
         return val  # int, str, bool
 
@@ -56,16 +63,19 @@ def value_to_json(val: Any) -> Any:
         return val
     elif isinstance(val, int):
         return {"#bigint": str(val)}
-    elif isinstance(val, tuple):
+    elif isinstance(val, tuple) and not hasattr(val, "_fields"):
         return {"#tup": [value_to_json(v) for v in val]}
     elif isinstance(val, frozenset):
         return {"#set": [value_to_json(v) for v in val]}
     elif isinstance(val, dict):
         return {"#map": [[value_to_json(k), value_to_json(v)] for k, v in val.items()]}
-    elif isinstance(val, list):
+    elif isinstance(val, list) or isinstance(val, FrozenList):
         return [value_to_json(v) for v in val]
     elif hasattr(val, "__dict__"):
         return {k: value_to_json(v) for k, v in val.__dict__.items()}
+    elif isinstance(val, tuple) and hasattr(val, "_fields"):
+        # namedtuple
+        return {k: value_to_json(v) for k, v in val._asdict().items()}  # type: ignore
     elif isinstance(val, str):
         return val
     else:

itf_py-0.1.1/src/itf_py/__init__.py

@@ -1,10 +0,0 @@
-"""
-Python library to parse and emit Apalache ITF traces.
-"""
-
-from .itf import ITFState
-
-__version__ = "0.1.0"
-__all__ = [
-    "ITFState",
-]