Spaces:

Hansimov
/

llm-mixer

Sleeping

App Files Files Community

Hansimov commited on Nov 6, 2023

Commit

451c088

•

1 Parent(s): 7bb4d19

:recycle: [Refactor] Clean llm_requester with imports from chat_operator

Browse files

Files changed (3) hide show

apps/llm_mixer/index.html +1 -1
apps/llm_mixer/js/buttons_binder.js +3 -3
apps/llm_mixer/js/llm_requester.js +12 -37

apps/llm_mixer/index.html CHANGED Viewed

@@ -12,7 +12,7 @@
     </head>
     <body>
         <div class="container">
-            <div id="chats-container" class="mt-3"></div>
             <div class="fixed-bottom m-3">
                 <div class="container-fluid">
                     <div class="row no-gutters">

     </head>
     <body>
         <div class="container">
+            <div id="messagers-container" class="mt-3"></div>
             <div class="fixed-bottom m-3">
                 <div class="container-fluid">
                     <div class="row no-gutters">

apps/llm_mixer/js/buttons_binder.js CHANGED Viewed

@@ -51,9 +51,9 @@ export class ButtonsBinder {
         }
     }
     async post_user_input() {
-        let user_input = $("#user-input").val();
-        console.log(user_input);
-        this.requester = new ChatCompletionsRequester(user_input);
         await this.requester.post();
     }
     bind() {

         }
     }
     async post_user_input() {
+        let user_input_content = $("#user-input").val();
+        console.log(user_input_content);
+        this.requester = new ChatCompletionsRequester(user_input_content);
         await this.requester.post();
     }
     bind() {

apps/llm_mixer/js/llm_requester.js CHANGED Viewed

@@ -3,31 +3,16 @@ import {
     stringify_stream_bytes,
 } from "./stream_jsonizer.js";
 import * as secrets from "./secrets.js";
-import { update_chat, create_chat_block } from "./chat_renderer.js";
-export var chat_sessions = [];
-export class ChatSession {
-    constructor(messages = []) {
-        this.messages = messages;
-    }
-    add_message(message) {
-        this.messages.push(message);
-    }
-    pop_messages(n = 1) {
-        return this.messages.splice(-n, n);
-    }
-    extend_messages(messages) {
-        this.messages = this.messages.concat(messages);
-    }
-    clear() {
-        this.messages = [];
-    }
-}
 export class ChatCompletionsRequester {
     constructor(
         prompt,
-        model = "poe-gpt-3.5-turbo",
         temperature = 0,
         messages = [],
         endpoint,
@@ -41,20 +26,9 @@ export class ChatCompletionsRequester {
         this.cors_proxy = cors_proxy || secrets.cors_proxy;
         this.request_endpoint = this.cors_proxy + this.endpoint;
         this.controller = new AbortController();
-        this.construct_request_params();
     }
     construct_request_messages() {
-        let message = {
-            role: "user",
-            content: this.prompt,
-            model: this.model,
-            temperature: this.temperature,
-        };
-        this.messages = this.messages.concat(message);
-        this.request_messages = this.messages.map(({ role, content }) => ({
-            role,
-            content,
-        }));
     }
     construct_request_headers() {
         this.request_headers = {
@@ -63,6 +37,7 @@ export class ChatCompletionsRequester {
         };
     }
     construct_request_body() {
         this.request_body = {
             model: this.model,
             messages: this.request_messages,
@@ -71,7 +46,6 @@ export class ChatCompletionsRequester {
         };
     }
     construct_request_params() {
-        this.construct_request_messages();
         this.construct_request_headers();
         this.construct_request_body();
         this.request_params = {
@@ -82,8 +56,9 @@ export class ChatCompletionsRequester {
         };
     }
     post() {
-        create_chat_block("user", this.prompt);
-        create_chat_block("assistant");
         return fetch(this.request_endpoint, this.request_params)
             .then((response) => response.body)
             .then((rb) => {
@@ -95,7 +70,7 @@ export class ChatCompletionsRequester {
                     let json_chunks = jsonize_stream_data(
                         stringify_stream_bytes(value)
                     );
-                    update_chat(json_chunks);
                     return reader.read().then(process);
                 });
             })

     stringify_stream_bytes,
 } from "./stream_jsonizer.js";
 import * as secrets from "./secrets.js";
+import {
+    update_message,
+    create_messager,
+    get_request_messages,
+} from "./chat_operator.js";
 export class ChatCompletionsRequester {
     constructor(
         prompt,
+        model = "gpt-3.5-turbo",
         temperature = 0,
         messages = [],
         endpoint,
         this.cors_proxy = cors_proxy || secrets.cors_proxy;
         this.request_endpoint = this.cors_proxy + this.endpoint;
         this.controller = new AbortController();
     }
     construct_request_messages() {
+        this.request_messages = get_request_messages();
     }
     construct_request_headers() {
         this.request_headers = {
         };
     }
     construct_request_body() {
+        this.construct_request_messages();
         this.request_body = {
             model: this.model,
             messages: this.request_messages,
         };
     }
     construct_request_params() {
         this.construct_request_headers();
         this.construct_request_body();
         this.request_params = {
         };
     }
     post() {
+        create_messager("user", this.prompt);
+        create_messager("assistant", "", this.model, this.temperature);
+        this.construct_request_params();
         return fetch(this.request_endpoint, this.request_params)
             .then((response) => response.body)
             .then((rb) => {
                     let json_chunks = jsonize_stream_data(
                         stringify_stream_bytes(value)
                     );
+                    update_message(json_chunks);
                     return reader.read().then(process);
                 });
             })