Matched with base

Unreal/Plugins/AvatarCore_AI/Source/AvatarCore_AI/Private/AIBaseManager.cpp

@@ -126,9 +126,9 @@ void UAIBaseManager::OnAIReady()
     UAIBaseManager::SetNewState(EAvatarCoreAIState::Ready);
     if (!ResponseQueue.IsEmpty())
     {
-        FString QueuedPrompt;
+        FPrompt QueuedPrompt;
         ResponseQueue.Dequeue(QueuedPrompt);
-        UAIBaseManager::SendResponse(QueuedPrompt, false, true);
+        UAIBaseManager::SendResponse(QueuedPrompt.Prompt, QueuedPrompt.Role, false, true);
     }
 }
 
@@ -146,10 +146,13 @@ void UAIBaseManager::SetNewState(EAvatarCoreAIState NewState, bool ForceState)
     }
 }
 
-void UAIBaseManager::SendResponse(const FString& Response, bool NotifyDelay = false, bool TriggerResponse = true)
+void UAIBaseManager::SendResponse(const FString& Response, EAvatarCoreAIPromptRole Role = EAvatarCoreAIPromptRole::User, bool NotifyDelay = false, bool TriggerResponse = true)
 {
     if (CurrentAIState != EAvatarCoreAIState::Ready) {
-        ResponseQueue.Enqueue(Response);
+        FPrompt tmpPrompt;
+        tmpPrompt.Prompt = Response;
+        tmpPrompt.Role = Role;
+        ResponseQueue.Enqueue(tmpPrompt);
         if(CurrentAIState == EAvatarCoreAIState::Disconnected)
             ActivateAI();    
         return;
@@ -167,7 +170,7 @@ void UAIBaseManager::SendResponse(const FString& Response, bool NotifyDelay = fa
 	BroadcastAILog(FString::Printf(TEXT("AI Manager sent question/response: %s"), *Response));
     if (NotifyDelay)
         UAIBaseManager::StartDelayedAnswerTimer();
-	SendResponseChild(Response, NotifyDelay, TriggerResponse);
+	SendResponseChild(Response, Role, NotifyDelay, TriggerResponse);
 }
 
 void UAIBaseManager::RepeatText(FString TextToRepeat, bool DoRephrase)
@@ -179,7 +182,7 @@ void UAIBaseManager::RepeatText(FString TextToRepeat, bool DoRephrase)
         Instruction = "[REPHRASE] " + TextToRepeat;
 	else
 		Instruction = "[REPEAT] " + TextToRepeat;
-	SendResponse(Instruction, false, true);
+	SendResponse(Instruction, EAvatarCoreAIPromptRole::System, false, true);
 }
 
 void UAIBaseManager::ClearAI()
@@ -341,6 +344,19 @@ void UAIBaseManager::ClearMCPCommand()
     }
 }
 
+FString UAIBaseManager::GetRoleAsString(EAvatarCoreAIPromptRole Role)
+{
+    switch (Role) {
+    case EAvatarCoreAIPromptRole::Assistant:
+        return "assistant";
+    case EAvatarCoreAIPromptRole::System:
+        return "system";
+    case EAvatarCoreAIPromptRole::User:
+    default:
+        return "user";
+    }
+}
+
 void UAIBaseManager::CommandFinished(const FString& Command, const FString& Payload)
 {
     SetNewState(EAvatarCoreAIState::Ready);

Unreal/Plugins/AvatarCore_AI/Source/AvatarCore_AI/Private/RealtimeAPI/AvatarCoreAIRealtime.cpp

@@ -38,9 +38,9 @@ void UAvatarCoreAIRealtime::DeactivateAI()
     UAIBaseManager::DeactivateAI();
 }
 
-void UAvatarCoreAIRealtime::SendResponseChild(const FString& Response, bool NotifyDelay = false, bool TriggerResponse = true)
+void UAvatarCoreAIRealtime::SendResponseChild(const FString& Response, EAvatarCoreAIPromptRole Role, bool NotifyDelay = false, bool TriggerResponse = true)
 {
-    UAvatarCoreAIRealtime::CreateConversationItem(Response, EOpenAIRoleType::User, TriggerResponse);
+    UAvatarCoreAIRealtime::CreateConversationItem(Response, Role, TriggerResponse);
 }
 
 void UAvatarCoreAIRealtime::ClearAI()
@@ -263,7 +263,7 @@ void UAvatarCoreAIRealtime::WebSocketSendType(const FString& type)
     }
 }
 
-void UAvatarCoreAIRealtime::CreateConversationItem(const FString& message, EOpenAIRoleType role, bool triggerResponse)
+void UAvatarCoreAIRealtime::CreateConversationItem(const FString& message, EAvatarCoreAIPromptRole role, bool triggerResponse)
 {
     TSharedPtr<FJsonObject> RootObject = MakeShareable(new FJsonObject);
     RootObject->SetStringField("type", "conversation.item.create");
@@ -695,17 +695,3 @@ void UAvatarCoreAIRealtime::DebugSimulateConnectionDrop()
     SetNewState(EAvatarCoreAIState::Error, true);
     BroadcastAIError("Simulated socket error 3008", EAvatarCoreAIError::ConnectionDropped);
 }
