Use shorter experiment IDs
Because https://app.openpipe.ai/experiments/B1EtN6oHeXMele2 is a cooler URL than https://app.openpipe.ai/experiments/3692942c-6f1b-4bef-83b1-c11f00a3fbdd
This commit is contained in:
2
app/@types/nextjs-routes.d.ts
vendored
2
app/@types/nextjs-routes.d.ts
vendored
@@ -21,7 +21,7 @@ declare module "nextjs-routes" {
|
|||||||
| StaticRoute<"/dashboard">
|
| StaticRoute<"/dashboard">
|
||||||
| DynamicRoute<"/data/[id]", { "id": string }>
|
| DynamicRoute<"/data/[id]", { "id": string }>
|
||||||
| StaticRoute<"/data">
|
| StaticRoute<"/data">
|
||||||
| DynamicRoute<"/experiments/[id]", { "id": string }>
|
| DynamicRoute<"/experiments/[experimentSlug]", { "experimentSlug": string }>
|
||||||
| StaticRoute<"/experiments">
|
| StaticRoute<"/experiments">
|
||||||
| StaticRoute<"/">
|
| StaticRoute<"/">
|
||||||
| DynamicRoute<"/invitations/[invitationToken]", { "invitationToken": string }>
|
| DynamicRoute<"/invitations/[invitationToken]", { "invitationToken": string }>
|
||||||
|
|||||||
@@ -0,0 +1,88 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2023 Viascom Ltd liab. Co
|
||||||
|
*
|
||||||
|
* Licensed to the Apache Software Foundation (ASF) under one
|
||||||
|
* or more contributor license agreements. See the NOTICE file
|
||||||
|
* distributed with this work for additional information
|
||||||
|
* regarding copyright ownership. The ASF licenses this file
|
||||||
|
* to you under the Apache License, Version 2.0 (the
|
||||||
|
* "License"); you may not use this file except in compliance
|
||||||
|
* with the License. You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing,
|
||||||
|
* software distributed under the License is distributed on an
|
||||||
|
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||||
|
* KIND, either express or implied. See the License for the
|
||||||
|
* specific language governing permissions and limitations
|
||||||
|
* under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
CREATE EXTENSION IF NOT EXISTS pgcrypto;
|
||||||
|
|
||||||
|
CREATE OR REPLACE FUNCTION nanoid(
|
||||||
|
size int DEFAULT 21,
|
||||||
|
alphabet text DEFAULT '_-0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
|
||||||
|
)
|
||||||
|
RETURNS text
|
||||||
|
LANGUAGE plpgsql
|
||||||
|
volatile
|
||||||
|
AS
|
||||||
|
$$
|
||||||
|
DECLARE
|
||||||
|
idBuilder text := '';
|
||||||
|
counter int := 0;
|
||||||
|
bytes bytea;
|
||||||
|
alphabetIndex int;
|
||||||
|
alphabetArray text[];
|
||||||
|
alphabetLength int;
|
||||||
|
mask int;
|
||||||
|
step int;
|
||||||
|
BEGIN
|
||||||
|
alphabetArray := regexp_split_to_array(alphabet, '');
|
||||||
|
alphabetLength := array_length(alphabetArray, 1);
|
||||||
|
mask := (2 << cast(floor(log(alphabetLength - 1) / log(2)) as int)) - 1;
|
||||||
|
step := cast(ceil(1.6 * mask * size / alphabetLength) AS int);
|
||||||
|
|
||||||
|
while true
|
||||||
|
loop
|
||||||
|
bytes := gen_random_bytes(step);
|
||||||
|
while counter < step
|
||||||
|
loop
|
||||||
|
alphabetIndex := (get_byte(bytes, counter) & mask) + 1;
|
||||||
|
if alphabetIndex <= alphabetLength then
|
||||||
|
idBuilder := idBuilder || alphabetArray[alphabetIndex];
|
||||||
|
if length(idBuilder) = size then
|
||||||
|
return idBuilder;
|
||||||
|
end if;
|
||||||
|
end if;
|
||||||
|
counter := counter + 1;
|
||||||
|
end loop;
|
||||||
|
|
||||||
|
counter := 0;
|
||||||
|
end loop;
|
||||||
|
END
|
||||||
|
$$;
|
||||||
|
|
||||||
|
|
||||||
|
-- Make a short_nanoid function that uses the default alphabet and length of 15
|
||||||
|
CREATE OR REPLACE FUNCTION short_nanoid()
|
||||||
|
RETURNS text
|
||||||
|
LANGUAGE plpgsql
|
||||||
|
volatile
|
||||||
|
AS
|
||||||
|
$$
|
||||||
|
BEGIN
|
||||||
|
RETURN nanoid(15, '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ');
|
||||||
|
END
|
||||||
|
$$;
|
||||||
|
|
||||||
|
-- AlterTable
|
||||||
|
ALTER TABLE "Experiment" ADD COLUMN "slug" TEXT NOT NULL DEFAULT short_nanoid();
|
||||||
|
|
||||||
|
-- For existing experiments, keep the existing id as the slug for backwards compatibility
|
||||||
|
UPDATE "Experiment" SET "slug" = "id";
|
||||||
|
|
||||||
|
-- CreateIndex
|
||||||
|
CREATE UNIQUE INDEX "Experiment_slug_key" ON "Experiment"("slug");
|
||||||
@@ -11,7 +11,9 @@ datasource db {
|
|||||||
}
|
}
|
||||||
|
|
||||||
model Experiment {
|
model Experiment {
|
||||||
id String @id @default(uuid()) @db.Uuid
|
id String @id @default(uuid()) @db.Uuid
|
||||||
|
|
||||||
|
slug String @unique @default(dbgenerated("short_nanoid()"))
|
||||||
label String
|
label String
|
||||||
|
|
||||||
sortIndex Int @default(0)
|
sortIndex Int @default(0)
|
||||||
@@ -207,14 +209,14 @@ model Project {
|
|||||||
personalProjectUserId String? @unique @db.Uuid
|
personalProjectUserId String? @unique @db.Uuid
|
||||||
personalProjectUser User? @relation(fields: [personalProjectUserId], references: [id], onDelete: Cascade)
|
personalProjectUser User? @relation(fields: [personalProjectUserId], references: [id], onDelete: Cascade)
|
||||||
|
|
||||||
createdAt DateTime @default(now())
|
createdAt DateTime @default(now())
|
||||||
updatedAt DateTime @updatedAt
|
updatedAt DateTime @updatedAt
|
||||||
projectUsers ProjectUser[]
|
projectUsers ProjectUser[]
|
||||||
projectUserInvitations UserInvitation[]
|
projectUserInvitations UserInvitation[]
|
||||||
experiments Experiment[]
|
experiments Experiment[]
|
||||||
datasets Dataset[]
|
datasets Dataset[]
|
||||||
loggedCalls LoggedCall[]
|
loggedCalls LoggedCall[]
|
||||||
apiKeys ApiKey[]
|
apiKeys ApiKey[]
|
||||||
}
|
}
|
||||||
|
|
||||||
enum ProjectUserRole {
|
enum ProjectUserRole {
|
||||||
@@ -324,10 +326,10 @@ model LoggedCallModelResponse {
|
|||||||
}
|
}
|
||||||
|
|
||||||
model LoggedCallTag {
|
model LoggedCallTag {
|
||||||
id String @id @default(uuid()) @db.Uuid
|
id String @id @default(uuid()) @db.Uuid
|
||||||
name String
|
name String
|
||||||
value String?
|
value String?
|
||||||
projectId String @db.Uuid
|
projectId String @db.Uuid
|
||||||
|
|
||||||
loggedCallId String @db.Uuid
|
loggedCallId String @db.Uuid
|
||||||
loggedCall LoggedCall @relation(fields: [loggedCallId], references: [id], onDelete: Cascade)
|
loggedCall LoggedCall @relation(fields: [loggedCallId], references: [id], onDelete: Cascade)
|
||||||
@@ -391,12 +393,12 @@ model User {
|
|||||||
|
|
||||||
role UserRole @default(USER)
|
role UserRole @default(USER)
|
||||||
|
|
||||||
accounts Account[]
|
accounts Account[]
|
||||||
sessions Session[]
|
sessions Session[]
|
||||||
projectUsers ProjectUser[]
|
projectUsers ProjectUser[]
|
||||||
projects Project[]
|
projects Project[]
|
||||||
worldChampEntrant WorldChampEntrant?
|
worldChampEntrant WorldChampEntrant?
|
||||||
sentUserInvitations UserInvitation[]
|
sentUserInvitations UserInvitation[]
|
||||||
|
|
||||||
createdAt DateTime @default(now())
|
createdAt DateTime @default(now())
|
||||||
updatedAt DateTime @default(now()) @updatedAt
|
updatedAt DateTime @default(now()) @updatedAt
|
||||||
@@ -405,17 +407,17 @@ model User {
|
|||||||
model UserInvitation {
|
model UserInvitation {
|
||||||
id String @id @default(uuid()) @db.Uuid
|
id String @id @default(uuid()) @db.Uuid
|
||||||
|
|
||||||
projectId String @db.Uuid
|
projectId String @db.Uuid
|
||||||
project Project @relation(fields: [projectId], references: [id], onDelete: Cascade)
|
project Project @relation(fields: [projectId], references: [id], onDelete: Cascade)
|
||||||
email String
|
email String
|
||||||
role ProjectUserRole
|
role ProjectUserRole
|
||||||
invitationToken String @unique
|
invitationToken String @unique
|
||||||
senderId String @db.Uuid
|
senderId String @db.Uuid
|
||||||
sender User @relation(fields: [senderId], references: [id], onDelete: Cascade)
|
sender User @relation(fields: [senderId], references: [id], onDelete: Cascade)
|
||||||
|
createdAt DateTime @default(now())
|
||||||
|
updatedAt DateTime @updatedAt
|
||||||
|
|
||||||
@@unique([projectId, email])
|
@@unique([projectId, email])
|
||||||
createdAt DateTime @default(now())
|
|
||||||
updatedAt DateTime @updatedAt
|
|
||||||
}
|
}
|
||||||
|
|
||||||
model VerificationToken {
|
model VerificationToken {
|
||||||
|
|||||||
@@ -14,21 +14,11 @@ import { formatTimePast } from "~/utils/dayjs";
|
|||||||
import Link from "next/link";
|
import Link from "next/link";
|
||||||
import { useRouter } from "next/router";
|
import { useRouter } from "next/router";
|
||||||
import { BsPlusSquare } from "react-icons/bs";
|
import { BsPlusSquare } from "react-icons/bs";
|
||||||
import { api } from "~/utils/api";
|
import { RouterOutputs, api } from "~/utils/api";
|
||||||
import { useHandledAsyncCallback } from "~/utils/hooks";
|
import { useHandledAsyncCallback } from "~/utils/hooks";
|
||||||
import { useAppStore } from "~/state/store";
|
import { useAppStore } from "~/state/store";
|
||||||
|
|
||||||
type ExperimentData = {
|
export const ExperimentCard = ({ exp }: { exp: RouterOutputs["experiments"]["list"][0] }) => {
|
||||||
testScenarioCount: number;
|
|
||||||
promptVariantCount: number;
|
|
||||||
id: string;
|
|
||||||
label: string;
|
|
||||||
sortIndex: number;
|
|
||||||
createdAt: Date;
|
|
||||||
updatedAt: Date;
|
|
||||||
};
|
|
||||||
|
|
||||||
export const ExperimentCard = ({ exp }: { exp: ExperimentData }) => {
|
|
||||||
return (
|
return (
|
||||||
<Card
|
<Card
|
||||||
w="full"
|
w="full"
|
||||||
@@ -45,7 +35,7 @@ export const ExperimentCard = ({ exp }: { exp: ExperimentData }) => {
|
|||||||
as={Link}
|
as={Link}
|
||||||
w="full"
|
w="full"
|
||||||
h="full"
|
h="full"
|
||||||
href={{ pathname: "/experiments/[id]", query: { id: exp.id } }}
|
href={{ pathname: "/experiments/[experimentSlug]", query: { experimentSlug: exp.slug } }}
|
||||||
justify="space-between"
|
justify="space-between"
|
||||||
>
|
>
|
||||||
<HStack w="full" color="gray.700" justify="center">
|
<HStack w="full" color="gray.700" justify="center">
|
||||||
@@ -89,8 +79,8 @@ export const NewExperimentCard = () => {
|
|||||||
projectId: selectedProjectId ?? "",
|
projectId: selectedProjectId ?? "",
|
||||||
});
|
});
|
||||||
await router.push({
|
await router.push({
|
||||||
pathname: "/experiments/[id]",
|
pathname: "/experiments/[experimentSlug]",
|
||||||
query: { id: newExperiment.id },
|
query: { experimentSlug: newExperiment.slug },
|
||||||
});
|
});
|
||||||
}, [createMutation, router, selectedProjectId]);
|
}, [createMutation, router, selectedProjectId]);
|
||||||
|
|
||||||
|
|||||||
@@ -16,11 +16,14 @@ export const useOnForkButtonPressed = () => {
|
|||||||
|
|
||||||
const [onFork, isForking] = useHandledAsyncCallback(async () => {
|
const [onFork, isForking] = useHandledAsyncCallback(async () => {
|
||||||
if (!experiment.data?.id || !selectedProjectId) return;
|
if (!experiment.data?.id || !selectedProjectId) return;
|
||||||
const forkedExperimentId = await forkMutation.mutateAsync({
|
const newExperiment = await forkMutation.mutateAsync({
|
||||||
id: experiment.data.id,
|
id: experiment.data.id,
|
||||||
projectId: selectedProjectId,
|
projectId: selectedProjectId,
|
||||||
});
|
});
|
||||||
await router.push({ pathname: "/experiments/[id]", query: { id: forkedExperimentId } });
|
await router.push({
|
||||||
|
pathname: "/experiments/[experimentSlug]",
|
||||||
|
query: { experimentSlug: newExperiment.slug },
|
||||||
|
});
|
||||||
}, [forkMutation, experiment.data?.id, router]);
|
}, [forkMutation, experiment.data?.id, router]);
|
||||||
|
|
||||||
const onForkButtonPressed = useCallback(() => {
|
const onForkButtonPressed = useCallback(() => {
|
||||||
|
|||||||
@@ -33,9 +33,9 @@ export default function Experiment() {
|
|||||||
|
|
||||||
const experiment = useExperiment();
|
const experiment = useExperiment();
|
||||||
const experimentStats = api.experiments.stats.useQuery(
|
const experimentStats = api.experiments.stats.useQuery(
|
||||||
{ id: router.query.id as string },
|
{ id: experiment.data?.id as string },
|
||||||
{
|
{
|
||||||
enabled: !!router.query.id,
|
enabled: !!experiment.data?.id,
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
const stats = experimentStats.data;
|
const stats = experimentStats.data;
|
||||||
@@ -125,7 +125,7 @@ export default function Experiment() {
|
|||||||
</PageHeaderContainer>
|
</PageHeaderContainer>
|
||||||
<ExperimentSettingsDrawer />
|
<ExperimentSettingsDrawer />
|
||||||
<Box w="100%" overflowX="auto" flex={1}>
|
<Box w="100%" overflowX="auto" flex={1}>
|
||||||
<OutputsTable experimentId={router.query.id as string | undefined} />
|
<OutputsTable experimentId={experiment.data?.id} />
|
||||||
</Box>
|
</Box>
|
||||||
</VStack>
|
</VStack>
|
||||||
</AppShell>
|
</AppShell>
|
||||||
@@ -85,15 +85,16 @@ export const experimentsRouter = createTRPCRouter({
|
|||||||
return experimentsWithCounts;
|
return experimentsWithCounts;
|
||||||
}),
|
}),
|
||||||
|
|
||||||
get: publicProcedure.input(z.object({ id: z.string() })).query(async ({ input, ctx }) => {
|
get: publicProcedure.input(z.object({ slug: z.string() })).query(async ({ input, ctx }) => {
|
||||||
await requireCanViewExperiment(input.id, ctx);
|
|
||||||
const experiment = await prisma.experiment.findFirstOrThrow({
|
const experiment = await prisma.experiment.findFirstOrThrow({
|
||||||
where: { id: input.id },
|
where: { slug: input.slug },
|
||||||
include: {
|
include: {
|
||||||
project: true,
|
project: true,
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
|
await requireCanViewExperiment(experiment.id, ctx);
|
||||||
|
|
||||||
const canModify = ctx.session?.user.id
|
const canModify = ctx.session?.user.id
|
||||||
? await canModifyExperiment(experiment.id, ctx.session?.user.id)
|
? await canModifyExperiment(experiment.id, ctx.session?.user.id)
|
||||||
: false;
|
: false;
|
||||||
@@ -290,7 +291,10 @@ export const experimentsRouter = createTRPCRouter({
|
|||||||
}),
|
}),
|
||||||
]);
|
]);
|
||||||
|
|
||||||
return newExperimentId;
|
const newExperiment = await prisma.experiment.findUniqueOrThrow({
|
||||||
|
where: { id: newExperimentId },
|
||||||
|
});
|
||||||
|
return newExperiment;
|
||||||
}),
|
}),
|
||||||
|
|
||||||
create: protectedProcedure
|
create: protectedProcedure
|
||||||
|
|||||||
@@ -15,8 +15,8 @@ export const useExperiments = () => {
|
|||||||
export const useExperiment = () => {
|
export const useExperiment = () => {
|
||||||
const router = useRouter();
|
const router = useRouter();
|
||||||
const experiment = api.experiments.get.useQuery(
|
const experiment = api.experiments.get.useQuery(
|
||||||
{ id: router.query.id as string },
|
{ slug: router.query.experimentSlug as string },
|
||||||
{ enabled: !!router.query.id },
|
{ enabled: !!router.query.experimentSlug },
|
||||||
);
|
);
|
||||||
|
|
||||||
return experiment;
|
return experiment;
|
||||||
|
|||||||
2
pnpm-lock.yaml
generated
2
pnpm-lock.yaml
generated
@@ -6259,7 +6259,7 @@ packages:
|
|||||||
resolution: {integrity: sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==}
|
resolution: {integrity: sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==}
|
||||||
engines: {node: '>= 10.13.0'}
|
engines: {node: '>= 10.13.0'}
|
||||||
dependencies:
|
dependencies:
|
||||||
'@types/node': 20.4.10
|
'@types/node': 18.16.0
|
||||||
merge-stream: 2.0.0
|
merge-stream: 2.0.0
|
||||||
supports-color: 8.1.1
|
supports-color: 8.1.1
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user