admin/dify
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix: Azure OpenAI o1 max_completion_token and get_num_token_from_messages error (#9326)

Browse Source 
Co-authored-by: wwwc <wwwc@outlook.com>
This commit is contained in:
Warren Wong
2024-10-15 16:26:44 +08:00
committed by GitHub
parent fb32e5ca9a
commit b597a0d31c
9 changed files with 638 additions and 381 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
api/tests/integration_tests/model_runtime/__mock/openai_moderation.py
View File

@@ -41,6 +41,8 @@ class MockModerationClass:
"sexual/minors": False,
"violence": False,
"violence/graphic": False,
"illicit": False,
"illicit/violent": False,
}
moderation_categories_scores = {
"harassment": 1.0,
@@ -54,13 +56,30 @@ class MockModerationClass:
"sexual/minors": 1.0,
"violence": 1.0,
"violence/graphic": 1.0,
"illicit": 1.0,
"illicit/violent": 1.0,
}
category_applied_input_types = {
"sexual": ["text", "image"],
"hate": ["text"],
"harassment": ["text"],
"self-harm": ["text", "image"],
"sexual/minors": ["text"],
"hate/threatening": ["text"],
"violence/graphic": ["text", "image"],
"self-harm/intent": ["text", "image"],
"self-harm/instructions": ["text", "image"],
"harassment/threatening": ["text"],
"violence": ["text", "image"],
"illicit": ["text"],
"illicit/violent": ["text"],
}
result.append(
Moderation(
flagged=True,
categories=Categories(**moderation_categories),
category_scores=CategoryScores(**moderation_categories_scores),
category_applied_input_types=category_applied_input_types,
)
)
else:
@@ -76,6 +95,8 @@ class MockModerationClass:
"sexual/minors": False,
"violence": False,
"violence/graphic": False,
"illicit": False,
"illicit/violent": False,
}
moderation_categories_scores = {
"harassment": 0.0,
@@ -89,12 +110,30 @@ class MockModerationClass:
"sexual/minors": 0.0,
"violence": 0.0,
"violence/graphic": 0.0,
"illicit": 0.0,
"illicit/violent": 0.0,
}
category_applied_input_types = {
"sexual": ["text", "image"],
"hate": ["text"],
"harassment": ["text"],
"self-harm": ["text", "image"],
"sexual/minors": ["text"],
"hate/threatening": ["text"],
"violence/graphic": ["text", "image"],
"self-harm/intent": ["text", "image"],
"self-harm/instructions": ["text", "image"],
"harassment/threatening": ["text"],
"violence": ["text", "image"],
"illicit": ["text"],
"illicit/violent": ["text"],
}
result.append(
Moderation(
flagged=False,
categories=Categories(**moderation_categories),
category_scores=CategoryScores(**moderation_categories_scores),
category_applied_input_types=category_applied_input_types,
)
)