Review help/usage for cli commands

src/datachain/cli/__init__.py

@@ -39,6 +39,10 @@
     if args.command in ("internal-run-udf", "internal-run-udf-worker"):
         return handle_udf(args.command)
 
+    if args.command is None:
+        datachain_parser.print_help(sys.stderr)
+        return 1
+
     logger.addHandler(logging.StreamHandler())
     logging_level = get_logging_level(args)
     logger.setLevel(logging_level)
@@ -120,12 +124,17 @@
         recursive=bool(args.recursive),
         no_glob=args.no_glob,
         no_cp=args.no_cp,
-        edatachain=args.edatachain,
-        edatachain_file=args.edatachain_file,
     )
 
 
 def handle_dataset_command(args, catalog):
+    if args.datasets_cmd is None:
+        print(
+            f"Use 'datachain {args.command} --help' to see available options",
+            file=sys.stderr,
+        )
+        return 1
+
     dataset_commands = {
         "pull": lambda: catalog.pull_dataset(
             args.dataset,
@@ -134,8 +143,6 @@
             local_ds_version=args.local_version,
             cp=args.cp,
             force=bool(args.force),
-            edatachain=args.edatachain,
-            edatachain_file=args.edatachain_file,
         ),
         "edit": lambda: edit_dataset(
             catalog,
@@ -187,6 +194,7 @@
     handler = dataset_commands.get(args.datasets_cmd)
     if handler:
         return handler()
+
     raise Exception(f"Unexpected command {args.datasets_cmd}")
 
 

src/datachain/cli/commands/datasets.py

@@ -11,6 +11,7 @@
 from datachain.cli.utils import determine_flavors
 from datachain.config import Config
 from datachain.error import DatasetNotFoundError
+from datachain.studio import list_datasets as list_datasets_studio
 
 
 def list_datasets(
@@ -20,14 +21,12 @@ def list_datasets(
     all: bool = True,
     team: Optional[str] = None,
 ):
-    from datachain.studio import list_datasets
-
     token = Config().read().get("studio", {}).get("token")
     all, local, studio = determine_flavors(studio, local, all, token)
 
     local_datasets = set(list_datasets_local(catalog)) if all or local else set()
     studio_datasets = (
-        set(list_datasets(team=team)) if (all or studio) and token else set()
+        set(list_datasets_studio(team=team)) if (all or studio) and token else set()
     )
 
     rows = [