AIGC/AICore.py

@@ -1,47 +1,21 @@
-import logging
-from typing import Tuple
 import requests
 from ollama import Client, ResponseError
 import tiktoken
-import random
-from Utils.AIGCLog import AIGCLog
 
 class AICore:
     modelMaxTokens = 128000
     # 初始化 DeepSeek 使用的 Tokenizer (cl100k_base)
     encoder = tiktoken.get_encoding("cl100k_base")
-    logger = AIGCLog(name = "AIGC", log_file = "aigc.log")
 
+     
 
     def __init__(self, model):
          #初始化ollama客户端
         self.ollamaClient = Client(host='http://localhost:11434', headers={'x-some-header': 'some-value'})
-        self.modelName = model
         response = self.ollamaClient.show(model)
         modelMaxTokens = response.modelinfo['qwen2.context_length']
         
     def getPromptToken(self, prompt)-> int: 
         tokens = self.encoder.encode(prompt)
         return len(tokens)
-    
+   
-    def generateAI(self, promptStr: str) -> Tuple[bool, str]:
-        try:
-            response = self.ollamaClient.generate(
-                model = self.modelName,
-                stream = False,
-                prompt = promptStr,
-                options={
-                    "temperature": random.uniform(1.0, 1.5),
-                    "repeat_penalty": 1.2,  # 抑制重复
-                    "top_p": random.uniform(0.7, 0.95),
-                    "num_ctx": 4096,           # 上下文长度
-                }
-            )
-            return True, response.response
-        except ResponseError as e:
-            if e.status_code == 503:
-                print("🔄 服务不可用，5秒后重试...")    
-            return False,"ollama 服务不可用"
-        except Exception as e:
-            print(f"🔥 未预料错误: {str(e)}")
-            return False, "未预料错误"

AIGC/DatabaseHandle.py

@@ -103,18 +103,17 @@ class DatabaseHandle:
             conn.commit()
             return cursor.lastrowid
         
-    def get_chats_by_character_id(self, character_id: str) -> list:
+    def get_chats_by_character_id(self, character_id: int) -> list:
         """
         根据角色ID查询聊天记录（target_id为空时返回全部数据）
         :param target_id: 目标角色ID（None时返回全部记录）
         :return: 聊天记录字典列表
         """
-    
-        sorted_ids = sorted(character_id.split(","), key=int)  # 按数值升序
-        normalized_param = ",".join(sorted_ids)
         with self._get_connection() as conn:
             cursor = conn.cursor()
-            sql = "SELECT * FROM chat_records WHERE character_ids = ?"
+            sql = "SELECT * FROM chat_records WHERE ',' || character_ids || ',' LIKE '%,' || ? || ',%'"
-            cursor.execute(sql, (normalized_param,))
+            params = (str(character_id))
+            cursor.execute(sql, params)
+            # 转换结果为字典列表
             columns = [col[0] for col in cursor.description]
             return [dict(zip(columns, row)) for row in cursor.fetchall()]

AIGC/StartCommand.bat

@@ -2,7 +2,7 @@
 chcp 65001 > nul
 set OLLAMA_MODEL=deepseek-r1:7b
 rem 启动Ollama服务
-start "Ollama DeepSeek" cmd /k ollama serve
+start "Ollama DeepSeek" cmd /k ollama run %OLLAMA_MODEL%
 
 rem 检测11434端口是否就绪
 echo 等待Ollama服务启动...

AIGC/main.py

