ismailelghazi commited on
Commit
6775485
·
1 Parent(s): c75629b

Update database config and env

Browse files
Files changed (2) hide show
  1. .env +1 -2
  2. app/database.py +14 -4
.env CHANGED
@@ -4,8 +4,7 @@ POSTGRES_SERVER=db.ydujocibcmcmsrbmibyr.supabase.co
4
  POSTGRES_PORT=5432
5
  POSTGRES_DB=postgres
6
 
7
- # IMPORTANT → utilise Supabase, PAS localhost
8
  DATABASE_URL=postgresql://postgres:Ism55515%40%2BA@db.ydujocibcmcmsrbmibyr.supabase.co:5432/postgres
9
 
10
  HF_TOKEN=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
11
- JWT_SECRET=PNjgAPBPOnXMRYdyYxNwUmEbswEmyRCxry
 
4
  POSTGRES_PORT=5432
5
  POSTGRES_DB=postgres
6
 
 
7
  DATABASE_URL=postgresql://postgres:Ism55515%40%2BA@db.ydujocibcmcmsrbmibyr.supabase.co:5432/postgres
8
 
9
  HF_TOKEN=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
10
+ JWT_SECRET=PNjgAPBPOnXMRYdyYxNwUmEbswEmyRCxry
app/database.py CHANGED
@@ -7,20 +7,30 @@ from dotenv import load_dotenv
7
 
8
  load_dotenv()
9
 
 
10
  POSTGRES_USER = os.getenv("POSTGRES_USER", "postgres")
11
- POSTGRES_PASSWORD = os.getenv("POSTGRES_PASSWORD", "password")
12
- POSTGRES_SERVER = os.getenv("POSTGRES_SERVER", "localhost")
13
- POSTGRES_DB = os.getenv("POSTGRES_DB", "talait")
 
14
 
 
15
  encoded_user = urllib.parse.quote_plus(POSTGRES_USER)
16
  encoded_password = urllib.parse.quote_plus(POSTGRES_PASSWORD)
17
 
18
- DATABASE_URL = os.getenv("DATABASE_URL", f"postgresql://{encoded_user}:{encoded_password}@{POSTGRES_SERVER}/{POSTGRES_DB}")
 
 
 
 
 
 
19
 
20
  engine = create_engine(
21
  DATABASE_URL,
22
  connect_args={"client_encoding": "utf8"}
23
  )
 
24
  SessionLocal = sessionmaker(autocommit=False, autoflush=False, bind=engine)
25
 
26
  Base = declarative_base()
 
7
 
8
  load_dotenv()
9
 
10
+ # Load env variables
11
  POSTGRES_USER = os.getenv("POSTGRES_USER", "postgres")
12
+ POSTGRES_PASSWORD = os.getenv("POSTGRES_PASSWORD", "")
13
+ POSTGRES_SERVER = os.getenv("POSTGRES_SERVER", "")
14
+ POSTGRES_PORT = os.getenv("POSTGRES_PORT", "5432")
15
+ POSTGRES_DB = os.getenv("POSTGRES_DB", "")
16
 
17
+ # Encode sensitive values for URL safety
18
  encoded_user = urllib.parse.quote_plus(POSTGRES_USER)
19
  encoded_password = urllib.parse.quote_plus(POSTGRES_PASSWORD)
20
 
21
+ # Build DATABASE URL (Supabase always uses sslmode=require)
22
+ DATABASE_URL = (
23
+ f"postgresql://{encoded_user}:{encoded_password}@"
24
+ f"{POSTGRES_SERVER}:{POSTGRES_PORT}/{POSTGRES_DB}?sslmode=require"
25
+ )
26
+
27
+ print("📡 Connecting to:", DATABASE_URL)
28
 
29
  engine = create_engine(
30
  DATABASE_URL,
31
  connect_args={"client_encoding": "utf8"}
32
  )
33
+
34
  SessionLocal = sessionmaker(autocommit=False, autoflush=False, bind=engine)
35
 
36
  Base = declarative_base()