phylogenie 1.0.2__tar.gz → 1.0.3__tar.gz

{phylogenie-1.0.2 → phylogenie-1.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: phylogenie
-Version: 1.0.2
+Version: 1.0.3
 Summary: Generate phylogenetic datasets with minimal setup effort
 Author: Gabriele Marino
 Author-email: gabmarino.8601@gmail.com

{phylogenie-1.0.2 → phylogenie-1.0.3}/phylogenie/core/factories.py

@@ -1,4 +1,4 @@
-from typing import Any, overload
+from typing import Any, Literal, overload
 
 import numpy as np
 
@@ -23,10 +23,9 @@ def _eval_expression(expression: str, data: pgt.Data) -> Any:
             expression,
             {
                 "__builtins__": __builtins__,
-                # "np": np,
-                # **{k: np.array(v) for k, v in data.items()},
+                "np": np,
+                **{k: np.array(v) for k, v in data.items()},
             },
-            {k: np.array(v) for k, v in data.items()},
         )
     ).tolist()
 
@@ -101,20 +100,17 @@ def skyline_parameter_like_factory(
     )
 
 
-from typing import Literal
-
-
 @overload
 def _parse_skyline_vector_value_model(
     x: cfg.SkylineVectorValueModel, data: pgt.Data, coercible: Literal[True]
-) -> SkylineVector | SkylineParameter: ...
+) -> SkylineVectorCoercible: ...
 @overload
 def _parse_skyline_vector_value_model(
     x: cfg.SkylineVectorValueModel, data: pgt.Data, coercible: Literal[False]
-) -> SkylineVector: ...
+) -> SkylineVectorLike: ...
 def _parse_skyline_vector_value_model(
     x: cfg.SkylineVectorValueModel, data: pgt.Data, coercible: bool
-) -> SkylineVector | SkylineParameter:
+) -> SkylineVectorCoercible:
     change_times = many_scalars_factory(x.change_times, data)
     if isinstance(x.value, str):
         e = _eval_expression(x.value, data)
@@ -132,13 +128,13 @@ def _parse_skyline_vector_value_model(
             return SkylineParameter(value=value, change_times=change_times)
         else:
             raise ValueError(
-                f"Parsing SkylineVector value {x.value} yielded a sequence of scalars ({value}) when a nested (2D) sequence of scalars was expected."
+                f"Parsing SkylineVector config {x.value} yielded a sequence of scalars {value} when a nested (2D) sequence of scalars was expected."
             )
 
     Ns = {len(elem) for elem in value if tg.is_many(elem)}
     if len(Ns) > 1:
         raise ValueError(
-            f"All elements in the value of a SkylineVector config must be scalars or have the same length (got value={value} with inconsistent lengths {Ns})."
+            f"All elements in the value of a SkylineVector config must be scalars or have the same length (config {x.value} yielded value={value} with inconsistent lengths {Ns})."
         )
     (N,) = Ns
     value = [[p] * N if isinstance(p, pgt.Scalar) else p for p in value]
@@ -238,13 +234,13 @@ def skyline_matrix_coercible_factory(
             n_rows = len(elem)
             if any(len(row) != n_rows for row in elem):
                 raise ValueError(
-                    f"All elements in the value of a SkylineMatrix config must be scalars or square matrices (got non-square matrix: {elem})."
+                    f"All elements in the value of a SkylineMatrix config must be scalars or square matrices (config {x.value} yeilded a non-square matrix: {elem})."
                 )
             Ns.add(n_rows)
 
     if len(Ns) > 1:
         raise ValueError(
-            f"All elements in the value of a SkylineMatrix config must be scalars or have the same square shape (got value={value} with inconsistent lengths {Ns})."
+            f"All elements in the value of a SkylineMatrix config must be scalars or have the same square shape (config {x.value} yielded value={value} with inconsistent lengths {Ns})."
         )
     (N,) = Ns
     value = [[[p] * N] * N if isinstance(p, pgt.Scalar) else p for p in value]

{phylogenie-1.0.2 → phylogenie-1.0.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "phylogenie"
-version = "1.0.2"
+version = "1.0.3"
 description = "Generate phylogenetic datasets with minimal setup effort"
 authors = ["Gabriele Marino <gabmarino.8601@gmail.com>"]
 readme = "README.md"