pi-media-models 0.1.5 → 0.1.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-media-models",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "type": "module",
   "description": "Provider-neutral multimodal generation tools for Pi Coding Agent",
   "keywords": [

package/src/adapters/base.ts

@@ -30,7 +30,7 @@ export abstract class BaseAdapter implements ProviderAdapter {
 
   protected key(request: MediaRequest): string {
     const configKey = request.providerOptions?.apiKey;
-    const value = (typeof configKey === "string" ? configKey : undefined) ?? (this.envKey ? this.env[this.envKey] : undefined)
+    const value = (typeof configKey === "string" && configKey.trim() ? configKey.trim() : undefined) ?? (this.envKey ? this.env[this.envKey] : undefined)
     if (!value) throw new MediaError('AUTH', `${this.envKey ?? `${this.id} API key`} is not set in environment or config`, { provider: this.id })
     return value
   }

package/src/adapters/google.ts

@@ -3,6 +3,7 @@ import { fileURLToPath } from 'node:url'
 import { MediaError } from '../errors.js'
 import { MediaJob } from '../media-job.js'
 import { BaseAdapter, artifactsOrThrow, makeModel } from './base.js'
+import { expandHomePath } from '../config.js'
 import type { AdapterContext, AdapterResult, Capability, JobStatus, JsonObject, MediaRequest, ModelDescriptor } from '../types.js'
 import type { AdapterDependencies } from './base.js'
 
@@ -164,7 +165,8 @@ export class GoogleMediaAdapter extends BaseAdapter {
     const options = request.providerOptions;
     const configuredFile = typeof options?.credentialsFile === "string" ? options.credentialsFile : undefined
     const rawKeyFilename = configuredFile ?? this.env.VERTEX_CREDENTIALS_FILE ?? this.env.GOOGLE_APPLICATION_CREDENTIALS
-    const keyFilename = rawKeyFilename?.startsWith('file://') ? fileURLToPath(rawKeyFilename) : rawKeyFilename
+    const expandedKeyFile = expandHomePath(rawKeyFilename)
+    const keyFilename = expandedKeyFile?.startsWith('file://') ? fileURLToPath(expandedKeyFile) : expandedKeyFile
     const auth = new GoogleAuth({
       scopes: ['https://www.googleapis.com/auth/cloud-platform'],
       ...(keyFilename ? { keyFilename } : {}),

package/src/config.ts

@@ -1,9 +1,18 @@
 import { readFile } from 'node:fs/promises'
 import { homedir } from 'node:os'
-import { join } from 'node:path'
+import { join, resolve } from 'node:path'
 import { CAPABILITIES, type Capability, type JsonObject } from './types.js'
 import { MediaError } from './errors.js'
 
+export function expandHomePath(rawPath: string | undefined): string | undefined {
+  if (!rawPath) return undefined
+  if (rawPath === '~') return homedir()
+  if (rawPath.startsWith('~/') || rawPath.startsWith('~\\')) {
+    return join(homedir(), rawPath.slice(2))
+  }
+  return rawPath
+}
+
 export interface CustomAsyncConfig {
   idPath: string
   statusPath: string
@@ -61,8 +70,11 @@ export async function loadMediaConfig(cwd: string, allowProjectConfig: boolean):
   const globalPath = join(homedir(), '.pi', 'agent', 'media-models.json')
   const global = await parseFile(globalPath) ?? EMPTY_CONFIG
   const project = allowProjectConfig ? await parseFile(join(cwd, '.pi', 'media-models.json')) : undefined
+  const rawOutputDir = project?.outputDir ?? global.outputDir
+  const expandedOutputDir = expandHomePath(rawOutputDir)
+  const outputDir = expandedOutputDir ? resolve(cwd, expandedOutputDir) : undefined
   const merged: MediaConfig = {
-    outputDir: project?.outputDir ?? global.outputDir,
+    outputDir,
     customProviders: project?.customProviders ?? global.customProviders ?? [],
     providerOptions: { ...(global.providerOptions ?? {}), ...(project?.providerOptions ?? {}) },
   }

package/src/router.ts

@@ -49,9 +49,15 @@ export class CapabilityRouter {
   }
 
   private isConfigured(adapter: ProviderAdapter): boolean {
-    if (!adapter.envKey) return true
-    if (this.env[adapter.envKey]) return true
-    if (this.providerDefaults[adapter.id]?.apiKey) return true
+    if (adapter.id === 'vertex') {
+      const vertexOpts = this.providerDefaults['vertex']
+      if (typeof vertexOpts?.credentialsFile === 'string' && vertexOpts.credentialsFile.trim()) return true
+      if (this.env.GOOGLE_APPLICATION_CREDENTIALS || this.env.VERTEX_CREDENTIALS_FILE) return true
+      return false
+    }
+    const configKey = this.providerDefaults[adapter.id]?.apiKey
+    if (typeof configKey === 'string' && configKey.trim()) return true
+    if (adapter.envKey && this.env[adapter.envKey]) return true
     return false
   }