diff --git a/package-lock.json b/package-lock.json index 5eb3db4..e8fc8ce 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21,7 +21,7 @@ "js-yaml": "^4.1.0", "lodash": "^4.17.21", "safe-flat": "^2.1.0", - "uuidv4": "^6.2.13", + "uuid": "^9.0.1", "winston": "^3.11.0", "zod": "^3.22.4" }, @@ -34,6 +34,7 @@ "@types/js-yaml": "^4.0.9", "@types/lodash": "^4.17.0", "@types/node": "^20.11.16", + "@types/uuid": "^9.0.8", "@typescript-eslint/eslint-plugin": "^6.19.1", "@typescript-eslint/parser": "^6.19.1", "@vitest/coverage-v8": "^1.3.1", @@ -3340,9 +3341,10 @@ "integrity": "sha512-6WaYesThRMCl19iryMYP7/x2OVgCtbIVflDGFpWnb9irXI3UjYE4AzmYuiUKY1AJstGijoY+MgUszMgRxIYTYw==" }, "node_modules/@types/uuid": { - "version": "8.3.4", - "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-8.3.4.tgz", - "integrity": "sha512-c/I8ZRb51j+pYGAu5CrFMRxqZ2ke4y2grEBO5AUjgSkSk+qT2Ea+OdWElz/OiMf5MNpn2b17kuVBwZLQJXzihw==" + "version": "9.0.8", + "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-9.0.8.tgz", + "integrity": "sha512-jg+97EGIcY9AGHJJRaaPVgetKDsrTgbRjQ5Msgjh/DQKEFl0DtyRr/VCOyD1T2R1MNeWPK/u7JoGhlDZnKBAfA==", + "dev": true }, "node_modules/@typescript-eslint/eslint-plugin": { "version": "6.19.1", @@ -7285,22 +7287,17 @@ } }, "node_modules/uuid": { - "version": "8.3.2", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", - "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==", + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz", + "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==", + "funding": [ + "https://github.com/sponsors/broofa", + "https://github.com/sponsors/ctavan" + ], "bin": { "uuid": "dist/bin/uuid" } }, - "node_modules/uuidv4": { - "version": "6.2.13", - "resolved": "https://registry.npmjs.org/uuidv4/-/uuidv4-6.2.13.tgz", - "integrity": "sha512-AXyzMjazYB3ovL3q051VLH06Ixj//Knx7QnUSi1T//Ie3io6CpsPu9nVMOx5MoLWh6xV0B9J0hIaxungxXUbPQ==", - "dependencies": { - "@types/uuid": "8.3.4", - "uuid": "8.3.2" - } - }, "node_modules/v8-to-istanbul": { "version": "9.2.0", "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.2.0.tgz", diff --git a/package.json b/package.json index d821a80..075c79f 100644 --- a/package.json +++ b/package.json @@ -44,6 +44,7 @@ "@types/js-yaml": "^4.0.9", "@types/lodash": "^4.17.0", "@types/node": "^20.11.16", + "@types/uuid": "^9.0.8", "@typescript-eslint/eslint-plugin": "^6.19.1", "@typescript-eslint/parser": "^6.19.1", "@vitest/coverage-v8": "^1.3.1", @@ -73,7 +74,7 @@ "js-yaml": "^4.1.0", "lodash": "^4.17.21", "safe-flat": "^2.1.0", - "uuidv4": "^6.2.13", + "uuid": "^9.0.1", "winston": "^3.11.0", "zod": "^3.22.4" } diff --git a/src/client/app.ts b/src/client/app.ts index 57a384b..f9f3b79 100644 --- a/src/client/app.ts +++ b/src/client/app.ts @@ -44,7 +44,7 @@ import * as yaml from "js-yaml"; import { validateWorkflow } from "../workflows/validate"; import { getYamlOutputInfoProto } from "../workflows/utils"; import { Model as ModelConstructor } from "./model"; -import { uuid } from "uuidv4"; +import { v4 as uuid } from "uuid"; import { fromProtobufObject } from "from-protobuf-object"; import { fromPartialProtobufObject } from "../utils/fromPartialProtobufObject"; import { flatten } from "safe-flat"; diff --git a/src/client/input.ts b/src/client/input.ts index 066a678..0aba10f 100644 --- a/src/client/input.ts +++ b/src/client/input.ts @@ -27,7 +27,7 @@ import { } from "google-protobuf/google/protobuf/struct_pb"; import { parse } from "csv-parse"; import { finished } from "stream/promises"; -import { uuid } from "uuidv4"; +import { v4 as uuid } from "uuid"; import { CancelInputsAddJobRequest, DeleteInputsRequest, diff --git a/src/datasets/upload/image.ts b/src/datasets/upload/image.ts index caeb68b..a85006d 100644 --- a/src/datasets/upload/image.ts +++ b/src/datasets/upload/image.ts @@ -4,7 +4,7 @@ import { } from "clarifai-nodejs-grpc/proto/clarifai/api/resources_pb"; import { ClarifaiDataLoader, ClarifaiDataset } from "./base"; import path from "path"; -import { uuid } from "uuidv4"; +import { v4 as uuid } from "uuid"; import { Input } from "../../client/input"; import { VisualClassificationFeatures,