Compare commits

..

No commits in common. "master" and "0.9.9" have entirely different histories.

11 changed files with 48 additions and 422 deletions

208
LICENSE
View file

@ -1,208 +0,0 @@
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
1. Definitions.
"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.
"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.
"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.
"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.
"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.
"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.
"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).
"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.
"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."
"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.
2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.
3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.
4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:
(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and
(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and
(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and
(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.
You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.
5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.
6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.
7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.
8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.
9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.
END OF TERMS AND CONDITIONS
APPENDIX: How to apply the Apache License to your work.
To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.
Copyright [yyyy] [name of copyright owner]
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
This project includes or depends on the following third-party software:
- Cellpose (https://github.com/mouseland/cellpose)
Licensed under the BSD 3-Clause License.
Copyright © 2020 Howard Hughes Medical Institute.
See LICENSES/BSD-3-Clause-cellpose.txt for details.

View file

@ -1,11 +0,0 @@
# From the Cellpose project (https://github.com/mouseland/cellpose)
# Original license text follows:
Copyright © 2020 Howard Hughes Medical Institute
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
Neither the name of HHMI nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

View file

@ -6,13 +6,8 @@
<img alt="Static Badge" src="https://img.shields.io/badge/Redis-6.4.0-red"> <img alt="Static Badge" src="https://img.shields.io/badge/Redis-6.4.0-red">
<img alt="Static Badge" src="https://img.shields.io/badge/JSDelivr-in_use-brown"> <img alt="Static Badge" src="https://img.shields.io/badge/JSDelivr-in_use-brown">
<img alt="Static Badge" src="https://img.shields.io/badge/Flask-3.1.2-8ecae6"> <img alt="Static Badge" src="https://img.shields.io/badge/Flask-3.1.2-8ecae6">
<br><br>
<img width="1920" height="1080" alt="image" src="https://github.com/user-attachments/assets/da5b891e-b4ac-484a-885c-0856f18e04fc" style="height: 70%; width: 70%"/>
</p> </p>
<br> <br>
🌈 实现功能: 🌈 实现功能:
@ -21,19 +16,7 @@
- ⛵️ 训练、分割结果随时下载 - ⛵️ 训练、分割结果随时下载
- 📚 权重可直接作为后续分割模型 - 📚 权重可直接作为后续分割模型
- 🛠️ 一键安装部署脚本 - 🛠️ 一键安装部署脚本
- 🎨 前端样式美化 - 🚧 [TODO] 前端样式美化
<br>
## 🚀一键安装
<b>[最新Release页面](https://github.com/ClovertaTheTrilobita/cellpose-web/releases/latest)</b>中下载最新的 <b>install.sh</b> 到你的Linux/macOS机器上。
将它放到你希望项目存在的位置,并执行它,安装脚本会将项目自动拉取到同一目录下。
**NOTE:** 安装脚本设计上支持Debian系、Arch系、RHEL系Linux,但目前仅测试过Arch Linux。其他发行版暂未经过测试若出现意外错误推荐手动安装。
Windows暂时不支持通过脚本一键安装。
<br> <br>
@ -161,10 +144,3 @@ python main.py
请将Nginx指向<b>[`frontend/index.html`](frontend/index.html)</b> 请将Nginx指向<b>[`frontend/index.html`](frontend/index.html)</b>
如果你在本地部署,你可以在启动后端后直接打开<b>[`index.html`](frontend/index.html)</b>,开始使用。 如果你在本地部署,你可以在启动后端后直接打开<b>[`index.html`](frontend/index.html)</b>,开始使用。
## ⚖License
This project is licensed under the [Apache-2.0 license](LICENSE).
It also includes code and ideas from the [Cellpose](https://github.com/mouseland/cellpose) project,
which is licensed under the [BSD 3-Clause License](LICENSES/BSD-3-Clause-cellpose.txt).

View file

@ -1,5 +1,5 @@
backend: backend:
ip: 192.168.193.141 ip: 10.10.25.240
port: 5000 port: 5000
model: model:

View file

@ -62,20 +62,6 @@ class Cprun:
diameter: float | None = None, diameter: float | None = None,
flow_threshold: float = 0.4, flow_threshold: float = 0.4,
cellprob_threshold: float = 0.0, ): cellprob_threshold: float = 0.0, ):
"""
运行 cellpose 分割
Args:
images: [list] 图片存储路径
time: [str] 开始运行的时间相当于本次运行的ID用于存储运行结果
model: [str] 图像分割所使用的模型
diameter: [float] diameters are used to rescale the image to 30 pix cell diameter.
flow_threshold: [float] flow error threshold (all cells with errors below threshold are kept) (not used for 3D). Defaults to 0.4.
cellprob_threshold: [float] all pixels with value above threshold kept for masks, decrease to find more and larger masks. Defaults to 0.0.
Returns:
"""
if time is None: if time is None:
return [False, "No time received"] return [False, "No time received"]
@ -85,10 +71,9 @@ class Cprun:
message = [f"Using {model} model"] message = [f"Using {model} model"]
# 设定模型参数
model = models.CellposeModel(gpu=True, model_type=model) model = models.CellposeModel(gpu=True, model_type=model)
files = images files = images
imgs = [imread(f) for f in files] # 获取目录中的每一个文件 imgs = [imread(f) for f in files]
masks, flows, styles = model.eval( masks, flows, styles = model.eval(
imgs, imgs,
flow_threshold=flow_threshold, flow_threshold=flow_threshold,
@ -105,7 +90,7 @@ class Cprun:
out = base + "_output" out = base + "_output"
save_masks(imgs, mask, flow, out, tif=True) save_masks(imgs, mask, flow, out, tif=True)
# 用 plot 生成彩色叠加图 # 用 plot 生成彩色叠加图(不依赖 skimage
rgb = plot.image_to_rgb(img, channels=[0, 0]) # 原图转 RGB rgb = plot.image_to_rgb(img, channels=[0, 0]) # 原图转 RGB
over = plot.mask_overlay(rgb, masks=mask, colors=None) # 叠加彩色实例 over = plot.mask_overlay(rgb, masks=mask, colors=None) # 叠加彩色实例
Image.fromarray(over).save(base + "_overlay.png") Image.fromarray(over).save(base + "_overlay.png")

View file

@ -19,19 +19,6 @@ os.environ["CELLPOSE_LOCAL_MODELS_PATH"] = MODELS_DIR
r = redis.Redis(host="127.0.0.1", port=6379, db=0) r = redis.Redis(host="127.0.0.1", port=6379, db=0)
def set_status(task_id, status, train_losses, test_losses, **extra): def set_status(task_id, status, train_losses, test_losses, **extra):
"""
修改redis数据库中某一任务的运行状态
Args:
task_id: 这一任务的时间戳
status: 任务状态
train_losses: 此次任务的训练loss
test_losses: 此次任务的测试loss
**extra:
Returns:
"""
payload = {"status": status, payload = {"status": status,
"updated_at": datetime.datetime.utcnow().isoformat(), "updated_at": datetime.datetime.utcnow().isoformat(),
"train_losses": train_losses.tolist() if hasattr(train_losses, "tolist") else train_losses, "train_losses": train_losses.tolist() if hasattr(train_losses, "tolist") else train_losses,
@ -68,32 +55,6 @@ class Cptrain:
scale_range=None, scale_range=None,
channel_axis: int = None, channel_axis: int = None,
): ):
"""
开始训练
Args:
time: 此次任务的时间戳即任务ID
model_name: 训练结果命名
image_filter:
mask_filter:
base_model:
train_probs:
test_probs:
batch_size:
learning_rate:
n_epochs:
weight_decay:
normalize:
compute_flows:
min_train_masks:
nimg_per_epoch:
rescale:
scale_range:
channel_axis:
Returns:
"""
train_dir = Path(TRAIN_DIR) / time train_dir = Path(TRAIN_DIR) / time
test_dir = Path(TEST_DIR) / time test_dir = Path(TEST_DIR) / time

View file

@ -93,10 +93,15 @@ def run_upload():
return default return default
flow_threshold = _to_float(request.args.get("flow_threshold") or request.form.get("flow_threshold"), 0.4) flow_threshold = _to_float(request.args.get("flow_threshold") or request.form.get("flow_threshold"), 0.4)
cellprob_threshold = _to_float(request.args.get("cellprob_threshold") or request.form.get("cellprob_threshold"),0.0) cellprob_threshold = _to_float(request.args.get("cellprob_threshold") or request.form.get("cellprob_threshold"),
0.0)
diameter_raw = request.args.get("diameter") or request.form.get("diameter") diameter_raw = request.args.get("diameter") or request.form.get("diameter")
diameter = _to_float(diameter_raw, None) if diameter_raw not in (None, "") else None diameter = _to_float(diameter_raw, None) if diameter_raw not in (None, "") else None
print("cpt:" + str(cellprob_threshold))
print("flow:" + str(flow_threshold))
print("diameter:" + str(diameter))
# 将文件保存在本地目录中 # 将文件保存在本地目录中
ts = datetime.datetime.now().strftime("%Y-%m-%d-%H-%M-%S") + f"-{int(time.time()*1000)%1000:03d}" ts = datetime.datetime.now().strftime("%Y-%m-%d-%H-%M-%S") + f"-{int(time.time()*1000)%1000:03d}"
os.makedirs(Path(UPLOAD_DIR) / ts, exist_ok=True) os.makedirs(Path(UPLOAD_DIR) / ts, exist_ok=True)
@ -135,39 +140,19 @@ def run_upload():
@app.post("/train_upload") @app.post("/train_upload")
def train_upload(): def train_upload():
"""
从前端获取训练数据和测试数据并开始训练
Returns:
"""
def _to_float(x, default): def _to_float(x, default):
"""
将变量转为float类型
Args:
x: 变量
default: 默认值
"""
try: try:
return float(x) return float(x)
except (TypeError, ValueError): except (TypeError, ValueError):
return default return default
def _to_int(x, default): def _to_int(x, default):
"""
将变量转为int类型
Args:
x: 变量
default: 默认值
"""
try: try:
return int(x) return int(x)
except (TypeError, ValueError): except (TypeError, ValueError):
return default return default
# 获取从前端传来的参数
ts = datetime.datetime.now().strftime("%Y-%m-%d-%H-%M-%S") + f"-{int(time.time()*1000)%1000:03d}" ts = datetime.datetime.now().strftime("%Y-%m-%d-%H-%M-%S") + f"-{int(time.time()*1000)%1000:03d}"
model_name = request.args.get("model_name") or f"custom_model-{ts}" model_name = request.args.get("model_name") or f"custom_model-{ts}"
image_filter = request.args.get("image_filter") or "_img" image_filter = request.args.get("image_filter") or "_img"
@ -197,7 +182,6 @@ def train_upload():
scale_range = _to_float(request.args.get("scale_range"), None) scale_range = _to_float(request.args.get("scale_range"), None)
channel_axis = _to_int(request.args.get("channel_axis"), None) channel_axis = _to_int(request.args.get("channel_axis"), None)
# 创建工作目录
train_files = request.files.getlist("train_files") train_files = request.files.getlist("train_files")
test_files = request.files.getlist("test_files") test_files = request.files.getlist("test_files")
os.makedirs(Path(TRAIN_DIR) / ts, exist_ok=True) os.makedirs(Path(TRAIN_DIR) / ts, exist_ok=True)
@ -219,30 +203,34 @@ def train_upload():
saved.append(os.path.join(TEST_DIR, ts, name)) saved.append(os.path.join(TEST_DIR, ts, name))
def job(): def job():
"""
子线程方法
"""
return asyncio.run(Cptrain.start_train( return asyncio.run(Cptrain.start_train(
time=ts, model_name=model_name, image_filter=image_filter, mask_filter=mask_filter, base_model=base_model, time=ts,
batch_size=batch_size, learning_rate=learning_rate, n_epochs=n_epochs, weight_decay=weight_decay, model_name=model_name,
normalize=normalize, compute_flows=compute_flows, min_train_masks=min_train_masks, nimg_per_epoch=nimg_per_epoch, image_filter=image_filter,
rescale=rescale, scale_range=scale_range, channel_axis=channel_axis, mask_filter=mask_filter,
base_model=base_model,
batch_size=batch_size,
learning_rate=learning_rate,
n_epochs=n_epochs,
weight_decay=weight_decay,
normalize=normalize,
compute_flows=compute_flows,
min_train_masks=min_train_masks,
nimg_per_epoch=nimg_per_epoch,
rescale=rescale,
scale_range=scale_range,
channel_axis=channel_axis,
)) ))
# 创建一个子线程,防止阻塞主线程
fut = executor.submit(job) fut = executor.submit(job)
def done_cb(f): def done_cb(f):
"""
获取训练结果并存入redis数据库
"""
try: try:
train_losses, test_losses = f.result() train_losses, test_losses = f.result()
set_train_status(ts, "success", train_losses, test_losses) set_train_status(ts, "success", train_losses, test_losses)
except Exception as e: except Exception as e:
set_status(ts, "failed", error=str(e)) set_status(ts, "failed", error=str(e))
# 添加回调在子线程执行完后更新redis中任务状态
fut.add_done_callback(done_cb) fut.add_done_callback(done_cb)
return jsonify({"ok": True, "count": len(saved), "id": ts}) return jsonify({"ok": True, "count": len(saved), "id": ts})
@ -256,20 +244,12 @@ def status():
""" """
task_id = request.args.get('id') task_id = request.args.get('id')
st = get_status(task_id) st = get_status(task_id)
print(st)
if not st: if not st:
return jsonify({"ok": True, "exists": False, "status": "not_found"}), 200 return jsonify({"ok": True, "exists": False, "status": "not_found"}), 200
return jsonify({"ok": True, "exists": True, **st}), 200 return jsonify({"ok": True, "exists": True, **st}), 200
@app.get("/preview") @app.get("/preview")
def preview(): def preview():
"""
获取本次分割结果的预览
Returns:
"""
task_id = request.args.get('id') task_id = request.args.get('id')
task_dir = Path(OUTPUT_DIR) / task_id task_dir = Path(OUTPUT_DIR) / task_id
if not task_dir.exists(): if not task_dir.exists():
@ -294,24 +274,11 @@ def preview():
@app.get("/models") @app.get("/models")
def list_models(): def list_models():
""" models_list = os.listdir(MODELS_DIR)
获取现有模型列表
Returns:
"""
models_list = os.listdir(MODELS_DIR) # 查询模型列表中有哪些文件
return jsonify({"ok": True, "models": models_list}) return jsonify({"ok": True, "models": models_list})
@app.get("/result") @app.get("/result")
def list_results(): def list_results():
"""
获取运行结果
Returns:
"""
task_id = request.args.get('id') task_id = request.args.get('id')
st = get_status(task_id) st = get_status(task_id)
if not st: if not st:

View file

@ -4,7 +4,7 @@ from multiprocessing import Process
if __name__ == "__main__": if __name__ == "__main__":
# 启动测试服务器 # Cprun.run_test()
p = Process(target=run_dev) p = Process(target=run_dev)
p.start() p.start()
print(f"Flask running in PID {p.pid}") print(f"Flask running in PID {p.pid}")

View file

@ -1,7 +1,7 @@
const config = { const config = {
server: { server: {
protocol: 'http', protocol: 'http',
host: '192.168.193.141', host: '10.10.25.240',
port: 5000 port: 5000
} }
}; };

View file

@ -100,7 +100,7 @@
<canvas id="lossChart"></canvas> <canvas id="lossChart"></canvas>
</div> </div>
<!-- 底部小提示 --> <!-- 可选:底部小提示(不影响现有 JS -->
<div class="mt-3 text-secondary small"> <div class="mt-3 text-secondary small">
提示:如果你使用 Chart.js建议设置 <code>responsive: true</code><code>maintainAspectRatio: false</code> 提示:如果你使用 Chart.js建议设置 <code>responsive: true</code><code>maintainAspectRatio: false</code>
本页样式已自动保证画布自适应容器尺寸。 本页样式已自动保证画布自适应容器尺寸。
@ -138,17 +138,12 @@
const data = res.data; const data = res.data;
if (!exists) { if (!exists) {
msg.textContent = `任务 "${ID}" 不存在`; msg.textContent = `id "${ID}" 不存在`;
msg.hidden = false; msg.hidden = false;
cava.hidden = true; cava.hidden = true;
} }
else if (status == "running") { else if (status == "running") {
msg.textContent = `任务 "${ID}" 仍在运行中,请耐心等待片刻后刷新。`; msg.textContent = `id "${ID}" 仍在运行中,请耐心等待片刻后刷新。`;
msg.hidden = false;
cava.hidden = true;
}
else if (status == "failed") {
msg.textContent = `任务 "${ID}" 运行失败,由于:"Error: ${data.error}",请检查上传数据集是否存在问题`;
msg.hidden = false; msg.hidden = false;
cava.hidden = true; cava.hidden = true;
} }

View file

@ -129,61 +129,22 @@ install_arch() {
install_rhel() { install_rhel() {
local package=$1 local package=$1
local SUDO=$(need_sudo) local SUDO=$(need_sudo)
set -e
local PM
if command -v dnf >/dev/null 2>&1; then PM=dnf; else PM=yum; fi
# 识别 RHEL/CentOS 主版本号7/8/9
local ELVER; ELVER="$(rpm -E %rhel 2>/dev/null || echo 0)"
# 优先 dnf旧版用 yum。RHEL/CentOS/Fedora 的 python3 自带 venv # 优先 dnf旧版用 yum。RHEL/CentOS/Fedora 的 python3 自带 venv
if [[ "$package" = "python" ]]; then if command -v dnf >/dev/null 2>&1; then
if command -v dnf >/dev/null 2>&1; then if [[ "$package" = "python" ]]; then
$SUDO dnf -y install python3 python3-pip $SUDO dnf -y install python3 python3-pip
$SUDO dnf -y groupinstall "Development Tools" || true # 开发工具组(可选)
else elif [[ "$package" = "redis" ]]; then
$SUDO dnf -y install redis
fi
$SUDO dnf -y groupinstall "Development Tools" || true
else
if [[ "$package" = "python" ]]; then
$SUDO yum -y install python3 python3-pip || true $SUDO yum -y install python3 python3-pip || true
$SUDO yum -y groupinstall "Development Tools" || true elif [[ "$package" = "redis" ]]; then
fi $SUDO yum install -y redis
elif [[ "$package" = "redis" ]]; then
if [ "$ELVER" -eq 7 ]; then
sudo $PM install -y epel-release
sudo $PM install -y redis
elif [ "$ELVER" -eq 8 ]; then
sudo $PM install -y epel-release
# 启用 PowerToolsEL8
if command -v dnf >/dev/null 2>&1; then
sudo dnf config-manager --set-enabled powertools || true
else
sudo yum install -y dnf-plugins-core || true
sudo yum config-manager --set-enabled powertools || true
fi
# 启用 AppStream 模块里的 redis常见是 6
sudo dnf -y module reset redis 2>/dev/null || true
sudo dnf -y module enable redis:6 2>/dev/null || true
sudo $PM install -y redis
else # EL9 及以上CentOS Stream 9 / RHEL 9
sudo $PM install -y epel-release
# 启用 CRBEL9 的 PowerTools
if command -v dnf >/dev/null 2>&1; then
sudo dnf config-manager --set-enabled crb || true
fi
# 先尝试 EPEL 提供的 redis有的镜像没有
if ! sudo $PM install -y redis; then
# 回退到 Remi 仓库(提供 redis:7
sudo $PM install -y https://rpms.remirepo.net/enterprise/remi-release-9.rpm
sudo dnf -y module reset redis || true
sudo dnf -y module enable redis:7 || true
sudo $PM install -y redis
fi
fi
# 安装后启动服务(不同发行服务名不同)
if command -v systemctl >/dev/null 2>&1; then
sudo systemctl enable --now redis 2>/dev/null || \
sudo systemctl enable --now redis-server 2>/dev/null || true
fi fi
$SUDO yum -y groupinstall "Development Tools" || true
fi fi
} }
@ -249,13 +210,13 @@ install_redis() {
case "$id" in case "$id" in
arch | manjaro) arch | manjaro)
install_arch "redis" install_arch
;; ;;
ubuntu | debian | linuxmint | pop | elementary | neon | kali | raspbian) ubuntu | debian | linuxmint | pop | elementary | neon | kali | raspbian)
install_debian "redis" install_debian
;; ;;
fedora | centos | rhel | rocky | almalinux | ol) fedora | centos | rhel | rocky | almalinux | ol)
install_rhel "redis" install_rhel
;; ;;
*) *)
# 用 ID_LIKE 兜底 # 用 ID_LIKE 兜底
@ -290,7 +251,7 @@ if [ -n "$root" ]; then
else else
echo -e "${YELLOW}==>${RESET} Repo enviroment not found" echo -e "${YELLOW}==>${RESET} Repo enviroment not found"
if ask_yn "Do you wish to clone it from github?" y; then if ask_yn "Do you wish to clone it from github?" y; then
echo -e "${GREEN}==>${RESET} Cloning from remote..." echo "${GREEN}==>${RESET} Cloning from remote..."
git clone https://github.com/ClovertaTheTrilobita/cellpose-web.git git clone https://github.com/ClovertaTheTrilobita/cellpose-web.git
if ! cd cellpose-web; then if ! cd cellpose-web; then