@ibgib/web-gib 0.0.4 → 0.0.6

package/src/witness/agent/gemini/agent-witness-gemini-v1.mts

@@ -1,7 +1,15 @@
+/**
+ * @module agent-witness-gemini-v1.mts
+ *
+ * ## MIGRATING TO @google/genai NOTES
+ *
+ * * Different Part types (TextPart, FunctionCallPart) are apparently "unified" in the new structure as just Part
+ */
+import { FunctionCallPart, FunctionResponsePart, } from './gemini-types.mjs';
 import {
-    EnhancedGenerateContentResponse, ErrorDetails, FunctionCallPart, FunctionCallingMode,
-    FunctionResponsePart, GenerateContentResult, GoogleGenerativeAI, TextPart,
-} from '@google/generative-ai';
+    Part, GenerateContentResponse, Content, GoogleGenAI, SendMessageParameters,
+    CreateChatParameters, FunctionCallingConfigMode, FunctionCall,
+} from '@google/genai';
 
 import { clone, delay, extractErrorMsg, getTimestampInTicks, pretty } from '@ibgib/helper-gib/dist/helpers/utils-helper.mjs';
 import { Ib, IbGibAddr, TransformResult } from '@ibgib/ts-gib/dist/types.mjs';
@@ -11,17 +19,19 @@ import { ROOT_ADDR } from '@ibgib/ts-gib/dist/V1/constants.mjs';
 import { getGibInfo } from '@ibgib/ts-gib/dist/V1/transforms/transform-helper.mjs';
 import { CommentIbGib_V1 } from '@ibgib/core-gib/dist/common/comment/comment-types.mjs';
 import { createCommentIbGib, parseCommentIb } from '@ibgib/core-gib/dist/common/comment/comment-helper.mjs';
-import { MetaspaceService } from '@ibgib/core-gib/dist/witness/space/metaspace/metaspace-types.mjs';
-import { IbGibSpaceAny } from '@ibgib/core-gib/dist/witness/space/space-base-v1.mjs';
+import { execInSpaceWithLocking } from '@ibgib/core-gib/dist/witness/space/space-helper.mjs';
+import { appendToTimeline, Rel8nInfo } from '@ibgib/core-gib/dist/timeline/timeline-api.mjs';
 
 import { GLOBAL_LOG_A_LOT } from '../../../constants.mjs';
 import { getAllFunctionInfos, getDeprecatedFunctionInfoNames } from '../../../api/api-index.mjs';
 import {
-    AddTextsOpts, AgentWitnessData_V1, AgentWitnessIbGib_V1, AgentWitnessRel8ns_V1, AgentWitness_V1,
+    AddTextsOpts, AgentWitnessData_V1, AgentWitnessIbGib_V1, AgentWitnessRel8ns_V1,
     PromptOneOffOpts,
+} from '../agent-types.mjs';
+import {
     getAddlMetadataTextForAgentText,
     parseAddlMetadataTextForAgentText, validateAgentWitnessCommentIbGib
-} from '../agent-one-file.mjs';
+} from '../agent-helpers.mjs';
 import {
     getFunctionCallAndResponseParts, isFunctionCallRequestComment,
     isPromptInfoGemini, systemPromptEntriesToSystemInstructionContent,
@@ -33,14 +43,13 @@ import { agentIbGibDtoToWitness } from './gemini-agent-factory.mjs';
 import { getAgentsSvc } from '../agents-service-v1.mjs';
 import { GEMINI_BACKUP_MODEL_STR, GEMINI_ERROR_DETAILS_TYPE_RETRY_INFO, GEMINI_ERROR_DETAILS_TYPE_RETRY_INFO_RETRY_DELAY_KEY, GEMINI_ERROR_STATUS_MODEL_OVERLOADED, GEMINI_ERROR_STATUS_RATE_QUOTA_EXCEEDED, GEMINI_MAX_TRY_COUNT } from './gemini-constants.mjs';
 import { AGENT_REL8N_NAME, TextSource } from '../agent-constants.mjs';
-// import { appendToTimeline, getLockScope, mut8Timeline, Rel8nInfo } from '../../../api/timeline/timeline-api.mjs';
-import { execInSpaceWithLocking } from '@ibgib/core-gib/dist/witness/space/space-helper.mjs';
-import { appendToTimeline, Rel8nInfo } from '@ibgib/core-gib/dist/timeline/timeline-api.mjs';
+import { AgentWitness_V1 } from '../agent-one-file.mjs';
 
 const logalot = GLOBAL_LOG_A_LOT;
 
 export class AgentWitnessGemini_V1
-    extends AgentWitness_V1<GoogleGenerativeAI, PromptInfoGemini, PromptAPIResult_Gemini> {
+    extends AgentWitness_V1<GoogleGenAI, PromptInfoGemini, PromptAPIResult_Gemini> {
+    // extends AgentWitness_V1<GoogleGenerativeAI, PromptInfoGemini, PromptAPIResult_Gemini> {
     // witness(arg: IbGib_V1): Promise<IbGib_V1 | undefined> {
     //     throw new Error('Method not implemented.');
     // }
@@ -265,7 +274,8 @@ export class AgentWitnessGemini_V1
                                 text: getTextPartForCurrentContextTjpAddr({
                                     currentContextTjpAddr
                                 })
-                            } satisfies TextPart
+                            } satisfies Part // see genai migration note at top of this file
+                            // } satisfies TextPart
                         ],
                     }
                 })
