HttpGPT v1.5.4: Add chat history persistence to editor tool

lucoiso · web-flow · commit 45947b43b6a0 · 2023-08-14T19:33:45.000+01:00
diff --git a/HttpGPT.uplugin b/HttpGPT.uplugin
@@ -1,7 +1,7 @@
 {
 	"FileVersion": 3,
-	"Version": 16,
-	"VersionName": "1.5.3",
+	"Version": 17,
+	"VersionName": "1.5.4",
 	"FriendlyName": "HttpGPT - GPT Integration",
 	"Description": "HttpGPT is an Unreal Engine plugin that facilitates integration with OpenAI's GPT based services (ChatGPT and DALL-E) through asynchronous REST requests, making it easy for developers to communicate with these services. HttpGPT also includes new Editor Tools to integrate Chat GPT and DALL-E image generation directly in the Engine.",
 	"Category": "Game Features",
diff --git a/Source/HttpGPTChatModule/Private/Tasks/HttpGPTChatRequest.cpp b/Source/HttpGPTChatModule/Private/Tasks/HttpGPTChatRequest.cpp
@@ -105,7 +105,7 @@ FString UHttpGPTChatRequest::SetRequestContent()
 
     UE_LOG(LogHttpGPT_Internal, Display, TEXT("%s (%d): Mounting content"), *FString(__func__), GetUniqueID());
 
-    const TSharedPtr<FJsonObject> JsonRequest = MakeShareable(new FJsonObject);
+    const TSharedPtr<FJsonObject> JsonRequest = MakeShared<FJsonObject>();
     JsonRequest->SetStringField("model", UHttpGPTHelper::ModelToName(GetChatOptions().Model).ToString().ToLower());
     JsonRequest->SetNumberField("max_tokens", GetChatOptions().MaxTokens);
     JsonRequest->SetNumberField("temperature", GetChatOptions().Temperature);
@@ -125,15 +125,15 @@ FString UHttpGPTChatRequest::SetRequestContent()
         TArray<TSharedPtr<FJsonValue>> StopJson;
         for (const FName& Iterator : GetChatOptions().Stop)
         {
-            StopJson.Add(MakeShareable(new FJsonValueString(Iterator.ToString())));
+            StopJson.Add(MakeShared<FJsonValueString>(Iterator.ToString()));
         }
 
         JsonRequest->SetArrayField("stop", StopJson);
     }
 
     if (!HttpGPT::Internal::HasEmptyParam(GetChatOptions().LogitBias))
     {
-        TSharedPtr<FJsonObject> LogitBiasJson = MakeShareable(new FJsonObject());
+        TSharedPtr<FJsonObject> LogitBiasJson = MakeShared<FJsonObject>();
         for (const TPair<int32, float>& Iterator : GetChatOptions().LogitBias)
         {
             LogitBiasJson->SetNumberField(FString::FromInt(Iterator.Key), Iterator.Value);
@@ -314,7 +314,7 @@ void UHttpGPTChatRequest::DeserializeSingleResponse(const FString& Content)
     }
 
     const TSharedRef<TJsonReader<>> Reader = TJsonReaderFactory<>::Create(Content);
-    TSharedPtr<FJsonObject> JsonResponse = MakeShareable(new FJsonObject);
+    TSharedPtr<FJsonObject> JsonResponse = MakeShared<FJsonObject>();
     FJsonSerializer::Deserialize(Reader, JsonResponse);
 
     if (CheckError(JsonResponse, Response.Error))
diff --git a/Source/HttpGPTCommonModule/Private/Structures/HttpGPTChatTypes.cpp b/Source/HttpGPTCommonModule/Private/Structures/HttpGPTChatTypes.cpp
@@ -19,11 +19,11 @@ FHttpGPTChatMessage::FHttpGPTChatMessage(const FName& Role, const FString& Conte
 
 TSharedPtr<FJsonValue> FHttpGPTChatMessage::GetMessage() const
 {
-    TSharedPtr<FJsonObject> JsonObject = MakeShareable(new FJsonObject);
+    TSharedPtr<FJsonObject> JsonObject = MakeShared<FJsonObject>();
     JsonObject->SetStringField("role", UHttpGPTHelper::RoleToName(Role).ToString().ToLower());
     JsonObject->SetStringField("content", Content);
 
-    return MakeShareable(new FJsonValueObject(JsonObject));
+    return MakeShared<FJsonValueObject>(JsonObject);
 }
 
 FHttpGPTChatOptions::FHttpGPTChatOptions()
diff --git a/Source/HttpGPTEditorModule/HttpGPTEditorModule.Build.cs b/Source/HttpGPTEditorModule/HttpGPTEditorModule.Build.cs
@@ -37,7 +37,8 @@ public HttpGPTEditorModule(ReadOnlyTargetRules Target) : base(Target)
             "AssetRegistry",
             "HttpGPTCommonModule",
             "HttpGPTChatModule",
-            "HttpGPTImageModule"
+            "HttpGPTImageModule",
+            "Json"
         });
     }
 }
