fixed:stream history and done handle incorrect for ai module

delete:macro version handle fir ai module

Author: xengine-qyt

XEngine_Example/AIApi_APPExample/AIApi_APPExample.cpp

@@ -42,11 +42,11 @@ int main()
 	XNETHANDLE xhToken = 0;
 
 	LPCXSTR lpszAPIUrl = _X("https://api.zhizengzeng.com/v1/chat/completions");
-	LPCXSTR lpszAPIKey = _X("sk-zk29d91bb8d095c79c32a2a7edaca603137678e1b2a9316a");
+	LPCXSTR lpszAPIKey = _X("sk-1");
 	LPCXSTR lpszAPIModel = _X("gpt-4o");
 
 	//LPCXSTR lpszAPIUrl = _X("https://api.hunyuan.cloud.tencent.com/v1/chat/completions");
-	//LPCXSTR lpszAPIKey = _X("sk-kguobQDvmlzonvUXFBgYyMEZjZZjjcNp17bME2Si6SjrGNKp");
+	//LPCXSTR lpszAPIKey = _X("sk-1");
 	//LPCXSTR lpszAPIModel = _X("hunyuan-turbos-latest");
 
 	if (!AIApi_Chat_Create(&xhToken, lpszAPIUrl, lpszAPIKey, XEngine_AIApi_CBRecv))
@@ -57,7 +57,7 @@ int main()
 	AIApi_Chat_SetRole(xhToken, _X("You are a helpful assistant."));
 	LPCXSTR lpszMSGBuffer = _X("hello");
 	int nMSGLen = strlen(lpszMSGBuffer);