@@ -26,15 +26,11 @@ parser.add_argument('--model', type=str, default='deepseek-r1:1.5b',
 args = parser.parse_args()
 logger.log(logging.INFO, f"使用的模型是 {args.model}")
 
-maxAIRegerateCount = 5 #最大重新生成次数
+maxAIRegerateCount = 5
-regenerateCount = 1 #当前重新生成次数
-totalAIGenerateCount = 1 #客户端生成AI响应总数
-currentGenerateCount = 0 #当前生成次数
 lastPrompt = ""
-character_id1 = 0
+
-character_id2 = 0
 aicore = AICore(args.model)
-database = DatabaseHandle()
+
 
 async def heartbeat(websocket: WebSocket):
     pass
@@ -52,18 +48,6 @@ async def senddata(websocket: WebSocket,  protocol: dict):
         json_string = json.dumps(protocol, ensure_ascii=False)
         await websocket.send_text(json_string)
 
-async def sendprotocol(websocket: WebSocket,  cmd: str, status: int, message: str, data: str):
-    # 将AI响应发送回UE5
-    protocol = {}
-    protocol["cmd"] = cmd
-    protocol["status"] = status
-    protocol["message"] = message
-    protocol["data"] = data
-
-    if websocket.client_state == WebSocketState.CONNECTED:
-        json_string = json.dumps(protocol, ensure_ascii=False)
-        await websocket.send_text(json_string)
-
 # WebSocket路由处理
 @app.websocket("/ws/{client_id}")
 async def websocket_endpoint(websocket: WebSocket, client_id: str):
@@ -78,7 +62,20 @@ async def websocket_endpoint(websocket: WebSocket, client_id: str):
             data = await websocket.receive_text()
             logger.log(logging.INFO, f"收到UE5消息 [{client_id}]: {data}")
             await process_protocol_json(data, websocket)
-                         
+
+            # success, prompt = process_prompt(data)
+            # global lastPrompt
+            # lastPrompt = prompt
+            # # 调用AI生成响应
+            # if(success):
+            #     asyncio.create_task(generateAIChat(prompt, websocket))
+            #     await senddata(websocket, 0, [])
+            # else:
+            #     await senddata(websocket, -1, [])
+           
+            
+           
+    
     except WebSocketDisconnect:
         #manager.disconnect(client_id)
         logger.log(logging.WARNING, f"UE5客户端主动断开 [{client_id}]")
@@ -90,7 +87,7 @@ async def handle_characterlist(client: WebSocket):
     ### 获得数据库中的角色信息###
     characters = database.get_character_byname("")
     protocol = {}
-    protocol["cmd"] = "RequestCharacterInfos"
+    protocol["cmd"] = "CharacterList"
     protocol["status"] = 1
     protocol["message"] = "success"
     characterforUE = {}
@@ -98,84 +95,6 @@ async def handle_characterlist(client: WebSocket):
     protocol["data"] = json.dumps(characterforUE)
     await senddata(client, protocol)
 
-async def handle_characternames(client: WebSocket):
-    ### 获得数据库中的角色信息###
-    characters = database.get_character_byname("")
-    protocol = {}
-    protocol["cmd"] = "RequestCharacterNames"
-    protocol["status"] = 1
-    protocol["message"] = "success"
-    characterforUE = {}
-    characterforUE["characterInfos"] = characters
-    protocol["data"] = json.dumps(characterforUE)
-    await senddata(client, protocol)
-
-async def generate_aichat(promptStr: str, client: WebSocket| None = None):
-    dynamic_token = str(int(time.time() % 1000)) 
-    promptStr = f""" 
-        [动态标识码:{dynamic_token}]
-    """ + promptStr
-    logger.log(logging.INFO, "prompt:" + promptStr)
-    starttime = time.time()
-    success, response, = aicore.generateAI(promptStr)
-    if(success):
-        logger.log(logging.INFO, "接口调用耗时 :" + str(time.time() - starttime))
-        logger.log(logging.INFO, "AI生成" + response)
-        #处理ai输出内容
-        think_remove_text = re.sub(r'<think>.*?</think>', '', response, flags=re.DOTALL)
-        pattern = r".*<format>(.*?)</format>"  # .* 吞掉前面所有字符，定位最后一组
-        match = re.search(pattern, think_remove_text, re.DOTALL)
-        if not match:
-            #生成内容格式错误
-            if await reGenerateAIChat(lastPrompt, client):
-                pass
-            else:
-                #超过重新生成次数
-                logger.log(logging.ERROR, "请更换prompt,或者升级模型大小")
-                await sendprotocol(client, "AiChatGenerate", 0, "请更换prompt,或者升级模型大小", "")
-        else:
-            #生成内容格式正确
-            core_dialog = match.group(1).strip()
-            dialog_lines = [line.strip() for line in core_dialog.split('\n') if line.strip()]
-            if len(dialog_lines) != 4:
-                #生成内容格式错误
-                if await reGenerateAIChat(lastPrompt, client):
-                    pass
-                else:
-                    logger.log(logging.ERROR, "请更换prompt，或者升级模型大小")
-                await sendprotocol(client, "AiChatGenerate", 0, "请更换prompt，或者升级模型大小", "")
-            else:
-                logger.log(logging.INFO, "AI的输出正确：\n" + core_dialog)
-                global regenerateCount
-                regenerateCount = 0
-                #保存数据到数据库
-                database.add_chat({"character_ids":f"{character_id1},{character_id2}","chat":f"{" ".join(dialog_lines)}"})
-
-                await sendprotocol(client, "AiChatGenerate", 1, "AI生成成功", "|".join(dialog_lines))
-    else:
-        await sendprotocol(client, "AiChatGenerate", -1, "调用ollama服务失败", "")
-    
-async def handle_aichat_generate(client: WebSocket, aichat_data:str):
-    ### 处理ai prompt###
-    success, prompt = process_prompt(aichat_data)
-    global lastPrompt
-    lastPrompt = prompt
-    
-    # 调用AI生成响应
-    if(success):
-        #asyncio.create_task(generateAIChat(prompt, client))
-        global currentGenerateCount
-        while currentGenerateCount < totalAIGenerateCount:
-            currentGenerateCount += 1
-            await generate_aichat(prompt, client)
-        
-        currentGenerateCount = 0
-        #全部生成完成
-        await sendprotocol(client, "AiChatGenerate", 2, "AI生成成功", "")
-    else:
-        #prompt生成失败
-        await sendprotocol(client, "AiChatGenerate", -1, "prompt convert failed", "")
-
 async def handle_addcharacter(client: WebSocket, chracterJson: str):
     ### 添加角色到数据库 ###
     character_info = json.loads(chracterJson)
@@ -190,14 +109,10 @@ async def process_protocol_json(json_str: str, client: WebSocket):
         protocol = json.loads(json_str)
         cmd = protocol.get("cmd")
         data = protocol.get("data")
-        if cmd == "RequestCharacterInfos":
+        if cmd == "CharacterList":
             await handle_characterlist(client)
-        elif cmd == "RequestCharacterNames":
-            await handle_characternames(client)
         elif cmd == "AddCharacter":
             await handle_addcharacter(client, data)
-        elif cmd == "AiChatGenerate":
-            await handle_aichat_generate(client, data)
 
     except json.JSONDecodeError as e:
         print(f"JSON解析错误: {e}")
@@ -206,65 +121,42 @@ async def process_protocol_json(json_str: str, client: WebSocket):
 def process_prompt(promptFromUE: str) -> Tuple[bool, str]:
     try:
         data = json.loads(promptFromUE)
-        global maxAIRegerateCount
         # 提取数据
-        dialog_scene = data["dialogScene"]
+        dialog_scene = data["dialogContent"]["dialogScene"]
-        global totalAIGenerateCount
+        persons = data["persons"]
-        totalAIGenerateCount = data["generateCount"]
-        persons = data["characterName"]
         
         assert len(persons) == 2
-        characterInfo1 = database.get_character_byname(persons[0])
+        for person in persons:
-        characterInfo2 = database.get_character_byname(persons[1])
+            print(f"  姓名: {person['name']}, 职业: {person['job']}")
-        global character_id1, character_id2
+    
-        character_id1 = characterInfo1[0]["id"]
-        character_id2 = characterInfo2[0]["id"]
-        chat_history = database.get_chats_by_character_id(str(character_id1) +  "," + str(character_id2))
-        #整理对话记录
-        result = result = '\n'.join([item['chat'] for item in chat_history])
-      
-
         prompt = f"""
-            #你是一个游戏NPC对话生成器。请严格按以下要求生成两个角色的日常对话
+                你是一个游戏NPC对话生成器。请严格按以下要求生成两个路人NPC（{persons[0]["name"]}和{persons[1]["name"]}）的日常对话：
-            #对话的背景
+                1. 生成【2轮完整对话】，每轮包含双方各一次发言（共4句）
-            {dialog_scene}
+                2. 对话场景：{dialog_scene}
-            1. 生成【2轮完整对话】，每轮包含双方各一次发言（共4句）
+                3. 角色设定：
-            2.角色设定
+                {persons[0]["name"]}：{persons[0]["job"]}
-             {characterInfo1[0]["name"]}: {{
+                {persons[1]["name"]}：{persons[1]["job"]}
-                "姓名": {characterInfo1[0]["name"]},
+                4. 对话要求：
-                "年龄": {characterInfo1[0]["age"]},
+                * 每轮对话需自然衔接，体现生活细节
-                "性格": {characterInfo1[0]["personality"]},
+                * 避免任务指引或玩家交互内容
-                "职业": {characterInfo1[0]["profession"]},
+                * 结尾保持对话未完成感
-                "背景": {characterInfo1[0]["characterBackground"]},
+                5. 输出格式：
-                "语言风格": {characterInfo1[0]["chat_style"]}
+                <format>
-            }},
+                {persons[0]["name"]}：[第一轮发言] 
-             {characterInfo2[0]["name"]}: {{
+                {persons[1]["name"]}：[第一轮回应] 
-                "姓名": {characterInfo2[0]["name"]},
+                {persons[0]["name"]}：[第二轮发言] 
-                "年龄": {characterInfo2[0]["age"]},
+                {persons[1]["name"]}：[第二轮回应]
-                "性格": {characterInfo2[0]["personality"]},
+                </format>
-                "职业": {characterInfo2[0]["profession"]},
+                
-                "背景": {characterInfo2[0]["characterBackground"]},
+                6.重要！若未按此格式输出，请重新生成直至完全符合
-                "语言风格": {characterInfo2[0]["chat_style"]}
-            }}
-            3.参考的历史对话内容
-            {result}
-            4.输出格式：
-            <format>
-            张三：[第一轮发言] 
-            李明：[第一轮回应] 
-            张三：[第二轮发言] 
-            李明：[第二轮回应]
-            </format>
-            5.重要！若未按此格式输出，请重新生成直至完全符合
         """
         return True, prompt
     
     except json.JSONDecodeError as e:
         print(f"JSON解析错误: {e}")
         return False, ""
-    except Exception as e:
+    except KeyError as e:
-        print(f"发生错误：{type(e).__name__} - {e}") 
+        print(f"缺少必要字段: {e}")
-        return False, ""
         
     
 
@@ -281,15 +173,91 @@ def run_webserver():
         log_level="info"
     )
 
