diff --git a/src/config.py b/src/config.py index 74e8b66..03ab027 100644 --- a/src/config.py +++ b/src/config.py @@ -77,8 +77,8 @@ SQLALCHEMY_DATABASE_URI = f"postgresql+asyncpg://{_DATABASE_CREDENTIAL_USER}:{_Q # collector COLLECTOR_HOSTNAME = config("COLLECTOR_HOSTNAME", default="http://192.168.1.86") COLLECTOR_PORT = config("COLLECTOR_PORT", cast=int, default=5432) -_COLLECTOR_CREDENTIAL_USER = config("COLLECTOR_CREDENTIAL_USER", default="postgres") -_COLLECTOR_CREDENTIAL_PASSWORD = config("COLLECTOR_CREDENTIAL_PASSWORD", default="postgres") +_COLLECTOR_CREDENTIAL_USER = config("COLLECTOR_CREDENTIAL_USER") +_COLLECTOR_CREDENTIAL_PASSWORD = config("COLLECTOR_CREDENTIAL_PASSWORD") _QUOTED_COLLECTOR_PASSWORD = parse.quote(str(_COLLECTOR_CREDENTIAL_PASSWORD)) COLLECTOR_NAME = config("COLLECTOR_NAME", default="digital_twin") @@ -95,3 +95,6 @@ RELIABILITY_APP_URL = config( ) RBD_APP_URL = config("RBD_APP_URL", default="http://192.168.1.82:8000/rbd") + +DEV_USERNAME = config("DEV_USERNAME") +DEV_PASSWORD = config("DEV_PASSWORD") diff --git a/src/modules/config.py b/src/modules/config.py index 7ffa027..3c004e0 100644 --- a/src/modules/config.py +++ b/src/modules/config.py @@ -4,7 +4,7 @@ import os sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), '../..'))) -from src.config import DATABASE_HOSTNAME, DATABASE_PORT, COLLECTOR_HOSTNAME, COLLECTOR_PORT, _DATABASE_CREDENTIAL_USER, _DATABASE_CREDENTIAL_PASSWORD, _COLLECTOR_CREDENTIAL_USER, _COLLECTOR_CREDENTIAL_PASSWORD, DATABASE_NAME, COLLECTOR_NAME +from src.config import DATABASE_HOSTNAME, DATABASE_PORT, COLLECTOR_HOSTNAME, COLLECTOR_PORT, _DATABASE_CREDENTIAL_USER, _DATABASE_CREDENTIAL_PASSWORD, _COLLECTOR_CREDENTIAL_USER, _COLLECTOR_CREDENTIAL_PASSWORD, DATABASE_NAME, COLLECTOR_NAME, DEV_USERNAME, DEV_PASSWORD def get_production_connection(): try: diff --git a/src/modules/equipment/Prediksi.py b/src/modules/equipment/Prediksi.py index 44a621f..8ccf4c9 100644 --- a/src/modules/equipment/Prediksi.py +++ b/src/modules/equipment/Prediksi.py @@ -16,7 +16,7 @@ from dotenv import load_dotenv import sys import os from .formula import rc_labor_cost, rc_lost_cost, rc_total_cost -from src.modules.config import get_connection, get_production_connection +from src.modules.config import get_connection, get_production_connection, DEV_USERNAME, DEV_PASSWORD import json load_dotenv() @@ -566,7 +566,7 @@ class Prediksi: # Authentication: sign-in and refresh helpers - async def sign_in(self, username: str = "lcca_admin", password: str = "password") -> dict: + async def sign_in(self, username: str = DEV_USERNAME, password: str = DEV_PASSWORD) -> dict: """Sign in to AUTH_APP_URL/sign-in using provided username/password. Stores access_token and refresh_token on the instance when successful and returns the parsed response dict. diff --git a/src/modules/plant/fetch_eaf_from_rbd.py b/src/modules/plant/fetch_eaf_from_rbd.py index 011c77f..0766a84 100644 --- a/src/modules/plant/fetch_eaf_from_rbd.py +++ b/src/modules/plant/fetch_eaf_from_rbd.py @@ -6,14 +6,14 @@ from datetime import datetime from sqlalchemy import select from src.database.core import DbSession from src.yeardata.model import Yeardata -from src.config import RBD_APP_URL +from src.config import RBD_APP_URL, DEV_USERNAME, DEV_PASSWORD logger = logging.getLogger(__name__) current_year = datetime.now().year AUTH_APP_URL = os.getenv("AUTH_APP_URL", "http://192.168.1.82:8000/auth") -async def sign_in(username: str = "lcca_admin", password: str = "password") -> str: +async def sign_in(username: str = DEV_USERNAME, password: str = DEV_PASSWORD) -> str: """ Sign in to AUTH_APP_URL/sign-in using provided username/password. Returns the access_token string if successful, else None.