Skip to content
Merged
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
9 changes: 9 additions & 0 deletions HISTORY.rst
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,15 @@
History
=======

1.4.1 (2026-06-16)
------------------
* Improved speed of random spot generation used in permutation testing.

API and Bug Fixes:
* Fixed up docstring and types for various CCI methods.
* Fixes for issues #350 and #300 with incorrect types.
* Upgrade libraries: pillow>=12.0.0,<13.0

1.4.0 (2026-05-01)
------------------
* Removed tensorflow and keras and replaced with torch and torchvision.
Expand Down
2 changes: 2 additions & 0 deletions docs/index.rst
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,8 @@ undissociated tissue sample.
Latest Additions
----------------

.. include:: release_notes/1.4.1.rst

.. include:: release_notes/1.4.0.rst

.. include:: release_notes/1.3.0.rst
Expand Down
11 changes: 11 additions & 0 deletions docs/release_notes/1.4.1.rst
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1.4.1 `2026-06-16`
~~~~~~~~~~~~~~~~~~~~~~~~~

.. rubric:: Features
* Improved speed of random spot generation used in permutation testing.

.. rubric:: Bugs

* Fixed up docstring and types for various CCI methods.
* Fixes for issues #350 and #300 with incorrect types.
* Upgrade libraries: pillow>=12.0.0,<13.0
2 changes: 2 additions & 0 deletions docs/release_notes/index.rst
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
Release Notes
===================================================

.. include:: 1.4.1.rst

.. include:: 1.4.0.rst

.. include:: 1.3.0.rst
Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"

