diff --git a/main/como/__init__.py b/main/como/__init__.py index 05100d09..f92ebf4b 100644 --- a/main/como/__init__.py +++ b/main/como/__init__.py @@ -4,7 +4,7 @@ from como.utils import stringlist_to_list __all__ = ["stringlist_to_list", "Config"] -__version__ = "1.10.0" +__version__ = "1.11.0" def return_placeholder_data() -> pd.DataFrame: diff --git a/main/como/create_context_specific_model.py b/main/como/create_context_specific_model.py index 2628eac3..f6ac8b91 100644 --- a/main/como/create_context_specific_model.py +++ b/main/como/create_context_specific_model.py @@ -308,9 +308,16 @@ def _build_with_imat( expr_vector: npt.NDArray, expr_thesh: tuple[float, float], force_gene_ids: Sequence[int], + solver: str, ) -> (cobra.Model, pd.DataFrame): expr_vector = np.array(expr_vector) - properties = IMATProperties(exp_vector=expr_vector, exp_thresholds=expr_thesh, core=force_gene_ids, epsilon=0.01) + properties = IMATProperties( + exp_vector=expr_vector, + exp_thresholds=expr_thesh, + core=force_gene_ids, + epsilon=0.01, + solver=solver.upper(), + ) algorithm = IMAT(s_matrix, np.array(lb), np.array(ub), properties) context_rxns: npt.NDArray = algorithm.run() fluxes: pd.Series = algorithm.sol.to_series() @@ -419,7 +426,6 @@ def _build_model( # noqa: C901 force excluded even if they meet GPR association requirements using the force exclude file. """ config = Config() - cobra.Configuration().solver = solver.lower() reference_model: cobra.Model match general_model_file.suffix: case ".mat": @@ -508,7 +514,14 @@ def _build_model( # noqa: C901 elif recon_algorithm == Algorithm.IMAT: context_model_cobra: cobra.Model context_model_cobra, flux_df = _build_with_imat( - reference_model, s_matrix, lb, ub, expr_vector, exp_thresh, idx_force + reference_model, + s_matrix, + lb, + ub, + expr_vector, + exp_thresh, + idx_force, + solver=solver, ) imat_reactions = flux_df.rxn model_reactions = [reaction.id for reaction in context_model_cobra.reactions] diff --git a/pyproject.toml b/pyproject.toml index 2c6d42c5..2f4fdb2f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -17,8 +17,8 @@ dependencies = [ "openpyxl>=3.1.5", "aiofiles>=24.1.0", "aioftp>=0.23.1", - "troppo", - "cobamp", + "troppo@git+https://github.com/JoshLoecker/troppo@master", + "cobamp@git+https://github.com/JoshLoecker/cobamp@master", ] [build-system] @@ -46,7 +46,3 @@ dev-dependencies = [ "hypothesis>=6.122.1", "pytest-cov>=6.0.0", ] - -[tool.uv.sources] -troppo = { git = "https://github.com/JoshLoecker/troppo", rev = "update_dependencies" } -cobamp = { git = "https://github.com/JoshLoecker/cobamp", rev = "update_packages" }