Merge pull request #134 from Dooders/dev

Dev

Author: csmangum

memory/embeddings/vector_store.py

@@ -556,60 +556,31 @@ def store_memory_vectors(
         embeddings = memory_entry.get("embeddings", {})
         metadata = memory_entry.get("metadata", {})
 
-        def store_vector(
-            index,
-            memory_id: str,
-            vector: List[float],
-            metadata: Dict[str, Any],
-            tier: str,
-        ) -> bool:
-            """
-            Store a vector in the appropriate index.
-
-            Args:
-                index: Vector index to store in
-                memory_id: Unique identifier for the memory
-                vector: Vector to store
-                metadata: Metadata to store
-                tier: Tier to store the vector in ("stm", "im", or "ltm")
-
-            Returns:
-                True if storage was successful
-            """
-            try:
-                logger.debug(f"Storing {tier.upper()} vector for memory {memory_id}")
-                return index.add(memory_id, vector, metadata)
-            except Exception as e:
-                logger.error(
-                    f"Failed to store {tier.upper()} vector for memory {memory_id}: {e}"
+        try:
+            logger.debug(f"Storing {tier.upper()} vector for memory {memory_id}")
+
+            # Store in appropriate index based on tier
+            if tier == "stm":
+                return self.stm_index.add(
+                    memory_id, embeddings["full_vector"], metadata
                 )
+            elif tier == "im":
+                #! TODO: Use compressed vector
+                return self.im_index.add(memory_id, embeddings["full_vector"], metadata)
+            elif tier == "ltm":
+                #! TODO: Use abstract vector
+                return self.ltm_index.add(
+                    memory_id, embeddings["full_vector"], metadata
+                )
+            else:
+                logger.error(f"Invalid tier: {tier}")
                 return False
 
-        success = True
-
-        # Store in appropriate index based on tier
-        if tier == "stm":
-            success = store_vector(
-                self.stm_index, memory_id, embeddings["full_vector"], metadata, "stm"
-            )
-        elif tier == "im":
-            #! TODO: Use compressed vector
-            logger.debug(
-                f"@@@@@@@@@@@@@@@@@@@@@@@@@ Storing IM vector for memory {memory_id}"
-            )
-            success = store_vector(
-                self.im_index, memory_id, embeddings["full_vector"], metadata, "im"
-            )
-            logger.debug(
-                f"@@@@@@@@@@@@@@@@@@@@@@@@@ Result of storing IM vector: {success}"
-            )
-        elif tier == "ltm":
-            #! TODO: Use abstract vector
-            success = store_vector(
-                self.ltm_index, memory_id, embeddings["full_vector"], metadata, "ltm"
+        except Exception as e:
+            logger.error(
+                f"Failed to store {tier.upper()} vector for memory {memory_id}: {e}"
             )
-
-        return success
+            return False
 
     def find_similar_memories(
         self,
@@ -654,38 +625,18 @@ def filter_fn(metadata):
                         logger.debug("Found match for type in memory_type: %s", value)
                         continue
 
-                    # Try match in nested content.metadata
-                    if "content" in metadata and isinstance(metadata["content"], dict):
-                        content = metadata["content"]
-                        if "metadata" in content and isinstance(
-                            content["metadata"], dict
-                        ):
-                            content_metadata = content["metadata"]
-                            if (
-                                key in content_metadata
-                                and content_metadata[key] == value
-                            ):
-                                logger.debug(
-                                    "Found nested match for %s: %s in content.metadata",
-                                    key,
-                                    value,
-                                )
-                                continue
-
                     # No match found for this key
                     unmatched_keys.append((key, value))
-                    return False
 
                 if unmatched_keys:
                     logger.debug(
                         "No matches found for the following keys and values: %s",
                         unmatched_keys,
                     )
+                    return False
                 else:
                     logger.debug("All filter criteria matched")
-                # All keys matched
-                logger.debug("All filter criteria matched")
-                return True
+                    return True
 
         # Select the appropriate index based on tier
         if tier == "im":

memory/search/strategies/similarity.py

@@ -35,6 +35,7 @@ def __init__(self, memory_system: AgentMemorySystem):
         self.vector_store = self.memory_system.vector_store
         self.embedding_engine = self.memory_system.embedding_engine
         self.config = self.memory_system.config
+        # self.logger = self.memory_system.logger #! future use
 
     def name(self) -> str:
         """Return the name of the search strategy.
@@ -111,13 +112,13 @@ def search(
 
             # Generate query vector from input
             query_vector = self._generate_query_vector(query, current_tier)
-            
+
             # Add detailed logging for vector generation
             logger.debug(
                 "Query vector generation for tier %s - Input: %s, Output: %s",
                 current_tier,
                 query,
-                query_vector
+                query_vector,
             )
 
             # Skip if vector generation failed
@@ -135,9 +136,9 @@ def search(
 
             # Find similar vectors
             logger.debug(
-                "About to call vector_store.find_similar_memories for tier %s with vector: %s", 
+                "About to call vector_store.find_similar_memories for tier %s with vector: %s",
                 current_tier,
-                query_vector
+                query_vector,
             )
             try:
                 similar_vectors = self.vector_store.find_similar_memories(
@@ -156,7 +157,7 @@ def search(
                 logger.error(
                     "Error in vector_store.find_similar_memories for tier %s: %s",
                     current_tier,
-                    str(e)
+                    str(e),
                 )
                 continue
 
@@ -307,7 +308,10 @@ def _generate_query_vector(
                         vector,
                     )
                 else:
-                    logger.warning("Failed to generate vector for tier %s - encoding returned None", tier)
+                    logger.warning(
+                        "Failed to generate vector for tier %s - encoding returned None",
+                        tier,
+                    )
                 return vector
             except Exception as e:
                 logger.error("Error generating vector for tier %s: %s", tier, str(e))

memory/utils/serialization.py

@@ -468,15 +468,18 @@ def load_memory_system_from_json(filepath: str, use_mock_redis: bool = False):
                         }
 
                         # Store the vector
-                        vector_store.store_memory_vectors(memory_copy)
+                        
 
                         # Determine the tier for the memory
                         tier = memory_copy.get("tier")
                         if tier == "stm":
+                            vector_store.store_memory_vectors(memory_copy, tier="stm")
                             memory_agent.stm_store.store(agent_id, memory_copy)
                         elif tier == "im":
+                            vector_store.store_memory_vectors(memory_copy, tier="im")
                             memory_agent.im_store.store(agent_id, memory_copy)
                         elif tier == "ltm":
+                            vector_store.store_memory_vectors(memory_copy, tier="ltm")
                             memory_agent.ltm_store.store(memory_copy)
                         else:
                             logger.warning(f"Unknown tier '{tier}' for memory {memory_copy.get('memory_id')}")

validation/search/attribute/validation.md

@@ -2,15 +2,14 @@
 
 ## Overview
 
-This document outlines the comprehensive validation approach used to ensure the AttributeSearchStrategy implementation is robust, efficient, and reliable. The validation strategy covers basic functionality, advanced features, edge cases, and performance characteristics.
+This document outlines the comprehensive validation approach used to ensure the AttributeSearchStrategy implementation is robust, efficient, and reliable. The validation strategy covers basic functionality, advanced features, and edge cases.
 
 ## Validation Components
 
 The validation suite for AttributeSearchStrategy consists of:
 
 1. **Functional Testing**: A comprehensive test suite that verifies correctness of various search capabilities
-2. **Performance Testing**: Metrics-driven evaluation of search performance under various conditions
-3. **Edge Case Testing**: Validation of behavior with unexpected or boundary inputs
+2. **Edge Case Testing**: Validation of behavior with unexpected or boundary inputs
 
 ## Functional Validation
 
@@ -79,15 +78,6 @@ Robustness is validated through testing of edge cases:
 - ✅ Long vs. short document handling
 - ✅ Varying document length impacts
 
-## Performance Characteristics
-
-The strategy has been performance-tested with:
-
-- ✅ Varying memory sizes
-- ✅ Different scoring methods' performance impact
-- ✅ Pattern caching effectiveness
-- ✅ Memory impact across different query types
-
 ## Validation Methodology
 
 ### Test Data
@@ -126,12 +116,11 @@ The AttributeSearchStrategy validation is comprehensive because it:
 1. **Covers all public API parameters** - Every parameter of the `search()` method is tested
 2. **Tests all scoring methods** - All implemented scoring approaches are validated
 3. **Examines edge cases** - Boundary conditions and error handling are verified
-4. **Verifies performance characteristics** - Both speed and resource usage are measured
-5. **Validates across memory tiers** - Tests span STM, IM, and LTM memory stores
-6. **Tests with realistic data** - Uses representative memory content structures
+4. **Validates across memory tiers** - Tests span STM, IM, and LTM memory stores
+5. **Tests with realistic data** - Uses representative memory content structures
 
 ## Conclusion
 
-The AttributeSearchStrategy implementation has been thoroughly validated across functional requirements, edge cases, and performance characteristics. The test suite provides confidence in the robustness of the implementation and establishes a baseline for regression testing as the codebase evolves.
+The AttributeSearchStrategy implementation has been thoroughly validated across functional requirements and edge cases. The test suite provides confidence in the robustness of the implementation and establishes a baseline for regression testing as the codebase evolves.
 
-Both the test suite and performance testing components verify that the strategy successfully handles various memory structures, search patterns, and retrieval scenarios. All tests pass with the expected results, confirming that the implementation fulfills its designed purpose effectively. 
+Both the test suite components verify that the strategy successfully handles various memory structures, search patterns, and retrieval scenarios. All tests pass with the expected results, confirming that the implementation fulfills its designed purpose effectively.