[project]
name = "stlearn"
version = "1.4.0"
version = "1.4.1"
authors = [
{ name = "Genomics and Machine Learning Lab", email = "andrew.newman@uq.edu.au" },
]
Expand All@@ -20,7 +20,7 @@ dependencies = [
"leidenalg>=0.11.0",
"numba>=0.58.1",
"numpy>=2.4.0",
"pillow>=11.0.0,<12.0",
"pillow>=12.0.0,<13.0",
"scanpy>=1.12.0",
"scikit-image>=0.22.0",
"pandas>=2.3.0",
Expand Down
2 changes: 1 addition & 1 deletion stlearn/__init__.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@

__author__ = """Genomics and Machine Learning Lab"""
__email__ = "andrew.newman@uq.edu.au"
__version__ = "1.4.0"
__version__ = "1.4.1"

from . import add, datasets, em, pl, pp, spatial, tl, types
from ._settings import settings
Expand Down
36 changes: 24 additions & 12 deletions stlearn/adds/add_mask.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,9 +38,11 @@ def add_mask(
library_id = next(iter(adata.uns["spatial"].keys()))
quality = adata.uns["spatial"][library_id]["use_quality"]
except Exception as e:
raise KeyError("""\
raise KeyError(
"""\
Please read ST data first and try again
""") from e
"""
) from e

if imgpath is not None and os.path.isfile(imgpath):
try:
Expand All@@ -59,13 +61,17 @@ def add_mask(
adata.uns["mask_image"][library_id][key][quality] = img
print("Added tissue mask to the object!")
except Exception as e:
raise ValueError(f"""\
raise ValueError(
f"""\
{imgpath!r} does not end on a valid extension.
""") from e
"""
) from e
else:
raise ValueError(f"""\
raise ValueError(
f"""\
{imgpath!r} does not end on a valid extension.
""")
"""
)
return adata if copy else None


Expand DownExpand Up@@ -128,9 +134,11 @@ def apply_mask(
library_id = next(iter(adata.uns["spatial"].keys()))
quality = adata.uns["spatial"][library_id]["use_quality"]
except Exception as e:
raise KeyError("""\
raise KeyError(
"""\
Please read ST data first and try again
""") from e
"""
) from e

if masks == "all":
masks = list(adata.uns["mask_image"][library_id].keys())
Expand All@@ -144,9 +152,11 @@ def apply_mask(
try:
mask_image = adata.uns["mask_image"][library_id][mask][quality]
except Exception as e:
raise KeyError(f"""\
raise KeyError(
f"""\
Please load mask {mask} images first and try again
""") from e
"""
) from e

# Normalise to uint8 if the image is float in [0, 1]
if mask_image.dtype.kind == "f" and mask_image.max() <= 1.0:
Expand All@@ -157,9 +167,11 @@ def apply_mask(
elif select == "white":
mask_image = np.where(mask_image >= 155, 1, 0)
else:
raise ValueError("""\
raise ValueError(
"""\
Only support black and white mask yet.
""")
"""
)
mask_image_2d = mask_image.mean(axis=2)

def apply_spot_mask(x, _mask=mask, _i=i, _mask_image_2d=mask_image_2d):
Expand Down
12 changes: 8 additions & 4 deletions stlearn/adds/image.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -71,11 +71,15 @@ def image(

print("Added tissue image to the object!")
except Exception as e:
raise ValueError(f"""\
raise ValueError(
f"""\
{imgpath!r} does not end on a valid extension.
""") from e
"""
) from e
else:
raise ValueError(f"""\
raise ValueError(
f"""\
{imgpath!r} does not end on a valid extension.
""")
"""
)
return adata if copy else None
6 changes: 4 additions & 2 deletions stlearn/spatial/sme/_weighting_matrix.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,9 +36,11 @@ def row_col_by_platform(
array_col = adata.obs_names.map(lambda x: x.split("x")[0])
rate = 1.5
else:
raise ValueError(f"""\
raise ValueError(
f"""\
{platform!r} does not support.
""")
"""
)
regression = LinearRegression()
reg_row: LinearRegression = regression.fit(array_row.values.reshape(-1, 1), img_row) # type: ignore
reg_col: LinearRegression = regression.fit(array_col.values.reshape(-1, 1), img_col) # type: ignore
Expand Down
6 changes: 4 additions & 2 deletions stlearn/spatial/sme/pseudo_spot.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -172,9 +172,11 @@ def pseudo_spot(
).reset_index()
obs_df.drop_duplicates(subset=["array_row", "array_col"], keep="last")
else:
raise ValueError(f"""\
raise ValueError(
f"""\
{platform!r} does not support.
""")
"""
)

reg_row = LinearRegression().fit(array_row.values.reshape(-1, 1), img_row)

Expand Down
6 changes: 4 additions & 2 deletions stlearn/spatial/sme/sme_impute0.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -61,9 +61,11 @@ def sme_impute0(
elif isinstance(adata.X, pd.Dataframe):
count_embed = adata.X.values
else:
raise ValueError(f"""\
raise ValueError(
f"""\
{type(adata.X)} is not a valid type.
""")
"""
)
else:
count_embed = adata.obsm[use_data]

Expand Down
6 changes: 4 additions & 2 deletions stlearn/spatial/sme/sme_normalize.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -61,9 +61,11 @@ def sme_normalize(
elif isinstance(adata.X, pd.Dataframe):
count_embed = adata.X.values
else:
raise ValueError(f"""\
raise ValueError(
f"""\
{type(adata.X)} is not a valid type.
""")
"""
)
else:
count_embed = adata.obsm[use_data]

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Fix data type errors by newmana · Pull Request #352 · BiomedicalMachineLearning/stLearn · GitHub
Skip to content
Merged
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
9 changes: 9 additions & 0 deletions HISTORY.rst
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,15 @@
History
=======

1.4.1 (2026-06-16)
------------------
* Improved speed of random spot generation used in permutation testing.

API and Bug Fixes:
* Fixed up docstring and types for various CCI methods.
* Fixes for issues #350 and #300 with incorrect types.
* Upgrade libraries: pillow>=12.0.0,<13.0

1.4.0 (2026-05-01)
------------------
* Removed tensorflow and keras and replaced with torch and torchvision.
Expand Down
2 changes: 2 additions & 0 deletions docs/index.rst
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,8 @@ undissociated tissue sample.
Latest Additions
----------------

.. include:: release_notes/1.4.1.rst

.. include:: release_notes/1.4.0.rst

.. include:: release_notes/1.3.0.rst
Expand Down
11 changes: 11 additions & 0 deletions docs/release_notes/1.4.1.rst
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1.4.1 `2026-06-16`
~~~~~~~~~~~~~~~~~~~~~~~~~

.. rubric:: Features
* Improved speed of random spot generation used in permutation testing.

.. rubric:: Bugs

* Fixed up docstring and types for various CCI methods.
* Fixes for issues #350 and #300 with incorrect types.
* Upgrade libraries: pillow>=12.0.0,<13.0
2 changes: 2 additions & 0 deletions docs/release_notes/index.rst
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
Release Notes
===================================================

.. include:: 1.4.1.rst

.. include:: 1.4.0.rst

.. include:: 1.3.0.rst
Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"

[project]
name = "stlearn"
version = "1.4.0"
version = "1.4.1"
authors = [
{ name = "Genomics and Machine Learning Lab", email = "andrew.newman@uq.edu.au" },
]
Expand All@@ -20,7 +20,7 @@ dependencies = [
"leidenalg>=0.11.0",
"numba>=0.58.1",
"numpy>=2.4.0",
"pillow>=11.0.0,<12.0",
"pillow>=12.0.0,<13.0",
"scanpy>=1.12.0",
"scikit-image>=0.22.0",
"pandas>=2.3.0",
Expand Down
2 changes: 1 addition & 1 deletion stlearn/__init__.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@

__author__ = """Genomics and Machine Learning Lab"""
__email__ = "andrew.newman@uq.edu.au"
__version__ = "1.4.0"
__version__ = "1.4.1"

from . import add, datasets, em, pl, pp, spatial, tl, types
from ._settings import settings
Expand Down
36 changes: 24 additions & 12 deletions stlearn/adds/add_mask.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,9 +38,11 @@ def add_mask(
library_id = next(iter(adata.uns["spatial"].keys()))
quality = adata.uns["spatial"][library_id]["use_quality"]
except Exception as e:
raise KeyError("""\
raise KeyError(
"""\
Please read ST data first and try again
""") from e
"""
) from e

if imgpath is not None and os.path.isfile(imgpath):
try:
Expand All@@ -59,13 +61,17 @@ def add_mask(
adata.uns["mask_image"][library_id][key][quality] = img
print("Added tissue mask to the object!")
except Exception as e:
raise ValueError(f"""\
raise ValueError(
f"""\
{imgpath!r} does not end on a valid extension.
""") from e
"""
) from e
else:
raise ValueError(f"""\
raise ValueError(
f"""\
{imgpath!r} does not end on a valid extension.
""")
"""
)
return adata if copy else None


Expand DownExpand Up@@ -128,9 +134,11 @@ def apply_mask(
library_id = next(iter(adata.uns["spatial"].keys()))
quality = adata.uns["spatial"][library_id]["use_quality"]
except Exception as e:
raise KeyError("""\
raise KeyError(
"""\
Please read ST data first and try again
""") from e
"""
) from e

if masks == "all":
masks = list(adata.uns["mask_image"][library_id].keys())
Expand All@@ -144,9 +152,11 @@ def apply_mask(
try:
mask_image = adata.uns["mask_image"][library_id][mask][quality]
except Exception as e:
raise KeyError(f"""\
raise KeyError(
f"""\
Please load mask {mask} images first and try again
""") from e
"""
) from e

# Normalise to uint8 if the image is float in [0, 1]
if mask_image.dtype.kind == "f" and mask_image.max() <= 1.0:
Expand All@@ -157,9 +167,11 @@ def apply_mask(
elif select == "white":
mask_image = np.where(mask_image >= 155, 1, 0)
else:
raise ValueError("""\
raise ValueError(
"""\
Only support black and white mask yet.
""")
"""
)
mask_image_2d = mask_image.mean(axis=2)

def apply_spot_mask(x, _mask=mask, _i=i, _mask_image_2d=mask_image_2d):
Expand Down
12 changes: 8 additions & 4 deletions stlearn/adds/image.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -71,11 +71,15 @@ def image(

print("Added tissue image to the object!")
except Exception as e:
raise ValueError(f"""\
raise ValueError(
f"""\
{imgpath!r} does not end on a valid extension.
""") from e
"""
) from e
else:
raise ValueError(f"""\
raise ValueError(
f"""\
{imgpath!r} does not end on a valid extension.
""")
"""
)
return adata if copy else None
6 changes: 4 additions & 2 deletions stlearn/spatial/sme/_weighting_matrix.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,9 +36,11 @@ def row_col_by_platform(
array_col = adata.obs_names.map(lambda x: x.split("x")[0])
rate = 1.5
else:
raise ValueError(f"""\
raise ValueError(
f"""\
{platform!r} does not support.
""")
"""
)
regression = LinearRegression()
reg_row: LinearRegression = regression.fit(array_row.values.reshape(-1, 1), img_row) # type: ignore
reg_col: LinearRegression = regression.fit(array_col.values.reshape(-1, 1), img_col) # type: ignore
Expand Down
6 changes: 4 additions & 2 deletions stlearn/spatial/sme/pseudo_spot.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -172,9 +172,11 @@ def pseudo_spot(
).reset_index()
obs_df.drop_duplicates(subset=["array_row", "array_col"], keep="last")
else:
raise ValueError(f"""\
raise ValueError(
f"""\
{platform!r} does not support.
""")
"""
)

reg_row = LinearRegression().fit(array_row.values.reshape(-1, 1), img_row)

Expand Down
6 changes: 4 additions & 2 deletions stlearn/spatial/sme/sme_impute0.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -61,9 +61,11 @@ def sme_impute0(
elif isinstance(adata.X, pd.Dataframe):
count_embed = adata.X.values
else:
raise ValueError(f"""\
raise ValueError(
f"""\
{type(adata.X)} is not a valid type.
""")
"""
)
else:
count_embed = adata.obsm[use_data]

Expand Down
6 changes: 4 additions & 2 deletions stlearn/spatial/sme/sme_normalize.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -61,9 +61,11 @@ def sme_normalize(
elif isinstance(adata.X, pd.Dataframe):
count_embed = adata.X.values
else:
raise ValueError(f"""\
raise ValueError(
f"""\
{type(adata.X)} is not a valid type.
""")
"""
)
else:
count_embed = adata.obsm[use_data]

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Fix data type errors by newmana · Pull Request #352 · BiomedicalMachineLearning/stLearn · GitHub
Skip to content
Merged
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
9 changes: 9 additions & 0 deletions HISTORY.rst
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,15 @@
History
=======

1.4.1 (2026-06-16)
------------------
* Improved speed of random spot generation used in permutation testing.

API and Bug Fixes:
* Fixed up docstring and types for various CCI methods.
* Fixes for issues #350 and #300 with incorrect types.
* Upgrade libraries: pillow>=12.0.0,<13.0

1.4.0 (2026-05-01)
------------------
* Removed tensorflow and keras and replaced with torch and torchvision.
Expand Down
2 changes: 2 additions & 0 deletions docs/index.rst
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,8 @@ undissociated tissue sample.
Latest Additions
----------------

.. include:: release_notes/1.4.1.rst

.. include:: release_notes/1.4.0.rst

.. include:: release_notes/1.3.0.rst
Expand Down
11 changes: 11 additions & 0 deletions docs/release_notes/1.4.1.rst
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1.4.1 `2026-06-16`
~~~~~~~~~~~~~~~~~~~~~~~~~

.. rubric:: Features
* Improved speed of random spot generation used in permutation testing.

.. rubric:: Bugs

* Fixed up docstring and types for various CCI methods.
* Fixes for issues #350 and #300 with incorrect types.
* Upgrade libraries: pillow>=12.0.0,<13.0
2 changes: 2 additions & 0 deletions docs/release_notes/index.rst
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
Release Notes
===================================================

.. include:: 1.4.1.rst

.. include:: 1.4.0.rst

.. include:: 1.3.0.rst
Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"

[project]
name = "stlearn"
version = "1.4.0"
version = "1.4.1"
authors = [
{ name = "Genomics and Machine Learning Lab", email = "andrew.newman@uq.edu.au" },
]
Expand All@@ -20,7 +20,7 @@ dependencies = [
"leidenalg>=0.11.0",
"numba>=0.58.1",
"numpy>=2.4.0",
"pillow>=11.0.0,<12.0",
"pillow>=12.0.0,<13.0",
"scanpy>=1.12.0",
"scikit-image>=0.22.0",
"pandas>=2.3.0",
Expand Down
2 changes: 1 addition & 1 deletion stlearn/__init__.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@

__author__ = """Genomics and Machine Learning Lab"""
__email__ = "andrew.newman@uq.edu.au"
__version__ = "1.4.0"
__version__ = "1.4.1"

from . import add, datasets, em, pl, pp, spatial, tl, types
from ._settings import settings
Expand Down
36 changes: 24 additions & 12 deletions stlearn/adds/add_mask.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,9 +38,11 @@ def add_mask(
library_id = next(iter(adata.uns["spatial"].keys()))
quality = adata.uns["spatial"][library_id]["use_quality"]
except Exception as e:
raise KeyError("""\
raise KeyError(
"""\
Please read ST data first and try again
""") from e
"""
) from e

if imgpath is not None and os.path.isfile(imgpath):
try:
Expand All@@ -59,13 +61,17 @@ def add_mask(
adata.uns["mask_image"][library_id][key][quality] = img
print("Added tissue mask to the object!")
except Exception as e:
raise ValueError(f"""\
raise ValueError(
f"""\
{imgpath!r} does not end on a valid extension.
""") from e
"""
) from e
else:
raise ValueError(f"""\
raise ValueError(
f"""\
{imgpath!r} does not end on a valid extension.
""")
"""
)
return adata if copy else None


Expand DownExpand Up@@ -128,9 +134,11 @@ def apply_mask(
library_id = next(iter(adata.uns["spatial"].keys()))
quality = adata.uns["spatial"][library_id]["use_quality"]
except Exception as e:
raise KeyError("""\
raise KeyError(
"""\
Please read ST data first and try again
""") from e
"""
) from e

if masks == "all":
masks = list(adata.uns["mask_image"][library_id].keys())
Expand All@@ -144,9 +152,11 @@ def apply_mask(
try:
mask_image = adata.uns["mask_image"][library_id][mask][quality]
except Exception as e:
raise KeyError(f"""\
raise KeyError(
f"""\
Please load mask {mask} images first and try again
""") from e
"""
) from e

# Normalise to uint8 if the image is float in [0, 1]
if mask_image.dtype.kind == "f" and mask_image.max() <= 1.0:
Expand All@@ -157,9 +167,11 @@ def apply_mask(
elif select == "white":
mask_image = np.where(mask_image >= 155, 1, 0)
else:
raise ValueError("""\
raise ValueError(
"""\
Only support black and white mask yet.
""")
"""
)
mask_image_2d = mask_image.mean(axis=2)

def apply_spot_mask(x, _mask=mask, _i=i, _mask_image_2d=mask_image_2d):
Expand Down
12 changes: 8 additions & 4 deletions stlearn/adds/image.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -71,11 +71,15 @@ def image(

print("Added tissue image to the object!")
except Exception as e:
raise ValueError(f"""\
raise ValueError(
f"""\
{imgpath!r} does not end on a valid extension.
""") from e
"""
) from e
else:
raise ValueError(f"""\
raise ValueError(
f"""\
{imgpath!r} does not end on a valid extension.
""")
"""
)
return adata if copy else None
6 changes: 4 additions & 2 deletions stlearn/spatial/sme/_weighting_matrix.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,9 +36,11 @@ def row_col_by_platform(
array_col = adata.obs_names.map(lambda x: x.split("x")[0])
rate = 1.5
else:
raise ValueError(f"""\
raise ValueError(
f"""\
{platform!r} does not support.
""")
"""
)
regression = LinearRegression()
reg_row: LinearRegression = regression.fit(array_row.values.reshape(-1, 1), img_row) # type: ignore
reg_col: LinearRegression = regression.fit(array_col.values.reshape(-1, 1), img_col) # type: ignore
Expand Down
6 changes: 4 additions & 2 deletions stlearn/spatial/sme/pseudo_spot.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -172,9 +172,11 @@ def pseudo_spot(
).reset_index()
obs_df.drop_duplicates(subset=["array_row", "array_col"], keep="last")
else:
raise ValueError(f"""\
raise ValueError(
f"""\
{platform!r} does not support.
""")
"""
)

reg_row = LinearRegression().fit(array_row.values.reshape(-1, 1), img_row)

Expand Down
6 changes: 4 additions & 2 deletions stlearn/spatial/sme/sme_impute0.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -61,9 +61,11 @@ def sme_impute0(
elif isinstance(adata.X, pd.Dataframe):
count_embed = adata.X.values
else:
raise ValueError(f"""\
raise ValueError(
f"""\
{type(adata.X)} is not a valid type.
""")
"""
)
else:
count_embed = adata.obsm[use_data]

Expand Down
6 changes: 4 additions & 2 deletions stlearn/spatial/sme/sme_normalize.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -61,9 +61,11 @@ def sme_normalize(
elif isinstance(adata.X, pd.Dataframe):
count_embed = adata.X.values
else:
raise ValueError(f"""\
raise ValueError(
f"""\
{type(adata.X)} is not a valid type.
""")
"""
)
else:
count_embed = adata.obsm[use_data]

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Fix data type errors by newmana · Pull Request #352 · BiomedicalMachineLearning/stLearn · GitHub
Skip to content
Merged
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
9 changes: 9 additions & 0 deletions HISTORY.rst
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,15 @@
History
=======

1.4.1 (2026-06-16)
------------------
* Improved speed of random spot generation used in permutation testing.

API and Bug Fixes:
* Fixed up docstring and types for various CCI methods.
* Fixes for issues #350 and #300 with incorrect types.
* Upgrade libraries: pillow>=12.0.0,<13.0

1.4.0 (2026-05-01)
------------------
* Removed tensorflow and keras and replaced with torch and torchvision.
Expand Down
2 changes: 2 additions & 0 deletions docs/index.rst
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,8 @@ undissociated tissue sample.
Latest Additions
----------------

.. include:: release_notes/1.4.1.rst

.. include:: release_notes/1.4.0.rst

.. include:: release_notes/1.3.0.rst
Expand Down
11 changes: 11 additions & 0 deletions docs/release_notes/1.4.1.rst
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1.4.1 `2026-06-16`
~~~~~~~~~~~~~~~~~~~~~~~~~

.. rubric:: Features
* Improved speed of random spot generation used in permutation testing.

.. rubric:: Bugs

* Fixed up docstring and types for various CCI methods.
* Fixes for issues #350 and #300 with incorrect types.
* Upgrade libraries: pillow>=12.0.0,<13.0
2 changes: 2 additions & 0 deletions docs/release_notes/index.rst
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
Release Notes
===================================================

.. include:: 1.4.1.rst

.. include:: 1.4.0.rst

.. include:: 1.3.0.rst
Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"

[project]
name = "stlearn"
version = "1.4.0"
version = "1.4.1"
authors = [
{ name = "Genomics and Machine Learning Lab", email = "andrew.newman@uq.edu.au" },
]
Expand All@@ -20,7 +20,7 @@ dependencies = [
"leidenalg>=0.11.0",
"numba>=0.58.1",
"numpy>=2.4.0",
"pillow>=11.0.0,<12.0",
"pillow>=12.0.0,<13.0",
"scanpy>=1.12.0",
"scikit-image>=0.22.0",
"pandas>=2.3.0",
Expand Down
2 changes: 1 addition & 1 deletion stlearn/__init__.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@

__author__ = """Genomics and Machine Learning Lab"""
__email__ = "andrew.newman@uq.edu.au"
__version__ = "1.4.0"
__version__ = "1.4.1"

from . import add, datasets, em, pl, pp, spatial, tl, types
from ._settings import settings
Expand Down
36 changes: 24 additions & 12 deletions stlearn/adds/add_mask.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,9 +38,11 @@ def add_mask(
library_id = next(iter(adata.uns["spatial"].keys()))
quality = adata.uns["spatial"][library_id]["use_quality"]
except Exception as e:
raise KeyError("""\
raise KeyError(
"""\
Please read ST data first and try again
""") from e
"""
) from e

if imgpath is not None and os.path.isfile(imgpath):
try:
Expand All@@ -59,13 +61,17 @@ def add_mask(
adata.uns["mask_image"][library_id][key][quality] = img
print("Added tissue mask to the object!")
except Exception as e:
raise ValueError(f"""\
raise ValueError(
f"""\
{imgpath!r} does not end on a valid extension.
""") from e
"""
) from e
else:
raise ValueError(f"""\
raise ValueError(
f"""\
{imgpath!r} does not end on a valid extension.
""")
"""
)
return adata if copy else None


Expand DownExpand Up@@ -128,9 +134,11 @@ def apply_mask(
library_id = next(iter(adata.uns["spatial"].keys()))
quality = adata.uns["spatial"][library_id]["use_quality"]
except Exception as e:
raise KeyError("""\
raise KeyError(
"""\
Please read ST data first and try again
""") from e
"""
) from e

if masks == "all":
masks = list(adata.uns["mask_image"][library_id].keys())
Expand All@@ -144,9 +152,11 @@ def apply_mask(
try:
mask_image = adata.uns["mask_image"][library_id][mask][quality]
except Exception as e:
raise KeyError(f"""\
raise KeyError(
f"""\
Please load mask {mask} images first and try again
""") from e
"""
) from e

# Normalise to uint8 if the image is float in [0, 1]
if mask_image.dtype.kind == "f" and mask_image.max() <= 1.0:
Expand All@@ -157,9 +167,11 @@ def apply_mask(
elif select == "white":
mask_image = np.where(mask_image >= 155, 1, 0)
else:
raise ValueError("""\
raise ValueError(
"""\
Only support black and white mask yet.
""")
"""
)
mask_image_2d = mask_image.mean(axis=2)

def apply_spot_mask(x, _mask=mask, _i=i, _mask_image_2d=mask_image_2d):
Expand Down
12 changes: 8 additions & 4 deletions stlearn/adds/image.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -71,11 +71,15 @@ def image(

print("Added tissue image to the object!")
except Exception as e:
raise ValueError(f"""\
raise ValueError(
f"""\
{imgpath!r} does not end on a valid extension.
""") from e
"""
) from e
else:
raise ValueError(f"""\
raise ValueError(
f"""\
{imgpath!r} does not end on a valid extension.
""")
"""
)
return adata if copy else None
6 changes: 4 additions & 2 deletions stlearn/spatial/sme/_weighting_matrix.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,9 +36,11 @@ def row_col_by_platform(
array_col = adata.obs_names.map(lambda x: x.split("x")[0])
rate = 1.5
else:
raise ValueError(f"""\
raise ValueError(
f"""\
{platform!r} does not support.
""")
"""
)
regression = LinearRegression()
reg_row: LinearRegression = regression.fit(array_row.values.reshape(-1, 1), img_row) # type: ignore
reg_col: LinearRegression = regression.fit(array_col.values.reshape(-1, 1), img_col) # type: ignore
Expand Down
6 changes: 4 additions & 2 deletions stlearn/spatial/sme/pseudo_spot.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -172,9 +172,11 @@ def pseudo_spot(
).reset_index()
obs_df.drop_duplicates(subset=["array_row", "array_col"], keep="last")
else:
raise ValueError(f"""\
raise ValueError(
f"""\
{platform!r} does not support.
""")
"""
)

reg_row = LinearRegression().fit(array_row.values.reshape(-1, 1), img_row)

Expand Down
6 changes: 4 additions & 2 deletions stlearn/spatial/sme/sme_impute0.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -61,9 +61,11 @@ def sme_impute0(
elif isinstance(adata.X, pd.Dataframe):
count_embed = adata.X.values
else:
raise ValueError(f"""\
raise ValueError(
f"""\
{type(adata.X)} is not a valid type.
""")
"""
)
else:
count_embed = adata.obsm[use_data]

Expand Down
6 changes: 4 additions & 2 deletions stlearn/spatial/sme/sme_normalize.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -61,9 +61,11 @@ def sme_normalize(
elif isinstance(adata.X, pd.Dataframe):
count_embed = adata.X.values
else:
raise ValueError(f"""\
raise ValueError(
f"""\
{type(adata.X)} is not a valid type.
""")
"""
)
else:
count_embed = adata.obsm[use_data]

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' Fix data type errors by newmana · Pull Request #352 · BiomedicalMachineLearning/stLearn · GitHub
Skip to content
Merged
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
9 changes: 9 additions & 0 deletions HISTORY.rst
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,15 @@
History
=======

1.4.1 (2026-06-16)
------------------
* Improved speed of random spot generation used in permutation testing.

API and Bug Fixes:
* Fixed up docstring and types for various CCI methods.
* Fixes for issues #350 and #300 with incorrect types.
* Upgrade libraries: pillow>=12.0.0,<13.0

1.4.0 (2026-05-01)
------------------
* Removed tensorflow and keras and replaced with torch and torchvision.
Expand Down
2 changes: 2 additions & 0 deletions docs/index.rst
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,8 @@ undissociated tissue sample.
Latest Additions
----------------

.. include:: release_notes/1.4.1.rst

.. include:: release_notes/1.4.0.rst

.. include:: release_notes/1.3.0.rst
Expand Down
11 changes: 11 additions & 0 deletions docs/release_notes/1.4.1.rst
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1.4.1 `2026-06-16`
~~~~~~~~~~~~~~~~~~~~~~~~~

.. rubric:: Features
* Improved speed of random spot generation used in permutation testing.

.. rubric:: Bugs

* Fixed up docstring and types for various CCI methods.
* Fixes for issues #350 and #300 with incorrect types.
* Upgrade libraries: pillow>=12.0.0,<13.0
2 changes: 2 additions & 0 deletions docs/release_notes/index.rst
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
Release Notes
===================================================

.. include:: 1.4.1.rst

.. include:: 1.4.0.rst

.. include:: 1.3.0.rst
Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"

[project]
name = "stlearn"
version = "1.4.0"
version = "1.4.1"
authors = [
{ name = "Genomics and Machine Learning Lab", email = "andrew.newman@uq.edu.au" },
]
Expand All@@ -20,7 +20,7 @@ dependencies = [
"leidenalg>=0.11.0",
"numba>=0.58.1",
"numpy>=2.4.0",
"pillow>=11.0.0,<12.0",
"pillow>=12.0.0,<13.0",
"scanpy>=1.12.0",
"scikit-image>=0.22.0",
"pandas>=2.3.0",
Expand Down
2 changes: 1 addition & 1 deletion stlearn/__init__.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@

__author__ = """Genomics and Machine Learning Lab"""
__email__ = "andrew.newman@uq.edu.au"
__version__ = "1.4.0"
__version__ = "1.4.1"

from . import add, datasets, em, pl, pp, spatial, tl, types
from ._settings import settings
Expand Down
36 changes: 24 additions & 12 deletions stlearn/adds/add_mask.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,9 +38,11 @@ def add_mask(
library_id = next(iter(adata.uns["spatial"].keys()))
quality = adata.uns["spatial"][library_id]["use_quality"]
except Exception as e:
raise KeyError("""\
raise KeyError(
"""\
Please read ST data first and try again
""") from e
"""
) from e

if imgpath is not None and os.path.isfile(imgpath):
try:
Expand All@@ -59,13 +61,17 @@ def add_mask(
adata.uns["mask_image"][library_id][key][quality] = img
print("Added tissue mask to the object!")
except Exception as e:
raise ValueError(f"""\
raise ValueError(
f"""\
{imgpath!r} does not end on a valid extension.
""") from e
"""
) from e
else:
raise ValueError(f"""\
raise ValueError(
f"""\
{imgpath!r} does not end on a valid extension.
""")
"""
)
return adata if copy else None


Expand DownExpand Up@@ -128,9 +134,11 @@ def apply_mask(
library_id = next(iter(adata.uns["spatial"].keys()))
quality = adata.uns["spatial"][library_id]["use_quality"]
except Exception as e:
raise KeyError("""\
raise KeyError(
"""\
Please read ST data first and try again
""") from e
"""
) from e

if masks == "all":
masks = list(adata.uns["mask_image"][library_id].keys())
Expand All@@ -144,9 +152,11 @@ def apply_mask(
try:
mask_image = adata.uns["mask_image"][library_id][mask][quality]
except Exception as e:
raise KeyError(f"""\
raise KeyError(
f"""\
Please load mask {mask} images first and try again
""") from e
"""
) from e

# Normalise to uint8 if the image is float in [0, 1]
if mask_image.dtype.kind == "f" and mask_image.max() <= 1.0:
Expand All@@ -157,9 +167,11 @@ def apply_mask(
elif select == "white":
mask_image = np.where(mask_image >= 155, 1, 0)
else:
raise ValueError("""\
raise ValueError(
"""\
Only support black and white mask yet.
""")
"""
)
mask_image_2d = mask_image.mean(axis=2)

def apply_spot_mask(x, _mask=mask, _i=i, _mask_image_2d=mask_image_2d):
Expand Down
12 changes: 8 additions & 4 deletions stlearn/adds/image.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -71,11 +71,15 @@ def image(

print("Added tissue image to the object!")
except Exception as e:
raise ValueError(f"""\
raise ValueError(
f"""\
{imgpath!r} does not end on a valid extension.
""") from e
"""
) from e
else:
raise ValueError(f"""\
raise ValueError(
f"""\
{imgpath!r} does not end on a valid extension.
""")
"""
)
return adata if copy else None
6 changes: 4 additions & 2 deletions stlearn/spatial/sme/_weighting_matrix.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,9 +36,11 @@ def row_col_by_platform(
array_col = adata.obs_names.map(lambda x: x.split("x")[0])
rate = 1.5
else:
raise ValueError(f"""\
raise ValueError(
f"""\
{platform!r} does not support.
""")
"""
)
regression = LinearRegression()
reg_row: LinearRegression = regression.fit(array_row.values.reshape(-1, 1), img_row) # type: ignore
reg_col: LinearRegression = regression.fit(array_col.values.reshape(-1, 1), img_col) # type: ignore
Expand Down
6 changes: 4 additions & 2 deletions stlearn/spatial/sme/pseudo_spot.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -172,9 +172,11 @@ def pseudo_spot(
).reset_index()
obs_df.drop_duplicates(subset=["array_row", "array_col"], keep="last")
else:
raise ValueError(f"""\
raise ValueError(
f"""\
{platform!r} does not support.
""")
"""
)

reg_row = LinearRegression().fit(array_row.values.reshape(-1, 1), img_row)

Expand Down
6 changes: 4 additions & 2 deletions stlearn/spatial/sme/sme_impute0.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -61,9 +61,11 @@ def sme_impute0(
elif isinstance(adata.X, pd.Dataframe):
count_embed = adata.X.values
else:
raise ValueError(f"""\
raise ValueError(
f"""\
{type(adata.X)} is not a valid type.
""")
"""
)
else:
count_embed = adata.obsm[use_data]

Expand Down
6 changes: 4 additions & 2 deletions stlearn/spatial/sme/sme_normalize.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -61,9 +61,11 @@ def sme_normalize(
elif isinstance(adata.X, pd.Dataframe):
count_embed = adata.X.values
else:
raise ValueError(f"""\
raise ValueError(
f"""\
{type(adata.X)} is not a valid type.
""")
"""
)
else:
count_embed = adata.obsm[use_data]

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Fix data type errors by newmana · Pull Request #352 · BiomedicalMachineLearning/stLearn · GitHub
Skip to content
Merged
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
9 changes: 9 additions & 0 deletions HISTORY.rst
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,15 @@
History
=======

1.4.1 (2026-06-16)
------------------
* Improved speed of random spot generation used in permutation testing.

API and Bug Fixes:
* Fixed up docstring and types for various CCI methods.
* Fixes for issues #350 and #300 with incorrect types.
* Upgrade libraries: pillow>=12.0.0,<13.0

1.4.0 (2026-05-01)
------------------
* Removed tensorflow and keras and replaced with torch and torchvision.
Expand Down
2 changes: 2 additions & 0 deletions docs/index.rst
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,8 @@ undissociated tissue sample.
Latest Additions
----------------

.. include:: release_notes/1.4.1.rst

.. include:: release_notes/1.4.0.rst

.. include:: release_notes/1.3.0.rst
Expand Down
11 changes: 11 additions & 0 deletions docs/release_notes/1.4.1.rst
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1.4.1 `2026-06-16`
~~~~~~~~~~~~~~~~~~~~~~~~~

.. rubric:: Features
* Improved speed of random spot generation used in permutation testing.

.. rubric:: Bugs

* Fixed up docstring and types for various CCI methods.
* Fixes for issues #350 and #300 with incorrect types.
* Upgrade libraries: pillow>=12.0.0,<13.0
2 changes: 2 additions & 0 deletions docs/release_notes/index.rst
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
Release Notes
===================================================

.. include:: 1.4.1.rst

.. include:: 1.4.0.rst

.. include:: 1.3.0.rst
Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"

[project]
name = "stlearn"
version = "1.4.0"
version = "1.4.1"
authors = [
{ name = "Genomics and Machine Learning Lab", email = "andrew.newman@uq.edu.au" },
]
Expand All@@ -20,7 +20,7 @@ dependencies = [
"leidenalg>=0.11.0",
"numba>=0.58.1",
"numpy>=2.4.0",
"pillow>=11.0.0,<12.0",
"pillow>=12.0.0,<13.0",
"scanpy>=1.12.0",
"scikit-image>=0.22.0",
"pandas>=2.3.0",
Expand Down
2 changes: 1 addition & 1 deletion stlearn/__init__.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@

__author__ = """Genomics and Machine Learning Lab"""
__email__ = "andrew.newman@uq.edu.au"
__version__ = "1.4.0"
__version__ = "1.4.1"

from . import add, datasets, em, pl, pp, spatial, tl, types
from ._settings import settings
Expand Down
36 changes: 24 additions & 12 deletions stlearn/adds/add_mask.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,9 +38,11 @@ def add_mask(
library_id = next(iter(adata.uns["spatial"].keys()))
quality = adata.uns["spatial"][library_id]["use_quality"]
except Exception as e:
raise KeyError("""\
raise KeyError(
"""\
Please read ST data first and try again
""") from e
"""
) from e

if imgpath is not None and os.path.isfile(imgpath):
try:
Expand All@@ -59,13 +61,17 @@ def add_mask(
adata.uns["mask_image"][library_id][key][quality] = img
print("Added tissue mask to the object!")
except Exception as e:
raise ValueError(f"""\
raise ValueError(
f"""\
{imgpath!r} does not end on a valid extension.
""") from e
"""
) from e
else:
raise ValueError(f"""\
raise ValueError(
f"""\
{imgpath!r} does not end on a valid extension.
""")
"""
)
return adata if copy else None


Expand DownExpand Up@@ -128,9 +134,11 @@ def apply_mask(
library_id = next(iter(adata.uns["spatial"].keys()))
quality = adata.uns["spatial"][library_id]["use_quality"]
except Exception as e:
raise KeyError("""\
raise KeyError(
"""\
Please read ST data first and try again
""") from e
"""
) from e

if masks == "all":
masks = list(adata.uns["mask_image"][library_id].keys())
Expand All@@ -144,9 +152,11 @@ def apply_mask(
try:
mask_image = adata.uns["mask_image"][library_id][mask][quality]
except Exception as e:
raise KeyError(f"""\
raise KeyError(
f"""\
Please load mask {mask} images first and try again
""") from e
"""
) from e

# Normalise to uint8 if the image is float in [0, 1]
if mask_image.dtype.kind == "f" and mask_image.max() <= 1.0:
Expand All@@ -157,9 +167,11 @@ def apply_mask(
elif select == "white":
mask_image = np.where(mask_image >= 155, 1, 0)
else:
raise ValueError("""\
raise ValueError(
"""\
Only support black and white mask yet.
""")
"""
)
mask_image_2d = mask_image.mean(axis=2)

def apply_spot_mask(x, _mask=mask, _i=i, _mask_image_2d=mask_image_2d):
Expand Down
12 changes: 8 additions & 4 deletions stlearn/adds/image.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -71,11 +71,15 @@ def image(

print("Added tissue image to the object!")
except Exception as e:
raise ValueError(f"""\
raise ValueError(
f"""\
{imgpath!r} does not end on a valid extension.
""") from e
"""
) from e
else:
raise ValueError(f"""\
raise ValueError(
f"""\
{imgpath!r} does not end on a valid extension.
""")
"""
)
return adata if copy else None
6 changes: 4 additions & 2 deletions stlearn/spatial/sme/_weighting_matrix.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,9 +36,11 @@ def row_col_by_platform(
array_col = adata.obs_names.map(lambda x: x.split("x")[0])
rate = 1.5
else:
raise ValueError(f"""\
raise ValueError(
f"""\
{platform!r} does not support.
""")
"""
)
regression = LinearRegression()
reg_row: LinearRegression = regression.fit(array_row.values.reshape(-1, 1), img_row) # type: ignore
reg_col: LinearRegression = regression.fit(array_col.values.reshape(-1, 1), img_col) # type: ignore
Expand Down
6 changes: 4 additions & 2 deletions stlearn/spatial/sme/pseudo_spot.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -172,9 +172,11 @@ def pseudo_spot(
).reset_index()
obs_df.drop_duplicates(subset=["array_row", "array_col"], keep="last")
else:
raise ValueError(f"""\
raise ValueError(
f"""\
{platform!r} does not support.
""")
"""
)

reg_row = LinearRegression().fit(array_row.values.reshape(-1, 1), img_row)

Expand Down
6 changes: 4 additions & 2 deletions stlearn/spatial/sme/sme_impute0.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -61,9 +61,11 @@ def sme_impute0(
elif isinstance(adata.X, pd.Dataframe):
count_embed = adata.X.values
else:
raise ValueError(f"""\
raise ValueError(
f"""\
{type(adata.X)} is not a valid type.
""")
"""
)
else:
count_embed = adata.obsm[use_data]

Expand Down
6 changes: 4 additions & 2 deletions stlearn/spatial/sme/sme_normalize.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -61,9 +61,11 @@ def sme_normalize(
elif isinstance(adata.X, pd.Dataframe):
count_embed = adata.X.values
else:
raise ValueError(f"""\
raise ValueError(
f"""\
{type(adata.X)} is not a valid type.
""")
"""
)
else:
count_embed = adata.obsm[use_data]

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Fix data type errors by newmana · Pull Request #352 · BiomedicalMachineLearning/stLearn · GitHub
Skip to content
Merged
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
9 changes: 9 additions & 0 deletions HISTORY.rst
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,15 @@
History
=======

1.4.1 (2026-06-16)
------------------
* Improved speed of random spot generation used in permutation testing.

API and Bug Fixes:
* Fixed up docstring and types for various CCI methods.
* Fixes for issues #350 and #300 with incorrect types.
* Upgrade libraries: pillow>=12.0.0,<13.0

1.4.0 (2026-05-01)
------------------
* Removed tensorflow and keras and replaced with torch and torchvision.
Expand Down
2 changes: 2 additions & 0 deletions docs/index.rst
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,8 @@ undissociated tissue sample.
Latest Additions
----------------

.. include:: release_notes/1.4.1.rst

.. include:: release_notes/1.4.0.rst

.. include:: release_notes/1.3.0.rst
Expand Down
11 changes: 11 additions & 0 deletions docs/release_notes/1.4.1.rst
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1.4.1 `2026-06-16`
~~~~~~~~~~~~~~~~~~~~~~~~~

.. rubric:: Features
* Improved speed of random spot generation used in permutation testing.

.. rubric:: Bugs

* Fixed up docstring and types for various CCI methods.
* Fixes for issues #350 and #300 with incorrect types.
* Upgrade libraries: pillow>=12.0.0,<13.0
2 changes: 2 additions & 0 deletions docs/release_notes/index.rst
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
Release Notes
===================================================

.. include:: 1.4.1.rst

.. include:: 1.4.0.rst

.. include:: 1.3.0.rst
Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"

[project]
name = "stlearn"
version = "1.4.0"
version = "1.4.1"
authors = [
{ name = "Genomics and Machine Learning Lab", email = "andrew.newman@uq.edu.au" },
]
Expand All@@ -20,7 +20,7 @@ dependencies = [
"leidenalg>=0.11.0",
"numba>=0.58.1",
"numpy>=2.4.0",
"pillow>=11.0.0,<12.0",
"pillow>=12.0.0,<13.0",
"scanpy>=1.12.0",
"scikit-image>=0.22.0",
"pandas>=2.3.0",
Expand Down
2 changes: 1 addition & 1 deletion stlearn/__init__.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@

__author__ = """Genomics and Machine Learning Lab"""
__email__ = "andrew.newman@uq.edu.au"
__version__ = "1.4.0"
__version__ = "1.4.1"

from . import add, datasets, em, pl, pp, spatial, tl, types
from ._settings import settings
Expand Down
36 changes: 24 additions & 12 deletions stlearn/adds/add_mask.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,9 +38,11 @@ def add_mask(
library_id = next(iter(adata.uns["spatial"].keys()))
quality = adata.uns["spatial"][library_id]["use_quality"]
except Exception as e:
raise KeyError("""\
raise KeyError(
"""\
Please read ST data first and try again
""") from e
"""
) from e

if imgpath is not None and os.path.isfile(imgpath):
try:
Expand All@@ -59,13 +61,17 @@ def add_mask(
adata.uns["mask_image"][library_id][key][quality] = img
print("Added tissue mask to the object!")
except Exception as e:
raise ValueError(f"""\
raise ValueError(
f"""\
{imgpath!r} does not end on a valid extension.
""") from e
"""
) from e
else:
raise ValueError(f"""\
raise ValueError(
f"""\
{imgpath!r} does not end on a valid extension.
""")
"""
)
return adata if copy else None


Expand DownExpand Up@@ -128,9 +134,11 @@ def apply_mask(
library_id = next(iter(adata.uns["spatial"].keys()))
quality = adata.uns["spatial"][library_id]["use_quality"]
except Exception as e:
raise KeyError("""\
raise KeyError(
"""\
Please read ST data first and try again
""") from e
"""
) from e

if masks == "all":
masks = list(adata.uns["mask_image"][library_id].keys())
Expand All@@ -144,9 +152,11 @@ def apply_mask(
try:
mask_image = adata.uns["mask_image"][library_id][mask][quality]
except Exception as e:
raise KeyError(f"""\
raise KeyError(
f"""\
Please load mask {mask} images first and try again
""") from e
"""
) from e

# Normalise to uint8 if the image is float in [0, 1]
if mask_image.dtype.kind == "f" and mask_image.max() <= 1.0:
Expand All@@ -157,9 +167,11 @@ def apply_mask(
elif select == "white":
mask_image = np.where(mask_image >= 155, 1, 0)
else:
raise ValueError("""\
raise ValueError(
"""\
Only support black and white mask yet.
""")
"""
)
mask_image_2d = mask_image.mean(axis=2)

def apply_spot_mask(x, _mask=mask, _i=i, _mask_image_2d=mask_image_2d):
Expand Down
12 changes: 8 additions & 4 deletions stlearn/adds/image.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -71,11 +71,15 @@ def image(

print("Added tissue image to the object!")
except Exception as e:
raise ValueError(f"""\
raise ValueError(
f"""\
{imgpath!r} does not end on a valid extension.
""") from e
"""
) from e
else:
raise ValueError(f"""\
raise ValueError(
f"""\
{imgpath!r} does not end on a valid extension.
""")
"""
)
return adata if copy else None
6 changes: 4 additions & 2 deletions stlearn/spatial/sme/_weighting_matrix.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,9 +36,11 @@ def row_col_by_platform(
array_col = adata.obs_names.map(lambda x: x.split("x")[0])
rate = 1.5
else:
raise ValueError(f"""\
raise ValueError(
f"""\
{platform!r} does not support.
""")
"""
)
regression = LinearRegression()
reg_row: LinearRegression = regression.fit(array_row.values.reshape(-1, 1), img_row) # type: ignore
reg_col: LinearRegression = regression.fit(array_col.values.reshape(-1, 1), img_col) # type: ignore
Expand Down
6 changes: 4 additions & 2 deletions stlearn/spatial/sme/pseudo_spot.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -172,9 +172,11 @@ def pseudo_spot(
).reset_index()
obs_df.drop_duplicates(subset=["array_row", "array_col"], keep="last")
else:
raise ValueError(f"""\
raise ValueError(
f"""\
{platform!r} does not support.
""")
"""
)

reg_row = LinearRegression().fit(array_row.values.reshape(-1, 1), img_row)

Expand Down
6 changes: 4 additions & 2 deletions stlearn/spatial/sme/sme_impute0.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -61,9 +61,11 @@ def sme_impute0(
elif isinstance(adata.X, pd.Dataframe):
count_embed = adata.X.values
else:
raise ValueError(f"""\
raise ValueError(
f"""\
{type(adata.X)} is not a valid type.
""")
"""
)
else:
count_embed = adata.obsm[use_data]

Expand Down
6 changes: 4 additions & 2 deletions stlearn/spatial/sme/sme_normalize.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -61,9 +61,11 @@ def sme_normalize(
elif isinstance(adata.X, pd.Dataframe):
count_embed = adata.X.values
else:
raise ValueError(f"""\
raise ValueError(
f"""\
{type(adata.X)} is not a valid type.
""")
"""
)
else:
count_embed = adata.obsm[use_data]

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })(); Fix data type errors by newmana · Pull Request #352 · BiomedicalMachineLearning/stLearn · GitHub
Skip to content
Merged
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
9 changes: 9 additions & 0 deletions HISTORY.rst
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,15 @@
History
=======

1.4.1 (2026-06-16)
------------------
* Improved speed of random spot generation used in permutation testing.

API and Bug Fixes:
* Fixed up docstring and types for various CCI methods.
* Fixes for issues #350 and #300 with incorrect types.
* Upgrade libraries: pillow>=12.0.0,<13.0

1.4.0 (2026-05-01)
------------------
* Removed tensorflow and keras and replaced with torch and torchvision.
Expand Down
2 changes: 2 additions & 0 deletions docs/index.rst
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,8 @@ undissociated tissue sample.
Latest Additions
----------------

.. include:: release_notes/1.4.1.rst

.. include:: release_notes/1.4.0.rst

.. include:: release_notes/1.3.0.rst
Expand Down
11 changes: 11 additions & 0 deletions docs/release_notes/1.4.1.rst
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1.4.1 `2026-06-16`
~~~~~~~~~~~~~~~~~~~~~~~~~

.. rubric:: Features
* Improved speed of random spot generation used in permutation testing.

.. rubric:: Bugs

* Fixed up docstring and types for various CCI methods.
* Fixes for issues #350 and #300 with incorrect types.
* Upgrade libraries: pillow>=12.0.0,<13.0
2 changes: 2 additions & 0 deletions docs/release_notes/index.rst
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
Release Notes
===================================================

.. include:: 1.4.1.rst

.. include:: 1.4.0.rst

.. include:: 1.3.0.rst
Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"

[project]
name = "stlearn"
version = "1.4.0"
version = "1.4.1"
authors = [
{ name = "Genomics and Machine Learning Lab", email = "andrew.newman@uq.edu.au" },
]
Expand All@@ -20,7 +20,7 @@ dependencies = [
"leidenalg>=0.11.0",
"numba>=0.58.1",
"numpy>=2.4.0",
"pillow>=11.0.0,<12.0",
"pillow>=12.0.0,<13.0",
"scanpy>=1.12.0",
"scikit-image>=0.22.0",
"pandas>=2.3.0",
Expand Down
2 changes: 1 addition & 1 deletion stlearn/__init__.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@

__author__ = """Genomics and Machine Learning Lab"""
__email__ = "andrew.newman@uq.edu.au"
__version__ = "1.4.0"
__version__ = "1.4.1"

from . import add, datasets, em, pl, pp, spatial, tl, types
from ._settings import settings
Expand Down
36 changes: 24 additions & 12 deletions stlearn/adds/add_mask.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,9 +38,11 @@ def add_mask(
library_id = next(iter(adata.uns["spatial"].keys()))
quality = adata.uns["spatial"][library_id]["use_quality"]
except Exception as e:
raise KeyError("""\
raise KeyError(
"""\
Please read ST data first and try again
""") from e
"""
) from e

if imgpath is not None and os.path.isfile(imgpath):
try:
Expand All@@ -59,13 +61,17 @@ def add_mask(
adata.uns["mask_image"][library_id][key][quality] = img
print("Added tissue mask to the object!")
except Exception as e:
raise ValueError(f"""\
raise ValueError(
f"""\
{imgpath!r} does not end on a valid extension.
""") from e
"""
) from e
else:
raise ValueError(f"""\
raise ValueError(
f"""\
{imgpath!r} does not end on a valid extension.
""")
"""
)
return adata if copy else None


Expand DownExpand Up@@ -128,9 +134,11 @@ def apply_mask(
library_id = next(iter(adata.uns["spatial"].keys()))
quality = adata.uns["spatial"][library_id]["use_quality"]
except Exception as e:
raise KeyError("""\
raise KeyError(
"""\
Please read ST data first and try again
""") from e
"""
) from e

if masks == "all":
masks = list(adata.uns["mask_image"][library_id].keys())
Expand All@@ -144,9 +152,11 @@ def apply_mask(
try:
mask_image = adata.uns["mask_image"][library_id][mask][quality]
except Exception as e:
raise KeyError(f"""\
raise KeyError(
f"""\
Please load mask {mask} images first and try again
""") from e
"""
) from e

# Normalise to uint8 if the image is float in [0, 1]
if mask_image.dtype.kind == "f" and mask_image.max() <= 1.0:
Expand All@@ -157,9 +167,11 @@ def apply_mask(
elif select == "white":
mask_image = np.where(mask_image >= 155, 1, 0)
else:
raise ValueError("""\
raise ValueError(
"""\
Only support black and white mask yet.
""")
"""
)
mask_image_2d = mask_image.mean(axis=2)

def apply_spot_mask(x, _mask=mask, _i=i, _mask_image_2d=mask_image_2d):
Expand Down
12 changes: 8 additions & 4 deletions stlearn/adds/image.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -71,11 +71,15 @@ def image(

print("Added tissue image to the object!")
except Exception as e:
raise ValueError(f"""\
raise ValueError(
f"""\
{imgpath!r} does not end on a valid extension.
""") from e
"""
) from e
else:
raise ValueError(f"""\
raise ValueError(
f"""\
{imgpath!r} does not end on a valid extension.
""")
"""
)
return adata if copy else None
6 changes: 4 additions & 2 deletions stlearn/spatial/sme/_weighting_matrix.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,9 +36,11 @@ def row_col_by_platform(
array_col = adata.obs_names.map(lambda x: x.split("x")[0])
rate = 1.5
else:
raise ValueError(f"""\
raise ValueError(
f"""\
{platform!r} does not support.
""")
"""
)
regression = LinearRegression()
reg_row: LinearRegression = regression.fit(array_row.values.reshape(-1, 1), img_row) # type: ignore
reg_col: LinearRegression = regression.fit(array_col.values.reshape(-1, 1), img_col) # type: ignore
Expand Down
6 changes: 4 additions & 2 deletions stlearn/spatial/sme/pseudo_spot.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -172,9 +172,11 @@ def pseudo_spot(
).reset_index()
obs_df.drop_duplicates(subset=["array_row", "array_col"], keep="last")
else:
raise ValueError(f"""\
raise ValueError(
f"""\
{platform!r} does not support.
""")
"""
)

reg_row = LinearRegression().fit(array_row.values.reshape(-1, 1), img_row)

Expand Down
6 changes: 4 additions & 2 deletions stlearn/spatial/sme/sme_impute0.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -61,9 +61,11 @@ def sme_impute0(
elif isinstance(adata.X, pd.Dataframe):
count_embed = adata.X.values
else:
raise ValueError(f"""\
raise ValueError(
f"""\
{type(adata.X)} is not a valid type.
""")
"""
)
else:
count_embed = adata.obsm[use_data]

Expand Down
6 changes: 4 additions & 2 deletions stlearn/spatial/sme/sme_normalize.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -61,9 +61,11 @@ def sme_normalize(
elif isinstance(adata.X, pd.Dataframe):
count_embed = adata.X.values
else:
raise ValueError(f"""\
raise ValueError(
f"""\
{type(adata.X)} is not a valid type.
""")
"""
)
else:
count_embed = adata.obsm[use_data]

Expand Down
Loading