Merge pull request #281 from RooVetGit/glama_fixes

mrubens · web-flow · commit 124dc46fae9d · 2025-01-05T20:42:06.000-05:00
Glama fixes
diff --git a/src/api/providers/glama.ts b/src/api/providers/glama.ts
@@ -107,14 +107,15 @@ export class GlamaHandler implements ApiHandler {
 			if (completionRequest.tokenUsage) {
 				yield {
 					type: "usage",
+					cacheWriteTokens: completionRequest.tokenUsage.cacheCreationInputTokens,
+					cacheReadTokens: completionRequest.tokenUsage.cacheReadInputTokens,
 					inputTokens: completionRequest.tokenUsage.promptTokens,
 					outputTokens: completionRequest.tokenUsage.completionTokens,
-					totalCost: completionRequest.totalCostUsd,
+					totalCost: parseFloat(completionRequest.totalCostUsd),
 				}
 			}			
 		} catch (error) {
-			// ignore if fails
-			console.error("Error fetching Glama generation details:", error)
+			console.error("Error fetching Glama completion details", error)
 		}
 	}
 
diff --git a/src/shared/api.ts b/src/shared/api.ts
@@ -315,7 +315,7 @@ export const bedrockModels = {
 
 // Glama
 // https://glama.ai/models
-export const glamaDefaultModelId = "anthropic/claude-3-5-sonnet" // will always exist in openRouterModels
+export const glamaDefaultModelId = "anthropic/claude-3-5-sonnet"
 export const glamaDefaultModelInfo: ModelInfo = {
 	maxTokens: 8192,
 	contextWindow: 200_000,

Original file line number	Diff line number	Diff line change
`@@ -107,14 +107,15 @@ export class GlamaHandler implements ApiHandler {`
`107`	`107`	`if (completionRequest.tokenUsage) {`
`108`	`108`	`yield {`
`109`	`109`	`type: "usage",`
	`110`	`+ cacheWriteTokens: completionRequest.tokenUsage.cacheCreationInputTokens,`
	`111`	`+ cacheReadTokens: completionRequest.tokenUsage.cacheReadInputTokens,`
`110`	`112`	`inputTokens: completionRequest.tokenUsage.promptTokens,`
`111`	`113`	`outputTokens: completionRequest.tokenUsage.completionTokens,`
`112`		`- totalCost: completionRequest.totalCostUsd,`
	`114`	`+ totalCost: parseFloat(completionRequest.totalCostUsd),`
`113`	`115`	`}`
`114`	`116`	`}`
`115`	`117`	`} catch (error) {`
`116`		`- // ignore if fails`
`117`		`- console.error("Error fetching Glama generation details:", error)`
	`118`	`+ console.error("Error fetching Glama completion details", error)`
`118`	`119`	`}`
`119`	`120`	`}`
`120`	`121`