maleo-foundation 0.1.38__py3-none-any.whl → 0.1.40__py3-none-any.whl

maleo_foundation/managers/service.py

@@ -5,9 +5,9 @@ from fastapi.exceptions import RequestValidationError
 from starlette.exceptions import HTTPException
 from starlette.types import Lifespan, AppType
 from pydantic_settings import BaseSettings
-from pydantic import BaseModel, Field
+from pydantic import BaseModel, Field, model_validator
 from sqlalchemy import MetaData
-from typing import Optional, Type
+from typing import Dict, Optional, Type
 from maleo_foundation.enums import BaseEnums
 from maleo_foundation.models.transfers.general.token import BaseTokenGeneralTransfers
 from maleo_foundation.models.transfers.parameters.token import BaseTokenParametersTransfers
@@ -80,12 +80,20 @@ class ServiceConfigurations(BaseModel):
 
 class DatabaseConfigurations(BaseModel):
     username:str = Field("postgres", description="Database user's username")
-    password_env:str = Field("DB_PASSWORD", description="Database user's password .env")
-    password:str = Field(os.getenv(password_env), description="Database user's password")
+    password:str = Field(..., description="Database user's password")
     host:str = Field(..., description="Database's host")
     port:int = Field(5432, description="Database's port")
     database:str = Field(..., description="Database")
 
+    @model_validator(mode='before')
+    @classmethod
+    def populate_password(cls, values:Dict):
+        env_value = os.getenv("DB_PASSWORD")
+        if env_value is None:
+            raise ValueError("'DB_PASSWORD' environmet variable must be set.")
+        values["password"] = env_value
+        return values
+
     @property
     def url(self) -> str:
         return f"postgresql://{self.username}:{self.password}@{self.host}:{self.port}/{self.database}"

{maleo_foundation-0.1.38.dist-info → maleo_foundation-0.1.40.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: maleo_foundation
-Version: 0.1.38
+Version: 0.1.40
 Summary: Foundation package for Maleo
 Author-email: Agra Bima Yuda <agra@nexmedis.com>
 License: MIT

{maleo_foundation-0.1.38.dist-info → maleo_foundation-0.1.40.dist-info}/RECORD

@@ -13,7 +13,7 @@ maleo_foundation/expanded_types/token.py,sha256=4fRTJw6W5MYq71NksNrWNi7qYHQ4_lQw
 maleo_foundation/managers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 maleo_foundation/managers/db.py,sha256=ZN0b43OgqQtk2WHKMJQ0E2TeaSEyVJ0-l4FEkrSG0Qo,4645
 maleo_foundation/managers/middleware.py,sha256=7CDXPMb28AR7J72TWOeKFxOlMypKezEtO9mr53a88B0,4032
-maleo_foundation/managers/service.py,sha256=UBjpYugx_-NYk4PxOew-5Izrc4qpBIYWkAvkesGZ4N0,20549
+maleo_foundation/managers/service.py,sha256=kz1xMClvT5oqCgtS-yywhzFgt5GzXl3boG5hBNDpMBo,20777
 maleo_foundation/managers/client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 maleo_foundation/managers/client/base.py,sha256=lYREmEoTLShlPPXOKKiAopjefJ8nIWHCi7IvWkXXKeY,1465
 maleo_foundation/managers/client/maleo.py,sha256=NibYGdiN3EXUw5nx-tL48QAZym14GcA4BDZihGJNQ-g,4254
@@ -66,7 +66,7 @@ maleo_foundation/utils/loaders/__init__.py,sha256=Dnuv7BWyglSddnbsFb96s-b3KaW7UK
 maleo_foundation/utils/loaders/json.py,sha256=NsXLq3VZSgzmEf99tV1VtrmiudWdQ8Pzh_hI4Rm0cM8,397
 maleo_foundation/utils/loaders/key.py,sha256=GZ4h1ONfp6Xx8-E8AWoGP4ajAZrwPhZRtidjn_u82Qg,2562
 maleo_foundation/utils/loaders/yaml.py,sha256=jr8v3BlgmRCMTzdNgKhIYt1tnubaJXcDSSGkKVR8pbw,362
-maleo_foundation-0.1.38.dist-info/METADATA,sha256=ZAclk06bycRqWmZNtdMEHcpAN2c7oQSgY4F6GLl2-dU,3190
-maleo_foundation-0.1.38.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
-maleo_foundation-0.1.38.dist-info/top_level.txt,sha256=_iBos3F_bhEOdjOnzeiEYSrCucasc810xXtLBXI8cQc,17
-maleo_foundation-0.1.38.dist-info/RECORD,,
+maleo_foundation-0.1.40.dist-info/METADATA,sha256=8yAyauzZ4r9LjO3WcqxlqMEPoYNhmeCPntKP51s7psc,3190
+maleo_foundation-0.1.40.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
+maleo_foundation-0.1.40.dist-info/top_level.txt,sha256=_iBos3F_bhEOdjOnzeiEYSrCucasc810xXtLBXI8cQc,17
+maleo_foundation-0.1.40.dist-info/RECORD,,