merge-cli 3.2.0__tar.gz → 3.2.1__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (24) hide show
  1. {merge_cli-3.2.0 → merge_cli-3.2.1}/PKG-INFO +1 -1
  2. {merge_cli-3.2.0 → merge_cli-3.2.1}/merge_cli/api.py +7 -1
  3. {merge_cli-3.2.0 → merge_cli-3.2.1}/merge_cli/cli.py +2 -6
  4. {merge_cli-3.2.0 → merge_cli-3.2.1}/merge_cli.egg-info/PKG-INFO +1 -1
  5. {merge_cli-3.2.0 → merge_cli-3.2.1}/pyproject.toml +1 -1
  6. {merge_cli-3.2.0 → merge_cli-3.2.1}/merge_cli/__init__.py +0 -0
  7. {merge_cli-3.2.0 → merge_cli-3.2.1}/merge_cli/cli_env_patch.py +0 -0
  8. {merge_cli-3.2.0 → merge_cli-3.2.1}/merge_cli/config.py +0 -0
  9. {merge_cli-3.2.0 → merge_cli-3.2.1}/merge_cli/data/__init__.py +0 -0
  10. {merge_cli-3.2.0 → merge_cli-3.2.1}/merge_cli/data/models/.gitkeep +0 -0
  11. {merge_cli-3.2.0 → merge_cli-3.2.1}/merge_cli/data/models/BestModel_Clinvar-noncoding.pkl +0 -0
  12. {merge_cli-3.2.0 → merge_cli-3.2.1}/merge_cli/data/models/BestModel_Clinvar.pkl +0 -0
  13. {merge_cli-3.2.0 → merge_cli-3.2.1}/merge_cli/data/models/BestModel_Splice_Unsupervised Only.pkl +0 -0
  14. {merge_cli-3.2.0 → merge_cli-3.2.1}/merge_cli/data/models/__init__.py +0 -0
  15. {merge_cli-3.2.0 → merge_cli-3.2.1}/merge_cli/data/models/ensemble_predict.py +0 -0
  16. {merge_cli-3.2.0 → merge_cli-3.2.1}/merge_cli/ensemble_predict.py +0 -0
  17. {merge_cli-3.2.0 → merge_cli-3.2.1}/merge_cli/local_engine.py +0 -0
  18. {merge_cli-3.2.0 → merge_cli-3.2.1}/merge_cli/output.py +0 -0
  19. {merge_cli-3.2.0 → merge_cli-3.2.1}/merge_cli.egg-info/SOURCES.txt +0 -0
  20. {merge_cli-3.2.0 → merge_cli-3.2.1}/merge_cli.egg-info/dependency_links.txt +0 -0
  21. {merge_cli-3.2.0 → merge_cli-3.2.1}/merge_cli.egg-info/entry_points.txt +0 -0
  22. {merge_cli-3.2.0 → merge_cli-3.2.1}/merge_cli.egg-info/requires.txt +0 -0
  23. {merge_cli-3.2.0 → merge_cli-3.2.1}/merge_cli.egg-info/top_level.txt +0 -0
  24. {merge_cli-3.2.0 → merge_cli-3.2.1}/setup.cfg +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: merge-cli
3
- Version: 3.2.0
3
+ Version: 3.2.1
4
4
  Summary: MERGE 变异致病性预测 CLI(服务器固定,集成模型内嵌,无需手动配置)
5
5
  Project-URL: Homepage, https://merge.fanglab.cn
6
6
  Requires-Python: >=3.11
@@ -62,8 +62,14 @@ def predict_single(
62
62
  # ─────────────────────────────────────────────────────────────
63
63
  # 2. 集成模型评分 POST /ensemble/
64
64
  # ─────────────────────────────────────────────────────────────
65
- def predict_ensemble(prediction: dict, all_transcripts: list) -> dict:
65
+ def predict_ensemble(
66
+ prediction: dict,
67
+ all_transcripts: list,
68
+ ensemble_type: Optional[str] = None,
69
+ ) -> dict:
66
70
  payload = {"prediction": prediction, "all_transcripts": all_transcripts}
71
+ if ensemble_type:
72
+ payload["ensemble_type"] = ensemble_type
67
73
  resp = requests.post(
68
74
  f"{_BASE}/ensemble/",
69
75
  json=payload,
@@ -206,7 +206,7 @@ def config_show():
206
206
  help="手动指定变异类型(跳过 ANNOVAR)")
207
207
  @_add_model_options
208
208
  def predict(chrom, pos, ref, alt, genome, fmt, no_ensemble,
209
- use_local, ensemble_type, local_genome_path, **kwargs):
209
+ use_local, ensemble_type, **kwargs):
210
210
  """单变异致病性预测(远程 / 本地模式)。
211
211
 
212
212
  \b
@@ -256,10 +256,6 @@ def predict(chrom, pos, ref, alt, genome, fmt, no_ensemble,
256
256
  dbnsfp = prediction.get("dbnsfp") or {}
257
257
  transcripts = [dbnsfp] if dbnsfp else []
258
258
  # FIX #7: 自动通过远程 ANNOVAR 判断变异类型
259
- if not ensemble_type:
260
- from . import local_engine as _le
261
- ensemble_type = _le.get_variant_type(
262
- chrom, pos, ref, alt, genome)
263
259
  ens_resp = api.predict_ensemble(prediction, transcripts,
264
260
  ensemble_type=ensemble_type)
265
261
  if ens_resp.get("success"):
@@ -604,7 +600,7 @@ def local_download(file_type):
604
600
  help="手动指定变异类型(跳过 ANNOVAR):coding / noncoding / splice")
605
601
  @_add_model_options
606
602
  def local_predict(chrom, pos, ref, alt, genome, fmt,
607
- no_ensemble, ensemble_type, local_genome_path=None, **kwargs):
603
+ no_ensemble, ensemble_type, **kwargs):
608
604
  """完全在本地运行单变异预测,无速率限制。
609
605
 
610
606
  \b
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: merge-cli
3
- Version: 3.2.0
3
+ Version: 3.2.1
4
4
  Summary: MERGE 变异致病性预测 CLI(服务器固定,集成模型内嵌,无需手动配置)
5
5
  Project-URL: Homepage, https://merge.fanglab.cn
6
6
  Requires-Python: >=3.11
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
4
4
 
5
5
  [project]
6
6
  name = "merge-cli"
7
- version = "3.2.0"
7
+ version = "3.2.1"
8
8
  description = "MERGE 变异致病性预测 CLI(服务器固定,集成模型内嵌,无需手动配置)"
9
9
  requires-python = ">=3.11"
10
10
  dependencies = [
File without changes
File without changes
File without changes