+async def generateAIChat(promptStr: str, websocket: WebSocket| None = None):
+    #动态标识吗 防止重复输入导致的结果重复
+    dynamic_token = str(int(time.time() % 1000)) 
+    promptStr = f""" 
+        [动态标识码:{dynamic_token}]
+    """ + promptStr
+    logger.log(logging.INFO, "prompt:" + promptStr)
+    starttime = time.time()
+    receivemessage=[
+            {"role": "system", "content": promptStr}
+        ]
+    try:
+
+        # response = ollamaClient.chat(
+        #     model = args.model,
+        #     stream = False,
+        #     messages = receivemessage,
+        #     options={
+        #         "temperature": random.uniform(1.0, 1.5),
+        #         "repeat_penalty": 1.2,  # 抑制重复
+        #         "top_p": random.uniform(0.7, 0.95),
+        #         "num_ctx": 4096,           # 上下文长度
+        #         "seed": int(time.time() * 1000) % 1000000 
+        #     }
+        # )
+        response = ollamaClient.generate(
+            model = args.model,
+            stream = False,
+            prompt = promptStr,
+            options={
+                "temperature": random.uniform(1.0, 1.5),
+                "repeat_penalty": 1.2,  # 抑制重复
+                "top_p": random.uniform(0.7, 0.95),
+                "num_ctx": 4096,           # 上下文长度
+            }
+        )
+
+    except ResponseError as e:
+        if e.status_code == 503:
+            print("🔄 服务不可用，5秒后重试...")    
+        return await senddata(websocket, -1, messages=["ollama 服务不可用"])
+    except Exception as e:
+        print(f"🔥 未预料错误: {str(e)}")
+        return await senddata(websocket, -1, messages=["未预料错误"])
+    logger.log(logging.INFO, "接口调用耗时 :" + str(time.time() - starttime))
+    #aiResponse = response['message']['content']
+    aiResponse = response['response']
+    logger.log(logging.INFO, "AI生成" + aiResponse)
+    #处理ai输出内容
+    think_remove_text = re.sub(r'<think>.*?</think>', '', aiResponse, flags=re.DOTALL)
+    pattern = r".*<format>(.*?)</format>"  # .* 吞掉前面所有字符，定位最后一组
+    match = re.search(pattern, think_remove_text, re.DOTALL)
+    
+    if not match:
+        if await reGenerateAIChat(lastPrompt, websocket):
+            pass
+        else:
+            logger.log(logging.ERROR, "请更换prompt，或者升级模型大小")
+            await senddata(websocket, -1, messages=["请更换prompt，或者升级模型大小"])
+        
+    else:
+        core_dialog = match.group(1).strip()
+        dialog_lines = [line for line in core_dialog.split('\n') if line.strip()]
+        if len(dialog_lines) != 4:
+            if await reGenerateAIChat(lastPrompt, websocket):
+                pass
+            else:
+                logger.log(logging.ERROR, "请更换prompt，或者升级模型大小")
+                await senddata(websocket, -1, messages=["请更换prompt，或者升级模型大小"])
+        else:
+            logger.log(logging.INFO, "AI的输出正确：\n" + core_dialog)
+            global regenerateCount
+            regenerateCount = 0
+            await senddata(websocket, 1,  dialog_lines)
+
+regenerateCount = 1
 async def reGenerateAIChat(prompt: str, websocket: WebSocket):
     global regenerateCount
     if regenerateCount < maxAIRegerateCount:
         regenerateCount += 1
         logger.log(logging.ERROR, f"AI输出格式不正确，重新进行生成 {regenerateCount}/{maxAIRegerateCount}")