diff --git a/Source/HttpGPTEditorModule/Private/SHttpGPTChatView.cpp b/Source/HttpGPTEditorModule/Private/SHttpGPTChatView.cpp
@@ -7,6 +7,11 @@
 #include <Utils/HttpGPTHelper.h>
 #include <HttpGPTInternalFuncs.h>
 #include <Interfaces/IPluginManager.h>
+#include <Dom/JsonObject.h>
+#include <Serialization/JsonWriter.h>
+#include <Serialization/JsonReader.h>
+#include <Serialization/JsonSerializer.h>
+#include <Misc/FileHelper.h>
 
 #ifdef UE_INLINE_GENERATED_CPP_BY_NAME
 #include UE_INLINE_GENERATED_CPP_BY_NAME(SHttpGPTChatView)
@@ -249,6 +254,13 @@ void SHttpGPTChatView::Construct([[maybe_unused]] const FArguments&)
                         ]
                 ]
         ];
+
+    LoadChatHistory();
+}
+
+SHttpGPTChatView::~SHttpGPTChatView()
+{
+    SaveChatHistory();
 }
 
 FReply SHttpGPTChatView::HandleSendMessageButton()
@@ -319,9 +331,11 @@ TArray<FHttpGPTChatMessage> SHttpGPTChatView::GetChatHistory() const
         FHttpGPTChatMessage(EHttpGPTChatRole::System, GetSystemContext())
     };
 
-    for (const auto& Item : ChatItems)
+    for (const SHttpGPTChatItemPtr& Item : ChatItems)
     {
-        Output.Add(FHttpGPTChatMessage(*Item->GetRoleText(), Item->GetMessageText()));
+        FString RoleText = Item->GetRoleText();
+        RoleText.RemoveFromEnd(TEXT(":"));
+        Output.Add(FHttpGPTChatMessage(*RoleText, Item->GetMessageText()));
     }
 
     return Output;
@@ -390,6 +404,76 @@ FString SHttpGPTChatView::GetSystemContext() const
     return FString::Format(TEXT("You are an assistant that will help with the development of projects in Unreal Engine in general.\n{0}\n{1}\n{2}\n{3}\n{4}\n{5}"), Arguments_SystemContext);
 }
 
