modify:unused history code and unified error code

Author: xengine-qyt

XEngine_Module/XEngine_AIApi/AIApi_Error.h

@@ -15,4 +15,10 @@
 /************************************************************************/
 #define ERROR_XENGINE_MODULE_AIAPI_CHAT_PARAMENT 0x01D0001               //参数错误，无法继续
 #define ERROR_XENGINE_MODULE_AIAPI_CHAT_MALLOC 0x01D0002                 //申请内存失败
-#define ERROR_XENGINE_MODULE_AIAPI_CHAT_NOTFOUND 0x01D0003               //没有找到
+#define ERROR_XENGINE_MODULE_AIAPI_CHAT_NOTFOUND 0x01D0003               //没有找到
+/************************************************************************/
+/*                         AI图像模型接口错误                           */
+/************************************************************************/
+#define ERROR_XENGINE_MODULE_AIAPI_IMAGE_PARAMENT 0x01D1001               //参数错误，无法继续
+#define ERROR_XENGINE_MODULE_AIAPI_IMAGE_MALLOC 0x01D1002                 //申请内存失败
+#define ERROR_XENGINE_MODULE_AIAPI_IMAGE_NOTFOUND 0x01D1003               //没有找到

XEngine_Module/XEngine_AIApi/AIApi_Image/AIApi_Image.cpp

