@dataclouder/nest-vertex 0.0.8 → 0.0.9

package/index.d.ts

@@ -5,3 +5,4 @@ export * from './services/nest-tts.service';
 export * from './services/gemini-chat.service';
 export * from './services/vertex-image.service';
 export * from './dto/generate-image.dto';
+export * from './models/gemini-models';

package/index.js

@@ -21,4 +21,5 @@ __exportStar(require("./services/nest-tts.service"), exports);
 __exportStar(require("./services/gemini-chat.service"), exports);
 __exportStar(require("./services/vertex-image.service"), exports);
 __exportStar(require("./dto/generate-image.dto"), exports);
+__exportStar(require("./models/gemini-models"), exports);
 //# sourceMappingURL=index.js.map

package/models/gemini-models.d.ts

@@ -0,0 +1,5 @@
+export declare enum GeminiModels {
+    Flash2_5 = "gemini-2.5-flash-preview-04-17",
+    Flash2_5Pro = "gemini-2.5-pro-preview-05-06",
+    Flash2_0Lite = "gemini-2.0-flash-lite"
+}

package/models/gemini-models.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GeminiModels = void 0;
+var GeminiModels;
+(function (GeminiModels) {
+    GeminiModels["Flash2_5"] = "gemini-2.5-flash-preview-04-17";
+    GeminiModels["Flash2_5Pro"] = "gemini-2.5-pro-preview-05-06";
+    GeminiModels["Flash2_0Lite"] = "gemini-2.0-flash-lite";
+})(GeminiModels || (exports.GeminiModels = GeminiModels = {}));
+//# sourceMappingURL=gemini-models.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dataclouder/nest-vertex",
-  "version": "0.0.8",
+  "version": "0.0.9",
   "description": "NestJS Vertex AI library for Dataclouder",
   "author": "dataclouder",
   "license": "MIT",

package/services/gemini-chat.service.d.ts

@@ -20,6 +20,7 @@ export declare class GeminiChatService {
     chat(messages: ChatCompletionMessageParam[], model?: string): Promise<ChatMessageDict>;
     chatStream(messages: ChatCompletionMessageParam[]): Promise<AsyncIterable<ChatMessageDict>>;
     listModels(): Promise<Record<string, string>[]>;
+    private extractJsonFromResponseBackup;
     private extractJsonFromResponse;
-    chatAndExtractJson(messages: ChatCompletionMessageParam[], model?: any): Promise<any>;
+    chatAndExtractJson(messages: ChatCompletionMessageParam[], model?: string): Promise<any>;
 }

package/services/gemini-chat.service.js

@@ -14,6 +14,7 @@ exports.GeminiChatService = exports.ChatMessageDict = exports.ChatRole = void 0;
 const common_1 = require("@nestjs/common");
 const genai_1 = require("@google/genai");
 const nest_core_1 = require("@dataclouder/nest-core");
+const gemini_models_1 = require("../models/gemini-models");
 var ChatRole;
 (function (ChatRole) {
     ChatRole["System"] = "system";
@@ -149,7 +150,8 @@ let GeminiChatService = GeminiChatService_1 = class GeminiChatService {
             { id: 'gemini-2.0-flash-live-001' },
         ];
     }
-    extractJsonFromResponse(content) {
+    extractJsonFromResponseBackup(content) {
+        console.log(content);
         const jsonMatch = content.match(/(\{[\s\S]*?\}|\[[\s\S]*?\])/);
         if (!jsonMatch)
             return null;
@@ -161,7 +163,23 @@ let GeminiChatService = GeminiChatService_1 = class GeminiChatService {
             throw new Error(`Failed to parse JSON: ${error.message}`);
         }
     }
-    async chatAndExtractJson(messages, model) {
+    extractJsonFromResponse(content) {
+        let cleanedContent = content.trim();
+        if (cleanedContent.startsWith('```json')) {
+            cleanedContent = cleanedContent.substring('```json'.length);
+        }
+        if (cleanedContent.endsWith('```')) {
+            cleanedContent = cleanedContent.substring(0, cleanedContent.length - '```'.length);
+        }
+        cleanedContent = cleanedContent.trim();
+        try {
+            return JSON.parse(cleanedContent);
+        }
+        catch (error) {
+            return this.extractJsonFromResponseBackup(cleanedContent);
+        }
+    }
+    async chatAndExtractJson(messages, model = gemini_models_1.GeminiModels.Flash2_5) {
         const response = await this.chat(messages, model);
         this.logger.debug(`Initial response content: ${response.content}`);
         try {
@@ -174,7 +192,7 @@ let GeminiChatService = GeminiChatService_1 = class GeminiChatService {
         catch (initialError) {
             this.logger.warn(`Initial JSON extraction failed: ${initialError.message}. Attempting recovery.`);
             try {
-                const fixPrompt = `The previous attempt to extract JSON failed. Please analyze the following text, correct any JSON formatting errors, and return ONLY the valid JSON object or array. Do not include any explanatory text before or after the JSON itself. Text to fix: ${response.content}`;
+                const fixPrompt = `I cant extract the json from the following text, something is wrong, please analyze the following text, correct any JSON formatting errors invalid characters or whatever thing is wrong, change or complete the text if needed, and return ONLY the valid JSON object or array. Do not include any explanatory text before or after the JSON itself. JSON to fix: ${response.content}`;
                 const fixResponse = await this.chat([{ role: 'user', content: fixPrompt }], model);
                 this.logger.debug(`Recovery response content: ${fixResponse.content}`);
                 const fixedJson = this.extractJsonFromResponse(fixResponse.content);