-        await sendprotocol(websocket, "AiChatGenerate", 0, "ai生成格式不正确， 重新进行生成", "")
+        await senddata(websocket, 2, messages=["ai生成格式不正确， 重新进行生成"])
         await asyncio.sleep(0)
-        prompt = prompt + "补充：上一次的输出格式错误，严格执行prompt中的输出格式要求"
+        prompt = prompt + "补充：上一次的输出格式错误，严格执行prompt中第5条的输出格式要求"
-        await generate_aichat(prompt, websocket)
+        await generateAIChat(prompt, websocket)
         return True
     else:
         regenerateCount = 0
@@ -304,18 +272,19 @@ if __name__ == "__main__":
 
     
     #Test database
-    
+    database = DatabaseHandle()
    
     
-    # id = database.add_character({"name":"李明","age":30,"personality":"活泼健谈","profession":"产品经理"
+    id = database.add_character({"name":"李明","age":30,"personality":"活泼健谈","profession":"产品经理"
-    #                         ,"characterBackground":"公司资深产品经理","chat_style":"热情"})
+                            ,"characterBackground":"公司资深产品经理","chat_style":"热情"})
     
-    #characters = database.get_character_byname("")
+    characters = database.get_character_byname("")
     #chat_id = database.add_chat({"character_ids":"1,2","chat":"张三：[第一轮发言] 李明：[第一轮回应] 张三：[第二轮发言] 李明：[第二轮回应"})
-    #chat = database.get_chats_by_character_id(3)
+    chat = database.get_chats_by_character_id(3)
-    #
+    if id == 0:
+        logger.log(logging.ERROR, f"角色 张三已经添加到数据库")
     # Test AI
-    #aicore.getPromptToken("测试功能")
+    aicore.getPromptToken("测试功能")
     # asyncio.run(
     #     generateAIChat(promptStr = f"""
     #         #你是一个游戏NPC对话生成器。请严格按以下要求生成两个角色的日常对话

TestForAIGC/Plugins/AIGC/Source/AIGC/Definations.cpp

@@ -1,6 +1,5 @@
 #include "Definations.h"
 
-FString FNetCommand::RequestCharacterInfos = TEXT("RequestCharacterInfos");
+FString FNetCommand::CharacterList = TEXT("CharacterList");
-FString FNetCommand::RequestCharacterNames = TEXT("RequestCharacterNames");
 FString FNetCommand::AddCharacter = TEXT("AddCharacter");
 FString FNetCommand::AiChatGenerate = TEXT("AiChatGenerate");

TestForAIGC/Plugins/AIGC/Source/AIGC/Private/AIGC.cpp

@@ -188,19 +188,8 @@ void FAIGCModule::InitWebSocketManager()
 	auto& Settings = *GetDefault<UAIGCSetting>();
 	WebSocketManager = NewObject<UWebSocketManager>();
 	WebSocketManager->InitWebSocket(Settings.ServerIP);