-	if (!AIApi_Chat_Excute(xhToken, lpszAPIModel, lpszMSGBuffer, nMSGLen))
+	if (!AIApi_Chat_Excute(xhToken, lpszAPIModel, lpszMSGBuffer, nMSGLen, false))
 	{
 		printf("AIApi_Chat_Excute:%lX\n", AIApi_GetLastError());
 		return 0;
@@ -67,12 +67,21 @@ int main()
 	AIApi_Chat_GetStatus(xhToken, &bCompleted);
 	lpszMSGBuffer = _X("what can you do for me?");
 	nMSGLen = strlen(lpszMSGBuffer);
-	if (!AIApi_Chat_Excute(xhToken, lpszAPIModel, lpszMSGBuffer, nMSGLen, false))
+	if (!AIApi_Chat_Excute(xhToken, lpszAPIModel, lpszMSGBuffer, nMSGLen, true))
 	{
 		printf("AIApi_Chat_Excute:%lX\n", AIApi_GetLastError());
 		return 0;
 	}
+	bCompleted = false;
+	AIApi_Chat_GetStatus(xhToken, &bCompleted);
 
+	lpszMSGBuffer = _X("李白是谁?");
+	nMSGLen = strlen(lpszMSGBuffer);
+	if (!AIApi_Chat_Excute(xhToken, lpszAPIModel, lpszMSGBuffer, nMSGLen, true))
+	{
+		printf("AIApi_Chat_Excute:%lX\n", AIApi_GetLastError());
+		return 0;
+	}
 	bCompleted = false;
 	AIApi_Chat_GetStatus(xhToken, &bCompleted);
 	AIApi_Chat_Destory(xhToken);

XEngine_Module/XEngine_AIApi/AIApi_Chat/AIApi_Chat.cpp

@@ -221,15 +221,13 @@ bool CAIApi_Chat::AIApi_Chat_Excute(XNETHANDLE xhToken, LPCXSTR lpszModelName, L
 	st_JsonRoot["messages"] = st_JsonArray;
 
 	xstring m_StrBody = Json::writeString(st_JsonBuilder, st_JsonRoot);
-#if XENGINE_VERSION_KERNEL >= 9 && XENGINE_VERSION_MAIN >= 21
 	if (!APIClient_Http_Excute(xhToken, m_StrBody.c_str(), m_StrBody.length(), stl_MapIterator->second->tszAPIHdr))
 	{
 		AIApi_IsErrorOccur = true;
 		AIApi_dwErrorCode = APIClient_GetLastError();
 		st_Locker.unlock_shared();
 		return false;
 	}
-#endif
 	st_Locker.unlock_shared();
 	return true;
 }
@@ -347,11 +345,7 @@ bool CAIApi_Chat::AIApi_Chat_GetStatus(XNETHANDLE xhToken, bool* pbComplete, int
 		return false;
 	}
 
-#if XENGINE_VERSION_KERNEL >= 9 && XENGINE_VERSION_MAIN >= 21
 	if (!APIClient_Http_GetResult(xhToken, pbComplete, pInt_HTTPCode, bWaitExist))
-#else
-	if (!APIClient_Http_GetResult(xhToken, pbComplete, pInt_HTTPCode))
-#endif
 	{
 		AIApi_IsErrorOccur = true;
 		AIApi_dwErrorCode = APIClient_GetLastError();
@@ -453,10 +447,21 @@ bool CAIApi_Chat::AIApi_Chat_Parse(AICLIENT_CHAT* pSt_AIClient, LPCXSTR lpszMSGB
 			XCHAR tszGBKBuffer[8192] = {};
 			BaseLib_Charset_UTFToAnsi(st_JsonMessage["content"].asString().c_str(), tszGBKBuffer, &nGBKLen);
 			pSt_AIClient->lpCall_Chat(pSt_AIClient->xhToken, st_JsonRoot["model"].asCString(), tszGBKBuffer, nGBKLen, pSt_AIClient->lParam);
+			if (bSSEReply)
+			{
+				//流式数据需要单独处理保存
+				memcpy(pSt_AIClient->st_HisStream.tszRoleContent + pSt_AIClient->st_HisStream.nCLen, tszGBKBuffer, nGBKLen);
+				pSt_AIClient->st_HisStream.nCLen += nGBKLen;
+			}
 #else
 			pSt_AIClient->lpCall_Chat(pSt_AIClient->xhToken, st_JsonRoot["model"].asCString(), st_JsonMessage["content"].asString().c_str(), st_JsonMessage["content"].asString().length(), pSt_AIClient->lParam);
+			if (bSSEReply)
+			{
+				memcpy(pSt_AIClient->st_HisStream.tszRoleContent + pSt_AIClient->st_HisStream.nCLen, st_JsonMessage["content"].asString().c_str(), st_JsonMessage["content"].asString().length());
+				pSt_AIClient->st_HisStream.nCLen += st_JsonMessage["content"].asString().length();
+			}
 #endif
-			if (pSt_AIClient->bHistory)
+			if (pSt_AIClient->bHistory && !bSSEReply)
 			{
 				pSt_AIClient->pStl_ListHistory->push_back(st_AIHistory);
 			}
@@ -483,9 +488,9 @@ void CAIApi_Chat::AIApi_Chat_CBRecv(XNETHANDLE xhToken, XPVOID lpszMsgBuffer, in
 	if (pSt_AIClient->bStream)
 	{
 		//SSE
-		printf("%s\n", (LPCXSTR)lpszMsgBuffer);
 		int nPos = 0;
 		LPCXSTR lpszSSEStr = _X("data: ");
+		LPCXSTR lpszSSEEnd = _X("[DONE]");
 
 		XCHAR* ptszStart = pSt_AIClient->ptszMSGBuffer;
 		XCHAR* ptszEnd = ptszStart + pSt_AIClient->nMSGLen;
@@ -507,6 +512,19 @@ void CAIApi_Chat::AIApi_Chat_CBRecv(XNETHANDLE xhToken, XPVOID lpszMsgBuffer, in
 			{
 				nPos = _tcsxlen(lpszSSEStr);
 			}
+			if (_tcsxnicmp(lpszSSEEnd, ptszStart + nPos, _tcsxlen(lpszSSEEnd)) == 0)
+			{
+				//结束
+				if (pSt_AIClient->bHistory)
+				{
+					_xstrcpy(pSt_AIClient->st_HisStream.tszRoleName, _X("assistant"), sizeof(pSt_AIClient->st_HisStream.tszRoleName));
+					pSt_AIClient->pStl_ListHistory->push_back(pSt_AIClient->st_HisStream);
+					memset(&pSt_AIClient->st_HisStream, '\0', sizeof(AICLIENT_HISTORY));
+				}
+				pSt_AIClient->nMSGLen = 0;
+				memset(pSt_AIClient->ptszMSGBuffer, '\0', XENGINE_MEMORY_SIZE_MAX);
+				break;
+			}
 			// 解析当前消息体
 			if (!pClass_This->AIApi_Chat_Parse(pSt_AIClient, ptszStart + nPos, nOneMsgLen - nPos, true))
 			{

XEngine_Module/XEngine_AIApi/AIApi_Chat/AIApi_Chat.h

@@ -12,18 +12,20 @@
 *********************************************************************/
 typedef struct
 {
+	int nCLen;
 	XCHAR tszRoleContent[8192];
 	XCHAR tszRoleName[128];
 }AICLIENT_HISTORY;
 typedef struct
 {
+	AICLIENT_HISTORY st_HisStream;       //流式有用
 	XCHAR tszAPIUrl[XPATH_MAX];
 	XCHAR tszAPIHdr[XPATH_MAX];
 	XCHAR tszAPIRole[XPATH_MAX];
 	XNETHANDLE xhToken;
 	time_t nTimeStart;
 	int nMSGLen;
-
+	
 	bool bStream;
 	bool bHistory;
 	std::unique_ptr<std::list<AICLIENT_HISTORY>> pStl_ListHistory;