refactor: Improve import order and cleanup environment creation in examples

Author: akosyakov

examples/anthropic_tool_use.py

@@ -2,11 +2,12 @@
 
 from __future__ import annotations
 
-from gitpod import AsyncGitpod
-import gitpod.lib as util
 from anthropic import Anthropic
 from anthropic.types import ToolParam, MessageParam
 
+import gitpod.lib as util
+from gitpod import AsyncGitpod
+
 gpclient = AsyncGitpod()
 llmclient = Anthropic()
 
@@ -33,7 +34,7 @@
     },
 ]
 
-async def create_environment(args: dict[str, str]) -> str:
+async def create_environment(args: dict[str, str], cleanup: util.Disposables) -> str:
     env_class = await util.find_most_used_environment_class(gpclient)
     if not env_class:
         raise Exception("No environment class found. Please create one first.")
@@ -46,6 +47,7 @@ async def create_environment(args: dict[str, str]) -> str:
             "machine": {"class": env_class.id},
         }
     )).environment.id
+    cleanup.add(lambda: asyncio.run(gpclient.environments.delete(environment_id=environment_id)))
     print(f"\nCreated environment: {environment_id} - waiting for it to be ready...")
     await util.wait_for_environment_ready(gpclient, environment_id)
     print(f"\nEnvironment is ready: {environment_id}")
@@ -81,8 +83,7 @@ async def main(cleanup: util.Disposables):
         for tool in (c for c in message.content if c.type == "tool_use"):
             try:
                 if tool.name == "create_environment":
-                    environment_id = await create_environment(tool.input)
-                    cleanup.add(lambda: asyncio.run(gpclient.environments.delete(environment_id=environment_id)))
+                    environment_id = await create_environment(tool.input, cleanup)
                     messages.append({
                         "role": "user",
                         "content": [{

examples/fs_access.py

@@ -1,13 +1,16 @@
 #!/usr/bin/env python
 
-from io import StringIO
 import sys
 import asyncio
+from io import StringIO
+
 import paramiko
-from gitpod import AsyncGitpod
+
 import gitpod.lib as util
+from gitpod import AsyncGitpod
 from gitpod.types.environment_spec_param import EnvironmentSpecParam
 
+
 # Examples:
 # - ./examples/fs_access.py
 # - ./examples/fs_access.py https://github.com/gitpod-io/empty

examples/run_command.py

@@ -2,10 +2,12 @@
 
 import sys
 import asyncio
-from gitpod import AsyncGitpod
+
 import gitpod.lib as util
+from gitpod import AsyncGitpod
 from gitpod.types.environment_spec_param import EnvironmentSpecParam
 
+
 # Examples:
 # - ./examples/run_command.py 'echo "Hello World!"'
 # - ./examples/run_command.py 'echo "Hello World!"' https://github.com/gitpod-io/empty

examples/run_service.py

@@ -2,10 +2,12 @@
 
 import sys
 import asyncio
-from gitpod import AsyncGitpod
+
 import gitpod.lib as util
+from gitpod import AsyncGitpod
 from gitpod.types.environment_spec_param import EnvironmentSpecParam
 
+
 # Examples:
 # - ./examples/run_service.py
 # - ./examples/run_service.py https://github.com/gitpod-io/empty

src/gitpod/lib/__init__.py

@@ -1,6 +1,6 @@
 from .automation import run_command, run_service
-from .environment import find_most_used_environment_class, EnvironmentState, wait_for_environment_ready
 from .disposables import Disposables
+from .environment import EnvironmentState, wait_for_environment_ready, find_most_used_environment_class
 
 __all__ = [
     'find_most_used_environment_class',

src/gitpod/lib/automation.py

@@ -1,9 +1,11 @@
 import asyncio
+from typing import Callable, Optional, Awaitable, AsyncIterator
+
 import httpx
-from typing import AsyncIterator, Awaitable, Callable, Optional
 
 from gitpod._client import AsyncGitpod
 from gitpod.types.environments.automations import service_create_params
+
 TASK_REFERENCE = "gitpod-python-sdk"
 
 async def run_service(

src/gitpod/lib/disposables.py

@@ -1,5 +1,5 @@
-from typing import Any, Callable, List
 import logging
+from typing import Any, List, Callable
 
 log = logging.getLogger(__name__)
 

src/gitpod/lib/environment.py

@@ -1,6 +1,6 @@
-from typing import Optional, Callable, List, TypeVar
 import asyncio
 import logging
+from typing import List, TypeVar, Callable, Optional
 
 from gitpod import AsyncGitpod
 from gitpod.types.shared import EnvironmentClass