-	WebSocketManager->OnConnectDelegate.AddLambda([this](bool bSuccess)
-		{
-		
-			if (!bSuccess)
-			{
-				WebSocketManager->ConditionalBeginDestroy();
-				WebSocketManager = nullptr;
-			}
-		});
-	//WebSocketManager->OnConnectDelegate.AddRaw(this, &FAIGCModule::OnWebSocketConnect);
 }
 
-
 #undef LOCTEXT_NAMESPACE
 	
 IMPLEMENT_MODULE(FAIGCModule, AIGC)

TestForAIGC/Plugins/AIGC/Source/AIGC/Private/Widget/AIGCWindow.cpp

@@ -15,6 +15,15 @@ void SAIGCWindow::Construct(const FArguments& InArgs)
 {
 	ChildSlot[
 		SNew(SVerticalBox)
+		+ SVerticalBox::Slot()
+		   .AutoHeight()
+		   .Padding(10)
+		   [
+			   SAssignNew(ServerIP, SConfigItem_Text)
+			   .Title(LOCTEXT("Server", "服务器ip"))
+			   .HintText(LOCTEXT("HintServer", "请输入服务器ip"))
+			   .DefaultText(LOCTEXT("InputServer", "127.0.0.1"))
+		   ]
 		+ SVerticalBox::Slot()
 		   .AutoHeight()
 		   .Padding(10)
@@ -27,48 +36,35 @@ void SAIGCWindow::Construct(const FArguments& InArgs)
 			   .AutoHeight()
 			   .Padding(10)
 			   [
-				   SAssignNew(NPCName1, SConfigItem_ComboBox<TSharedPtr<FCharacterInfo>>)
+				   SAssignNew(NPCName1, SConfigItem_Text)
 				   .Title(LOCTEXT("Name1", "名称1"))
-				   .OptionsSource(&CharacterInfos)
+				   .HintText(LOCTEXT("HintName", "请输入名称"))
-			   		.Content()
-					[
-						SNew(STextBlock)
-					   .Text_Lambda([this]() -> FText {
-			   			
-							return FText::FromString(SelectedCharacter1.name);
-					   })
-					]
-			   	.OnGenerateWidget_Lambda([this](TSharedPtr<FCharacterInfo> CharacterInfo) {
-					return SNew(STextBlock).Text(FText::FromString(CharacterInfo->name));
-				})
-				.OnSelectionChanged_Lambda([this](TSharedPtr<FCharacterInfo> CharacterInfo, ESelectInfo::Type)
-				{
-					SelectedCharacter1 = *CharacterInfo;
-				})
 			   ]
 		+ SVerticalBox::Slot()
-			   .AutoHeight()
+		   .AutoHeight()
-			   .Padding(10)
+		   .Padding(10)
-			   [
+		   [
-				   SAssignNew(NPCName2, SConfigItem_ComboBox<TSharedPtr<FCharacterInfo>>)
+			   SAssignNew(NPCJob1, SConfigItem_Text)
-				   .Title(LOCTEXT("Name2", "名称2"))
+			   .Title(LOCTEXT("Job1", "职业1"))
-				   .OptionsSource(&CharacterInfos)
+			   .HintText(LOCTEXT("HintJon", "请输入职业"))
-					   .Content()
+		   ]
-					[
+		+ SVerticalBox::Slot()
-						SNew(STextBlock)
+		   .AutoHeight()
-					   .Text_Lambda([this]() -> FText {
+		   .Padding(10)
-			   			
+		   [
-							return FText::FromString(SelectedCharacter2.name);
+			   SAssignNew(NPCName2, SConfigItem_Text)
-					   })
+			   .Title(LOCTEXT("Name2", "名称2"))
-					]
+			   .HintText(LOCTEXT("HintName", "请输入名称"))
-				   .OnGenerateWidget_Lambda([this](TSharedPtr<FCharacterInfo> CharacterInfo) {
+		   ]
-						return SNew(STextBlock).Text(FText::FromString(CharacterInfo->name));
+		
-					})
+		+ SVerticalBox::Slot()
-				.OnSelectionChanged_Lambda([this](TSharedPtr<FCharacterInfo> CharacterInfo, ESelectInfo::Type)
+		   .AutoHeight()
-				{
+		   .Padding(10)
-					SelectedCharacter2 = *CharacterInfo;
+		   [
-				})
+			   SAssignNew(NPCJob2, SConfigItem_Text)
-			   ]
+			   .Title(LOCTEXT("Job2", "职业2"))
+			   .HintText(LOCTEXT("HintJon", "请输入职业"))
+		   ]
 		+ SVerticalBox::Slot()
 		   .AutoHeight()
 		   .Padding(10)
@@ -115,19 +111,14 @@ EActiveTimerReturnType SAIGCWindow::OnPostPaint(double X, float Arg)
 	if (ModulePtr)
 	{
 		UWebSocketManager* WebSocketManager = ModulePtr->GetWebSocketManager();
-		if (!IsValid(WebSocketManager))
+		if (!WebSocketManager)
 		{
 			ModulePtr->InitWebSocketManager();
 			WebSocketManager = ModulePtr->GetWebSocketManager();
 		}
-		else
+		WebSocketManager->OnConnectDelegate.AddLambda([this](bool bSuccess)
-		{
-			WebSocketManager->SendData(FNetCommand::RequestCharacterNames, TEXT(""));
-		}
-		WebSocketManager->OnConnectDelegate.AddLambda([this, WebSocketManager](bool bSuccess)
 		{
 			GenerateButton->SetEnabled(bSuccess);
-			WebSocketManager->SendData(FNetCommand::RequestCharacterNames, TEXT(""));
 		});
 		WebSocketManager->OnDataReceiveDelaget.AddRaw(this, &SAIGCWindow::HandleReceiveData);
 		
@@ -140,27 +131,11 @@ void SAIGCWindow::OnAIGenerateClicked()
 {
 	GenerateButton->SetEnabled(false);
 	RequireGenerateCount = GenerateCount->GetNumber();
-
+	UE_LOG(LogTemp, Warning, TEXT("生成次数 %d prompt:%s"), RequireGenerateCount, *GeneratePromptJson());
 	FAIGCModule* ModulePtr = FModuleManager::GetModulePtr<FAIGCModule>("AIGC");
-
-	//生成ai 配置信息
-	FRequestAIChat RequestAIChat;
-	RequestAIChat.DialogScene =DialogScene->GetInputText();
-	RequestAIChat.GenerateCount = GenerateCount->GetNumber();
-	RequestAIChat.CharacterName.Add(SelectedCharacter1.name);
-	RequestAIChat.CharacterName.Add(SelectedCharacter2.name);
-	FString dataJson;
-	FJsonObjectConverter::UStructToJsonObjectString(
-		FRequestAIChat::StaticStruct(), 
-		&RequestAIChat, 
-		dataJson, 
-		0, 
-		0
-	);
-	//发送ai对话生成请求
 	if (ModulePtr)
 	{
-		ModulePtr->GetWebSocketManager()->SendData(FNetCommand::AiChatGenerate, dataJson);
+		ModulePtr->GetWebSocketManager()->SendData(FNetCommand::AiChatGenerate, GeneratePromptJson());
 	}
 	
 }
@@ -168,55 +143,60 @@ void SAIGCWindow::OnAIGenerateClicked()
 
 void SAIGCWindow::HandleReceiveData(FNetProtocol protocol)
 {
-	if (protocol.cmd == FNetCommand::RequestCharacterNames)
+	// UE_LOG(LogTemp, Warning, TEXT("AI当前进度  %d/%d"), GeneratedCount, RequireGenerateCount);
-	{
+	// //添加数据到dataTable中
-		
+	// if (AiMessages.Num() > 0)
-		//解析json角色信息
+	// {
-		FJsonObjectConverter::JsonObjectStringToUStruct<FCharacterArray>(
+	// 	FAIGCModule* ModulePtr = FModuleManager::GetModulePtr<FAIGCModule>("AIGC");
-			protocol.data, 
+	// 	if (ModulePtr) {
-			&Characters, 
+	// 		FString DataPath = FString::Printf(TEXT("/Game/Test/%s.%s"), *DataName->GetInputText(), *DataName->GetInputText());
-			0,  // 检查标志位
+	// 		FString Final = "";
-			0   // 转换标志位
+	// 		for (auto message: AiMessages)
-		);
+	// 		{
-		CharacterInfos.Empty();
+	// 			Final += message + TEXT("|");
-		for (auto Character: Characters.characterInfos)
+	// 		}
-		{
+	// 		ModulePtr->CreateOrAddData(DataPath, Final);
-			CharacterInfos.Add(MakeShareable(new FCharacterInfo(Character)));
+	// 	}
-		}
+	// }
-		NPCName1->RefreshOptions();
+	//
-		NPCName2->RefreshOptions();
+	// //是否生成足够数量
-	}
+	// if (GeneratedCount < RequireGenerateCount)
-	else if (protocol.cmd == FNetCommand::AiChatGenerate)
+	// {
-	{
+	// 	GeneratedCount++;
-		if (protocol.status == -1)
+	// 	FAIGCModule* ModulePtr = FModuleManager::GetModulePtr<FAIGCModule>("AIGC");
-		{
+	// 	if (ModulePtr)
-			//需要重新生成
+	// 	{
-			GenerateButton->SetEnabled(true);
+	// 		ModulePtr->GetWebSocketManager()->SendData(FNetCommand::AiChatGenerate, GeneratePromptJson());
-			UE_LOG(LogTemp, Error, TEXT("Chat Generate Failed reson = %s"), *protocol.message);
+	// 	}
-		}
+	// 	
-		else if (protocol.status == 0)
+	// }
-		{
+	// else
-			UE_LOG(LogTemp, Warning, TEXT("Chat Generate warning reson = %s"), *protocol.message);
+	// {
-		}
+	// 	GeneratedCount = 0;
-		else if (protocol.status == 1)
+	// 	GenerateButton->SetEnabled(true);
-		{
+	// 	UE_LOG(LogTemp, Warning, TEXT("生成结束！"));
-			UE_LOG(LogTemp, Warning, TEXT("Chat Generate success chat = %s"), *protocol.data);
+	// }
-			FAIGCModule* ModulePtr = FModuleManager::GetModulePtr<FAIGCModule>("AIGC");
-			if (ModulePtr) {
-				FString DataPath = FString::Printf(TEXT("/Game/Test/%s.%s"), *DataName->GetInputText(), *DataName->GetInputText());
-				ModulePtr->CreateOrAddData(DataPath, protocol.data);
-			}
-		}
-		else if (protocol.status == 2)
-		{
-			//全部生成完成
-			UE_LOG(LogTemp, Warning, TEXT("Chat Generate has all generated"));
-			GenerateButton->SetEnabled(true);
-		}
-	}
 	
 }
 
+FString SAIGCWindow::GeneratePromptJson()
+{
+	FPrompt PromptData;
+	PromptData.DialogContent = FDialogContent(DialogScene->GetInputText());
+	PromptData.Persons.Add(FPersonInfo(NPCName1->GetInputText(), NPCJob1->GetInputText()));
+	PromptData.Persons.Add(FPersonInfo(NPCName2->GetInputText(), NPCJob2->GetInputText()));
+	// 结构体转JSON字符串
+	FString OutputString;
+	FJsonObjectConverter::UStructToJsonObjectString(
+		FPrompt::StaticStruct(), 
+		&PromptData, 
+		OutputString, 
+		0, 
+		0
+	);
+	return OutputString;
+}
+
 
 
 #undef LOCTEXT_NAMESPACE

TestForAIGC/Plugins/AIGC/Source/AIGC/Private/Widget/CharacterWindow.cpp

@@ -12,6 +12,7 @@
 void SCharacterWindow::Construct(const FArguments& InArgs)
 {
 	
+
 	ChildSlot[
 		SNew(SVerticalBox)
 		+SVerticalBox::Slot()
@@ -128,12 +129,12 @@ EActiveTimerReturnType SCharacterWindow::OnPostPaint(double X, float Arg)
 		}
 		else
 		{
-			WebSocketManager->SendData(FNetCommand::RequestCharacterInfos, TEXT(""));
+			WebSocketManager->SendData(FNetCommand::CharacterList, TEXT(""));
 		}
 		WebSocketManager->OnDataReceiveDelaget.AddRaw(this, &SCharacterWindow::HandleReceiveData);
 		WebSocketManager->OnConnectDelegate.AddLambda([this, WebSocketManager](bool bSuccess)
 		{
-			WebSocketManager->SendData(FNetCommand::RequestCharacterInfos, TEXT(""));
+			WebSocketManager->SendData(FNetCommand::CharacterList, TEXT(""));
 		});
 	}
 	return EActiveTimerReturnType::Stop;
@@ -141,7 +142,7 @@ EActiveTimerReturnType SCharacterWindow::OnPostPaint(double X, float Arg)
 
 void SCharacterWindow::HandleReceiveData(FNetProtocol protocol)
 {
-	if (protocol.cmd == FNetCommand::RequestCharacterInfos)
+	if (protocol.cmd == FNetCommand::CharacterList)
 	{
 		
 		//解析json角色信息

TestForAIGC/Plugins/AIGC/Source/AIGC/Private/Widget/ConfigItem_ComboBox.cpp

@@ -1,5 +0,0 @@
-// Fill out your copyright notice in the Description page of Project Settings.
-
-
-#include "Widget/ConfigItem_ComboBox.h"
-

TestForAIGC/Plugins/AIGC/Source/AIGC/Public/AIGC.h

@@ -50,7 +50,6 @@ public:
 	void CreateOrAddData(const FString& DataTablePath, const FString& RowValue);
 	class UWebSocketManager* GetWebSocketManager();
 	void InitWebSocketManager();
-	//void OnWebSocketConnect(bool bSuccess);
 	
 private:
 	TSharedPtr<class FUICommandList> PluginCommands;

TestForAIGC/Plugins/AIGC/Source/AIGC/Public/Definations.h

@@ -3,42 +3,49 @@
 #include "CoreMinimal.h"
 #include "Definations.generated.h"
 
-// USTRUCT()
-// struct FDialogContent
-// {
-//     GENERATED_BODY()
-//     FDialogContent() {};
-//
-//     FDialogContent(const FString& InDialogScene) : DialogScene(InDialogScene) {}
-//     UPROPERTY()
-//     FString DialogScene;
-// };
-
-// USTRUCT()
-// struct FPersonInfo
-// {
-//     GENERATED_BODY()
-//     FPersonInfo() {}
-//     FPersonInfo(const FString& InName, const FString& InJob):
-//     Name(InName), Job(InJob){}
-//     UPROPERTY()
-//     FString Name;
-//     UPROPERTY()
-//     FString Job;
-//     
-// };
 USTRUCT()
-struct FRequestAIChat
+struct FDialogContent
+{
+    GENERATED_BODY()
+    FDialogContent() {};
+
+    FDialogContent(const FString& InDialogScene) : DialogScene(InDialogScene) {}
+    UPROPERTY()
+    FString DialogScene;
+};
+
+USTRUCT()
+struct FPersonInfo
+{
+    GENERATED_BODY()
+    FPersonInfo() {}
+    FPersonInfo(const FString& InName, const FString& InJob):
+    Name(InName), Job(InJob){}
+    UPROPERTY()
+    FString Name;
+    UPROPERTY()
+    FString Job;
+    
+};
+USTRUCT()
+struct FPrompt
 {
     GENERATED_BODY()
     UPROPERTY()
-    FString DialogScene;
+    FDialogContent DialogContent;
     UPROPERTY()
-    int32 GenerateCount;
+    TArray<FPersonInfo> Persons;
-    UPROPERTY()
-    TArray<FString> CharacterName;
 };
 
+USTRUCT()
+struct FAIServerData
+{
+    GENERATED_BODY()
+    UPROPERTY()
+    int32 statusCode;
+    UPROPERTY()
+    TArray<FString> messages;
+};
 
 USTRUCT()
 struct FCharacterInfo
@@ -85,8 +92,7 @@ USTRUCT()
 struct FNetCommand
 {
     GENERATED_BODY()
-    static FString RequestCharacterInfos;
+    static FString CharacterList;
-    static FString RequestCharacterNames;
     static FString AddCharacter;
     static FString AiChatGenerate;
 };

TestForAIGC/Plugins/AIGC/Source/AIGC/Public/Widget/AIGCWindow.h

@@ -3,7 +3,6 @@
 #pragma once
 
 #include "CoreMinimal.h"
-#include "ConfigItem_ComboBox.h"
 #include "ConfigItem_NumberSpin.h"
 #include "ConfigItem_Text.h"
 #include "Definations.h"
@@ -27,22 +26,19 @@ public:
 	void HandleReceiveData(FNetProtocol protocol);
 	
 private:
-
+	FString GeneratePromptJson();
 	int32 RequireGenerateCount;
 	int32 GeneratedCount = 1;
-	FCharacterArray Characters;
-	TArray<TSharedPtr<FCharacterInfo>> CharacterInfos;
-	FCharacterInfo SelectedCharacter1;
-	FCharacterInfo SelectedCharacter2;
-	
 protected:
+	TSharedPtr<SConfigItem_Text> ServerIP; //服务器IP
 	TSharedPtr<SConfigItem_Text> DataName; //datatable 名称
-	TSharedPtr<SConfigItem_ComboBox<TSharedPtr<FCharacterInfo>>> NPCName1; //npc1的名称
+	TSharedPtr<SConfigItem_Text> NPCName1; //npc1的名称
-	TSharedPtr<SConfigItem_ComboBox<TSharedPtr<FCharacterInfo>>> NPCName2; //npc2的名称
+	TSharedPtr<SConfigItem_Text> NPCJob1;	//npc1的职业
+	TSharedPtr<SConfigItem_Text> NPCName2; //npc2的名称
+	TSharedPtr<SConfigItem_Text> NPCJob2;	//npc2的职业
 	TSharedPtr<SConfigItem_Text> DialogScene; //对话场景
 	TSharedPtr<SConfigItem_NumberSpin<int32>> GenerateCount; //生成数目 
 	TSharedPtr<SButton> GenerateButton; //生成按钮
 
-	
 
 };

TestForAIGC/Plugins/AIGC/Source/AIGC/Public/Widget/ConfigItem_ComboBox.h

@@ -1,69 +0,0 @@
-// Fill out your copyright notice in the Description page of Project Settings.
-
-#pragma once
-
-#include "CoreMinimal.h"
-
-/**
- * 
- */
-template <typename OptionType>
-class AIGC_API SConfigItem_ComboBox: public SCompoundWidget 
-{
-public:
-	typedef typename TSlateDelegates<OptionType>::FOnGenerateWidget FOnGenerateWidget;
-	typedef typename TSlateDelegates<OptionType>::FOnSelectionChanged FOnSelectionChanged;
-	SLATE_BEGIN_ARGS( SConfigItem_ComboBox )
-		:_Title()
-		,_Content()
-		{}
-		
-		
-		SLATE_ARGUMENT(FText, Title)        // 标题参数
-		SLATE_ITEMS_SOURCE_ARGUMENT( OptionType, OptionsSource ) //数据源
-		SLATE_EVENT(FOnGenerateWidget, OnGenerateWidget )
-		SLATE_EVENT( FOnSelectionChanged, OnSelectionChanged )
-		SLATE_NAMED_SLOT(FArguments, Content)//显示
-	
-	SLATE_END_ARGS()
-	
-	void Construct(const FArguments& InArgs)
-	{
-		//OptionSource = InArgs.GetOptionsSource();
-		ChildSlot
-		[
-			SNew(SHorizontalBox)
-			+ SHorizontalBox::Slot()
-				.AutoWidth()
-				.Padding(10, 0)
-				[
-					SNew(STextBlock)
-					.Text(InArgs._Title)
-				]
-			+ SHorizontalBox::Slot()
-				.FillWidth(1.0f)
-				.Padding(10, 0)
-				[
-					SAssignNew(ComboBox, SComboBox<OptionType>)
-					.OptionsSource(InArgs.GetOptionsSource())
-					.Content()
-					[
-						InArgs._Content.Widget
-					]
-					.OnGenerateWidget(InArgs._OnGenerateWidget)
-					.OnSelectionChanged(InArgs._OnSelectionChanged)
-				]
-		];
-	}
-	void RefreshOptions()
-	{
-			ComboBox->RefreshOptions();
-	}
-private:
-	TSharedPtr<SComboBox<OptionType>> ComboBox;
-	//TArray<OptionType>* OptionSource; //数据源指针
-	// FOnGenerateWidget OnGenerateWidgetDelegate;
-	// FOnSelectionChanged OnSelectionChangedDelegate;
-};
-
-

TestForAIGC/Plugins/AIGC/Source/AIGC/Public/Widget/ConfigItem_NumberSpin.h

@@ -25,7 +25,6 @@ public:
 
 	void Construct(const FArguments& InArgs)
 	{
-		InputValue = InArgs._MinNumber;
 		ChildSlot
 		[
 			SNew(SHorizontalBox)