From 7f28abee0312c675e11e35ca9f2101ab2ef17c07 Mon Sep 17 00:00:00 2001
From: Nate Sesti <sestinj@gmail.com>
Date: Fri, 2 Jun 2023 01:05:59 -0400
Subject: notebook -> gui
---
.../src/hooks/ContinueGUIClientProtocol.ts | 13 ++++++
.../src/hooks/ContinueNotebookClientProtocol.ts | 13 ------
.../react-app/src/hooks/useContinueGUIProtocol.ts | 49 ++++++++++++++++++++++
.../src/hooks/useContinueNotebookProtocol.ts | 49 ----------------------
extension/react-app/src/hooks/useWebsocket.ts | 16 +++----
5 files changed, 70 insertions(+), 70 deletions(-)
create mode 100644 extension/react-app/src/hooks/ContinueGUIClientProtocol.ts
delete mode 100644 extension/react-app/src/hooks/ContinueNotebookClientProtocol.ts
create mode 100644 extension/react-app/src/hooks/useContinueGUIProtocol.ts
delete mode 100644 extension/react-app/src/hooks/useContinueNotebookProtocol.ts
(limited to 'extension/react-app/src/hooks')
diff --git a/extension/react-app/src/hooks/ContinueGUIClientProtocol.ts b/extension/react-app/src/hooks/ContinueGUIClientProtocol.ts
new file mode 100644
index 00000000..18a91de7
--- /dev/null
+++ b/extension/react-app/src/hooks/ContinueGUIClientProtocol.ts
@@ -0,0 +1,13 @@
+abstract class AbstractContinueGUIClientProtocol {
+ abstract sendMainInput(input: string): void;
+
+ abstract reverseToIndex(index: number): void;
+
+ abstract sendRefinementInput(input: string, index: number): void;
+
+ abstract sendStepUserInput(input: string, index: number): void;
+
+ abstract onStateUpdate(state: any): void;
+}
+
+export default AbstractContinueGUIClientProtocol;
diff --git a/extension/react-app/src/hooks/ContinueNotebookClientProtocol.ts b/extension/react-app/src/hooks/ContinueNotebookClientProtocol.ts
deleted file mode 100644
index 75fd7373..00000000
--- a/extension/react-app/src/hooks/ContinueNotebookClientProtocol.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-abstract class AbstractContinueNotebookClientProtocol {
- abstract sendMainInput(input: string): void;
-
- abstract reverseToIndex(index: number): void;
-
- abstract sendRefinementInput(input: string, index: number): void;
-
- abstract sendStepUserInput(input: string, index: number): void;
-
- abstract onStateUpdate(state: any): void;
-}
-
-export default AbstractContinueNotebookClientProtocol;
diff --git a/extension/react-app/src/hooks/useContinueGUIProtocol.ts b/extension/react-app/src/hooks/useContinueGUIProtocol.ts
new file mode 100644
index 00000000..a3a1d0c9
--- /dev/null
+++ b/extension/react-app/src/hooks/useContinueGUIProtocol.ts
@@ -0,0 +1,49 @@
+import AbstractContinueGUIClientProtocol from "./ContinueGUIClientProtocol";
+// import { Messenger, WebsocketMessenger } from "../../../src/util/messenger";
+import { Messenger, WebsocketMessenger } from "./messenger";
+import { VscodeMessenger } from "./vscodeMessenger";
+
+class ContinueGUIClientProtocol extends AbstractContinueGUIClientProtocol {
+ messenger: Messenger;
+ // Server URL must contain the session ID param
+ serverUrlWithSessionId: string;
+
+ constructor(
+ serverUrlWithSessionId: string,
+ useVscodeMessagePassing: boolean
+ ) {
+ super();
+ this.serverUrlWithSessionId = serverUrlWithSessionId;
+ if (useVscodeMessagePassing) {
+ this.messenger = new VscodeMessenger(serverUrlWithSessionId);
+ } else {
+ this.messenger = new WebsocketMessenger(serverUrlWithSessionId);
+ }
+ }
+
+ sendMainInput(input: string) {
+ this.messenger.send("main_input", { input });
+ }
+
+ reverseToIndex(index: number) {
+ this.messenger.send("reverse_to_index", { index });
+ }
+
+ sendRefinementInput(input: string, index: number) {
+ this.messenger.send("refinement_input", { input, index });
+ }
+
+ sendStepUserInput(input: string, index: number) {
+ this.messenger.send("step_user_input", { input, index });
+ }
+
+ onStateUpdate(callback: (state: any) => void) {
+ this.messenger.onMessageType("state_update", (data: any) => {
+ if (data.state) {
+ callback(data.state);
+ }
+ });
+ }
+}
+
+export default ContinueGUIClientProtocol;
diff --git a/extension/react-app/src/hooks/useContinueNotebookProtocol.ts b/extension/react-app/src/hooks/useContinueNotebookProtocol.ts
deleted file mode 100644
index b785cc84..00000000
--- a/extension/react-app/src/hooks/useContinueNotebookProtocol.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-import AbstractContinueNotebookClientProtocol from "./ContinueNotebookClientProtocol";
-// import { Messenger, WebsocketMessenger } from "../../../src/util/messenger";
-import { Messenger, WebsocketMessenger } from "./messenger";
-import { VscodeMessenger } from "./vscodeMessenger";
-
-class ContinueNotebookClientProtocol extends AbstractContinueNotebookClientProtocol {
- messenger: Messenger;
- // Server URL must contain the session ID param
- serverUrlWithSessionId: string;
-
- constructor(
- serverUrlWithSessionId: string,
- useVscodeMessagePassing: boolean
- ) {
- super();
- this.serverUrlWithSessionId = serverUrlWithSessionId;
- if (useVscodeMessagePassing) {
- this.messenger = new VscodeMessenger(serverUrlWithSessionId);
- } else {
- this.messenger = new WebsocketMessenger(serverUrlWithSessionId);
- }
- }
-
- sendMainInput(input: string) {
- this.messenger.send("main_input", { input });
- }
-
- reverseToIndex(index: number) {
- this.messenger.send("reverse_to_index", { index });
- }
-
- sendRefinementInput(input: string, index: number) {
- this.messenger.send("refinement_input", { input, index });
- }
-
- sendStepUserInput(input: string, index: number) {
- this.messenger.send("step_user_input", { input, index });
- }
-
- onStateUpdate(callback: (state: any) => void) {
- this.messenger.onMessageType("state_update", (data: any) => {
- if (data.state) {
- callback(data.state);
- }
- });
- }
-}
-
-export default ContinueNotebookClientProtocol;
diff --git a/extension/react-app/src/hooks/useWebsocket.ts b/extension/react-app/src/hooks/useWebsocket.ts
index 016fa17d..e762666f 100644
--- a/extension/react-app/src/hooks/useWebsocket.ts
+++ b/extension/react-app/src/hooks/useWebsocket.ts
@@ -1,15 +1,15 @@
import React, { useEffect, useState } from "react";
import { RootStore } from "../redux/store";
import { useSelector } from "react-redux";
-import ContinueNotebookClientProtocol from "./useContinueNotebookProtocol";
+import ContinueGUIClientProtocol from "./useContinueGUIProtocol";
import { postVscMessage } from "../vscode";
-function useContinueNotebookProtocol(useVscodeMessagePassing: boolean = true) {
+function useContinueGUIProtocol(useVscodeMessagePassing: boolean = true) {
const sessionId = useSelector((state: RootStore) => state.config.sessionId);
const serverHttpUrl = useSelector((state: RootStore) => state.config.apiUrl);
- const [client, setClient] = useState<
- ContinueNotebookClientProtocol | undefined
- >(undefined);
+ const [client, setClient] = useState<ContinueGUIClientProtocol | undefined>(
+ undefined
+ );
useEffect(() => {
if (!sessionId || !serverHttpUrl) {
@@ -22,12 +22,12 @@ function useContinueNotebookProtocol(useVscodeMessagePassing: boolean = true) {
const serverUrlWithSessionId =
serverHttpUrl.replace("http", "ws") +
- "/notebook/ws?session_id=" +
+ "/gui/ws?session_id=" +
encodeURIComponent(sessionId);
console.log("Creating websocket", serverUrlWithSessionId);
console.log("Using vscode message passing", useVscodeMessagePassing);
- const newClient = new ContinueNotebookClientProtocol(
+ const newClient = new ContinueGUIClientProtocol(
serverUrlWithSessionId,
useVscodeMessagePassing
);
@@ -36,4 +36,4 @@ function useContinueNotebookProtocol(useVscodeMessagePassing: boolean = true) {
return client;
}
-export default useContinueNotebookProtocol;
+export default useContinueGUIProtocol;
--
cgit v1.2.3-70-g09d2