soulcraft/brainy
2
0
Fork 0
Code Issues 1 Pull requests Projects Releases 335 Packages Wiki Activity Actions

**feat(core, storage, tests): enhance verb construction with timestamps and metadata**

Browse source 
- **Core**: Improved verb creation logic by adding `createdAt`, `updatedAt`, and `createdBy` attributes. These fields include timestamped metadata (`seconds`, `nanoseconds`) and source augmentation/service information for better tracking.
- **Storage**: Refactored `BaseStorage` methods to utilize internal variants (e.g., `saveVerb_internal`, `getNoun_internal`). Added support for new verb attributes while maintaining backward compatibility with existing data structures.
- **Tests**:
  - Updated `s3-storage.test.ts` and `opfs-storage.test.ts` to validate changes in verb attributes such as timestamps and augmentation metadata.
  - Added assertions for `createdAt`, `updatedAt`, and `createdBy` fields in test cases.
- **Cleanup**: Replaced ambiguous type aliases like `Edge` and `HNSWNode` with clearer equivalents (`Verb` and `HNSWNoun_internal`) for consistency across storage adapters.

**Purpose**: Enhance metadata tracking and standardize attribute handling across storage and core modules to ensure accurate and consistent data throughout the system.
This commit is contained in:
David Snelling 2025-07-25 09:44:10 -07:00
parent ae3560aad3
commit 501244398e
10 changed files with 641 additions and 310 deletions
Download patch file Download diff file Expand all files Collapse all files

150
src/storage/adapters/s3CompatibleStorage.ts
View file

