mirror of
https://github.com/kvcache-ai/ktransformers.git
synced 2026-04-28 11:49:51 +00:00
Fix/sglang kt detection (#1875)
* [feat]: simplify sglang installation with submodule, auto-sync CI, and version alignment
- Add kvcache-ai/sglang as git submodule at third_party/sglang (branch = main)
- Add top-level install.sh for one-click source installation (sglang + kt-kernel)
- Add sglang-kt as hard dependency in kt-kernel/pyproject.toml
- Add CI workflow to auto-sync sglang submodule daily and create PR
- Add CI workflow to build and publish sglang-kt to PyPI
- Integrate sglang-kt build into release-pypi.yml (version.py bump publishes both packages)
- Align sglang-kt version with ktransformers via SGLANG_KT_VERSION env var injection
- Update Dockerfile to use submodule and inject aligned version
- Update all 13 doc files, CLI hints, and i18n strings to reference new install methods
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
* [build]: bump version to 0.5.2
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
* [build]: rename PyPI package from kt-kernel to ktransformers
Users can now `pip install ktransformers` to get everything
(sglang-kt is auto-installed as a dependency).
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
* Revert "[build]: rename PyPI package from kt-kernel to ktransformers"
This reverts commit e0cbbf6364.
* [build]: add ktransformers meta-package for PyPI
`pip install ktransformers` now works as a single install command.
It pulls kt-kernel (which in turn pulls sglang-kt).
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
* [fix]: show sglang-kt package version in kt version command
- Prioritize sglang-kt package version (aligned with ktransformers)
over sglang internal __version__
- Update display name from "sglang" to "sglang-kt"
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
* [fix]: improve sglang-kt detection in kt doctor and kt version
Recognize sglang-kt package name as proof of kvcache-ai fork installation.
Previously both commands fell through to "PyPI (not recommended)" for
non-editable local source installs. Now version.py reuses the centralized
check_sglang_installation() logic.
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
* [build]: bump version to 0.5.2.post1
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---------
Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
Jianwei Dong
GitHub
parent
9e69fccb02
commit
15c624dcae
29 changed files with 787 additions and 179 deletions
|
|
@ -369,7 +369,19 @@ def doctor(
|
|||
sglang_info = check_sglang_installation()
|
||||
|
||||
if sglang_info["installed"]:
|
||||
if sglang_info["from_source"]:
|
||||
if sglang_info.get("is_kvcache_fork"):
|
||||
# Package name is sglang-kt — this is definitively the kvcache-ai fork
|
||||
if sglang_info["from_source"] and sglang_info["git_info"]:
|
||||
git_remote = sglang_info["git_info"].get("remote", "unknown")
|
||||
git_branch = sglang_info["git_info"].get("branch", "unknown")
|
||||
sglang_source_value = f"sglang-kt (Source: {git_remote}, branch: {git_branch})"
|
||||
elif sglang_info["editable"]:
|
||||
sglang_source_value = "sglang-kt (editable)"
|
||||
else:
|
||||
sglang_source_value = "sglang-kt"
|
||||
sglang_source_status = "ok"
|
||||
sglang_source_hint = None
|
||||
elif sglang_info["from_source"]:
|
||||
if sglang_info["git_info"]:
|
||||
git_remote = sglang_info["git_info"].get("remote", "unknown")
|
||||
git_branch = sglang_info["git_info"].get("branch", "unknown")
|
||||
|
|
@ -381,7 +393,7 @@ def doctor(
|
|||
sglang_source_status = "ok"
|
||||
sglang_source_hint = None
|
||||
else:
|
||||
sglang_source_value = "PyPI (not recommended)"
|
||||
sglang_source_value = "PyPI sglang (not kvcache-ai fork)"
|
||||
sglang_source_status = "warning"
|
||||
sglang_source_hint = t("sglang_pypi_hint")
|
||||
else:
|
||||
|
|
@ -411,7 +423,7 @@ def doctor(
|
|||
else:
|
||||
kt_kernel_value = t("sglang_kt_kernel_not_supported")
|
||||
kt_kernel_status = "error"
|
||||
kt_kernel_hint = 'Reinstall SGLang from: git clone https://github.com/kvcache-ai/sglang && cd sglang && pip install -e "python[all]"'
|
||||
kt_kernel_hint = "Reinstall SGLang: pip uninstall sglang -y && pip install sglang-kt (or run ./install.sh from ktransformers root)"
|
||||
issues_found = True
|
||||
|
||||
checks.append(
|
||||
|
|
|
|||
|
|
@ -16,54 +16,38 @@ from kt_kernel.cli.utils.environment import detect_cuda_version, get_installed_p
|
|||
|
||||
|
||||
def _get_sglang_info() -> str:
|
||||
"""Get sglang version and installation source information."""
|
||||
try:
|
||||
import sglang
|
||||
"""Get sglang-kt version and installation source information."""
|
||||
from kt_kernel.cli.utils.sglang_checker import check_sglang_installation
|
||||
|
||||
version = getattr(sglang, "__version__", None)
|
||||
info = check_sglang_installation()
|
||||
|
||||
if not version:
|
||||
version = get_installed_package_version("sglang")
|
||||
|
||||
if not version:
|
||||
return t("version_not_installed")
|
||||
|
||||
# Try to detect installation source
|
||||
from pathlib import Path
|
||||
import subprocess
|
||||
|
||||
if hasattr(sglang, "__file__") and sglang.__file__:
|
||||
location = Path(sglang.__file__).parent.parent
|
||||
git_dir = location / ".git"
|
||||
|
||||
if git_dir.exists():
|
||||
# Installed from git (editable install)
|
||||
try:
|
||||
# Get remote URL
|
||||
result = subprocess.run(
|
||||
["git", "remote", "get-url", "origin"],
|
||||
cwd=location,
|
||||
capture_output=True,
|
||||
text=True,
|
||||
timeout=2,
|
||||
)
|
||||
if result.returncode == 0:
|
||||
remote_url = result.stdout.strip()
|
||||
# Simplify GitHub URLs
|
||||
if "github.com" in remote_url:
|
||||
repo_name = remote_url.split("/")[-1].replace(".git", "")
|
||||
owner = remote_url.split("/")[-2]
|
||||
return f"{version} [dim](GitHub: {owner}/{repo_name})[/dim]"
|
||||
return f"{version} [dim](Git: {remote_url})[/dim]"
|
||||
except (subprocess.TimeoutExpired, FileNotFoundError, OSError):
|
||||
pass
|
||||
|
||||
# Default: installed from PyPI
|
||||
return f"{version} [dim](PyPI)[/dim]"
|
||||
|
||||
except ImportError:
|
||||
if not info["installed"]:
|
||||
return t("version_not_installed")
|
||||
|
||||
# Get version from package metadata (prefer sglang-kt)
|
||||
version = get_installed_package_version("sglang-kt")
|
||||
if not version:
|
||||
version = get_installed_package_version("sglang")
|
||||
if not version:
|
||||
version = info.get("version") or "unknown"
|
||||
|
||||
# Determine source label
|
||||
if info.get("is_kvcache_fork"):
|
||||
if info["from_source"] and info.get("git_info"):
|
||||
git_remote = info["git_info"].get("remote", "")
|
||||
return f"{version} [dim](Source: {git_remote})[/dim]"
|
||||
elif info["editable"]:
|
||||
return f"{version} [dim](editable)[/dim]"
|
||||
else:
|
||||
return f"{version} [dim](sglang-kt)[/dim]"
|
||||
elif info["from_source"]:
|
||||
if info.get("git_info"):
|
||||
git_remote = info["git_info"].get("remote", "")
|
||||
return f"{version} [dim](Source: {git_remote})[/dim]"
|
||||
return f"{version} [dim](source)[/dim]"
|
||||
else:
|
||||
return f"{version} [dim](PyPI)[/dim]"
|
||||
|
||||
|
||||
def version(
|
||||
verbose: bool = typer.Option(False, "--verbose", "-v", help="Show detailed version info"),
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue