Merge pull request #11 from devchat-ai/feat-diff

feat: add topic delete logic

Author: pplam

api/topic.md

@@ -48,6 +48,54 @@
 }
 ```
 
+## Delete Topic
+
+### JS to Java
+
+```json
+{
+  "action": "deleteTopic/request",
+  "metadata": {
+    "callback": "responseFunctionName"
+  },
+  "payload": {
+    "topicHash": "xxx"
+  }
+}
+```
+
+### Java to JS
+
+- success
+
+```json
+{
+  "action": "deleteTopic/response",
+  "metadata": {
+    "status": "success",
+    "error": ""
+  },
+  "payload": {
+    "topicHash": "xxx"
+  }
+}
+```
+
+- failed
+
+```json
+{
+  "action": "deleteTopic/response",
+  "metadata": {
+    "status": "failed",
+    "error": "xxx"
+  },
+  "payload": {
+    "topicHash": "xxx"
+  }
+}
+```
+
 ## Query Topic History Conversations
 
 ### JS to Java

src/main/java/ai/devchat/devchat/ActionHandlerFactory.java

@@ -27,6 +27,7 @@ public class ActionHandlerFactory {
             put(DevChatActions.UPDATE_SETTING_REQUEST, UpdateSettingRequestHandler.class);
             put(DevChatActions.SHOW_SETTING_DIALOG_REQUEST, ShowSettingDialogRequestHandler.class);
             put(DevChatActions.DELETE_LAST_CONVERSATION_REQUEST, DeleteLastConversationRequestHandler.class);
+            put(DevChatActions.DELETE_TOPIC_REQUEST, DeleteTopicRequestHandler.class);
         }
     };
 

src/main/java/ai/devchat/devchat/DevChatActions.java

@@ -35,4 +35,6 @@ public class DevChatActions {
     public static final String SHOW_SETTING_DIALOG_REQUEST = "showSettingDialog/request";
     public static final String DELETE_LAST_CONVERSATION_REQUEST = "deleteLastConversation/request";
     public static final String DELETE_LAST_CONVERSATION_RESPONSE = "deleteLastConversation/response";
+    public static final String DELETE_TOPIC_REQUEST = "deleteTopic/request";
+    public static final String DELETE_TOPIC_RESPONSE = "deleteTopic/response";
 }

src/main/java/ai/devchat/devchat/handler/DeleteTopicRequestHandler.java

@@ -0,0 +1,45 @@
+package ai.devchat.devchat.handler;
+
+import ai.devchat.devchat.ActionHandler;
+import ai.devchat.devchat.DevChatActionHandler;
+import ai.devchat.devchat.DevChatActions;
+import ai.devchat.idea.storage.DeletedTopicsState;
+import com.alibaba.fastjson.JSONObject;
+
+public class DeleteTopicRequestHandler implements ActionHandler {
+    private JSONObject metadata;
+    private JSONObject payload;
+    private final DevChatActionHandler devChatActionHandler;
+
+    public DeleteTopicRequestHandler(DevChatActionHandler devChatActionHandler) {
+        this.devChatActionHandler = devChatActionHandler;
+    }
+
+    @Override
+    public void executeAction() {
+        String callbackFunc = metadata.getString("callback");
+        String topicHash = payload.getString("topicHash");
+
+        DeletedTopicsState state = DeletedTopicsState.getInstance();
+
+        if (!state.deletedTopicHashes.contains(topicHash)) {
+            state.deletedTopicHashes.add(topicHash);
+        }
+
+        devChatActionHandler.sendResponse(DevChatActions.DELETE_TOPIC_RESPONSE, callbackFunc, (metadata, payload) -> {
+            metadata.put("status", "success");
+            metadata.put("error", "");
+            payload.put("topicHash", topicHash);
+        });
+    }
+
+    @Override
+    public void setMetadata(JSONObject metadata) {
+        this.metadata = metadata;
+    }
+
+    @Override
+    public void setPayload(JSONObject payload) {
+        this.payload = payload;
+    }
+}

src/main/java/ai/devchat/devchat/handler/ListTopicsRequestHandler.java

@@ -6,10 +6,13 @@
 import ai.devchat.devchat.ActionHandler;
 import ai.devchat.devchat.DevChatActionHandler;
 import ai.devchat.devchat.DevChatActions;
+import ai.devchat.idea.storage.DeletedTopicsState;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 
+import java.util.List;
+
 public class ListTopicsRequestHandler implements ActionHandler {
     private JSONObject metadata;
     private JSONObject payload;
@@ -26,43 +29,58 @@ public void executeAction() {
         String callbackFunc = metadata.getString("callback");
         try {
             DevChatWrapper devchatWrapper = new DevChatWrapper(DevChatPathUtil.getDevchatBinPath());
-            /* topics format:
-            [
-              {
-                "root_prompt": {
-                  "user": "Daniel Hu <tao.hu@merico.dev>",
-                  "date": 1698828624,
-                  "context": [
-                    {
-                      "content": "{\"languageId\":\"python\",\"path\":\"a.py\",\"startLine\":0,\"content\":\"adkfjj\\n\"}",
-                      "role": "system"
-                    }
-                  ],
-                  "request": "hello",
-                  "responses": [
-                    "Hi there! How can I assist you with Python today?"
-                  ],
-                  "request_tokens": 46,
-                  "response_tokens": 22,
-                  "hash": "596cf7c60a936e33409c71b67ba7f9903886bbeb7c7d2aacf6d1556b0831f04b",
-                  "parent": null
-                },
-                "latest_time": 1698828867,
-                "title": null,
-                "hidden": false
-              }
-            ]
+            /*
+             * topics format:
+             * [
+             * {
+             * "root_prompt": {
+             * "user": "Daniel Hu <tao.hu@merico.dev>",
+             * "date": 1698828624,
+             * "context": [
+             * {
+             * "content":
+             * "{\"languageId\":\"python\",\"path\":\"a.py\",\"startLine\":0,\"content\":\"adkfjj\\n\"}",
+             * "role": "system"
+             * }
+             * ],
+             * "request": "hello",
+             * "responses": [
+             * "Hi there! How can I assist you with Python today?"
+             * ],
+             * "request_tokens": 46,
+             * "response_tokens": 22,
+             * "hash": "596cf7c60a936e33409c71b67ba7f9903886bbeb7c7d2aacf6d1556b0831f04b",
+             * "parent": null
+             * },
+             * "latest_time": 1698828867,
+             * "title": null,
+             * "hidden": false
+             * }
+             * ]
              */
             JSONArray topics = devchatWrapper.listTopics();
-            // remove request_tokens and response_tokens in the topics object, then update title field.
+
+            // Get deleted topics hash list
+            DeletedTopicsState deletedTopicsState = DeletedTopicsState.getInstance();
+            List<String> deletedTopicHashes = deletedTopicsState.deletedTopicHashes;
+
+            // Filter out deleted topics
+            JSONArray filteredTopics = new JSONArray();
+            // remove request_tokens and response_tokens in the topics object, then update
+            // title field.
             for (int i = 0; i < topics.size(); i++) {
                 JSONObject topic = topics.getJSONObject(i);
-                topic.remove("latest_time");
-                topic.remove("hidden");
-                // set title = root_prompt.request + "-" + root_prompt.responses[0]
                 JSONObject rootPrompt = topic.getJSONObject("root_prompt");
-                String title = rootPrompt.getString("request") + "-" + rootPrompt.getJSONArray("responses").getString(0);
-                rootPrompt.put("title", title);
+                String topicHash = rootPrompt.getString("hash");
+
+                if (!deletedTopicHashes.contains(topicHash)) {
+                    // set title = root_prompt.request + "-" + root_prompt.responses[0]
+                    String title = rootPrompt.getString("request") + "-"
+                            + rootPrompt.getJSONArray("responses").getString(0);
+                    rootPrompt.put("title", title);
+
+                    filteredTopics.add(topic);
+                }
             }
 
             devChatActionHandler.sendResponse(DevChatActions.LIST_TOPICS_RESPONSE, callbackFunc, (metadata, payload) -> {

src/main/java/ai/devchat/idea/storage/DeletedTopicsState.java

@@ -0,0 +1,32 @@
+package ai.devchat.idea.storage;
+
+import com.intellij.openapi.components.PersistentStateComponent;
+import com.intellij.openapi.components.ServiceManager;
+import com.intellij.openapi.components.State;
+import com.intellij.openapi.components.Storage;
+import com.intellij.util.xmlb.XmlSerializerUtil;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@State(name = "ai.devchat.devchat.DeletedTopicsState", storages = @Storage("deletedTopics.xml"))
+public class DeletedTopicsState implements PersistentStateComponent<DeletedTopicsState> {
+    public List<String> deletedTopicHashes = new ArrayList<>();
+
+    public static DeletedTopicsState getInstance() {
+        return ServiceManager.getService(DeletedTopicsState.class);
+    }
+
+    @Nullable
+    @Override
+    public DeletedTopicsState getState() {
+        return this;
+    }
+
+    @Override
+    public void loadState(@NotNull DeletedTopicsState state) {
+        XmlSerializerUtil.copyBean(state, this);
+    }
+}