fix vllm version name and code

src/display/utils.py

@@ -170,6 +170,16 @@ class Backend(Enum):
             return Backend.Unknown
 
 
+class VllmVersion(Enum):
+    current = ModelDetails("v0.6.3post1")
+    Unknown = ModelDetails("?")
+
+    def from_str(version):
+        if version == "v0.6.3post1":
+            return VllmVersion.current
+        return VllmVersion.Unknown
+
+
 # Column selection
 COLS = [c.name for c in fields(AutoEvalColumn) if not c.hidden]
 TYPES = [c.type for c in fields(AutoEvalColumn)]

src/envs.py

@@ -1,6 +1,5 @@
 import os
 
-import requests
 from huggingface_hub import HfApi
 
 # Info to change for your repository
@@ -23,18 +22,4 @@ EVAL_RESULTS_PATH = os.path.join(CACHE_PATH, "eval-results")
 EVAL_REQUESTS_PATH_BACKEND = os.path.join(CACHE_PATH, "eval-queue-bk")
 EVAL_RESULTS_PATH_BACKEND = os.path.join(CACHE_PATH, "eval-results-bk")
 
-
-# vllm version
-def get_latest_vllm_version() -> str:
-    """GitHubからvllmの最新バージョンを取得する"""
-    url = "https://api.github.com/repos/vllm-project/vllm/releases/latest"
-    response = requests.get(url)
-    if response.status_code == 200:
-        latest_release = response.json()
-        return latest_release["tag_name"]
-    return None  # APIリクエストが失敗した場合はNoneを返す
-
-
-VLLM_CURRENT_VERSION = get_latest_vllm_version()
-
 API = HfApi(token=TOKEN)

src/submission/submit.py

@@ -3,8 +3,8 @@ import os
 from datetime import datetime, timezone
 
 from src.display.formatting import styled_error, styled_message, styled_warning
-from src.display.utils import Version
-from src.envs import API, EVAL_REQUESTS_PATH, QUEUE_REPO, TOKEN, VLLM_CURRENT_VERSION
+from src.display.utils import Version, VllmVersion
+from src.envs import API, EVAL_REQUESTS_PATH, QUEUE_REPO, TOKEN
 from src.submission.check_validity import already_submitted_models, check_model_card, get_model_size, is_model_on_hub
 
 REQUESTED_MODELS = None
@@ -24,14 +24,12 @@ def add_new_eval(
         REQUESTED_MODELS, USERS_TO_SUBMISSION_DATES = already_submitted_models(EVAL_REQUESTS_PATH)
 
     current_version = Version.v1_4_1.value.name
-    current_vllm_version = VLLM_CURRENT_VERSION
+    current_vllm_version = VllmVersion.current.value.name
 
     # バージョン情報を含めた重複チェック
-    submission_id = f"{model}_{precision}_{add_special_tokens}_{current_version}_{current_vllm_version}"
+    submission_id = f"{model}_{precision}_{add_special_tokens}_{current_version}"
     if submission_id in REQUESTED_MODELS:
-        return styled_warning(
-            f"This model has already been evaluated with llm-jp-eval version {current_version} and vllm version {current_vllm_version}"
-        )
+        return styled_warning(f"This model has already been evaluated with llm-jp-eval version {current_version}")
 
     user_name = ""
     model_path = model
@@ -50,14 +48,7 @@ def add_new_eval(
         revision = "main"
 
     # Is the model on the hub?
-    model_on_hub, error, model_config = is_model_on_hub(
-        model_name=model, revision=revision, token=TOKEN, test_tokenizer=True
-    )
-    architecture = "?"
-    if model_config is not None:
-        architectures = getattr(model_config, "architectures", None)
-        if architectures:
-            architecture = ";".join(architectures)
+    model_on_hub, error, _ = is_model_on_hub(model_name=model, revision=revision, token=TOKEN, test_tokenizer=True)
     if not model_on_hub:
         return styled_error(f'Model "{model}" {error}')
 
@@ -95,7 +86,6 @@ def add_new_eval(
         "private": False,
         "add_special_tokens": add_special_tokens,
         "llm_jp_eval_version": current_version,
-        "architecture": architecture,
         "vllm_version": current_vllm_version,
     }