truss 0.9.88.dev10__tar.gz → 0.9.88.dev11__tar.gz

{truss-0.9.88.dev10 → truss-0.9.88.dev11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: truss
-Version: 0.9.88.dev10
+Version: 0.9.88.dev11
 Summary: A seamless bridge from model development to model delivery
 Home-page: https://github.com/basetenlabs/truss
 License: MIT

{truss-0.9.88.dev10 → truss-0.9.88.dev11}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "truss"
-version = "0.9.88dev10"
+version = "0.9.88dev11"
 description = "A seamless bridge from model development to model delivery"
 license = "MIT"
 readme = "README.md"

{truss-0.9.88.dev10 → truss-0.9.88.dev11}/truss/base/truss_config.py

@@ -487,8 +487,15 @@ class DockerAuthSettings(custom_types.ConfigModel):
     the custom base image."""
 
     auth_method: DockerAuthType
-    secret_name: Optional[str] = None
     registry: Optional[str] = ""
+    # Note that the secret_name is only required for GCP_SERVICE_ACCOUNT_JSON.
+    secret_name: Optional[str] = None
+
+    # These are only required for AWS_IAM, and only need to be
+    # provided in cases where the user wants to use different secret
+    # names for the AWS credentials.
+    aws_access_key_id_secret_name: Optional[str] = "aws_access_key_id"
+    aws_secret_access_key_secret_name: Optional[str] = "aws_secret_access_key"
 
     @pydantic.field_validator("auth_method", mode="before")
     def _normalize_auth_method(cls, v: str) -> str:
@@ -496,8 +503,13 @@ class DockerAuthSettings(custom_types.ConfigModel):
 
     @pydantic.model_validator(mode="after")
     def validate_secret_name(self) -> "DockerAuthSettings":
-        if self.auth_method == DockerAuthType.GCP_SERVICE_ACCOUNT_JSON and self.secret_name is None:
-            raise ValueError("secret_name must be provided when auth_method is GCP_SERVICE_ACCOUNT_JSON")
+        if (
+            self.auth_method == DockerAuthType.GCP_SERVICE_ACCOUNT_JSON
+            and self.secret_name is None
+        ):
+            raise ValueError(
+                "secret_name must be provided when auth_method is GCP_SERVICE_ACCOUNT_JSON"
+            )
         return self
 
 

{truss-0.9.88.dev10 → truss-0.9.88.dev11}/truss/tests/test_config.py

@@ -223,6 +223,33 @@ def test_acc_spec_from_str(input_str, expected_acc):
                 },
             },
         ),
+        (
+            {
+                "image": "custom_base_image",
+                "python_executable_path": "/path/python",
+                "docker_auth": {
+                    "auth_method": "AWS_IAM",
+                    "registry": "some-ecr-docker-registry",
+                },
+            },
+            BaseImage(
+                image="custom_base_image",
+                python_executable_path="/path/python",
+                docker_auth=DockerAuthSettings(
+                    auth_method=DockerAuthType.AWS_IAM,
+                    registry="some-ecr-docker-registry",
+                ),
+            ),
+            {
+                "image": "custom_base_image",
+                "python_executable_path": "/path/python",
+                "docker_auth": {
+                    "auth_method": "AWS_IAM",
+                    "registry": "some-ecr-docker-registry",
+                    "secret_name": None,
+                },
+            },
+        ),
     ],
 )
 def test_parse_base_image(input_dict, expect_base_image, output_dict):