bedrock-agentcore-starter-toolkit 0.1.11__py3-none-any.whl → 0.1.12__py3-none-any.whl

bedrock_agentcore_starter_toolkit/cli/runtime/commands.py

@@ -68,7 +68,7 @@ def _prompt_for_requirements_file(prompt_text: str, default: str = "") -> Option
     return None
 
 
-def _handle_requirements_file_display(requirements_file: Optional[str]) -> Optional[str]:
+def _handle_requirements_file_display(requirements_file: Optional[str], non_interactive: bool = False) -> Optional[str]:
     """Handle requirements file with display logic for CLI."""
     from ...utils.runtime.entrypoint import detect_dependencies
 
@@ -76,6 +76,15 @@ def _handle_requirements_file_display(requirements_file: Optional[str]) -> Optio
         # User provided file - validate and show confirmation
         return _validate_requirements_file(requirements_file)
 
+    if non_interactive:
+        # Auto-detection for non-interactive mode
+        deps = detect_dependencies(Path.cwd())
+        if deps.found:
+            _print_success(f"Using detected file: [dim]{deps.file}[/dim]")
+            return None  # Use detected file
+        else:
+            _handle_error("No requirements file specified and none found automatically")
+
     # Auto-detection with interactive prompt
     deps = detect_dependencies(Path.cwd())
 
@@ -170,6 +179,9 @@ def configure(
     verbose: bool = typer.Option(False, "--verbose", "-v", help="Enable verbose output"),
     region: Optional[str] = typer.Option(None, "--region", "-r"),
     protocol: Optional[str] = typer.Option(None, "--protocol", "-p", help="Server protocol (HTTP or MCP)"),
+    non_interactive: bool = typer.Option(
+        False, "--non-interactive", "-ni", help="Skip prompts; use defaults unless overridden"
+    ),
 ):
     """Configure a Bedrock AgentCore agent. The agent name defaults to your Python file name."""
     if ctx.invoked_subcommand is not None:
