From efdf0c7bedcc707e6af210f5cd7780f85b169f46 Mon Sep 17 00:00:00 2001 From: Minhye Kim Date: Tue, 30 Jan 2024 18:29:47 +0800 Subject: [PATCH] OmniTool 1.0.1 Update Dependency Updates: - Update project dependencies with latest versions User Interface Enhancements: - Opened chat menu when launching local APIs - UX clean up and small visual improvements Feature Additions: - Added support for filtering user recipes in recipe manager Documentation Updates: - Upkeep readme --- README.md | 2 +- package.json | 6 +- packages/omni-sdk/package.json | 18 +- packages/omni-sdk/src/MarkdownEngine.ts | 2 +- packages/omni-server/dist/run.js | 7 +- packages/omni-server/package.json | 44 +- .../WorkflowIntegration.ts | 5 +- packages/omni-shared/lib/index.js | 2 +- packages/omni-shared/package.json | 18 +- packages/omni-shared/src/core/App.ts | 2 +- packages/omni-sockets/package.json | 4 +- .../omni-ui/omni-client-services/package.json | 6 +- packages/omni-ui/omni-web/package.json | 40 +- .../omni-web/src/components/EditorTopMenu.hbs | 91 +- .../omni-web/src/components/Sidebar.hbs | 2 +- yarn.lock | 1735 ++++++++++------- 16 files changed, 1157 insertions(+), 827 deletions(-) diff --git a/README.md b/README.md index 26cf9fc..31a8c63 100644 --- a/README.md +++ b/README.md @@ -69,7 +69,7 @@ Omnitool is **highly extensible and interoperable**. Most OpenAPI3 based service ### Comprehensive AI Provider Support * Seamlessly provides access to 1000s of AI model and utility APIs from an rapidly growing list leading AI providers and aggregators, exposing them all via interoperable blocks. -Currently supported (v. 0.6.0) : +Currently supported: * [Civitai.com](https://civitai.com) (Model metadata access) * [Deepl.com](https://deepl.com) (Document translation) * [ElevenLabs.io](https://elevenlabs.io) (Multilingual voice generation) diff --git a/package.json b/package.json index 04bd4bb..3e6750c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "omnitool", - "version": "1.0.0", + "version": "1.0.1", "packageManager": "yarn@4.0.2", "private": true, "workspaces": [ @@ -62,7 +62,7 @@ "devDependencies": { "eslint": "^8.56.0", "eslint-config-prettier": "^9.1.0", - "eslint-plugin-prettier": "^5.1.2", - "prettier": "^3.1.1" + "eslint-plugin-prettier": "^5.1.3", + "prettier": "^3.2.4" } } diff --git a/packages/omni-sdk/package.json b/packages/omni-sdk/package.json index 5ac7433..278c013 100644 --- a/packages/omni-sdk/package.json +++ b/packages/omni-sdk/package.json @@ -1,7 +1,7 @@ { "name": "omni-sdk", "packageManager": "yarn@4.0.2", - "version": "1.0.0", + "version": "1.0.1", "type": "module", "main": "./lib/index.js", "types": "./lib/index.d.ts", @@ -12,16 +12,16 @@ "./lib/" ], "devDependencies": { - "@typescript-eslint/eslint-plugin": "^5.62.0", - "@typescript-eslint/parser": "^5.62.0", - "esbuild": "^0.19.10", + "@typescript-eslint/eslint-plugin": "^6.19.1", + "@typescript-eslint/parser": "^6.19.1", + "esbuild": "^0.19.12", "eslint": "^8.56.0", - "eslint-config-standard-with-typescript": "^36.1.1", + "eslint-config-standard-with-typescript": "^43.0.1", "eslint-plugin-import": "^2.29.1", - "eslint-plugin-n": "^15.7.0", - "eslint-plugin-prettier": "^4.2.1", + "eslint-plugin-n": "^16.6.2", + "eslint-plugin-prettier": "^5.1.3", "eslint-plugin-promise": "^6.1.1", - "prettier": "^3.1.1", + "prettier": "^3.2.4", "typescript": "^5.3.3" }, "scripts": { @@ -33,6 +33,6 @@ "dependencies": { "emittery": "^1.0.1", "handlebars": "^4.7.8", - "marked": "^10.0.0" + "marked": "^11.2.0" } } diff --git a/packages/omni-sdk/src/MarkdownEngine.ts b/packages/omni-sdk/src/MarkdownEngine.ts index 838105e..4e1079c 100644 --- a/packages/omni-sdk/src/MarkdownEngine.ts +++ b/packages/omni-sdk/src/MarkdownEngine.ts @@ -99,7 +99,7 @@ class MarkdownEngine { const md = marked.parse(modifiedContent, { renderer: mdRenderer }); - let { content, data } = await this.preprocessData(md, tokens); + let { content, data } = await this.preprocessData(md, tokens); content = this.injectTokens(content, tokens); const replacedContent = this.handlebars.compile(content)(Object.assign({}, data, context)); diff --git a/packages/omni-server/dist/run.js b/packages/omni-server/dist/run.js index c2fb983..cb95b24 100644 --- a/packages/omni-server/dist/run.js +++ b/packages/omni-server/dist/run.js @@ -15145,7 +15145,12 @@ var WorkflowIntegration = class extends APIIntegration { return collection; } async getWorkflowsForSessionUser(ctx, docsPerPage, page, filter = "") { - const userIds = [ctx.user.id, "-----public-----"]; + const recipeOwner = ctx.user.recipeOwner; + const userIds = []; + if (recipeOwner == void 0 || recipeOwner == "user") + userIds.push(ctx.user.id); + if (recipeOwner == void 0 || recipeOwner == "public") + userIds.push("-----public-----"); const queryFilter = /* @__PURE__ */ new Map(); if (filter !== "") { queryFilter.set("id", filter); diff --git a/packages/omni-server/package.json b/packages/omni-server/package.json index f37942c..d8d7fb0 100644 --- a/packages/omni-server/package.json +++ b/packages/omni-server/package.json @@ -1,6 +1,6 @@ { "name": "omni-server", - "version": "1.0.0", + "version": "1.0.1", "packageManager": "yarn@4.0.2", "main": "./dist/run.js", "engines": { @@ -10,23 +10,23 @@ "dependencies": { "@casl/ability": "^6.5.0", "@fastify/cookie": "^8.3.0", - "@fastify/cors": "^8.5.0", + "@fastify/cors": "^9.0.0", "@fastify/formbody": "^7.4.0", "@fastify/http-proxy": "^9.3.0", - "@fastify/jwt": "^7.2.4", - "@fastify/multipart": "^8.0.0", - "@fastify/rate-limit": "^9.0.1", + "@fastify/jwt": "^8.0.0", + "@fastify/multipart": "^8.1.0", + "@fastify/rate-limit": "^9.1.0", "@fastify/session": "^10.7.0", "@fastify/static": "^6.12.0", "@huggingface/inference": "^2.6.4", - "@tensorflow/tfjs": "^4.15.0", - "@tensorflow/tfjs-backend-wasm": "^4.15.0", - "@tensorflow/tfjs-core": "^4.15.0", + "@tensorflow/tfjs": "^4.16.0", + "@tensorflow/tfjs-backend-wasm": "^4.16.0", + "@tensorflow/tfjs-core": "^4.16.0", "@types/color-namer": "^1.3.3", - "@types/node": "^20.10.5", + "@types/node": "^20.11.7", "@types/serialize-javascript": "^5.0.4", "app-store-scraper": "^0.18.0", - "better-sqlite3": "^9.2.2", + "better-sqlite3": "^9.3.0", "chokidar": "^3.5.3", "cli-table3": "^0.6.3", "color-namer": "^1.4.0", @@ -34,16 +34,16 @@ "consola": "^3.2.3", "deepmerge": "^4.3.1", "detect-content-type": "^1.2.0", - "dotenv": "^16.3.1", + "dotenv": "^16.4.1", "ejs": "^3.1.9", "eventsource-parser": "^1.1.1", "fastify": "^4.25.2", "fastify-plugin": "^4.5.1", "fastify-sse-v2": "^3.1.2", - "file-type": "^18.7.0", + "file-type": "^19.0.0", "fs-extra": "^11.2.0", "gpt-tokenizer": "^2.1.2", - "image-size": "^1.0.2", + "image-size": "^1.1.1", "imurmurhash": "^0.1.4", "insane": "^2.6.2", "js-levenshtein": "^1.1.6", @@ -51,7 +51,7 @@ "jsonwebtoken": "^9.0.2", "jwks-rsa": "^3.1.0", "lodash-es": "^4.17.21", - "marked": "^10.0.0", + "marked": "^11.2.0", "mime-types": "^2.1.35", "nano": "^10.1.3", "nanoid": "^5.0.4", @@ -68,11 +68,11 @@ "rete": "^1.5.2", "rete-connection-plugin": "^0.9.0", "sanitize-filename": "^1.6.3", - "serialize-javascript": "^6.0.1", - "sharp": "^0.33.1", - "simple-git": "^3.21.0", + "serialize-javascript": "^6.0.2", + "sharp": "^0.33.2", + "simple-git": "^3.22.0", "simple-oauth2": "^5.0.0", - "swagger-client": "^3.24.6", + "swagger-client": "^3.25.0", "tar": "^6.2.0", "tmp-promise": "^3.0.3" }, @@ -87,7 +87,7 @@ "clean": "node build.js clean" }, "devDependencies": { - "@types/better-sqlite3": "^7.6.8", + "@types/better-sqlite3": "^7.6.9", "@types/color-convert": "^2.0.3", "@types/fs-extra": "^11.0.4", "@types/imurmurhash": "^0.1.4", @@ -97,10 +97,10 @@ "@types/lodash-es": "^4.17.12", "@types/mime-types": "^2.1.4", "@types/simple-oauth2": "^5.0.7", - "@types/tar": "^6.1.10", - "esbuild": "^0.19.10", + "@types/tar": "^6.1.11", + "esbuild": "^0.19.12", "eslint": "^8.56.0", - "prettier": "^3.1.1", + "prettier": "^3.2.4", "ts-node": "^10.9.2", "typescript": "^5.3.3" } diff --git a/packages/omni-server/src/integrations/WorkflowIntegration/WorkflowIntegration.ts b/packages/omni-server/src/integrations/WorkflowIntegration/WorkflowIntegration.ts index 49ef8aa..fe81060 100644 --- a/packages/omni-server/src/integrations/WorkflowIntegration/WorkflowIntegration.ts +++ b/packages/omni-server/src/integrations/WorkflowIntegration/WorkflowIntegration.ts @@ -330,7 +330,10 @@ class WorkflowIntegration extends APIIntegration { filter: string = '' ): Promise { // Build list of owner IDs to search for. - const userIds: string[] = [ctx.user.id, '-----public-----']; + const recipeOwner = ctx.user.recipeOwner; + const userIds: string[] = []; + if (recipeOwner == undefined || recipeOwner == "user") userIds.push(ctx.user.id); + if (recipeOwner == undefined || recipeOwner == "public") userIds.push('-----public-----'); // Create filters const queryFilter = new Map(); diff --git a/packages/omni-shared/lib/index.js b/packages/omni-shared/lib/index.js index 45cb554..a0c1fd0 100644 --- a/packages/omni-shared/lib/index.js +++ b/packages/omni-shared/lib/index.js @@ -477,7 +477,7 @@ var App = class { this.events.on(`${id}.${event}`, handler); } stringify(obj) { - return stringify(obj, null, 2); + return stringify(obj); } parse(str) { return parse(str); diff --git a/packages/omni-shared/package.json b/packages/omni-shared/package.json index a2b365f..72192bf 100644 --- a/packages/omni-shared/package.json +++ b/packages/omni-shared/package.json @@ -12,18 +12,18 @@ "./lib/" ], "devDependencies": { - "@types/ungap__structured-clone": "^0.3.3", - "@types/uuid": "^9.0.7", - "@typescript-eslint/eslint-plugin": "^5.62.0", - "@typescript-eslint/parser": "^5.62.0", - "esbuild": "^0.19.10", + "@types/ungap__structured-clone": "^1.2.0", + "@types/uuid": "^9.0.8", + "@typescript-eslint/eslint-plugin": "^6.19.1", + "@typescript-eslint/parser": "^6.19.1", + "esbuild": "^0.19.12", "eslint": "^8.56.0", - "eslint-config-standard-with-typescript": "^36.1.1", + "eslint-config-standard-with-typescript": "^43.0.1", "eslint-plugin-import": "^2.29.1", - "eslint-plugin-n": "^15.7.0", - "eslint-plugin-prettier": "^4.2.1", + "eslint-plugin-n": "^16.6.2", + "eslint-plugin-prettier": "^5.1.3", "eslint-plugin-promise": "^6.1.1", - "prettier": "^3.1.1", + "prettier": "^3.2.4", "typescript": "^5.3.3" }, "scripts": { diff --git a/packages/omni-shared/src/core/App.ts b/packages/omni-shared/src/core/App.ts index 0eadaa9..a1d9ed5 100644 --- a/packages/omni-shared/src/core/App.ts +++ b/packages/omni-shared/src/core/App.ts @@ -220,7 +220,7 @@ abstract class App implements IApp { } stringify(obj: any) { - return stringify(obj, null, 2); + return stringify(obj); } parse(str: string) { diff --git a/packages/omni-sockets/package.json b/packages/omni-sockets/package.json index 89f9eb2..de546df 100644 --- a/packages/omni-sockets/package.json +++ b/packages/omni-sockets/package.json @@ -21,14 +21,14 @@ "devDependencies": { "@typescript-eslint/eslint-plugin": "^5.62.0", "@typescript-eslint/parser": "^5.62.0", - "esbuild": "^0.19.10", + "esbuild": "^0.19.12", "eslint": "^8.56.0", "eslint-config-standard-with-typescript": "^36.1.1", "eslint-plugin-import": "^2.29.1", "eslint-plugin-n": "^15.7.0", "eslint-plugin-prettier": "^4.2.1", "eslint-plugin-promise": "^6.1.1", - "prettier": "^3.1.1", + "prettier": "^3.2.4", "typescript": "^5.3.3" }, "scripts": { diff --git a/packages/omni-ui/omni-client-services/package.json b/packages/omni-ui/omni-client-services/package.json index 78dc6ac..f64aced 100644 --- a/packages/omni-ui/omni-client-services/package.json +++ b/packages/omni-ui/omni-client-services/package.json @@ -28,17 +28,17 @@ "omni-shared": "workspace:*" }, "devDependencies": { - "@types/node": "^20.10.5", + "@types/node": "^20.11.7", "@typescript-eslint/eslint-plugin": "^5.62.0", "@typescript-eslint/parser": "^5.62.0", - "esbuild": "^0.19.10", + "esbuild": "^0.19.12", "eslint": "^8.56.0", "eslint-config-standard-with-typescript": "^36.1.1", "eslint-plugin-import": "^2.29.1", "eslint-plugin-n": "^15.7.0", "eslint-plugin-prettier": "^4.2.1", "eslint-plugin-promise": "^6.1.1", - "prettier": "^3.1.1", + "prettier": "^3.2.4", "ts-node": "^10.9.2", "typescript": "^5.3.3" } diff --git a/packages/omni-ui/omni-web/package.json b/packages/omni-ui/omni-web/package.json index eece547..2586ba4 100644 --- a/packages/omni-ui/omni-web/package.json +++ b/packages/omni-ui/omni-web/package.json @@ -12,51 +12,51 @@ "lint": "eslint ./src --ext .js,.ts, --ignore-path .gitignore" }, "devDependencies": { - "@babel/core": "^7.23.6", + "@babel/core": "^7.23.9", "@babel/preset-typescript": "^7.23.3", "@tailwindcss/forms": "^0.5.7", "@tailwindcss/typography": "^0.5.10", - "@types/alpinejs": "^3.13.5", + "@types/alpinejs": "^3.13.6", "@types/dompurify": "^3.0.5", "@types/marked": "^6.0.0", - "@types/node": "^20.10.5", + "@types/node": "^20.11.7", "@types/winbox": "^0.2.5", "@typescript-eslint/eslint-plugin": "^5.62.0", "@typescript-eslint/parser": "^5.62.0", - "autoprefixer": "^10.4.16", + "autoprefixer": "^10.4.17", "deepmerge": "^4.3.1", - "esbuild": "^0.19.10", + "esbuild": "^0.19.12", "eslint": "^8.56.0", "eslint-config-standard-with-typescript": "^36.1.1", "eslint-plugin-import": "^2.29.1", "eslint-plugin-n": "^15.7.0", "eslint-plugin-promise": "^6.1.1", - "postcss": "^8.4.32", - "prettier": "^3.1.1", + "postcss": "^8.4.33", + "prettier": "^3.2.4", "prop-types": "^15.8.1", "rete-cli": "^0.6.1", - "rollup-plugin-visualizer": "^5.11.0", - "sass": "^1.69.5", - "tailwindcss": "^3.4.0", + "rollup-plugin-visualizer": "^5.12.0", + "sass": "^1.70.0", + "tailwindcss": "^3.4.1", "ts-node": "^10.9.2", "typescript": "^5.3.3", - "vite": "^5.0.10", + "vite": "^5.0.12", "vite-plugin-conditional-compiler": "^0.2.1", "vite-plugin-handlebars": "^1.6.0" }, "dependencies": { - "@alpinejs/focus": "^3.13.3", - "@alpinejs/intersect": "^3.13.3", - "@alpinejs/morph": "^3.13.3", + "@alpinejs/focus": "^3.13.5", + "@alpinejs/intersect": "^3.13.5", + "@alpinejs/morph": "^3.13.5", "@marcreichel/alpine-autosize": "^1.3.3", - "@yaireo/tagify": "^4.17.9", - "alpinejs": "^3.13.3", - "axios": "^1.6.2", + "@yaireo/tagify": "^4.18.3", + "alpinejs": "^3.13.5", + "axios": "^1.6.7", "d3": "^7.8.5", - "dompurify": "^3.0.6", + "dompurify": "^3.0.8", "doodle.css": "^0.0.2", "highlight.js": "^11.9.0", - "marked": "^10.0.0", + "marked": "^11.2.0", "marked-emoji": "^1.3.1", "monaco-editor": "^0.45.0", "omni-client-services": "workspace:*", @@ -67,7 +67,7 @@ "rete-area-plugin": "^0.2.1", "rete-connection-path-plugin": "^0.3.1", "rete-connection-plugin": "^0.9.0", - "serialize-javascript": "^6.0.1", + "serialize-javascript": "^6.0.2", "tippy.js": "^6.3.7", "winbox": "^0.2.82" } diff --git a/packages/omni-ui/omni-web/src/components/EditorTopMenu.hbs b/packages/omni-ui/omni-web/src/components/EditorTopMenu.hbs index 3254dd4..0e5ac9b 100644 --- a/packages/omni-ui/omni-web/src/components/EditorTopMenu.hbs +++ b/packages/omni-ui/omni-web/src/components/EditorTopMenu.hbs @@ -53,6 +53,29 @@ + + + + + +
-
+