已把工具调用从 XML 改成 OpenAI 兼容 JSON,并统一解析/执行流程。改动概览如下:
新增 JSON tool_calls 解析/序列化并替换核心执行与提示词为 JSON-only:JsonToolCallParser.cs、AIIntelligenceCore.cs 工具基类移除 XML 解析,统一 JSON 参数读取与类型转换辅助:AITool.cs 工具实现统一 JSON args/UsageSchema(含重写/修复):Tool_ModifyGoodwill.cs、Tool_SendReinforcement.cs、Tool_GetMapPawns.cs、Tool_GetMapResources.cs、Tool_GetAvailablePrefabs.cs、Tool_CallPrefabAirdrop.cs、Tool_CallBombardment.cs、Tool_GetAvailableBombardments.cs、Tool_GetPawnStatus.cs、Tool_GetRecentNotifications.cs、Tool_SearchThingDef.cs、Tool_SearchPawnKind.cs、Tool_ChangeExpression.cs、Tool_SetOverwatchMode.cs、Tool_RememberFact.cs、Tool_RecallMemories.cs、Tool_SpawnResources.cs、Tool_AnalyzeScreen.cs 轰炸相关解析统一到 JSON 字典并增强数值解析:BombardmentUtility.cs UI 对话展示改为剥离 JSON tool_calls:Overlay_WulaLink.cs、Dialog_AIConversation.cs
This commit is contained in:
@@ -5,6 +5,7 @@ using UnityEngine;
|
||||
using Verse;
|
||||
using RimWorld;
|
||||
using WulaFallenEmpire.EventSystem.AI;
|
||||
using WulaFallenEmpire.EventSystem.AI.Utils;
|
||||
|
||||
namespace WulaFallenEmpire.EventSystem.AI.UI
|
||||
{
|
||||
@@ -386,7 +387,7 @@ namespace WulaFallenEmpire.EventSystem.AI.UI
|
||||
string displayText = msg.message;
|
||||
if (msg.role == "assistant")
|
||||
{
|
||||
displayText = StripXmlTags(msg.message)?.Trim() ?? "";
|
||||
displayText = StripToolCallJson(msg.message)?.Trim() ?? "";
|
||||
}
|
||||
else if (msg.role == "user")
|
||||
{
|
||||
@@ -476,14 +477,17 @@ namespace WulaFallenEmpire.EventSystem.AI.UI
|
||||
Widgets.EndScrollView();
|
||||
}
|
||||
|
||||
private static string StripXmlTags(string text)
|
||||
private static string StripToolCallJson(string text)
|
||||
{
|
||||
if (string.IsNullOrEmpty(text)) return text;
|
||||
// Remove XML tags with content: <tag>content</tag>
|
||||
string stripped = System.Text.RegularExpressions.Regex.Replace(text, @"<(?!/?(i|b|color|size|material)\b)([a-zA-Z0-9_]+)[^>]*>.*?</\2>", "", System.Text.RegularExpressions.RegexOptions.Singleline);
|
||||
// Remove self-closing tags: <tag/>
|
||||
stripped = System.Text.RegularExpressions.Regex.Replace(stripped, @"<([a-zA-Z0-9_]+)[^>]*/?>", "");
|
||||
return stripped;
|
||||
if (!JsonToolCallParser.TryParseToolCallsFromText(text, out _, out string fragment))
|
||||
{
|
||||
return text;
|
||||
}
|
||||
|
||||
int index = text.IndexOf(fragment, StringComparison.Ordinal);
|
||||
if (index < 0) return text;
|
||||
return text.Remove(index, fragment.Length).Trim();
|
||||
}
|
||||
|
||||
private void DrawFooter(Rect rect)
|
||||
|
||||
Reference in New Issue
Block a user