@@ -196,7 +208,7 @@ def configure(
 
     # Create configuration manager for clean, elegant prompting
     config_path = Path.cwd() / ".bedrock_agentcore.yaml"
-    config_manager = ConfigurationManager(config_path)
+    config_manager = ConfigurationManager(config_path, non_interactive)
 
     # Interactive prompts for missing values - clean and elegant
     if not execution_role:
@@ -217,7 +229,7 @@ def configure(
         _print_success(f"Using existing ECR repository: [dim]{ecr_repository}[/dim]")
 
     # Handle dependency file selection with simplified logic
-    final_requirements_file = _handle_requirements_file_display(requirements_file)
+    final_requirements_file = _handle_requirements_file_display(requirements_file, non_interactive)
 
     # Handle OAuth authorization configuration
     oauth_config = None

bedrock_agentcore_starter_toolkit/cli/runtime/configuration_manager.py

@@ -10,19 +10,25 @@ from ..common import _handle_error, _print_success, _prompt_with_default, consol
 class ConfigurationManager:
     """Manages interactive configuration prompts with existing configuration defaults."""
 
-    def __init__(self, config_path: Path):
+    def __init__(self, config_path: Path, non_interactive: bool = False):
         """Initialize the ConfigPrompt with a configuration path.
 
         Args:
             config_path: Path to the configuration file
+            non_interactive: If True, use defaults without prompting
         """
         from ...utils.runtime.config import load_config_if_exists
 
         project_config = load_config_if_exists(config_path)
         self.existing_config = project_config.get_agent_config() if project_config else None
+        self.non_interactive = non_interactive
 
     def prompt_execution_role(self) -> Optional[str]:
         """Prompt for execution role. Returns role name/ARN or None for auto-creation."""
+        if self.non_interactive:
+            _print_success("Will auto-create execution role")
+            return None
+
         console.print("\n🔐 [cyan]Execution Role[/cyan]")
         console.print(
             "[dim]Press Enter to auto-create execution role, or provide execution role ARN/name to use existing[/dim]"
@@ -43,6 +49,10 @@ class ConfigurationManager:
 
     def prompt_ecr_repository(self) -> tuple[Optional[str], bool]:
         """Prompt for ECR repository. Returns (repository, auto_create_flag)."""
+        if self.non_interactive:
+            _print_success("Will auto-create ECR repository")
+            return None, True
+
         console.print("\n🏗️  [cyan]ECR Repository[/cyan]")
         console.print(
             "[dim]Press Enter to auto-create ECR repository, or provide ECR Repository URI to use existing[/dim]"
@@ -63,6 +73,10 @@ class ConfigurationManager:
 
     def prompt_oauth_config(self) -> Optional[dict]:
         """Prompt for OAuth configuration. Returns OAuth config dict or None."""
+        if self.non_interactive:
+            _print_success("Using default IAM authorization")
+            return None
+
         console.print("\n🔐 [cyan]Authorization Configuration[/cyan]")
         console.print("[dim]By default, Bedrock AgentCore uses IAM authorization.[/dim]")
 

bedrock_agentcore_starter_toolkit/operations/gateway/client.py

@@ -176,6 +176,145 @@ class GatewayClient:
         self.logger.info("\n✅Target is ready")
         return target
 
+    def fix_iam_permissions(self, gateway: dict) -> None:
+        """Fix IAM role trust policy for the gateway.
+
+        :param gateway: the gateway dict containing roleArn
+        """
+        # Check for None gateway
+        if gateway is None:
+            return
+
+        # Check for missing roleArn
+        role_arn = gateway.get("roleArn")
+        if not role_arn:
+            return
+
+        sts = boto3.client("sts")
+        iam = boto3.client("iam")
+
+        account_id = sts.get_caller_identity()["Account"]
+        role_name = role_arn.split("/")[-1]
+
+        # Update trust policy
+        trust_policy = {
+            "Version": "2012-10-17",
+            "Statement": [
+                {
+                    "Effect": "Allow",
+                    "Principal": {"Service": "bedrock-agentcore.amazonaws.com"},
+                    "Action": "sts:AssumeRole",
+                    "Condition": {
+                        "StringEquals": {"aws:SourceAccount": account_id},
+                        "ArnLike": {"aws:SourceArn": f"arn:aws:bedrock-agentcore:{self.region}:{account_id}:*"},
+                    },
+                }
+            ],
+        }
+
+        try:
+            iam.update_assume_role_policy(RoleName=role_name, PolicyDocument=json.dumps(trust_policy))
+
+            # Add Lambda permissions
+            iam.put_role_policy(
+                RoleName=role_name,
+                PolicyName="LambdaInvokePolicy",
+                PolicyDocument=json.dumps(
+                    {
+                        "Version": "2012-10-17",
+                        "Statement": [
+                            {
+                                "Effect": "Allow",
+                                "Action": ["lambda:InvokeFunction"],
+                                "Resource": (
+                                    f"arn:aws:lambda:{self.region}:{account_id}:function:AgentCoreLambdaTestFunction"
+                                ),
+                            }
+                        ],
+                    }
+                ),
+            )
+            self.logger.info("✓ Fixed IAM permissions for Gateway")
+        except Exception as e:
+            self.logger.warning("⚠️ IAM role update failed: %s. Continuing with best effort.", str(e))
+
+    def cleanup_gateway(self, gateway_id: str, client_info: Optional[Dict] = None) -> None:
+        """Remove all resources associated with a gateway.
+
+        :param gateway_id: the ID of the gateway to clean up
+        :param client_info: optional Cognito client info for cleanup
+        """
+        self.logger.info("🧹 Cleaning up Gateway resources...")
+
+        gateway_client = self.client
+
+        # Step 1: List and delete all targets
+        self.logger.info("  • Finding targets for gateway: %s", gateway_id)
+
+        try:
+            response = gateway_client.list_gateway_targets(gatewayIdentifier=gateway_id)
+            # API returns targets in 'items' field
+            targets = response.get("items", [])
+            self.logger.info("    Found %s targets to delete", len(targets))
+
+            for target in targets:
+                target_id = target["targetId"]
+                self.logger.info("  • Deleting target: %s", target_id)
+                try:
+                    gateway_client.delete_gateway_target(gatewayIdentifier=gateway_id, targetId=target_id)
+                    self.logger.info("    ✓ Target deletion initiated: %s", target_id)
+                    # Wait for deletion to complete
+                    time.sleep(5)
+                except Exception as e:
+                    self.logger.warning("    ⚠️ Error deleting target %s: %s", target_id, str(e))
+
+            # Verify all targets are deleted
+            self.logger.info("  • Verifying targets deletion...")
+            time.sleep(5)  # Additional wait
+            verify_response = gateway_client.list_gateway_targets(gatewayIdentifier=gateway_id)
+            remaining_targets = verify_response.get("items", [])
+            if remaining_targets:
+                self.logger.warning("    ⚠️ %s targets still remain", len(remaining_targets))
+            else:
+                self.logger.info("    ✓ All targets deleted")
+
+        except Exception as e:
+            self.logger.warning("    ⚠️ Error managing targets: %s", str(e))
+
+        # Step 2: Delete the gateway
+        try:
+            self.logger.info("  • Deleting gateway: %s", gateway_id)
+            gateway_client.delete_gateway(gatewayIdentifier=gateway_id)
+            self.logger.info("    ✓ Gateway deleted: %s", gateway_id)
+        except Exception as e:
+            self.logger.warning("    ⚠️ Error deleting gateway: %s", str(e))
+
+        # Step 3: Delete Cognito resources if provided
+        if client_info and "user_pool_id" in client_info:
+            cognito = boto3.client("cognito-idp", region_name=self.region)
+            user_pool_id = client_info["user_pool_id"]
+
+            # Delete domain first
+            if "domain_prefix" in client_info:
+                domain_prefix = client_info["domain_prefix"]
+                self.logger.info("  • Deleting Cognito domain: %s", domain_prefix)
+                try:
+                    cognito.delete_user_pool_domain(UserPoolId=user_pool_id, Domain=domain_prefix)
+                    self.logger.info("    ✓ Cognito domain deleted")
+                    time.sleep(5)  # Wait for domain deletion
+                except Exception as e:
+                    self.logger.warning("    ⚠️ Error deleting Cognito domain: %s", str(e))
+
+            # Now delete the user pool
+            self.logger.info("  • Deleting Cognito user pool: %s", user_pool_id)
+            try:
+                cognito.delete_user_pool(UserPoolId=user_pool_id)
+                self.logger.info("    ✓ Cognito user pool deleted")
+            except Exception as e:
+                self.logger.warning("    ⚠️ Error deleting Cognito user pool: %s", str(e))
+
+        self.logger.info("✅ Cleanup complete")
+
     def __handle_lambda_target_creation(self, role_arn: str) -> Dict[str, Any]:
         """Create a test lambda.
 

{bedrock_agentcore_starter_toolkit-0.1.11.dist-info → bedrock_agentcore_starter_toolkit-0.1.12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bedrock-agentcore-starter-toolkit
-Version: 0.1.11
+Version: 0.1.12
 Summary: A starter toolkit for using Bedrock AgentCore
 Project-URL: Homepage, https://github.com/aws/bedrock-agentcore-starter-toolkit
 Project-URL: Bug Tracker, https://github.com/aws/bedrock-agentcore-starter-toolkit/issues
@@ -126,6 +126,22 @@ AgentCore Import-Agent enables seamless migration of existing Amazon Bedrock Age
 
 Bedrock AgentCore is currently in public preview.
 
+## Installation
+
+### Quick Start
+
+```bash
+# Install uv if you haven't already
+curl -LsSf https://astral.sh/uv/install.sh | sh
+
+# Install using uv (recommended)
+uv pip install bedrock-agentcore-starter-toolkit
+
+# Or alternatively with pip
+pip install bedrock-agentcore-starter-toolkit
+```
+
+
 ## 📝 License & Contributing
 
 - **License:** Apache 2.0 - see [LICENSE.txt](LICENSE.txt)

{bedrock_agentcore_starter_toolkit-0.1.11.dist-info → bedrock_agentcore_starter_toolkit-0.1.12.dist-info}/RECORD

@@ -9,14 +9,14 @@ bedrock_agentcore_starter_toolkit/cli/import_agent/__init__.py,sha256=tyM3dXM3Tc
 bedrock_agentcore_starter_toolkit/cli/import_agent/agent_info.py,sha256=V0fZEbV76_H3gmkA17yscyJ8UdcMAquzNqENQ9DXdHA,9477
 bedrock_agentcore_starter_toolkit/cli/import_agent/commands.py,sha256=vpA66fGwKf6cxBelT3Yb_Af5Ow3AMquGLIDe-tBLjmc,22419
 bedrock_agentcore_starter_toolkit/cli/runtime/__init__.py,sha256=0zKPPoYThoDIr3DZhIQJavq5nVTKRsgcE1s9--wx118,60
-bedrock_agentcore_starter_toolkit/cli/runtime/commands.py,sha256=s7-JKK5gEmY7amfXPcPmQGQv7487fU-mxdUfTOEz9KA,45283
-bedrock_agentcore_starter_toolkit/cli/runtime/configuration_manager.py,sha256=5TJK80uzA1ARh263smLfthw1t5Ona3bAtdO1pE7OfNo,5808
+bedrock_agentcore_starter_toolkit/cli/runtime/commands.py,sha256=nBRT37Ydbhq5rnJdXidjFdHLCKJtk_ifSvIjPTsYdnU,45860
+bedrock_agentcore_starter_toolkit/cli/runtime/configuration_manager.py,sha256=eu-PnhT0YoOSMbSfpaF0aFVp4LtTDAekdUrRzfq-bVM,6321
 bedrock_agentcore_starter_toolkit/notebook/__init__.py,sha256=wH1ZzIVKsKT_P0qX2kIIoyVxeHj8K40odfR1YI3McHw,129
 bedrock_agentcore_starter_toolkit/notebook/runtime/__init__.py,sha256=DoGfB_uGFLANJVE9rSZtTH3ymw76WBWmD9vORvBIdXs,66
 bedrock_agentcore_starter_toolkit/notebook/runtime/bedrock_agentcore.py,sha256=UvG-X9Ny_z4VhMG8BNTy-OaZMFU4VIQ8QIHz2lm7Dyo,15328
 bedrock_agentcore_starter_toolkit/operations/__init__.py,sha256=L7sCNjfZviiVVoh2f3NEs2sbjNqFkmIRI3ZPYMMWMz0,51
 bedrock_agentcore_starter_toolkit/operations/gateway/__init__.py,sha256=5Qo1GeN-DghNp9g0coFUs7WpUJDboJoidOVs-5Co7fo,233
-bedrock_agentcore_starter_toolkit/operations/gateway/client.py,sha256=8WP2E_u6h1-mPfz4TgNMloD6bcXfoXQDL3UCrbyhT7g,20068
+bedrock_agentcore_starter_toolkit/operations/gateway/client.py,sha256=A4pBxe66TKVpwVQb4GWfC5LCVvwPo0kdRqXnSgONf6w,26063
 bedrock_agentcore_starter_toolkit/operations/gateway/constants.py,sha256=0_4J6BN4VAE4-XTQhPTEACkhilRrFqu_iKiuHSm2pYk,4610
 bedrock_agentcore_starter_toolkit/operations/gateway/create_lambda.py,sha256=MQsBJfUj26zBh7LqYWLoekHuvbAHIJE8qcXwrmJOhM0,2875
 bedrock_agentcore_starter_toolkit/operations/gateway/create_role.py,sha256=Oma9s6K4T9EFgwPAUDungDL9fGa3W0LsHBknIXUmSpI,4474
@@ -56,9 +56,9 @@ bedrock_agentcore_starter_toolkit/utils/runtime/templates/Dockerfile.j2,sha256=X
 bedrock_agentcore_starter_toolkit/utils/runtime/templates/dockerignore.template,sha256=b_70sBi0MwkTuA9TqxPqFcWK7TcmpaXBJ6M2Ipox65Q,691
 bedrock_agentcore_starter_toolkit/utils/runtime/templates/execution_role_policy.json.j2,sha256=-0AXT46IYVQr4fwueXTQ0FVXcCshZFNx7-2mViR34Co,4941
 bedrock_agentcore_starter_toolkit/utils/runtime/templates/execution_role_trust_policy.json.j2,sha256=PPJF6Ofq70W5DUE0NlbmnZjw5RkgepPgkskxEgEG28o,473
-bedrock_agentcore_starter_toolkit-0.1.11.dist-info/METADATA,sha256=mD8ZbSvNP-ysXpbQyPDOBTJyUa9qwNY66CH9_afM8Nc,9744
-bedrock_agentcore_starter_toolkit-0.1.11.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-bedrock_agentcore_starter_toolkit-0.1.11.dist-info/entry_points.txt,sha256=Tf94DkUf2Tp8P7p8MEXLxre7A7Pp_XNukteiz0wHnk8,77
-bedrock_agentcore_starter_toolkit-0.1.11.dist-info/licenses/LICENSE.txt,sha256=nNPOMinitYdtfbhdQgsPgz1UowBznU6QVN3Xs0pSTKU,10768
-bedrock_agentcore_starter_toolkit-0.1.11.dist-info/licenses/NOTICE.txt,sha256=rkBsg8DbKqfIoQbveqX9foR4uJPUVAokbkr02pRPilE,8674
-bedrock_agentcore_starter_toolkit-0.1.11.dist-info/RECORD,,
+bedrock_agentcore_starter_toolkit-0.1.12.dist-info/METADATA,sha256=_UcEnnN8XVm3sucpUYlbSjFjlehTsyFh9HTa-K-bsFw,10034
+bedrock_agentcore_starter_toolkit-0.1.12.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+bedrock_agentcore_starter_toolkit-0.1.12.dist-info/entry_points.txt,sha256=Tf94DkUf2Tp8P7p8MEXLxre7A7Pp_XNukteiz0wHnk8,77
+bedrock_agentcore_starter_toolkit-0.1.12.dist-info/licenses/LICENSE.txt,sha256=nNPOMinitYdtfbhdQgsPgz1UowBznU6QVN3Xs0pSTKU,10768
+bedrock_agentcore_starter_toolkit-0.1.12.dist-info/licenses/NOTICE.txt,sha256=rkBsg8DbKqfIoQbveqX9foR4uJPUVAokbkr02pRPilE,8674
+bedrock_agentcore_starter_toolkit-0.1.12.dist-info/RECORD,,