Fixed the .str error in cytotrace2 (#146)

Starlitnightly · Sep 25, 2024 · 7833649 · 7833649
1 parent 30d7564
commit 7833649
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 3 deletions.
diff --git a/omicverse/externel/cytotrace2/gen_utils.py b/omicverse/externel/cytotrace2/gen_utils.py
@@ -151,6 +151,7 @@ def predict(ranked_data, cell_names, model_dir, batch_size = 10000):
     all_order_test = []
 
     all_models_path = pd.Series(np.array([os.path.join(dp, f) for dp, dn, fn in os.walk(os.path.expanduser(model_dir)) for f in fn]))
+    all_models_path = all_models_path.astype(str)  # 确保所有元素都是字符串
     all_models_path = all_models_path[all_models_path.str.endswith('.pt')]
 
 

diff --git a/omicverse/externel/flowsig/plotting/__init__.py b/omicverse/externel/flowsig/plotting/__init__.py
@@ -1 +1 @@
-from ._plotting import plot_intercellular_flows_from_inflows, plot_intercellular_flows_from_gems, plot_intercellular_flows_from_outflows
+from ._plotting import subset_for_flow_type,plot_intercellular_flows_from_inflows, plot_intercellular_flows_from_gems, plot_intercellular_flows_from_outflows
diff --git a/omicverse/externel/flowsig/plotting/_plotting.py b/omicverse/externel/flowsig/plotting/_plotting.py
@@ -29,7 +29,7 @@ def subset_for_flow_type(adata: sc.AnnData,
 
     if var_type != 'all':
 
-        adata_subset = adata_subset[:, adata_subset.var['Type'].isin(list(var_type))]
+        adata_subset = adata_subset[:, adata_subset.var['Type'].isin([var_type])]
 
     return adata_subset
 

diff --git a/omicverse_guide/docs/Release_notes.md b/omicverse_guide/docs/Release_notes.md
@@ -469,6 +469,7 @@ Support Raw Windows platform
 
 - Fixed the error of `get_results` and `get_results_rfc` in `cNMF` module. (#143) (#139)
 - Added `sccaf` to obtain the best clusters.
+- Fixed the `.str` error in cytotrace2 (#146)
 
 ### Bulk Module
 

diff --git a/pyproject.toml b/pyproject.toml
@@ -27,7 +27,7 @@ classifiers = [
 ]
 dependencies = [
     'numpy>=1.23',
-    'scanpy>=1.10',
+    'scanpy>=1.9',
     'pandas>=1.5',
     'matplotlib<3.7',
     'scikit-learn>=1.2',
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		from ._plotting import plot_intercellular_flows_from_inflows, plot_intercellular_flows_from_gems, plot_intercellular_flows_from_outflows
		from ._plotting import subset_for_flow_type,plot_intercellular_flows_from_inflows, plot_intercellular_flows_from_gems, plot_intercellular_flows_from_outflows