@@ -65,14 +65,14 @@ bool CAIApi_Image::AIApi_Image_Create(XNETHANDLE* pxhToken, LPCXSTR lpszAPIUrl,
 	if (NULL == pxhToken || NULL == lpszAPIUrl || NULL == lpszAPIKey)
 	{
 		AIApi_IsErrorOccur = true;
-		AIApi_dwErrorCode = ERROR_XENGINE_MODULE_AIAPI_CHAT_PARAMENT;
+		AIApi_dwErrorCode = ERROR_XENGINE_MODULE_AIAPI_IMAGE_PARAMENT;
 		return false;
 	}
 	AICLIENT_IMAGE *pSt_AIClient = new AICLIENT_IMAGE;
 	if (NULL == pSt_AIClient)
 	{
 		AIApi_IsErrorOccur = true;
-		AIApi_dwErrorCode = ERROR_XENGINE_MODULE_AIAPI_CHAT_MALLOC;
+		AIApi_dwErrorCode = ERROR_XENGINE_MODULE_AIAPI_IMAGE_MALLOC;
 		return false;
 	}
 	*pSt_AIClient = {};
@@ -83,14 +83,14 @@ bool CAIApi_Image::AIApi_Image_Create(XNETHANDLE* pxhToken, LPCXSTR lpszAPIUrl,
 	_xstrcpy(pSt_AIClient->tszAPIUrl, lpszAPIUrl, sizeof(pSt_AIClient->tszAPIUrl));
 	_xsntprintf(pSt_AIClient->tszAPIHdr, sizeof(pSt_AIClient->tszAPIHdr), _X("Content-Type: application/json\r\nAuthorization: Bearer %s"), lpszAPIKey);
 
-	pSt_AIClient->ptszMSGBuffer = (XCHAR*)malloc(XENGINE_MEMORY_SIZE_MAX);
+	pSt_AIClient->ptszMSGBuffer = (XCHAR*)malloc(XENGINE_MEMORY_SIZE_LARGE);
 	if (NULL == pSt_AIClient->ptszMSGBuffer)
 	{
 		AIApi_IsErrorOccur = true;
-		AIApi_dwErrorCode = ERROR_XENGINE_MODULE_AIAPI_CHAT_MALLOC;
+		AIApi_dwErrorCode = ERROR_XENGINE_MODULE_AIAPI_IMAGE_MALLOC;
 		return false;
 	}
-	memset(pSt_AIClient->ptszMSGBuffer, '\0', XENGINE_MEMORY_SIZE_MAX);
+	memset(pSt_AIClient->ptszMSGBuffer, '\0', XENGINE_MEMORY_SIZE_LARGE);
 
 	if (!APIClient_Http_Create(&pSt_AIClient->xhToken, AIApi_Image_CBRecv, pSt_AIClient))
 	{
@@ -162,7 +162,7 @@ bool CAIApi_Image::AIApi_Image_Excute(XNETHANDLE xhToken, LPCXSTR lpszModelName,
 	if (stl_MapIterator == stl_MapAIClient.end())
 	{
 		AIApi_IsErrorOccur = true;
-		AIApi_dwErrorCode = ERROR_XENGINE_MODULE_AIAPI_CHAT_NOTFOUND;
+		AIApi_dwErrorCode = ERROR_XENGINE_MODULE_AIAPI_IMAGE_NOTFOUND;
 		st_Locker.unlock_shared();
 		return false;
 	}
@@ -204,7 +204,6 @@ bool CAIApi_Image::AIApi_Image_Excute(XNETHANDLE xhToken, LPCXSTR lpszModelName,
 	st_JsonRoot["messages"] = st_JsonArray;
 
 	xstring m_StrBody = Json::writeString(st_JsonBuilder, st_JsonRoot);
-	printf("%s\n", m_StrBody.c_str());
 	if (!APIClient_Http_Excute(xhToken, m_StrBody.c_str(), m_StrBody.length(), stl_MapIterator->second->tszAPIHdr))
 	{
 		AIApi_IsErrorOccur = true;
@@ -252,7 +251,7 @@ bool CAIApi_Image::AIApi_Image_GetStatus(XNETHANDLE xhToken, bool* pbComplete, i
 	if (stl_MapIterator == stl_MapAIClient.end())
 	{
 		AIApi_IsErrorOccur = true;
-		AIApi_dwErrorCode = ERROR_XENGINE_MODULE_AIAPI_CHAT_NOTFOUND;
+		AIApi_dwErrorCode = ERROR_XENGINE_MODULE_AIAPI_IMAGE_NOTFOUND;
 		st_Locker.unlock_shared();
 		return false;
 	}
@@ -351,19 +350,8 @@ bool CAIApi_Image::AIApi_Image_Parse(AICLIENT_IMAGE* pSt_AIClient, LPCXSTR lpszM
 			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, false, 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(), false, 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
 		}
 	}

XEngine_Module/XEngine_AIApi/AIApi_Image/AIApi_Image.h

@@ -12,14 +12,6 @@
 *********************************************************************/
 typedef struct
 {
-	int nCLen;
-	XCHAR tszThinkContent[8192];
-	XCHAR tszRoleContent[8192];
-	XCHAR tszRoleName[128];
-}AICLIENT_IMAGEHISTORY;
-typedef struct
-{
-	AICLIENT_IMAGEHISTORY st_HisStream;       //流式有用
 	XCHAR tszAPIUrl[XPATH_MAX];
 	XCHAR tszAPIHdr[XPATH_MAX];
 	XNETHANDLE xhToken;

XEngine_Module/XEngine_AIApi/XEngine_AIApi.vcxproj

@@ -239,12 +239,14 @@
     <ClInclude Include="AIApi_Chat\AIApi_Chat.h" />
     <ClInclude Include="AIApi_Define.h" />
     <ClInclude Include="AIApi_Error.h" />
+    <ClInclude Include="AIApi_Help\AIApi_Help.h" />
     <ClInclude Include="AIApi_Image\AIApi_Image.h" />
     <ClInclude Include="framework.h" />
     <ClInclude Include="pch.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="AIApi_Chat\AIApi_Chat.cpp" />
+    <ClCompile Include="AIApi_Help\AIApi_Help.cpp" />
     <ClCompile Include="AIApi_Image\AIApi_Image.cpp" />
     <ClCompile Include="dllmain.cpp" />
     <ClCompile Include="pch.cpp">

XEngine_Module/XEngine_AIApi/XEngine_AIApi.vcxproj.filters

@@ -25,6 +25,12 @@
     <Filter Include="源文件\AIApi_Image">
       <UniqueIdentifier>{a13fcb1c-0028-48b8-8412-889d070db132}</UniqueIdentifier>
     </Filter>
+    <Filter Include="头文件\AIApi_Help">
+      <UniqueIdentifier>{90ea5304-7076-452a-b6ad-890b625b0d58}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="源文件\AIApi_Help">
+      <UniqueIdentifier>{d612c628-9e84-4ba6-8612-f261a6952c73}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="framework.h">
@@ -45,6 +51,9 @@
     <ClInclude Include="AIApi_Image\AIApi_Image.h">
       <Filter>头文件\AIApi_Image</Filter>
     </ClInclude>
+    <ClInclude Include="AIApi_Help\AIApi_Help.h">
+      <Filter>头文件\AIApi_Help</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="dllmain.cpp">
@@ -59,6 +68,9 @@
     <ClCompile Include="AIApi_Image\AIApi_Image.cpp">
       <Filter>源文件\AIApi_Image</Filter>
     </ClCompile>
+    <ClCompile Include="AIApi_Help\AIApi_Help.cpp">
+      <Filter>源文件\AIApi_Help</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="XEngine_AIApi.def">

XEngine_Module/XEngine_AIApi/pch.h

@@ -8,6 +8,7 @@
 #define PCH_H
 #ifdef _MSC_BUILD
 // 添加要在此处预编译的标头
+#define _CRT_SECURE_NO_WARNINGS
 #include "framework.h"
 #endif
 #endif //PCH_H
@@ -29,6 +30,8 @@
 #include <XEngine_Include/XEngine_BaseLib/BaseSafe_Error.h>
 #include <XEngine_Include/XEngine_Client/APIClient_Define.h>
 #include <XEngine_Include/XEngine_Client/APIClient_Error.h>
+#include <XEngine_Include/XEngine_Core/Cryption_Define.h>
+#include <XEngine_Include/XEngine_Core/Cryption_Error.h>
 #include "AIApi_Define.h"
 #include "AIApi_Error.h"
 /********************************************************************
@@ -49,6 +52,7 @@ extern XLONG AIApi_dwErrorCode;
 #pragma comment(lib,"XEngine_BaseLib/XEngine_BaseLib")
 #pragma comment(lib,"XEngine_BaseLib/XEngine_BaseSafe")
 #pragma comment(lib,"XEngine_Client/XClient_APIHelp")
+#pragma comment(lib,"XEngine_Core/XEngine_Cryption")
 #ifdef _DEBUG
 #ifdef _M_X64
 #pragma comment(lib,"x64/Debug/jsoncpp")