indent 0.1.10__py3-none-any.whl → 0.1.12__py3-none-any.whl

exponent/commands/config_commands.py

@@ -13,11 +13,6 @@ from exponent.commands.settings import use_settings
 from exponent.commands.types import exponent_cli_group
 from exponent.core.config import Settings
 from exponent.core.graphql.client import GraphQLClient
-from exponent.core.graphql.cloud_config_queries import (
-    CREATE_CLOUD_CONFIG_MUTATION,
-    GET_CLOUD_CONFIGS_QUERY,
-    UPDATE_CLOUD_CONFIG_MUTATION,
-)
 from exponent.core.graphql.get_chats_query import GET_CHATS_QUERY
 from exponent.core.graphql.github_config_queries import (
     CHECK_GITHUB_CONFIG_VALIDITY_QUERY,
@@ -185,7 +180,7 @@ async def repos_for_github_config_task(
     help="Clear use default colors",
 )
 @use_settings
-def config(
+def config(  # noqa: PLR0913
     settings: Settings,
     set_git_warning_disabled: bool,
     set_git_warning_enabled: bool,
@@ -394,34 +389,6 @@ async def get_authenticated_user_task(
         click.echo(it)
 
 
-@config_cli.command(hidden=True)
-@use_settings
-def get_cloud_configs(
-    settings: Settings,
-) -> None:
-    if not settings.api_key:
-        redirect_to_login(settings)
-        return
-
-    run_until_complete(
-        get_cloud_configs_task(
-            api_key=settings.api_key,
-            base_api_url=settings.get_base_api_url(),
-            base_ws_url=settings.get_base_ws_url(),
-        )
-    )
-
-
-async def get_cloud_configs_task(
-    api_key: str,
-    base_api_url: str,
-    base_ws_url: str,
-) -> None:
-    graphql_client = GraphQLClient(api_key, base_api_url, base_ws_url)
-    result = await graphql_client.execute(GET_CLOUD_CONFIGS_QUERY)
-    click.echo(result)
-
-
 async def create_github_config_task(
     api_key: str,
     base_api_url: str,
@@ -436,133 +403,6 @@ async def create_github_config_task(
     click.echo(result)
 
 
-@config_cli.command(hidden=True)
-@click.option("--github-pat", required=True, help="Github personal access token")
-@use_settings
-def create_github_config(
-    settings: Settings,
-    github_pat: str,
-) -> None:
-    if not settings.api_key:
-        redirect_to_login(settings)
-        return
-
-    run_until_complete(
-        create_github_config_task(
-            api_key=settings.api_key,
-            base_api_url=settings.get_base_api_url(),
-            base_ws_url=settings.get_base_ws_url(),
-            github_pat=github_pat,
-        )
-    )
-
-
-@config_cli.command(hidden=True)
-@click.option("--github-org-name", required=True, help="GitHub organization name")
-@click.option("--github-repo-name", required=True, help="GitHub repository name")
-@click.option(
-    "--setup_commands",
-    required=False,
-    help="List of commands to set up and build your repo",
-    multiple=True,
-)
-@use_settings
-def create_cloud_config(
-    settings: Settings,
-    github_org_name: str,
-    github_repo_name: str,
-    setup_commands: list[str] | None = None,
-) -> None:
-    if not settings.api_key:
-        redirect_to_login(settings)
-        return
-
-    run_until_complete(
-        create_cloud_config_task(
-            api_key=settings.api_key,
-            base_api_url=settings.get_base_api_url(),
-            base_ws_url=settings.get_base_ws_url(),
-            github_org_name=github_org_name,
-            github_repo_name=github_repo_name,
-            setup_commands=setup_commands,
-        )
-    )
-
-
-async def create_cloud_config_task(
-    api_key: str,
-    base_api_url: str,
-    base_ws_url: str,
-    github_org_name: str,
-    github_repo_name: str,
-    setup_commands: list[str] | None,
-) -> None:
-    graphql_client = GraphQLClient(api_key, base_api_url, base_ws_url)
-    variables = {
-        "githubOrgName": github_org_name,
-        "githubRepoName": github_repo_name,
-        "setupCommands": setup_commands,
-    }
-    result = await graphql_client.execute(CREATE_CLOUD_CONFIG_MUTATION, variables)
-    click.echo(result)
-
-
-@config_cli.command(hidden=True)
-@click.option("--cloud-config-uuid", required=True, help="Cloud config UUID")
-@click.option("--github-org-name", required=True, help="GitHub organization name")
-@click.option("--github-repo-name", required=True, help="GitHub repository name")
-@click.option(
-    "--setup_commands",
-    required=False,
-    help="List of commands to set up and build your repo",
-    multiple=True,
-)
-@use_settings
-def update_cloud_config(
-    settings: Settings,
-    cloud_config_uuid: str,
-    github_org_name: str,
-    github_repo_name: str,
-    setup_commands: list[str] | None = None,
-) -> None:
-    if not settings.api_key:
-        redirect_to_login(settings)
-        return
-
-    run_until_complete(
-        update_cloud_config_task(
-            api_key=settings.api_key,
-            base_api_url=settings.get_base_api_url(),
-            base_ws_url=settings.get_base_ws_url(),
-            cloud_config_uuid=cloud_config_uuid,
-            github_org_name=github_org_name,
-            github_repo_name=github_repo_name,
-            setup_commands=setup_commands,
-        )
-    )
-
-
-async def update_cloud_config_task(
-    api_key: str,
-    base_api_url: str,
-    base_ws_url: str,
-    cloud_config_uuid: str,
-    github_org_name: str,
-    github_repo_name: str,
-    setup_commands: list[str] | None,
-) -> None:
-    graphql_client = GraphQLClient(api_key, base_api_url, base_ws_url)
-    variables = {
-        "cloudConfigUuid": cloud_config_uuid,
-        "githubOrgName": github_org_name,
-        "githubRepoName": github_repo_name,
-        "setupCommands": setup_commands,
-    }
-
-    result = await graphql_client.execute(UPDATE_CLOUD_CONFIG_MUTATION, variables)
-    click.echo(result)
-
-
 @config_cli.command(hidden=True)
 @use_settings
 def refresh_key(settings: Settings) -> None:

exponent/commands/run_commands.py

@@ -61,12 +61,19 @@ def run_cli() -> None:
     hidden=True,
     required=False,
 )
+@click.option(
+    "--timeout-seconds",
+    type=int,
+    help="Number of seconds without receiving a request before shutting down",
+    envvar="INDENT_TIMEOUT_SECONDS",
+)
 @use_settings
 def run(
     settings: Settings,
     chat_id: str | None = None,
     prompt: str | None = None,
     workflow_id: str | None = None,
+    timeout_seconds: int | None = None,
 ) -> None:
     """[default] Start or reconnect to an Indent session."""
     check_exponent_version_and_upgrade(settings)
@@ -104,7 +111,9 @@ def run(
         launch_exponent_browser(settings.environment, base_url, chat_uuid)
 
     while True:
-        result = run_chat(loop, api_key, chat_uuid, settings, prompt, workflow_id)
+        result = run_chat(
+            loop, api_key, chat_uuid, settings, prompt, workflow_id, timeout_seconds
+        )
         if result is None or isinstance(result, WSDisconnected):
             # NOTE: None here means that handle_connection_changes exited
             # first. We should likely have a different message for this.
@@ -112,11 +121,11 @@ def run(
                 click.secho(f"Error: {result.error_message}", fg="red")
                 sys.exit(10)
             else:
-                print("Disconnected upon user request, shutting down...")
+                click.echo("Disconnected upon user request, shutting down...")
                 break
         elif isinstance(result, SwitchCLIChat):
             chat_uuid = result.new_chat_uuid
-            print("\nSwitching chats...")
+            click.echo("\nSwitching chats...")
         else:
             assert_unreachable(result)
 
@@ -128,6 +137,7 @@ def run_chat(
     settings: Settings,
     prompt: str | None,
     workflow_id: str | None,
+    timeout_seconds: int | None,
 ) -> REMOTE_EXECUTION_CLIENT_EXIT_INFO | None:
     start_ts = time.time()
     base_url = settings.base_url
@@ -135,7 +145,7 @@ def run_chat(
     base_ws_url = settings.get_base_ws_url()
 
     print_exponent_message(base_url, chat_uuid)
-    print()
+    click.echo()
 
     connection_tracker = ConnectionTracker()
 
@@ -149,6 +159,7 @@ def run_chat(
             prompt=prompt,
             workflow_id=workflow_id,
             connection_tracker=connection_tracker,
+            timeout_seconds=timeout_seconds,
         )
     )
 
@@ -179,27 +190,27 @@ async def handle_connection_changes(
     try:
         async with timeout(5):
             assert await connection_tracker.next_change()
-            print(ready_message(start_ts))
+            click.echo(ready_message(start_ts))
     except TimeoutError:
         spinner = Spinner("Connecting...")
         spinner.show()
         assert await connection_tracker.next_change()
         spinner.hide()
-        print(ready_message(start_ts))
+        click.echo(ready_message(start_ts))
 
     while True:
         assert not await connection_tracker.next_change()
 
-        print("Disconnected...", end="")
+        click.echo("Disconnected...", nl=False)
         await asyncio.sleep(1)
         spinner = Spinner("Reconnecting...")
         spinner.show()
         assert await connection_tracker.next_change()
         spinner.hide()
-        print("\x1b[1;32m✓ Reconnected", end="")
+        click.echo("\x1b[1;32m✓ Reconnected", nl=False)
         sys.stdout.flush()
         await asyncio.sleep(1)
-        print("\r\x1b[0m\x1b[2K", end="")
+        click.echo("\r\x1b[0m\x1b[2K", nl=False)
         sys.stdout.flush()
 
 

exponent/commands/utils.py

@@ -98,9 +98,9 @@ class Spinner:
             while True:
                 t = time.time() - base_time
                 i = round(t * self.animation_speed) % len(self.animation_chars)
-                print(
+                click.echo(
                     f"\r{style_start}{self.animation_chars[i]} {self.text}{style_end}",
-                    end="",
+                    nl=False,
                 )
                 await asyncio.sleep(0.1)
 
@@ -112,7 +112,7 @@ class Spinner:
 
         self.task.cancel()
         self.task = None
-        print("\r\x1b[0m\x1b[2K", end="")
+        click.echo("\r\x1b[0m\x1b[2K", nl=False)
         sys.stdout.flush()
 
 

exponent/commands/workflow_commands.py

@@ -47,7 +47,7 @@ def trigger(settings: Settings, workflow_type: str) -> None:
 
     while True:
         result = run_chat(
-            loop, settings.api_key, response.chat_uuid, settings, None, None
+            loop, settings.api_key, response.chat_uuid, settings, None, None, None
         )
         if result is None or isinstance(result, WSDisconnected):
             # NOTE: None here means that handle_connection_changes exited
@@ -56,7 +56,7 @@ def trigger(settings: Settings, workflow_type: str) -> None:
                 click.secho(f"Error: {result.error_message}", fg="red")
                 sys.exit(10)
             else:
-                print("Disconnected upon user request, shutting down...")
+                click.echo("Disconnected upon user request, shutting down...")
                 break
         else:
             raise click.ClickException("Workflow run exited unexpectedly")

exponent/core/config.py

@@ -24,7 +24,6 @@ logger = logging.getLogger(__name__)
 
 
 def is_editable_install() -> bool:
-
     if os.getenv("ENVIRONMENT") == "test" or os.getenv("EXPONENT_TEST_AUTO_UPGRADE"):
         # We should explicitly set these variables
         # in test when needed

exponent/core/graphql/mutations.py

@@ -73,3 +73,117 @@ mutation CreateCloudChat($configId: String!) {
   }
 }
 """
+
+
+CREATE_CLOUD_CHAT_FROM_REPOSITORY_MUTATION = """
+mutation CreateCloudChatFromRepository($repositoryId: String!) {
+  createCloudChat(repositoryId: $repositoryId) {
+    __typename
+    ...on Chat {
+      chatUuid
+    }
+    ...on UnauthenticatedError {
+      message
+    }
+    ...on ChatNotFoundError {
+      message
+    }
+    ...on CloudConfigNotFoundError {
+      message
+    }
+    ...on GithubConfigNotFoundError {
+      message
+    }
+    ...on CloudSessionError {
+      message
+    }
+  }
+}
+"""
+
+
+ENABLE_CLOUD_REPOSITORY_MUTATION = """
+mutation EnableCloudRepository($orgName: String!, $repoName: String!) {
+  enableCloudRepository(orgName: $orgName, repoName: $repoName) {
+    __typename
+    ...on ContainerImage {
+      buildRef
+      createdAt
+      updatedAt
+    }
+    ...on UnauthenticatedError {
+      message
+    }
+    ...on CloudConfigNotFoundError {
+      message
+    }
+    ...on GithubConfigNotFoundError {
+      message
+    }
+    ...on CloudSessionError {
+      message
+    }
+    ...on Error {
+      message
+    }
+  }
+}
+"""
+
+
+INCREMENTAL_BUILD_CLOUD_REPOSITORY_MUTATION = """
+mutation IncrementalBuildCloudRepository($orgName: String!, $repoName: String!) {
+  incrementalBuildCloudRepository(orgName: $orgName, repoName: $repoName) {
+    __typename
+    ...on ContainerImage {
+      buildRef
+      createdAt
+      updatedAt
+    }
+    ...on UnauthenticatedError {
+      message
+    }
+    ...on CloudConfigNotFoundError {
+      message
+    }
+    ...on GithubConfigNotFoundError {
+      message
+    }
+    ...on CloudSessionError {
+      message
+    }
+    ...on Error {
+      message
+    }
+  }
+}
+"""
+
+
+REBUILD_CLOUD_REPOSITORY_MUTATION = """
+mutation RebuildCloudRepository($orgName: String!, $repoName: String!) {
+  rebuildCloudRepository(orgName: $orgName, repoName: $repoName) {
+    __typename
+    ...on ContainerImage {
+      buildRef
+      createdAt
+      updatedAt
+    }
+    ...on UnauthenticatedError {
+      message
+    }
+    ...on CloudConfigNotFoundError {
+      message
+    }
+    ...on GithubConfigNotFoundError {
+      message
+    }
+    ...on CloudSessionError {
+      message
+    }
+    ...on Error {
+      message
+    }
+  }
+}
+"""

exponent/core/graphql/queries.py

@@ -1,3 +1,26 @@
+GITHUB_REPOSITORIES_QUERY: str = """
+query GithubRepositories {
+  githubRepositories {
+    __typename
+    ... on GithubRepositories {
+      repositories {
+        id
+        githubOrgName
+        githubRepoName
+        baseHost
+        containerImageId
+        createdAt
+        updatedAt
+      }
+    }
+    ... on Error {
+      message
+    }
+  }
+}
+"""
+
+
 EVENTS_FOR_CHAT_QUERY: str = """query EventsForChat($chatUuid: UUID!) {
   eventsForChat(chatUuid: $chatUuid) {
     ... on EventHistory {