phylogenie 1.0.6__py3-none-any.whl → 1.0.8__py3-none-any.whl

phylogenie/backend/remaster/generate.py

@@ -24,7 +24,7 @@ def _beautify_xml(xml: bytes) -> str:
 
 def _generate_config_file(
     output_xml_file: str,
-    tree_file_name: str,
+    tree_filename: str,
     populations: list[str],
     init_values: list[int],
     sample_population: str,
@@ -85,7 +85,7 @@ def _generate_config_file(
     simulate.append(trajectory)
 
     logger = Element(
-        "logger", {"spec": "Logger", "mode": "tree", "fileName": tree_file_name}
+        "logger", {"spec": "Logger", "mode": "tree", "fileName": tree_filename}
     )
     logger.append(
         Element(
@@ -140,7 +140,7 @@ def _postprocess_tree(input_file: str, output_file: str, attributes: list[str])
 
 
 def generate_trees(
-    tree_file_name: str,
+    tree_filename: str,
     populations: str | list[str] = DEFAULT_POPULATION,
     init_population: str = DEFAULT_POPULATION,
     sample_population: str = SAMPLE_POPULATION,
@@ -158,14 +158,14 @@ def generate_trees(
     init_values[populations.index(init_population)] = 1
 
     if output_xml_file is None:
-        xml_file = f"{tree_file_name}-temp.xml"
+        xml_file = f"{tree_filename}-temp.xml"
     else:
         xml_file = output_xml_file
 
-    temp_tree_file = f"{tree_file_name}-temp.nex"
+    temp_tree_filename = f"{tree_filename}-temp.nex"
     _generate_config_file(
         output_xml_file=xml_file,
-        tree_file_name=temp_tree_file,
+        tree_filename=temp_tree_filename,
         populations=populations,
         init_values=init_values,
         sample_population=sample_population,
@@ -181,7 +181,7 @@ def generate_trees(
     cmd.append(xml_file)
     subprocess.run(cmd, check=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
 
-    _postprocess_tree(temp_tree_file, tree_file_name, ["type", "time"])
+    _postprocess_tree(temp_tree_filename, tree_filename, ["type", "time"])
     if output_xml_file is None:
         subprocess.run(["rm", xml_file], check=True)
-    subprocess.run(["rm", temp_tree_file], check=True)
+    subprocess.run(["rm", temp_tree_filename], check=True)

phylogenie/backend/treesimulator.py

@@ -101,6 +101,7 @@ def generate_tree(
     )
     for i, leaf in enumerate(tree.iter_leaves()):
         state: str = getattr(leaf, STATE)
+        delattr(leaf, STATE)
         date = tree.get_distance(leaf)
         leaf.name = f"{i}|{state}|{date}"
     save_forest([tree], output_file)

phylogenie/core/msas/base.py

@@ -1,6 +1,7 @@
 import os
 from abc import abstractmethod
 from enum import Enum
+from pathlib import Path
 from typing import Literal
 
 from numpy.random import Generator
@@ -14,9 +15,14 @@ class BackendType(str, Enum):
     ALISIM = "alisim"
 
 
+MSAS_DIRNAME = "MSAs"
+TREES_DIRNAME = "trees"
+
+
 class MSAsGenerator(DatasetGenerator):
     data_type: Literal[DataType.MSAS] = DataType.MSAS
     trees: TreesGeneratorConfig
+    keep_trees: bool = False
 
     @abstractmethod
     def _generate_one_from_tree(
@@ -24,11 +30,22 @@ class MSAsGenerator(DatasetGenerator):
     ) -> None: ...
 
     def _generate_one(self, filename: str, rng: Generator, data: pgt.Data) -> None:
-        tree_filename = f"{filename}.temp-tree"
+        if self.keep_trees:
+            base_dir = Path(filename).parent
+            file_id = Path(filename).stem
+            tree_filename = os.path.join(base_dir, TREES_DIRNAME, file_id)
+            msas_dir = os.path.join(base_dir, MSAS_DIRNAME)
+            os.makedirs(msas_dir, exist_ok=True)
+            msa_filename = os.path.join(msas_dir, file_id)
+        else:
+            tree_filename = f"{filename}.temp-tree"
+            msa_filename = filename
+
         self.trees.generate_one(
             filename=tree_filename, data=data, seed=int(rng.integers(0, 2**32 - 1))
         )
         self._generate_one_from_tree(
-            filename=filename, tree_file=f"{tree_filename}.nwk", rng=rng, data=data
+            filename=msa_filename, tree_file=f"{tree_filename}.nwk", rng=rng, data=data
         )
-        os.remove(f"{tree_filename}.nwk")
+        if not self.keep_trees:
+            os.remove(f"{tree_filename}.nwk")

phylogenie/core/trees/remaster/generator.py

@@ -51,7 +51,7 @@ class ReMASTERGenerator(TreesGenerator):
         self, filename: str, rng: Generator, data: pgt.Data, reactions: list[Reaction]
     ) -> None:
         generate_trees(
-            tree_file_name=f"{filename}.nwk",
+            tree_filename=f"{filename}.nwk",
             populations=self.populations,
             init_population=self.init_population.format(**data),
             sample_population=self.sample_population,

{phylogenie-1.0.6.dist-info → phylogenie-1.0.8.dist-info}/METADATA

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

{phylogenie-1.0.6.dist-info → phylogenie-1.0.8.dist-info}/RECORD

@@ -1,9 +1,9 @@
 phylogenie/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 phylogenie/backend/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 phylogenie/backend/remaster/__init__.py,sha256=g1oMKi6SX60Geq_e2AjBlf7-pDvLfrsT3gW6AORdbMo,509
-phylogenie/backend/remaster/generate.py,sha256=Sb5izUQO0GmUcIEMoXtHWLsh9c4vIeyNIUm7u4RVLdw,6100
+phylogenie/backend/remaster/generate.py,sha256=jDtcZyi6ifptRopeuGCHETzVz_NyK4UC3HiNPwQPzbg,6109
 phylogenie/backend/remaster/reactions.py,sha256=oc2ZY9WtTajbOWjARDmA0JnS255tbVeMt1DmyCUp95M,5904
-phylogenie/backend/treesimulator.py,sha256=6yoOnVXcNatw3jBfuTgOrJ56out9-dNRlcTH83iiqZ0,5440
+phylogenie/backend/treesimulator.py,sha256=pJmSX_0EOFngJTCxh36qTap1llYIZq4p9azQ9PIjlo4,5469
 phylogenie/configs.py,sha256=HtRUWZ-zNq1--zTBWL3QFXX27Ybw5x1qSWcmx7Sz8YA,125
 phylogenie/core/__init__.py,sha256=pvQMohKFAPaSvujw7H5sQJn7SOSqENQUHECuVfUBVNg,402
 phylogenie/core/configs.py,sha256=9tUYWrmdDn_Gg6xnywCDcGDEk0gne0vYqFH9dXixJbM,1042
@@ -15,13 +15,13 @@ phylogenie/core/dataset.py,sha256=mgPAexXTat6x7YB9-BI6d5HWwrAvt8xydmiWVzwVD3M,24
 phylogenie/core/factories.py,sha256=DwuocGd48Ham7wD7uyGnGA0tHvXhzuP1Ji0PW5-onwM,7397
 phylogenie/core/msas/__init__.py,sha256=-2XjTmiTA6zAwiLs2ksKecCrSbNLheo7KKjDyvuLipg,207
 phylogenie/core/msas/alisim.py,sha256=TG4LAHJaH3rGWa3cwXzX6MgaXuh2tLzhdoALyOkoiXY,1047
-phylogenie/core/msas/base.py,sha256=OaGYxSmlARWy531g-lkPFgg5CcMCUQw8-SXUQc8mlRs,1042
+phylogenie/core/msas/base.py,sha256=Mw7bI4PU7J4b5mrsd0kMkJVJk7bqmJQZFtZ91I8oRS0,1597
 phylogenie/core/trees/__init__.py,sha256=epKgJ-EI04kBEuS4kfBcnsAj7dMObT1T742peBAnB78,335
 phylogenie/core/trees/base.py,sha256=sNBCJRtWGYaMog4WoyAkrK4F2SXrgjXrxjuVQ6Ae5Js,305
 phylogenie/core/trees/remaster/__init__.py,sha256=FfgXYjkeosb22Anbp78re2NssWtNcNNaj7hFQZx8JLE,116
 phylogenie/core/trees/remaster/configs.py,sha256=d4EqowYMb5I2TfBTgNf9H_X1t8aNCYJbh1RQmFoDxs4,362
 phylogenie/core/trees/remaster/factories.py,sha256=qla4pg4OgfE5lwQZuP3bEaMt7xIF4P6fQ1Z0IPpFxUs,812
-phylogenie/core/trees/remaster/generator.py,sha256=LZTnNHZej6E1QakTBaBwRQQRaeb6rfG61U61bGbgE5Y,7260
+phylogenie/core/trees/remaster/generator.py,sha256=UJO9ymxHE3lS62RgyJ-cS2Tc_RbHgxeGggx_Ses6k4Q,7259
 phylogenie/core/trees/treesimulator.py,sha256=RpyRvXAHLHEOU9Ub9Yg61au7xP_rnbC7N0va43gbbx8,7319
 phylogenie/core/typeguards.py,sha256=wEBYJZZ_Q_bY7ZJSh00AXJeyc1X8ZoysoOiLwo24N1w,990
 phylogenie/main.py,sha256=n_joau3dWJIq0ZMHe4a_1_2GigTFagkfzUFuQEMlyRI,1158
@@ -32,8 +32,8 @@ phylogenie/skyline/parameter.py,sha256=CJ5OEyRQG2Tg1WJWQ1IpfX-6hjJv80Zj8lMoRke5n
 phylogenie/skyline/vector.py,sha256=Zh6HWoziXQFKDz-XvVE2e_Tw1706NrbwcvBpyPpw_cc,7120
 phylogenie/typeguards.py,sha256=WBOSJSaOC8VDtrYoA2w_AYEXTpyKdCfmsM29KaKXl3A,1350
 phylogenie/typings.py,sha256=93VRedBxrpzXkT4uaNu_1JiMzsOjp7fUy4kLv_eYxUE,565
-phylogenie-1.0.6.dist-info/LICENSE.txt,sha256=NUrDqElK-eD3I0WqC004CJsy6cs0JgsAoebDv_42-pw,1071
-phylogenie-1.0.6.dist-info/METADATA,sha256=zJP0tUUe17qjUcUVSeM8y3-7ng9e9R54W_phEVIGpgE,6291
-phylogenie-1.0.6.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-phylogenie-1.0.6.dist-info/entry_points.txt,sha256=Rt6_usN0FkBX1ZfiqCirjMN9FKOgFLG8rydcQ8kugeE,51
-phylogenie-1.0.6.dist-info/RECORD,,
+phylogenie-1.0.8.dist-info/LICENSE.txt,sha256=NUrDqElK-eD3I0WqC004CJsy6cs0JgsAoebDv_42-pw,1071
+phylogenie-1.0.8.dist-info/METADATA,sha256=eEc-ZuAO-y2SKsjHYxqSxRwqMYZ4Y_Hr8wzk49x9I4k,6291
+phylogenie-1.0.8.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+phylogenie-1.0.8.dist-info/entry_points.txt,sha256=Rt6_usN0FkBX1ZfiqCirjMN9FKOgFLG8rydcQ8kugeE,51
+phylogenie-1.0.8.dist-info/RECORD,,