+void SHttpGPTChatView::LoadChatHistory()
+{
+    if (const FString LoadPath = GetHistoryPath(); FPaths::FileExists(LoadPath))
+    {
+        FString FileContent;
+        if (!FFileHelper::LoadFileToString(FileContent, *LoadPath))
+        {
+            return;
+        }
+
+        TSharedPtr<FJsonObject> JsonParsed;
+        TSharedRef<TJsonReader<>> Reader = TJsonReaderFactory<>::Create(FileContent);
+        if (FJsonSerializer::Deserialize(Reader, JsonParsed))
+        {
+            const TArray<TSharedPtr<FJsonValue>> Data = JsonParsed->GetArrayField("Data");
+            for (const TSharedPtr<FJsonValue>& Item : Data)
+            {
+                if (const TSharedPtr<FJsonObject> MessageItObj = Item->AsObject())
+                {
+                    const FString RoleString = MessageItObj->GetStringField("role");
+                    const EHttpGPTChatRole Role = UHttpGPTHelper::NameToRole(*RoleString);
+                    if (Role == EHttpGPTChatRole::System)
+                    {
+                        continue;
+                    }
+
+                    const FString Message = MessageItObj->GetStringField("content");
+
+                    ChatItems.Add(
+                        SNew(SHttpGPTChatItem)
+                        .MessageRole(Role)
+                        .InputText(Message)
+                    );
+                }
+            }
+        }
+    }
+
+    for (const SHttpGPTChatItemPtr& Item : ChatItems)
+    {
+        ChatBox->AddSlot().AutoHeight()[Item.ToSharedRef()];
+    }
+}
+
+void SHttpGPTChatView::SaveChatHistory() const
+{
+    const TSharedPtr<FJsonObject> JsonRequest = MakeShared<FJsonObject>();
+
+    TArray<TSharedPtr<FJsonValue>> Data;
+    for (const FHttpGPTChatMessage& Item : GetChatHistory())
+    {
+        Data.Add(Item.GetMessage());
+    }
+
+    JsonRequest->SetArrayField("Data", Data);
+
+    FString RequestContentString;
+    const TSharedRef<TJsonWriter<>> Writer = TJsonWriterFactory<>::Create(&RequestContentString);
+
+    if (FJsonSerializer::Serialize(JsonRequest.ToSharedRef(), Writer))
+    {
+        FFileHelper::SaveStringToFile(RequestContentString, *GetHistoryPath());
+    }
+}
+
+FString SHttpGPTChatView::GetHistoryPath() const
+{
+    return FPaths::Combine(FPaths::ProjectSavedDir(), "HttpGPT", "HttpGPTChatHistory.json");
+}
+
 void SHttpGPTChatView::InitializeModelsOptions()
 {
     for (const FName& ModelName : UHttpGPTHelper::GetAvailableGPTModels())
diff --git a/Source/HttpGPTEditorModule/Private/SHttpGPTChatView.h b/Source/HttpGPTEditorModule/Private/SHttpGPTChatView.h
@@ -78,6 +78,7 @@ class SHttpGPTChatView final : public SCompoundWidget
     SLATE_END_ARGS()
 
     void Construct(const FArguments& InArgs);
+    ~SHttpGPTChatView();
 
     FReply HandleSendMessageButton();
     bool IsSendMessageEnabled() const;
@@ -89,6 +90,11 @@ class SHttpGPTChatView final : public SCompoundWidget
     TArray<FHttpGPTChatMessage> GetChatHistory() const;
     FString GetSystemContext() const;
 
+    void LoadChatHistory();
+    void SaveChatHistory() const;
+
+    FString GetHistoryPath() const;
+
     void InitializeModelsOptions();
 
 private:
diff --git a/Source/HttpGPTEditorModule/Private/SHttpGPTImageGenView.cpp b/Source/HttpGPTEditorModule/Private/SHttpGPTImageGenView.cpp
@@ -397,13 +397,13 @@ void SHttpGPTImageGenView::InitializeImageNumOptions()
     constexpr uint8 MaxNum = 10u;
     for (uint8 Iterator = 1u; Iterator <= MaxNum; ++Iterator)
     {
-        ImageNum.Add(MakeShareable(new FString(FString::FromInt(Iterator))));
+        ImageNum.Add(MakeShared<FString>(FString::FromInt(Iterator)));
     }
 }
 
 void SHttpGPTImageGenView::InitializeImageSizeOptions()
 {
-    ImageSize.Add(MakeShareable(new FString(UHttpGPTHelper::SizeToName(EHttpGPTImageSize::x256).ToString())));
-    ImageSize.Add(MakeShareable(new FString(UHttpGPTHelper::SizeToName(EHttpGPTImageSize::x512).ToString())));
-    ImageSize.Add(MakeShareable(new FString(UHttpGPTHelper::SizeToName(EHttpGPTImageSize::x1024).ToString())));
+    ImageSize.Add(MakeShared<FString>(UHttpGPTHelper::SizeToName(EHttpGPTImageSize::x256).ToString()));
+    ImageSize.Add(MakeShared<FString>(UHttpGPTHelper::SizeToName(EHttpGPTImageSize::x512).ToString()));
+    ImageSize.Add(MakeShared<FString>(UHttpGPTHelper::SizeToName(EHttpGPTImageSize::x1024).ToString()));
 }
