Skip to content

Commit 01332ae

Browse files
committed
Fix: 細かな修正
1 parent 27fa753 commit 01332ae

File tree

1 file changed

+3
-13
lines changed

1 file changed

+3
-13
lines changed

voicevox_engine/utility/user_agent_utility.py

+3-13
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,6 @@ def get_gpu_names() -> list[str]:
110110
return ["Unknown"]
111111
elif os_name == "Linux":
112112
try:
113-
if not GPUtil:
114-
return ["NoGPULib"]
115113
gpus = GPUtil.getGPUs()
116114
names = [gpu.name for gpu in gpus if hasattr(gpu, "name")]
117115
return names if names else ["NoGPU"]
@@ -129,8 +127,6 @@ def get_memory_info() -> tuple[float | None, float | None]:
129127
エラー時は None, None を返す。
130128
"""
131129
try:
132-
if not psutil:
133-
return None, None
134130
vm = psutil.virtual_memory()
135131
total_gb = round(vm.total / (1024**3), 1)
136132
available_gb = round(vm.available / (1024**3), 1)
@@ -200,15 +196,9 @@ def is_docker() -> bool:
200196
except Exception as e:
201197
# 最悪の場合のフォールバック
202198
logger.error("Failed to generate user agent string: %s", e)
203-
fallback_agent = (
204-
f"AivisSpeech-Engine/{__version__} "
205-
f"(OS/Unknown; Arch/Unknown; "
206-
f"CPU/Unknown; GPU/Unknown; "
207-
f"Memory/Unknown; "
208-
f"Inference/{inference_type})"
209-
)
210-
__user_agent_cache = fallback_agent
211-
return fallback_agent
199+
generic_user_agent = f"AivisSpeech-Engine/{__version__}"
200+
__user_agent_cache = generic_user_agent
201+
return generic_user_agent
212202

213203

214204
if __name__ == "__main__":

0 commit comments

Comments
 (0)