Skip to content

Build and run agents you can see, understand and trust.

feat(credential): register TypeSafeCredential in CredentialFactory (#3625)

ffffff5557ddbd1bb76f
diff --git a/src/agentscope/credential/_factory.py b/src/agentscope/credential/_factory.py
index 1ed40c999..850e9e272 100644
--- a/src/agentscope/credential/_factory.py
+++ b/src/agentscope/credential/_factory.py
@@ -12,6 +12,7 @@ from ._minimax import MiniMaxCredential
from ._moonshot import MoonshotCredential
from ._ollama import OllamaCredential
from ._openai import OpenAICredential
+from ._typesafe import TypeSafeCredential
from ._xai import XAICredential
from ._volcengine import VolcengineCredential
from ._base import CredentialBase
@@ -44,6 +45,7 @@ class CredentialFactory:
MoonshotCredential,
OllamaCredential,
OpenAICredential,
+ TypeSafeCredential,
XAICredential,
VolcengineCredential,
]
diff --git a/src/agentscope/credential/_typesafe.py b/src/agentscope/credential/_typesafe.py
index bf23073b4..524f0c0b3 100644
--- a/src/agentscope/credential/_typesafe.py
+++ b/src/agentscope/credential/_typesafe.py
@@ -7,7 +7,7 @@ from pydantic import ConfigDict, Field, SecretStr
from ._base import CredentialBase
if TYPE_CHECKING:
- from ..model import ChatModelBase
+ from ..model import ChatModelBase, ModelCard
class TypeSafeCredential(CredentialBase):
@@ -31,3 +31,8 @@ class TypeSafeCredential(CredentialBase):
def get_chat_model_class(cls) -> Type["ChatModelBase"]:
"""TypeSafe credentials serve classifier models only."""
raise NotImplementedError(f"{cls.__name__} has no chat model.")
+
+ @classmethod
+ def list_models(cls) -> list["ModelCard"]:
+ """Return no chat models for classifier-only credentials."""
+ return []
diff --git a/tests/classifier_jev_test.py b/tests/classifier_jev_test.py
index 96f8d9eb3..bfe43de1a 100644
--- a/tests/classifier_jev_test.py
+++ b/tests/classifier_jev_test.py
@@ -3,12 +3,14 @@
from dataclasses import asdict
from types import SimpleNamespace
from typing import Any
-from unittest import IsolatedAsyncioTestCase
+from unittest import IsolatedAsyncioTestCase, TestCase, skipIf
from unittest.mock import AsyncMock, MagicMock, patch
-import pytest
+from fastapi import FastAPI
+from fastapi.testclient import TestClient
from utils import AnyValue
+from agentscope.app._router._model import model_router
from agentscope.classifier import (
BinaryCriteria,
BinaryQuestion,
@@ -16,13 +18,82 @@ from agentscope.classifier import (
JevClassifierModel,
ScoreQuestion,
)
-from agentscope.credential import TypeSafeCredential
+from agentscope.credential import (
+ CredentialFactory,
+ OpenAICredential,
+ TypeSafeCredential,
+)
-typesafe_sdk = pytest.importorskip("typesafe_sdk")
+try:
+ import typesafe_sdk
+except ImportError:
+ typesafe_sdk = None
A = AnyValue()
+class TypeSafeCredentialTest(TestCase):
+ """Test credential registration and chat model discovery without SDK."""
+
+ def test_factory_round_trip(self) -> None:
+ """The factory preserves the credential and exposes its schema."""
+ credential = TypeSafeCredential(
+ id="typesafe-test",
+ name="TypeSafe test",
+ api_key="ts-key",
+ base_url="https://typesafe.example",
+ )
+ restored = CredentialFactory.from_dict(credential.model_dump())
+ self.assertEqual(restored, credential)
+ self.assertIs(
+ CredentialFactory.get_credential_class("typesafe_credential"),
+ TypeSafeCredential,
+ )
+ schemas = [
+ schema
+ for schema in CredentialFactory.list_schemas()
+ if schema["properties"]["type"]["const"] == "typesafe_credential"
+ ]
+ self.assertEqual(schemas, [TypeSafeCredential.model_json_schema()])
+
+ def test_has_no_chat_models(self) -> None:
+ """Classifier credentials expose no candidate chat models."""
+ self.assertEqual(TypeSafeCredential.list_models(), [])
+ with self.assertRaisesRegex(
+ NotImplementedError,
+ "TypeSafeCredential has no chat model",
+ ):
+ TypeSafeCredential.get_chat_model_class()
+
+ def test_list_models(self) -> None:
+ """Return candidates, empty lists, or 404 for unknown providers."""
+ app = FastAPI()
+ app.include_router(model_router)
+ cards = OpenAICredential.list_models()
+ cases = [
+ ("typesafe_credential", 200, {"models": [], "total": 0}),
+ (
+ "openai_credential",
+ 200,
+ {
+ "models": [c.model_dump(mode="json") for c in cards],
+ "total": len(cards),
+ },
+ ),
+ ("unknown", 404, {"detail": "Provider 'unknown' not found."}),
+ ]
+ with TestClient(app, raise_server_exceptions=False) as client:
+ for provider, status, expected in cases:
+ with self.subTest(provider=provider):
+ response = client.get(
+ "/model/",
+ params={"provider": provider},
+ )
+ self.assertEqual(response.status_code, status)
+ self.assertEqual(response.json(), expected)
+
+
+@skipIf(typesafe_sdk is None, "typesafe_sdk is not installed")
class JevClassifierModelTest(IsolatedAsyncioTestCase):
"""Test request and response translation against official SDK types."""