@@ -341,7 +351,8 @@ export class AgentWitnessGemini_V1
                     text: 'no api key entered so no LLM chat happening. enter a gemini api key and donate/invest!',
                 }; /* <<<< returns early */
             }
-            this._genAI ??= new GoogleGenerativeAI(apiKey);
+            this._genAI ??= new GoogleGenAI({ apiKey });
+            // this._genAI ??= new GoogleGenerativeAI(apiKey);
 
             const functionDeclarations = Array.from(this.availableFunctions.values()).map(
                 (x) => ({
@@ -388,7 +399,8 @@ export class AgentWitnessGemini_V1
             //     this.transientDecompressionPromptText = undefined;
             // }
 
-            let result: GenerateContentResult | undefined = undefined;
+            let result: GenerateContentResponse | undefined = undefined;
+            // let result: GenerateContentResult | undefined = undefined;
 
             /**
              * need to be able to call this function with retries with different
@@ -403,33 +415,75 @@ export class AgentWitnessGemini_V1
              * @param modelStr to use
              * @param isRetry if true, this indicates this is aleady a retry and should throw if fails
              */
+            // const fnGoModel = async (modelStr: string) => {
+            //     if (!this._genAI) { throw new Error(`(UNEXPECTED) this._genAI falsy? (E: 503a0d9e3f729de7653ee3565b017b25)`); }
+            //     const genModel = this._genAI.getGenerativeModel({
+            //         model: modelStr,
+            //         systemInstruction: systemPromptEntriesToSystemInstructionContent({ systemPromptEntries }),
+            //         tools: [{ functionDeclarations }],
+            //         toolConfig: {
+            //             functionCallingConfig: {
+            //                 // mode: FunctionCallingMode.AUTO, // can be either text or function call, this is the default
+            //                 mode:
+            //                     info.overrideFunctionCallingMode ??
+            //                     FunctionCallingMode.ANY, // MANDATES a function call. If this is not used, the model gets confused, but maybe this will be fixed after we get better function response feedback in place.
+            //             },
+            //         },
+            //     });
+            //     /**
+            //      * We start a "chat", _BUT ONLY TO USE THE HISTORY MECHANISM_.
+            //      * Really we use this as a one-off, but we do not know how to mimic
+            //      * the "history" so that the model understands to only respond to
+            //      * the most recent prompt.
+            //      */
+            //     const chat = genModel.startChat({
+            //         history: chatPromptHistoryParts.map(x => x.content),
+            //     });
+            //     result = await chat.sendMessage(chatPromptCurrent.content.parts);
+            //     return result;
+            // }
+            // interface ChatConfigParams {
+            //     model: string;
+            //     history: Content[];
+            //     config: GenerateContentConfig;
+            // }
+
             const fnGoModel = async (modelStr: string) => {
-                if (!this._genAI) { throw new Error(`(UNEXPECTED) this._genAI falsy? (E: 503a0d9e3f729de7653ee3565b017b25)`); }
-                const genModel = this._genAI.getGenerativeModel({
+                if (!this._genAI) {
+                    throw new Error(`(UNEXPECTED) this._genAI falsy? (E: 503a0d9e3f729de7653ee3565b017b25)`);
+                }
+
+                const historyContents: Content[] = chatPromptHistoryParts.map(x => x.content);
+
+                const chatConfig: CreateChatParameters = {
                     model: modelStr,
-                    systemInstruction: systemPromptEntriesToSystemInstructionContent({ systemPromptEntries }),
-                    tools: [{ functionDeclarations }],
-                    toolConfig: {
-                        functionCallingConfig: {
-                            // mode: FunctionCallingMode.AUTO, // can be either text or function call, this is the default
-                            mode:
-                                info.overrideFunctionCallingMode ??
-                                FunctionCallingMode.ANY, // MANDATES a function call. If this is not used, the model gets confused, but maybe this will be fixed after we get better function response feedback in place.
+                    history: historyContents,
+                    config: {
+                        systemInstruction: systemPromptEntriesToSystemInstructionContent({ systemPromptEntries }),
+                        tools: [{ functionDeclarations }],
+                        toolConfig: {
+                            functionCallingConfig: {
+                                mode: info.overrideFunctionCallingMode ?? FunctionCallingConfigMode.ANY,
+                            },
                         },
-                    },
-                });
-                /**
-                 * We start a "chat", _BUT ONLY TO USE THE HISTORY MECHANISM_.
-                 * Really we use this as a one-off, but we do not know how to mimic
-                 * the "history" so that the model understands to only respond to
-                 * the most recent prompt.
-                 */
-                const chat = genModel.startChat({
-                    history: chatPromptHistoryParts.map(x => x.content),
-                });
-                result = await chat.sendMessage(chatPromptCurrent.content.parts);
+                    }
+                };
+
+                const chat = this._genAI.chats.create(chatConfig);
+
+                // The 'sendMessage' method requires a `message` property in its parameters object.
+                // The message content itself can be a string or Part[] (PartListUnion).
+
+                // Prepare the message parameters:
+                const messageParams: SendMessageParameters = {
+                    message: chatPromptCurrent.content.parts as Part[], // Cast to Part[] to satisfy the type
+                };
+
+                // The result is typed as GenerateContentResponse
+                const result: GenerateContentResponse = await chat.sendMessage(messageParams);
+
                 return result;
-            }
+            };
 
             let tryCount = 0;
             let modelStr = model;
@@ -439,7 +493,11 @@ export class AgentWitnessGemini_V1
                     result = await fnGoModel(modelStr);
                     break;
                 } catch (error) {
-                    if (error.status && error.status === GEMINI_ERROR_STATUS_MODEL_OVERLOADED) {
+                    const errorMessage = error.message;
+                    const status = (error as any).status ?? '[STATUS?]';
+
+                    // if (error.status && error.status === GEMINI_ERROR_STATUS_MODEL_OVERLOADED) {
+                    if (errorMessage.includes(`${GEMINI_ERROR_STATUS_MODEL_OVERLOADED}`)) {
                         // model is overloaded, try using the backup
                         console.error(`${lc}[fnGoModel][${modelStr}] error trying to get result from model. will try using backup model (${GEMINI_BACKUP_MODEL_STR}) for this next call. error (${error.status}): ${extractErrorMsg(error)} (E: a5cd7d174183518058da57cc6d0d8a25)`);
                         modelStr = GEMINI_BACKUP_MODEL_STR;
@@ -452,12 +510,28 @@ export class AgentWitnessGemini_V1
             if (!result) { throw new Error(`couldn't get result from model (E: ede013a53f875d99a96a2e257c7e7125)`); }
 
             // const result = await genModel.generateContent(finalChatPrompt);
-            const enhancedResult = result.response as EnhancedGenerateContentResponse;
-            const functionCalls = enhancedResult.functionCalls();
+            // const enhancedResult = result.response as EnhancedGenerateContentResponse;
+            // const functionCalls = enhancedResult.functionCalls();
+
+            // The 'result' IS the GenerateContentResponse object directly.
+            const response: GenerateContentResponse = result;
+
+            // Function calls are no longer accessed via a method, but by manually scanning the 'candidates' structure.
+
+            // We need a way to extract the function calls from the parts array manually.
+            const functionCalls: FunctionCall[] = [];
+            const parts = response.candidates?.[0]?.content?.parts || [];
+
+            for (const part of parts) {
+                if (part.functionCall) {
+                    functionCalls.push(part.functionCall);
+                }
+            }
 
             if (!functionCalls || functionCalls.length === 0) {
                 if (logalot) { console.warn(`${lc} no function calls in response, returning text. (W: 3a4b8c940983b9e28e3f04c01a09bb25)`); }
-                return { text: result.response.text() };
+                if (!response.text) { throw new Error(`response generated no function calls and no response.text (E: 6123b8cacfb834105ad3160cfc4ef825)`); }
+                return { text: response.text };
             }
 
             if (logalot) {
@@ -511,13 +585,14 @@ export class AgentWitnessGemini_V1
                 // part for the function response entry.
                 const functionInfoIbGibs: FunctionInfoIbGib_V1[] =
                     await this.getFunctionInfoIbGibs({ fcrCommentIbGib: commentIbGib });
+                // const functionCallParts: Part[] = [];
                 const functionCallParts: FunctionCallPart[] = [];
                 const functionResponseParts: FunctionResponsePart[] = [];
                 for (let functionInfoIbGib of functionInfoIbGibs) {
                     let { call, response } = getFunctionCallAndResponseParts({ functionInfoIbGib });
                     if (!call) { throw new Error(`(UNEXPECTED) call falsy? (E: 5c8f3bd6de3b300e1c105b9603bb7b25)`); }
                     if (!response) { throw new Error(`(UNEXPECTED) response falsy? (E: d0388c838975c93126c1a6d64f781d25)`); }
-                    if (call.functionCall.name !== response.functionResponse.name) {
+                    if (call.functionCall!.name !== response.functionResponse.name) {
                         throw new Error(`(UNEXPECTED) functionCall.name !== functionResponse.name? (E: e49f0d60093354db2b6ad17fdf86d425)`);
                     }
                     functionCallParts.push(call);
@@ -557,7 +632,12 @@ export class AgentWitnessGemini_V1
                     // text: commentIbGib.data.text,
                     content: {
                         role: textSourceToGeminiRole(textSrc),
-                        parts: [{ text: commentIbGib.data.text } satisfies TextPart],
+                        parts: [
+                            {
+                                text: commentIbGib.data.text
+                            } satisfies Part // see genai migration note at top of this file
+                            // } satisfies TextPart
+                        ],
                     }
                 }];
             }
@@ -590,8 +670,7 @@ export class AgentWitnessGemini_V1
                 console.error(`${lc} apiKey falsy. did you set this.fnGetAPIKey (E: genuuid)`);
                 return undefined; /* <<<< returns early */
             }
-            this._genAI ??= new GoogleGenerativeAI(apiKey);
-
+            this._genAI ??= new GoogleGenAI({ apiKey });
 
             /**
              * need to be able to call this function with retries with different
@@ -607,26 +686,31 @@ export class AgentWitnessGemini_V1
              * @param isRetry if true, this indicates this is aleady a retry and should throw if fails
              */
             const fnGoModel = async (modelStr: string) => {
-                if (!this._genAI) { throw new Error(`(UNEXPECTED) this._genAI falsy? (E: genuuid)`); }
-                const genModel = this._genAI.getGenerativeModel({
+                if (!this._genAI) { throw new Error(`(UNEXPECTED) this._genAI falsy? (E: fbe235713d48f0d8e87cd0b88ec54825)`); }
+                const chatConfig: CreateChatParameters = {
                     model: modelStr,
-                    systemInstruction: systemInstructions,
-                });
-                /**
-                 * We start a "chat", _BUT ONLY TO USE THE HISTORY MECHANISM_.
-                 * Really we use this as a one-off, but we do not know how to mimic
-                 * the "history" so that the model understands to only respond to
-                 * the most recent prompt.
-                 */
-                // const chat = genModel.startChat({
-                //     history: chatPromptHistoryParts.map(x => x.content),
-                // });
-                const result = await genModel.generateContent(text);
-                if (result.response) {
-                    return result.response.text();
+                    config: {
+                        systemInstruction: systemInstructions,
+                    }
+                };
+                const chat = this._genAI.chats.create(chatConfig);
+                const response = await chat.sendMessage({ message: text });
+                if (response.text) {
+                    return response.text;
                 } else {
-                    throw new Error(`not implemented (E: bbf05fe00da23d5b16c223bd200eaa25)`);
+                    throw new Error(`response.text empty/falsy, potentially blocked by safety settings (E: a21a78c9471f27a42c07d1c859187825)`);
+
                 }
+                // const genModel = this._genAI.getGenerativeModel({
+                //     model: modelStr,
+                //     systemInstruction: systemInstructions,
+                // });
+                // const result = await genModel.generateContent(text);
+                // if (result.response) {
+                //     return result.response.text();
+                // } else {
+                //     throw new Error(`not implemented (E: bbf05fe00da23d5b16c223bd200eaa25)`);
+                // }
             }
 
             let result: string | undefined = undefined;
@@ -637,47 +721,60 @@ export class AgentWitnessGemini_V1
                 tryCount++;
                 retryDelayInSeconds++;
                 try {
-                    let x: ErrorDetails
+                    debugger; // step through the new error mechanism and look for how to determine if the model is overloaded vs quota exceeded
+                    // let x: ErrorDetails
                     result = await fnGoModel(modelStr);
                     break;
                 } catch (error) {
-                    if (error.status && error.status === GEMINI_ERROR_STATUS_MODEL_OVERLOADED) {
-                        if (modelStr === GEMINI_BACKUP_MODEL_STR) {
-                            // already is the backup model, so we just fail
-                            console.error(`${lc}[fnGoModel][${modelStr}] error trying to get result from model: GEMINI_ERROR_STATUS_MODEL_OVERLOADED ${GEMINI_ERROR_STATUS_MODEL_OVERLOADED}. we are already using the backup model, so SOL here. will try again... error (${error.status}): ${extractErrorMsg(error)} (E: 9bb63cb520b8bd3bb85d2ca20715c825)`);
-                        } else {
-                            // model is overloaded, try using the backup
-                            console.error(`${lc}[fnGoModel][${modelStr}] error trying to get result from model: GEMINI_ERROR_STATUS_MODEL_OVERLOADED ${GEMINI_ERROR_STATUS_MODEL_OVERLOADED}. will try using backup model (${GEMINI_BACKUP_MODEL_STR}) for this next call. error (${error.status}): ${extractErrorMsg(error)} (E: b07a041bb97ea95b03cd6f9856f01525)`);
-                            modelStr = GEMINI_BACKUP_MODEL_STR;
-                        }
-                    } else if (error.status && error.status === GEMINI_ERROR_STATUS_RATE_QUOTA_EXCEEDED) {
-                        // quota exceeded, either try backup or wait for retry
-                        if (modelStr === GEMINI_BACKUP_MODEL_STR) {
-                            // nothing else to try, wait retry amount if possible
-                            let errorDetails: ErrorDetails[] = error.errorDetails;
-                            let retryInfo = errorDetails.find(x => x['@type'] === GEMINI_ERROR_DETAILS_TYPE_RETRY_INFO);
-                            retryDelayInSeconds = 30;
-                            if (retryInfo && retryInfo[GEMINI_ERROR_DETAILS_TYPE_RETRY_INFO_RETRY_DELAY_KEY]) {
-                                // get more accurate wait time
-                                let retryStr = retryInfo[GEMINI_ERROR_DETAILS_TYPE_RETRY_INFO_RETRY_DELAY_KEY]! as string;
-                                // retryStr from testing is in seconds, e.g., "41s". IF it's longer than a minute, I don't know/care (too long)
-                                if (retryStr.match(/^\d+s$/)) {
-                                    // valid retry str in seconds
-                                    retryDelayInSeconds = Number.parseInt(retryStr.substring(0, retryStr.length - 1));
-                                    if (Number.isNaN(retryDelayInSeconds)) {
-                                        retryDelayInSeconds = 30;
-                                    }
-                                } else {
-                                    retryDelayInSeconds = 30;
-                                    console.error(`${lc}[fnGoModel][${modelStr}] error trying to get result from model: GEMINI_ERROR_STATUS_RATE_QUOTA_EXCEEDED ${GEMINI_ERROR_STATUS_RATE_QUOTA_EXCEEDED}. Could not find valid retryInfo (errorDetails with retry info with a ${GEMINI_ERROR_DETAILS_TYPE_RETRY_INFO_RETRY_DELAY_KEY} with an "s"). So we'll just try waiting ${retryDelayInSeconds} seconds: ${extractErrorMsg(error)} (E: 986d9883fc72bf156f1691183e27ee25)`);
-                                }
+                    if (error instanceof Error) {
+                        const errorMessage = error.message;
+                        const status = (error as any).status ?? '[STATUS?]';
+
+                        // if (error.status && error.status === GEMINI_ERROR_STATUS_MODEL_OVERLOADED) // see migration notes at top of file
+                        if (errorMessage.includes(`${GEMINI_ERROR_STATUS_MODEL_OVERLOADED}`)) {
+                            if (modelStr === GEMINI_BACKUP_MODEL_STR) {
+                                // already is the backup model, so we just fail
+                                console.error(`${lc}[fnGoModel][${modelStr}] error trying to get result from model: GEMINI_ERROR_STATUS_MODEL_OVERLOADED ${GEMINI_ERROR_STATUS_MODEL_OVERLOADED}. we are already using the backup model, so SOL here. will try again... error (${status}): ${extractErrorMsg(error)} (E: 9bb63cb520b8bd3bb85d2ca20715c825)`);
+                            } else {
+                                // model is overloaded, try using the backup
+                                console.error(`${lc}[fnGoModel][${modelStr}] error trying to get result from model: GEMINI_ERROR_STATUS_MODEL_OVERLOADED ${GEMINI_ERROR_STATUS_MODEL_OVERLOADED}. will try using backup model (${GEMINI_BACKUP_MODEL_STR}) for this next call. error (${status}): ${extractErrorMsg(error)} (E: b07a041bb97ea95b03cd6f9856f01525)`);
+                                modelStr = GEMINI_BACKUP_MODEL_STR;
                             }
+                            //  else if (error.status && error.status === GEMINI_ERROR_STATUS_RATE_QUOTA_EXCEEDED)
+                        } else if (errorMessage.includes(`${GEMINI_ERROR_STATUS_RATE_QUOTA_EXCEEDED}`)) {
+                            // quota exceeded, either try backup or wait for retry
+                            debugger; // examine the error to see if we can manually parse out any information about retry
+                            throw new Error('examine the error to see if we can manually parse out any information about retry (E: ea2c2e2ef1deadf968cd0558cdfd5a25)');
+
+                            // if (modelStr === GEMINI_BACKUP_MODEL_STR) {
+                            //     // nothing else to try, wait retry amount if possible
+                            //     let errorDetails: ErrorDetails[] = error.errorDetails;
+                            //     let retryInfo = errorDetails.find(x => x['@type'] === GEMINI_ERROR_DETAILS_TYPE_RETRY_INFO);
+                            //     retryDelayInSeconds = 30;
+                            //     if (retryInfo && retryInfo[GEMINI_ERROR_DETAILS_TYPE_RETRY_INFO_RETRY_DELAY_KEY]) {
+                            //         // get more accurate wait time
+                            //         let retryStr = retryInfo[GEMINI_ERROR_DETAILS_TYPE_RETRY_INFO_RETRY_DELAY_KEY]! as string;
+                            //         // retryStr from testing is in seconds, e.g., "41s". IF it's longer than a minute, I don't know/care (too long)
+                            //         if (retryStr.match(/^\d+s$/)) {
+                            //             // valid retry str in seconds
+                            //             retryDelayInSeconds = Number.parseInt(retryStr.substring(0, retryStr.length - 1));
+                            //             if (Number.isNaN(retryDelayInSeconds)) {
+                            //                 retryDelayInSeconds = 30;
+                            //             }
+                            //         } else {
+                            //             retryDelayInSeconds = 30;
+                            //             console.error(`${lc}[fnGoModel][${modelStr}] error trying to get result from model: GEMINI_ERROR_STATUS_RATE_QUOTA_EXCEEDED ${GEMINI_ERROR_STATUS_RATE_QUOTA_EXCEEDED}. Could not find valid retryInfo (errorDetails with retry info with a ${GEMINI_ERROR_DETAILS_TYPE_RETRY_INFO_RETRY_DELAY_KEY} with an "s"). So we'll just try waiting ${retryDelayInSeconds} seconds: ${extractErrorMsg(error)} (E: 986d9883fc72bf156f1691183e27ee25)`);
+                            //         }
+                            //     }
+                            // } else {
+                            //     console.error(`${lc}[fnGoModel][${modelStr}] error trying to get result from model: GEMINI_ERROR_STATUS_RATE_QUOTA_EXCEEDED ${GEMINI_ERROR_STATUS_RATE_QUOTA_EXCEEDED}. will try using backup model (${GEMINI_BACKUP_MODEL_STR}) for this next call. error (${error.status}): ${extractErrorMsg(error)} (E: 637ed809c659f55738becab83fc01825)`);
+                            // }
+                            // modelStr = GEMINI_BACKUP_MODEL_STR;
                         } else {
-                            console.error(`${lc}[fnGoModel][${modelStr}] error trying to get result from model: GEMINI_ERROR_STATUS_RATE_QUOTA_EXCEEDED ${GEMINI_ERROR_STATUS_RATE_QUOTA_EXCEEDED}. will try using backup model (${GEMINI_BACKUP_MODEL_STR}) for this next call. error (${error.status}): ${extractErrorMsg(error)} (E: 637ed809c659f55738becab83fc01825)`);
+                            console.error(`${lc}[fnGoModel][${modelStr}] error trying to get result from model. error (${status}): ${extractErrorMsg(error)} (E: a67d595c8ed313d458369d4d0b3e7f25)`);
                         }
-                        modelStr = GEMINI_BACKUP_MODEL_STR;
                     } else {
-                        console.error(`${lc}[fnGoModel][${modelStr}] error trying to get result from model. error (${error.status}): ${extractErrorMsg(error)} (E: a67d595c8ed313d458369d4d0b3e7f25)`);
+                        console.error(`${lc}[fnGoModel][${modelStr}] (UNEXPECTED) error is not instanceof Error? The expected error from the @google/genai lib is supposed to be an instance of Error according to Gemini migration AI. (E: 15df95701e78b35f783d250801092825)`);
                     }
                 }
                 if (tryCount > 1) {

package/src/witness/agent/gemini/gemini-agent-factory.mts

@@ -4,12 +4,13 @@ import {
 import { IbGibSpaceAny } from '@ibgib/core-gib/dist/witness/space/space-base-v1.mjs';
 
 import { GLOBAL_LOG_A_LOT } from '../../../constants.mjs';
-import { AgentWitnessAny, AgentWitnessData_V1, AgentWitnessIbGib_V1, AgentWitnessRel8ns_V1, DEFAULT_AGENT_DATA_V1, DEFAULT_AGENT_REL8NS_V1, } from '../agent-one-file.mjs';
+import { AgentWitnessData_V1, AgentWitnessIbGib_V1, AgentWitnessRel8ns_V1, DEFAULT_AGENT_DATA_V1, DEFAULT_AGENT_REL8NS_V1, } from '../agent-types.mjs';
 import { AgentWitnessGemini_V1 } from './agent-witness-gemini-v1.mjs';
 import { storageGet } from '../../../storage/storage-helpers.web.mjs';
 import { CreateConcreteAgentWitnessFactory, CreateNewAgentArg } from '../agent-types.mjs';
 import type { AgentsService_V1 } from '../agents-service-v1.mjs';
 import { getGlobalDbName, getGlobalIndexedDbKey_APIKey, getGlobalStoreName } from '../../../helpers.web.mjs';
+import { AgentWitnessAny } from '../agent-one-file.mjs';
 
 const logalot = GLOBAL_LOG_A_LOT;
 

package/src/witness/agent/gemini/gemini-helpers.mts

@@ -1,5 +1,12 @@
-import { Content, FunctionCall, FunctionCallPart, FunctionResponse, FunctionResponsePart, TextPart } from "@google/generative-ai";
-import type { GoogleGenerativeAI, ModelParams } from "@google/generative-ai";
+/**
+ * @module gemini-helpers.mts
+ *
+ * ## MIGRATION to @google/genai
+ *
+ * See migration notes in agent-witness-gemini.mts.
+ */
+import { FunctionCallPart, FunctionResponsePart, } from "./gemini-types.mjs";
+import { Content, FunctionCall, FunctionResponse, } from "@google/genai";
 
 import { extractErrorMsg, pretty } from "@ibgib/helper-gib/dist/helpers/utils-helper.mjs";
 import { IbGib_V1 } from "@ibgib/ts-gib/dist/V1/types.mjs";
@@ -8,7 +15,7 @@ import { isComment, } from "@ibgib/core-gib/dist/common/comment/comment-helper.m
 import { GLOBAL_LOG_A_LOT } from '../../../constants.mjs';
 import { getAllFunctionInfos } from "../../../api/api-index.mjs";
 import { APIFunctionInfo } from "../../../api/api-types.mjs";
-import { PromptInfo, } from "../agent-one-file.mjs";
+import { PromptInfo, } from "../agent-types.mjs";
 import { FUNCTION_CALL_REQUEST_COMMENT_TAG, TextSource, } from "../agent-constants.mjs";
 import { FunctionResponsePart_ResponseWrapper, PromptInfoEntryGemini, PromptInfoGemini } from "./gemini-types.mjs";
 import { FunctionInfoIbGib_V1 } from "../function-info/function-info-one-file.mjs";
@@ -55,6 +62,7 @@ export function geminiFunctionCallToAPIFunctionInfo({
     functionCall: FunctionCall
 }): { info: APIFunctionInfo, args: any } {
     const lc = `[${geminiFunctionCallToAPIFunctionInfo.name}]`;
+    if (!functionCall.name) { throw new Error(`(UNEXPECTED) functionCall.name is falsy? (E: b2c638cf22f88493d823e7e9915fd625)`); }
     const functionInfo = getAllFunctionInfos().get(functionCall.name);
     if (!functionInfo) {
         throw new Error(`${lc} no APIFunctionInfo found matching name: ${functionCall.name} (E: 7c5c7c17988a666a86e72299630c7f25)`);
@@ -68,7 +76,6 @@ export function geminiFunctionCallToAPIFunctionInfo({
 /**
  * Takes 0 or more entries and combines them into a single {@link Content}
  * object that Gemini API expects for `systemInstruction` when using the fn
- * {@link GoogleGenerativeAI.getGenerativeModel} (@see {@link ModelParams}).
  *
  * @param entries for system instruction, probably from {@link AgentWitnessGemini_V1.systemPromptParts}
  * @returns undefined if no entries, else single Gemini API Content object with role === "user" and combined parts from {@link systemPromptEntries}
@@ -88,7 +95,10 @@ export function systemPromptEntriesToSystemInstructionContent({
         }
         const sysInstructionContent: Content = {
             role: "user",
-            parts: systemPromptEntries.flatMap(entry => entry.content.parts),
+            parts:
+                systemPromptEntries
+                    .filter(entry => !!entry.content.parts)
+                    .flatMap(entry => entry.content.parts!),
         };
         if (logalot) { console.log(`${lc} sysInstructionContent: ${pretty(sysInstructionContent)} (I: 011e5b865c23eb0b640df3f464ac2525)`); }
         return sysInstructionContent;
@@ -160,7 +170,7 @@ export function isFunctionCallRequestComment({ ibGib }: { ibGib: IbGib_V1 }): bo
  *
  * @param {object} arg - Arguments object.
  * @param {FunctionInfoIbGib_V1} arg.functionInfoIbGib - The FunctionInfoIbGib_V1 instance containing function call details.
- * @returns {{ call: FunctionCallPart; response: FunctionResponsePart }} - An object containing both FunctionCallPart and FunctionResponsePart objects.
+ * @returns {{ call: Part; response: Part }} - An object containing both FunctionCallPart and FunctionResponsePart objects.
  * @throws {Error} If there's an error during the process, such as missing function name or arguments.
  */
 export function getFunctionCallAndResponseParts({

package/src/witness/agent/gemini/gemini-types.mts

@@ -1,8 +1,37 @@
-import { Content, } from "@google/generative-ai";
-import type { StartChatParams, ChatSession, FunctionCallingMode, } from "@google/generative-ai";
-import { PromptInfo, } from "../agent-one-file.mjs";
+import { Content, FunctionCallingConfigMode, GoogleGenAI, } from "@google/genai";
+import { PromptInfo, } from "../agent-types.mjs";
 import { TextSource } from "../agent-constants.mjs";
 
+// #region @google/generative-ai to @google/genai shims
+// the changes in @google/genai are a little bassackwards, in that they no
+// longer expose the ability to constrain parts at compile time. these shims
+// enable this.
+
+import { type Part } from '@google/genai';
+
+/** Utility type to make a specific key required, without using 'never' for others. */
+type AssertRequired<T, K extends keyof T> = T & Required<Pick<T, K>>;
+
+// Define your shims:
+
+/** Represents a Part where the 'text' property is guaranteed to be a string. */
+export type TextPart = AssertRequired<Part, 'text'>;
+
+/** Represents a Part where the 'functionCall' property is guaranteed to be present. */
+export type FunctionCallPart = AssertRequired<Part, 'functionCall'>;
+
+/** Represents a Part where the 'functionResponse' property is guaranteed to be present. */
+export type FunctionResponsePart = AssertRequired<Part, 'functionResponse'>;
+
+// // If you need the other top-level types:
+// export type GenerateContentResult = Parameters<NonNullable<ConstructorParameters<typeof GoogleGenAI>[0]>['generateContent']>['0'];
+
+// The EnhancedGenerateContentResponse maps directly to the main response type now
+import { type GenerateContentResponse } from '@google/genai';
+export type EnhancedGenerateContentResponse = GenerateContentResponse;
+
+// #endregion @google/generative-ai to @google/genai shims
+
 export interface PromptInfoEntryGemini {
     /**
      * The source of the text, in terms of our code definition.
@@ -36,23 +65,19 @@ export interface PromptInfoGemini extends PromptInfo {
      * recent.
      *
      * NOTE: We will be using this for the gemini api's "chat" function.
-     *
-     * @see {@link StartChatParams.history}
      */
     chatPromptHistoryParts: PromptInfoEntryGemini[];
     /**
     * The most recent chat message
-    *
-    * @see {@link ChatSession.sendMessage}
     */
     chatPromptCurrent: PromptInfoEntryGemini;
     /**
      * if truthy, this will override the default function calling mode when
      * prompting the LLM.
      *
-     * if falsy, will use the default (FunctionCallingMode.ANY)
+     * if falsy, will use the default (FunctionCallingConfigMode.ANY)
      *
-     * @see {@link FunctionCallingMode}
+     * @see {@link FunctionCallingConfigMode}
      *
      * ## notes
      *
@@ -61,7 +86,7 @@ export interface PromptInfoGemini extends PromptInfo {
      * to just ask the model a "normal" chat llm question (for translating some
      * text).
      */
-    overrideFunctionCallingMode?: FunctionCallingMode;
+    overrideFunctionCallingMode?: FunctionCallingConfigMode;
 }
 
 /**
@@ -79,10 +104,11 @@ export type PromptAPIResult_Gemini =
 
 /**
  * This is a "kluge" IMO because it wraps the response part to be able to handle
- * all responses of functions. This is a limitation of the Gemini API which requires an
- * object as the response part's value. So if a function returns "undefined" or an array,
- * it throws an error. So this is a wrapper.
+ * all responses of functions. This is a limitation of the Gemini API which
+ * requires an object as the response part's value. So if a function returns
+ * "undefined" or an array, it throws an error. So this is a wrapper.
  */
 export interface FunctionResponsePart_ResponseWrapper {
     value: any | undefined;
+    [key: string]: any; // This satisfies the compiler for the *external* library
 }