Skip to content

Commit 0b2144a

Browse files
committed
Fixing computed field issue
1 parent 68ecd22 commit 0b2144a

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

ingest/settings.py

+3-5
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ class Settings(BaseSettings):
1919
DATABASE_DB: str
2020
DATABASE_HOST: str
2121
DATABASE_PORT: int
22-
DATABASE_READ_URL: Union[str, None]
23-
DATABASE_WRITE_URL: Union[str, None]
2422
DRYRUN: bool = False
2523
FETCH_BUCKET: str
2624
ETL_BUCKET: str
@@ -35,14 +33,14 @@ class Settings(BaseSettings):
3533

3634
@computed_field
3735
def DATABASE_READ_URL(self) -> str:
38-
return f"postgresql://{values['DATABASE_READ_USER']}:{values['DATABASE_READ_PASSWORD']}@{values['DATABASE_HOST']}:{values['DATABASE_PORT']}/{values['DATABASE_DB']}"
36+
return f"postgresql://{self.DATABASE_READ_USER}:{self.DATABASE_READ_PASSWORD}@{self.DATABASE_HOST}:{self.DATABASE_PORT}/{self.DATABASE_DB}"
3937

4038
@computed_field
4139
def DATABASE_WRITE_URL(self) -> str:
42-
return f"postgresql://{values['DATABASE_WRITE_USER']}:{values['DATABASE_WRITE_PASSWORD']}@{values['DATABASE_HOST']}:{values['DATABASE_PORT']}/{values['DATABASE_DB']}"
40+
return f"postgresql://{self.DATABASE_WRITE_USER}:{self.DATABASE_WRITE_PASSWORD}@{self.DATABASE_HOST}:{self.DATABASE_PORT}/{self.DATABASE_DB}"
4341

4442
model_config = SettingsConfigDict(
45-
extra="ignore", env_file=f"../{environ.get('DOTENV', '.env')}", env_file_encoding="utf-8"
43+
extra="ignore", env_file=f"{environ.get('DOTENV', '.env')}", env_file_encoding="utf-8"
4644
)
4745

4846

pyproject.toml

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ pydantic-settings = "^2.3.2"
1919

2020
[tool.poetry.group.cdk.dependencies]
2121
aws-cdk-lib = "^2.145.0"
22+
boto3 = "^1.34.124"
2223

2324
[build-system]
2425
requires = ["poetry-core"]

0 commit comments

Comments
 (0)