-
Notifications
You must be signed in to change notification settings - Fork 1.3k
fix: rebuild token_usage from denormalized columns in hybrid log list #4764
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
2cc19f2
fix: use `parseAsSafeArrayOf` for logs page array query params to han…
impoiler 4b06fb2
feat: add TruncatedLabel component with tooltip on overflow (#4715)
impoiler 11d6f95
refactor: extract `TruncatedLabel` component and replace inline trunc…
impoiler 18b1af3
fix: rebuild token_usage from denormalized columns in hybrid log list…
G-XD File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| [fix]: rebuild token usage from denormalized columns in hybrid log list [@G-XD](https://github.com/G-XD) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| package logstore | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| "github.com/stretchr/testify/assert" | ||
| "github.com/stretchr/testify/require" | ||
| ) | ||
|
|
||
| func TestDeserializeFieldsReconstructsTokenUsageFromDenormalizedColumns(t *testing.T) { | ||
| log := &Log{ | ||
| PromptTokens: 10, | ||
| CompletionTokens: 5, | ||
| TotalTokens: 15, | ||
| } | ||
| require.NoError(t, log.DeserializeFields()) | ||
| require.NotNil(t, log.TokenUsageParsed) | ||
| assert.Equal(t, 10, log.TokenUsageParsed.PromptTokens) | ||
| assert.Equal(t, 5, log.TokenUsageParsed.CompletionTokens) | ||
| assert.Equal(t, 15, log.TokenUsageParsed.TotalTokens) | ||
| assert.Nil(t, log.TokenUsageParsed.PromptTokensDetails) | ||
| } | ||
|
|
||
| func TestDeserializeFieldsPrefersSerializedTokenUsage(t *testing.T) { | ||
| log := &Log{ | ||
| TokenUsage: `{"prompt_tokens":99,"completion_tokens":1,"total_tokens":100}`, | ||
| PromptTokens: 10, | ||
| CompletionTokens: 5, | ||
| TotalTokens: 15, | ||
| } | ||
| require.NoError(t, log.DeserializeFields()) | ||
| require.NotNil(t, log.TokenUsageParsed) | ||
| assert.Equal(t, 99, log.TokenUsageParsed.PromptTokens) | ||
| assert.Equal(t, 1, log.TokenUsageParsed.CompletionTokens) | ||
| assert.Equal(t, 100, log.TokenUsageParsed.TotalTokens) | ||
| } | ||
|
|
||
| func TestDeserializeFieldsDoesNotReconstructTokenUsageWhenSerializedValueIsMalformed(t *testing.T) { | ||
| log := &Log{ | ||
| TokenUsage: `{"prompt_tokens":`, | ||
| PromptTokens: 10, | ||
| CompletionTokens: 5, | ||
| TotalTokens: 15, | ||
| } | ||
| require.NoError(t, log.DeserializeFields()) | ||
| assert.Nil(t, log.TokenUsageParsed) | ||
| } | ||
|
|
||
| func TestDeserializeFieldsSkipsTokenUsageReconstructionWhenAllZero(t *testing.T) { | ||
| log := &Log{} | ||
| require.NoError(t, log.DeserializeFields()) | ||
| assert.Nil(t, log.TokenUsageParsed) | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| import * as React from "react"; | ||
| import { useCallback, useLayoutEffect, useState } from "react"; | ||
|
|
||
| import { cn } from "@/lib/utils"; | ||
|
|
||
| import { Tooltip, TooltipContent, TooltipTrigger } from "./tooltip"; | ||
|
|
||
| type TruncatedLabelProps = { | ||
| children: React.ReactNode; | ||
| className?: string; | ||
| tooltip?: React.ReactNode; | ||
| tooltipSide?: React.ComponentProps<typeof TooltipContent>["side"]; | ||
| } & Omit<React.ComponentProps<"span">, "children">; | ||
|
|
||
| function TruncatedLabel({ children, className, tooltip, tooltipSide = "right", ...props }: TruncatedLabelProps) { | ||
| const [measureEl, setMeasureEl] = useState<HTMLSpanElement | null>(null); | ||
| const [isTruncated, setIsTruncated] = useState(false); | ||
|
|
||
| const setTextRef = useCallback((node: HTMLSpanElement | null) => { | ||
| setMeasureEl(node); | ||
| }, []); | ||
|
|
||
| useLayoutEffect(() => { | ||
| if (!measureEl) return; | ||
|
|
||
| const checkTruncation = () => { | ||
| setIsTruncated(measureEl.scrollWidth > measureEl.clientWidth); | ||
| }; | ||
|
|
||
| checkTruncation(); | ||
| const observer = new ResizeObserver(checkTruncation); | ||
| observer.observe(measureEl); | ||
| return () => observer.disconnect(); | ||
| }, [measureEl, children]); | ||
|
|
||
| const tooltipContent = tooltip ?? (typeof children === "string" ? children : undefined); | ||
|
|
||
| const inner = ( | ||
| <span ref={setTextRef} className={cn("min-w-0 truncate", className)} {...props}> | ||
| {children} | ||
| </span> | ||
| ); | ||
|
|
||
| if (!isTruncated || tooltipContent == null) return inner; | ||
|
|
||
| return ( | ||
| <Tooltip> | ||
| <TooltipTrigger asChild>{inner}</TooltipTrigger> | ||
| <TooltipContent side={tooltipSide}>{tooltipContent}</TooltipContent> | ||
| </Tooltip> | ||
| ); | ||
| } | ||
|
|
||
| export { TruncatedLabel }; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| import { describe, expect, test } from "vitest"; | ||
| import { parseAsSafeArrayOf, parseAsSafeString } from "./queryParamsParser"; | ||
|
|
||
| describe("parseAsSafeString", () => { | ||
| test("roundtrips model names with double slashes", () => { | ||
| const model = "gpt://b1g9n2rqsrnikgh0uofm/gpt-oss-120b"; | ||
| const serialized = parseAsSafeString.serialize(model); | ||
| expect(serialized).not.toContain("://"); | ||
| expect(parseAsSafeString.parse(serialized)).toBe(model); | ||
| }); | ||
| }); | ||
|
|
||
| describe("parseAsSafeArrayOf", () => { | ||
| test("roundtrips multiple models with special characters", () => { | ||
| const models = ["gpt://b1g9n2rqsrnikgh0uofm/gpt-oss-20b", "gpt://b1g9n2rqsrnikgh0uofm/gpt-oss-120b"]; | ||
| const serialized = parseAsSafeArrayOf.serialize(models); | ||
| expect(serialized).not.toContain("://"); | ||
| expect(parseAsSafeArrayOf.parse(serialized)).toEqual(models); | ||
| }); | ||
| }); |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.