Skip to content

利用 AI 大模型和自动化工作流,根据主题或关键词一键生成高清短视频。Generate HD short videos from a topic or keyword with an automated AI workflow.

fix(twelvelabs): close owned HTTP transports after requests

Rudy Celekliae8262c5fdde
diff --git a/app/services/twelvelabs.py b/app/services/twelvelabs.py
index 6d4844d1..f6f3946e 100644
--- a/app/services/twelvelabs.py
+++ b/app/services/twelvelabs.py
@@ -30,6 +30,7 @@ Configure a TwelveLabs API key from the TwelveLabs dashboard (https://twelvelabs
"""
import math
+from contextlib import contextmanager
from functools import lru_cache
from typing import List, Optional
@@ -50,13 +51,23 @@ def is_enabled() -> bool:
return bool(keys)
-def _client():
+def _client(httpx_client=None):
# Lazy import + rotated key reuse mirrors the other providers in
# material.py (get_api_key rotates across configured keys).
from twelvelabs import TwelveLabs
api_key = material.get_api_key("twelvelabs_api_keys")
- return TwelveLabs(api_key=api_key)
+ return TwelveLabs(api_key=api_key, httpx_client=httpx_client)
+
+
+@contextmanager
+def _managed_client():
+ # The SDK does not close its HTTP client on context-manager exit. Own the
+ # transport explicitly, preserving its default timeout and redirect policy.
+ import httpx
+
+ with httpx.Client(timeout=600, follow_redirects=True) as transport:
+ yield _client(httpx_client=transport)
def _cosine(a: List[float], b: List[float]) -> float:
@@ -88,10 +99,10 @@ def embed_text(text: str, model: Optional[str] = None) -> Optional[List[float]]:
@lru_cache(maxsize=512)
def _embed_text_cached(text: str, model: str) -> List[float]:
- client = _client()
- resp = client.embed.create(model_name=model, text=text)
- # SDK aliases the raw JSON 'float' vector key to `float_`.
- return list(resp.text_embedding.segments[0].float_)
+ with _managed_client() as client:
+ resp = client.embed.create(model_name=model, text=text)
+ # SDK aliases the raw JSON 'float' vector key to `float_`.
+ return list(resp.text_embedding.segments[0].float_)
def rerank_terms_by_subject(
@@ -153,14 +164,14 @@ def analyze_clip(
try:
from twelvelabs.types import VideoContext_Url
- client = _client()
- resp = client.analyze(
- model_name=model,
- video=VideoContext_Url(url=video_url),
- prompt=prompt,
- max_tokens=max(max_tokens, _PEGASUS_MIN_MAX_TOKENS),
- )
- return resp.data
+ with _managed_client() as client:
+ resp = client.analyze(
+ model_name=model,
+ video=VideoContext_Url(url=video_url),
+ prompt=prompt,
+ max_tokens=max(max_tokens, _PEGASUS_MIN_MAX_TOKENS),
+ )
+ return resp.data
except Exception as e: # noqa: BLE001
logger.warning(f"TwelveLabs analyze_clip failed: {e}")
return None
diff --git a/test/services/test_twelvelabs_client_lifecycle.py b/test/services/test_twelvelabs_client_lifecycle.py
new file mode 100644
index 00000000..7acaf017
--- /dev/null
+++ b/test/services/test_twelvelabs_client_lifecycle.py
@@ -0,0 +1,53 @@
+from types import SimpleNamespace
+from unittest.mock import patch
+import pytest
+from app.services import twelvelabs as service
+
+sdk = pytest.importorskip("twelvelabs")
+
+
[email protected]("operation", ["embed", "analyze"])
[email protected]("fails", [False, True])
+def test_owned_sdk_http_transport_closes_on_every_outcome(operation, fails):
+ real_client = sdk.TwelveLabs
+ transports = []
+
+ def construct(**kwargs):
+ client = real_client(**kwargs)
+ transport = client._client_wrapper.httpx_client.httpx_client
+ transports.append(transport)
+
+ def result(**kwargs):
+ if fails:
+ raise RuntimeError("provider unavailable")
+ return SimpleNamespace(
+ text_embedding=SimpleNamespace(
+ segments=[SimpleNamespace(float_=[1.0, 0.0])]
+ ),
+ data="A coffee scene",
+ )
+
+ client.embed.create = result
+ client.analyze = result
+ return client
+
+ service._embed_text_cached.cache_clear()
+ try:
+ with (
+ patch.object(service.config, "app", {"twelvelabs_api_keys": ["fake-key"]}),
+ patch.object(sdk, "TwelveLabs", side_effect=construct),
+ ):
+ result = (
+ service.embed_text("coffee")
+ if operation == "embed"
+ else service.analyze_clip("https://example.test/coffee.mp4")
+ )
+ assert result == (
+ None if fails else [1.0, 0.0] if operation == "embed" else "A coffee scene"
+ )
+ assert len(transports) == 1
+ assert transports[0].is_closed
+ finally:
+ for transport in transports:
+ transport.close()
+ service._embed_text_cached.cache_clear()