change from --as-video to --frames

Author: simedw

darwin/cli.py

@@ -62,7 +62,7 @@ def run(args, parser):
         elif args.action == "url":
             f.url(args.dataset)
         elif args.action == "push":
-            f.upload_data(args.dataset, args.files, args.exclude, args.fps, args.path, args.as_video)
+            f.upload_data(args.dataset, args.files, args.exclude, args.fps, args.path, args.frames)
         # Remove a project (remotely)
         elif args.action == "remove":
             f.remove_remote_dataset(args.dataset)

darwin/cli_functions.py

@@ -439,7 +439,7 @@ def upload_data(
     files_to_exclude: Optional[List[str]],
     fps: int,
     path: Optional[str],
-    as_video: Optional[bool],
+    frames: Optional[bool],
 ):
     """Uploads the files provided as parameter to the remote dataset selected
 
@@ -464,7 +464,7 @@ def upload_data(
     client = _load_client()
     try:
         dataset = client.get_remote_dataset(dataset_identifier=dataset_slug)
-        dataset.push(files_to_exclude=files_to_exclude, fps=fps, as_video=as_video, files_to_upload=files, path=path)
+        dataset.push(files_to_exclude=files_to_exclude, fps=fps, as_frames=frames, files_to_upload=files, path=path)
     except NotFound as e:
         _error(f"No dataset with name '{e.name}'")
     except ValueError:

darwin/dataset/remote_dataset.py

@@ -69,7 +69,7 @@ def push(
         blocking: bool = True,
         multi_threaded: bool = True,
         fps: int = 1,
-        as_video: bool = False,
+        as_frames: bool = False,
         files_to_exclude: Optional[List[str]] = None,
         resume: bool = False,
         path: Optional[str] = None,
@@ -89,7 +89,7 @@ def push(
             List of files to exclude from the file scan (which is done only if files is None)
         fps : int
             Number of file per seconds to upload
-        as_video: bool
+        as_frames: bool
             Annotate as video.
         resume : bool
             Flag for signalling the resuming of a push
@@ -140,7 +140,7 @@ def push(
             dataset_id=str(self.dataset_id),
             filenames=files_to_upload,
             fps=fps,
-            as_video=as_video,
+            as_frames=as_frames,
             team=self.team,
             path=path,
         )

darwin/dataset/upload_manager.py

@@ -24,7 +24,7 @@ def add_files_to_dataset(
     filenames: List[Path],
     team: str,
     fps: Optional[int] = 1,
-    as_video: Optional[bool] = False,
+    as_frames: Optional[bool] = False,
     path: Optional[str] = None,
 ):
     """Helper function: upload images to an existing remote dataset
@@ -54,7 +54,7 @@ def add_files_to_dataset(
         payload = {
             "image_filenames": [image.name for image in images],
             "videos": [
-                {"fps": fps, "annotate_as_video": as_video, "original_filename": video.name} for video in videos
+                {"fps": fps, "annotate_as_video": not as_frames, "original_filename": video.name} for video in videos
             ],
         }
         if path:

darwin/options.py

@@ -76,10 +76,10 @@ def __init__(self):
             help="Excludes the files with the specified extension/s if a data folder is provided as data path. ",
         )
         parser_push.add_argument(
-            "-f", "--fps", type=int, default="1", help="Frames per second for video split (recommended: 1)."
+            "-f", "--fps", default="native", help="Frames per second for video split (recommended: 1), use 'native' to use the videos intrinsic fps."
         )
         parser_push.add_argument(
-            "--as-video", action="store_true", help="Annotate a video as a video and not independent frames"
+            "--frames", action="store_true", help="Annotate a video as independent frames"
         )
 
         parser_push.add_argument("--path", type=str, default=None, help="Folder to upload the files into.")