Skip to content

Commit 53ab980

Browse files
committed
separate config env
1 parent 2daf840 commit 53ab980

File tree

4 files changed

+22
-155
lines changed

4 files changed

+22
-155
lines changed

app/main.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
set_cache_pair,
1919
url_cache,
2020
)
21-
from app.utils.config import DOMAIN, MAX_RECENT_URLS, SESSION_SECRET, load_env
21+
from app.utils.config import DOMAIN, MAX_RECENT_URLS, SESSION_SECRET
2222
from app.utils.helper import (
2323
format_date,
2424
generate_code,
@@ -27,7 +27,6 @@
2727
)
2828
from app.utils.qr import generate_qr_with_logo
2929

30-
load_env()
3130

3231

3332
# -----------------------------
@@ -151,7 +150,7 @@ async def create_short_url(
151150
return RedirectResponse("/", status_code=303)
152151

153152
# Mypy now knows short_code is strictly 'str'
154-
new_short_url = build_short_url(short_code, str(request.base_url))
153+
new_short_url = build_short_url(short_code, DOMAIN)
155154

156155
session.update(
157156
{

app/utils/config.py

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,14 @@
1-
import os
2-
3-
from dotenv import load_dotenv
4-
5-
6-
def load_env():
7-
env = os.getenv("ENV", "development")
8-
file_map = {
9-
"production": ".env",
10-
"local": ".env.local",
11-
"development": ".env.development",
12-
}
13-
load_dotenv(file_map.get(env, ".env.development"), override=True)
14-
print(f"Environment selected: {env}")
15-
print(f"MODE value: {os.getenv('MODE')}")
16-
171

2+
import os
183
# -------------------------
194
# Helpers
205
# -------------------------
21-
def _get_bool(key: str, default: bool) -> bool:
22-
return os.getenv(key, str(default)).lower() in ("1", "true", "yes", "on")
236

247

8+
from app.utils.config_env import load_env # noqa: F401
9+
10+
load_env()
11+
2512
def _get_int(key: str, default: int) -> int:
2613
try:
2714
return int(os.getenv(key, default))

app/utils/config_env.py

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
import os
2+
3+
from dotenv import load_dotenv
4+
5+
6+
def load_env():
7+
env = os.getenv("ENV", "development")
8+
file_map = {
9+
"production": ".env",
10+
"local": ".env.local",
11+
"development": ".env.development",
12+
}
13+
load_dotenv(file_map.get(env, ".env.development"), override=True)
14+
print(f"Environment selected: {env}")
15+
print(f"MODE value: {os.getenv('MODE')}")

group_shorten.ps1

Lines changed: 0 additions & 134 deletions
This file was deleted.

0 commit comments

Comments
 (0)