vectocore4 0.0.27 → 0.0.29

package/dist/cjs/index.js

@@ -283,7 +283,7 @@ class Lens {
             this.baseURL = baseURL;
         }
     }
-    requestStream(requestBody) {
+    request(requestBody) {
         return __awaiter(this, void 0, void 0, function* () {
             let header = {
                 "x-tenant-key": this.tenantKey ? this.tenantKey : "",
@@ -294,23 +294,7 @@ class Lens {
                 body: JSON.stringify(requestBody),
             };
             const response = yield fetch(this.baseURL, request);
-            return response.body;
-        });
-    }
-    genStreamResponse(streamRes) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const reader = streamRes === null || streamRes === void 0 ? void 0 : streamRes.getReader();
-            const decoder = new TextDecoder();
-            let done = false;
-            let content = "";
-            while (!done) {
-                const { value, done: doneReading } = yield reader.read();
-                done = doneReading; // 스트림 완료시 true
-                const chunkValue = decoder.decode(value);
-                content = content + chunkValue;
-            }
-            const payload = JSON.parse(content);
-            return payload;
+            return response;
         });
     }
     chat(_a) {
@@ -346,70 +330,69 @@ class Lens {
                 requestParam.params.static_info = staticInfo;
             if (customSystemPrompt)
                 requestParam.params.custom_system_prompt = customSystemPrompt;
-            let response = yield this.requestStream(requestParam);
+            let response = yield this.request(requestParam);
             if (stream) {
                 return response;
             }
             else {
-                const res = yield this.genStreamResponse(response);
-                return res;
+                return response.json();
             }
         });
     }
-    history(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ sessionKey, limit }) {
-            const requestParam = {
-                command: "lensChatHistory",
-                sessionKey: sessionKey,
-            };
-            if (limit)
-                requestParam.limit = limit;
-            let response = yield this.requestStream(requestParam);
-            const res = yield this.genStreamResponse(response);
-            return res;
-        });
-    }
     jsonAutoComplete(jsonString) {
-        const dataCloseChar = {
-            "{": "}",
-            "[": "]",
-            '"': '"',
-        };
         if (!jsonString)
             return null;
-        let string = jsonString
-            .trim()
-            .replace(/(\r\n|\n|\r|\s{2,})/gm, "")
-            .replace(/(?<=:)([a-zA-Z]+)(?=\s*(?![,\}])(?:[,\}\s]|$))/g, " null");
-        let missingChars = [];
-        for (let i = 0; i < string.length; i++) {
-            const char = string[i];
-            if (char === missingChars[missingChars.length - 1]) {
-                missingChars.pop();
+        const stack = [];
+        let isInsideString = false;
+        let isEscaped = false;
+        for (let i = 0; i < jsonString.length; i++) {
+            const char = jsonString[i];
+            if (isEscaped) {
+                isEscaped = false;
+                continue;
             }
-            else if (dataCloseChar[char]) {
-                missingChars.push(dataCloseChar[char]);
-                if (char === "{") {
-                    missingChars.push(":");
+            if (char === "\\") {
+                isEscaped = true;
+                continue;
+            }
+            if (char === '"') {
+                isInsideString = !isInsideString;
+                continue;
+            }
+            if (!isInsideString) {
+                if (char === "{")
+                    stack.push("}");
+                else if (char === "[")
+                    stack.push("]");
+                else if (char === "}" || char === "]") {
+                    if (stack.length > 0 && stack[stack.length - 1] === char) {
+                        stack.pop();
+                    }
                 }
             }
         }
-        if (missingChars[missingChars.length - 1] === ":") {
-            if (string[string.length - 1] !== "{") {
-                missingChars[missingChars.length - 1] = ": null";
-            }
-            else {
-                missingChars.pop();
+        let result = jsonString.trim();
+        // 1. 문자열이 열린 채로 끝났다면 따옴표 닫기
+        if (isInsideString) {
+            result += '"';
+        }
+        // 2. trailing comma 제거 (중요: ", ]" 또는 ", }" 방지)
+        result = result.replace(/,\s*$/, "");
+        // 3. 스택을 역순으로 닫기 전에, 속성 이름만 있고 값이 없는 경우 처리
+        // 예: "key": 문자로 끝난 경우
+        if (result.endsWith(":")) {
+            result += "null";
+        }
+        // 4. 남아있는 모든 괄호 닫기
+        for (let i = stack.length - 1; i >= 0; i--) {
+            const closingChar = stack[i];
+            // 배열 중간에서 끊겼을 때를 위한 보정 (예: [{}, { -> [{}, {}])
+            if (closingChar === "]" && result.endsWith(",")) {
+                result = result.slice(0, -1);
             }
+            result += closingChar;
         }
-        const missingCharsString = missingChars.reverse().join("");
-        const completeString = string + missingCharsString;
-        const cleanedString = completeString
-            .replace(/"":/g, "")
-            .replace(/":}|": }/g, '": null }')
-            .replace(/,""}|,}|,\"\w+\"}/g, "}")
-            .replace(/},]/g, "}]");
-        return cleanedString;
+        return result;
     }
 }
 exports.Lens = Lens;

package/dist/index.d.ts

@@ -324,10 +324,8 @@ export declare class Lens {
      * @param {string | undefined} [opts.tenantKey=process.env['VECTOCORE4_TENANT_KEY'] ?? undefined]
      */
     constructor({ tenantKey, baseURL }: ClientOptions);
-    protected requestStream(requestBody: any): Promise<ReadableStream<Uint8Array> | null>;
-    protected genStreamResponse(streamRes: ReadableStream): Promise<any>;
+    protected request(requestBody: any): Promise<Response>;
     chat({ question, stream, model, xfinder, webSearch, agentic, imageUrls, fileUrls, customContext, sessionKey, maxHisCount, withStatus, staticInfo, customSystemPrompt, }: LensChatParams): Promise<any>;
-    history({ sessionKey, limit }: ChatHistoryParams): Promise<any>;
     jsonAutoComplete(jsonString: string): string | null;
 }
 export declare class AIMS {

package/dist/mjs/index.js

@@ -248,7 +248,7 @@ export class Lens {
             this.baseURL = baseURL;
         }
     }
