Skip to content
Draft
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

## Unreleased

* The experimental data (`load_experiment_data`, `ExperimentData`, `FluxData`, `load_flux_data`), the simulation of a condition (`simulate_conditions`) and its distance to the measurements (`experiment_distance`, `compute_carbon_weights`) are in `raven_toolbox.experiments`; geckopy imports them and `geckopy.databases` still exports `FluxData` and `load_flux_data`. `load_experiment_data` takes the data folder instead of the adapter. The evotune functions take `experiment_data` (was `evotune_data`) and `max_growth` (was `max_grate`), `FluxData.weight` is the per-condition weight (was `evotune_rmse_weight`) and the file column is `weight` (was `evotuneRMSEweight`, which now raises an error naming the new column). The files are `fluxData.tsv`, `maxGrowth.tsv` and `zeroFlux.tsv` (were `evotuneFluxData.tsv`, `evotuneMaxGrowth.tsv` and `evotuneZeroExch.tsv`); in the tutorial `fluxData.tsv` holds the condition of the protein step as its first row, with weight 0.
* `apply_flux_data_constraints` takes the constraint logic from `raven_toolbox.experiments.apply_flux_data_constraints` and keeps the adapter defaults for `bio_rxn` and `c_source`.
* `geckopy.solver_support` is removed. Its functions are in `raven_toolbox.utils.solver` (`optimize_model`, `repair_scipy_problem`, `switch_to_scipy`, `edit_on_fast_solver`, `fast_solver_while_building`, `is_scipy_interface`, `constraint_shadow_prices`).
* `calculate_mw`, `find_met_smiles` and `met_smiles` are in raven-toolbox (`raven_toolbox.utils.protein` and `raven_toolbox.annotation`) and `geckopy.databases` exports them from there. `find_met_smiles` needs `cache_path`; it no longer defaults to `data/smilesDB.tsv` of the adapter.
* `kcat_evidence` shows, for selected reactions, the kcat of every source file next to the kcat of the model and, for a tuned kcat, the kcat before tuning. The reactions are selected by name (`rxns`), by enzyme (`enzymes`, for example the enzymes that `flexibilize_enz_concs` relaxed) or by the result of `sensitivity_tuning` (`tuned`); `compute=["ec_tree"]` adds the EC-tree estimate without a source file. `kcats_for_reactions` gets the kcats of every source for a few reactions, computes the EC-tree estimate and, with `okp`, predicts them with one, several or all OpenKineticsPredictor methods. `kcats_from_okp` has `job_tag`, which keeps a job for a few reactions apart from the job of all reactions: it has its own job, input and result files. GECKO has `kcatEvidence`, `kcatsForReactions` and the `jobTag` option of `kcatsFromOKP`.
* `kcats_from_ec_tree` marks a reverse direction (`_REV`) in `detail` with `direction=reverse`. The estimate depends on the EC number only, as BRENDA measurements have no direction, so the reverse direction has the value of the forward direction. GECKO's `kcatsFromECTree` does the same.
* `load_uniprot_tsv` always splits a gene cell of uniprot.tsv with several gene names, separated by semicolons and/or whitespace (`YPR080W; YBR118W`), into one row per gene name; the other columns are repeated on every row and an empty cell stays one row. A model gene that is any of the names finds the entry. The `split_gene_cells` option is removed. GECKO's `loadDatabases` does the same.
Expand Down
6 changes: 3 additions & 3 deletions src/geckopy/databases/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@
load_complex_portal_json,
)
from .dlkcat_ignore_lists import DLKcatIgnoreLists, load_dlkcat_ignore_lists
from .flux_data import FluxData, load_flux_data
from raven_toolbox.annotation import find_met_smiles, met_smiles
from raven_toolbox.experiments import FluxData, load_flux_data
from raven_toolbox.utils.protein import calculate_mw
from .kegg_download import download_kegg
from .kegg_loader import KeggDB, load_kegg_tsv
from .mw import calculate_mw
from .pax_db_loader import ProtData, load_pax_db
from .phyl_dist import PhylDist, download_phyl_dist, load_phyl_dist
from .prot_data_loader import load_prot_data
from .pubchem import find_met_smiles, met_smiles
from .uniprot_download import download_uniprot
from .uniprot_loader import UniprotDB, load_uniprot_tsv

Expand Down
255 changes: 0 additions & 255 deletions src/geckopy/databases/flux_data.py

This file was deleted.

2 changes: 1 addition & 1 deletion src/geckopy/databases/kegg_download.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

import requests

from .mw import calculate_mw
from raven_toolbox.utils.protein import calculate_mw

logger = logging.getLogger(__name__)

Expand Down
Loading