gmakstutis/cognee
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(database): address CodeRabbit review feedback

Browse source 
- Add comprehensive docstring for __init__ method to meet 80% coverage requirement
- Fix security issue: remove sensitive data from log messages
- Fix merge precedence: programmatic args now correctly override env vars
- Fix SQLite timeout order: user-specified timeout now overrides default 30s
- Clarify precedence in docstring documentation

Signed-off-by: ketanjain7981 <ketan.jain@think41.com>
This commit is contained in:
ketanjain7981 2025-12-02 21:01:43 +05:30
parent f9b16e508d
commit c892265644
1 changed files with 27 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
cognee/infrastructure/databases/relational/sqlalchemy/SqlAlchemyAdapter.py
View file

@ -31,23 +31,39 @@ class SQLAlchemyAdapter:
"""
def __init__(self, connection_string: str, connect_args: Optional[dict] = None):
"""
Initialize the SQLAlchemy adapter with connection settings.
Parameters:
-----------
connection_string (str): The database connection string (e.g., 'sqlite:///path/to/db'
or 'postgresql://user:pass@host:port/db').
connect_args (Optional[dict]): Optional dictionary of connection arguments to pass to
the database engine. These are driver-specific parameters such as SSL settings,
timeouts, or connection pool options. If DATABASE_CONNECT_ARGS environment variable
is set, those values will be merged with this parameter (programmatic values take
precedence over environment variables). Defaults to None.
Environment Variables:
----------------------
DATABASE_CONNECT_ARGS: Optional JSON string containing connection arguments.
Example: '{"sslmode": "require", "connect_timeout": 10}'
"""
self.db_path: str = None
self.db_uri: str = connection_string
env_connect_args = os.getenv("DATABASE_CONNECT_ARGS")
if env_connect_args:
try:
env_connect_args = json.loads(env_connect_args)
if isinstance(env_connect_args, dict):
if connect_args is None:
connect_args = {}
connect_args.update(env_connect_args)
parsed_env_args = json.loads(env_connect_args)
if isinstance(parsed_env_args, dict):
# Merge: env vars as base, programmatic args override
merged_args = {**parsed_env_args, **(connect_args or {})}
connect_args = merged_args
else:
logger.warning(
f"DATABASE_CONNECT_ARGS is not a valid JSON dictionary: {env_connect_args}"
)
except json.JSONDecodeError as e:
logger.warning(f"Failed to parse DATABASE_CONNECT_ARGS as JSON: {e}")
logger.warning("DATABASE_CONNECT_ARGS is not a valid JSON dictionary, ignoring")
except json.JSONDecodeError:
logger.warning("Failed to parse DATABASE_CONNECT_ARGS as JSON, ignoring")
if "sqlite" in connection_string:
[prefix, db_path] = connection_string.split("///")
@ -69,7 +85,7 @@ class SQLAlchemyAdapter:
self.engine = create_async_engine(
connection_string,
poolclass=NullPool,
connect_args={**(connect_args or {}), **{"timeout": 30}},
connect_args={**{"timeout": 30}, **(connect_args or {})},
)
else:
self.engine = create_async_engine(