fix: per-sheet column detection in Excel importer

CRITICAL FIX for Entity_* placeholder names in multi-sheet Excel imports

Root Cause:
- Column detection ran globally on first row of all combined sheets
- Different sheets have different column structures (Term vs Name, etc.)
- Concepts sheet: [Term, Definition] → detected 'Term' column 
- Characters sheet: [Name, Description] → looked for 'Term' column 
- Result: Characters/Places/Other fell back to Entity_* placeholders

Fix:
- Group rows by sheet (_sheet field)
- Detect columns per-sheet, not globally
- Each sheet now uses its own column mapping
- Characters/Places sheets now correctly find 'Name' column

Impact:
- Concepts: Still work (no change)
- Characters/Places/Other: NOW USE ACTUAL NAMES! 🎉

Also removed debug logging from v4.8.5 (performance overhead)

Fixes: Workshop File Explorer showing Entity_* instead of real names
Ref: BRAINY_V4.8.4_VFS_UNDEFINED_NAMES_BUG.md
This commit is contained in:
David Snelling 2025-10-28 14:30:31 -07:00
parent 14ffd3a477
commit 401443a4b0
4 changed files with 24 additions and 50 deletions

View file

@ -573,14 +573,6 @@ export class Brainy<T = any> implements BrainyInterface<T> {
// v4.8.0: Storage adapters ALREADY extract standard fields to top-level! // v4.8.0: Storage adapters ALREADY extract standard fields to top-level!
// Just read from top-level fields of HNSWNounWithMetadata // Just read from top-level fields of HNSWNounWithMetadata
console.log(`[DEBUG convertNounToEntity] Converting noun ${noun.id}:`, {
nounMetadataKeys: noun.metadata ? Object.keys(noun.metadata) : [],
nounType: noun.type,
hasName: !!noun.metadata?.name,
hasPath: !!noun.metadata?.path,
hasVfsType: !!noun.metadata?.vfsType
})
// v4.8.0: Clean structure with standard fields at top-level // v4.8.0: Clean structure with standard fields at top-level
const entity: Entity<T> = { const entity: Entity<T> = {
id: noun.id, id: noun.id,
@ -600,13 +592,6 @@ export class Brainy<T = any> implements BrainyInterface<T> {
metadata: noun.metadata as T metadata: noun.metadata as T
} }
console.log(`[DEBUG convertNounToEntity] Converted entity metadata:`, {
entityMetadataKeys: entity.metadata ? Object.keys(entity.metadata as any) : [],
metadata_name: (entity.metadata as any)?.name,
metadata_path: (entity.metadata as any)?.path,
metadata_vfsType: (entity.metadata as any)?.vfsType
})
return entity return entity
} }

View file

