postgres settings

Author: pcrespov

packages/settings-library/src/settings_library/http_client_request.py

@@ -1,3 +1,5 @@
+from typing import Annotated
+
 from pydantic import Field
 
 from .base import BaseCustomSettings
@@ -6,26 +8,32 @@
 class ClientRequestSettings(BaseCustomSettings):
     # NOTE: These entries are used in some old services as well. These need to be updated if these
     # variable names or defaults are changed.
-    HTTP_CLIENT_REQUEST_TOTAL_TIMEOUT: int | None = Field(
-        default=20,
-        description="timeout in seconds used for outgoing http requests",
-    )
+    HTTP_CLIENT_REQUEST_TOTAL_TIMEOUT: Annotated[
+        int | None,
+        Field(
+            description="timeout in seconds used for outgoing http requests",
+        ),
+    ] = 20
 
-    HTTP_CLIENT_REQUEST_AIOHTTP_CONNECT_TIMEOUT: int | None = Field(
-        default=None,
-        description=(
-            "Maximal number of seconds for acquiring a connection"
-            " from pool. The time consists connection establishment"
-            " for a new connection or waiting for a free connection"
-            " from a pool if pool connection limits are exceeded. "
-            "For pure socket connection establishment time use sock_connect."
+    HTTP_CLIENT_REQUEST_AIOHTTP_CONNECT_TIMEOUT: Annotated[
+        int | None,
+        Field(
+            description=(
+                "Maximal number of seconds for acquiring a connection"
+                " from pool. The time consists connection establishment"
+                " for a new connection or waiting for a free connection"
+                " from a pool if pool connection limits are exceeded. "
+                "For pure socket connection establishment time use sock_connect."
+            ),
         ),
-    )
+    ] = None
 
-    HTTP_CLIENT_REQUEST_AIOHTTP_SOCK_CONNECT_TIMEOUT: int | None = Field(
-        default=5,
-        description=(
-            "aiohttp specific field used in ClientTimeout, timeout for connecting to a "
-            "peer for a new connection not given a pool"
+    HTTP_CLIENT_REQUEST_AIOHTTP_SOCK_CONNECT_TIMEOUT: Annotated[
+        int | None,
+        Field(
+            description=(
+                "aiohttp specific field used in ClientTimeout, timeout for connecting to a "
+                "peer for a new connection not given a pool"
+            ),
         ),
-    )
+    ] = 5

packages/settings-library/src/settings_library/postgres.py

@@ -1,4 +1,5 @@
 from functools import cached_property
+from typing import Annotated
 from urllib.parse import parse_qsl, urlencode, urlparse, urlunparse
 
 from pydantic import (
@@ -25,26 +26,28 @@ class PostgresSettings(BaseCustomSettings):
     POSTGRES_PASSWORD: SecretStr
 
     # database
-    POSTGRES_DB: str = Field(..., description="Database name")
+    POSTGRES_DB: Annotated[str, Field(description="Database name")]
 
     # pool connection limits
-    POSTGRES_MINSIZE: int = Field(
-        default=1, description="Minimum number of connections in the pool", ge=1
-    )
-    POSTGRES_MAXSIZE: int = Field(
-        default=50, description="Maximum number of connections in the pool", ge=1
-    )
+    POSTGRES_MINSIZE: Annotated[
+        int, Field(description="Minimum number of connections in the pool", ge=1)
+    ] = 1
+    POSTGRES_MAXSIZE: Annotated[
+        int, Field(description="Maximum number of connections in the pool", ge=1)
+    ] = 50
 
-    POSTGRES_CLIENT_NAME: str | None = Field(
-        default=None,
-        description="Name of the application connecting the postgres database, will default to use the host hostname (hostname on linux)",
-        validation_alias=AliasChoices(
-            "POSTGRES_CLIENT_NAME",
-            # This is useful when running inside a docker container, then the hostname is set each client gets a different name
-            "HOST",
-            "HOSTNAME",
+    POSTGRES_CLIENT_NAME: Annotated[
+        str | None,
+        Field(
+            description="Name of the application connecting the postgres database, will default to use the host hostname (hostname on linux)",
+            validation_alias=AliasChoices(
+                "POSTGRES_CLIENT_NAME",
+                # This is useful when running inside a docker container, then the hostname is set each client gets a different name
+                "HOST",
+                "HOSTNAME",
+            ),
         ),
-    )
+    ] = None
 
     @field_validator("POSTGRES_MAXSIZE")
     @classmethod