roboflow - npm Package Compare versions

Comparing version 0.0.13 to 0.0.14

cli/commands/upload.js

 const fs = require("fs");
 const path = require("path");
+const pLimit = require("p-limit");
 
@@ -7,2 +8,33 @@ const { selectProjectFromWorkspace, getApiKeyWorWorkspace } = require("../core.js");
 
+async function uploadWithAnnotation(f, annotationFilename, projectUrl, apiKey, extraOptions) {
+    const uploadResult = await api.uploadImage(f, projectUrl, apiKey, extraOptions);
+    const imageId = uploadResult.id;
+
+    if (annotationFilename.includes("[filename]")) {
+        annotationFilename = annotationFilename.replace("[filename]", path.parse(f).name);
+    }
+
+    if (fs.existsSync(annotationFilename)) {
+        const annotationResult = await api.uploadAnnotation(
+            imageId,
+            annotationFilename,
+            projectUrl,
+            apiKey
+        );
+        console.log(`  ${f} uploaded: `, uploadResult);
+        console.log("    annotation upload:", annotationResult);
+    } else {
+        console.log(`  ${f} uploaded: `, uploadResult);
+        console.log(
+            `   cant stat annotation file: '${annotationFilename}'.  image uploaded without annotation`
+        );
+        return;
+    }
+}
+
+async function uploadSimple(f, projectUrl, apiKey, extraOption) {
+    const result = await api.uploadImage(f, projectUrl, apiKey, extraOptions);
+    console.log("  image uploaded:", result);
+}
+
 async function uploadImage(args, options) {
@@ -34,39 +66,27 @@ const workspaceUrl = options.workspace;
 
-    if (options.annotation) {
-        for (var f of args) {
-            // console.log("upload:", f, projectUrl, apiKey, extraOptions);
-            const uploadResult = await api.uploadImage(f, projectUrl, apiKey, extraOptions);
-            console.log("image uploaded: ", uploadResult);
-            const imageId = uploadResult.id;
+    let concurrency = 10;
+    if (options.concurrent) {
+        concurrency = parseInt(options.concurrent);
+    }
 
-            let annotationFilename = options.annotation;
+    const uploadPromises = [];
 
-            if (annotationFilename.includes("[filename]")) {
-                annotationFilename = annotationFilename.replace("[filename]", path.parse(f).name);
-            }
+    const limit = pLimit(concurrency);
 
-            if (fs.existsSync(annotationFilename)) {
-                const annotationResult = await api.uploadAnnotation(
-                    imageId,
-                    annotationFilename,
-                    projectUrl,
-                    apiKey
-                );
-                console.log("annotation uploaded:", annotationResult);
-            } else {
-                console.log(
-                    `cant stat annotation file: '${annotationFilename}'.  image uplaoded without annotation`
-                );
-                continue;
-            }
+    if (options.annotation) {
+        for (let f of args) {
+            const p = limit(() =>
+                uploadWithAnnotation(f, options.annotation, projectUrl, apiKey, extraOptions)
+            );
+
+            uploadPromises.push(p);
         }
     } else {
-        // console.log("upload unanotated", args, options);
-
-        for (var f of args) {
-            // console.log("upload:", f, projectUrl, apiKey, extraOptions);
-            const result = await api.uploadImage(f, projectUrl, apiKey, extraOptions);
-            console.log("image uplaoded:", result);
+        for (let f of args) {
+            const p = limit(() => uploadSimple(f, projectUrl, apiKey, extraOptions));
+            uploadPromises.push(p);
         }
     }
+
+    await Promise.all(uploadPromises);
 }
@@ -73,0 +93,0 @@

cli/index.js

@@ -123,3 +123,3 @@ #! /usr/bin/env node
         )
-
+        .option("-c --concurrent [n]", "how many image uploads to perform concurrently", 10)
         .argument("<files...>")
@@ -126,0 +126,0 @@ .option("-b --batch <batch>", "specify a batch to add the uploaded image to")

package.json

 {
   "name": "roboflow",
-  "version": "0.0.13",
+  "version": "0.0.14",
   "description": "Roboflow.ai node module and CLI tools",
   "main": "index.js",
-  "scripts": {
-    
-  },
+  "scripts": {},
   "repository": {
@@ -26,2 +24,3 @@ "type": "git",
     "open": "^8.4.0",
+    "p-limit": "^3.1.0",
     "terminal-link": "^2.1.1"
@@ -28,0 +27,0 @@ },

No alert changes

Improved metrics

Total package byte prevSize

33445

increased by1.39%

Lines of code

842

increased by1.94%

Worsened metrics

Dependency count

11

increased by10%

Dependency changes

• + Addedp-limit@^3.1.0

• + Addedp-limit@3.1.0(transitive)

• + Addedyocto-queue@0.1.0(transitive)