refactor: Change vector_db_url usage to its appropriate vector_db_host usage
This commit is contained in:
parent
05084e6779
commit
0903092fc9
5 changed files with 19 additions and 8 deletions
|
|
@ -102,7 +102,7 @@ class SQLAlchemyAdapter:
|
||||||
"postgresql+asyncpg",
|
"postgresql+asyncpg",
|
||||||
username=vector_config.vector_db_username,
|
username=vector_config.vector_db_username,
|
||||||
password=vector_config.vector_db_password,
|
password=vector_config.vector_db_password,
|
||||||
host=vector_config.vector_db_url,
|
host=vector_config.vector_db_host,
|
||||||
port=int(vector_config.vector_db_port),
|
port=int(vector_config.vector_db_port),
|
||||||
database=maintenance_db_name,
|
database=maintenance_db_name,
|
||||||
)
|
)
|
||||||
|
|
|
||||||
|
|
@ -31,6 +31,7 @@ class VectorConfig(BaseSettings):
|
||||||
vector_dataset_database_handler: str = "lancedb"
|
vector_dataset_database_handler: str = "lancedb"
|
||||||
vector_db_username: str = ""
|
vector_db_username: str = ""
|
||||||
vector_db_password: str = ""
|
vector_db_password: str = ""
|
||||||
|
vector_db_host: str = ""
|
||||||
|
|
||||||
model_config = SettingsConfigDict(env_file=".env", extra="allow")
|
model_config = SettingsConfigDict(env_file=".env", extra="allow")
|
||||||
|
|
||||||
|
|
@ -69,6 +70,7 @@ class VectorConfig(BaseSettings):
|
||||||
"vector_dataset_database_handler": self.vector_dataset_database_handler,
|
"vector_dataset_database_handler": self.vector_dataset_database_handler,
|
||||||
"vector_db_username": self.vector_db_username,
|
"vector_db_username": self.vector_db_username,
|
||||||
"vector_db_password": self.vector_db_password,
|
"vector_db_password": self.vector_db_password,
|
||||||
|
"vector_db_host": self.vector_db_host,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -16,6 +16,7 @@ def create_vector_engine(
|
||||||
vector_dataset_database_handler: str = "",
|
vector_dataset_database_handler: str = "",
|
||||||
vector_db_username: str = "",
|
vector_db_username: str = "",
|
||||||
vector_db_password: str = "",
|
vector_db_password: str = "",
|
||||||
|
vector_db_host: str = "",
|
||||||
):
|
):
|
||||||
"""
|
"""
|
||||||
Wrapper function to call create vector engine with caching.
|
Wrapper function to call create vector engine with caching.
|
||||||
|
|
@ -28,6 +29,9 @@ def create_vector_engine(
|
||||||
vector_db_port,
|
vector_db_port,
|
||||||
vector_db_key,
|
vector_db_key,
|
||||||
vector_dataset_database_handler,
|
vector_dataset_database_handler,
|
||||||
|
vector_db_username,
|
||||||
|
vector_db_password,
|
||||||
|
vector_db_host,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -36,9 +40,12 @@ def _create_vector_engine(
|
||||||
vector_db_provider: str,
|
vector_db_provider: str,
|
||||||
vector_db_url: str,
|
vector_db_url: str,
|
||||||
vector_db_name: str,
|
vector_db_name: str,
|
||||||
vector_db_port: str = "",
|
vector_db_port: str,
|
||||||
vector_db_key: str = "",
|
vector_db_key: str,
|
||||||
vector_dataset_database_handler: str = "",
|
vector_dataset_database_handler: str,
|
||||||
|
vector_db_username: str,
|
||||||
|
vector_db_password: str,
|
||||||
|
vector_db_host: str,
|
||||||
):
|
):
|
||||||
"""
|
"""
|
||||||
Create a vector database engine based on the specified provider.
|
Create a vector database engine based on the specified provider.
|
||||||
|
|
@ -84,19 +91,19 @@ def _create_vector_engine(
|
||||||
if backend_access_control_enabled():
|
if backend_access_control_enabled():
|
||||||
connection_string: str = (
|
connection_string: str = (
|
||||||
f"postgresql+asyncpg://{vector_db_username}:{vector_db_password}"
|
f"postgresql+asyncpg://{vector_db_username}:{vector_db_password}"
|
||||||
f"@{vector_db_url}:{vector_db_port}/{vector_db_name}"
|
f"@{vector_db_host}:{vector_db_port}/{vector_db_name}"
|
||||||
)
|
)
|
||||||
else:
|
else:
|
||||||
if (
|
if (
|
||||||
vector_db_port
|
vector_db_port
|
||||||
and vector_db_username
|
and vector_db_username
|
||||||
and vector_db_password
|
and vector_db_password
|
||||||
and vector_db_url
|
and vector_db_host
|
||||||
and vector_db_name
|
and vector_db_name
|
||||||
):
|
):
|
||||||
connection_string: str = (
|
connection_string: str = (
|
||||||
f"postgresql+asyncpg://{vector_db_username}:{vector_db_password}"
|
f"postgresql+asyncpg://{vector_db_username}:{vector_db_password}"
|
||||||
f"@{vector_db_url}:{vector_db_port}/{vector_db_name}"
|
f"@{vector_db_host}:{vector_db_port}/{vector_db_name}"
|
||||||
)
|
)
|
||||||
else:
|
else:
|
||||||
from cognee.infrastructure.databases.relational import get_relational_config
|
from cognee.infrastructure.databases.relational import get_relational_config
|
||||||
|
|
|
||||||
|
|
@ -32,6 +32,7 @@ class PGVectorDatasetDatabaseHandler(DatasetDatabaseHandlerInterface):
|
||||||
"port": vector_config.vector_db_port,
|
"port": vector_config.vector_db_port,
|
||||||
"username": vector_config.vector_db_username,
|
"username": vector_config.vector_db_username,
|
||||||
"password": vector_config.vector_db_password,
|
"password": vector_config.vector_db_password,
|
||||||
|
"host": vector_config.vector_db_host,
|
||||||
},
|
},
|
||||||
"vector_dataset_database_handler": "pgvector_local",
|
"vector_dataset_database_handler": "pgvector_local",
|
||||||
}
|
}
|
||||||
|
|
@ -51,6 +52,7 @@ class PGVectorDatasetDatabaseHandler(DatasetDatabaseHandlerInterface):
|
||||||
"vector_db_password": new_vector_config["vector_database_connection_info"][
|
"vector_db_password": new_vector_config["vector_database_connection_info"][
|
||||||
"password"
|
"password"
|
||||||
],
|
],
|
||||||
|
"vector_db_host": new_vector_config["vector_database_connection_info"]["host"],
|
||||||
"vector_dataset_database_handler": "pgvector",
|
"vector_dataset_database_handler": "pgvector",
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
|
||||||
|
|
@ -29,7 +29,7 @@ async def create_pg_database(vector_config):
|
||||||
|
|
||||||
pg_relational_engine = create_relational_engine(
|
pg_relational_engine = create_relational_engine(
|
||||||
db_path="",
|
db_path="",
|
||||||
db_host=vector_config["vector_db_url"],
|
db_host=vector_config["vector_db_host"],
|
||||||
db_name=vector_config["vector_db_name"],
|
db_name=vector_config["vector_db_name"],
|
||||||
db_port=vector_config["vector_db_port"],
|
db_port=vector_config["vector_db_port"],
|
||||||
db_username=vector_config["vector_db_username"],
|
db_username=vector_config["vector_db_username"],
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue