From ffa0f4d99b50433ff318dc1443f7bfc3ada1b94a Mon Sep 17 00:00:00 2001 From: Jiang-Jia-Jun <163579578+Jiang-Jia-Jun@users.noreply.github.com> Date: Wed, 30 Jul 2025 16:05:24 +0800 Subject: [PATCH] [Fix] Fix version function (#3076) * [Fix] Fix version function * Fix commit * Fix commit * fix code sync * Update coverage_run.sh --------- Co-authored-by: Jiang-Jia-Jun --- fastdeploy/__init__.py | 3 ++- fastdeploy/config.py | 5 ++++- fastdeploy/utils.py | 3 ++- scripts/coverage_run.sh | 2 +- test/utils/test_version.py | 13 +++++++++++++ 5 files changed, 22 insertions(+), 4 deletions(-) create mode 100644 test/utils/test_version.py diff --git a/fastdeploy/__init__.py b/fastdeploy/__init__.py index 15186dfb7..cc26ff07a 100644 --- a/fastdeploy/__init__.py +++ b/fastdeploy/__init__.py @@ -24,8 +24,9 @@ os.environ["GLOG_minloglevel"] = "2" os.environ["AISTUDIO_LOG"] = "critical" from fastdeploy.engine.sampling_params import SamplingParams from fastdeploy.entrypoints.llm import LLM +from fastdeploy.utils import version -__all__ = ["LLM", "SamplingParams"] +__all__ = ["LLM", "SamplingParams", "version"] try: import use_triton_in_paddle diff --git a/fastdeploy/config.py b/fastdeploy/config.py index 0a09d1908..35793ff18 100644 --- a/fastdeploy/config.py +++ b/fastdeploy/config.py @@ -23,6 +23,7 @@ from typing import Literal, Optional from paddleformers.transformers.configuration_utils import PretrainedConfig +import fastdeploy from fastdeploy import envs from fastdeploy.model_executor.layers.quantization.quant_base import QuantConfigBase from fastdeploy.utils import check_unified_ckpt, get_logger @@ -866,8 +867,10 @@ class CommitConfig: self._load_from_version_file() - def _load_from_version_file(self, file_path: str = "fastdeploy/version.txt"): + def _load_from_version_file(self, file_path: str = None): """Internal method to load version info from file""" + if file_path is None: + file_path = os.path.join(fastdeploy.__path__[0], "version.txt") try: with open(file_path, "r") as f: for line in f: diff --git a/fastdeploy/utils.py b/fastdeploy/utils.py index c5fc9da43..9ea25000c 100644 --- a/fastdeploy/utils.py +++ b/fastdeploy/utils.py @@ -587,12 +587,13 @@ def version(): current_dir = os.path.dirname(os.path.abspath(__file__)) version_file_path = os.path.join(current_dir, "version.txt") + content = "Unknown" try: with open(version_file_path, "r") as f: content = f.read() - print(content) except FileNotFoundError: llm_logger.error("[version.txt] Not Found!") + return content llm_logger = get_logger("fastdeploy", "fastdeploy.log") diff --git a/scripts/coverage_run.sh b/scripts/coverage_run.sh index c07d4c2b1..98ed025bd 100644 --- a/scripts/coverage_run.sh +++ b/scripts/coverage_run.sh @@ -6,7 +6,7 @@ run_path="$DIR/../test/" cd ${run_path} ls -dirs=("layers" "operators" "worker") +dirs=("layers" "operators" "worker" "utils") failed_tests_file="failed_tests.log" > "$failed_tests_file" disabled_tests=( diff --git a/test/utils/test_version.py b/test/utils/test_version.py new file mode 100644 index 000000000..b5ea2f4a7 --- /dev/null +++ b/test/utils/test_version.py @@ -0,0 +1,13 @@ +import unittest + +import fastdeploy + + +class TestVersion(unittest.TestCase): + def test_get_version(self): + ver = fastdeploy.version() + assert ver.count("COMMIT") > 0 + + +if __name__ == "__main__": + unittest.main()