Spaces:
Running
Running
Upload managed_auth.py
Browse files- managed_auth.py +68 -1
managed_auth.py
CHANGED
|
@@ -26,6 +26,8 @@ EDGE_ASSERTION_COOKIE_NAME = "smartpaper_edge_assertion"
|
|
| 26 |
EDGE_ASSERTION_AUDIENCE = "smartpaper-streamlit"
|
| 27 |
ASSERTION_CLOCK_SKEW_SECONDS = 30
|
| 28 |
REQUEST_TIMEOUT = (5.0, 15.0)
|
|
|
|
|
|
|
| 29 |
|
| 30 |
_HTTP_SESSION = requests.Session()
|
| 31 |
_HTTP_SESSION.headers.update({
|
|
@@ -34,6 +36,16 @@ _HTTP_SESSION.headers.update({
|
|
| 34 |
"User-Agent": "SmartPaper-HuggingFace/edge-first-v1",
|
| 35 |
})
|
| 36 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 37 |
|
| 38 |
def _runtime_value(name: str) -> str:
|
| 39 |
value = os.environ.get(name, "")
|
|
@@ -200,8 +212,63 @@ def _authorized_post(path: str, payload: dict[str, Any] | None = None) -> dict[s
|
|
| 200 |
return _post(path, body)
|
| 201 |
|
| 202 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 203 |
def start_generation_task(*, idempotency_key: str, mode: str, interface_language: str) -> dict[str, Any]:
|
| 204 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 205 |
|
| 206 |
|
| 207 |
def recover_generation_task() -> dict[str, Any]:
|
|
|
|
| 26 |
EDGE_ASSERTION_AUDIENCE = "smartpaper-streamlit"
|
| 27 |
ASSERTION_CLOCK_SKEW_SECONDS = 30
|
| 28 |
REQUEST_TIMEOUT = (5.0, 15.0)
|
| 29 |
+
TASK_START_TIMEOUT = (8.0, 20.0)
|
| 30 |
+
TASK_START_RETRY_DELAY_SECONDS = 0.5
|
| 31 |
|
| 32 |
_HTTP_SESSION = requests.Session()
|
| 33 |
_HTTP_SESSION.headers.update({
|
|
|
|
| 36 |
"User-Agent": "SmartPaper-HuggingFace/edge-first-v1",
|
| 37 |
})
|
| 38 |
|
| 39 |
+
# /task/start uses a direct connection first, then one environment-aware
|
| 40 |
+
# retry. Both attempts reuse the exact same idempotency_key and request body.
|
| 41 |
+
_TASK_DIRECT_SESSION = requests.Session()
|
| 42 |
+
_TASK_DIRECT_SESSION.trust_env = False
|
| 43 |
+
_TASK_DIRECT_SESSION.headers.update({
|
| 44 |
+
"Accept": "application/json",
|
| 45 |
+
"Content-Type": "application/json",
|
| 46 |
+
"User-Agent": "SmartPaper-HuggingFace/edge-first-v1",
|
| 47 |
+
})
|
| 48 |
+
|
| 49 |
|
| 50 |
def _runtime_value(name: str) -> str:
|
| 51 |
value = os.environ.get(name, "")
|
|
|
|
| 212 |
return _post(path, body)
|
| 213 |
|
| 214 |
|
| 215 |
+
def _post_task_start(payload: dict[str, Any]) -> dict[str, Any]:
|
| 216 |
+
"""Start one task with one bounded retry and the same idempotency key."""
|
| 217 |
+
url = f"{_api_base()}/task/start"
|
| 218 |
+
headers = {"Authorization": f"Bearer {_service_key()}"}
|
| 219 |
+
transports = (_TASK_DIRECT_SESSION, _HTTP_SESSION)
|
| 220 |
+
last_error: Exception | None = None
|
| 221 |
+
|
| 222 |
+
for attempt, session in enumerate(transports):
|
| 223 |
+
try:
|
| 224 |
+
response = session.post(
|
| 225 |
+
url,
|
| 226 |
+
headers=headers,
|
| 227 |
+
json=payload,
|
| 228 |
+
timeout=TASK_START_TIMEOUT,
|
| 229 |
+
allow_redirects=False,
|
| 230 |
+
)
|
| 231 |
+
except (requests.exceptions.Timeout, requests.exceptions.ConnectionError) as exc:
|
| 232 |
+
last_error = exc
|
| 233 |
+
if attempt == 0:
|
| 234 |
+
time.sleep(TASK_START_RETRY_DELAY_SECONDS)
|
| 235 |
+
continue
|
| 236 |
+
raise
|
| 237 |
+
|
| 238 |
+
try:
|
| 239 |
+
data = response.json()
|
| 240 |
+
except ValueError as exc:
|
| 241 |
+
raise RuntimeError(
|
| 242 |
+
f"Authentication service returned non-JSON content (HTTP {response.status_code})."
|
| 243 |
+
) from exc
|
| 244 |
+
|
| 245 |
+
if response.status_code >= 400:
|
| 246 |
+
message = (
|
| 247 |
+
data.get("message")
|
| 248 |
+
or data.get("reason")
|
| 249 |
+
or data.get("error")
|
| 250 |
+
or f"HTTP {response.status_code}"
|
| 251 |
+
)
|
| 252 |
+
raise RuntimeError(str(message))
|
| 253 |
+
|
| 254 |
+
return data
|
| 255 |
+
|
| 256 |
+
if last_error is not None:
|
| 257 |
+
raise last_error
|
| 258 |
+
raise RuntimeError("task_start_request_failed")
|
| 259 |
+
|
| 260 |
+
|
| 261 |
def start_generation_task(*, idempotency_key: str, mode: str, interface_language: str) -> dict[str, Any]:
|
| 262 |
+
session_token = str(st.session_state.get("sp_session_token") or "").strip()
|
| 263 |
+
if not session_token:
|
| 264 |
+
raise RuntimeError("session_token_required")
|
| 265 |
+
payload = {
|
| 266 |
+
"idempotency_key": idempotency_key,
|
| 267 |
+
"mode": mode,
|
| 268 |
+
"interface_language": interface_language,
|
| 269 |
+
"session_token": session_token,
|
| 270 |
+
}
|
| 271 |
+
return _post_task_start(payload)
|
| 272 |
|
| 273 |
|
| 274 |
def recover_generation_task() -> dict[str, Any]:
|