-    async requestStream(requestBody) {
+    async request(requestBody) {
         let header = {
             "x-tenant-key": this.tenantKey ? this.tenantKey : "",
         };
@@ -258,21 +258,7 @@ export class Lens {
             body: JSON.stringify(requestBody),
         };
         const response = await fetch(this.baseURL, request);
-        return response.body;
-    }
-    async genStreamResponse(streamRes) {
-        const reader = streamRes?.getReader();
-        const decoder = new TextDecoder();
-        let done = false;
-        let content = "";
-        while (!done) {
-            const { value, done: doneReading } = await reader.read();
-            done = doneReading; // 스트림 완료시 true
-            const chunkValue = decoder.decode(value);
-            content = content + chunkValue;
-        }
-        const payload = JSON.parse(content);
-        return payload;
+        return response;
     }
     async chat({ question, stream, model, xfinder, webSearch, agentic, imageUrls, fileUrls, customContext, sessionKey, maxHisCount, withStatus, staticInfo, customSystemPrompt, }) {
         const requestParam = {
@@ -306,67 +292,68 @@ export class Lens {
             requestParam.params.static_info = staticInfo;
         if (customSystemPrompt)
             requestParam.params.custom_system_prompt = customSystemPrompt;
-        let response = await this.requestStream(requestParam);
+        let response = await this.request(requestParam);
         if (stream) {
             return response;
         }
         else {
-            const res = await this.genStreamResponse(response);
-            return res;
+            return response.json();
         }
     }
-    async history({ sessionKey, limit }) {
-        const requestParam = {
-            command: "lensChatHistory",
-            sessionKey: sessionKey,
-        };
-        if (limit)
-            requestParam.limit = limit;
-        let response = await this.requestStream(requestParam);
-        const res = await this.genStreamResponse(response);
-        return res;
-    }
     jsonAutoComplete(jsonString) {
-        const dataCloseChar = {
-            "{": "}",
-            "[": "]",
-            '"': '"',
-        };
         if (!jsonString)
             return null;
-        let string = jsonString
-            .trim()
-            .replace(/(\r\n|\n|\r|\s{2,})/gm, "")
-            .replace(/(?<=:)([a-zA-Z]+)(?=\s*(?![,\}])(?:[,\}\s]|$))/g, " null");
-        let missingChars = [];
-        for (let i = 0; i < string.length; i++) {
-            const char = string[i];
-            if (char === missingChars[missingChars.length - 1]) {
-                missingChars.pop();
+        const stack = [];
+        let isInsideString = false;
+        let isEscaped = false;
+        for (let i = 0; i < jsonString.length; i++) {
+            const char = jsonString[i];
+            if (isEscaped) {
+                isEscaped = false;
+                continue;
             }
-            else if (dataCloseChar[char]) {
-                missingChars.push(dataCloseChar[char]);
-                if (char === "{") {
-                    missingChars.push(":");
+            if (char === "\\") {
+                isEscaped = true;
+                continue;
+            }
+            if (char === '"') {
+                isInsideString = !isInsideString;
+                continue;
+            }
+            if (!isInsideString) {
+                if (char === "{")
+                    stack.push("}");
+                else if (char === "[")
+                    stack.push("]");
+                else if (char === "}" || char === "]") {
+                    if (stack.length > 0 && stack[stack.length - 1] === char) {
+                        stack.pop();
+                    }
                 }
             }
         }
-        if (missingChars[missingChars.length - 1] === ":") {
-            if (string[string.length - 1] !== "{") {
-                missingChars[missingChars.length - 1] = ": null";
-            }
-            else {
-                missingChars.pop();
+        let result = jsonString.trim();
+        // 1. 문자열이 열린 채로 끝났다면 따옴표 닫기
+        if (isInsideString) {
+            result += '"';
+        }
+        // 2. trailing comma 제거 (중요: ", ]" 또는 ", }" 방지)
+        result = result.replace(/,\s*$/, "");
+        // 3. 스택을 역순으로 닫기 전에, 속성 이름만 있고 값이 없는 경우 처리
+        // 예: "key": 문자로 끝난 경우
+        if (result.endsWith(":")) {
+            result += "null";
+        }
+        // 4. 남아있는 모든 괄호 닫기
+        for (let i = stack.length - 1; i >= 0; i--) {
+            const closingChar = stack[i];
+            // 배열 중간에서 끊겼을 때를 위한 보정 (예: [{}, { -> [{}, {}])
+            if (closingChar === "]" && result.endsWith(",")) {
+                result = result.slice(0, -1);
             }
+            result += closingChar;
         }
-        const missingCharsString = missingChars.reverse().join("");
-        const completeString = string + missingCharsString;
-        const cleanedString = completeString
-            .replace(/"":/g, "")
-            .replace(/":}|": }/g, '": null }')
-            .replace(/,""}|,}|,\"\w+\"}/g, "}")
-            .replace(/},]/g, "}]");
-        return cleanedString;
+        return result;
     }
 }
 export class AIMS {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vectocore4",
-  "version": "0.0.27",
+  "version": "0.0.29",
   "description": "",
   "types": "dist/index.d.ts",
   "main": "dist/cjs/index.js",