Chore: Merge cli and cli_commands

client/ayon_core/cli.py

@@ -5,6 +5,7 @@
 import code
 import traceback
 from pathlib import Path
+import warnings
 
 import click
 import acre
@@ -18,7 +19,6 @@
     Logger,
 )
 
-from .cli_commands import Commands
 
 
 class AliasedGroup(click.Group):
@@ -116,14 +116,25 @@ def extractenvironments(
         This function is deprecated and will be removed in future. Please use
         'addon applications extractenvironments ...' instead.
     """
-    Commands.extractenvironments(
-        output_json_path,
-        project,
-        asset,
-        task,
-        app,
-        envgroup,
-        ctx.obj["addons_manager"]
+    warnings.warn(
+        (
+            "Command 'extractenvironments' is deprecated and will be"
+            " removed in future. Please use"
+            " 'addon applications extractenvironments ...' instead."
+        ),
+        DeprecationWarning
+    )
+
+    addons_manager = ctx.obj["addons_manager"]
+    applications_addon = addons_manager.get_enabled_addon("applications")
+    if applications_addon is None:
+        raise RuntimeError(
+            "Applications addon is not available or enabled."
+        )
+
+    # Please ignore the fact this is using private method
+    applications_addon._cli_extract_environments(
+        output_json_path, project, asset, task, app, envgroup
     )
 
 
@@ -132,15 +143,15 @@ def extractenvironments(
 @click.argument("path", required=True)
 @click.option("-t", "--targets", help="Targets", default=None,
               multiple=True)
-@click.option("-g", "--gui", is_flag=True,
-              help="Show Publish UI", default=False)
-def publish(ctx, path, targets, gui):
+def publish(ctx, path, targets):
     """Start CLI publishing.
 
     Publish collects json from path provided as an argument.
 
     """
-    Commands.publish(path, targets, gui, ctx.obj["addons_manager"])
+    from ayon_core.pipeline.publish import main_cli_publish
+
+    main_cli_publish(path, targets, ctx.obj["addons_manager"])
 
 
 @main_cli.command(context_settings={"ignore_unknown_options": True})
@@ -170,12 +181,10 @@ def contextselection(
     Context is project name, folder path and task name. The result is stored
     into json file which path is passed in first argument.
     """
-    Commands.contextselection(
-        output_path,
-        project,
-        folder,
-        strict
-    )
+    from ayon_core.tools.context_dialog import main
+
+    main(output_path, project, folder, strict)
+
 
 
 @main_cli.command(

client/ayon_core/pipeline/publish/__init__.py

@@ -42,6 +42,8 @@
     get_plugin_settings,
     get_publish_instance_label,
     get_publish_instance_families,
+
+    main_cli_publish,
 )
 
 from .abstract_expected_files import ExpectedFiles
@@ -92,6 +94,8 @@
     "get_publish_instance_label",
     "get_publish_instance_families",
 
+    "main_cli_publish",
+
     "ExpectedFiles",
 
     "RenderInstance",