From 92f1bd4f26d7fdc484a8f84841bfddeb0e08b19d Mon Sep 17 00:00:00 2001 From: Pavol Hejny Date: Sat, 11 Nov 2023 14:41:42 +0100 Subject: [PATCH 1/2] Title is string_markdown_text --- ...er_image.ts => createNewWallpaper_image.ts | 26 ++--- package-lock.json | 110 +++++++++--------- package.json | 14 +-- .../TaskInProgress/TasksInProgress.tsx | 4 +- .../TaskInProgress/task/WebgptTaskProgress.ts | 6 +- .../TaskInProgress/task/mock/_tasks.tsx | 6 +- .../task/mock/mockedMultitaskWithPrompts.tsx | 8 +- src/components/Translate/Translate.tsx | 13 ++- src/components/WebsiteTablo/WebsiteTablo.tsx | 6 +- .../createNewWallpaper_prepareFromIdea.ts | 3 +- .../createNewWallpaper_prepareFromImage.ts | 2 +- 11 files changed, 96 insertions(+), 102 deletions(-) rename src/workers/createNewWallpaper/createNewWallpaper_image.ts => createNewWallpaper_image.ts (90%) diff --git a/src/workers/createNewWallpaper/createNewWallpaper_image.ts b/createNewWallpaper_image.ts similarity index 90% rename from src/workers/createNewWallpaper/createNewWallpaper_image.ts rename to createNewWallpaper_image.ts index 657d89c59..1e08d8c35 100644 --- a/src/workers/createNewWallpaper/createNewWallpaper_image.ts +++ b/createNewWallpaper_image.ts @@ -5,19 +5,19 @@ import { USE_DALLE_VERSION, WALLPAPER_IMAGE_ASPECT_RATIO_ALLOWED_RANGE, WALLPAPER_IMAGE_MAX_ALLOWED_SIZE, -} from '../../../config'; -import { ImagePromptResult } from '../../ai/text-to-image/0-interfaces/ImagePromptResult'; -import { getImageGenerator } from '../../ai/text-to-image/getImageGenerator'; -import { WebgptTaskProgress } from '../../components/TaskInProgress/task/WebgptTaskProgress'; -import { UploadWallpaperResponse } from '../../pages/api/upload-image'; -import { aspectRatioRangeExplain } from '../../utils/aspect-ratio/aspectRatioRangeExplain'; -import { downscaleWithAspectRatio } from '../../utils/aspect-ratio/downscaleWithAspectRatio'; -import { isInAspectRatioRange } from '../../utils/aspect-ratio/isInAspectRatioRange'; -import { createImageInWorker } from '../../utils/image/createImageInWorker'; -import { measureImageBlob } from '../../utils/image/measureImageBlob'; -import { resizeImageBlob } from '../../utils/image/resizeImageBlob'; -import { IImageColorStats } from '../../utils/image/utils/IImageColorStats'; -import { string_image_prompt, string_url_image, uuid } from '../../utils/typeAliases'; +} from './config'; +import { ImagePromptResult } from './src/ai/text-to-image/0-interfaces/ImagePromptResult'; +import { getImageGenerator } from './src/ai/text-to-image/getImageGenerator'; +import { WebgptTaskProgress } from './src/components/TaskInProgress/task/WebgptTaskProgress'; +import { UploadWallpaperResponse } from './src/pages/api/upload-image'; +import { aspectRatioRangeExplain } from './src/utils/aspect-ratio/aspectRatioRangeExplain'; +import { downscaleWithAspectRatio } from './src/utils/aspect-ratio/downscaleWithAspectRatio'; +import { isInAspectRatioRange } from './src/utils/aspect-ratio/isInAspectRatioRange'; +import { createImageInWorker } from './src/utils/image/createImageInWorker'; +import { measureImageBlob } from './src/utils/image/measureImageBlob'; +import { resizeImageBlob } from './src/utils/image/resizeImageBlob'; +import { IImageColorStats } from './src/utils/image/utils/IImageColorStats'; +import { string_image_prompt, string_url_image, uuid } from './src/utils/typeAliases'; interface CreateNewWallpaperImageRequest { /** diff --git a/package-lock.json b/package-lock.json index f90977c81..b0370f62e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15,13 +15,13 @@ "@faker-js/faker": "8.0.2", "@monaco-editor/react": "4.5.1", "@octokit/rest": "18.12.0", - "@promptbook/core": "0.15.0", - "@promptbook/execute-javascript": "0.15.0", - "@promptbook/openai": "0.15.0", - "@promptbook/remote-client": "0.15.0", - "@promptbook/remote-server": "0.15.0", - "@promptbook/types": "0.15.0", - "@promptbook/utils": "0.15.0", + "@promptbook/core": "0.16.0", + "@promptbook/execute-javascript": "0.16.0", + "@promptbook/openai": "0.16.0", + "@promptbook/remote-client": "0.16.0", + "@promptbook/remote-server": "0.16.0", + "@promptbook/types": "0.16.0", + "@promptbook/utils": "0.16.0", "@supabase/supabase-js": "2.26.0", "@types/file-saver": "2.0.5", "@vercel/og": "0.5.8", @@ -3037,9 +3037,9 @@ } }, "node_modules/@promptbook/core": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@promptbook/core/-/core-0.15.0.tgz", - "integrity": "sha512-qb3266TBA4DnZgZsFq55nWrnot8LARNxGGuWYPFuxu52/ttw1EaMpI3im8pnOV0zOmcxFvwL87M5Se4L+Z5kuA==", + "version": "0.16.0", + "resolved": "https://registry.npmjs.org/@promptbook/core/-/core-0.16.0.tgz", + "integrity": "sha512-CNx0krlJrzsMHb/nYrJHMNNNxpDJN7uE9bbLGn/NABu+Lx8IFRh+iNhHbeBkknj404g/tNB1A7qMXwYqu4MYZg==", "dependencies": { "n12": "1.6.0", "spacetrim": "0.9.2" @@ -3051,16 +3051,16 @@ "integrity": "sha512-1yc++1RbULLNqyxxqOKfrJEdjWGAG4tyQgJKi9QRjYPmyiAOqpsnphJuDOGdZWtsLg3DH2roAYjz7S74CP6nYw==" }, "node_modules/@promptbook/execute-javascript": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@promptbook/execute-javascript/-/execute-javascript-0.15.0.tgz", - "integrity": "sha512-g654C5DHFmtFiiuHPIl4I7HMNYSCIvAdL/wesWVdeNbIqaHWsweB0m1FIZIx2/DH4kv2pe1gVa68M2aBmK1ThA==", + "version": "0.16.0", + "resolved": "https://registry.npmjs.org/@promptbook/execute-javascript/-/execute-javascript-0.16.0.tgz", + "integrity": "sha512-1Ak2Dn4r2k10mrazsQJQqKioBI4bOfDlZTeGqXJc8JuEawD7wsQm33CAvdIwnyaOajLi3ORsV9Odm8EI/Co+YA==", "dependencies": { "n12": "1.6.0", "spacetrim": "0.9.2", "waitasecond": "1.11.1" }, "peerDependencies": { - "@promptbook/core": "0.15.0" + "@promptbook/core": "0.16.0" } }, "node_modules/@promptbook/execute-javascript/node_modules/n12": { @@ -3069,14 +3069,14 @@ "integrity": "sha512-1yc++1RbULLNqyxxqOKfrJEdjWGAG4tyQgJKi9QRjYPmyiAOqpsnphJuDOGdZWtsLg3DH2roAYjz7S74CP6nYw==" }, "node_modules/@promptbook/openai": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@promptbook/openai/-/openai-0.15.0.tgz", - "integrity": "sha512-6Boj/G1m5kjyVIyFRmpcBLBlFj3wlNvYmqcKXeubWwSbLiBul7vAHA39ckGR0/PvGKaht0p52oLpi5WUIu5sEQ==", + "version": "0.16.0", + "resolved": "https://registry.npmjs.org/@promptbook/openai/-/openai-0.16.0.tgz", + "integrity": "sha512-2/q65S2RXM7tg+tP0KI/PEG+TlGypvGVNTGNKq4VUlycMKRefbnr6lSVz9oodsA++wrkH2+XfDtVWVDioS77QQ==", "dependencies": { "openai": "4.2.0" }, "peerDependencies": { - "@promptbook/core": "0.15.0" + "@promptbook/core": "0.16.0" } }, "node_modules/@promptbook/openai/node_modules/openai": { @@ -3098,45 +3098,45 @@ } }, "node_modules/@promptbook/remote-client": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@promptbook/remote-client/-/remote-client-0.15.0.tgz", - "integrity": "sha512-+wHA/ttjrv87K4WZAB0jhIFEOF/34JiBYn5C5NapDm8GL2InxRySy8tG2j3OTpzAnRiMQQMgq7ZOrQvmE8ms3g==", + "version": "0.16.0", + "resolved": "https://registry.npmjs.org/@promptbook/remote-client/-/remote-client-0.16.0.tgz", + "integrity": "sha512-0BrjtEo7f05V/F3G/s3D7U7guZBn5bBcPu3tFw+oQEOJsjxVhI+0MrvvnG7HtbXItfC0GFBXZV9gB8a7X7N70w==", "dependencies": { "socket.io-client": "4.7.2" }, "peerDependencies": { - "@promptbook/core": "0.15.0" + "@promptbook/core": "0.16.0" } }, "node_modules/@promptbook/remote-server": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@promptbook/remote-server/-/remote-server-0.15.0.tgz", - "integrity": "sha512-yrDpnH1xXr6mXoqOt+zZJxnoSAjW2zBboxrZ2RAYyifJ+F2nFIqYRfGR/uU2l/KpiEXcXSvA8LYJDngbHkbAnw==", + "version": "0.16.0", + "resolved": "https://registry.npmjs.org/@promptbook/remote-server/-/remote-server-0.16.0.tgz", + "integrity": "sha512-jf+ypLLFHYSYXAe0l5jhFlWJYNJPCcC/5VjXHME2bIunsM3p+BsTYRMmBkukCyFBunU58WSef5OyXKGkAZ1Heg==", "dependencies": { "socket.io": "4.7.2", "spacetrim": "0.9.2" }, "peerDependencies": { - "@promptbook/core": "0.15.0" + "@promptbook/core": "0.16.0" } }, "node_modules/@promptbook/types": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@promptbook/types/-/types-0.15.0.tgz", - "integrity": "sha512-i9BJSAzKjZuHto6PpYMIYOHycpvz4nQnjwIO9ikZjdZnNQjv7ztxlIrNXnMwvN7AWIlLVW3PiTbPMC+Zm29lhg==", + "version": "0.16.0", + "resolved": "https://registry.npmjs.org/@promptbook/types/-/types-0.16.0.tgz", + "integrity": "sha512-35Q2/aZwws9S+OLuYut5XbXssaAAkqw9u+nFT2IHIi2fZlBSizY5OP8s9TR5c9jIdgcW5+vOh7OD7brSzA3lWg==", "peerDependencies": { - "@promptbook/core": "0.15.0" + "@promptbook/core": "0.16.0" } }, "node_modules/@promptbook/utils": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@promptbook/utils/-/utils-0.15.0.tgz", - "integrity": "sha512-YQzCyGwUlVf0HX5qPFxhgh44eoiCI69u/NNMrCfoj+wRQSXkIjsQmuGU77pCjOVv5uJSXPdgQxAISvt5jeHQog==", + "version": "0.16.0", + "resolved": "https://registry.npmjs.org/@promptbook/utils/-/utils-0.16.0.tgz", + "integrity": "sha512-/4uBZtWV5zB/WWztadzwKars5HBFy1v9zr/3ohfGgobPPeE1BBBeEJGxPeO188X0oUoOwlJ5p12cebnGv2WR+g==", "dependencies": { "spacetrim": "0.9.2" }, "peerDependencies": { - "@promptbook/core": "0.15.0" + "@promptbook/core": "0.16.0" } }, "node_modules/@puppeteer/browsers": { @@ -19429,9 +19429,9 @@ } }, "@promptbook/core": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@promptbook/core/-/core-0.15.0.tgz", - "integrity": "sha512-qb3266TBA4DnZgZsFq55nWrnot8LARNxGGuWYPFuxu52/ttw1EaMpI3im8pnOV0zOmcxFvwL87M5Se4L+Z5kuA==", + "version": "0.16.0", + "resolved": "https://registry.npmjs.org/@promptbook/core/-/core-0.16.0.tgz", + "integrity": "sha512-CNx0krlJrzsMHb/nYrJHMNNNxpDJN7uE9bbLGn/NABu+Lx8IFRh+iNhHbeBkknj404g/tNB1A7qMXwYqu4MYZg==", "requires": { "n12": "1.6.0", "spacetrim": "0.9.2" @@ -19445,9 +19445,9 @@ } }, "@promptbook/execute-javascript": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@promptbook/execute-javascript/-/execute-javascript-0.15.0.tgz", - "integrity": "sha512-g654C5DHFmtFiiuHPIl4I7HMNYSCIvAdL/wesWVdeNbIqaHWsweB0m1FIZIx2/DH4kv2pe1gVa68M2aBmK1ThA==", + "version": "0.16.0", + "resolved": "https://registry.npmjs.org/@promptbook/execute-javascript/-/execute-javascript-0.16.0.tgz", + "integrity": "sha512-1Ak2Dn4r2k10mrazsQJQqKioBI4bOfDlZTeGqXJc8JuEawD7wsQm33CAvdIwnyaOajLi3ORsV9Odm8EI/Co+YA==", "requires": { "n12": "1.6.0", "spacetrim": "0.9.2", @@ -19462,9 +19462,9 @@ } }, "@promptbook/openai": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@promptbook/openai/-/openai-0.15.0.tgz", - "integrity": "sha512-6Boj/G1m5kjyVIyFRmpcBLBlFj3wlNvYmqcKXeubWwSbLiBul7vAHA39ckGR0/PvGKaht0p52oLpi5WUIu5sEQ==", + "version": "0.16.0", + "resolved": "https://registry.npmjs.org/@promptbook/openai/-/openai-0.16.0.tgz", + "integrity": "sha512-2/q65S2RXM7tg+tP0KI/PEG+TlGypvGVNTGNKq4VUlycMKRefbnr6lSVz9oodsA++wrkH2+XfDtVWVDioS77QQ==", "requires": { "openai": "4.2.0" }, @@ -19487,32 +19487,32 @@ } }, "@promptbook/remote-client": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@promptbook/remote-client/-/remote-client-0.15.0.tgz", - "integrity": "sha512-+wHA/ttjrv87K4WZAB0jhIFEOF/34JiBYn5C5NapDm8GL2InxRySy8tG2j3OTpzAnRiMQQMgq7ZOrQvmE8ms3g==", + "version": "0.16.0", + "resolved": "https://registry.npmjs.org/@promptbook/remote-client/-/remote-client-0.16.0.tgz", + "integrity": "sha512-0BrjtEo7f05V/F3G/s3D7U7guZBn5bBcPu3tFw+oQEOJsjxVhI+0MrvvnG7HtbXItfC0GFBXZV9gB8a7X7N70w==", "requires": { "socket.io-client": "4.7.2" } }, "@promptbook/remote-server": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@promptbook/remote-server/-/remote-server-0.15.0.tgz", - "integrity": "sha512-yrDpnH1xXr6mXoqOt+zZJxnoSAjW2zBboxrZ2RAYyifJ+F2nFIqYRfGR/uU2l/KpiEXcXSvA8LYJDngbHkbAnw==", + "version": "0.16.0", + "resolved": "https://registry.npmjs.org/@promptbook/remote-server/-/remote-server-0.16.0.tgz", + "integrity": "sha512-jf+ypLLFHYSYXAe0l5jhFlWJYNJPCcC/5VjXHME2bIunsM3p+BsTYRMmBkukCyFBunU58WSef5OyXKGkAZ1Heg==", "requires": { "socket.io": "4.7.2", "spacetrim": "0.9.2" } }, "@promptbook/types": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@promptbook/types/-/types-0.15.0.tgz", - "integrity": "sha512-i9BJSAzKjZuHto6PpYMIYOHycpvz4nQnjwIO9ikZjdZnNQjv7ztxlIrNXnMwvN7AWIlLVW3PiTbPMC+Zm29lhg==", + "version": "0.16.0", + "resolved": "https://registry.npmjs.org/@promptbook/types/-/types-0.16.0.tgz", + "integrity": "sha512-35Q2/aZwws9S+OLuYut5XbXssaAAkqw9u+nFT2IHIi2fZlBSizY5OP8s9TR5c9jIdgcW5+vOh7OD7brSzA3lWg==", "requires": {} }, "@promptbook/utils": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@promptbook/utils/-/utils-0.15.0.tgz", - "integrity": "sha512-YQzCyGwUlVf0HX5qPFxhgh44eoiCI69u/NNMrCfoj+wRQSXkIjsQmuGU77pCjOVv5uJSXPdgQxAISvt5jeHQog==", + "version": "0.16.0", + "resolved": "https://registry.npmjs.org/@promptbook/utils/-/utils-0.16.0.tgz", + "integrity": "sha512-/4uBZtWV5zB/WWztadzwKars5HBFy1v9zr/3ohfGgobPPeE1BBBeEJGxPeO188X0oUoOwlJ5p12cebnGv2WR+g==", "requires": { "spacetrim": "0.9.2" } diff --git a/package.json b/package.json index a2186127c..9455487da 100644 --- a/package.json +++ b/package.json @@ -61,13 +61,13 @@ "@azure/cognitiveservices-computervision": "8.2.0", "@azure/ms-rest-azure-js": "2.1.0", "@faker-js/faker": "8.0.2", - "@promptbook/core": "0.15.0", - "@promptbook/execute-javascript": "0.15.0", - "@promptbook/openai": "0.15.0", - "@promptbook/remote-client": "0.15.0", - "@promptbook/remote-server": "0.15.0", - "@promptbook/types": "0.15.0", - "@promptbook/utils": "0.15.0", + "@promptbook/core": "0.16.0", + "@promptbook/execute-javascript": "0.16.0", + "@promptbook/openai": "0.16.0", + "@promptbook/remote-client": "0.16.0", + "@promptbook/remote-server": "0.16.0", + "@promptbook/types": "0.16.0", + "@promptbook/utils": "0.16.0", "@monaco-editor/react": "4.5.1", "@octokit/rest": "18.12.0", "@supabase/supabase-js": "2.26.0", diff --git a/src/components/TaskInProgress/TasksInProgress.tsx b/src/components/TaskInProgress/TasksInProgress.tsx index 266e89f6d..001edf57e 100644 --- a/src/components/TaskInProgress/TasksInProgress.tsx +++ b/src/components/TaskInProgress/TasksInProgress.tsx @@ -4,6 +4,7 @@ import { Vector } from 'xyzt'; import { IS_DEVELOPMENT } from '../../../config'; import { useGraph } from '../../utils/hooks/useGraph'; import { Dialogues } from '../Dialogues/Dialogues'; +import { Translate } from '../Translate/Translate'; import { WebgptTaskProgress } from './task/WebgptTaskProgress'; import styles from './TasksInProgress.module.css'; @@ -109,7 +110,8 @@ export function TasksInProgress(props: TaskInProgressProps) { console.info({ taskProgress }); }} > - {taskProgress.title} + {taskProgress.title} + ))} diff --git a/src/components/TaskInProgress/task/WebgptTaskProgress.ts b/src/components/TaskInProgress/task/WebgptTaskProgress.ts index cbbd9e56c..cfcd5c1e6 100644 --- a/src/components/TaskInProgress/task/WebgptTaskProgress.ts +++ b/src/components/TaskInProgress/task/WebgptTaskProgress.ts @@ -1,16 +1,16 @@ -import { string_name, title } from '../../../utils/typeAliases'; +import { string_markdown_text, string_name } from '../../../utils/typeAliases'; export type WebgptTaskProgress = PendingWebgptTaskProgress | DoneWebgptTaskProgress; export interface PendingWebgptTaskProgress { readonly name: string_name; - readonly title: title; + readonly title: string_markdown_text; readonly isDone: false; } export interface DoneWebgptTaskProgress { readonly name: string_name; - readonly title?: title; + readonly title?: string_markdown_text /* <- TODO> && Exclude */; readonly isDone: true; } diff --git a/src/components/TaskInProgress/task/mock/_tasks.tsx b/src/components/TaskInProgress/task/mock/_tasks.tsx index d40e50bc2..7a3020e0a 100644 --- a/src/components/TaskInProgress/task/mock/_tasks.tsx +++ b/src/components/TaskInProgress/task/mock/_tasks.tsx @@ -27,11 +27,7 @@ export const MOCKED_TASKS_PROGRESS_QUEUE: Array = [ }, { name: 'text-analysis', - title: ( - <> - Analyzing newsletter text (2) - - ), + title: `Analyzing *newsletter* text (2)`, isDone: true, }, { diff --git a/src/components/TaskInProgress/task/mock/mockedMultitaskWithPrompts.tsx b/src/components/TaskInProgress/task/mock/mockedMultitaskWithPrompts.tsx index 3e5d920f6..0db4f3ca2 100644 --- a/src/components/TaskInProgress/task/mock/mockedMultitaskWithPrompts.tsx +++ b/src/components/TaskInProgress/task/mock/mockedMultitaskWithPrompts.tsx @@ -30,7 +30,7 @@ export async function mockedMultitaskWithPrompts( await onProgress({ name: `mocked-task-${i}`, - title: <>{title}, + title, isDone: false, }); @@ -46,11 +46,7 @@ export async function mockedMultitaskWithPrompts( await onProgress({ name: `mocked-task-${i}`, - title: ( - <> - {title} ({response}) - - ), + title: `${title} *(${response})*`, isDone: true, }); } diff --git a/src/components/Translate/Translate.tsx b/src/components/Translate/Translate.tsx index 8687139a5..69a59702d 100644 --- a/src/components/Translate/Translate.tsx +++ b/src/components/Translate/Translate.tsx @@ -1,5 +1,5 @@ -import { ReactNode } from 'react'; import { useLocale } from '../../utils/hooks/useLocale'; +import { string_markdown_text, string_translate_language } from '../../utils/typeAliases'; /** * A component that renders its children only if the locale matches the router locale @@ -9,13 +9,18 @@ import { useLocale } from '../../utils/hooks/useLocale'; */ interface TranslateProps { /** - * @@@ + * Language !!! */ - locale: string; + locale: string_translate_language; - children: ReactNode; + /** + * Content to translate + */ + children: string_markdown_text; } +// Use only one at once + /** * @@@ */ diff --git a/src/components/WebsiteTablo/WebsiteTablo.tsx b/src/components/WebsiteTablo/WebsiteTablo.tsx index 7d601be8f..a5c0c569c 100644 --- a/src/components/WebsiteTablo/WebsiteTablo.tsx +++ b/src/components/WebsiteTablo/WebsiteTablo.tsx @@ -51,11 +51,7 @@ export function WebsiteTablo() { tasksProgress={[ { name: 'publishing', - title: ( - <> - Publishing {domain} - - ), + title: `Publishing **${domain}**`, isDone: false, }, /* diff --git a/src/workers/createNewWallpaper/createNewWallpaper_prepareFromIdea.ts b/src/workers/createNewWallpaper/createNewWallpaper_prepareFromIdea.ts index ff9259c17..7df21c0e7 100644 --- a/src/workers/createNewWallpaper/createNewWallpaper_prepareFromIdea.ts +++ b/src/workers/createNewWallpaper/createNewWallpaper_prepareFromIdea.ts @@ -1,8 +1,8 @@ import { TaskProgress } from '@promptbook/types'; +import { createNewWallpaper_image } from '../../../createNewWallpaper_image'; import { WebgptTaskProgress } from '../../components/TaskInProgress/task/WebgptTaskProgress'; import { string_image_prompt } from '../../utils/typeAliases'; import { CreateNewWallpaperPrepareResult, CreateNewWallpaperRequest } from './createNewWallpaper'; -import { createNewWallpaper_image } from './createNewWallpaper_image'; import { createNewWallpaper_text } from './createNewWallpaper_text'; /** @@ -37,7 +37,6 @@ export async function createNewWallpaper_prepareFromIdea( addSections, }, (taskProgress: TaskProgress) => { - // TODO: [⛵] DRY const isProgressLoggedForCurrentTemplate = taskProgress.executionType === 'PROMPT_TEMPLATE'; diff --git a/src/workers/createNewWallpaper/createNewWallpaper_prepareFromImage.ts b/src/workers/createNewWallpaper/createNewWallpaper_prepareFromImage.ts index c2770b03e..dac965b16 100644 --- a/src/workers/createNewWallpaper/createNewWallpaper_prepareFromImage.ts +++ b/src/workers/createNewWallpaper/createNewWallpaper_prepareFromImage.ts @@ -1,7 +1,7 @@ import { TaskProgress } from '@promptbook/types'; +import { createNewWallpaper_image } from '../../../createNewWallpaper_image'; import { WebgptTaskProgress } from '../../components/TaskInProgress/task/WebgptTaskProgress'; import { CreateNewWallpaperPrepareResult, CreateNewWallpaperRequest } from './createNewWallpaper'; -import { createNewWallpaper_image } from './createNewWallpaper_image'; import { createNewWallpaper_text } from './createNewWallpaper_text'; /** From 3a2ce06a05216bc3ec4fe302732b8283118bac97 Mon Sep 17 00:00:00 2001 From: Pavol Hejny Date: Wed, 29 Nov 2023 21:46:59 +0100 Subject: [PATCH 2/2] Merge branch 'main' into feature/auto-translation --- .../createNewWallpaper_image.ts | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/src/workers/functions/createNewWallpaper/createNewWallpaper_image.ts b/src/workers/functions/createNewWallpaper/createNewWallpaper_image.ts index 59dc6284e..216f9cb63 100644 --- a/src/workers/functions/createNewWallpaper/createNewWallpaper_image.ts +++ b/src/workers/functions/createNewWallpaper/createNewWallpaper_image.ts @@ -4,21 +4,6 @@ import { COLORSTATS_DEFAULT_COMPUTE_IN_FRONTEND, WALLPAPER_IMAGE_ASPECT_RATIO_ALLOWED_RANGE, WALLPAPER_IMAGE_MAX_ALLOWED_SIZE, -<<<<<<< HEAD:createNewWallpaper_image.ts -} from './config'; -import { ImagePromptResult } from './src/ai/text-to-image/0-interfaces/ImagePromptResult'; -import { getImageGenerator } from './src/ai/text-to-image/getImageGenerator'; -import { WebgptTaskProgress } from './src/components/TaskInProgress/task/WebgptTaskProgress'; -import { UploadWallpaperResponse } from './src/pages/api/upload-image'; -import { aspectRatioRangeExplain } from './src/utils/aspect-ratio/aspectRatioRangeExplain'; -import { downscaleWithAspectRatio } from './src/utils/aspect-ratio/downscaleWithAspectRatio'; -import { isInAspectRatioRange } from './src/utils/aspect-ratio/isInAspectRatioRange'; -import { createImageInWorker } from './src/utils/image/createImageInWorker'; -import { measureImageBlob } from './src/utils/image/measureImageBlob'; -import { resizeImageBlob } from './src/utils/image/resizeImageBlob'; -import { IImageColorStats } from './src/utils/image/utils/IImageColorStats'; -import { string_image_prompt, string_url_image, uuid } from './src/utils/typeAliases'; -======= } from '../../../../config'; import { WebgptTaskProgress } from '../../../components/TaskInProgress/task/WebgptTaskProgress'; import { UploadWallpaperResponse } from '../../../pages/api/upload-image'; @@ -31,7 +16,6 @@ import { resizeImageBlob } from '../../../utils/image/resizeImageBlob'; import { IImageColorStats } from '../../../utils/image/utils/IImageColorStats'; import { string_image_prompt, string_url_image, uuid } from '../../../utils/typeAliases'; import { imageGeneratorDialogue } from '../../dialogues/image-generator/imageGeneratorDialogue'; ->>>>>>> main:src/workers/functions/createNewWallpaper/createNewWallpaper_image.ts interface CreateNewWallpaperImageRequest { /**