[Feature]: Enable Text-to-CAD at the application level (#6501)
* chore: saving off skeleton * fix: saving skeleton * chore: skeleton for loading projects from project directory path * chore: cleaning up useless state transition to be an on event direct to action state * fix: new structure for web vs desktop vs react machine provider code * chore: saving off skeleton * fix: skeleton logic for react? going to move it from a string to obj.string * fix: trying to prevent error element unmount on global react components. This is bricking JS state * fix: we are so back * chore: implemented navigating to specfic KCL file * chore: implementing renaming project * chore: deleting project * fix: auto fixes * fix: old debug/testing file oops * chore: generic create new file * chore: skeleton for web create file provide * chore: basic machine vitest... need to figure out how to get window.electron implemented in vitest? * chore: save off progress before deleting other project implementation, a few missing features still * chore: trying a different init skeleton? most likely will migrate * chore: first attempt of purging projects context provider * chore: enabling toast for some machine state * chore: enabling more toast success and error * chore: writing read write state to the system io based on the project path * fix: tsc fixes * fix: use file system watcher, navigate to project after creation via the requestProjectName * chore: open project command, hooks vs snapshot context helpers * chore: implemented open and create project for e2e testing. They are hard coded in poor spot for now. * fix: codespell fixes * chore: implementing more project commands * chore: PR improvements for root.tsx * chore: leaving comment about new Router.tsx layout * fix: removing debugging code * fix: rewriting component for readability * fix: improving web initialization * chore: implementing import file from url which is not actually that? * fix: clearing search params on import file from url * fix: fixed two e2e tests, forgot needsReview when making new command * fix: fixing some import from url business logic to pass e2e tests * chore: script for diffing circular deps +/- * fix: formatting * fix: massive fix for circular depsga! * fix: trying to fix some errors and auto fmt * fix: updating deps * fix: removing debugging code * fix: big clean up * fix: more deletion * fix: tsc cleanup * fix: TSC TSC TSC TSC! * fix: typo fix * fix: clear query params on web only, desktop not required * fix: removing unused code * fmt * Bring back `trap` removed in merge * Use explicit types instead of `any`s on arg configs * Add project commands directly to command palette * fix: deleting debugging code, from PR review * fix: this got added back(?) * fix: using referred type * fix: more PR clean up * fix: big block comment for xstate architecture decision * fix: more pr comment fixes * fix: saving off logic, need a big cleanup because I hacked it together to get a POC * fix: extra business? * fix: merge conflict just added them back why dude * fix: more PR comments * fix: big ciruclar deps fix, commandBarActor in appActor * chore: writing e2e test, still need to fix 3 bugs * chore: adding more scenarios * fix: formatting * fix: fixing tsc errors * chore: deleting the old text to cad and using the new application level one, almost there * fix: prompt to edit works * fix: large push to get 1 text to cad command... the usage is a little buggy with delete and navigate within /file * fix: settings for highlight edges now works * chore: adding another e2e test * fix: cleaning up e2e tests and writing more of them * fix: tsc type * chore: more e2e improvements, unique project name in text to cad * chore: e2e tests should be good to go * fix: gotcha comment * fix: enabled web t2c, codespell fixes * fix: fixing merge conflcits?? * fix: t2c is back * Remove spaces in command bar test * fmt --------- Co-authored-by: Frank Noirot <frankjohnson1993@gmail.com> Co-authored-by: lee-at-zoo-corp <lee@zoo.dev>
This commit is contained in:
Kevin Nadro
GitHub
@ -2,8 +2,6 @@ import type { Models } from '@kittycad/lib'
|
||||
import { VITE_KC_API_BASE_URL } from '@src/env'
|
||||
import toast from 'react-hot-toast'
|
||||
import type { NavigateFunction } from 'react-router-dom'
|
||||
import type { ContextFrom, EventFrom } from 'xstate'
|
||||
|
||||
import {
|
||||
ToastTextToCadError,
|
||||
ToastTextToCadSuccess,
|
||||
@ -12,13 +10,12 @@ import { FILE_EXT } from '@src/lib/constants'
|
||||
import crossPlatformFetch from '@src/lib/crossPlatformFetch'
|
||||
import { getNextFileName } from '@src/lib/desktopFS'
|
||||
import { isDesktop } from '@src/lib/isDesktop'
|
||||
import { kclManager } from '@src/lib/singletons'
|
||||
import type { Themes } from '@src/lib/theme'
|
||||
import { kclManager, systemIOActor } from '@src/lib/singletons'
|
||||
import { SystemIOMachineEvents } from '@src/machines/systemIO/utils'
|
||||
import { reportRejection } from '@src/lib/trap'
|
||||
import { toSync } from '@src/lib/utils'
|
||||
import type { fileMachine } from '@src/machines/fileMachine'
|
||||
|
||||
async function submitTextToCadPrompt(
|
||||
export async function submitTextToCadPrompt(
|
||||
prompt: string,
|
||||
projectName: string,
|
||||
token?: string
|
||||
@ -52,7 +49,7 @@ async function submitTextToCadPrompt(
|
||||
return data
|
||||
}
|
||||
|
||||
async function getTextToCadResult(
|
||||
export async function getTextToCadResult(
|
||||
id: string,
|
||||
token?: string
|
||||
): Promise<Models['TextToCad_type'] | Error> {
|
||||
@ -68,29 +65,25 @@ async function getTextToCadResult(
|
||||
return data
|
||||
}
|
||||
|
||||
interface TextToKclProps {
|
||||
interface TextToKclPropsApplicationLevel {
|
||||
trimmedPrompt: string
|
||||
fileMachineSend: (
|
||||
type: EventFrom<typeof fileMachine>,
|
||||
data?: unknown
|
||||
) => unknown
|
||||
navigate: NavigateFunction
|
||||
context: ContextFrom<typeof fileMachine>
|
||||
token?: string
|
||||
settings: {
|
||||
theme: Themes
|
||||
projectName: string
|
||||
isProjectNew: boolean
|
||||
settings?: {
|
||||
highlightEdges: boolean
|
||||
}
|
||||
}
|
||||
|
||||
export async function submitAndAwaitTextToKcl({
|
||||
export async function submitAndAwaitTextToKclSystemIO({
|
||||
trimmedPrompt,
|
||||
fileMachineSend,
|
||||
navigate,
|
||||
context,
|
||||
token,
|
||||
projectName,
|
||||
navigate,
|
||||
isProjectNew,
|
||||
settings,
|
||||
}: TextToKclProps) {
|
||||
}: TextToKclPropsApplicationLevel) {
|
||||
const toastId = toast.loading('Submitting to Text-to-CAD API...')
|
||||
const showFailureToast = (message: string) => {
|
||||
toast.error(
|
||||
@ -99,6 +92,9 @@ export async function submitAndAwaitTextToKcl({
|
||||
toastId,
|
||||
message,
|
||||
prompt: trimmedPrompt,
|
||||
method: isProjectNew ? 'newProject' : 'existingProject',
|
||||
projectName: isProjectNew ? '' : projectName,
|
||||
newProjectName: isProjectNew ? projectName : '',
|
||||
}),
|
||||
{
|
||||
id: toastId,
|
||||
@ -109,7 +105,7 @@ export async function submitAndAwaitTextToKcl({
|
||||
|
||||
const textToCadQueued = await submitTextToCadPrompt(
|
||||
trimmedPrompt,
|
||||
context.project.name,
|
||||
projectName,
|
||||
token
|
||||
)
|
||||
.then((value) => {
|
||||
@ -174,12 +170,16 @@ export async function submitAndAwaitTextToKcl({
|
||||
}
|
||||
)
|
||||
|
||||
let newFileName = ''
|
||||
|
||||
const textToCadOutputCreated = await textToCadComplete
|
||||
.catch((e) => {
|
||||
showFailureToast('Failed to generate parametric model')
|
||||
return e
|
||||
})
|
||||
.then(async (value) => {
|
||||
console.log('completed')
|
||||
console.log(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) {
|
||||
@ -193,7 +193,7 @@ export async function submitAndAwaitTextToKcl({
|
||||
}
|
||||
|
||||
const TRUNCATED_PROMPT_LENGTH = 24
|
||||
let newFileName = `${value.prompt
|
||||
newFileName = `${value.prompt
|
||||
.slice(0, TRUNCATED_PROMPT_LENGTH)
|
||||
.replace(/\s/gi, '-')
|
||||
.replace(/\W/gi, '-')
|
||||
@ -205,16 +205,15 @@ export async function submitAndAwaitTextToKcl({
|
||||
// and by extension the file-deletion-on-reject logic.
|
||||
newFileName = getNextFileName({
|
||||
entryName: newFileName,
|
||||
baseDir: context.selectedDirectory.path,
|
||||
baseDir: projectName,
|
||||
}).name
|
||||
|
||||
fileMachineSend({
|
||||
type: 'Create file',
|
||||
systemIOActor.send({
|
||||
type: SystemIOMachineEvents.createKCLFile,
|
||||
data: {
|
||||
name: newFileName,
|
||||
makeDir: false,
|
||||
content: value.code,
|
||||
silent: true,
|
||||
requestedProjectName: projectName,
|
||||
requestedCode: value.code,
|
||||
requestedFileName: newFileName,
|
||||
},
|
||||
})
|
||||
}
|
||||
@ -234,13 +233,16 @@ export async function submitAndAwaitTextToKcl({
|
||||
// and options to reject or accept the model
|
||||
toast.success(
|
||||
() =>
|
||||
// EXPECTED: This will throw a error in dev mode, do not worry about it.
|
||||
// Warning: Internal React error: Expected static flag was missing. Please notify the React team.
|
||||
ToastTextToCadSuccess({
|
||||
toastId,
|
||||
data: textToCadOutputCreated,
|
||||
token,
|
||||
projectName: projectName,
|
||||
fileName: newFileName,
|
||||
navigate,
|
||||
context,
|
||||
fileMachineSend,
|
||||
isProjectNew,
|
||||
settings,
|
||||
}),
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user