* Get electron building something at all * Merge Frank test setup work (#3418) * Working window.electron.getPath * Loading project-specific settings in electron tests * Simplify test until we can get snapshots/traces working in electron tests * test tweaks --------- Co-authored-by: Frank Noirot <frank@kittycad.io> * add test #3375 and #3420 * put kcl files together * move files * can sort projects #3362 * File in the file pane should open with a single click #3385 * pressing delete on home screen should do nothing #3387 * add aria labels to icons * Rename and delete projects, also spam arrow keys when renaming #3364 #3365 #3259 * Fix up paths * Update flake.nix to support Electron * Remove a layer of indirection * Work without a web server * Fix settings#projectDir link on home * Fix login (requires new @kittycad/lib WHICH IS NOT INCLUDED HERE) * Lee: Tests are broken because auth skip needs to happen * get setting override envs passed through * tweak eletron CI * yml tweak * fmt * NUKE tauri shit post merge with main * another test auth tweak * Revert "another test auth tweak" This reverts commitb2254b10af. * try CI again * CI tweaks * SKIP_AUTH true now on playwright * Skipping auth when NODE_ENV=development now * fmt Signed-off-by: Jess Frazelle <github@jessfraz.com> * Use BASE_URL() * fix exists Signed-off-by: Jess Frazelle <github@jessfraz.com> * fix foldername for macos Signed-off-by: Jess Frazelle <github@jessfraz.com> * update for windows Signed-off-by: Jess Frazelle <github@jessfraz.com> * fix version in lower right Signed-off-by: Jess Frazelle <github@jessfraz.com> * cleanup unused imports Signed-off-by: Jess Frazelle <github@jessfraz.com> * progress on is playwright Signed-off-by: Jess Frazelle <github@jessfraz.com> * fix test folders Signed-off-by: Jess Frazelle <github@jessfraz.com> * fix fmt Signed-off-by: Jess Frazelle <github@jessfraz.com> * remove tauri from actions bullshit Signed-off-by: Jess Frazelle <github@jessfraz.com> * remove tauri dir Signed-off-by: Jess Frazelle <github@jessfraz.com> * fixups the coredump async shit Signed-off-by: Jess Frazelle <github@jessfraz.com> * updates Signed-off-by: Jess Frazelle <github@jessfraz.com> * node env dev Signed-off-by: Jess Frazelle <github@jessfraz.com> * fix cancellable Signed-off-by: Jess Frazelle <github@jessfraz.com> * cleanup unnessary things Signed-off-by: Jess Frazelle <github@jessfraz.com> * fix Signed-off-by: Jess Frazelle <github@jessfraz.com> * env vars Signed-off-by: Jess Frazelle <github@jessfraz.com> * Bring back fix for NOT using hardcoded main.kcl * env Signed-off-by: Jess Frazelle <github@jessfraz.com> * fmt Signed-off-by: Jess Frazelle <github@jessfraz.com> * updates Signed-off-by: Jess Frazelle <github@jessfraz.com> * Revert "updates" This reverts commit da5d9f1043eb94404e8b3f8044088e990e34a4ef. * updates Signed-off-by: Jess Frazelle <github@jessfraz.com> * remove tauri clippuy Signed-off-by: Jess Frazelle <github@jessfraz.com> * less retries for now, no debug Signed-off-by: Jess Frazelle <github@jessfraz.com> * updates Signed-off-by: Jess Frazelle <github@jessfraz.com> * tsconfig Signed-off-by: Jess Frazelle <github@jessfraz.com> * small tsc fix * update some tsc Signed-off-by: Jess Frazelle <github@jessfraz.com> * tsc env Signed-off-by: Jess Frazelle <github@jessfraz.com> * fix other tsc Signed-off-by: Jess Frazelle <github@jessfraz.com> * small change for routeLoaders * rm old screenshot Signed-off-by: Jess Frazelle <github@jessfraz.com> * fix auth Signed-off-by: Jess Frazelle <github@jessfraz.com> * fix last onew Signed-off-by: Jess Frazelle <github@jessfraz.com> * auth clean up * fix package.json Signed-off-by: Jess Frazelle <github@jessfraz.com> * fix Signed-off-by: Jess Frazelle <github@jessfraz.com> * dissmissed screen on tests * add waits between files being written * put back retried Signed-off-by: Jess Frazelle <github@jessfraz.com> * fix weird programMemory Map issue * put private back * Revert "put private back" This reverts commitd311b978ca. * Revert "fix weird programMemory Map issue" This reverts commit6c387bdf62. * remove serde-wasm-bindgen Signed-off-by: Jess Frazelle <github@jessfraz.com> * add env Signed-off-by: Jess Frazelle <github@jessfraz.com> * A snapshot a day keeps the bugs away! 📷🐛 (OS: ubuntu) * A snapshot a day keeps the bugs away! 📷🐛 (OS: ubuntu) * fix tests * more test tweaks * A snapshot a day keeps the bugs away! 📷🐛 (OS: ubuntu) * another tweak * A snapshot a day keeps the bugs away! 📷🐛 (OS: ubuntu) * more test tweaks * more tweaks * increase macos timeout * try fix macos * disable macos playwright tests --------- Signed-off-by: Jess Frazelle <github@jessfraz.com> Co-authored-by: Kurt Hutten <k.hutten@protonmail.ch> Co-authored-by: Frank Noirot <frank@kittycad.io> Co-authored-by: Adam Sunderland <iterion@gmail.com> Co-authored-by: Jess Frazelle <github@jessfraz.com> Co-authored-by: Jess Frazelle <jessfraz@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
258 lines
6.5 KiB
TypeScript
258 lines
6.5 KiB
TypeScript
import { Models } from '@kittycad/lib'
|
|
import {
|
|
ToastTextToCadError,
|
|
ToastTextToCadSuccess,
|
|
} from 'components/ToastTextToCad'
|
|
import { VITE_KC_API_BASE_URL } from 'env'
|
|
import toast from 'react-hot-toast'
|
|
import { FILE_EXT } from './constants'
|
|
import { ContextFrom, EventData, EventFrom } from 'xstate'
|
|
import { fileMachine } from 'machines/fileMachine'
|
|
import { NavigateFunction } from 'react-router-dom'
|
|
import crossPlatformFetch from './crossPlatformFetch'
|
|
import { isDesktop } from 'lib/isDesktop'
|
|
import { Themes } from './theme'
|
|
import { commandBarMachine } from 'machines/commandBarMachine'
|
|
import { getNextFileName } from './desktopFS'
|
|
|
|
export async function submitTextToCadPrompt(
|
|
prompt: string,
|
|
token?: string
|
|
): Promise<Models['TextToCad_type'] | Error> {
|
|
const body: Models['TextToCadCreateBody_type'] = { prompt }
|
|
// Glb has a smaller footprint than gltf, should we want to render it.
|
|
const url = VITE_KC_API_BASE_URL + '/ai/text-to-cad/glb?kcl=true'
|
|
const data: Models['TextToCad_type'] | Error = await crossPlatformFetch(
|
|
url,
|
|
{
|
|
method: 'POST',
|
|
body: JSON.stringify(body),
|
|
},
|
|
token
|
|
)
|
|
|
|
// Make sure we have an id.
|
|
if (data instanceof Error) {
|
|
return data
|
|
}
|
|
|
|
if (!data.id) {
|
|
return new Error('No id returned from Text-to-CAD API')
|
|
}
|
|
|
|
return data
|
|
}
|
|
|
|
export async function getTextToCadResult(
|
|
id: string,
|
|
token?: string
|
|
): Promise<Models['TextToCad_type'] | Error> {
|
|
const url = VITE_KC_API_BASE_URL + '/user/text-to-cad/' + id
|
|
const data: Models['TextToCad_type'] | Error = await crossPlatformFetch(
|
|
url,
|
|
{
|
|
method: 'GET',
|
|
},
|
|
token
|
|
)
|
|
|
|
return data
|
|
}
|
|
|
|
interface TextToKclProps {
|
|
trimmedPrompt: string
|
|
fileMachineSend: (
|
|
type: EventFrom<typeof fileMachine>,
|
|
data?: EventData
|
|
) => unknown
|
|
navigate: NavigateFunction
|
|
commandBarSend: (
|
|
type: EventFrom<typeof commandBarMachine>,
|
|
data?: EventData
|
|
) => unknown
|
|
context: ContextFrom<typeof fileMachine>
|
|
token?: string
|
|
settings: {
|
|
theme: Themes
|
|
highlightEdges: boolean
|
|
}
|
|
}
|
|
|
|
export async function submitAndAwaitTextToKcl({
|
|
trimmedPrompt,
|
|
fileMachineSend,
|
|
navigate,
|
|
commandBarSend,
|
|
context,
|
|
token,
|
|
settings,
|
|
}: TextToKclProps) {
|
|
const toastId = toast.loading('Submitting to Text-to-CAD API...')
|
|
const showFailureToast = (message: string) => {
|
|
toast.error(
|
|
() =>
|
|
ToastTextToCadError({
|
|
toastId,
|
|
message,
|
|
commandBarSend,
|
|
prompt: trimmedPrompt,
|
|
}),
|
|
{
|
|
id: toastId,
|
|
duration: Infinity,
|
|
}
|
|
)
|
|
}
|
|
|
|
const textToCadQueued = await submitTextToCadPrompt(trimmedPrompt, token)
|
|
.then((value) => {
|
|
if (value instanceof Error) {
|
|
return Promise.reject(value)
|
|
}
|
|
return value
|
|
})
|
|
.catch((error) => {
|
|
showFailureToast('Failed to submit to Text-to-CAD API')
|
|
return error
|
|
})
|
|
|
|
if (textToCadQueued instanceof Error) {
|
|
showFailureToast('Failed to submit to Text-to-CAD API')
|
|
return
|
|
}
|
|
|
|
toast.loading('Generating parametric model...', {
|
|
id: toastId,
|
|
})
|
|
|
|
// Check the status of the text-to-cad API job
|
|
// until it is completed
|
|
const textToCadComplete = new Promise<Models['TextToCad_type']>(
|
|
async (resolve, reject) => {
|
|
const value = await textToCadQueued
|
|
if (value instanceof Error) {
|
|
reject(value)
|
|
}
|
|
|
|
const MAX_CHECK_TIMEOUT = 3 * 60_000
|
|
const CHECK_INTERVAL = 3000
|
|
|
|
let timeElapsed = 0
|
|
const interval = setInterval(async () => {
|
|
timeElapsed += CHECK_INTERVAL
|
|
if (timeElapsed >= MAX_CHECK_TIMEOUT) {
|
|
clearInterval(interval)
|
|
reject(new Error('Text-to-CAD API timed out'))
|
|
}
|
|
|
|
const check = await getTextToCadResult(value.id, token)
|
|
if (check instanceof Error) {
|
|
clearInterval(interval)
|
|
reject(check)
|
|
}
|
|
|
|
if (check instanceof Error || check.status === 'failed') {
|
|
clearInterval(interval)
|
|
reject(check)
|
|
} else if (check.status === 'completed') {
|
|
clearInterval(interval)
|
|
resolve(check)
|
|
}
|
|
}, CHECK_INTERVAL)
|
|
}
|
|
)
|
|
|
|
const textToCadOutputCreated = await textToCadComplete
|
|
.catch((e) => {
|
|
showFailureToast('Failed to generate parametric model')
|
|
return e
|
|
})
|
|
.then(async (value) => {
|
|
if (value.code === undefined || !value.code || value.code.length === 0) {
|
|
// We want to show the real error message to the user.
|
|
if (value.error && value.error.length > 0) {
|
|
const error = value.error.replace('Text-to-CAD server:', '').trim()
|
|
showFailureToast(error)
|
|
return Promise.reject(new Error(error))
|
|
} else {
|
|
showFailureToast('No KCL code returned')
|
|
return Promise.reject(new Error('No KCL code returned'))
|
|
}
|
|
}
|
|
|
|
const TRUNCATED_PROMPT_LENGTH = 24
|
|
let newFileName = `${value.prompt
|
|
.slice(0, TRUNCATED_PROMPT_LENGTH)
|
|
.replace(/\s/gi, '-')
|
|
.replace(/\W/gi, '-')
|
|
.toLowerCase()}${FILE_EXT}`
|
|
|
|
if (isDesktop()) {
|
|
// We have to pre-emptively run our unique file name logic,
|
|
// so that we can pass the unique file name to the toast,
|
|
// and by extension the file-deletion-on-reject logic.
|
|
newFileName = getNextFileName({
|
|
entryName: newFileName,
|
|
baseDir: context.selectedDirectory.path,
|
|
}).name
|
|
|
|
fileMachineSend({
|
|
type: 'Create file',
|
|
data: {
|
|
name: newFileName,
|
|
makeDir: false,
|
|
content: value.code,
|
|
silent: true,
|
|
},
|
|
})
|
|
}
|
|
|
|
return {
|
|
...value,
|
|
fileName: newFileName,
|
|
}
|
|
})
|
|
|
|
if (textToCadOutputCreated instanceof Error) {
|
|
showFailureToast('Failed to generate parametric model')
|
|
return
|
|
}
|
|
|
|
// Show a custom toast with the .glb model preview
|
|
// and options to reject or accept the model
|
|
toast.success(
|
|
() =>
|
|
ToastTextToCadSuccess({
|
|
toastId,
|
|
data: textToCadOutputCreated,
|
|
token,
|
|
navigate,
|
|
context,
|
|
fileMachineSend,
|
|
settings,
|
|
}),
|
|
{
|
|
id: toastId,
|
|
duration: Infinity,
|
|
icon: null,
|
|
}
|
|
)
|
|
return textToCadOutputCreated
|
|
}
|
|
|
|
export async function sendTelemetry(
|
|
id: string,
|
|
feedback: Models['AiFeedback_type'],
|
|
token?: string
|
|
): Promise<void> {
|
|
const url =
|
|
VITE_KC_API_BASE_URL + '/user/text-to-cad/' + id + '?feedback=' + feedback
|
|
await crossPlatformFetch(
|
|
url,
|
|
{
|
|
method: 'POST',
|
|
},
|
|
token
|
|
)
|
|
}
|