Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 41 additions & 4 deletions src/piqtree2/_app/__init__.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,46 @@
"""cogent3 apps for piqtree2."""

from typing import Optional, Union

import cogent3
import cogent3.app.typing
from cogent3.app.composable import define_app
from cogent3.util.misc import extend_docstring_from

from piqtree2 import TreeGenMode, build_tree, fit_tree, random_trees
from piqtree2.model import Model


@define_app
@extend_docstring_from(build_tree)
def piqtree_phylo(
aln: Union[cogent3.Alignment, cogent3.ArrayAlignment],
model: Model,
rand_seed: Optional[int] = None,
) -> Union[cogent3.PhyloNode, cogent3.app.typing.SerialisableType]:
return build_tree(aln, model, rand_seed)


@define_app
@extend_docstring_from(fit_tree)
def piqtree_fit(
aln: Union[cogent3.Alignment, cogent3.ArrayAlignment],
tree: cogent3.PhyloNode,
model: Model,
rand_seed: Optional[int] = None,
) -> Union[cogent3.PhyloNode, cogent3.app.typing.SerialisableType]:
return fit_tree(aln, tree, model, rand_seed)


@define_app
@extend_docstring_from(random_trees)
def piqtree_random_trees(
num_taxa: int,
tree_mode: TreeGenMode,
num_trees: int,
rand_seed: Optional[int] = None,
) -> tuple[cogent3.PhyloNode]:
return random_trees(num_taxa, tree_mode, num_trees, rand_seed)

from piqtree2.iqtree import build_tree, fit_tree, random_trees

piqtree_phylo = define_app(build_tree)
piqtree_fit = define_app(fit_tree)
piqtree_random_trees = define_app(random_trees)
_ALL_APP_NAMES = ["piqtree_phylo", "piqtree_fit", "piqtree_random_trees"]
11 changes: 11 additions & 0 deletions tests/test_app/test_pickle.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
"""Apps must be pickleable to be able to be run with parallel=True"""

import pickle

from cogent3 import get_app
from piqtree2._app import _ALL_APP_NAMES


def test_pickle():
for app_name in _ALL_APP_NAMES:
assert len(pickle.dumps(get_app(app_name))) > 0