@ -147,6 +147,13 @@ export class S3CompatibleStorage extends BaseStorage {
}
}
/**
* Save a noun to storage (internal implementation)
*/
protected async saveNoun_internal(noun: HNSWNoun): Promise<void> {
return this.saveNode(noun)
}
/**
* Save a node to storage
*/
@ -209,6 +216,13 @@ export class S3CompatibleStorage extends BaseStorage {
}
}
/**
* Get a noun from storage (internal implementation)
*/
protected async getNoun_internal(id: string): Promise<HNSWNoun | null> {
return this.getNode(id)
}
/**
* Get a node from storage
*/
@ -277,6 +291,13 @@ export class S3CompatibleStorage extends BaseStorage {
}
}
/**
* Get all nouns from storage (internal implementation)
*/
protected async getAllNouns_internal(): Promise<HNSWNoun[]> {
return this.getAllNodes()
}
/**
* Get all nodes from storage
*/
@ -401,6 +422,15 @@ export class S3CompatibleStorage extends BaseStorage {
}
}
/**
* Get nouns by noun type (internal implementation)
* @param nounType The noun type to filter by
* @returns Promise that resolves to an array of nouns of the specified noun type
*/
protected async getNounsByNounType_internal(nounType: string): Promise<HNSWNoun[]> {
return this.getNodesByNounType(nounType)
}
/**
* Get nodes by noun type
* @param nounType The noun type to filter by
@ -429,6 +459,13 @@ export class S3CompatibleStorage extends BaseStorage {
}
}
/**
* Delete a noun from storage (internal implementation)
*/
protected async deleteNoun_internal(id: string): Promise<void> {
return this.deleteNode(id)
}
/**
* Delete a node from storage
*/
@ -452,6 +489,13 @@ export class S3CompatibleStorage extends BaseStorage {
}
}
/**
* Save a verb to storage (internal implementation)
*/
protected async saveVerb_internal(verb: GraphVerb): Promise<void> {
return this.saveEdge(verb)
}
/**
* Save an edge to storage
*/
@ -485,6 +529,13 @@ export class S3CompatibleStorage extends BaseStorage {
}
}
/**
* Get a verb from storage (internal implementation)
*/
protected async getVerb_internal(id: string): Promise<GraphVerb | null> {
return this.getEdge(id)
}
/**
* Get an edge from storage
*/
@ -524,7 +575,9 @@ export class S3CompatibleStorage extends BaseStorage {
// Ensure the parsed edge has the expected properties
if (!parsedEdge || !parsedEdge.id || !parsedEdge.vector || !parsedEdge.connections ||
!parsedEdge.sourceId || !parsedEdge.targetId || !parsedEdge.type) {
!(parsedEdge.sourceId || parsedEdge.source) ||
!(parsedEdge.targetId || parsedEdge.target) ||
!(parsedEdge.type || parsedEdge.verb)) {
console.error(`Invalid edge data for ${id}:`, parsedEdge)
return null
}
@ -535,15 +588,33 @@ export class S3CompatibleStorage extends BaseStorage {
connections.set(Number(level), new Set(nodeIds as string[]))
}
// Create default timestamp if not present
const defaultTimestamp = {
seconds: Math.floor(Date.now() / 1000),
nanoseconds: (Date.now() % 1000) * 1000000
}
// Create default createdBy if not present
const defaultCreatedBy = {
augmentation: 'unknown',
version: '1.0'
}
const edge = {
id: parsedEdge.id,
vector: parsedEdge.vector,
connections,
sourceId: parsedEdge.sourceId,
targetId: parsedEdge.targetId,
type: parsedEdge.type,
sourceId: parsedEdge.sourceId || parsedEdge.source,
targetId: parsedEdge.targetId || parsedEdge.target,
source: parsedEdge.sourceId || parsedEdge.source,
target: parsedEdge.targetId || parsedEdge.target,
verb: parsedEdge.type || parsedEdge.verb,
type: parsedEdge.type || parsedEdge.verb,
weight: parsedEdge.weight || 1.0, // Default weight if not provided
metadata: parsedEdge.metadata || {}
metadata: parsedEdge.metadata || {},
createdAt: parsedEdge.createdAt || defaultTimestamp,
updatedAt: parsedEdge.updatedAt || defaultTimestamp,
createdBy: parsedEdge.createdBy || defaultCreatedBy
}
console.log(`Successfully retrieved edge ${id}:`, edge)
@ -559,6 +630,13 @@ export class S3CompatibleStorage extends BaseStorage {
}
}
/**
* Get all verbs from storage (internal implementation)
*/
protected async getAllVerbs_internal(): Promise<GraphVerb[]> {
return this.getAllEdges()
}
/**
* Get all edges from storage
*/
@ -611,15 +689,33 @@ export class S3CompatibleStorage extends BaseStorage {
connections.set(Number(level), new Set(nodeIds as string[]))
}
// Create default timestamp if not present
const defaultTimestamp = {
seconds: Math.floor(Date.now() / 1000),
nanoseconds: (Date.now() % 1000) * 1000000
}
// Create default createdBy if not present
const defaultCreatedBy = {
augmentation: 'unknown',
version: '1.0'
}
return {
id: parsedEdge.id,
vector: parsedEdge.vector,
connections,
sourceId: parsedEdge.sourceId,
targetId: parsedEdge.targetId,
type: parsedEdge.type,
weight: parsedEdge.weight,
metadata: parsedEdge.metadata
sourceId: parsedEdge.sourceId || parsedEdge.source,
targetId: parsedEdge.targetId || parsedEdge.target,
source: parsedEdge.sourceId || parsedEdge.source,
target: parsedEdge.targetId || parsedEdge.target,
verb: parsedEdge.type || parsedEdge.verb,
type: parsedEdge.type || parsedEdge.verb,
weight: parsedEdge.weight || 1.0,
metadata: parsedEdge.metadata || {},
createdAt: parsedEdge.createdAt || defaultTimestamp,
updatedAt: parsedEdge.updatedAt || defaultTimestamp,
createdBy: parsedEdge.createdBy || defaultCreatedBy
}
} catch (error) {
console.error(`Error getting edge from ${object.Key}:`, error)
@ -637,12 +733,26 @@ export class S3CompatibleStorage extends BaseStorage {
}
}
/**
* Get verbs by source (internal implementation)
*/
protected async getVerbsBySource_internal(sourceId: string): Promise<GraphVerb[]> {
return this.getEdgesBySource(sourceId)
}
/**
* Get edges by source
*/
protected async getEdgesBySource(sourceId: string): Promise<Edge[]> {
const edges = await this.getAllEdges()
return edges.filter((edge) => edge.sourceId === sourceId)
return edges.filter((edge) => (edge.sourceId || edge.source) === sourceId)
}
/**
* Get verbs by target (internal implementation)
*/
protected async getVerbsByTarget_internal(targetId: string): Promise<GraphVerb[]> {
return this.getEdgesByTarget(targetId)
}
/**
@ -650,7 +760,14 @@ export class S3CompatibleStorage extends BaseStorage {
*/
protected async getEdgesByTarget(targetId: string): Promise<Edge[]> {
const edges = await this.getAllEdges()
return edges.filter((edge) => edge.targetId === targetId)
return edges.filter((edge) => (edge.targetId || edge.target) === targetId)
}
/**
* Get verbs by type (internal implementation)
*/
protected async getVerbsByType_internal(type: string): Promise<GraphVerb[]> {
return this.getEdgesByType(type)
}
/**
@ -658,7 +775,14 @@ export class S3CompatibleStorage extends BaseStorage {
*/
protected async getEdgesByType(type: string): Promise<Edge[]> {
const edges = await this.getAllEdges()
return edges.filter((edge) => edge.type === type)
return edges.filter((edge) => (edge.type || edge.verb) === type)
}
/**
* Delete a verb from storage (internal implementation)
*/
protected async deleteVerb_internal(id: string): Promise<void> {
return this.deleteEdge(id)
}
/**