berget 1.3.1 → 2.0.0

package/src/services/api-key-service.ts

@@ -108,7 +108,7 @@ export class ApiKeyService {
         '/v1/api-keys/{id}/rotate',
         {
           params: { path: { id } },
-        }
+        },
       )
       if (error) throw new Error(JSON.stringify(error))
       return data!

package/src/services/auth-service.ts

@@ -37,7 +37,7 @@ export class AuthService {
       const { data: profile, error } = await this.client.GET('/v1/users/me')
       if (error) {
         throw new Error(
-          error ? JSON.stringify(error) : 'Failed to get user profile'
+          error ? JSON.stringify(error) : 'Failed to get user profile',
         )
       }
       return profile
@@ -57,14 +57,14 @@ export class AuthService {
       // Step 1: Initiate device authorization
       const { data: deviceData, error: deviceError } = await apiClient.POST(
         '/v1/auth/device',
-        {}
+        {},
       )
 
       if (deviceError || !deviceData) {
         throw new Error(
           deviceError
             ? JSON.stringify(deviceError)
-            : 'Failed to get device authorization data'
+            : 'Failed to get device authorization data',
         )
       }
 
@@ -83,17 +83,17 @@ export class AuthService {
         chalk.cyan(
           `1. Open this URL: ${chalk.bold(
             typedDeviceData.verification_url ||
-              'https://keycloak.berget.ai/device'
-          )}`
-        )
+              'https://keycloak.berget.ai/device',
+          )}`,
+        ),
       )
       if (!typedDeviceData.verification_url)
         console.log(
           chalk.cyan(
             `2. Enter this code: ${chalk.bold(
-              typedDeviceData.user_code || ''
-            )}\n`
-          )
+              typedDeviceData.user_code || '',
+            )}\n`,
+          ),
         )
 
       // Try to open browser automatically
@@ -104,15 +104,15 @@ export class AuthService {
           await open(typedDeviceData.verification_url)
           console.log(
             chalk.dim(
-              "Browser opened automatically. If it didn't open, please use the URL above."
-            )
+              "Browser opened automatically. If it didn't open, please use the URL above.",
+            ),
           )
         }
       } catch (error) {
         console.log(
           chalk.yellow(
-            'Could not open browser automatically. Please open the URL manually.'
-          )
+            'Could not open browser automatically. Please open the URL manually.',
+          ),
         )
       }
 