-
-
-FString UAvatarCoreAIRealtime::GetRoleAsString(EOpenAIRoleType role)
-{
-    switch (role) {
-        case EOpenAIRoleType::Assistant:
-            return "assistant";
-        case EOpenAIRoleType::System:
-            return "system";
-        case EOpenAIRoleType::User:
-        default:
-            return "user";
-    }
-}

Unreal/Plugins/AvatarCore_AI/Source/AvatarCore_AI/Public/AIBaseManager.h

@@ -105,10 +105,10 @@ public:
     * Send Response/Question to the AI Model. If NotifyDelay is true call the DelayedAnswer Event when time defined in AIConfig has passed.
     */
     UFUNCTION(BlueprintCallable, Category = "AvatarCoreAI")
-    void SendResponse(const FString& Response, bool NotifyDelay, bool TriggerResponse);
+    void SendResponse(const FString& Response, EAvatarCoreAIPromptRole Role, bool NotifyDelay, bool TriggerResponse);
 
     UFUNCTION(BlueprintCallable, Category = "AvatarCoreAI")
-    virtual void SendResponseChild(const FString& Response, bool NotifyDelay, bool TriggerResponse) {};
+    virtual void SendResponseChild(const FString& Response, EAvatarCoreAIPromptRole Role, bool NotifyDelay, bool TriggerResponse) {};
 
     /**
     * Make the AI Model repeat the Text.
@@ -207,6 +207,9 @@ public:
     UFUNCTION(BlueprintCallable, Category = "AvatarCoreAI|MCP Commands")
     void ClearMCPCommand();
 
+    UFUNCTION(BlueprintCallable, Category = "AvatarCoreAI|Helper")
+    static FString GetRoleAsString(EAvatarCoreAIPromptRole Role);
+
 protected:
 
     /**
@@ -283,6 +286,6 @@ protected:
 
 private:
 
-	TQueue<FString, EQueueMode::Spsc> ResponseQueue;
+	TQueue<FPrompt, EQueueMode::Spsc> ResponseQueue;
 
 };

Unreal/Plugins/AvatarCore_AI/Source/AvatarCore_AI/Public/AvatarCoreAIEnumsAndStructs.h

@@ -18,6 +18,15 @@ enum class EAvatarCoreAIError : uint8
 	Unknown
 };
 
+UENUM(BlueprintType)
+enum class EAvatarCoreAIPromptRole : uint8
+{
+	User		UMETA(DisplayName = "User"),
+	Assistant	UMETA(DisplayName = "Assistant"),
+	System		UMETA(DisplayName = "System"),
+};
+
+
 UENUM(BlueprintType)
 enum class EAvatarCoreAIState : uint8
 {
@@ -79,3 +88,15 @@ struct FMCPToolInfo
 		OutputScheme = "";
 	}
 };
+
+USTRUCT(BlueprintType)
+struct FPrompt
+{
+	GENERATED_BODY()
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "AI")
+	FString Prompt;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "AI")
+	EAvatarCoreAIPromptRole Role;
+};

Unreal/Plugins/AvatarCore_AI/Source/AvatarCore_AI/Public/RealtimeAPI/AvatarCoreAIRealtime.h

@@ -13,13 +13,6 @@
 #include "RealtimeAPI/RealtimeAPIConfig.h"
 #include "AvatarCoreAIRealtime.generated.h"
 
-UENUM(BlueprintType)
-enum class EOpenAIRoleType : uint8 {
-	User		UMETA(DisplayName = "User"),
-	Assistant	UMETA(DisplayName = "Assistant"),
-	System		UMETA(DisplayName = "System"),
-};
-
 UENUM(BlueprintType)
 enum class EOpenAIRequestType : uint8 {
 	undefined			UMETA(DisplayName = "UNDEFINED"),
@@ -156,7 +149,7 @@ public:
 	void ActivateAI() override;
 	void DeactivateAI() override;
 	void UpdateSession() override;
-	void SendResponseChild(const FString& Response, bool NotifyDelay, bool TriggerResponse) override;
+	void SendResponseChild(const FString& Response, EAvatarCoreAIPromptRole Role, bool NotifyDelay, bool TriggerResponse) override;
 	void ClearAI() override;
 
 	void ConnectToWebSocket();
@@ -169,7 +162,7 @@ public:
 	void WebSocketSendType(const FString& type);
 
 	UFUNCTION(BlueprintCallable, Category = "AvatarCore AI|RealtimeAPI")
-	void CreateConversationItem(const FString& message, EOpenAIRoleType role, bool triggerResponse = true);
+	void CreateConversationItem(const FString& message, EAvatarCoreAIPromptRole role, bool triggerResponse = true);
 
 	UFUNCTION(BlueprintCallable, Category = "AvatarCore AI|RealtimeAPI")
 	void CreateReseponse();
@@ -198,8 +191,6 @@ public:
 private:
 
 	URealtimeAPIConfig* RealtimeConfig;
-
-	FString GetRoleAsString(EOpenAIRoleType role);
 	FString CurrentRequestID;
 	int32 CurrentRetries = 0;
 	int32 MaxRetries = 2;