s3 settings

Author: pcrespov

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

@@ -1,4 +1,5 @@
 from enum import StrEnum
+from typing import Annotated
 
 from pydantic import Field, NonNegativeInt
 
@@ -13,19 +14,25 @@ class S3Provider(StrEnum):
 
 
 class RCloneSettings(BaseCustomSettings):
-    R_CLONE_S3: S3Settings = Field(json_schema_extra={"auto_default_from_env": True})
+    R_CLONE_S3: Annotated[
+        S3Settings, Field(json_schema_extra={"auto_default_from_env": True})
+    ]
     R_CLONE_PROVIDER: S3Provider
 
-    # SEE https://rclone.org/docs/#transfers-n
-    R_CLONE_OPTION_TRANSFERS: NonNegativeInt = Field(
-        default=5, description="`--transfers X`: sets the amount of parallel transfers"
-    )
-    # SEE https://rclone.org/docs/#retries-int
-    R_CLONE_OPTION_RETRIES: NonNegativeInt = Field(
-        default=3, description="`--retries X`: times to retry each individual transfer"
-    )
-    # SEE https://rclone.org/docs/#buffer-size-size
-    R_CLONE_OPTION_BUFFER_SIZE: str = Field(
-        default="16M",
-        description="`--buffer-size X`: sets the amount of RAM to use for each individual transfer",
-    )
+    R_CLONE_OPTION_TRANSFERS: Annotated[
+        # SEE https://rclone.org/docs/#transfers-n
+        NonNegativeInt,
+        Field(description="`--transfers X`: sets the amount of parallel transfers"),
+    ] = 5
+    R_CLONE_OPTION_RETRIES: Annotated[
+        # SEE https://rclone.org/docs/#retries-int
+        NonNegativeInt,
+        Field(description="`--retries X`: times to retry each individual transfer"),
+    ] = 3
+    R_CLONE_OPTION_BUFFER_SIZE: Annotated[
+        # SEE https://rclone.org/docs/#buffer-size-size
+        str,
+        Field(
+            description="`--buffer-size X`: sets the amount of RAM to use for each individual transfer",
+        ),
+    ] = "16M"

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

@@ -1,3 +1,5 @@
+from typing import Annotated
+
 from pydantic import AnyHttpUrl, Field
 from pydantic_settings import SettingsConfigDict
 
@@ -8,9 +10,9 @@
 class S3Settings(BaseCustomSettings):
     S3_ACCESS_KEY: IDStr
     S3_BUCKET_NAME: IDStr
-    S3_ENDPOINT: AnyHttpUrl | None = Field(
-        default=None, description="do not define if using standard AWS"
-    )
+    S3_ENDPOINT: Annotated[
+        AnyHttpUrl | None, Field(description="do not define if using standard AWS")
+    ] = None
     S3_REGION: IDStr
     S3_SECRET_KEY: IDStr