@ -227,8 +227,25 @@ export class SmartExcelImporter {
return this.emptyResult(startTime) return this.emptyResult(startTime)
} }
// Detect column names // CRITICAL FIX (v4.8.6): Detect columns per-sheet, not globally
const columns = this.detectColumns(rows[0], opts) // Different sheets may have different column structures (Term vs Name, etc.)
// Group rows by sheet and detect columns for each sheet separately
const rowsBySheet = new Map<string, typeof rows>()
for (const row of rows) {
const sheet = row._sheet || 'default'
if (!rowsBySheet.has(sheet)) {
rowsBySheet.set(sheet, [])
}
rowsBySheet.get(sheet)!.push(row)
}
// Detect columns for each sheet
const columnsBySheet = new Map<string, ReturnType<typeof this.detectColumns>>()
for (const [sheet, sheetRows] of rowsBySheet) {
if (sheetRows.length > 0) {
columnsBySheet.set(sheet, this.detectColumns(sheetRows[0], opts))
}
}
// Process each row with BATCHED PARALLEL PROCESSING (v3.38.0) // Process each row with BATCHED PARALLEL PROCESSING (v3.38.0)
const extractedRows: ExtractedRow[] = [] const extractedRows: ExtractedRow[] = []
@ -252,6 +269,10 @@ export class SmartExcelImporter {
chunk.map(async (row, chunkIndex) => { chunk.map(async (row, chunkIndex) => {
const i = chunkStart + chunkIndex const i = chunkStart + chunkIndex
// CRITICAL FIX (v4.8.6): Use sheet-specific column mapping
const sheet = row._sheet || 'default'
const columns = columnsBySheet.get(sheet) || this.detectColumns(row, opts)
// Extract data from row // Extract data from row
const term = this.getColumnValue(row, columns.term) || `Entity_${i}` const term = this.getColumnValue(row, columns.term) || `Entity_${i}`
const definition = this.getColumnValue(row, columns.definition) || '' const definition = this.getColumnValue(row, columns.definition) || ''

View file

@ -230,7 +230,6 @@ export class PathResolver {
from: dirId, from: dirId,
type: VerbType.Contains type: VerbType.Contains
}) })
console.log(`[DEBUG PathResolver] getChildren(${dirId}): Found ${relations.length} Contains relations`)
const validChildren: VFSEntity[]= [] const validChildren: VFSEntity[]= []
const childNames = new Set<string>() const childNames = new Set<string>()
@ -238,24 +237,12 @@ export class PathResolver {
// Fetch all child entities via relationships // Fetch all child entities via relationships
for (const relation of relations) { for (const relation of relations) {
const entity = await this.brain.get(relation.to) const entity = await this.brain.get(relation.to)
console.log(`[DEBUG PathResolver] Retrieved entity ${relation.to}:`, {
exists: !!entity,
type: entity?.type,
hasMetadata: !!entity?.metadata,
metadataKeys: entity?.metadata ? Object.keys(entity.metadata) : [],
metadata_vfsType: entity?.metadata?.vfsType,
metadata_name: entity?.metadata?.name
})
if (entity && entity.metadata?.vfsType && entity.metadata?.name) { if (entity && entity.metadata?.vfsType && entity.metadata?.name) {
validChildren.push(entity as VFSEntity) validChildren.push(entity as VFSEntity)
childNames.add(entity.metadata.name) childNames.add(entity.metadata.name)
} else {
console.log(`[DEBUG PathResolver] ❌ FILTERED OUT entity ${relation.to} - missing vfsType or name`)
} }
} }
console.log(`[DEBUG PathResolver] Returning ${validChildren.length} valid children (filtered from ${relations.length})`)
// Update cache // Update cache
this.parentCache.set(dirId, childNames) this.parentCache.set(dirId, childNames)
return validChildren return validChildren

View file

@ -846,20 +846,6 @@ export class VirtualFileSystem implements IVirtualFileSystem {
// Get children // Get children
let children = await this.pathResolver.getChildren(entityId) let children = await this.pathResolver.getChildren(entityId)
console.log(`[DEBUG VFS] readdir(${path}): Found ${children.length} children`)
// Debug first child
if (children.length > 0) {
const firstChild = children[0]
console.log(`[DEBUG VFS] First child structure:`, {
id: firstChild.id,
type: firstChild.type,
metadataKeys: Object.keys(firstChild.metadata || {}),
metadata_name: firstChild.metadata?.name,
metadata_path: firstChild.metadata?.path,
metadata_vfsType: firstChild.metadata?.vfsType
})
}
// Apply filters // Apply filters
if (options?.filter) { if (options?.filter) {
@ -884,17 +870,12 @@ export class VirtualFileSystem implements IVirtualFileSystem {
// Return appropriate format // Return appropriate format
if (options?.withFileTypes) { if (options?.withFileTypes) {
const result = children.map(child => ({ return children.map(child => ({
name: child.metadata.name, name: child.metadata.name,
path: child.metadata.path, path: child.metadata.path,
type: child.metadata.vfsType, type: child.metadata.vfsType,
entityId: child.id entityId: child.id
} as VFSDirent)) } as VFSDirent))
console.log(`[DEBUG VFS] Returning ${result.length} VFSDirent items`)
if (result.length > 0) {
console.log(`[DEBUG VFS] First VFSDirent:`, result[0])
}
return result
} }
return children.map(child => child.metadata.name) return children.map(child => child.metadata.name)