phylogenie 3.1.2__tar.gz → 3.1.3__tar.gz

{phylogenie-3.1.2 → phylogenie-3.1.3}/PKG-INFO

@@ -1,21 +1,17 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: phylogenie
-Version: 3.1.2
-Summary: Generate phylogenetic datasets with minimal setup effort
-Author: Gabriele Marino
-Author-email: gabmarino.8601@gmail.com
-Requires-Python: >=3.10,<4.0
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
-Requires-Dist: joblib (>=1.4.2,<2.0.0)
-Requires-Dist: matplotlib (>=3.10.6,<4.0.0)
-Requires-Dist: pandas (>=2.2.2,<3.0.0)
-Requires-Dist: pydantic (>=2.11.5,<3.0.0)
-Requires-Dist: pyyaml (>=6.0.2,<7.0.0)
-Requires-Dist: tqdm (>=4.66.4,<5.0.0)
+Version: 3.1.3
+Summary: Add your description here
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
+License-File: LICENSE.txt
+Requires-Dist: joblib>=1.5.2
+Requires-Dist: matplotlib>=3.10.7
+Requires-Dist: pandas>=2.3.3
+Requires-Dist: pydantic>=2.12.3
+Requires-Dist: pyyaml>=6.0.3
+Requires-Dist: tqdm>=4.67.1
+Dynamic: license-file
 
 <p align="center">
 <img src="https://raw.githubusercontent.com/gabriele-marino/phylogenie/main/logo.png" style="width:100%; height:auto;"/>
