@axiom-lattice/pg-stores 3.3.12 → 3.3.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@axiom-lattice/pg-stores",
-  "version": "3.3.12",
+  "version": "3.3.13",
   "description": "PG stores implementation for Axiom Lattice framework",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -25,8 +25,8 @@
     "@langchain/core": "1.1.30",
     "pg": "^8.16.3",
     "uuid": "^9.0.1",
-    "@axiom-lattice/core": "8.0.2",
-    "@axiom-lattice/protocols": "4.10.0"
+    "@axiom-lattice/core": "8.1.0",
+    "@axiom-lattice/protocols": "4.11.0"
   },
   "devDependencies": {
     "@types/jest": "^29.5.14",

package/src/PGVectorStoreProvider.ts

@@ -30,20 +30,26 @@ export class PGVectorStoreProvider implements VectorStoreProvider {
 
   async create(params: VectorStoreCreateParams): Promise<any> {
     const { tableName, embeddingKey } = params;
+    const tenantId = params.tenantId ?? "default";
 
-    let embeddings;
-    try {
-      embeddings = embeddingsLatticeManager.getEmbeddingsClient(embeddingKey);
-    } catch {
-      try {
-        embeddings = embeddingsLatticeManager.getEmbeddingsClient("default");
-      } catch {
-        throw new Error(
-          `No embedding model registered. Register one first:\n` +
-          `  import { registerEmbeddingsLattice } from "@axiom-lattice/core";\n` +
-          `  registerEmbeddingsLattice("default", new SomeEmbeddings(...));`
-        );
-      }
+    // Tenant first, deployment second — the same order every model resolver
+    // uses. A tenant model key is `${providerId}/${modelId}` and only resolves
+    // in that tenant's namespace.
+    const embeddings =
+      (await embeddingsLatticeManager.getEmbeddingsClientWithTenant(
+        tenantId,
+        embeddingKey
+      )) ??
+      (await embeddingsLatticeManager.getEmbeddingsClientWithTenant(
+        tenantId,
+        "default"
+      ));
+
+    if (!embeddings) {
+      throw new Error(
+        `No embedding model "${embeddingKey}" registered for tenant "${tenantId}", ` +
+          `and no deployment default. Configure one in the model provider panel.`
+      );
     }
 
     return PGVectorStore.initialize(embeddings, {

package/src/createPgStoreConfig.ts

@@ -98,6 +98,7 @@ import {
   addModelProviderModelStale,
   addModelProviderModelExtra,
   addModelProviderModelDefault,
+  addModelProviderModelKind,
 } from "./migrations/model_provider_migrations";
 import { PostgreSQLCapabilityBundleStore } from "./stores/PostgreSQLCapabilityBundleStore";
 import { PostgreSQLProjectRoomStore } from "./stores/PostgreSQLProjectRoomStore";
@@ -191,6 +192,7 @@ export async function createPgStoreConfig(connectionString: string) {
   mm.register(dropPluginDeploymentAuthToken);  // v190
   mm.register(addModelProviderModelExtra);      // v191
   mm.register(addModelProviderModelDefault);    // v192
+  mm.register(addModelProviderModelKind);       // v193
 
   await mm.migrate();
 

package/src/migrations/model_provider_migrations.ts

@@ -229,3 +229,30 @@ export const addModelProviderModelDefault: Migration = {
     `);
   },
 };
+
+/**
+ * What a model does: chat, embedding or speech-to-text.
+ *
+ * A column on the model row rather than a convention on the provider, because
+ * one provider is one credential and one base URL — a DashScope-compatible
+ * endpoint serves all three at once. Keeping it off the provider row is what
+ * lets a tenant configure one endpoint and still mark individual models by kind.
+ *
+ * `NOT NULL DEFAULT 'chat'` backfills every existing row, which is exactly
+ * right: before this column existed, every tenant model was a chat model.
+ */
+export const addModelProviderModelKind: Migration = {
+  version: 193,
+  name: 'add_model_provider_model_kind',
+  up: async (client: PoolClient) => {
+    await client.query(`
+      ALTER TABLE lattice_model_provider_models
+      ADD COLUMN IF NOT EXISTS kind VARCHAR(16) NOT NULL DEFAULT 'chat'
+    `);
+  },
+  down: async (client: PoolClient) => {
+    await client.query(`
+      ALTER TABLE lattice_model_provider_models DROP COLUMN IF EXISTS kind
+    `);
+  },
+};

package/src/stores/PostgreSQLModelProviderStore.ts

@@ -12,6 +12,7 @@ import {
   ModelProviderWireProtocol,
   ModelProviderApiStyle,
   ModelProviderLlmProvider,
+  ModelKind,
   CreateModelProviderRequest,
   UpdateModelProviderRequest,
   ProviderModelInput,
@@ -24,6 +25,7 @@ import {
   addModelProviderModelStale,
   addModelProviderModelExtra,
   addModelProviderModelDefault,
+  addModelProviderModelKind,
 } from '../migrations/model_provider_migrations';
 import { encrypt, safeDecrypt } from '@axiom-lattice/core';
 
@@ -81,6 +83,7 @@ interface ModelRow {
   enabled: boolean;
   stale: boolean;
   extra: Record<string, unknown> | null;
+  kind: string;
   is_default: boolean;
   discovered_at: Date;
 }
@@ -144,6 +147,7 @@ export class PostgreSQLModelProviderStore implements ModelProviderStore {
     this.migrationManager.register(addModelProviderModelStale);     // v184
     this.migrationManager.register(addModelProviderModelExtra);     // v191
     this.migrationManager.register(addModelProviderModelDefault);   // v192
+    this.migrationManager.register(addModelProviderModelKind);      // v193
 
     // Auto-migrate by default
     if (options.autoMigrate !== false) {
@@ -469,7 +473,7 @@ export class PostgreSQLModelProviderStore implements ModelProviderStore {
       ? await this.pool.query<ModelRow>(
           `
           SELECT id, tenant_id, provider_id, model_id, display_name, owned_by,
-                 upstream_created, enabled, stale, extra, is_default, discovered_at
+                 upstream_created, enabled, stale, extra, kind, is_default, discovered_at
           FROM lattice_model_provider_models
           WHERE tenant_id = $1 AND provider_id = $2
           ORDER BY model_id ASC
@@ -479,7 +483,7 @@ export class PostgreSQLModelProviderStore implements ModelProviderStore {
       : await this.pool.query<ModelRow>(
           `
           SELECT id, tenant_id, provider_id, model_id, display_name, owned_by,
-                 upstream_created, enabled, stale, extra, is_default, discovered_at
+                 upstream_created, enabled, stale, extra, kind, is_default, discovered_at
           FROM lattice_model_provider_models
           WHERE tenant_id = $1
           ORDER BY model_id ASC
@@ -505,7 +509,7 @@ export class PostgreSQLModelProviderStore implements ModelProviderStore {
     const result = await this.pool.query<ModelRow>(
       `
       SELECT id, tenant_id, provider_id, model_id, display_name, owned_by,
-             upstream_created, enabled, stale, extra, is_default, discovered_at
+             upstream_created, enabled, stale, extra, kind, is_default, discovered_at
       FROM lattice_model_provider_models
       WHERE tenant_id = $1 AND provider_id = $2 AND model_id = $3
     `,
@@ -553,10 +557,11 @@ export class PostgreSQLModelProviderStore implements ModelProviderStore {
         model_id: string;
         enabled: boolean;
         extra: Record<string, unknown> | null;
+        kind: string;
         is_default: boolean;
       }>(
         `
-        SELECT model_id, enabled, extra, is_default FROM lattice_model_provider_models
+        SELECT model_id, enabled, extra, kind, is_default FROM lattice_model_provider_models
         WHERE tenant_id = $1 AND provider_id = $2
       `,
         [tenantId, providerId]
@@ -567,6 +572,9 @@ export class PostgreSQLModelProviderStore implements ModelProviderStore {
       const currentExtra = new Map(
         current.rows.map((row) => [row.model_id, row.extra])
       );
+      const currentKind = new Map(
+        current.rows.map((row) => [row.model_id, row.kind])
+      );
       const currentIsDefault = new Map(
         current.rows.map((row) => [row.model_id, row.is_default])
       );
@@ -595,6 +603,13 @@ export class PostgreSQLModelProviderStore implements ModelProviderStore {
         (model) => model.extra ?? currentExtra.get(model.id) ?? {}
       );
 
+      // Same rule as `extra`: an omitted `kind` keeps the row's stored value,
+      // and a row created by discovery — which carries no kind at all — starts
+      // as chat. Nothing here can silently reclassify a model the tenant set.
+      const effectiveKind = rows.map(
+        (model) => model.kind ?? currentKind.get(model.id) ?? "chat"
+      );
+
       // Whether this write is naming a default at all.
       //
       // The unique index spans the *tenant*, while this method writes one
@@ -661,15 +676,15 @@ export class PostgreSQLModelProviderStore implements ModelProviderStore {
           `
           INSERT INTO lattice_model_provider_models (
             id, tenant_id, provider_id, model_id, display_name, owned_by,
-            upstream_created, raw, enabled, stale, extra, is_default, discovered_at
+            upstream_created, raw, enabled, stale, extra, kind, is_default, discovered_at
           )
           SELECT * FROM unnest(
             $1::text[], $2::text[], $3::text[], $4::text[], $5::text[],
             $6::text[], $7::timestamp[], $8::jsonb[], $9::boolean[], $10::boolean[],
-            $11::jsonb[], $12::boolean[], $13::timestamp[]
+            $11::jsonb[], $12::text[], $13::boolean[], $14::timestamp[]
           ) AS t(
             id, tenant_id, provider_id, model_id, display_name, owned_by,
-            upstream_created, raw, enabled, stale, extra, is_default, discovered_at
+            upstream_created, raw, enabled, stale, extra, kind, is_default, discovered_at
           )
           ON CONFLICT (tenant_id, provider_id, model_id) DO UPDATE SET
             display_name = EXCLUDED.display_name,
@@ -679,6 +694,7 @@ export class PostgreSQLModelProviderStore implements ModelProviderStore {
             enabled = EXCLUDED.enabled,
             stale = EXCLUDED.stale,
             extra = EXCLUDED.extra,
+            kind = EXCLUDED.kind,
             is_default = EXCLUDED.is_default,
             discovered_at = EXCLUDED.discovered_at
         `,
@@ -698,6 +714,7 @@ export class PostgreSQLModelProviderStore implements ModelProviderStore {
             effectiveEnabled,
             rows.map((model) => model.stale ?? false),
             effectiveExtra.map((extra) => JSON.stringify(extra)),
+            effectiveKind,
             effectiveIsDefault,
             rows.map(() => new Date().toISOString()),
           ]
@@ -827,6 +844,7 @@ export class PostgreSQLModelProviderStore implements ModelProviderStore {
       enabled: row.enabled,
       stale: row.stale,
       extra: extraOrUndefined(row.extra),
+      kind: (row.kind as ModelKind) || "chat",
       isDefault: row.is_default,
       discoveredAt: row.discovered_at,
     };