Skip to content
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

add spacexr #6212

Merged
merged 61 commits into from
Jan 15, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
8e3eb4a
started spacexr
nilchia Aug 2, 2024
a8c1906
started adding config file and help
nilchia Aug 5, 2024
460e8f2
params for reference
nilchia Aug 5, 2024
88fd911
added st param
nilchia Aug 5, 2024
54ff8da
correct format
nilchia Aug 5, 2024
8f1fb30
finished config file
nilchia Aug 5, 2024
3287e68
update rctd
nilchia Aug 6, 2024
ea3ad72
corrected tool name
nilchia Aug 6, 2024
74481cf
add shed.yml
nilchia Aug 6, 2024
fac4e1c
Update tools/spacexr/macros.xml
nilchia Aug 25, 2024
3fca0f8
Merge branch 'galaxyproject:main' into spacexr
nilchia Sep 15, 2024
f848cff
Merge branch 'galaxyproject:main' into spacexr
nilchia Sep 27, 2024
26d2d47
add test-data
nilchia Aug 6, 2024
e7d0fa3
add multi
nilchia Sep 27, 2024
6433511
add output
nilchia Sep 27, 2024
1adcbed
update output
nilchia Oct 8, 2024
16bb7e0
add test (is failing)
nilchia Oct 8, 2024
270f26d
first test pass
nilchia Oct 9, 2024
7ba98dd
test for full and multi
nilchia Oct 9, 2024
dae4129
correct categories
nilchia Oct 9, 2024
544dd98
add doi of CSIDE
nilchia Oct 11, 2024
1e0bad9
correct rds output of multi
nilchia Oct 11, 2024
8c2c3a4
started CSIDE input
nilchia Oct 14, 2024
f8dc7f7
add nonparametric script
nilchia Oct 15, 2024
8a7f38c
add pathologic DE input
nilchia Oct 15, 2024
4b1c4ec
cell2cell script
nilchia Oct 15, 2024
ea4ae35
clean macros
nilchia Oct 15, 2024
7b30145
add XY and custom part1
nilchia Oct 18, 2024
1bd854d
custom input and command
nilchia Oct 18, 2024
944acb2
output
nilchia Oct 18, 2024
84ceba2
correct rds output rctd
nilchia Oct 18, 2024
55cf2ca
better test-data for rctd
nilchia Oct 18, 2024
5fb6a97
first test cside
nilchia Oct 18, 2024
73624f3
fix some lint error
nilchia Oct 19, 2024
591ffd1
better label and name
nilchia Oct 21, 2024
df5391f
CDATA
nilchia Oct 22, 2024
3cdc55d
add env varaible, validator for text input, and update macro
nilchia Oct 22, 2024
8e448d5
select box for output
nilchia Oct 22, 2024
642ed70
fix some cheetah errors
nilchia Oct 22, 2024
db796c2
calling env variables is R
nilchia Oct 22, 2024
9857527
better config indentation
nilchia Oct 22, 2024
b83228d
tring to fix the problem with cheetah variables
nilchia Oct 22, 2024
30754b5
cheetah in config
nilchia Oct 23, 2024
7c39d4b
update cside.xml
nilchia Oct 25, 2024
9ad3ea3
update macros and xml
nilchia Oct 29, 2024
d0f4bef
Merge branch 'galaxyproject:main' into spacexr
nilchia Dec 6, 2024
5a2bc5a
trying to fix the error with multi cores
pavanvidem Jan 10, 2025
08d140f
also check whether the GALAXY_SLOTS is not empty
pavanvidem Jan 10, 2025
e0900ec
add non-parametric tests
nilchia Jan 11, 2025
d1ad159
point_density test
nilchia Jan 11, 2025
de68842
add tests
nilchia Jan 12, 2025
31cdfa7
test-data from zenodo
nilchia Jan 12, 2025
ed2ea56
fix core and inputs from zenodo
nilchia Jan 12, 2025
64acfac
update input location
nilchia Jan 12, 2025
17876fa
fix digit precision
nilchia Jan 12, 2025
c7fdf91
moved cheetah syntax from config to command session
nilchia Jan 12, 2025
fa592ec
mv variables back to config block
nilchia Jan 12, 2025
ec8c566
fix custom funcrion test
nilchia Jan 13, 2025
2fa20d3
barcode input as table
nilchia Jan 14, 2025
89bb063
update log output
nilchia Jan 15, 2025
94ef79a
update help
nilchia Jan 15, 2025
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
13 changes: 13 additions & 0 deletions tools/spacexr/.shed.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
name: spacexr
owner: iuc
description: Cell type identification and cell type-specific differential expression in spatial transcriptomics
homepage_url: https://github.com/dmcable/spacexr/tree/master
long_description: Computational methods for cell type identification (RCTD) and differential expression (C-SIDE) on spatial transcriptomics datasets
remote_repository_url: https://github.com/galaxyproject/tools-iuc/tree/master/tools/spacexr
categories:
- Spatial Omics
- Single Cell
suite:
name: "suite_spacexr"
description: "A suite of Galaxy tools designed to work with the spacexr-tools collection."
type: repository_suite_definition
107 changes: 107 additions & 0 deletions tools/spacexr/macros.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,107 @@
<macros>
<token name="@TOOL_VERSION@">2.2.1</token>
<token name="@VERSION_SUFFIX@">0</token>
<token name="@PROFILE@">23.0</token>
<xml name="requirements">
<requirements>
<requirement type="package" version="@TOOL_VERSION@">r-spacexr</requirement>
<yield/>
</requirements>
</xml>
<xml name="edam">
<edam_topics>
<edam_topic>topic_4019</edam_topic>
<edam_topic>topic_4028</edam_topic>
<edam_topic>topic_3308</edam_topic>
</edam_topics>
<edam_operations>
<edam_operation>operation_3223</edam_operation>
</edam_operations>
</xml>
<token name="CSIDE_COMMON_RUN"><![CDATA[
#if str($type.cell_types) != '':
cell_types = c($cell_types),
#end if
cell_type_threshold = $type.cell_type_threshold,
gene_threshold = $type.gene_threshold,
doublet_mode = $type.doublet_mode,
#if str($type.weight_threshold) != '':
weight_threshold = $type.weight_threshold,
#end if
sigma_gene = $type.sigma_gene,
PRECISION.THRESHOLD = $type.precision_threshold,
#if str($type.cell_types_present) != '':
cell_types_present = c($cell_types_present),
#end if
fdr = $type.fdr,
test_genes_sig = $type.test_genes_sig,
#if 'log' in $output_selector:
logs = TRUE,
#else:
logs = FALSE,
#end if
]]></token>
<token name="CSIDE_SINGLE_RUN"><![CDATA[
myRCTD <- run.CSIDE.single(myRCTD,
explanatory.variable,
normalize_expr = $type.normalize_expr,
log_fc_thresh = $type.log_FC_thresh,
fdr_method = "BH", # default
medv = $type.medv,
CSIDE_COMMON_RUN
)
]]></token>
<xml name="sanitizer">
<sanitizer invalid_char="">
<valid initial="string.ascii_letters,string.digits">
<add value="_" />
<add value="-" />
<add value="," />
</valid>
</sanitizer>
</xml>
<xml name="barcodes_input" token_help="" token_label="">
<param argument="barcodes" type="data" format="tabular" optional="false" label="@LABEL@" help="@HELP@" />
</xml>
<xml name="radius">
<param argument="radius" type="integer" min="0" value="50" label="Radius" help="The radius of the exponential filter. Approximately, the distance considered to be a relevant interaction."/>
</xml>
<xml name="cside_common_input">
<param argument="cell_types" type="text" optional="true" label="Cell types used for CSIDE" help="(Comma separated) If null, cell types will be chosen with aggregate occurences of at least 'cell type threshold'."/>
<param argument="cell_type_threshold" type="integer" min="0" value="125" label="Cell type threshold" help="Min occurence of number of cells for each cell type to be used."/>
<param argument="gene_threshold" type="float" min="0" value="0.00005" label="Gene threshold" help="Minimum average normalized expression required for selecting genes."/>
<param argument="doublet_mode" type="boolean" truevalue="TRUE" falsevalue="FALSE" checked="true" label="Use RCTD doublet mode weights?" help="Otherwise, uses RCTD full mode weights." />
<param argument="weight_threshold" type="float" min="0" value="" optional="true" label="Weight threshold" help="The threshold of total normalized weights across all cell types in 'cell types' per pixel to be included in the model."/>
<param argument="sigma_gene" type="boolean" truevalue="TRUE" falsevalue="FALSE" checked="true" label="Fit gene specific overdispersion parameter?" help="If FALSE, overdispersion parameter is same across all genes." />
<param argument="precision_threshold" type="float" min="0" value="0.05" label="Precision threshold" help="For checking for convergence, the maximum parameter change per algorithm step."/>
<param argument="cell_types_present" type="text" optional="true" label="Cell types present" help="(Comma separeated) cell types (a superset of 'cell types') to be considered as occuring often enough to consider for gene expression contamination during the step filtering out marker genes of other cell types."/>
<param argument="fdr" type="float" min="0" value="0.01" label="FDR" help="False discovery rate for hypothesis testing."/>
<param argument="test_genes_sig" type="boolean" truevalue="TRUE" falsevalue="FALSE" checked="true" label="Genes will be tested for significance."/>
</xml>
<xml name="cside_single_input">
<expand macro="cside_common_input"/>
<param argument="normalize_expr" type="boolean" truevalue="TRUE" falsevalue="FALSE" checked="false" label="Constrain total gene expression to sum to 1 in each condition?"/>
<param argument="log_FC_thresh" type="float" min="0" value="0.4" label="LogFC threshold" help="The natural log fold change cutoff for differential expression."/>
<param argument="medv" type="float" min="0" value="0.5" label="Explanatory.variable cutoff" help="For determining if enough pixels for each cell type have explanatory-variable greater than or less than this value."/>
</xml>
<xml name="output">
<section name="output" title="Output Options">
<param name="output_selector" type="select" multiple="true" optional="true" display="checkboxes" label="Select / Deselect all">
<option value="rds">RDS file</option>
<option value="rscript">R script</option>
<yield/>
</param>
</section>
</xml>
<xml name="citations">
<citations>
<citation type="doi">10.1038/s41587-021-00830-w</citation>
<citation type="doi">10.1038/s41592-022-01575-3</citation>
<citation type="bibtex">@Manual{github,
title = {SpatialeXpressionR: Cell type identification and cell type-specific differential expression in spatial transcriptomics.},
author = {Dylan Cable},
url = {https://github.com/dmcable/spacexr}}
</citation>
</citations>
</xml>
</macros>
Loading
Loading