diff --git a/Source/HttpGPTImageModule/Private/Tasks/HttpGPTImageRequest.cpp b/Source/HttpGPTImageModule/Private/Tasks/HttpGPTImageRequest.cpp
@@ -103,7 +103,7 @@ FString UHttpGPTImageRequest::SetRequestContent()
 
     UE_LOG(LogHttpGPT_Internal, Display, TEXT("%s (%d): Mounting content"), *FString(__func__), GetUniqueID());
 
-    const TSharedPtr<FJsonObject> JsonRequest = MakeShareable(new FJsonObject);
+    const TSharedPtr<FJsonObject> JsonRequest = MakeShared<FJsonObject>();
     JsonRequest->SetStringField("prompt", Prompt);
     JsonRequest->SetNumberField("n", GetImageOptions().ImagesNum);
     JsonRequest->SetStringField("size", UHttpGPTHelper::SizeToName(GetImageOptions().Size).ToString());
@@ -178,7 +178,7 @@ void UHttpGPTImageRequest::DeserializeResponse(const FString& Content)
     }
 
     const TSharedRef<TJsonReader<>> Reader = TJsonReaderFactory<>::Create(Content);
-    TSharedPtr<FJsonObject> JsonResponse = MakeShareable(new FJsonObject);
+    TSharedPtr<FJsonObject> JsonResponse = MakeShared<FJsonObject>();
     FJsonSerializer::Deserialize(Reader, JsonResponse);
 
     if (CheckError(JsonResponse, Response.Error))

Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ FString UHttpGPTChatRequest::SetRequestContent()`
`105`	`105`
`106`	`106`	`UE_LOG(LogHttpGPT_Internal, Display, TEXT("%s (%d): Mounting content"), *FString(__func__), GetUniqueID());`
`107`	`107`
`108`		`- const TSharedPtr<FJsonObject> JsonRequest = MakeShareable(new FJsonObject);`
	`108`	`+ const TSharedPtr<FJsonObject> JsonRequest = MakeShared<FJsonObject>();`
`109`	`109`	`JsonRequest->SetStringField("model", UHttpGPTHelper::ModelToName(GetChatOptions().Model).ToString().ToLower());`
`110`	`110`	`JsonRequest->SetNumberField("max_tokens", GetChatOptions().MaxTokens);`
`111`	`111`	`JsonRequest->SetNumberField("temperature", GetChatOptions().Temperature);`
`@@ -125,15 +125,15 @@ FString UHttpGPTChatRequest::SetRequestContent()`
`125`	`125`	`TArray<TSharedPtr<FJsonValue>> StopJson;`
`126`	`126`	`for (const FName& Iterator : GetChatOptions().Stop)`
`127`	`127`	`{`
`128`		`- StopJson.Add(MakeShareable(new FJsonValueString(Iterator.ToString())));`
	`128`	`+ StopJson.Add(MakeShared<FJsonValueString>(Iterator.ToString()));`
`129`	`129`	`}`
`130`	`130`
`131`	`131`	`JsonRequest->SetArrayField("stop", StopJson);`
`132`	`132`	`}`
`133`	`133`
`134`	`134`	`if (!HttpGPT::Internal::HasEmptyParam(GetChatOptions().LogitBias))`
`135`	`135`	`{`
`136`		`- TSharedPtr<FJsonObject> LogitBiasJson = MakeShareable(new FJsonObject());`
	`136`	`+ TSharedPtr<FJsonObject> LogitBiasJson = MakeShared<FJsonObject>();`
`137`	`137`	`for (const TPair<int32, float>& Iterator : GetChatOptions().LogitBias)`
`138`	`138`	`{`
`139`	`139`	`LogitBiasJson->SetNumberField(FString::FromInt(Iterator.Key), Iterator.Value);`
`@@ -314,7 +314,7 @@ void UHttpGPTChatRequest::DeserializeSingleResponse(const FString& Content)`
`314`	`314`	`}`
`315`	`315`
`316`	`316`	`const TSharedRef<TJsonReader<>> Reader = TJsonReaderFactory<>::Create(Content);`
`317`		`- TSharedPtr<FJsonObject> JsonResponse = MakeShareable(new FJsonObject);`
	`317`	`+ TSharedPtr<FJsonObject> JsonResponse = MakeShared<FJsonObject>();`
`318`	`318`	`FJsonSerializer::Deserialize(Reader, JsonResponse);`
`319`	`319`
`320`	`320`	`if (CheckError(JsonResponse, Response.Error))`
Original file line number	Diff line number	Diff line change
`@@ -19,11 +19,11 @@ FHttpGPTChatMessage::FHttpGPTChatMessage(const FName& Role, const FString& Conte`
`19`	`19`
`20`	`20`	`TSharedPtr<FJsonValue> FHttpGPTChatMessage::GetMessage() const`
`21`	`21`	`{`
`22`		`- TSharedPtr<FJsonObject> JsonObject = MakeShareable(new FJsonObject);`
	`22`	`+ TSharedPtr<FJsonObject> JsonObject = MakeShared<FJsonObject>();`
`23`	`23`	`JsonObject->SetStringField("role", UHttpGPTHelper::RoleToName(Role).ToString().ToLower());`
`24`	`24`	`JsonObject->SetStringField("content", Content);`
`25`	`25`
`26`		`- return MakeShareable(new FJsonValueObject(JsonObject));`
	`26`	`+ return MakeShared<FJsonValueObject>(JsonObject);`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`FHttpGPTChatOptions::FHttpGPTChatOptions()`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,8 @@ public HttpGPTEditorModule(ReadOnlyTargetRules Target) : base(Target)`
`37`	`37`	`"AssetRegistry",`
`38`	`38`	`"HttpGPTCommonModule",`
`39`	`39`	`"HttpGPTChatModule",`
`40`		`- "HttpGPTImageModule"`
	`40`	`+ "HttpGPTImageModule",`
	`41`	`+ "Json"`
`41`	`42`	`});`
`42`	`43`	`}`
`43`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -397,13 +397,13 @@ void SHttpGPTImageGenView::InitializeImageNumOptions()`
`397`	`397`	`constexpr uint8 MaxNum = 10u;`
`398`	`398`	`for (uint8 Iterator = 1u; Iterator <= MaxNum; ++Iterator)`
`399`	`399`	`{`
`400`		`- ImageNum.Add(MakeShareable(new FString(FString::FromInt(Iterator))));`
	`400`	`+ ImageNum.Add(MakeShared<FString>(FString::FromInt(Iterator)));`
`401`	`401`	`}`
`402`	`402`	`}`
`403`	`403`
`404`	`404`	`void SHttpGPTImageGenView::InitializeImageSizeOptions()`
`405`	`405`	`{`
`406`		`- ImageSize.Add(MakeShareable(new FString(UHttpGPTHelper::SizeToName(EHttpGPTImageSize::x256).ToString())));`
`407`		`- ImageSize.Add(MakeShareable(new FString(UHttpGPTHelper::SizeToName(EHttpGPTImageSize::x512).ToString())));`
`408`		`- ImageSize.Add(MakeShareable(new FString(UHttpGPTHelper::SizeToName(EHttpGPTImageSize::x1024).ToString())));`
	`406`	`+ ImageSize.Add(MakeShared<FString>(UHttpGPTHelper::SizeToName(EHttpGPTImageSize::x256).ToString()));`
	`407`	`+ ImageSize.Add(MakeShared<FString>(UHttpGPTHelper::SizeToName(EHttpGPTImageSize::x512).ToString()));`
	`408`	`+ ImageSize.Add(MakeShared<FString>(UHttpGPTHelper::SizeToName(EHttpGPTImageSize::x1024).ToString()));`
`409`	`409`	`}`