Age | Commit message (Collapse) | Author |
|
|
|
|
|
github.com:Alexanderlacuna/genenetwork2 into Alexanderlacuna-bugfix/metadata-fetching
|
|
github.com:Alexanderlacuna/genenetwork2 into Alexanderlacuna-chores/code-refactoring
|
|
|
|
github.com:Alexanderlacuna/genenetwork2 into Alexanderlacuna-bugfix/use-f1-parents
|
|
|
|
|
|
|
|
* wqflask/wqflask/database.py (database_connection): New function.
* wqflask/wqflask/views.py: Import sparql_connection
(show_trait_page): Pass sparql_connection object to
get_dataset_metadata.
|
|
|
|
|
|
* wqflask/wqflask/metadata_edits.py (update_probeset): Flash a success
messages when user updates something. Otherwise flash a warning message
* wqflask/wqflask/templates/edit_probeset.html: Display flash
messages.
|
|
|
|
|
|
* wqflask/wqflask/static/new/css/show_trait.css: Show a pointer when a
user hovers over summary data. Add extra styling for the metadata
table.
* wqflask/wqflask/templates/search_result_page.html: Replace
dataset.accession_id with metadata.accession_id.
* wqflask/wqflask/templates/show_metadata_details.html: New template.
file that displays a dataset's metadata in tabular form.
* wqflask/wqflask/templates/show_trait.html: Sub-template
'show_metadata_details' conditionally.
* wqflask/wqflask/views.py (show_trait_page): Explicitly pass metadata
as a dictionary to the template.
|
|
* wqflask/wqflask/correlation/show_corr_results.py
(set_template_vars): Convert monadict_dict to a normal dictionary.
(correlation_json_for_table): Ditto.
|
|
* wqflask/base/data_set/dataset.py (DataSet.as_dict): Rename this to ...
(as_monadic_dict): ... this.
* wqflask/wqflask/correlation/show_corr_results.py
(set_template_vars): Rename as_dict to as_monadic_dict.
(correlation_json_for_table): Ditto.
|
|
* wqflask/base/data_set/dataset.py: Import itertools, DictCursor, MonadicDict,
Maybe, Nothing and query_sql.
(DataSet.__init__): Initialize accession_id to Nothing.
(DataSet.as_dict): Rename this to ...
(Dataset.as_monadic_dict): ... this which returns a monadic
dictionary.
(DataSet.get_accession_id): Query for the accession_id and return it
as a maybe monad.
|
|
|
|
|
|
|
|
|
|
In Jinja, you can use dot notation to check for values. If a value
does not exist, you get None by default.
* wqflask/base/data_set/dataset.py (Dataset.get_accession_id): Remove
returning a string version of None.
* wqflask/wqflask/templates/correlation_page.html: Delete `!= 'None'`.
|
|
* wqflask/wqflask/correlation/show_corr_results.py: Delete os, Path,
TMPDIR, fetch_all_cached_metadata and cache_new_traits_metadata.
* wqflask/wqflask/db_info.py: Remove http.client.
|
|
* wqflask/wqflask/db_info.py: Import DictCursor.
(InfoPage.get_info): Add aliases in SQL that will be used as keys
later by DictCursor..
(process_query_results): Delete it.
|
|
* wqflask/wqflask/db_info.py (InfoPage.get_info): run
cursor.fetchone() only once.
|
|
* wqflask/wqflask/static/new/javascript/dataset_select_menu.js: Delete.
* wqflask/wqflask/static/new/javascript/dataset_select_menu_edit_trait.js:
Ditto.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
collection page
I think the Monad stuff Bonface/Arun are doing might address situations
like this better.
|
|
|
|
|
|
|
|
* Fix imports I broke when rebasing.
|
|
|
|
* wqflask/scripts/corr_compute.py: move correlation computation to
external script.
* wqflask/wqflask/templates/loading_corrs.html: Provide UI to display
while computation is still not complete.
* wqflask/wqflask/views.py: Dispatch correlation computation to
external script and display appropriate UI for each valid state of
the computation.
|
|
|
|
* wqflask/utility/tools.py: Output extraneous messages to stderr
rather than stdout to avoid cluttering the output.
|
|
* Pass the user_id for the current user to the
`check_resource_availability` function as an argument, rather than
using the global `g.user_session.user_id` value.
|
|
* wqflask/jobs/__init__.py: New jobs module
* wqflask/jobs/jobs.py: New jobs module
* wqflask/scripts/run_external.py: new external process manager.
|
|
genenetwork2 should be a thin wrapper web UI around the genenetwork3
API. Hence, this move.
* etc/default_settings.py (XAPIAN_DB_PATH): Delete variable.
* wqflask/wqflask/database.py: Remove xapian import.
(xapian_database, xapian_writable_database): Delete functions.
* wqflask/wqflask/gsearch.py: Do not import json, xapian, Nothing from
pymonad.maybe, base, utility.authentication_tools and
wqflask.database. Import MonadicDict from gn3.monads instead of
utility.monads and GN3_LOCAL_URL from utility.tools.
(GSearch.__init__): Query genenetwork3 search API instead of directly
reading a Xapian index.
|
|
The xapian indexing script has been moved to genenetwork3. All further
development will happen there.
* wqflask/scripts/index.py: Delete file.
|
|
|