fix: adk version update to 1.19 (#316)

Author: zakahan

pyproject.toml

@@ -33,7 +33,9 @@ dependencies = [
     "llama-index-llms-openai-like>=0.5.1",
     "llama-index-vector-stores-opensearch>=0.6.1",
     "psycopg2-binary>=2.9.10", # For PostgreSQL database (short term memory)
+    "asyncpg>=0.29.0", # For async PostgreSQL database (short term memory)
     "pymysql>=1.1.1", # For MySQL database (short term memory)
+    "aiomysql>=0.3.2", # For async MySQL database (short term memory)
     "opensearch-py==2.8.0",
     "filetype>=1.2.0",
 ]

veadk/memory/short_term_memory_backends/mysql_backend.py

@@ -15,10 +15,12 @@
 from functools import cached_property
 from typing import Any
 
+from google.adk import version as adk_version
 from google.adk.sessions import (
     BaseSessionService,
     DatabaseSessionService,
 )
+from packaging.version import parse as parse_version
 from pydantic import Field
 from typing_extensions import override
 from urllib.parse import quote_plus
@@ -36,7 +38,10 @@ class MysqlSTMBackend(BaseShortTermMemoryBackend):
     def model_post_init(self, context: Any) -> None:
         encoded_username = quote_plus(self.mysql_config.user)
         encoded_password = quote_plus(self.mysql_config.password)
-        self._db_url = f"mysql+pymysql://{encoded_username}:{encoded_password}@{self.mysql_config.host}/{self.mysql_config.database}"
+        if parse_version(adk_version.__version__) < parse_version("1.19.0"):
+            self._db_url = f"mysql+pymysql://{encoded_username}:{encoded_password}@{self.mysql_config.host}/{self.mysql_config.database}"
+        else:
+            self._db_url = f"mysql+aiomysql://{encoded_username}:{encoded_password}@{self.mysql_config.host}/{self.mysql_config.database}"
 
     @cached_property
     @override

veadk/memory/short_term_memory_backends/postgresql_backend.py

@@ -14,15 +14,16 @@
 
 from functools import cached_property
 from typing import Any
-from venv import logger
+from urllib.parse import quote_plus
 
+from google.adk import version as adk_version
 from google.adk.sessions import (
     BaseSessionService,
     DatabaseSessionService,
 )
+from packaging.version import parse as parse_version
 from pydantic import Field
 from typing_extensions import override
-from urllib.parse import quote_plus
 
 import veadk.config  # noqa E401
 from veadk.configs.database_configs import PostgreSqlConfig
@@ -37,8 +38,10 @@ class PostgreSqlSTMBackend(BaseShortTermMemoryBackend):
     def model_post_init(self, context: Any) -> None:
         encoded_username = quote_plus(self.postgresql_config.user)
         encoded_password = quote_plus(self.postgresql_config.password)
-        self._db_url = f"postgresql://{encoded_username}:{encoded_password}@{self.postgresql_config.host}:{self.postgresql_config.port}/{self.postgresql_config.database}"
-        logger.debug(self._db_url)
+        if parse_version(adk_version.__version__) < parse_version("1.19.0"):
+            self._db_url = f"postgresql://{encoded_username}:{encoded_password}@{self.postgresql_config.host}:{self.postgresql_config.port}/{self.postgresql_config.database}"
+        else:
+            self._db_url = f"postgresql+asyncpg://{encoded_username}:{encoded_password}@{self.postgresql_config.host}:{self.postgresql_config.port}/{self.postgresql_config.database}"
 
     @cached_property
     @override

veadk/memory/short_term_memory_backends/sqlite_backend.py

@@ -17,10 +17,12 @@
 from functools import cached_property
 from typing import Any
 
+from google.adk import version as adk_version
 from google.adk.sessions import (
     BaseSessionService,
     DatabaseSessionService,
 )
+from packaging.version import parse as parse_version
 from typing_extensions import override
 
 from veadk.memory.short_term_memory_backends.base_backend import (
@@ -32,12 +34,17 @@ class SQLiteSTMBackend(BaseShortTermMemoryBackend):
     local_path: str
 
     def model_post_init(self, context: Any) -> None:
+        self.local_path = os.path.abspath(self.local_path)
         # if the DB file not exists, create it
         if not self._db_exists():
+            os.makedirs(os.path.dirname(self.local_path), exist_ok=True)
             conn = sqlite3.connect(self.local_path)
             conn.close()
 
-        self._db_url = f"sqlite:///{self.local_path}"
+        if parse_version(adk_version.__version__) < parse_version("1.19.0"):
+            self._db_url = f"sqlite:///{self.local_path}"
+        else:
+            self._db_url = f"sqlite+aiosqlite:///{self.local_path}"
 
     @cached_property
     @override

veadk/utils/patches.py

@@ -82,9 +82,9 @@ def patch_google_adk_telemetry() -> None:
 
 
 def patch_tracer() -> None:
-    for mod_name, mod in sys.modules.items():
-        from opentelemetry import trace
+    from opentelemetry import trace
 
+    for mod_name, mod in tuple(sys.modules.items()):
         if mod_name.startswith("google.adk"):
             for var_name in dir(mod):
                 var = getattr(mod, var_name, None)