From d96a0085d7ea2013e1b21c6f8ca6d5701a9a8100 Mon Sep 17 00:00:00 2001 From: "panxuchen.pxc" Date: Fri, 15 Mar 2024 18:14:52 +0800 Subject: [PATCH 1/2] opt error message of modelwrapper --- src/agentscope/models/dashscope_model.py | 5 +++++ src/agentscope/models/openai_model.py | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/src/agentscope/models/dashscope_model.py b/src/agentscope/models/dashscope_model.py index 0f41d710a..bb08b7713 100644 --- a/src/agentscope/models/dashscope_model.py +++ b/src/agentscope/models/dashscope_model.py @@ -154,6 +154,11 @@ def __call__( kwargs = {**self.generate_args, **kwargs} # step2: checking messages + if not isinstance(messages, list): + raise ValueError( + "Dashscope `messages` field expected type `list`, " + f"got `{type(messages)}` instead." + ) if not all("role" in msg and "content" in msg for msg in messages): raise ValueError( "Each message in the 'messages' list must contain a 'role' " diff --git a/src/agentscope/models/openai_model.py b/src/agentscope/models/openai_model.py index 7ea2c5454..28c1d18c1 100644 --- a/src/agentscope/models/openai_model.py +++ b/src/agentscope/models/openai_model.py @@ -172,6 +172,11 @@ def __call__( kwargs = {**self.generate_args, **kwargs} # step2: checking messages + if not isinstance(messages, list): + raise ValueError( + "OpenAI `messages` field expected type `list`, " + f"got `{type(messages)}` instead." + ) if not all("role" in msg and "content" in msg for msg in messages): raise ValueError( "Each message in the 'messages' list must contain a 'role' " From 9949047f8667219c28c0cc7718b82677e91ebd53 Mon Sep 17 00:00:00 2001 From: "panxuchen.pxc" Date: Fri, 15 Mar 2024 18:24:12 +0800 Subject: [PATCH 2/2] opt error message of modelwrapper --- src/agentscope/models/dashscope_model.py | 2 +- src/agentscope/models/openai_model.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/agentscope/models/dashscope_model.py b/src/agentscope/models/dashscope_model.py index bb08b7713..0727e9906 100644 --- a/src/agentscope/models/dashscope_model.py +++ b/src/agentscope/models/dashscope_model.py @@ -157,7 +157,7 @@ def __call__( if not isinstance(messages, list): raise ValueError( "Dashscope `messages` field expected type `list`, " - f"got `{type(messages)}` instead." + f"got `{type(messages)}` instead.", ) if not all("role" in msg and "content" in msg for msg in messages): raise ValueError( diff --git a/src/agentscope/models/openai_model.py b/src/agentscope/models/openai_model.py index 28c1d18c1..6b1c96214 100644 --- a/src/agentscope/models/openai_model.py +++ b/src/agentscope/models/openai_model.py @@ -175,7 +175,7 @@ def __call__( if not isinstance(messages, list): raise ValueError( "OpenAI `messages` field expected type `list`, " - f"got `{type(messages)}` instead." + f"got `{type(messages)}` instead.", ) if not all("role" in msg and "content" in msg for msg in messages): raise ValueError(