Skip to content
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

Release #46

Merged
merged 65 commits into from
Apr 5, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
65 commits
Select commit Hold shift + click to select a range
e210184
Bug fix
karthikscale3 Apr 1, 2024
ef1ce1f
signup bug fix
karthikscale3 Apr 1, 2024
e77b9f0
user invite
karthikscale3 Apr 1, 2024
6f9f679
Merge pull request #7 from Scale3-Labs/karthik/teams-bug-fixes
karthikscale3 Apr 1, 2024
51ef09f
docs: add local setup instructions, cleanup files (#10)
darshit-s3 Apr 1, 2024
f75fab8
Update README.md (#11)
rohit-kadhe Apr 1, 2024
f4eab41
Bugfix auth (#12)
karthikscale3 Apr 1, 2024
5a3581c
Merge branch 'development' into release
karthikscale3 Apr 1, 2024
03f6536
Update README.md
rohit-kadhe Apr 1, 2024
1c4695c
Merge pull request #14 from Scale3-Labs/rohit/S3EN-2059-update-readme
rohit-kadhe Apr 1, 2024
4549370
Update favicon (#17)
karthikscale3 Apr 2, 2024
f8a00b8
Adding pagination to traces (#16)
dylanzuber-scale3 Apr 2, 2024
343cb43
Dylan/s3en 2060 adding more frontend pagination (#18)
dylanzuber-scale3 Apr 2, 2024
63fa12e
Merge branch 'development' of github.com:Scale3-Labs/langtrace into r…
karthikscale3 Apr 2, 2024
7d39600
updating prompt dialog (#19)
dylanzuber-scale3 Apr 2, 2024
540b613
Merge branch 'main' of github.com:Scale3-Labs/langtrace into release
karthikscale3 Apr 2, 2024
cdbb7a9
Show API key warning message (#20)
karthikscale3 Apr 2, 2024
b2cd5c2
Merge branch 'development' into release
karthikscale3 Apr 2, 2024
f0008e4
Fix null dereference checks (#21)
karthikscale3 Apr 2, 2024
e428dc9
Merge branch 'development' into release
karthikscale3 Apr 2, 2024
97fee7b
adding check for missing table (#22)
dylanzuber-scale3 Apr 2, 2024
1490b00
Merge branch 'development' into release
karthikscale3 Apr 2, 2024
73e73eb
Check length of data (#24)
karthikscale3 Apr 2, 2024
62e7250
Merge branch 'main' of github.com:Scale3-Labs/langtrace into release
karthikscale3 Apr 2, 2024
7cbc191
Merge branch 'development' into release
karthikscale3 Apr 2, 2024
a5d6ca1
flicker issue (#26)
karthikscale3 Apr 2, 2024
6c097a5
Merge branch 'main' of github.com:Scale3-Labs/langtrace into release
karthikscale3 Apr 2, 2024
238d43c
Flicker issue (#27)
karthikscale3 Apr 2, 2024
7041a32
Merge branch 'development' into release
karthikscale3 Apr 2, 2024
d0d5b18
Fix (#30)
karthikscale3 Apr 2, 2024
7dd49d0
Merge branch 'main' of github.com:Scale3-Labs/langtrace into release
karthikscale3 Apr 2, 2024
c30d1bf
Merge branch 'development' into release
karthikscale3 Apr 2, 2024
b973f2b
Fix header (#32)
karthikscale3 Apr 3, 2024
81c9f8c
Merge branch 'main' of github.com:Scale3-Labs/langtrace into release
karthikscale3 Apr 3, 2024
aaec9b0
Merge branch 'development' into release
karthikscale3 Apr 3, 2024
b07bf93
updating gitignore
dylanzuber-scale3 Apr 3, 2024
4b1684a
Merge pull request #34 from Scale3-Labs/dylan/s3en-2066-get-local-dev…
dylanzuber-scale3 Apr 3, 2024
97b0341
Rohit/s3 en 2064 fix api key not showing (#29)
rohit-kadhe Apr 3, 2024
02358de
Merge branch 'main' of github.com:Scale3-Labs/langtrace into release
karthikscale3 Apr 3, 2024
3f21ae0
Merge branch 'development' into release
karthikscale3 Apr 3, 2024
7181e11
adjust readme
alizenhom Apr 3, 2024
451a196
Merge pull request #36 from Scale3-Labs/ali/readme
alizenhom Apr 3, 2024
b178105
Pagination bug
karthikscale3 Apr 4, 2024
6d124e2
Pagination bug (#37)
karthikscale3 Apr 4, 2024
af47e53
Merge branch 'development' of github.com:Scale3-Labs/langtrace into d…
karthikscale3 Apr 4, 2024
65eb483
Merge branch 'main' of github.com:Scale3-Labs/langtrace into release
karthikscale3 Apr 4, 2024
29c53c7
Merge branch 'development' into release
karthikscale3 Apr 4, 2024
96ffeeb
removing form reset on edit (#39)
dylanzuber-scale3 Apr 4, 2024
cc6ab77
Merge branch 'development' of github.com:Scale3-Labs/langtrace into d…
karthikscale3 Apr 4, 2024
b8b7d7d
Dylan/s3en 2079 thumbs up duplication bug (#40)
dylanzuber-scale3 Apr 4, 2024
677b1aa
Merge branch 'development' of github.com:Scale3-Labs/langtrace into d…
karthikscale3 Apr 4, 2024
642483d
Merge branch 'main' of github.com:Scale3-Labs/langtrace into release
karthikscale3 Apr 4, 2024
db451ad
Merge branch 'development' into release
karthikscale3 Apr 4, 2024
0a6dd57
Bug fixes for Traces Pagination (#42)
karthikscale3 Apr 4, 2024
f996899
Merge branch 'development' of github.com:Scale3-Labs/langtrace into d…
karthikscale3 Apr 4, 2024
fa9bac5
Merge branch 'development' into release
karthikscale3 Apr 4, 2024
0e963e2
Bug fix
karthikscale3 Apr 5, 2024
932def9
Fix invalid model (#43)
karthikscale3 Apr 5, 2024
f3a8a23
Merge branch 'development' of github.com:Scale3-Labs/langtrace into d…
karthikscale3 Apr 5, 2024
da27c8a
Merge branch 'development' into release
karthikscale3 Apr 5, 2024
e3273b7
fix merge conflicts
karthikscale3 Apr 5, 2024
6d04bc3
Bug fixes (#45)
karthikscale3 Apr 5, 2024
3c353a5
Merge branch 'development' of github.com:Scale3-Labs/langtrace into d…
karthikscale3 Apr 5, 2024
0b0545a
Merge branch 'main' of github.com:Scale3-Labs/langtrace into release
karthikscale3 Apr 5, 2024
7154a9b
Merge branch 'development' into release
karthikscale3 Apr 5, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Bug fix
  • Loading branch information
karthikscale3 committed Apr 5, 2024
commit 0e963e226af17ffdba6282496d1979c6e30c20ad
1 change: 0 additions & 1 deletion app/api/user/route.ts
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@ export async function PUT(req: NextRequest) {
}

if ("status" in data) {
console.log("updating status");
const user = await prisma.user.update({
where: {
id,
Expand Down
2 changes: 0 additions & 2 deletions components/project/traces.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,6 @@ export default function Traces({ email }: { email: string }) {
}

// Merge the new data with the existing data
console.log("currentData", currentData);
console.log("newData", newData);
if (currentData.length > 0) {
const updatedData = [...currentData, ...newData];

Expand Down
1 change: 1 addition & 0 deletions lib/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -326,6 +326,7 @@ export function calculatePriceFromUsage(
output_tokens: number;
}
): any {
if (!model) return { total: 0, input: 0, output: 0 };
if (vendor === "openai") {
const costTable = OPENAI_PRICING[model.includes("gpt-4") ? "gpt-4" : model];
if (costTable) {
Expand Down