diff --git a/tests/test_dashscope_client.py b/tests/test_dashscope_client.py index d514bec..d2a58fa 100644 --- a/tests/test_dashscope_client.py +++ b/tests/test_dashscope_client.py @@ -9,6 +9,8 @@ Instructions: - Optionally set environment variables ALI_API_KEY and ALI_APP_ID. """ import os +import json +import os.path as osp import uuid from dotenv import load_dotenv from loguru import logger @@ -30,19 +32,83 @@ except Exception as e: BASE_URL = os.getenv("DS_BASE_URL", "http://127.0.0.1:8588/api/") # Params -API_KEY = os.getenv("FAST_AUTH_KEYS", "test-key") -APP_ID = os.getenv("ALI_APP_ID", "test-app") +def _first_non_empty_csv_token(value: str) -> str: + parts = [p.strip() for p in (value or "").split(",") if p.strip()] + return parts[0] if parts else "" + + +def _load_registry() -> dict: + project_root = osp.dirname(osp.dirname(osp.abspath(__file__))) + registry_path = os.getenv( + "FAST_PIPELINE_REGISTRY_FILE", + osp.join(project_root, "configs", "pipeline_registry.json"), + ) + with open(registry_path, "r", encoding="utf-8") as f: + return json.load(f) + + +def _pick_api_key(registry: dict) -> str: + # For local server_dashscope testing, FAST_AUTH_KEYS is usually the server auth source. + fast_first = _first_non_empty_csv_token(os.getenv("FAST_AUTH_KEYS", "")) + ali_key = (os.getenv("ALI_API_KEY") or "").strip() + + api_policies = registry.get("api_keys") or {} + if fast_first and (not api_policies or fast_first in api_policies): + return fast_first + if ali_key and (not api_policies or ali_key in api_policies): + return ali_key + if fast_first: + return fast_first + if ali_key: + return ali_key + raise RuntimeError("Missing API key. Set FAST_AUTH_KEYS or ALI_API_KEY in your environment.") + + +def _pick_app_id(api_key: str, registry: dict) -> str: + # Explicit user choice always wins. + explicit = os.getenv("ALI_APP_ID") + if explicit: + return explicit + + routes_obj = registry.get("routes") + if not isinstance(routes_obj, dict): + routes_obj = registry.get("pipelines", {}) + route_ids = [r for r in routes_obj.keys() if isinstance(r, str) and r] + + # Prefer an explicitly configured route so test behavior matches registry/routes. + if route_ids: + return route_ids[0] + return "default" + + +def _warn_if_policy_disallows_app_id(api_key: str, app_id: str, registry: dict) -> None: + policy = (registry.get("api_keys") or {}).get(api_key, {}) + if not isinstance(policy, dict): + return + allowed = policy.get("allowed_route_ids") + if allowed is None: + allowed = policy.get("allowed_pipeline_ids") + if isinstance(allowed, list) and allowed and app_id not in allowed: + logger.bind(tag=TAG).warning( + f"app_id='{app_id}' is not in allowed_route_ids for current API key; server may return 403." + ) + + +REGISTRY = _load_registry() +API_KEY = _pick_api_key(REGISTRY) +APP_ID = _pick_app_id(API_KEY, REGISTRY) +_warn_if_policy_disallows_app_id(API_KEY, APP_ID, REGISTRY) SESSION_ID = str(uuid.uuid4()) dialogue = [ {"role": "system", "content": "You are a helpful assistant."}, - {"role": "user", "content": "Say 'the world is awesome and beautiful'."}, + {"role": "user", "content": "who are you"}, ] call_params = { "api_key": API_KEY, - "app_id": "test_app", - "session_id": "123", + "app_id": APP_ID, + "session_id": SESSION_ID, "messages": dialogue, "stream": True, } @@ -52,8 +118,11 @@ def main(): # Point the SDK to our FastAPI implementation if BASE_URL and ("/api/" in BASE_URL): dashscope.base_http_api_url = BASE_URL + # Some SDK paths rely on global api_key to build Authorization header. + dashscope.api_key = API_KEY # dashscope.base_http_api_url = BASE_URL print(f"Using base_http_api_url = {dashscope.base_http_api_url}") + print(f"Using app_id = {APP_ID}") print("\nCalling Application.call(stream=True)...\n") responses = Application.call(**call_params)