Move firestore integration into integrations package

Author: ScottMansfield

src/google/adk/integrations/firestore/__init__.py

@@ -0,0 +1,17 @@
+# Copyright 2026 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from __future__ import annotations
+
+"""Firestore integrations for ADK."""

…/google/adk/firestore_database_runner.py …s/firestore/firestore_database_runner.pysrc/google/adk/firestore_database_runner.py renamed to src/google/adk/integrations/firestore/firestore_database_runner.py src/google/adk/firestore_database_runner.py renamed to src/google/adk/integrations/firestore/firestore_database_runner.py

@@ -18,13 +18,13 @@
 from typing import Optional
 from typing import TYPE_CHECKING
 
-from .artifacts.gcs_artifact_service import GcsArtifactService
-from .memory.firestore_memory_service import FirestoreMemoryService
-from .runners import Runner
-from .sessions.firestore_session_service import FirestoreSessionService
+from ...artifacts.gcs_artifact_service import GcsArtifactService
+from ...runners import Runner
+from .firestore_memory_service import FirestoreMemoryService
+from .firestore_session_service import FirestoreSessionService
 
 if TYPE_CHECKING:
-  from .agents.base_agent import BaseAgent
+  from ...agents.base_agent import BaseAgent
 
 
 def create_firestore_runner(

…e/adk/memory/firestore_memory_service.py …ns/firestore/firestore_memory_service.pysrc/google/adk/memory/firestore_memory_service.py renamed to src/google/adk/integrations/firestore/firestore_memory_service.py src/google/adk/memory/firestore_memory_service.py renamed to src/google/adk/integrations/firestore/firestore_memory_service.py

@@ -24,223 +24,44 @@
 
 from typing_extensions import override
 
-from . import _utils
-from ..events.event import Event
-from .base_memory_service import BaseMemoryService
-from .base_memory_service import SearchMemoryResponse
-from .memory_entry import MemoryEntry
+from ...memory import _utils
+from ...events.event import Event
+from ...memory.base_memory_service import BaseMemoryService
+from ...memory.base_memory_service import SearchMemoryResponse
+from ...memory.memory_entry import MemoryEntry
 
 if TYPE_CHECKING:
   from google.cloud import firestore
 
-  from ..sessions.session import Session
+  from ...sessions.session import Session
 
 logger = logging.getLogger("google_adk." + __name__)
 
 DEFAULT_EVENTS_COLLECTION = "events"
 
-# Standard English stop words
 DEFAULT_STOP_WORDS = {
-    "a",
-    "an",
-    "the",
-    "and",
-    "or",
-    "but",
-    "if",
-    "then",
-    "else",
-    "to",
-    "of",
-    "in",
-    "on",
-    "for",
-    "with",
-    "is",
-    "are",
-    "was",
-    "were",
-    "be",
-    "been",
-    "being",
-    "have",
-    "has",
-    "had",
-    "do",
-    "does",
-    "did",
-    "can",
-    "could",
-    "will",
-    "would",
-    "should",
-    "shall",
-    "may",
-    "might",
-    "must",
-    "up",
-    "down",
-    "out",
-    "in",
-    "over",
-    "under",
-    "again",
-    "further",
-    "then",
-    "once",
-    "here",
-    "there",
-    "when",
-    "where",
-    "why",
-    "how",
-    "all",
-    "any",
-    "both",
-    "each",
-    "few",
-    "more",
-    "most",
-    "other",
-    "some",
-    "such",
-    "no",
-    "nor",
-    "not",
-    "only",
-    "own",
-    "same",
-    "so",
-    "than",
-    "too",
-    "very",
-    "i",
-    "me",
-    "my",
-    "myself",
-    "we",
-    "our",
-    "ours",
-    "ourselves",
-    "you",
-    "your",
-    "yours",
-    "yourself",
-    "yourselves",
-    "he",
-    "him",
-    "his",
-    "himself",
-    "she",
-    "her",
-    "hers",
-    "herself",
-    "it",
-    "its",
-    "itself",
-    "they",
-    "them",
-    "their",
-    "theirs",
-    "themselves",
-    "what",
-    "which",
-    "who",
-    "whom",
-    "this",
-    "that",
-    "these",
-    "those",
-    "am",
-    "is",
-    "are",
-    "was",
-    "were",
-    "be",
-    "been",
-    "being",
-    "have",
-    "has",
-    "had",
-    "having",
-    "do",
-    "does",
-    "did",
-    "doing",
-    "a",
-    "an",
-    "the",
-    "and",
-    "but",
-    "if",
-    "or",
-    "because",
-    "as",
-    "until",
-    "while",
-    "of",
-    "at",
-    "by",
-    "for",
-    "with",
-    "about",
-    "against",
-    "between",
-    "into",
-    "through",
-    "during",
-    "before",
-    "after",
-    "above",
-    "below",
-    "to",
-    "from",
-    "up",
-    "down",
-    "in",
-    "out",
-    "on",
-    "off",
-    "over",
-    "under",
-    "again",
-    "further",
-    "then",
-    "once",
-    "here",
-    "there",
-    "when",
-    "where",
-    "why",
-    "how",
-    "all",
-    "any",
-    "both",
-    "each",
-    "few",
-    "more",
-    "most",
-    "other",
-    "some",
-    "such",
-    "no",
-    "nor",
-    "not",
-    "only",
-    "own",
-    "same",
-    "so",
-    "than",
-    "too",
-    "very",
-    "s",
-    "t",
-    "can",
-    "will",
-    "just",
-    "don",
-    "should",
-    "now",
+    "a", "an", "the", "and", "or", "but", "if", "then", "else", "to", "of",
+    "in", "on", "for", "with", "is", "are", "was", "were", "be", "been",
+    "being", "have", "has", "had", "do", "does", "did", "can", "could",
+    "will", "would", "should", "shall", "may", "might", "must", "up", "down",
+    "out", "in", "over", "under", "again", "further", "then", "once", "here",
+    "there", "when", "where", "why", "how", "all", "any", "both", "each",
+    "few", "more", "most", "other", "some", "such", "no", "nor", "not",
+    "only", "own", "same", "so", "than", "too", "very", "i", "me", "my",
+    "myself", "we", "our", "ours", "ourselves", "you", "your", "yours",
+    "yourself", "yourselves", "he", "him", "his", "himself", "she", "her",
+    "hers", "herself", "it", "its", "itself", "they", "them", "their",
+    "theirs", "themselves", "what", "which", "who", "whom", "this", "that",
+    "these", "those", "am", "is", "are", "was", "were", "be", "been", "being",
+    "have", "has", "had", "having", "do", "does", "did", "doing", "a", "an",
+    "the", "and", "but", "if", "or", "because", "as", "until", "while", "of",
+    "at", "by", "for", "with", "about", "against", "between", "into",
+    "through", "during", "before", "after", "above", "below", "to", "from",
+    "up", "down", "in", "out", "on", "off", "over", "under", "again",
+    "further", "then", "once", "here", "there", "when", "where", "why", "how",
+    "all", "any", "both", "each", "few", "more", "most", "other", "some",
+    "such", "no", "nor", "not", "only", "own", "same", "so", "than", "too",
+    "very", "s", "t", "can", "will", "just", "don", "should", "now",
 }
 
 
@@ -288,8 +109,6 @@ async def _search_by_keyword(
       self, app_name: str, user_id: str, keyword: str
   ) -> list[MemoryEntry]:
     """Searches for events matching a single keyword."""
-    # This requires a collection group index in Firestore for 'events' with
-    # appName == X, userId == Y, and keywords array-contains Z.
     query = (
         self.client.collection_group(self.events_collection)
         .where("appName", "==", app_name)
@@ -326,26 +145,16 @@ async def search_memory(
     if not keywords:
       return SearchMemoryResponse()
 
-    # Search for each keyword concurrently
     tasks = [
         self._search_by_keyword(app_name, user_id, keyword)
         for keyword in keywords
     ]
     results = await asyncio.gather(*tasks)
 
-    # Merge results and deduplicate by MemoryEntry content/author/timestamp
-    # (MemoryEntry is not hashable by default if it contains complex objects,
-    # so we might need to deduplicate by id if available, or by content string).
-    # Since we convert Event to MemoryEntry, we don't have event.id in MemoryEntry
-    # unless we add it. The Java code use custom hash/equals for MemoryEntry.
-    # In Python, MemoryEntry is a Pydantic model. We can deduplicate by model_dump_json()
-    # or by a custom key.
     seen = set()
     memories = []
     for result_list in results:
       for entry in result_list:
-        # Deduplicate by a key of (author, content_text)
-        # Content might be complex, so let's use its json representation or text
         content_text = ""
         if entry.content and entry.content.parts:
           content_text = " ".join(