Merge pull request #131 from Dooders/dev

Dev

Author: csmangum

memory/embeddings/vector_store.py

@@ -556,29 +556,57 @@ 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}"
+                )
+                return False
+
         success = True
 
-        # Store in STM index
+        # Store in appropriate index based on tier
         if tier == "stm":
-            logger.debug("Storing STM vector for memory %s", memory_id)
-            success = success and self.stm_index.add(
-                memory_id, embeddings["full_vector"], metadata
+            success = store_vector(
+                self.stm_index, memory_id, embeddings["full_vector"], metadata, "stm"
             )
-
-        # Store in IM index
-        if tier == "im":
+        elif tier == "im":
             #! TODO: Use compressed vector
-            logger.debug("Storing IM vector for memory %s", memory_id)
-            success = success and self.im_index.add(
-                memory_id, embeddings["full_vector"], metadata
+            logger.debug(
+                f"@@@@@@@@@@@@@@@@@@@@@@@@@ Storing IM vector for memory {memory_id}"
             )
-
-        # Store in LTM index
-        if tier == "ltm":
+            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
-            logger.debug("Storing LTM vector for memory %s", memory_id)
-            success = success and self.ltm_index.add(
-                memory_id, embeddings["full_vector"], metadata
+            success = store_vector(
+                self.ltm_index, memory_id, embeddings["full_vector"], metadata, "ltm"
             )
 
         return success

memory/utils/logging.py

@@ -0,0 +1,88 @@
+import os
+import logging
+import sys
+
+# Use current working directory for logs
+LOGS_DIR = os.path.join(os.getcwd(), "logs")
+
+print(f"Current working directory: {os.getcwd()}")
+print(f"Logs directory: {LOGS_DIR}")
+
+# Configure logging
+logger = logging.getLogger()
+
+
+def setup_logging(demo_name: str, log_dir: str = LOGS_DIR) -> logging.Logger:
+    """Set up logging to both console and file.
+
+    Args:
+        demo_name: Name of the demo for log file naming
+
+    Returns:
+        Configured logger instance
+    """
+    try:
+        # Create logs directory if it doesn't exist
+        os.makedirs(log_dir, exist_ok=True)
+        print(f"Created logs directory at: {log_dir}")
+
+        # Use a fixed log filename based on demo name (without timestamp)
+        log_file = os.path.join(log_dir, f"{demo_name}.log")
+        print(f"Log file will be created at: {log_file}")
+
+        # Clear the existing log file if it exists
+        with open(log_file, "w") as f:
+            # Empty the file by opening it in write mode
+            pass
+        print(f"Initialized log file: {log_file}")
+
+        
+        logger.setLevel(logging.DEBUG)
+
+        # Clear existing handlers if any
+        if logger.handlers:
+            logger.handlers.clear()
+
+        # File handler for logging to file
+        file_handler = logging.FileHandler(log_file)
+        file_formatter = logging.Formatter("%(asctime)s - %(levelname)s - %(message)s")
+        file_handler.setFormatter(file_formatter)
+        file_handler.setLevel(logging.DEBUG)
+
+        # Console handler for logging to console
+        console_handler = logging.StreamHandler()
+        console_formatter = logging.Formatter("%(message)s")
+        console_handler.setFormatter(console_formatter)
+        console_handler.setLevel(logging.INFO)
+
+        # Create a filter to exclude embedding-related log messages
+        class EmbeddingFilter(logging.Filter):
+            def filter(self, record):
+                # Skip any log messages containing "embedding" or "vector"
+                return not any(
+                    term in record.getMessage().lower()
+                    for term in ["embedding", "vector", "encoded"]
+                )
+
+        # Add the filter to both handlers
+        embedding_filter = EmbeddingFilter()
+        file_handler.addFilter(embedding_filter)
+        console_handler.addFilter(embedding_filter)
+
+        # Add handlers to logger
+        logger.addHandler(file_handler)
+        logger.addHandler(console_handler)
+
+        # Log a test message to verify logging is working
+        logger.info(f"Logging initialized for {demo_name}")
+        print(f"Logging setup complete for {demo_name}")
+
+        return logger
+    except Exception as e:
+        print(f"Error setting up logging: {e}")
+        # Fallback to basic console logging
+        logging.basicConfig(level=logging.INFO)
+        return logging.getLogger()
+    
+    
+