@@ -136,7 +136,7 @@ export class AuthService {
 
         // Update spinner
         process.stdout.write(
-          `\r${chalk.blue(spinner[spinnerIdx])} Waiting for authentication...`
+          `\r${chalk.blue(spinner[spinnerIdx])} Waiting for authentication...`,
         )
         spinnerIdx = (spinnerIdx + 1) % spinner.length
 
@@ -148,7 +148,7 @@ export class AuthService {
             body: {
               device_code: deviceCode,
             },
-          }
+          },
         )
 
         if (tokenError) {
@@ -170,7 +170,7 @@ export class AuthService {
             // Error or expired
             if (errorCode === 'EXPIRED_TOKEN') {
               console.log(
-                chalk.red('\n\nAuthentication timed out. Please try again.')
+                chalk.red('\n\nAuthentication timed out. Please try again.'),
               )
             } else if (errorCode !== 'AUTHORIZATION_PENDING') {
               // Only show error if it's not the expected "still waiting" error
@@ -187,15 +187,15 @@ export class AuthService {
             // This makes the flow more resilient to temporary issues
             if (process.env.DEBUG) {
               console.log(
-                chalk.yellow(`\n\nReceived error: ${JSON.stringify(errorObj)}`)
+                chalk.yellow(`\n\nReceived error: ${JSON.stringify(errorObj)}`),
               )
               console.log(
-                chalk.yellow('Continuing to wait for authentication...')
+                chalk.yellow('Continuing to wait for authentication...'),
               )
               process.stdout.write(
                 `\r${chalk.blue(
-                  spinner[spinnerIdx]
-                )} Waiting for authentication...`
+                  spinner[spinnerIdx],
+                )} Waiting for authentication...`,
               )
             }
             continue
@@ -219,7 +219,7 @@ export class AuthService {
             saveAuthToken(
               typedTokenData.token,
               typedTokenData.refresh_token || '',
-              typedTokenData.expires_in || 3600
+              typedTokenData.expires_in || 3600,
             )
 
             if (process.argv.includes('--debug')) {
@@ -232,9 +232,9 @@ export class AuthService {
                       refresh_expires_in: typedTokenData.refresh_expires_in,
                     },
                     null,
-                    2
-                  )
-                )
+                    2,
+                  ),
+                ),
               )
             }
 
@@ -244,7 +244,9 @@ export class AuthService {
             if (typedTokenData.user) {
               const user = typedTokenData.user
               console.log(
-                chalk.green(`Logged in as ${user.name || user.email || 'User'}`)
+                chalk.green(
+                  `Logged in as ${user.name || user.email || 'User'}`,
+                ),
               )
             }
 

package/src/services/chat-service.ts

@@ -1,4 +1,4 @@
-import { createAuthenticatedClient, API_BASE_URL } from '../client'
+import { createAuthenticatedClient } from '../client'
 import { logger } from '../utils/logger'
 
 export interface ChatMessage {
@@ -73,8 +73,8 @@ export class ChatService {
                 : '0 messages',
             },
             null,
-            2
-          )
+            2,
+          ),
         )
       } catch (error) {
         logger.error('Failed to stringify options:', error)
@@ -121,7 +121,7 @@ export class ChatService {
 
           logger.debug(`Default API key data exists: ${!!defaultApiKeyData}`)
           logger.debug(
-            `promptForDefaultApiKey returned: ${apiKey ? 'a key' : 'null'}`
+            `promptForDefaultApiKey returned: ${apiKey ? 'a key' : 'null'}`,
           )
 
           if (apiKey) {
@@ -130,10 +130,10 @@ export class ChatService {
           } else {
             logger.warn('No API key available. You need to either:')
             logger.warn(
-              '1. Create an API key with: berget api-keys create --name "My Key"'
+              '1. Create an API key with: berget api-keys create --name "My Key"',
             )
             logger.warn(
-              '2. Set a default API key with: berget api-keys set-default <id>'
+              '2. Set a default API key with: berget api-keys set-default <id>',
             )
             logger.warn('3. Provide an API key with the --api-key option')
             logger.warn('4. Set the BERGET_API_KEY environment variable')
@@ -141,7 +141,7 @@ export class ChatService {
             logger.warn('  export BERGET_API_KEY=your_api_key_here')
             logger.warn('  # or for a single command:')
             logger.warn(
-              '  BERGET_API_KEY=your_api_key_here berget chat run google/gemma-3-27b-it'
+              '  BERGET_API_KEY=your_api_key_here berget chat run google/gemma-3-27b-it',
             )
             throw new Error('No API key provided and no default API key set')
           }
@@ -159,7 +159,7 @@ export class ChatService {
             logger.error(error.message)
           }
           logger.warn(
-            'Please create an API key with: berget api-keys create --name "My Key"'
+            'Please create an API key with: berget api-keys create --name "My Key"',
           )
           throw new Error('Failed to get API key')
         }
@@ -179,8 +179,8 @@ export class ChatService {
             apiKey: optionsCopy.apiKey ? '***' : undefined, // Hide the actual API key in debug output
           },
           null,
-          2
-        )
+          2,
+        ),
       )
 
       return this.executeCompletion(optionsCopy, headers)
@@ -214,7 +214,7 @@ export class ChatService {
    */
   private async executeCompletion(
     options: ChatCompletionOptions,
-    headers: Record<string, string> = {}
+    headers: Record<string, string> = {},
   ): Promise<any> {
     try {
       // If an API key is provided, use it for this request
@@ -236,15 +236,15 @@ export class ChatService {
               : '0 messages',
           },
           null,
-          2
-        )
+          2,
+        ),
       )
 
       // Handle streaming responses differently
       if (requestOptions.stream && onChunk) {
         return await this.handleStreamingResponse(
           { ...requestOptions, onChunk },
-          headers
+          headers,
         )
       } else {
         // Ensure model is always defined for the API call
@@ -282,7 +282,7 @@ export class ChatService {
           requestError instanceof Error
             ? requestError.message
             : String(requestError)
-        }`
+        }`,
       )
       throw requestError
     }
@@ -295,10 +295,10 @@ export class ChatService {
     // We've exhausted all options for getting an API key
     logger.warn('No API key available. You need to either:')
     logger.warn(
-      '1. Create an API key with: berget api-keys create --name "My Key"'
+      '1. Create an API key with: berget api-keys create --name "My Key"',
     )
     logger.warn(
-      '2. Set a default API key with: berget api-keys set-default <id>'
+      '2. Set a default API key with: berget api-keys set-default <id>',
     )
     logger.warn('3. Provide an API key with the --api-key option')
     logger.warn('4. Set the BERGET_API_KEY environment variable')
@@ -306,10 +306,10 @@ export class ChatService {
     logger.warn('  export BERGET_API_KEY=your_api_key_here')
     logger.warn('  # or for a single command:')
     logger.warn(
-      '  BERGET_API_KEY=your_api_key_here berget chat run google/gemma-3-27b-it'
+      '  BERGET_API_KEY=your_api_key_here berget chat run google/gemma-3-27b-it',
     )
     throw new Error(
-      'No API key available. Please provide an API key or set a default API key.'
+      'No API key available. Please provide an API key or set a default API key.',
     )
   }
 
@@ -321,30 +321,17 @@ export class ChatService {
    */
   private async handleStreamingResponse(
     options: any,
-    headers: Record<string, string>
+    headers: Record<string, string>,
   ): Promise<any> {
-    logger.debug('Handling streaming response')
-
-    // Create URL with query parameters
-    const url = new URL(`${API_BASE_URL}/v1/chat/completions`)
-
-    // Debug the headers and options
-    logger.debug('Streaming headers:')
-    logger.debug(JSON.stringify(headers, null, 2))
-
-    logger.debug('Streaming options:')
-    logger.debug(
-      JSON.stringify(
-        {
-          ...options,
-          onChunk: options.onChunk ? 'function present' : 'no function',
-        },
-        null,
-        2
-      )
-    )
+    // Use the same base URL as the client
+    const baseUrl = process.env.API_BASE_URL || 'https://api.berget.ai'
+    const url = new URL(`${baseUrl}/v1/chat/completions`)
 
     try {
+      logger.debug(`Making streaming request to: ${url.toString()}`)
+      logger.debug(`Headers:`, JSON.stringify(headers, null, 2))
+      logger.debug(`Body:`, JSON.stringify(options, null, 2))
+
       // Make fetch request directly to handle streaming
       const response = await fetch(url.toString(), {
         method: 'POST',
@@ -356,14 +343,20 @@ export class ChatService {
         body: JSON.stringify(options),
       })
 
+      logger.debug(`Response status: ${response.status}`)
+      logger.debug(
+        `Response headers:`,
+        JSON.stringify(Object.fromEntries(response.headers.entries()), null, 2),
+      )
+
       if (!response.ok) {
         const errorText = await response.text()
         logger.error(
-          `Stream request failed: ${response.status} ${response.statusText}`
+          `Stream request failed: ${response.status} ${response.statusText}`,
         )
-        logger.debug(`Error response: ${errorText}`)
+        logger.error(`Error response: ${errorText}`)
         throw new Error(
-          `Stream request failed: ${response.status} ${response.statusText}`
+          `Stream request failed: ${response.status} ${response.statusText} - ${errorText}`,
         )
       }
 
@@ -440,7 +433,7 @@ export class ChatService {
       logger.error(
         `Streaming error: ${
           error instanceof Error ? error.message : String(error)
-        }`
+        }`,
       )
       throw error
     }

package/src/services/cluster-service.ts

@@ -16,10 +16,10 @@ export interface Cluster {
 export class ClusterService {
   private static instance: ClusterService
   private client = createAuthenticatedClient()
-  
+
   // Command group name for this service
   public static readonly COMMAND_GROUP = COMMAND_GROUPS.CLUSTERS
-  
+
   // Subcommands for this service
   public static readonly COMMANDS = SUBCOMMANDS.CLUSTERS
 
@@ -42,7 +42,7 @@ export class ClusterService {
         '/v1/clusters/{clusterId}/usage',
         {
           params: { path: { clusterId } },
-        }
+        },
       )
       if (error) throw new Error(JSON.stringify(error))
       return data
@@ -66,7 +66,7 @@ export class ClusterService {
       throw error
     }
   }
-  
+
   /**
    * Get detailed information about a cluster
    * Command: berget clusters describe
@@ -76,7 +76,7 @@ export class ClusterService {
       // This is a placeholder since the API doesn't have a specific endpoint
       // In a real implementation, this would call a specific endpoint
       const clusters = await this.list()
-      return clusters.find(cluster => cluster.id === clusterId) || null
+      return clusters.find((cluster) => cluster.id === clusterId) || null
     } catch (error) {
       console.error('Failed to describe cluster:', error)
       throw error

package/src/services/collaborator-service.ts

@@ -14,10 +14,10 @@ export interface Collaborator {
 export class CollaboratorService {
   private static instance: CollaboratorService
   private client = createAuthenticatedClient()
-  
+
   // Command group name for this service
   public static readonly COMMAND_GROUP = COMMAND_GROUPS.USERS
-  
+
   // Subcommands for this service
   public static readonly COMMANDS = SUBCOMMANDS.USERS
 
@@ -37,7 +37,7 @@ export class CollaboratorService {
    */
   public async invite(
     clusterId: string,
-    githubUsername: string
+    githubUsername: string,
   ): Promise<Collaborator[]> {
     throw new Error('This functionality is not available in the API')
   }

package/src/services/flux-service.ts

@@ -20,10 +20,10 @@ export interface FluxBootstrapOptions {
 export class FluxService {
   private static instance: FluxService
   private client = createAuthenticatedClient()
-  
+
   // Command group name for this service
   public static readonly COMMAND_GROUP = COMMAND_GROUPS.FLUX
-  
+
   // Subcommands for this service
   public static readonly COMMANDS = SUBCOMMANDS.FLUX
 

package/src/services/helm-service.ts

@@ -20,10 +20,10 @@ export interface HelmInstallOptions {
 export class HelmService {
   private static instance: HelmService
   private client = createAuthenticatedClient()
-  
+
   // Command group name for this service
   public static readonly COMMAND_GROUP = COMMAND_GROUPS.HELM
-  
+
   // Subcommands for this service
   public static readonly COMMANDS = SUBCOMMANDS.HELM
 

package/src/services/kubectl-service.ts

@@ -8,10 +8,10 @@ import { COMMAND_GROUPS, SUBCOMMANDS } from '../constants/command-structure'
 export class KubectlService {
   private static instance: KubectlService
   private client = createAuthenticatedClient()
-  
+
   // Command group name for this service
   public static readonly COMMAND_GROUP = COMMAND_GROUPS.KUBECTL
-  
+
   // Subcommands for this service
   public static readonly COMMANDS = SUBCOMMANDS.KUBECTL
 
@@ -47,10 +47,7 @@ export class KubectlService {
    * Command: berget kubectl get
    * This endpoint is not available in the API
    */
-  public async get(
-    resource: string,
-    namespace?: string
-  ): Promise<any[]> {
+  public async get(resource: string, namespace?: string): Promise<any[]> {
     throw new Error('This functionality is not available in the API')
   }
 }