Simplifies model provider logic and updates environment variables

Author: KevyVo

samples/mastra-nextjs/app/src/mastra/agent/index.ts

@@ -1,8 +1,7 @@
 import { Agent } from "@mastra/core/agent";
 import { createAmazonBedrock } from "@ai-sdk/amazon-bedrock";
-import type { LanguageModelV2 } from "@ai-sdk/provider";
 import { fromNodeProviderChain } from "@aws-sdk/credential-providers";
-import { createVertex } from "@ai-sdk/google-vertex";
+import { vertex } from "@ai-sdk/google-vertex";
 
 import { getMemory } from "../memory";
 import { instructions } from "./instructions";
@@ -13,49 +12,25 @@ import { getRepositoryCommits } from "../tools/getRepositoryCommits";
 import { getRepositoryPullRequests } from "../tools/getRepositoryPullRequests";
 import { getRepositoryStars } from "../tools/getRepositoryStars";
 
-// https://ai-sdk.dev/providers/ai-sdk-providers/amazon-bedrock#using-aws-sdk-credentials-chain-instance-profiles-instance-roles-ecs-roles-eks-service-accounts-etc
-function createAWSModelProvider(modelName: string): LanguageModelV2 {
-  return createAmazonBedrock({
-    credentialProvider: fromNodeProviderChain(),
-  })(modelName);
-}
-
-// https://ai-sdk.dev/providers/ai-sdk-providers/google-vertex
-function createGCPModelProvider(modelName: string): LanguageModelV2 {
-  const projectId = process.env.DEFANG_GCP_PROJECT;
-  if (projectId === undefined) {
-    throw new Error(
-      "DEFANG_GCP_PROJECT is not defined in environment variables"
-    );
-  }
-  const location = process.env.DEFANG_GCP_LOCATION;
-  if (location === undefined) {
-    throw new Error(
-      "DEFANG_GCP_LOCATION is not defined in environment variables"
-    );
-  }
-  return createVertex({
-    project: projectId,
-    location: location,
-  })(modelName);
-}
-
-function getModel(): LanguageModelV2 {
-  const provider = process.env.DEFANG_PROVIDER;
+function getModel() {
+  const provider = process.env.AWS_REGION ? "aws" : "gcp";
   const modelName = process.env.LLM_MODEL;
   if (modelName === undefined) {
     throw new Error("LLM_MODEL is not defined in environment variables");
   }
 
-  if (provider === "aws") {
-    return createAWSModelProvider(modelName);
-  }
-
-  if (provider === "gcp") {
-    return createGCPModelProvider(modelName);
+  switch (provider) {
+    case "aws":
+      // https://ai-sdk.dev/providers/ai-sdk-providers/amazon-bedrock#using-aws-sdk-credentials-chain-instance-profiles-instance-roles-ecs-roles-eks-service-accounts-etc
+      return createAmazonBedrock({
+        credentialProvider: fromNodeProviderChain(),
+      })(modelName);
+    case "gcp":
+      // https://ai-sdk.dev/providers/ai-sdk-providers/google-vertex
+      return vertex(modelName);
+    default:
+      return modelName;
   }
-
-  throw new Error(`Unsupported DEFANG_PROVIDER: ${provider}`);
 }
 
 export const agent = new Agent({

samples/mastra-nextjs/compose.dev.yaml

@@ -6,6 +6,7 @@ services:
     environment:
       - DB_URL=postgres://postgres:password@database:5432/postgres
       - DB_SSL=false #set this to true if deploying to defang playground
+      - LLM_MODEL=gemini-2.5-flash
       - GOOGLE_GENERATIVE_AI_API_KEY=xxx
       - GITHUB_TOKEN=xxx # remove this line if unused
 

samples/mastra-nextjs/compose.yaml

@@ -1,17 +1,17 @@
 services:
   app:
+    domainname: example.com
     x-defang-llm: true
     build:
       context: ./app
       dockerfile: Dockerfile
     environment:
       - DB_URL=postgres://postgres:${POSTGRES_PASSWORD}@database:5432/postgres
-      - DB_SSL=true #set this to false if deploying to defang playground
-      - GITHUB_TOKEN #optional, remove this line if unused
-      - DEFANG_PROVIDER # use "gcp" when deploying to Google Cloud, "aws" when deploying to AWS
-      - DEFANG_GCP_PROJECT # change to your GCP project when deploying to Google Cloud
-      - DEFANG_GCP_LOCATION #should be us-central1 when deploying to Google Cloud, else change to your perferred location
-      - LLM_MODEL=anthropic.claude-3-5-sonnet-20241022-v2:0 #gemini-2.5-flash for GCP, anthroipc.claude-3-5-sonnet-20241022-v2 for AWS
+      - DB_SSL=true # set this to false if deploying to defang playground, true otherwise
+      - GOOGLE_VERTEX_PROJECT= # your GCP project ID
+      - GOOGLE_VERTEX_LOCATION= # your GCP region, e.g., us-central1
+      - LLM_MODEL # gemini-2.5-flash for GCP, anthropic.claude-3-5-sonnet-20241022-v2:0 for AWS
+      - GITHUB_TOKEN # optional, remove this line if unused
     restart: unless-stopped
     ports:
       - mode: ingress