Update logic

Signed-off-by: Andy Kwok <[email protected]>

Author: andy-k-improving

src/strands_tools/mem0_memory.py

@@ -191,23 +191,14 @@ def _initialize_client(self, config: Optional[Dict] = None) -> Any:
             logger.debug("Using Mem0 Platform backend (MemoryClient)")
             return MemoryClient()
 
+
+
+        # Vector search providers
         if os.environ.get("NEPTUNE_ANALYTICS_GRAPH_IDENTIFIER_VECTOR") and os.environ.get("OPENSEARCH_HOST"):
             raise RuntimeError("""Conflicting backend configurations:
             Both NEPTUNE_ANALYTICS_GRAPH_IDENTIFIER_VECTOR and OPENSEARCH_HOST environment variables are set.
             Please specify only one backend.""")
-        if os.environ.get("NEPTUNE_ANALYTICS_GRAPH_IDENTIFIER") and os.environ.get("NEPTUNE_DATABASE_ENDPOINT"):
-            raise RuntimeError("""Conflicting backend configurations:
-                Both NEPTUNE_ANALYTICS_GRAPH_IDENTIFIER and NEPTUNE_DATABASE_ENDPOINT environment variables are set.
-                Please specify only one graph backend.""")
-
-        if os.environ.get("NEPTUNE_ANALYTICS_GRAPH_IDENTIFIER"):
-            logger.debug("Using Neptune Analytics graph backend (Mem0Memory with Neptune Analytics)")
-            config = self._configure_neptune_analytics_backend(config)
-        elif os.environ.get("NEPTUNE_DATABASE_ENDPOINT"):
-            logger.debug("Using Neptune Database graph backend (Mem0Memory with Neptune Database)")
-            config = self._configure_neptune_backend(config)
 
-        # Vector search providers
         if os.environ.get("OPENSEARCH_HOST"):
             logger.debug("Using OpenSearch backend (Mem0Memory with OpenSearch)")
             merged_config = self._initialize_opensearch_client(config)
@@ -220,10 +211,21 @@ def _initialize_client(self, config: Optional[Dict] = None) -> Any:
             logger.debug("Using FAISS backend (Mem0Memory with FAISS)")
             merged_config = self._initialize_faiss_client(config)
 
+
+
         # Graph backend providers
+        if os.environ.get("NEPTUNE_ANALYTICS_GRAPH_IDENTIFIER") and os.environ.get("NEPTUNE_DATABASE_ENDPOINT"):
+            raise RuntimeError("""Conflicting backend configurations:
+                Both NEPTUNE_ANALYTICS_GRAPH_IDENTIFIER and NEPTUNE_DATABASE_ENDPOINT environment variables are set.
+                Please specify only one graph backend.""")
+
         if os.environ.get("NEPTUNE_ANALYTICS_GRAPH_IDENTIFIER"):
             logger.debug("Using Neptune Analytics graph backend (Mem0Memory with Neptune Analytics)")
-            merged_config = self._configure_neptune_analytics_graph_backend(merged_config)
+            config = self._configure_neptune_analytics_backend(config)
+        elif os.environ.get("NEPTUNE_DATABASE_ENDPOINT"):
+            logger.debug("Using Neptune Database graph backend (Mem0Memory with Neptune Database)")
+            config = self._configure_neptune_backend(config)
+
 
         return Mem0Memory.from_config(config_dict=merged_config)
 

tests/test_mem0.py

@@ -455,6 +455,7 @@ def test_mem0_service_client_init(mock_opensearch, mock_mem0_memory, mock_sessio
         client = Mem0ServiceClient()
         assert client.mem0 is not None
 
+    # Test with Neptune Database with OpenSearch
     with patch.dict(
         os.environ,
         {"OPENSEARCH_HOST": "test.opensearch.amazonaws.com",