From b1c4601cd86af20ab840865ac60b4228dfcb0ba1 Mon Sep 17 00:00:00 2001 From: John Chilton Date: Thu, 24 Oct 2024 08:54:44 -0400 Subject: [PATCH 1/2] Tool markdown reports. --- .../Dataset/DatasetAsImage/DatasetAsImage.vue | 7 +- .../Dataset/DatasetIndex/DatasetIndex.vue | 3 +- .../Dataset/DatasetLink/DatasetLink.vue | 3 +- .../History/Content/ContentItem.vue | 6 +- .../Elements/HistoryDatasetAsTable.vue | 8 +- client/src/components/Markdown/Markdown.vue | 17 ++-- .../components/Markdown/MarkdownContainer.vue | 3 +- client/src/components/Tool/ToolReport.vue | 39 +++++++++ .../src/composables/datasetPathDestination.ts | 9 +-- client/src/entry/analysis/router.js | 6 ++ doc/parse_gx_xsd.py | 28 +++++++ .../config/sample/datatypes_conf.xml.sample | 1 + lib/galaxy/datatypes/data.py | 1 + lib/galaxy/managers/hdas.py | 10 ++- lib/galaxy/managers/markdown_util.py | 66 ++++++++++++++- lib/galaxy/schema/schema.py | 7 ++ lib/galaxy/tool_util/xsd/galaxy.xsd | 72 +++++++++++++++++ lib/galaxy/webapps/galaxy/api/datasets.py | 15 +++- lib/galaxy/webapps/galaxy/buildapp.py | 1 + .../webapps/galaxy/services/datasets.py | 29 ++++++- test/functional/tools/data/1.bed | 65 +++++++++++++++ .../functional/tools/data/rgWebLogo3_test.jpg | Bin 0 -> 21641 bytes .../tools/markdown_report_extra_files.xml | 53 +++++++++++++ .../tools/markdown_report_from_script.xml | 30 +++++++ .../tools/markdown_report_simple.xml | 75 ++++++++++++++++++ .../tools/markdown_report_simple_script.py | 46 +++++++++++ .../tools/sample_datatypes_conf.xml | 1 + test/functional/tools/sample_tool_conf.xml | 3 + 28 files changed, 574 insertions(+), 30 deletions(-) create mode 100644 client/src/components/Tool/ToolReport.vue create mode 100644 test/functional/tools/data/1.bed create mode 100644 test/functional/tools/data/rgWebLogo3_test.jpg create mode 100644 test/functional/tools/markdown_report_extra_files.xml create mode 100644 test/functional/tools/markdown_report_from_script.xml create mode 100644 test/functional/tools/markdown_report_simple.xml create mode 100644 test/functional/tools/markdown_report_simple_script.py diff --git a/client/src/components/Dataset/DatasetAsImage/DatasetAsImage.vue b/client/src/components/Dataset/DatasetAsImage/DatasetAsImage.vue index 5f9f2f50f39b..4e1a6862ed76 100644 --- a/client/src/components/Dataset/DatasetAsImage/DatasetAsImage.vue +++ b/client/src/components/Dataset/DatasetAsImage/DatasetAsImage.vue @@ -14,15 +14,14 @@ const { datasetPathDestination } = useDatasetPathDestination(); const props = defineProps(); -const pathDestination = computed(() => - datasetPathDestination.value(props.historyDatasetId, props.path) -); +const pathDestination = computedAsync(async () => { + return await datasetPathDestination.value(props.historyDatasetId, props.path); +}, null); const imageUrl = computed(() => { if (props.path === undefined || props.path === "undefined") { return `${getAppRoot()}dataset/display?dataset_id=${props.historyDatasetId}`; } - return pathDestination.value?.fileLink; }); diff --git a/client/src/components/Dataset/DatasetIndex/DatasetIndex.vue b/client/src/components/Dataset/DatasetIndex/DatasetIndex.vue index 5001d7f2b20a..a0e2ac3514d2 100644 --- a/client/src/components/Dataset/DatasetIndex/DatasetIndex.vue +++ b/client/src/components/Dataset/DatasetIndex/DatasetIndex.vue @@ -1,4 +1,5 @@ + + diff --git a/client/src/composables/datasetPathDestination.ts b/client/src/composables/datasetPathDestination.ts index 89f419572d1a..39569e416e97 100644 --- a/client/src/composables/datasetPathDestination.ts +++ b/client/src/composables/datasetPathDestination.ts @@ -20,11 +20,11 @@ export function useDatasetPathDestination() { const cache = ref<{ [key: string]: PathDestinationMap }>({}); const datasetPathDestination = computed(() => { - return (dataset_id: string, path?: string) => { + return async (dataset_id: string, path?: string) => { const targetPath = path ?? "undefined"; - const pathDestination = cache.value[dataset_id]?.[targetPath]; + let pathDestination = cache.value[dataset_id]?.[targetPath]; if (!pathDestination) { - getPathDestination(dataset_id, path); + pathDestination = (await getPathDestination(dataset_id, path)) ?? undefined; } return pathDestination ?? null; }; @@ -36,7 +36,6 @@ export function useDatasetPathDestination() { await datasetExtraFilesStore.fetchDatasetExtFilesByDatasetId({ id: dataset_id }); datasetExtraFiles = datasetExtraFilesStore.getDatasetExtraFiles(dataset_id); } - if (datasetExtraFiles === null) { return null; } @@ -66,9 +65,7 @@ export function useDatasetPathDestination() { } pathDestination.fileLink = getCompositeDatasetLink(dataset_id, datasetEntry.path); } - set(cache.value, dataset_id, { [path]: pathDestination }); - return pathDestination; } diff --git a/client/src/entry/analysis/router.js b/client/src/entry/analysis/router.js index 011bb9ffd082..5cf4b39737c9 100644 --- a/client/src/entry/analysis/router.js +++ b/client/src/entry/analysis/router.js @@ -21,6 +21,7 @@ import ToolLanding from "components/Landing/ToolLanding"; import WorkflowLanding from "components/Landing/WorkflowLanding"; import PageDisplay from "components/PageDisplay/PageDisplay"; import PageEditor from "components/PageEditor/PageEditor"; +import ToolReport from "components/Tool/ToolReport"; import ToolSuccess from "components/Tool/ToolSuccess"; import ToolsList from "components/ToolsList/ToolsList"; import ToolsJson from "components/ToolsView/ToolsSchemaJson/ToolsJson"; @@ -239,6 +240,11 @@ export function getRouter(Galaxy) { src: `/datasets/${route.params.datasetId}/display/?preview=True`, }), }, + { + path: "datasets/:datasetId/report", + component: ToolReport, + props: true, + }, { // legacy route, potentially used by 3rd parties path: "datasets/:datasetId/show_params", diff --git a/doc/parse_gx_xsd.py b/doc/parse_gx_xsd.py index 11092bb84515..e143c649fd53 100644 --- a/doc/parse_gx_xsd.py +++ b/doc/parse_gx_xsd.py @@ -8,12 +8,16 @@ from io import StringIO from lxml import etree +from yaml import safe_load with open(sys.argv[2]) as f: xmlschema_doc = etree.parse(f) markdown_buffer = StringIO() +DIRECTIVES_PATH = "../client/src/components/Markdown/directives.yml" +DIRECTIVES = safe_load(open(DIRECTIVES_PATH)) + def main(): """Entry point for the function that builds Markdown help for the Galaxy XSD.""" @@ -74,6 +78,7 @@ def _build_tag(tag, hide_attributes): annotation_el = tag_el.find("{http://www.w3.org/2001/XMLSchema}annotation") text = annotation_el.find("{http://www.w3.org/2001/XMLSchema}documentation").text text = _replace_attribute_list(tag, text, attributes) + text = _expand_directives(text) for line in text.splitlines(): if line.startswith("$assertions"): assertions_tag = xmlschema_doc.find( @@ -127,6 +132,29 @@ def _replace_attribute_list(tag, text, attributes): return text +def _build_directive_table(line: str) -> str: + _, directives_str = line.split(":", 1) + directives = directives_str.split(",") + attribute_table = StringIO() + attribute_table.write("\n\n") + for directive in directives: + header_level = 3 + header_prefix = "#" * header_level + attribute_table.write(f"\n{header_prefix} {directive}\n\n") + directive_info = DIRECTIVES[directive] + if "help" in directive_info: + attribute_table.write(DIRECTIVES[directive]["help"]) + return attribute_table.getvalue() + + +def _expand_directives(text): + for line in text.splitlines(): + if not line.startswith("$directive_list:"): + continue + text = text.replace(line, _build_directive_table(line)) + return text + + def _get_bp_link(annotation_el): anchor = annotation_el.attrib.get("{http://galaxyproject.org/xml/1.0}best_practices", None) link = None diff --git a/lib/galaxy/config/sample/datatypes_conf.xml.sample b/lib/galaxy/config/sample/datatypes_conf.xml.sample index a8e798143f8b..c373223a5b15 100644 --- a/lib/galaxy/config/sample/datatypes_conf.xml.sample +++ b/lib/galaxy/config/sample/datatypes_conf.xml.sample @@ -576,6 +576,7 @@ + diff --git a/lib/galaxy/datatypes/data.py b/lib/galaxy/datatypes/data.py index e5fea2612ace..ec25f8413a9f 100644 --- a/lib/galaxy/datatypes/data.py +++ b/lib/galaxy/datatypes/data.py @@ -464,6 +464,7 @@ def to_archive(self, dataset: DatasetProtocol, name: str = "") -> Iterable: def _serve_file_download(self, headers, data, trans, to_ext, file_size, **kwd): composite_extensions = trans.app.datatypes_registry.get_composite_extensions() composite_extensions.append("html") # for archiving composite datatypes + composite_extensions.append("tool_markdown") # basically should act as an HTML datatype in this capacity composite_extensions.append("data_manager_json") # for downloading bundles if bundled. composite_extensions.append("directory") # for downloading directories. diff --git a/lib/galaxy/managers/hdas.py b/lib/galaxy/managers/hdas.py index 63fa618545a8..9b8e1fadcda8 100644 --- a/lib/galaxy/managers/hdas.py +++ b/lib/galaxy/managers/hdas.py @@ -288,13 +288,10 @@ def data_conversion_status(self, hda): # .... data # TODO: to data provider or Text datatype directly - def text_data(self, hda, preview=True): + def text_data(self, hda, preview=True, filename: Optional[str] = None): """ Get data from text file, truncating if necessary. """ - # 1 MB - MAX_PEEK_SIZE = 1000000 - truncated = False hda_data = None # For now, cannot get data from non-text datasets. @@ -304,6 +301,11 @@ def text_data(self, hda, preview=True): if not os.path.exists(file_path): return truncated, hda_data + return self.text_data_truncated(file_path, preview=preview) + + def text_data_truncated(self, file_path, preview=True): + # 1 MB + MAX_PEEK_SIZE = 1000000 truncated = preview and os.stat(file_path).st_size > MAX_PEEK_SIZE with get_fileobj(file_path) as fh: try: diff --git a/lib/galaxy/managers/markdown_util.py b/lib/galaxy/managers/markdown_util.py index 02545399e997..757a9980e2cc 100644 --- a/lib/galaxy/managers/markdown_util.py +++ b/lib/galaxy/managers/markdown_util.py @@ -900,7 +900,7 @@ def _remap(container, line): ) if container == "history_link": return (f"history_link(history_id={invocation.history.id})\n", False) - if container == "invocation_time": + elif container == "invocation_time": return (f"invocation_time(invocation_id={invocation.id})\n", False) ref_object_type = None output_match = re.search(OUTPUT_LABEL_PATTERN, line) @@ -953,6 +953,70 @@ def find_non_empty_group(match): return galaxy_markdown +def resolve_job_markdown(trans, job, job_markdown): + """Resolve job objects to convert tool markdown to 'internal' representation. + + Replace references to abstract workflow parts with actual galaxy object IDs corresponding + to the actual executed workflow. For instance: + + convert output=name -to- history_dataset_id= | history_dataset_collection_id= + convert input=name -to- history_dataset_id= | history_dataset_collection_id= + convert argument-less job directives to job + """ + io_dicts = job.io_dicts() + + def _remap(container, line): + if container == "history_link": + return (f"history_link(history_id={job.history.id})\n", False) + elif container == "tool_stdout": + return (f"tool_stdout(job_id={job.id})\n", False) + elif container == "tool_stderr": + return (f"tool_stderr(job_id={job.id})\n", False) + elif container == "job_parameters": + return (f"job_parameters(job_id={job.id})\n", False) + elif container == "job_metrics": + return (f"job_metrics(job_id={job.id})\n", False) + ref_object_type = None + output_match = re.search(OUTPUT_LABEL_PATTERN, line) + input_match = re.search(INPUT_LABEL_PATTERN, line) + + def find_non_empty_group(match): + for group in match.groups(): + if group: + return group + + target_match: Optional[Match] + ref_object: Optional[Any] + if output_match: + target_match = output_match + name = find_non_empty_group(target_match) + if name in io_dicts.out_data: + ref_object = io_dicts.out_data[name] + elif name in io_dicts.out_collections: + ref_object = io_dicts.out_collections[name] + else: + raise Exception("Unknown exception") + elif input_match: + target_match = input_match + name = find_non_empty_group(target_match) + ref_object = io_dicts.inp_data[name] + else: + target_match = None + ref_object = None + if ref_object: + assert target_match # tell type system, this is set when ref_object is set + if ref_object_type is None: + if ref_object.history_content_type == "dataset": + ref_object_type = "history_dataset" + else: + ref_object_type = "history_dataset_collection" + line = line.replace(target_match.group(), f"{ref_object_type}_id={ref_object.id}") + return (line, False) + + galaxy_markdown = _remap_galaxy_markdown_calls(_remap, job_markdown) + return galaxy_markdown + + def _remap_galaxy_markdown_containers(func, markdown): new_markdown = markdown diff --git a/lib/galaxy/schema/schema.py b/lib/galaxy/schema/schema.py index 2299d862ce62..9458981c737e 100644 --- a/lib/galaxy/schema/schema.py +++ b/lib/galaxy/schema/schema.py @@ -3852,6 +3852,13 @@ class PageDetails(PageSummary): model_config = ConfigDict(extra="allow") +class ToolReportForDataset(BaseModel): + content: Optional[str] = ContentField + generate_version: Optional[str] = GenerateVersionField + generate_time: Optional[str] = GenerateTimeField + model_config = ConfigDict(extra="allow") + + class PageSummaryList(RootModel): root: List[PageSummary] = Field( default=[], diff --git a/lib/galaxy/tool_util/xsd/galaxy.xsd b/lib/galaxy/tool_util/xsd/galaxy.xsd index 8975b36408ec..fc972958177e 100644 --- a/lib/galaxy/tool_util/xsd/galaxy.xsd +++ b/lib/galaxy/tool_util/xsd/galaxy.xsd @@ -6101,6 +6101,78 @@ on Human (hg18)``. ``` +### Markdown Outputs + +Tools can produce Markdown reports enhanced with the Galaxy Markdown syntax. This +allows using Markdown directives to provide rich displays of tool inputs and outputs. + +``` + + + +``` + +For an overview of standard Markdown visit the [commonmark.org tutorial](https://commonmark.org/help/tutorial/). + +The Galaxy extensions to Markdown are represented as code blocks, these blocks start with the line + + + ```galaxy + +and end with the line + + ``` + +and have a command (or directive) with arguments between these lines. These arguments reference parts of your tool's job such as +inputs and outputs by label. + +#### History Contents Commands + +These commands reference a dataset or dataset collection. For instance, the following examples would display +the dataset collection metadata and would embed a dataset into the document as an image. + +These elements are referenced by input or output labels for the tool. + +Example: + + ```galaxy + history_dataset_collection_display(output=mapped_bams) + ``` + +Example: + + ```galaxy + history_dataset_as_image(output=normalized_result_plot) + ``` + +$directive_list:history_dataset_display,history_dataset_collection_display,history_dataset_as_image,history_dataset_as_table,history_dataset_peek,history_dataset_info + +#### Job Commands + +These commands implicitly reference the Galaxy job associated with the tool execution. + +Example: + + ```galaxy + tool_stdout() + ``` + +$directive_list:tool_stderr,tool_stdout,job_metrics,job_parameters + +#### Example Tools + +A few potential paradigms for build reports for tools have examples included. +[markdown_report_simple.xml](https://github.com/galaxyproject/galaxy/blob/dev/test/functional/tools/markdown_report_simple.xml) +demonstrates simply linking to the other outputs of a tool and builds the document +itself with a Galaxy ``configfile``. [markdown_report_extra_files.xml](https://github.com/galaxyproject/galaxy/blob/dev/test/functional/tools/markdown_report_extra_files.xml) +builds the report with a configfile just like that first example but demonstrates +copying data and images into the ``extra_files`` directory of the report. This variant +is useful if the number or types of files being produced is variable or if it is important +the outputs linked in the reports are not stand-alone outputs of the tool. Finally, +[markdown_report_from_script.xml](https://github.com/galaxyproject/galaxy/blob/dev/test/functional/tools/markdown_report_from_script.xml) +demonstrates you don't need to build the file in Galaxy's XML - you can build it with +a wrapper script or standalone application. + ]]> diff --git a/lib/galaxy/webapps/galaxy/api/datasets.py b/lib/galaxy/webapps/galaxy/api/datasets.py index eba6795100fd..a16251734633 100644 --- a/lib/galaxy/webapps/galaxy/api/datasets.py +++ b/lib/galaxy/webapps/galaxy/api/datasets.py @@ -39,6 +39,7 @@ AsyncTaskResultSummary, DatasetAssociationRoles, DatasetSourceType, + ToolReportForDataset, ) from galaxy.util.zipstream import ZipstreamWrapper from galaxy.webapps.base.api import GalaxyFileResponse @@ -189,9 +190,10 @@ def show_inheritance_chain( def get_content_as_text( self, dataset_id: HistoryDatasetIDPathParam, + filename: Optional[str] = FilenameQueryParam, trans=DependsOnTrans, ) -> DatasetTextContentDetails: - return self.service.get_content_as_text(trans, dataset_id) + return self.service.get_content_as_text(trans, dataset_id, filename=filename) @router.get( "/api/datasets/{dataset_id}/converted/{ext}", @@ -503,6 +505,17 @@ def compute_hash( ) -> AsyncTaskResultSummary: return self.service.compute_hash(trans, dataset_id, payload, hda_ldda=hda_ldda) + @router.get( + "/api/datasets/{dataset_id}/report", + summary="Return JSON content Galaxy will use to render Markdown reports", + ) + def report( + self, + dataset_id: HistoryDatasetIDPathParam, + trans=DependsOnTrans, + ) -> ToolReportForDataset: + return self.service.report(trans, dataset_id) + @router.put( "/api/datasets/{dataset_id}/object_store_id", summary="Update an object store ID for a dataset you own.", diff --git a/lib/galaxy/webapps/galaxy/buildapp.py b/lib/galaxy/webapps/galaxy/buildapp.py index e1897420f9a5..8ffce93080c7 100644 --- a/lib/galaxy/webapps/galaxy/buildapp.py +++ b/lib/galaxy/webapps/galaxy/buildapp.py @@ -280,6 +280,7 @@ def app_pair(global_conf, load_app_kwds=None, wsgi_preflight=True, **kwargs): webapp.add_client_route("/datasets/{dataset_id}/error") webapp.add_client_route("/datasets/{dataset_id}/details") webapp.add_client_route("/datasets/{dataset_id}/preview") + webapp.add_client_route("/datasets/{dataset_id}/report") webapp.add_client_route("/datasets/{dataset_id}/show_params") webapp.add_client_route("/collection/{collection_id}/edit") webapp.add_client_route("/jobs/submission/success") diff --git a/lib/galaxy/webapps/galaxy/services/datasets.py b/lib/galaxy/webapps/galaxy/services/datasets.py index 4f6fef304697..3588a162fba7 100644 --- a/lib/galaxy/webapps/galaxy/services/datasets.py +++ b/lib/galaxy/webapps/galaxy/services/datasets.py @@ -47,6 +47,10 @@ HistoryContentsManager, ) from galaxy.managers.lddas import LDDAManager +from galaxy.managers.markdown_util import ( + ready_galaxy_markdown_for_export, + resolve_job_markdown, +) from galaxy.model.base import transaction from galaxy.objectstore.badges import BadgeDict from galaxy.schema import ( @@ -70,6 +74,7 @@ DatasetSourceType, EncodedDatasetSourceId, Model, + ToolReportForDataset, UpdateDatasetPermissionsPayload, ) from galaxy.schema.tasks import ComputeDatasetHashTaskRequest @@ -506,6 +511,18 @@ def compute_hash( result = compute_dataset_hash.delay(request=request, task_user_id=getattr(trans.user, "id", None)) return async_task_summary(result) + def report(self, trans: ProvidesHistoryContext, dataset_id: DecodedDatabaseIdField) -> ToolReportForDataset: + dataset_instance = self.hda_manager.get_accessible(dataset_id, trans.user) + self.hda_manager.ensure_dataset_on_disk(trans, dataset_instance) + file_path = trans.app.object_store.get_filename(dataset_instance.dataset) + raw_content = open(file_path).read() + internal_markdown = resolve_job_markdown(trans, dataset_instance.creating_job, raw_content) + content, extra_attributes = ready_galaxy_markdown_for_export(trans, internal_markdown) + return ToolReportForDataset( + content=content, + **extra_attributes, + ) + def drs_dataset_instance(self, object_id: str) -> Tuple[int, DatasetSourceType]: if object_id.startswith("hda-"): decoded_object_id = self.decode_id(object_id[len("hda-") :], kind="drs") @@ -656,15 +673,19 @@ def display( return rval, headers def get_content_as_text( - self, - trans: ProvidesHistoryContext, - dataset_id: DecodedDatabaseIdField, + self, trans: ProvidesHistoryContext, dataset_id: DecodedDatabaseIdField, filename: Optional[str] ) -> DatasetTextContentDetails: """Returns dataset content as Text.""" user = trans.user hda = self.hda_manager.get_accessible(dataset_id, user) hda = self.hda_manager.error_if_uploading(hda) - truncated, dataset_data = self.hda_manager.text_data(hda, preview=True) + if filename and filename != "index": + object_store = trans.app.object_store + dir_name = hda.dataset.extra_files_path_name + file_path = object_store.get_filename(hda.dataset, extra_dir=dir_name, alt_name=filename) + truncated, dataset_data = self.hda_manager.text_data_truncated(file_path, preview=True) + else: + truncated, dataset_data = self.hda_manager.text_data(hda, preview=True) item_url = web.url_for( controller="dataset", action="display_by_username_and_slug", diff --git a/test/functional/tools/data/1.bed b/test/functional/tools/data/1.bed new file mode 100644 index 000000000000..eb4c30e347a1 --- /dev/null +++ b/test/functional/tools/data/1.bed @@ -0,0 +1,65 @@ +chr1 147962192 147962580 CCDS989.1_cds_0_0_chr1_147962193_r 0 - +chr1 147984545 147984630 CCDS990.1_cds_0_0_chr1_147984546_f 0 + +chr1 148078400 148078582 CCDS993.1_cds_0_0_chr1_148078401_r 0 - +chr1 148185136 148185276 CCDS996.1_cds_0_0_chr1_148185137_f 0 + +chr10 55251623 55253124 CCDS7248.1_cds_0_0_chr10_55251624_r 0 - +chr11 116124407 116124501 CCDS8374.1_cds_0_0_chr11_116124408_r 0 - +chr11 116206508 116206563 CCDS8377.1_cds_0_0_chr11_116206509_f 0 + +chr11 116211733 116212337 CCDS8378.1_cds_0_0_chr11_116211734_r 0 - +chr11 1812377 1812407 CCDS7726.1_cds_0_0_chr11_1812378_f 0 + +chr12 38440094 38440321 CCDS8736.1_cds_0_0_chr12_38440095_r 0 - +chr13 112381694 112381953 CCDS9526.1_cds_0_0_chr13_112381695_f 0 + +chr14 98710240 98712285 CCDS9949.1_cds_0_0_chr14_98710241_r 0 - +chr15 41486872 41487060 CCDS10096.1_cds_0_0_chr15_41486873_r 0 - +chr15 41673708 41673857 CCDS10097.1_cds_0_0_chr15_41673709_f 0 + +chr15 41679161 41679250 CCDS10098.1_cds_0_0_chr15_41679162_r 0 - +chr15 41826029 41826196 CCDS10101.1_cds_0_0_chr15_41826030_f 0 + +chr16 142908 143003 CCDS10397.1_cds_0_0_chr16_142909_f 0 + +chr16 179963 180135 CCDS10401.1_cds_0_0_chr16_179964_r 0 - +chr16 244413 244681 CCDS10402.1_cds_0_0_chr16_244414_f 0 + +chr16 259268 259383 CCDS10403.1_cds_0_0_chr16_259269_r 0 - +chr18 23786114 23786321 CCDS11891.1_cds_0_0_chr18_23786115_r 0 - +chr18 59406881 59407046 CCDS11985.1_cds_0_0_chr18_59406882_f 0 + +chr18 59455932 59456337 CCDS11986.1_cds_0_0_chr18_59455933_r 0 - +chr18 59600586 59600754 CCDS11988.1_cds_0_0_chr18_59600587_f 0 + +chr19 59068595 59069564 CCDS12866.1_cds_0_0_chr19_59068596_f 0 + +chr19 59236026 59236146 CCDS12872.1_cds_0_0_chr19_59236027_r 0 - +chr19 59297998 59298008 CCDS12877.1_cds_0_0_chr19_59297999_f 0 + +chr19 59302168 59302288 CCDS12878.1_cds_0_0_chr19_59302169_r 0 - +chr2 118288583 118288668 CCDS2120.1_cds_0_0_chr2_118288584_f 0 + +chr2 118394148 118394202 CCDS2121.1_cds_0_0_chr2_118394149_r 0 - +chr2 220190202 220190242 CCDS2441.1_cds_0_0_chr2_220190203_f 0 + +chr2 220229609 220230869 CCDS2443.1_cds_0_0_chr2_220229610_r 0 - +chr20 33330413 33330423 CCDS13249.1_cds_0_0_chr20_33330414_r 0 - +chr20 33513606 33513792 CCDS13255.1_cds_0_0_chr20_33513607_f 0 + +chr20 33579500 33579527 CCDS13256.1_cds_0_0_chr20_33579501_r 0 - +chr20 33593260 33593348 CCDS13257.1_cds_0_0_chr20_33593261_f 0 + +chr21 32707032 32707192 CCDS13614.1_cds_0_0_chr21_32707033_f 0 + +chr21 32869641 32870022 CCDS13615.1_cds_0_0_chr21_32869642_r 0 - +chr21 33321040 33322012 CCDS13620.1_cds_0_0_chr21_33321041_f 0 + +chr21 33744994 33745040 CCDS13625.1_cds_0_0_chr21_33744995_r 0 - +chr22 30120223 30120265 CCDS13897.1_cds_0_0_chr22_30120224_f 0 + +chr22 30160419 30160661 CCDS13898.1_cds_0_0_chr22_30160420_r 0 - +chr22 30665273 30665360 CCDS13901.1_cds_0_0_chr22_30665274_f 0 + +chr22 30939054 30939266 CCDS13903.1_cds_0_0_chr22_30939055_r 0 - +chr5 131424298 131424460 CCDS4149.1_cds_0_0_chr5_131424299_f 0 + +chr5 131556601 131556672 CCDS4151.1_cds_0_0_chr5_131556602_r 0 - +chr5 131621326 131621419 CCDS4152.1_cds_0_0_chr5_131621327_f 0 + +chr5 131847541 131847666 CCDS4155.1_cds_0_0_chr5_131847542_r 0 - +chr6 108299600 108299744 CCDS5061.1_cds_0_0_chr6_108299601_r 0 - +chr6 108594662 108594687 CCDS5063.1_cds_0_0_chr6_108594663_f 0 + +chr6 108640045 108640151 CCDS5064.1_cds_0_0_chr6_108640046_r 0 - +chr6 108722976 108723115 CCDS5067.1_cds_0_0_chr6_108722977_f 0 + +chr7 113660517 113660685 CCDS5760.1_cds_0_0_chr7_113660518_f 0 + +chr7 116512159 116512389 CCDS5771.1_cds_0_0_chr7_116512160_r 0 - +chr7 116714099 116714152 CCDS5773.1_cds_0_0_chr7_116714100_f 0 + +chr7 116945541 116945787 CCDS5774.1_cds_0_0_chr7_116945542_r 0 - +chr8 118881131 118881317 CCDS6324.1_cds_0_0_chr8_118881132_r 0 - +chr9 128764156 128764189 CCDS6914.1_cds_0_0_chr9_128764157_f 0 + +chr9 128787519 128789136 CCDS6915.1_cds_0_0_chr9_128787520_r 0 - +chr9 128882427 128882523 CCDS6917.1_cds_0_0_chr9_128882428_f 0 + +chr9 128937229 128937445 CCDS6919.1_cds_0_0_chr9_128937230_r 0 - +chrX 122745047 122745924 CCDS14606.1_cds_0_0_chrX_122745048_f 0 + +chrX 152648964 152649196 CCDS14733.1_cds_0_0_chrX_152648965_r 0 - +chrX 152691446 152691471 CCDS14735.1_cds_0_0_chrX_152691447_f 0 + +chrX 152694029 152694263 CCDS14736.1_cds_0_0_chrX_152694030_r 0 - diff --git a/test/functional/tools/data/rgWebLogo3_test.jpg b/test/functional/tools/data/rgWebLogo3_test.jpg new file mode 100644 index 0000000000000000000000000000000000000000..8f7e77eba67cccd231bbcb973b936bc44dd2d71a GIT binary patch literal 21641 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 + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/functional/tools/markdown_report_from_script.xml b/test/functional/tools/markdown_report_from_script.xml new file mode 100644 index 000000000000..12237780345a --- /dev/null +++ b/test/functional/tools/markdown_report_from_script.xml @@ -0,0 +1,30 @@ + + '$output_text'; + cp '$__tool_directory__/data/1.bed' '$output_table'; + cp '$__tool_directory__/data/rgWebLogo3_test.jpg' '$output_image'; + python '$__tool_directory__/markdown_report_simple_script.py' + ]]> + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/functional/tools/markdown_report_simple.xml b/test/functional/tools/markdown_report_simple.xml new file mode 100644 index 000000000000..bf893234144e --- /dev/null +++ b/test/functional/tools/markdown_report_simple.xml @@ -0,0 +1,75 @@ + + '$output_text'; + cp '$__tool_directory__/data/1.bed' '$output_table'; + cp '$__tool_directory__/data/rgWebLogo3_test.jpg' '$output_image'; + cp '${tool_markdown}' '${output_report}'; + ]]> + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/functional/tools/markdown_report_simple_script.py b/test/functional/tools/markdown_report_simple_script.py new file mode 100644 index 000000000000..fbcf9e6c9502 --- /dev/null +++ b/test/functional/tools/markdown_report_simple_script.py @@ -0,0 +1,46 @@ +DOCUMENT = """ +# Dynamically Generated Report + +Here is a peek of the exciting stuff we did: + +```galaxy +history_dataset_peek(output=output_text) +``` + +The tool produced the following image image: + +```galaxy +history_dataset_as_image(output=output_image) +``` + +We produced a table that looks like this: + +```galaxy +history_dataset_as_table(output=output_table, header="Table Header", footer="A description of the table", compact=true) +``` + +The same table as embedded and using the full dataset display: + +(embed) + +```galaxy +history_dataset_embedded(output=output_table) +``` + +(display) + +```galaxy +history_dataset_display(output=output_table) +``` + +The standard output for this tool execution is: + +```galaxy +tool_stdout() +``` + +This is my document and I have populated the title from a parameter. +""" + +with open("output_report.md", "w") as f: + f.write(DOCUMENT) diff --git a/test/functional/tools/sample_datatypes_conf.xml b/test/functional/tools/sample_datatypes_conf.xml index 1ebdfb456f75..4cffda7b9173 100644 --- a/test/functional/tools/sample_datatypes_conf.xml +++ b/test/functional/tools/sample_datatypes_conf.xml @@ -49,6 +49,7 @@ + diff --git a/test/functional/tools/sample_tool_conf.xml b/test/functional/tools/sample_tool_conf.xml index bb9d7568f600..91851d4035bf 100644 --- a/test/functional/tools/sample_tool_conf.xml +++ b/test/functional/tools/sample_tool_conf.xml @@ -232,6 +232,9 @@ + + + From f596e1592d0a3b677216d2c94d97655655a8da83 Mon Sep 17 00:00:00 2001 From: John Chilton Date: Thu, 24 Oct 2024 13:00:30 -0400 Subject: [PATCH 2/2] Rebuild schema for tool markdown reports... --- client/src/api/schema/schema.ts | 87 ++++++++++++++++++++++++++++++++- 1 file changed, 86 insertions(+), 1 deletion(-) diff --git a/client/src/api/schema/schema.ts b/client/src/api/schema/schema.ts index 8f9bee6a6572..412f9e62b29a 100644 --- a/client/src/api/schema/schema.ts +++ b/client/src/api/schema/schema.ts @@ -571,6 +571,23 @@ export interface paths { patch?: never; trace?: never; }; + "/api/datasets/{dataset_id}/report": { + parameters: { + query?: never; + header?: never; + path?: never; + cookie?: never; + }; + /** Return JSON content Galaxy will use to render Markdown reports */ + get: operations["report_api_datasets__dataset_id__report_get"]; + put?: never; + post?: never; + delete?: never; + options?: never; + head?: never; + patch?: never; + trace?: never; + }; "/api/datasets/{dataset_id}/storage": { parameters: { query?: never; @@ -16739,6 +16756,27 @@ export interface components { */ values: string; }; + /** ToolReportForDataset */ + ToolReportForDataset: { + /** + * Content + * @description Raw text contents of the last page revision (type dependent on content_format). + * @default + */ + content: string | null; + /** + * Galaxy Version + * @description The version of Galaxy this object was generated with. + */ + generate_time?: string | null; + /** + * Galaxy Version + * @description The version of Galaxy this object was generated with. + */ + generate_version?: string | null; + } & { + [key: string]: unknown; + }; /** ToolStep */ ToolStep: { /** @@ -19804,7 +19842,10 @@ export interface operations { }; get_content_as_text_api_datasets__dataset_id__get_content_as_text_get: { parameters: { - query?: never; + query?: { + /** @description If non-null, get the specified filename from the extra files for this dataset. */ + filename?: string | null; + }; header?: { /** @description The user ID that will be used to effectively make this API call. Only admins and designated users can make API calls on behalf of other users. */ "run-as"?: string | null; @@ -20137,6 +20178,50 @@ export interface operations { }; }; }; + report_api_datasets__dataset_id__report_get: { + parameters: { + query?: never; + header?: { + /** @description The user ID that will be used to effectively make this API call. Only admins and designated users can make API calls on behalf of other users. */ + "run-as"?: string | null; + }; + path: { + /** @description The ID of the History Dataset. */ + dataset_id: string; + }; + cookie?: never; + }; + requestBody?: never; + responses: { + /** @description Successful Response */ + 200: { + headers: { + [name: string]: unknown; + }; + content: { + "application/json": components["schemas"]["ToolReportForDataset"]; + }; + }; + /** @description Request Error */ + "4XX": { + headers: { + [name: string]: unknown; + }; + content: { + "application/json": components["schemas"]["MessageExceptionModel"]; + }; + }; + /** @description Server Error */ + "5XX": { + headers: { + [name: string]: unknown; + }; + content: { + "application/json": components["schemas"]["MessageExceptionModel"]; + }; + }; + }; + }; show_storage_api_datasets__dataset_id__storage_get: { parameters: { query?: {