clean up cli module structure

Author: aaronsteers

airbyte_cdk/cli/airbyte_cdk/__init__.py

@@ -0,0 +1,62 @@
+# Copyright (c) 2025 Airbyte, Inc., all rights reserved.
+"""CLI commands for `airbyte-cdk`.
+
+This CLI interface allows you to interact with your connector, including
+testing and running commands.
+
+**Basic Usage:**
+
+```bash
+airbyte-cdk --help
+airbyte-cdk connector --help
+airbyte-cdk manifest --help
+```
+
+**Running Statelessly:**
+
+You can run the latest version of this CLI, from any machine, using `pipx` or `uvx`:
+
+```bash
+# Run the latest version of the CLI:
+pipx run airbyte-cdk connector --help
+uvx airbyte-cdk connector --help
+
+# Run from a specific CDK version:
+pipx run airbyte-cdk==6.5.1 connector --help
+uvx airbyte-cdk==6.5.1 connector --help
+```
+
+**Running within your virtualenv:**
+
+You can also run from your connector's virtualenv:
+
+```bash
+poetry run airbyte-cdk connector --help
+```
+
+"""
+
+from typing import cast
+
+import click
+
+from airbyte_cdk.cli.airbyte_cdk._connector import connector_cli_group
+from airbyte_cdk.cli.airbyte_cdk._manifest import manifest_cli_group
+
+
+@click.group(
+    help=cast(str, __doc__).replace("\n", "\n\n"),  # Workaround to format help text correctly
+)
+def cli() -> None:
+    """Airbyte CDK CLI.
+
+    Help text is provided from the file-level docstring.
+    """
+
+
+cli.add_command(connector_cli_group)
+cli.add_command(manifest_cli_group)
+
+
+if __name__ == "__main__":
+    cli()

airbyte_cdk/cli/airbyte_cdk/_run.py airbyte_cdk/cli/airbyte_cdk/_connector.pyairbyte_cdk/cli/airbyte_cdk/_run.py renamed to airbyte_cdk/cli/airbyte_cdk/_connector.py

@@ -85,17 +85,13 @@
 '''
 
 
-@click.group()
-def connector() -> None:
+@click.group(name="connector")
+def connector_cli_group() -> None:
     """Connector related commands."""
     pass
 
-@click.group()
-def manifest() -> None:
-    """Manifest related commands."""
-    pass
 
-@connector.command()
+@connector_cli_group.command()
 @click.option(
     "--connector-name",
     type=str,
@@ -184,20 +180,7 @@ def test(
         plugins=[],
     )
 
-@click.group(
-    help=USAGE.replace("\n", "\n\n"),  # Workaround to format help text correctly
-)
-def cli() -> None:
-    """Airbyte CDK CLI.
-
-    Help text is provided from the file-level docstring.
-    """
 
-cli.add_command(connector)
-cli.add_command(manifest)
-
-def main() -> None:
-    cli()
-
-if __name__ == "__main__":
-    main()
+__all__ = [
+    "connector_cli_group",
+]

airbyte_cdk/cli/airbyte_cdk/_manifest.py

@@ -0,0 +1,15 @@
+# Copyright (c) 2025 Airbyte, Inc., all rights reserved.
+"""Manifest related commands."""
+
+import click
+
+
+@click.group(name="manifest")
+def manifest_cli_group() -> None:
+    """Manifest related commands."""
+    pass
+
+
+__all__ = [
+    "manifest_cli_group",
+]