@@ -103,4 +99,3 @@ This project is licensed under [MIT License](https://raw.githubusercontent.com/g
 For questions, bug reports, or feature requests, please, consider opening an [issue on GitHub](https://github.com/gabriele-marino/phylogenie/issues), or [contact me directly](mailto:gabmarino.8601@email.com).
 
 If you need help with the configuration files, feel free to reach out —  I am always very available and happy to assist!
-

{phylogenie-3.1.2 → phylogenie-3.1.3}/phylogenie/draw.py

@@ -48,7 +48,7 @@ def _draw_colored_tree(tree: Tree, ax: Axes, colors: Color | dict[Tree, Color])
 def draw_tree(
     tree: Tree,
     ax: Axes | None = None,
-    color_by: str | dict[Tree, Any] | None = None,
+    color_by: str | dict[str, Any] | None = None,
     coloring: str | Coloring | None = None,
     default_color: Color = "black",
     cmap: str | None = None,
@@ -67,15 +67,16 @@ def draw_tree(
     if color_by is None:
         return _draw_colored_tree(tree, ax, colors=default_color)
 
-    if isinstance(color_by, dict):
-        features = {node: color_by[node] for node in tree if node in color_by}
-    else:
+    if isinstance(color_by, str):
         features = {node: node[color_by] for node in tree if color_by in node.metadata}
+    else:
+        features = {node: color_by[node.name] for node in tree if node.name in color_by}
+    values = list(features.values())
 
     if coloring is None:
         coloring = (
             Coloring.CONTINUOUS
-            if any(isinstance(f, float) for f in features.values())
+            if any(isinstance(f, float) for f in values)
             else Coloring.DISCRETE
         )
 
@@ -86,14 +87,14 @@ def draw_tree(
         }
 
     if coloring == Coloring.DISCRETE:
-        if any(isinstance(f, float) for f in features.values()):
+        if any(isinstance(f, float) for f in values):
             raise ValueError(
                 "Discrete coloring selected but feature values are not all categorical."
             )
 
         colormap = plt.get_cmap("tab20" if cmap is None else cmap)
         feature_colors = {
-            f: mcolors.to_hex(colormap(i)) for i, f in enumerate(set(features.values()))
+            f: mcolors.to_hex(colormap(i)) for i, f in enumerate(set(values))
         }
         colors = _get_colors(lambda f: feature_colors[f])
 
@@ -114,8 +115,8 @@ def draw_tree(
         return _draw_colored_tree(tree, ax, colors)
 
     if coloring == Coloring.CONTINUOUS:
-        vmin = min(features.values()) if vmin is None else vmin
-        vmax = max(features.values()) if vmax is None else vmax
+        vmin = min(values) if vmin is None else vmin
+        vmax = max(values) if vmax is None else vmax
         norm = mcolors.Normalize(vmin=vmin, vmax=vmax)
         colormap = plt.get_cmap("viridis" if cmap is None else cmap)
         colors = _get_colors(lambda f: colormap(norm(float(f))))
@@ -127,7 +128,7 @@ def draw_tree(
             hist_ax = inset_axes(ax, **default_hist_axes_kwargs)  # pyright: ignore
 
             hist_kwargs = {} if hist_kwargs is None else hist_kwargs
-            _, bins, patches = hist_ax.hist(features, **hist_kwargs)  # pyright: ignore
+            _, bins, patches = hist_ax.hist(values, **hist_kwargs)  # pyright: ignore
 
             for patch, b0, b1 in zip(  # pyright: ignore
                 patches, bins[:-1], bins[1:]  # pyright: ignore

{phylogenie-3.1.2 → phylogenie-3.1.3}/phylogenie/treesimulator/io/nexus.py

@@ -15,9 +15,9 @@ def _parse_translate_block(lines: Iterator[str]) -> dict[str, str]:
             if ";" in line:
                 return translations
             else:
-                raise ValueError(f"Invalid translate line: {line}")
+                raise ValueError(f"Invalid translate line. Expected '<num> <name>'.")
         translations[match.group(1)] = match.group(2)
-    raise ValueError("Translate block not terminated with ';'")
+    raise ValueError("Translate block not terminated with ';'.")
 
 
 def _parse_trees_block(lines: Iterator[str]) -> dict[str, Tree]:
@@ -33,9 +33,12 @@ def _parse_trees_block(lines: Iterator[str]) -> dict[str, Tree]:
             match = re.match(r"^TREE\s*\*?\s+(\S+)\s*=\s*(.+)$", line, re.IGNORECASE)
             if match is None:
                 raise ValueError(
-                    f"Invalid tree line. Expected 'TREE <name> = <newick>'"
+                    f"Invalid tree line. Expected 'TREE <name> = <newick>'."
                 )
-            trees[match.group(1)] = parse_newick(match.group(2), translations)
+            name = match.group(1)
+            if name in trees:
+                raise ValueError(f"Duplicate tree name found: {name}.")
+            trees[name] = parse_newick(match.group(2), translations)
     raise ValueError("Unterminated TREES block.")
 
 

phylogenie-3.1.3/phylogenie.egg-info/PKG-INFO

@@ -0,0 +1,101 @@
+Metadata-Version: 2.4
+Name: phylogenie
+Version: 3.1.3
+Summary: Add your description here
+Requires-Python: >=3.10
+Description-Content-Type: text/markdown
+License-File: LICENSE.txt
+Requires-Dist: joblib>=1.5.2
+Requires-Dist: matplotlib>=3.10.7
+Requires-Dist: pandas>=2.3.3
+Requires-Dist: pydantic>=2.12.3
+Requires-Dist: pyyaml>=6.0.3
+Requires-Dist: tqdm>=4.67.1
+Dynamic: license-file
+
+<p align="center">
+<img src="https://raw.githubusercontent.com/gabriele-marino/phylogenie/main/logo.png" style="width:100%; height:auto;"/>
+</p>
+
+---
+
+[![AliSim](https://img.shields.io/badge/Powered%20by-AliSim-orange?style=flat-square)](https://iqtree.github.io/doc/AliSim)
+[![PyPI version](https://img.shields.io/pypi/v/phylogenie)](https://pypi.org/project/phylogenie/)
+![Downloads](https://img.shields.io/pypi/dm/phylogenie)
+
+
+Phylogenie is a [Python](https://www.python.org/) package designed to easily simulate phylogenetic datasets—such as trees and multiple sequence alignments (MSAs)—with minimal setup effort. Simply specify the distributions from which your parameters should be sampled, and Phylogenie will handle the rest!
+
+## ✨ Features
+
+Phylogenie comes packed with useful features, including:
+
+- **Simulate tree and multiple sequence alignment (MSA) datasets from parameter distributions** 🌳🧬  
+  Define distributions over your parameters and sample a different combination of parameters for each dataset sample.
+
+- **Automatic metadata management** 🗂️  
+  Phylogenie stores each parameter combination sampled during dataset generation in a `.csv` file.
+
+- **Generalizable configurations** 🔄  
+  Easily apply the same configuration across multiple dataset splits (e.g., train, validation, test).
+
+- **Multiprocessing support** ⚙️💻  
+  Simply specify the number of cores to use, and Phylogenie handles multiprocessing automatically.
+
+- **Pre-implemented parameterizations** 🎯  
+  Include canonical, fossilized birth-death, epidemiological, birth-death with exposed-infectious (BDEI), birth-death with superspreading (BDSS), and contact tracing (CT).
+
+- **Skyline parameter support** 🪜  
+  Support for piece-wise constant parameters.
+
+- **Arithmetic operations on parameters** 🧮  
+  Perform flexible arithmetic operations between parameters directly within the config file.
+
+## 📦 Installation
+Phylogenie requires [Python](https://www.python.org/) 3.10 to be installed on your system. There are several ways to install Python and managing different Python versions. One popular option is to use [pyenv](https://github.com/pyenv/pyenv).
+
+Once you have Python set up, you can install Phylogenie directly from PyPI:
+
+```bash
+pip install phylogenie
+```
+
+Or install from source:
+```bash
+git clone https://github.com/gabriele-marino/phylogenie.git
+cd phylogenie
+pip install .
+```
+
+## 🛠 Backend dependency
+
+Phylogenie relies on [AliSim](https://iqtree.github.io/doc/AliSim) for simulating multiple sequence alignments (MSAs). AliSim is a powerful MSAs simulation tool distributed with [IQ-TREE](https://iqtree.github.io/), and requires separate installation to use it as a simulation backend.
+
+## 🚀 Quick Start
+
+Once you have installed Phylogenie, check out the [examples](https://github.com/gabriele-marino/phylogenie/tree/main/examples) folder.  
+It includes a collection of thoroughly commented configuration files, organized as a step-by-step tutorial. These examples will help you understand how to use Phylogenie in practice and can be easily adapted to fit your own workflow.
+
+For quick start, pick your favorite config file and run Phylogenie with:
+```bash
+phylogenie examples/config_file.yaml
+```
+This command will create the output dataset in the folder specified inside the configuration file, including data directories and metadata files for each dataset split defined in the config.
+
+>❗ *Tip*: Can’t choose just one config file?
+You can run them all at once by pointing Phylogenie to the folder! Just use: `phylogenie examples`. In this mode, Phylogenie will automatically find all `.yaml` files in the folder you specified and run for each of them!
+
+## 📖 Documentation
+
+- The [examples](https://github.com/gabriele-marino/phylogenie/tree/main/examples) folder contains many ready-to-use, extensively commented configuration files that serve as a step-by-step tutorial to guide you through using Phylogenie. You can explore them to learn how it works or adapt them directly to your own workflows.
+- A complete user guide and API reference are under development. In the meantime, feel free to [reach out](mailto:gabmarino.8601@email.com) if you have any questions about integrating Phylogenie into your workflows.
+
+## 📄 License
+
+This project is licensed under [MIT License](https://raw.githubusercontent.com/gabriele-marino/phylogenie/main/LICENSE.txt). 
+
+## 📫 Contact
+
+For questions, bug reports, or feature requests, please, consider opening an [issue on GitHub](https://github.com/gabriele-marino/phylogenie/issues), or [contact me directly](mailto:gabmarino.8601@email.com).
+
+If you need help with the configuration files, feel free to reach out —  I am always very available and happy to assist!

phylogenie-3.1.3/phylogenie.egg-info/SOURCES.txt

@@ -0,0 +1,44 @@
+LICENSE.txt
+README.md
+pyproject.toml
+phylogenie/__init__.py
+phylogenie/draw.py
+phylogenie/main.py
+phylogenie/mixins.py
+phylogenie/msa.py
+phylogenie/py.typed
+phylogenie/typeguards.py
+phylogenie/typings.py
+phylogenie.egg-info/PKG-INFO
+phylogenie.egg-info/SOURCES.txt
+phylogenie.egg-info/dependency_links.txt
+phylogenie.egg-info/entry_points.txt
+phylogenie.egg-info/requires.txt
+phylogenie.egg-info/top_level.txt
+phylogenie/generators/__init__.py
+phylogenie/generators/alisim.py
+phylogenie/generators/configs.py
+phylogenie/generators/dataset.py
+phylogenie/generators/factories.py
+phylogenie/generators/trees.py
+phylogenie/generators/typeguards.py
+phylogenie/io/__init__.py
+phylogenie/io/fasta.py
+phylogenie/skyline/__init__.py
+phylogenie/skyline/matrix.py
+phylogenie/skyline/parameter.py
+phylogenie/skyline/vector.py
+phylogenie/treesimulator/__init__.py
+phylogenie/treesimulator/features.py
+phylogenie/treesimulator/gillespie.py
+phylogenie/treesimulator/model.py
+phylogenie/treesimulator/tree.py
+phylogenie/treesimulator/utils.py
+phylogenie/treesimulator/events/__init__.py
+phylogenie/treesimulator/events/base.py
+phylogenie/treesimulator/events/contact_tracing.py
+phylogenie/treesimulator/events/core.py
+phylogenie/treesimulator/events/mutations.py
+phylogenie/treesimulator/io/__init__.py
+phylogenie/treesimulator/io/newick.py
+phylogenie/treesimulator/io/nexus.py

phylogenie-3.1.3/phylogenie.egg-info/dependency_links.txt

@@ -0,0 +1 @@
+

phylogenie-3.1.3/phylogenie.egg-info/entry_points.txt

@@ -0,0 +1,2 @@
+[console_scripts]
+phylogenie = phylogenie.main:main

phylogenie-3.1.3/phylogenie.egg-info/requires.txt

@@ -0,0 +1,6 @@
+joblib>=1.5.2
+matplotlib>=3.10.7
+pandas>=2.3.3
+pydantic>=2.12.3
+pyyaml>=6.0.3
+tqdm>=4.67.1

phylogenie-3.1.3/phylogenie.egg-info/top_level.txt

@@ -0,0 +1 @@
+phylogenie

phylogenie-3.1.3/pyproject.toml

@@ -0,0 +1,32 @@
+[project]
+name = "phylogenie"
+version = "3.1.3"
+description = "Add your description here"
+readme = "README.md"
+requires-python = ">=3.10"
+dependencies = [
+    "joblib>=1.5.2",
+    "matplotlib>=3.10.7",
+    "pandas>=2.3.3",
+    "pydantic>=2.12.3",
+    "pyyaml>=6.0.3",
+    "tqdm>=4.67.1",
+]
+
+[tool.pyright]
+typeCheckingMode = "strict"
+
+[project.scripts]
+phylogenie = "phylogenie.main:main"
+
+[build-system]
+requires = ["setuptools>=42"]
+build-backend = "setuptools.build_meta"
+
+[dependency-groups]
+dev = [
+    "joblib-stubs>=1.5.2.0.20250831",
+    "pandas-stubs>=2.3.2.250926",
+    "pyright>=1.1.407",
+    "pytest>=8.4.2",
+]

phylogenie-3.1.3/setup.cfg

@@ -0,0 +1,4 @@
+[egg_info]
+tag_build = 
+tag_date = 0
+

phylogenie-3.1.2/pyproject.toml

@@ -1,32 +0,0 @@
-[tool.poetry]
-name = "phylogenie"
-version = "3.1.2"
-description = "Generate phylogenetic datasets with minimal setup effort"
-authors = ["Gabriele Marino <gabmarino.8601@gmail.com>"]
-readme = "README.md"
-
-[tool.poetry.dependencies]
-python = "^3.10"
-
-joblib = "^1.4.2"
-matplotlib = "^3.10.6"
-pandas = "^2.2.2"
-pydantic = "^2.11.5"
-pyyaml = "^6.0.2"
-tqdm = "^4.66.4"
-
-[tool.poetry.group.dev.dependencies]
-joblib-stubs = "^1.5.0.1.20250510"
-pandas-stubs = "^2.3.0.250703"
-pyright = "^1.1.402"
-pytest = "^8.3.5"
-
-[tool.poetry.scripts]
-phylogenie = "phylogenie.main:main"
-
-[tool.pyright]
-typeCheckingMode = "strict"
-
-[build-system]
-requires = ["poetry-core"]
-build-backend = "poetry.core.masonry.api"