Open source website builder and Webflow alternative. Webstudio is an advanced visual builder that connects to any headless CMS, supports all CSS properties, and can be hosted anywhere, including with us.
TypeScript accessibilityalternativecloudflarecloudflare-workersdesignfreefrontendopen-sourceradix-uireactremixweb-developmentwebflowwebsite-builderwebsite-developmentwebsiteswebstudio
fix: AI fixes and improvements (#2451)
Giuseppeec15ed4cd9b8
diff --git a/apps/builder/app/builder/features/ai/ai-command-bar.tsx b/apps/builder/app/builder/features/ai/ai-command-bar.tsxindex c8d4364fbb..5c5e75ac0d 100644--- a/apps/builder/app/builder/features/ai/ai-command-bar.tsx+++ b/apps/builder/app/builder/features/ai/ai-command-bar.tsx@@ -49,6 +49,7 @@ export const AiCommandBar = () => {const [open, setOpen] = useState(false);const [isAudioTranscribing, setIsAudioTranscribing] = useState(false);const [isAiRequesting, setIsAiRequesting] = useState(false);+ const abortController = useRef<AbortController>();const isAiCommandBarVisible = useStore($isAiCommandBarVisible);const recordButtonRef = useRef<HTMLButtonElement>(null);const guardIdRef = useRef(0);@@ -101,17 +102,23 @@ export const AiCommandBar = () => {});const handleAiRequest = async (prompt: string) => {+ abortController.current = new AbortController();setIsAiRequesting(true);guardIdRef.current++;const guardId = guardIdRef.current;// Skip Abort Logic for nowtry {- await fetchResult(prompt, new AbortController().signal);+ const errors = await fetchResult(prompt, abortController.current.signal);+if (guardId !== guardIdRef.current) {return;}+ if (errors.length > 0) {+ toast(errors.join("\n"));+ }+setPrompts((previousPrompts) => [...previousPrompts, prompt]);setValue("");@@ -120,10 +127,11 @@ export const AiCommandBar = () => {console.error(error);if (error instanceof Error) {toast(error.message);- return;+ } else {+ toast("Something went wrong");}- toast("Something went wrong");}+ abortController.current = undefined;setIsAiRequesting(false);};@@ -194,7 +202,7 @@ export const AiCommandBar = () => {// Cancel AI requestguardIdRef.current++;setIsAiRequesting(false);- alert("Not fully implemented, should abort changes");+ abortController.current?.abort();},};recordButtonIcon = <LargeXIcon />;diff --git a/apps/builder/app/builder/features/ai/ai-fetch-result.ts b/apps/builder/app/builder/features/ai/ai-fetch-result.tsindex 8a3473ba6e..fd1a9769dc 100644--- a/apps/builder/app/builder/features/ai/ai-fetch-result.ts+++ b/apps/builder/app/builder/features/ai/ai-fetch-result.ts@@ -1,9 +1,7 @@-// import { restAi } from "~/shared/router-utils";-import { z } from "zod";import {copywriter,- type operations,+ operations,handleAiRequest,commandDetect,} from "@webstudio-is/ai";@@ -39,14 +37,14 @@ import { traverseTemplate } from "@webstudio-is/jsx-utils";export const fetchResult = async (prompt: string,abortSignal: AbortSignal-): Promise<void> => {+): Promise<string[]> => {const project = projectStore.get();const selectedInstanceSelector = selectedInstanceSelectorStore.get();const availableComponentsNames = $availableComponentsNames.get();- const jsx = $jsx.get();+ const [styles, jsx] = $jsx.get() || [];const requestParams = {- jsx: jsx ? JSON.stringify(jsx) : "",+ jsx: `${styles}${jsx}`,components: availableComponentsNames,projectId: project?.id,instanceId: selectedInstanceSelector?.[0] ?? "",@@ -57,7 +55,7 @@ export const fetchResult = async (RequestParamsSchema.omit({ command: true }).safeParse(requestParams).success === false) {- throw new Error("Invalid prompt data");+ return ["Invalid prompt data"];}const commandsResponse = await handleAiRequest<commandDetect.Response>(@@ -77,15 +75,14 @@ export const fetchResult = async (// therefore this should never be the case.// The check is here just for type safety.if (commandsResponse.type === "stream") {- // eslint-disable-next-line no-console- throw new Error("Something went wrong.");+ return ["Something went wrong."];}if (abortSignal.aborted === false) {- throw new Error(commandsResponse.data.message);+ return [commandsResponse.data.message];}- throw new Error("Unknown error");+ return ["Something went wrong."];}const promises = await Promise.allSettled(@@ -93,7 +90,10 @@ export const fetchResult = async (handleAiRequest<operations.Response>(fetch(restAi(), {method: "POST",- body: JSON.stringify({ ...requestParams, command }),+ body: JSON.stringify({+ ...requestParams,+ command,+ }),signal: abortSignal,}),{@@ -151,9 +151,7 @@ export const fetchResult = async (}}- if (errors.length > 0) {- throw new Error(errors.join("\n"));- }+ return errors;};const $availableComponentsNames = computed(@@ -259,9 +257,13 @@ const $jsx = computed(});}- return `<style>{\`${engine.cssText.replace(/\n/gm, " ")}\`}</style>${jsx- .replace(new RegExp(`${componentAttribute}="[^"]+"`, "g"), "")- .replace(/\n(data-)/g, " $1")}`;+ const css = engine.cssText.replace(/\n/gm, " ");+ return [+ css.length > 0 ? `<style>{\`${css}\`}</style>` : "",+ jsx+ .replace(new RegExp(`${componentAttribute}="[^"]+"`, "g"), "")+ .replace(/\n(data-)/g, " $1"),+ ];});diff --git a/apps/builder/app/builder/features/ai/ai-fetch-transcription.ts b/apps/builder/app/builder/features/ai/ai-fetch-transcription.tsindex 7a81f32b7c..b514adb612 100644--- a/apps/builder/app/builder/features/ai/ai-fetch-transcription.ts+++ b/apps/builder/app/builder/features/ai/ai-fetch-transcription.ts@@ -4,7 +4,7 @@ export const fetchTranscription = async (file: File) => {const formData = new FormData();formData.append("file", file);- const response = await fetch(`${restAi()}/audio/transcriptions`, {+ const response = await fetch(restAi("audio/transcriptions"), {method: "POST",body: formData,});diff --git a/apps/builder/app/routes/rest.ai.detect.ts b/apps/builder/app/routes/rest.ai.detect.tsindex c7c58ea9c4..f93342e31a 100644--- a/apps/builder/app/routes/rest.ai.detect.ts+++ b/apps/builder/app/routes/rest.ai.detect.ts@@ -102,7 +102,8 @@ export const action = async ({ request }: ActionArgs) => {context: {prompt,commands: {- [copywriter.name]: "writes, rewrites, rephrases or translates text",+ [copywriter.name]:+ "writes, rewrites, rephrases, shortens, increases length or translates text",[operations.editStyles.name]: "edits styles",[operations.generateTemplatePrompt.name]:"handles a user interface generation request",diff --git a/apps/builder/app/routes/rest.ai.ts b/apps/builder/app/routes/rest.ai.tsindex e5f06dc100..6797be20c5 100644--- a/apps/builder/app/routes/rest.ai.ts+++ b/apps/builder/app/routes/rest.ai.ts@@ -36,7 +36,7 @@ export const RequestParamsSchema = z.object({});// Override Vercel's default serverless functions timeout.-export const maxDuration = 120; // seconds+export const maxDuration = 180; // secondsexport const action = async ({ request }: ActionArgs) => {if (isFeatureEnabled("ai") === false) {diff --git a/apps/builder/app/shared/router-utils/path-utils.ts b/apps/builder/app/shared/router-utils/path-utils.tsindex ecd2e48215..4576b28463 100644--- a/apps/builder/app/shared/router-utils/path-utils.ts+++ b/apps/builder/app/shared/router-utils/path-utils.ts@@ -163,5 +163,5 @@ export const getPublishedUrl = (domain: string) => {return `${protocol}//${domain}.${host}`;};-export const restAi = (subEndpoint?: "detect" | "copy") =>+export const restAi = (subEndpoint?: "detect" | "audio/transcriptions") =>typeof subEndpoint === "string" ? `/rest/ai/${subEndpoint}` : "/rest/ai";diff --git a/packages/ai/src/models/gpt.ts b/packages/ai/src/models/gpt.tsindex c5b32198c7..8f90b2c627 100644--- a/packages/ai/src/models/gpt.ts+++ b/packages/ai/src/models/gpt.ts@@ -149,15 +149,31 @@ const errorToResponse = (id: string, error: unknown) => {id,...createErrorResponse({status,- error: getErrorType(error),+ error: getErrorType(error, status),message: "Something went wrong",debug,}),} as const;};-const getErrorType = (error: unknown) => {+const getErrorType = (error: unknown, status: number) => {if (error instanceof OpenAI.APIError) {- return `ai.${error.name}`;+ if (error.code && error.code in errorCodes) {+ return `ai.${errorCodes[error.code as keyof typeof errorCodes]}`;+ }+ if (status in errorHttpCodes) {+ return `ai.${errorHttpCodes[status as keyof typeof errorHttpCodes]}`;+ }}return `ai.unknownError`;};++const errorCodes = {+ context_length_exceeded: "contextLengthExceeded",+ rate_limit_exceeded: "rateLimitExceeded",+ insufficient_quota: "spendingQuotaLimitReached",+};++const errorHttpCodes = {+ 401: "invalidAuthOrApiKey",+ 503: "engineOverloaded",+};