@undefineds.co/xpod 0.3.39 → 0.3.41

package/config/xpod.base.json

@@ -118,6 +118,10 @@
         "providerFactory": {
           "@id": "urn:solid-server:default:IdentityProviderFactory"
         },
+        "storageBaseUrl": {
+          "@id": "urn:solid-server:default:variable:baseUrl",
+          "@type": "Variable"
+        },
         "provisionBaseUrl": {
           "@id": "urn:solid-server:default:variable:oidcIssuer",
           "@type": "Variable"

package/dist/api/chatkit/pod-store.d.ts

@@ -34,6 +34,11 @@ export declare class PodChatKitStore implements ChatKitStore<StoreContext>, RunS
      */
     private getWebId;
     private derivePodBaseUrl;
+    private normalizePodBaseUrl;
+    private readPodUrlFromRuntimeSource;
+    private readPodUrlFromDatabase;
+    private readExplicitPodBaseUrl;
+    private ensurePodBaseUrlCache;
     /**
      * 将 ThreadStatus 对象转为字符串
      */
@@ -76,6 +81,7 @@ export declare class PodChatKitStore implements ChatKitStore<StoreContext>, RunS
     private generateMessageResourceId;
     private resolveDataResource;
     private baseRelativeIdFromResource;
+    private baseRelativeIdFromPodPath;
     private runRecordToData;
     private runStepRecordToData;
     private taskRecordToData;
@@ -197,6 +203,9 @@ export declare class PodChatKitStore implements ChatKitStore<StoreContext>, RunS
     private sortAiCredentialCandidates;
     private isTruthyValue;
     private timestampValue;
+    private parseIntegerValue;
+    private extractModelId;
+    private queryAiConfigFromSettingsSparql;
     getAiConfig(context: StoreContext): Promise<{
         providerId: string;
         baseUrl: string;

package/dist/api/chatkit/pod-store.js

@@ -93,6 +93,7 @@ class PodChatKitStore {
                 context._cachedDb = db;
                 context._cachedFetch = authFetch;
                 context._cachedWebId = auth.webId;
+                this.ensurePodBaseUrlCache(context, db, auth.webId);
                 return db;
             }
             catch (error) {
@@ -126,6 +127,7 @@ class PodChatKitStore {
             context._cachedDb = db;
             context._cachedFetch = authFetch;
             context._cachedWebId = webId;
+            this.ensurePodBaseUrlCache(context, db, webId);
             context._cachedAccessToken = token.accessToken;
             context._cachedTokenType = token.tokenType;
             return db;
@@ -218,6 +220,104 @@ class PodChatKitStore {
             return podBase.endsWith('/') ? podBase.slice(0, -1) : podBase;
         }
     }
+    normalizePodBaseUrl(value) {
+        if (typeof value !== 'string') {
+            return undefined;
+        }
+        const trimmed = value.trim();
+        if (!trimmed) {
+            return undefined;
+        }
+        return trimmed.replace(/\/+$/, '');
+    }
+    readPodUrlFromRuntimeSource(source) {
+        if (!source || typeof source !== 'object') {
+            return undefined;
+        }
+        const record = source;
+        const getPodUrl = record.getPodUrl;
+        if (typeof getPodUrl === 'function') {
+            try {
+                const value = getPodUrl.call(source);
+                const normalized = this.normalizePodBaseUrl(value);
+                if (normalized) {
+                    return normalized;
+                }
+            }
+            catch {
+                // Ignore and continue with direct properties.
+            }
+        }
+        for (const key of ['podUrl', 'podBaseUrl', 'storageUrl', 'storageProviderUrl']) {
+            const normalized = this.normalizePodBaseUrl(record[key]);
+            if (normalized) {
+                return normalized;
+            }
+        }
+        const runtime = record.runtime;
+        if (runtime && runtime !== source) {
+            return this.readPodUrlFromRuntimeSource(runtime);
+        }
+        return undefined;
+    }
+    readPodUrlFromDatabase(db) {
+        if (!db || typeof db !== 'object') {
+            return undefined;
+        }
+        const record = db;
+        const getDialect = record.getDialect;
+        if (typeof getDialect === 'function') {
+            try {
+                const value = this.readPodUrlFromRuntimeSource(getDialect.call(db));
+                if (value) {
+                    return value;
+                }
+            }
+            catch {
+                // Ignore and continue with session.
+            }
+        }
+        const getSession = record.getSession;
+        if (typeof getSession === 'function') {
+            try {
+                const value = this.readPodUrlFromRuntimeSource(getSession.call(db));
+                if (value) {
+                    return value;
+                }
+            }
+            catch {
+                // Ignore and continue with direct session property.
+            }
+        }
+        return this.readPodUrlFromRuntimeSource(record.session);
+    }
+    readExplicitPodBaseUrl(context) {
+        const record = context;
+        for (const key of ['podBaseUrl', 'podUrl', 'storageUrl', 'storageProviderUrl']) {
+            const normalized = this.normalizePodBaseUrl(record[key]);
+            if (normalized) {
+                return normalized;
+            }
+        }
+        return undefined;
+    }
+    ensurePodBaseUrlCache(context, db, fallbackWebId) {
+        const authoritativePodBaseUrl = this.readExplicitPodBaseUrl(context)
+            ?? this.readPodUrlFromDatabase(db);
+        if (authoritativePodBaseUrl) {
+            context._cachedPodBaseUrl = authoritativePodBaseUrl;
+            return authoritativePodBaseUrl;
+        }
+        const cached = this.getCachedPodBaseUrl(context);
+        if (cached) {
+            return cached;
+        }
+        const podBaseUrl = this.derivePodBaseUrl(fallbackWebId ?? this.getWebId(context));
+        if (podBaseUrl) {
+            context._cachedPodBaseUrl = podBaseUrl;
+        }
+        return podBaseUrl;
+    }
     /**
      * 将 ThreadStatus 对象转为字符串
      */
@@ -489,16 +589,14 @@ class PodChatKitStore {
         if (/^https?:\/\//.test(resourceId)) {
             return resourceId;
         }
-        const podBaseUrl = this.getCachedPodBaseUrl(context)
-            ?? this.derivePodBaseUrl(this.getWebId(context));
+        const podBaseUrl = this.ensurePodBaseUrlCache(context);
         if (!podBaseUrl) {
             throw new Error(`Cannot resolve Pod base URL for resource id: ${resourceId}`);
         }
         return (0, store_1.resolveDataResource)(podBaseUrl, resourceId);
     }
     baseRelativeIdFromResource(resource, context) {
-        const podBaseUrl = this.getCachedPodBaseUrl(context)
-            ?? this.derivePodBaseUrl(this.getWebId(context));
+        const podBaseUrl = this.ensurePodBaseUrlCache(context);
         if (podBaseUrl) {
             const dataPrefix = `${podBaseUrl.replace(/\/$/, '')}/.data/`;
             if (resource.startsWith(dataPrefix)) {
@@ -512,6 +610,22 @@ class PodChatKitStore {
         }
         return resource;
     }
+    baseRelativeIdFromPodPath(resource, context, podPath) {
+        const normalizedPath = podPath.replace(/^\/+|\/+$/g, '');
+        const podBaseUrl = this.ensurePodBaseUrlCache(context);
+        if (podBaseUrl) {
+            const prefix = `${podBaseUrl.replace(/\/$/, '')}/${normalizedPath}/`;
+            if (resource.startsWith(prefix)) {
+                return resource.slice(prefix.length);
+            }
+        }
+        const marker = `/${normalizedPath}/`;
+        const markerIndex = resource.indexOf(marker);
+        if (markerIndex >= 0) {
+            return resource.slice(markerIndex + marker.length);
+        }
+        return resource;
+    }
     runRecordToData(record) {
         const metadata = this.parseJsonObject(record.metadata);
         const xpod = this.getXpodMetadata(metadata);
@@ -775,8 +889,11 @@ class PodChatKitStore {
         return context._cachedFetch;
     }
     getCachedPodBaseUrl(context) {
-        const cachedWebId = context._cachedWebId;
-        return this.derivePodBaseUrl(cachedWebId);
+        const cachedPodBaseUrl = context._cachedPodBaseUrl;
+        if (cachedPodBaseUrl) {
+            return cachedPodBaseUrl.replace(/\/$/, '');
+        }
+        return undefined;
     }
     parseSparqlBindingValue(binding, key) {
         return binding?.[key]?.value ?? null;
@@ -798,8 +915,8 @@ class PodChatKitStore {
       PREFIX udfs: <https://undefineds.co/ns#>
       SELECT ?msg ?maker ?messageType ?legacyRole ?content ?messageStatus ?legacyStatus ?createdAt ?legacyCreatedAt ?toolName ?toolCallId ?metadata
       WHERE {
-        ?msg a meeting:Message ;
-             sioc:has_container <${resolvedThread.thread}> .
+        <${resolvedThread.thread}> sioc:has_member ?msg .
+        ?msg a meeting:Message .
         OPTIONAL { ?msg foaf:maker ?maker . }
         OPTIONAL { ?msg udfs:messageType ?messageType . }
         OPTIONAL { ?msg udfs:role ?legacyRole . }
@@ -1628,8 +1745,7 @@ WHERE { ${deletePatterns.join(' ')} }
         if (/^https?:\/\//.test(resource)) {
             return resource;
         }
-        const podBaseUrl = this.getCachedPodBaseUrl(context)
-            ?? this.derivePodBaseUrl(this.getWebId(context));
+        const podBaseUrl = this.ensurePodBaseUrlCache(context);
         if (!podBaseUrl) {
             throw new Error(`Cannot resolve Pod base URL for resource: ${resource}`);
         }
@@ -1698,12 +1814,115 @@ WHERE { ${deletePatterns.join(' ')} }
         }
         return 0;
     }
+    parseIntegerValue(value) {
+        if (typeof value === 'number' && Number.isFinite(value)) {
+            return value;
+        }
+        if (typeof value === 'string' && value.trim()) {
+            const parsed = Number.parseInt(value, 10);
+            return Number.isFinite(parsed) ? parsed : null;
+        }
+        return null;
+    }
+    extractModelId(model) {
+        if (!model) {
+            return undefined;
+        }
+        const hashIndex = model.lastIndexOf('#');
+        if (hashIndex >= 0 && hashIndex < model.length - 1) {
+            return model.slice(hashIndex + 1) || undefined;
+        }
+        const clean = model.replace(/\/+$/, '');
+        const slashIndex = clean.lastIndexOf('/');
+        const tail = slashIndex >= 0 ? clean.slice(slashIndex + 1) : clean;
+        return tail || undefined;
+    }
+    async queryAiConfigFromSettingsSparql(context) {
+        const cachedFetch = this.getCachedFetch(context);
+        const podBaseUrl = this.ensurePodBaseUrlCache(context);
+        if (!cachedFetch || !podBaseUrl) {
+            return null;
+        }
+        const endpoint = `${podBaseUrl.replace(/\/$/, '')}/settings/-/sparql`;
+        const query = `
+      PREFIX udfs: <https://undefineds.co/ns#>
+      SELECT ?cred ?provider ?apiKey ?isDefault ?lastUsedAt ?failCount ?baseUrl ?proxyUrl ?defaultModel ?hasModel
+      WHERE {
+        ?cred a udfs:Credential ;
+              udfs:service "ai" ;
+              udfs:status "active" ;
+              udfs:apiKey ?apiKey .
+        OPTIONAL { ?cred udfs:provider ?provider . }
+        OPTIONAL { ?cred udfs:isDefault ?isDefault . }
+        OPTIONAL { ?cred udfs:lastUsedAt ?lastUsedAt . }
+        OPTIONAL { ?cred udfs:failCount ?failCount . }
+        OPTIONAL { ?provider udfs:baseUrl ?baseUrl . }
+        OPTIONAL { ?provider udfs:proxyUrl ?proxyUrl . }
+        OPTIONAL { ?provider udfs:defaultModel ?defaultModel . }
+        OPTIONAL { ?provider udfs:hasModel ?hasModel . }
+      }
+    `.trim();
+        const response = await cachedFetch(endpoint, {
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/sparql-query',
+                Accept: 'application/sparql-results+json',
+            },
+            body: query,
+        });
+        if (!response.ok) {
+            const text = await response.text().catch(() => '');
+            throw new Error(`Failed to query settings AI config: ${response.status} ${response.statusText} - ${text}`);
+        }
+        const json = await response.json();
+        const credentials = (json.results?.bindings ?? []).map((binding) => {
+            const credentialIri = this.parseSparqlBindingValue(binding, 'cred') ?? '';
+            const providerRef = this.parseSparqlBindingValue(binding, 'provider');
+            return {
+                id: this.baseRelativeIdFromPodPath(credentialIri, context, '/settings/'),
+                provider: providerRef,
+                providerId: providerRef ? this.extractProviderId(providerRef) : null,
+                apiKey: this.parseSparqlBindingValue(binding, 'apiKey'),
+                isDefault: this.parseSparqlBindingValue(binding, 'isDefault'),
+                lastUsedAt: this.parseSparqlBindingValue(binding, 'lastUsedAt'),
+                failCount: this.parseIntegerValue(this.parseSparqlBindingValue(binding, 'failCount')),
+                baseUrl: this.parseSparqlBindingValue(binding, 'baseUrl'),
+                proxyUrl: this.parseSparqlBindingValue(binding, 'proxyUrl'),
+                defaultModel: this.parseSparqlBindingValue(binding, 'defaultModel')
+                    ?? this.parseSparqlBindingValue(binding, 'hasModel'),
+            };
+        });
+        for (const cred of this.sortAiCredentialCandidates(credentials)) {
+            if (!cred.provider || !cred.apiKey || !cred.baseUrl) {
+                continue;
+            }
+            const providerId = cred.providerId || this.extractProviderId(cred.provider);
+            if (!providerId) {
+                continue;
+            }
+            this.logger.debug(`Using credential ${cred.id} with provider ${providerId}`);
+            return {
+                providerId,
+                baseUrl: cred.baseUrl,
+                proxyUrl: cred.proxyUrl || undefined,
+                defaultModel: this.extractModelId(cred.defaultModel),
+                apiKey: cred.apiKey,
+                credentialId: cred.id,
+            };
+        }
+        return undefined;
+    }
     async getAiConfig(context) {
         const db = await this.getDb(context);
         if (!db) {
             return undefined;
         }
+        this.ensurePodBaseUrlCache(context, db);
         try {
+            const sparqlConfig = await this.queryAiConfigFromSettingsSparql(context);
+            if (sparqlConfig !== null) {
+                return sparqlConfig ?? undefined;
+            }
             // 查询活跃的 AI 凭据
             const credentials = await db.select()
                 .from(tables_1.Credential)