Skip to content

Elastic settings fix #43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 29, 2024
Merged

Elastic settings fix #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9ec0aef
Fix database connection URL to ensure: special characters in password…
mtykhenko Nov 29, 2024
e779711
Set elastic port to default in app settings to tmp fix ElasticStore n…
mtykhenko Nov 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion backend/core/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ class Settings(BaseSettings):

# Elasticsearch credentials
elastic_host: Optional[str] = None
elastic_port: Optional[int] = None
elastic_port: Optional[int] = 9200
elastic_password: Optional[str] = None
elastic_cacert_path: Optional[str] = None
elastic_cloud_id: Optional[str] = None
Expand Down
15 changes: 10 additions & 5 deletions backend/rag_solution/file_management/database.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import logging
import os

from sqlalchemy import create_engine
from sqlalchemy import create_engine, URL
from sqlalchemy.orm import declarative_base, sessionmaker
from sqlalchemy.exc import SQLAlchemyError
from core.config import settings
Expand All @@ -18,14 +18,19 @@
host = 'localhost'

# Synchronous database URL
DATABASE_URL = (
f"postgresql://{settings.collectiondb_user}:{settings.collectiondb_pass}@{settings.collectiondb_host}:{settings.collectiondb_port}/{settings.collectiondb_name}"
database_url = URL.create(
drivername="postgresql",
username=settings.collectiondb_user,
password=settings.collectiondb_pass,
host=settings.collectiondb_host,
port=settings.collectiondb_port,
database=settings.collectiondb_name
)

logger.debug(f"Database URL: {DATABASE_URL}")
logger.debug(f"Database URL: {database_url}")

# Create synchronous engine and session
engine = create_engine(DATABASE_URL, echo=True)
engine = create_engine(database_url, echo=True)
SessionLocal = sessionmaker(autocommit=False, autoflush=False, bind=engine)

Base = declarative_base()
Expand Down
Loading