Generalize 404 error handling

Author: ValentaTomas

packages/js-sdk/src/api/index.ts

@@ -3,7 +3,7 @@ import createClient, { FetchResponse } from 'openapi-fetch'
 import type { components, paths } from './schema.gen'
 import { defaultHeaders } from './metadata'
 import { ConnectionConfig } from '../connectionConfig'
-import { AuthenticationError, RateLimitError, SandboxError } from '../errors'
+import { AuthenticationError, RateLimitError, SandboxError, NotFoundError } from '../errors'
 import { createApiLogger } from '../logs'
 
 export function handleApiError(
@@ -18,28 +18,31 @@ export function handleApiError(
     return
   }
 
+  const content = response.error?.message ?? response.error
+
   if (response.response.status === 401) {
     const message = 'Unauthorized, please check your credentials.'
-    const content = response.error?.message ?? response.error
 
-    if (content) {
-      return new AuthenticationError(`${message} - ${content}`)
-    }
-    return new AuthenticationError(message)
+    return content
+      ? new AuthenticationError(`${message} - ${content}`)
+      : new AuthenticationError(message)
   }
 
   if (response.response.status === 429) {
     const message = 'Rate limit exceeded, please try again later'
-    const content = response.error?.message ?? response.error
 
-    if (content) {
-      return new RateLimitError(`${message} - ${content}`)
-    }
-    return new RateLimitError(message)
+    return content
+      ? new RateLimitError(`${message} - ${content}`)
+      : new RateLimitError(message)
+  }
+
+  if (response.response.status === 404) {
+    return content
+      ? new NotFoundError(`${content}`)
+      : new NotFoundError('Not found')
   }
 
-  const message = response.error?.message ?? response.error
-  return new errorClass(`${response.response.status}: ${message}`, stackTrace)
+  return new errorClass(`${response.response.status}: ${content}`, stackTrace)
 }
 
 /**
@@ -58,15 +61,15 @@ class ApiClient {
     if (opts?.requireApiKey && !config.apiKey) {
       throw new AuthenticationError(
         'API key is required, please visit the Team tab at https://e2b.dev/dashboard to get your API key. ' +
-          'You can either set the environment variable `E2B_API_KEY` ' +
-          "or you can pass it directly to the sandbox like Sandbox.create({ apiKey: 'e2b_...' })"
+        'You can either set the environment variable `E2B_API_KEY` ' +
+        "or you can pass it directly to the sandbox like Sandbox.create({ apiKey: 'e2b_...' })"
       )
     }
 
     if (opts?.requireAccessToken && !config.accessToken) {
       throw new AuthenticationError(
         'Access token is required, please visit the Personal tab at https://e2b.dev/dashboard to get your access token. ' +
-          'You can set the environment variable `E2B_ACCESS_TOKEN` or pass the `accessToken` in options.'
+        'You can set the environment variable `E2B_ACCESS_TOKEN` or pass the `accessToken` in options.'
       )
     }
 

packages/js-sdk/src/sandbox/sandboxApi.ts

@@ -18,7 +18,7 @@ export interface SandboxApiOpts
       ConnectionOpts,
       'apiKey' | 'headers' | 'debug' | 'domain' | 'requestTimeoutMs'
     >
-  > {}
+  > { }
 
 /**
  * Options for creating a new Sandbox.
@@ -224,7 +224,7 @@ export interface SandboxMetrics {
 }
 
 export class SandboxApi {
-  protected constructor() {}
+  protected constructor() { }
 
   /**
    * Kill the sandbox specified by sandbox ID.
@@ -357,10 +357,6 @@ export class SandboxApi {
       signal: config.getSignal(opts?.requestTimeoutMs),
     })
 
-    if (res.error?.code === 404) {
-      throw new NotFoundError(`Sandbox ${sandboxId} not found`)
-    }
-
     const err = handleApiError(res)
     if (err) {
       throw err
@@ -380,10 +376,6 @@ export class SandboxApi {
       signal: config.getSignal(opts?.requestTimeoutMs),
     })
 
-    if (res.error?.code === 404) {
-      throw new NotFoundError(`Sandbox ${sandboxId} not found`)
-    }
-
     const err = handleApiError(res)
     if (err) {
       throw err
@@ -485,7 +477,7 @@ export class SandboxApi {
       await this.kill(res.data!.sandboxID, opts)
       throw new TemplateError(
         'You need to update the template to use the new SDK. ' +
-          'You can do this by running `e2b template build` in the directory with the template.'
+        'You can do this by running `e2b template build` in the directory with the template.'
       )
     }
 

packages/python-sdk/e2b/api/__init__.py

@@ -13,6 +13,7 @@
     AuthenticationException,
     SandboxException,
     RateLimitException,
+    NotFoundException,
 )
 from e2b.api.client.types import Response
 
@@ -37,23 +38,30 @@ def handle_api_exception(
     except json.JSONDecodeError:
         body = {}
 
+    content = body.get("message", str(e.content))
+
     if e.status_code == 401:
         message = f"{e.status_code}: Unauthorized, please check your credentials."
-        if body.get("message"):
-            message += f" - {body['message']}"
-        return AuthenticationException(message)
+
+        return (
+            AuthenticationException(f"{message} - {content}")
+            if content
+            else AuthenticationException(message)
+        )
 
     if e.status_code == 429:
         message = f"{e.status_code}: Rate limit exceeded, please try again later."
-        if body.get("message"):
-            message += f" - {body['message']}"
-        return RateLimitException(message)
-
-    if "message" in body:
-        return default_exception_class(
-            f"{e.status_code}: {body['message']}"
-        ).with_traceback(stack_trace)
-    return default_exception_class(f"{e.status_code}: {e.content}").with_traceback(
+
+        return (
+            RateLimitException(f"{message} - {content}")
+            if content
+            else RateLimitException(message)
+        )
+
+    if e.status_code == 404:
+        return NotFoundException(content) if content else NotFoundException("Not found")
+
+    return default_exception_class(f"{e.status_code}: {content}").with_traceback(
         stack_trace
     )
 

packages/python-sdk/e2b/sandbox_async/sandbox_api.py

@@ -76,9 +76,6 @@ async def _cls_get_info(
                 client=api_client,
             )
 
-            if res.status_code == 404:
-                raise NotFoundException(f"Sandbox {sandbox_id} not found")
-
             if res.status_code >= 300:
                 raise handle_api_exception(res)
 
@@ -142,9 +139,6 @@ async def _cls_set_timeout(
                 body=PostSandboxesSandboxIDTimeoutBody(timeout=timeout),
             )
 
-            if res.status_code == 404:
-                raise NotFoundException(f"Paused sandbox {sandbox_id} not found")
-
             if res.status_code >= 300:
                 raise handle_api_exception(res)
 

packages/python-sdk/e2b/sandbox_sync/sandbox_api.py

@@ -75,9 +75,6 @@ def _cls_get_info(
                 client=api_client,
             )
 
-            if res.status_code == 404:
-                raise NotFoundException(f"Sandbox {sandbox_id} not found")
-
             if res.status_code >= 300:
                 raise handle_api_exception(res)
 
@@ -141,9 +138,6 @@ def _cls_set_timeout(
                 body=PostSandboxesSandboxIDTimeoutBody(timeout=timeout),
             )
 
-            if res.status_code == 404:
-                raise NotFoundException(f"Sandbox {sandbox_id} not found")
-
             if res.status_code >= 300:
                 raise handle_api_exception(res)