Skip to content

New msmodelutl #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 231 commits into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
231 commits
Select commit Hold shift + click to select a range
6931107
kinetics and uptake Notebooks
Sep 16, 2021
aa8f92c
FBAHelper unit-test corection
Sep 17, 2021
8b0dad1
Merge branch 'main' of https://github.com/freiburgermsu/ModelSEEDpy i…
Sep 17, 2021
7b009ce
FBAHelper unit-test corection
Sep 17, 2021
2195d77
drafting the dFBA package and Notebook example
Sep 21, 2021
35b0a88
drafting the dFBA package and Notebook example
Sep 22, 2021
bb8ac28
dFBA package with legacy BaseFBAPkg logic
Sep 22, 2021
3c02844
final dFBA package logic and Notebook
Sep 22, 2021
f368354
dFBA unit-test
Sep 23, 2021
8358e28
resolve merge conflicts
Apr 27, 2022
ea59cf5
MSCommunity model+examples, MSmodel pyEDA load, and MScompatibility
May 4, 2022
b331918
MScompatibility clarification and polishing
May 5, 2022
98f07f2
Merge branch 'main' into main
freiburgermsu May 5, 2022
0b2e148
MScompatibility finalization and Biohem utils simplification
May 5, 2022
0a04b43
Merge branch 'main' of https://github.com/freiburgermsu/ModelSEEDpy i…
May 5, 2022
bb3f1f8
MScompatibility finalization and Biohem utils simplification
May 5, 2022
8533c77
polishing for PR
May 5, 2022
c376228
MSCompatibility Notebook
May 5, 2022
2a0c3c6
MSCompatibility standardize_MSD patch
May 5, 2022
6dd1cd7
quick fix
May 5, 2022
048e903
dFBA draft module and preliminary Notebooks and unit-test
May 6, 2022
77314b1
dFBA script and unit-test
May 6, 2022
793440e
dFBApkg script adjustment, with operational Notebooks
May 7, 2022
b983a47
dFBA docs and minor edits of dFBAand its Notebooks
May 7, 2022
7e7bc94
API docs and ReadTheDocs assemblage
May 10, 2022
3e0c11d
docs correction
May 10, 2022
6c34c89
docs correction
May 10, 2022
6782a62
docs correction
May 10, 2022
5b37bf5
index copied to the docs root directory
May 10, 2022
f0110bd
update the documentation
May 10, 2022
82cf3d1
Update README.rst
freiburgermsu May 10, 2022
8ba4763
Update index.rst
freiburgermsu May 10, 2022
0efba14
update the docs indices
May 10, 2022
68eac9a
update the docs indices and associated edits to resolve bugs
May 10, 2022
4be7691
MSCompatibility updates
May 11, 2022
c299c8c
MSCompatibility edits
May 13, 2022
6f0638d
operational draft of MSCompatibility
May 13, 2022
2f6bf9a
updated draft of MSCompatibility
May 13, 2022
b5ced18
Merge branch 'main' into main
freiburgermsu May 13, 2022
5e9edc1
refined draft, with extended functionality, of MSCompatibility
May 14, 2022
205cbb6
Merge branch 'main' of https://github.com/freiburgermsu/ModelSEEDpy i…
May 14, 2022
3a5419d
export functionality of MSCompatibility and examples files
May 14, 2022
c8b116e
network visualization and associated features for MSCommunity +reorga…
May 15, 2022
289fac2
dFBA metabolite variables draft
May 15, 2022
7f0d15f
metabolites variables draft dFBA and LPfile
May 16, 2022
711b948
MSCompatibility fix and updated zip file
May 16, 2022
69a9f03
MSCompatibility polishing
May 16, 2022
e8e62ac
chemostat dFBA
May 20, 2022
d857e99
docs update
May 21, 2022
07c4495
docs update
May 21, 2022
51aeab7
docs update
May 21, 2022
75558ec
docs update
May 21, 2022
d1a4bd3
documentation and associated polishing
May 24, 2022
22015f2
documentation and associated polishing
May 24, 2022
ffad568
fbapkg documentation and associated polishing
May 25, 2022
376b914
reindexing the docs pages
May 25, 2022
1accfbb
polishing the existing docs drafts
May 25, 2022
a8a7e1f
README updates
May 25, 2022
805d262
Update README.rst
freiburgermsu May 25, 2022
16ba18b
core documentation
May 27, 2022
d34a204
API doc updates and Julia tests
Jun 7, 2022
47a53fd
corrected modules and Julia comparison
freiburgermsu Jun 7, 2022
1816363
expand the core_index RST
freiburgermsu Jun 8, 2022
b32283c
remove MSmodelutils from the FBAPkg directory
freiburgermsu Jun 8, 2022
5a4d617
docs, package edits, and organization
Jun 10, 2022
d3d4b0d
minor edits for TRAVIS
Jun 10, 2022
64188e8
passing unit tests
Jun 10, 2022
8a73a19
docs updates before upstream fetch
Jun 11, 2022
1203d06
merged with Chris' MSCommunity in the core directory
Jun 11, 2022
b77a3c0
docs and removed self-referential import in requirements
Jun 13, 2022
25c3817
Update requirements.txt
freiburgermsu Jun 13, 2022
6305e11
remove versions from requirement.txt, ReadTheDocs
freiburgermsu Jun 13, 2022
2034e50
RSTedits for improves ReadTheDocs
Jun 13, 2022
635671d
Merge branch 'main' of https://github.com/freiburgermsu/ModelSEEDpy i…
Jun 13, 2022
7b8f434
docs indices were updated
Jun 13, 2022
4c3089e
final core docs drafts
Jun 13, 2022
289f843
operational code logic
Jun 13, 2022
a78f31e
republicized function names, main setup path, and relocated requireme…
Jun 13, 2022
6c6cbac
reverted revisions
Jun 15, 2022
cf4c659
improved revisions
Jun 15, 2022
46b732b
improved revisions
Jun 15, 2022
c10d52d
community and FBAHelper additions
Jun 20, 2022
840cada
dfbapkg minor edit
Jun 20, 2022
ab6ea1d
exceptions file and dfba edits
Jun 22, 2022
83a69fa
Merge branch 'main' into MSmain
freiburgermsu Jun 22, 2022
b786d4d
Merge pull request #2 from freiburgermsu/MSmain
freiburgermsu Jun 22, 2022
17b7270
concessions for modelseed PR
Jun 22, 2022
6f0c7b3
edits for modelseed PR
Jun 22, 2022
817dd0d
mild edits for main PR
Jun 22, 2022
fb85f4f
Merge pull request #3 from freiburgermsu/MSmain
freiburgermsu Jun 22, 2022
2c5a668
Merge branch 'main' of https://github.com/freiburgermsu/ModelSEEDpy i…
Jun 22, 2022
54fafd2
exceptions and gapfill concession
Jun 25, 2022
0bc147e
Merge branch 'main' into minor_edits
freiburgermsu Jun 26, 2022
0569deb
Merge pull request #4 from freiburgermsu/minor_edits
freiburgermsu Jun 26, 2022
d363e2a
parse_df update to proper np.arrays
Jun 28, 2022
8c5a1b7
fbahelper polishing
Jun 29, 2022
3a12c5f
fbahelper polishing
Jun 29, 2022
071f6ed
fbahelper polishing
Jun 30, 2022
a0d7651
exceptions expansion
Jul 1, 2022
15da667
msmodelutl edits
Jul 2, 2022
06f2059
inital commit
Jul 2, 2022
f2f506e
msmodelutls polishing
Jul 2, 2022
4233e7d
msmodelutls polishing
Jul 2, 2022
0a470ab
exceptions.py expansion
Jul 2, 2022
1a2cb2e
rearrange the fullthermo functions
Jul 2, 2022
4db116e
initial commit
Jul 3, 2022
2887451
polishing edits
Jul 3, 2022
cba1857
polishing edits
Jul 3, 2022
6d0ac62
polishing edits
Jul 3, 2022
0f4c708
polishing edits
Jul 3, 2022
fd4fd01
polishing edits
Jul 3, 2022
df41110
initial ocmmit
Jul 3, 2022
f5dbca0
initial ocmmit
Jul 3, 2022
83e2dd3
initial ocmmit
Jul 3, 2022
164e74d
initial ocmmit
Jul 3, 2022
86886ab
polishing edits
Jul 3, 2022
9eeba64
initial commit
Jul 3, 2022
fbf93ab
polishing edits
Jul 3, 2022
be38dfb
polishing edits
Jul 3, 2022
55842d8
docs and example integration
Jul 4, 2022
76b331e
restoration of the source docs directory
Jul 4, 2022
60ebd46
update the requirements TXTfor ReadTheDaocs
Jul 4, 2022
45aa534
adjust the autoAPI import for ReadTheDaocs
Jul 4, 2022
e72710b
comment-out logic for autogeneration of documentation
Jul 4, 2022
ef7602e
move index to the main docs page
Jul 4, 2022
ea4a4be
ReadTheDocs YAML addition
Jul 4, 2022
dacfb34
slimmed requirements and deleted redundant index file
Jul 4, 2022
8d8d351
removed readthedocs.yaml file
Jul 4, 2022
4918b5f
restored readthedocs.yaml file and blank line in toctree
Jul 4, 2022
913e7ca
adjust docs index and add Notebook extensions to stimulate.rst
Jul 4, 2022
7c20aae
docs dorrections
Jul 4, 2022
c8ecf0f
relocate simulate_nb and justified case-sensitive directory references
Jul 4, 2022
dd92d54
docs updates and polishing
Jul 4, 2022
5eaace9
polishing Notebooks
Jul 4, 2022
8d110a3
polishing Notebooks
Jul 4, 2022
596647f
polishing Notebooks
Jul 4, 2022
55ed5d8
API includehidden tag
Jul 4, 2022
a9644a4
updated docs and associated examples for the docs
Jul 4, 2022
2b5ab2e
webinar links
Jul 4, 2022
183d852
Merge branch 'main' into docs_examples
freiburgermsu Jul 4, 2022
12d4428
Merge pull request #5 from freiburgermsu/docs_examples
freiburgermsu Jul 4, 2022
a6d3251
update docs and examples
Jul 4, 2022
5bf9ceb
update docs and examples
Jul 4, 2022
024df9d
Update index.ipynb
freiburgermsu Jul 6, 2022
8c50dd1
API landing page update
Jul 9, 2022
113ed34
Merge branch 'main' of https://github.com/freiburgermsu/ModelSEEDpy i…
Jul 9, 2022
06a37bc
API landing update and lowercase API titles
Jul 10, 2022
4456cc5
update toctree spacing in API landing
Jul 10, 2022
49482a1
final API landing update
Jul 10, 2022
458b433
final API landing update
Jul 10, 2022
f264162
headers for API landing
Jul 10, 2022
899c75c
Merge pull request #75 from ModelSEED/dev
Fxe Jul 12, 2022
341d497
MSCommFitting API docs and community docs polishing
Jul 16, 2022
5775122
MSCommFitting API docs and community docs polishing
Jul 16, 2022
aeff93c
MSCommFitting added to the community index
Jul 16, 2022
1c7f924
removed individual directory indices
Jul 16, 2022
e945cdf
exceptions update and setup correction to permit downloads
Jul 23, 2022
b318242
msmodelutl polishing
Jul 23, 2022
019a4f7
revert multi-statement line and logger location
freiburgermsu Jul 23, 2022
dc6398d
MSCommunity and edits associated with SMETANA
Jul 27, 2022
ee62e47
merge conflicts
Jul 27, 2022
e981352
MSCommunity debugging
Jul 27, 2022
7a79a14
MSCommunity debugging and FBAHelper expansion
Jul 27, 2022
7853210
MSCommunity debugging
Jul 28, 2022
8f4f8c7
MSCommunity debugging and Utility function additions
Aug 3, 2022
ee63e1a
MSCommunity and FBAHelper edits
Aug 4, 2022
d6dd6d5
MSCommunity, MSCompatability, and associated edits
Aug 5, 2022
5314b5a
community edits
Aug 6, 2022
78ba26e
community minimal media determination and edits towards MSCompatibili…
Aug 13, 2022
78a8290
community minimal media Janga combinations/permutations for optimal m…
Aug 13, 2022
824caea
community minimal media Janga combinations/permutations for optimal m…
Aug 13, 2022
3cda707
discriminating the permutations for community minimal media
Aug 14, 2022
673017e
OptlangHelper class for constructing Optlang models as dictionaries (…
Aug 15, 2022
49953ad
draft of MinimalMedia object and associated edits
Aug 16, 2022
bbb0eda
FBAHelper functions and clarifying BaseFBA edits for MinimalMedia
Aug 16, 2022
1788279
MSCompibility edits
Aug 17, 2022
228ec35
MSCompibility edits
Aug 17, 2022
d3b3b36
MSCompibility edits
Aug 17, 2022
8533b1c
MSCompibility and MSCommunity edits
Aug 18, 2022
eb7a636
MSCompibility staticmethod completion and the associated updates to t…
Aug 19, 2022
d77b5af
FBAHelper edits
freiburgermsu Aug 23, 2022
7a68ad2
FBAHelper merge conflict
freiburgermsu Aug 23, 2022
c4b0ae4
MSCompatibility edits
freiburgermsu Aug 24, 2022
c9a43b9
MSCompatilibity and MSCommunity edits
Aug 25, 2022
77e92b5
MSCompatilibity merge correction
Aug 25, 2022
59d66df
MSCompatilibity updates towards debugging the jenga method
Aug 26, 2022
22dc4da
OptlangHelper expansion with a recursive expression definition
Aug 27, 2022
b80e00c
OptlangHelper expansion with dot products
Aug 28, 2022
e1dacc6
OptlangHelper finalization and mscompatibility updates
Aug 29, 2022
f7edbcc
MSCompatibility and minimal_media updates
Aug 30, 2022
c4e995b
Compatibility edits
freiburgermsu Aug 30, 2022
3bbbbc5
MSSCommFitting dictionary composition
Aug 31, 2022
86f2d7e
remove print debugger from OptlganHelper
Aug 31, 2022
152fb41
finalized MSCompatibility package and Notebook
Aug 31, 2022
f71e37b
minor MSCompatibility edits ; setup dependencies
Sep 2, 2022
ce97312
minor Jenga edits in MSCommunity
Sep 3, 2022
eccc9b4
Cleaning directories and Jenga method edits
Sep 6, 2022
f8bcd1f
MILP ReactionUsePkg Minimal Media progress
Sep 8, 2022
64cb7e8
MinimalMediaPkg development and JENGA method relocation
Sep 10, 2022
cb2c5b2
Compatibility notebook
freiburgermsu Sep 13, 2022
d0eb8ea
macbook pro merged with upstream
freiburgermsu Sep 13, 2022
e6c9bcf
updated MSCompatibility notebook, FBAHelper edits, MinimalMediaPkg de…
freiburgermsu Sep 13, 2022
7f3a63f
MinimalMediaPkg minimal flux method development
freiburgermsu Sep 14, 2022
996ee83
Revert erroneous replacement with the newest version
freiburgermsu Sep 14, 2022
275a55d
Delete mscompatibility_original.py
freiburgermsu Sep 14, 2022
c7bcdee
reorganization; build_from_species and mscompatibility edits; and __i…
Sep 15, 2022
965b7ed
final polish
Sep 15, 2022
82ee631
build_from_species and minimal media operations
Sep 16, 2022
8b96808
basefba merge conflict resolution
Sep 18, 2022
5b9bd00
bilevel merge conflict resolution
Sep 18, 2022
4255bbe
flexiblebiomass merge conflict resolution
Sep 18, 2022
d1b4518
fluxfittingpkg and reactionusepkg merge conflict resolutions
Sep 18, 2022
329e380
Merge branch 'ModelSEED:main' into main
freiburgermsu Sep 18, 2022
68e74ac
MSCompatibility and MinimalMediaPkg edits
Sep 18, 2022
02703b8
MSCompatibility and build_from_species edits
Sep 19, 2022
0a73164
MSSmetana addition and reorganized community sub-library
Sep 21, 2022
c0eb2d8
MSSmetana & MinimalMediaPkg editsin complete draft
Sep 23, 2022
6e27dd2
examine community pairs in SMETNAA
Sep 30, 2022
ba36bcd
10-member pairs
Sep 30, 2022
58c18f0
MSSmetana assessment with 10-member comm pairs
Oct 2, 2022
38bfc9d
rename to MSMinimalMedia
Oct 2, 2022
101eb83
correct rename in MSMinimalMedia
Oct 2, 2022
40ca73f
statistical assessment of the pairs via SMETANA
Oct 2, 2022
fc672fd
merge conflict resolution with Chris' fork
freiburgermsu Oct 6, 2022
b73263f
SMETANA code revision and Notebook expansion for PMI presentation
Oct 11, 2022
e52dc91
CommKinetics and MSCommunity edits
Oct 18, 2022
678cb04
parsed SteadyCom and CommHelper from MSCommunity ; simulations for Al…
Oct 20, 2022
e708afe
rename steadycom
Oct 21, 2022
82d84fa
pair Notebook revision for Alexis
Oct 21, 2022
9c0e5e7
brief setup and MANIFEST patch
freiburgermsu Oct 25, 2022
072edd3
merge conflicts with Work MacBook
freiburgermsu Oct 25, 2022
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
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,9 @@ coverage.xml
*.mo
*.pot

# local cobrakbase fonts
examples/Flux Analysis/Users/

# Django stuff:
*.log
local_settings.py
Expand Down Expand Up @@ -128,5 +131,9 @@ venv.bak/
.dmypy.json
dmypy.json

# Julia dev models
*.mat
*.zip

# Pyre type checker
.pyre/
16 changes: 16 additions & 0 deletions .readthedocs.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# Required
version: 2

# Set the version of Python and other tools you might need
build:
os: ubuntu-20.04
tools:
python: "3.9"

# Build documentation in the docs/ directory with Sphinx
sphinx:
configuration: docs/source/conf.py

python:
install:
- requirements: docs/requirements.txt
1 change: 1 addition & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
include LICENSE
Include modelseedpy/config.cfg
graft data
1 change: 1 addition & 0 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ and then locally installed with ``pip``::

cd path/to/modelseedpy
pip install .


The associated ModelSEED Database, which is required for a few packages, is simply downloaded by cloning the GitHub repository::

Expand Down
61 changes: 2 additions & 59 deletions docs/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,59 +1,2 @@
anyio
appdirs
certifi
charset-normalizer
chemicals
ChemW
cobra
commonmark
cycler
depinfo
diskcache
et-xmlfile
fluids
fonttools
future
h11
httpcore
httpx
idna
importlib-resources
joblib
kiwisolver
matplotlib
mpmath
networkx
numpy
openpyxl
optlang
packaging
pandas
Pillow
PubChemPy
PuLP
pydantic
pyDEA
Pygments
pyparsing
python-dateutil
python-libsbml
pytz
requests
rfc3986
rich
ruamel.yaml
ruamel.yaml.clib
scikit-learn
scipy
sigfig
six
sniffio
sortedcontainers
swiglpk
sympy
threadpoolctl
typing_extensions
urllib3
xlrd
xlwt-future
zipp
autoapi
nbsphinx
89 changes: 83 additions & 6 deletions docs/source/api.rst
Original file line number Diff line number Diff line change
@@ -1,12 +1,89 @@
ModelSEEDpy API
API
________________________________________________________________________

The detailed documentation of all user-operable classes and functions in the ModelSEEDpy library are provided.


core
---------

The ``core`` sub-library permits parsing and manipulating metabolic models::

from modelseedpy.core import *


.. toctree::
:includehidden:

core/biology_api
core/fbahelper_api
core/gapfillinghelper_api
core/msatpcorrection_api
core/msbuilder_api
core/mseditorapi_api
core/msgenome_api
core/msgapfill_api
core/msgenomeclassifier_api
core/msgrowthphenotypes_api
core/msmedia_api
core/msmodel_api
core/msmodelutils_api
core/mstemplate_api
core/rpcclient_api
core/template_api


community
------------

The ``community`` sub-library compatibilizes transport reactions of individual models for a community model and simulates interactions amongst community members::

from modelseedpy.community import *


.. toctree::
:includehidden:

community/commkineticpkg_api
community/dfbapkg_api
community/mscommfitting_api
community/mscommunity_api
community/mscompatibility_api

contents
core/core_index
community/community_index
fbapkg/fbapkg_index
ml/ml_index

fbapkg
------------

The ``fbapkg`` sub-library constrains and investigates metabolic models through Flux Balance Analysis methods::

from modelseedpy.fbapkg import *

.. toctree::
:includehidden:

fbapkg/bilevel_api
fbapkg/changeoptpkg_api
fbapkg/drainfluxes_api
fbapkg/elementuptakepkg_api
fbapkg/flexiblebiomass_api
fbapkg/fluxfitting_api
fbapkg/gapfillingpkg_api
fbapkg/kbasemedia_api
fbapkg/metabofba_api
fbapkg/proteomefitting_api
fbapkg/reactionuse_api
fbapkg/tfa_api


ml
------------

The ``ml`` sub-library supports parsing features from genomes, with accessibility to KBase::

from modelseedpy.ml import *


.. toctree::
:includehidden:

ml/predict_phenotypes_api
33 changes: 0 additions & 33 deletions docs/source/community/community_index.rst

This file was deleted.

4 changes: 2 additions & 2 deletions docs/source/community/dfbapkg_api.rst
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
dFBA Package
dFBApkg
--------------

++++++++++
Expand All @@ -9,7 +9,7 @@ This class defines and executes dynamic FBA simulations of COBRA models:

.. code-block:: python

from modelseedpy.fbapkg import dFBAPkg
from modelseedpy.community import dFBAPkg
dfba = dFBAPkg(model, modelseed_db_path, solver = 'glpk', warnings = True, verbose = False, printing = False, jupyter = False)

- *model* ``cobra.core.model.Model``: the CobraKBase model that will be simulated. The conversion from `standard COBRA models <https://cobrapy.readthedocs.io/en/latest/autoapi/cobra/core/model/index.html>`_ to CobraKBase models is facilitated by the `cobrakbase` package.
Expand Down
Loading