Merge branch 'development' into release

Scale3-Labs · Sep 26, 2024 · ae99faf · ae99faf
2 parents c18ec55 + 482bc7e
commit ae99faf
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 3 deletions.
diff --git a/app/(protected)/project/[project_id]/dspy-experiments/layout.tsx b/app/(protected)/project/[project_id]/dspy-experiments/layout.tsx
@@ -7,5 +7,5 @@ export const metadata: Metadata = {
 };
 
 export default function Layout({ children }: { children: React.ReactNode }) {
-  return <LayoutClient children={children} />;
+  return <LayoutClient>{children}</LayoutClient>;
 }
diff --git a/lib/utils.ts b/lib/utils.ts
@@ -517,8 +517,26 @@ export function calculatePriceFromUsage(
 ): any {
   if (!model) return { total: 0, input: 0, output: 0 };
   let costTable: CostTableEntry | undefined = undefined;
-
-  if (vendor === "litellm") {
+  if (vendor === "ai") {
+    if (model.startsWith("gpt-4") || model.includes("gpt-4")) {
+      vendor = "openai";
+    } else if (model.includes("claude")) {
+      vendor = "anthropic";
+    } else if (model.includes("mistral")) {
+      vendor = "mistral"; // Assuming there is a MISTRAL_PRICING object
+    } else if (model.includes("gemini")) {
+      vendor =
+        model.includes("flash") || model.includes("pro")
+          ? "google generative ai"
+          : "google vertex";
+    } else if (
+      model.includes("llama") ||
+      model.includes("mixtral") ||
+      model.includes("gemma2")
+    ) {
+      vendor = "groq";
+    }
+  } else if (vendor === "litellm") {
     let correctModel = model;
     if (model.includes("gpt") || model.includes("o1")) {
       if (model.includes("gpt-4o-mini")) {