Updates for project structure.

Author: rlhagerm

.doc_gen/metadata/sesv2_metadata.yaml

@@ -39,7 +39,7 @@ sesv2_CreateContactList:
     Python:
       versions:
         - sdk_version: 3
-          github: python/example_code/sesv2
+          github: python/example_code/sesv2/newsletter_scenario
           excerpts:
             - description:
               genai: most
@@ -89,7 +89,7 @@ sesv2_CreateContact:
     Python:
       versions:
         - sdk_version: 3
-          github: python/example_code/sesv2
+          github: python/example_code/sesv2/newsletter_scenario
           excerpts:
             - description:
               genai: most
@@ -104,7 +104,7 @@ sesv2_GetEmailIdentity:
     Python:
       versions:
         - sdk_version: 3
-          github: python/example_code/sesv2
+          github: python/example_code/sesv2/attachments_scenario
           excerpts:
             - description:
               snippet_tags:
@@ -172,7 +172,7 @@ sesv2_ListContacts:
     Python:
       versions:
         - sdk_version: 3
-          github: python/example_code/sesv2
+          github: python/example_code/sesv2/newsletter_scenario
           excerpts:
             - description:
               genai: most
@@ -243,7 +243,14 @@ sesv2_SendEmail:
     Python:
       versions:
         - sdk_version: 3
-          github: python/example_code/sesv2
+          github: python/example_code/sesv2/attachments_scenario
+          excerpts:
+            - description: Sends a message with optional attachments.
+              snippet_tags:
+                - python.example_code.sesv2.SESv2Wrapper.decl
+                - python.example_code.sesv2.SendEmail
+        - sdk_version: 3
+          github: python/example_code/sesv2/newsletter_scenario
           excerpts:
             - description: Sends a message to all members of the contact list.
               genai: most
@@ -257,10 +264,6 @@ sesv2_SendEmail:
                 - python.example_code.sesv2.SESv2Workflow.main
                 - python.example_code.sesv2.SESv2Workflow.decl
                 - python.example_code.sesv2.SendEmail.template
-            - description: Sends a message with optional attachments.
-              snippet_tags:
-                - python.example_code.sesv2.SESv2Wrapper.decl
-                - python.example_code.sesv2.SendEmail
   services:
     sesv2: {SendEmail}
 sesv2_CreateEmailIdentity:
@@ -295,17 +298,20 @@ sesv2_CreateEmailIdentity:
     Python:
       versions:
         - sdk_version: 3
-          github: python/example_code/sesv2
+          github: python/example_code/sesv2/attachments_scenario
           excerpts:
             - description:
-              genai: most
               snippet_tags:
-                - python.example_code.sesv2.SESv2Workflow.main
-                - python.example_code.sesv2.SESv2Workflow.decl
+                - python.example_code.sesv2.SESv2Wrapper.decl
                 - python.example_code.sesv2.CreateEmailIdentity
+        - sdk_version: 3
+          github: python/example_code/sesv2/newsletter_scenario
+          excerpts:
             - description:
+              genai: most
               snippet_tags:
-                - python.example_code.sesv2.SESv2Wrapper.decl
+                - python.example_code.sesv2.SESv2Workflow.main
+                - python.example_code.sesv2.SESv2Workflow.decl
                 - python.example_code.sesv2.CreateEmailIdentity
     Rust:
       versions:
@@ -350,17 +356,20 @@ sesv2_CreateEmailTemplate:
     Python:
       versions:
         - sdk_version: 3
-          github: python/example_code/sesv2
+          github: python/example_code/sesv2/attachments_scenario
           excerpts:
             - description:
-              genai: most
               snippet_tags:
-                - python.example_code.sesv2.SESv2Workflow.main
-                - python.example_code.sesv2.SESv2Workflow.decl
+                - python.example_code.sesv2.SESv2Wrapper.decl
                 - python.example_code.sesv2.CreateEmailTemplate
+        - sdk_version: 3
+          github: python/example_code/sesv2/newsletter_scenario
+          excerpts:
             - description:
+              genai: most
               snippet_tags:
-                - python.example_code.sesv2.SESv2Wrapper.decl
+                - python.example_code.sesv2.SESv2Workflow.main
+                - python.example_code.sesv2.SESv2Workflow.decl
                 - python.example_code.sesv2.CreateEmailTemplate
     Rust:
       versions:
@@ -405,7 +414,7 @@ sesv2_DeleteContactList:
     Python:
       versions:
         - sdk_version: 3
-          github: python/example_code/sesv2
+          github: python/example_code/sesv2/newsletter_scenario
           excerpts:
             - description:
               genai: most
@@ -456,17 +465,20 @@ sesv2_DeleteEmailIdentity:
     Python:
       versions:
         - sdk_version: 3
-          github: python/example_code/sesv2
+          github: python/example_code/sesv2/attachments_scenario
           excerpts:
             - description:
-              genai: most
               snippet_tags:
-                - python.example_code.sesv2.SESv2Workflow.main
-                - python.example_code.sesv2.SESv2Workflow.decl
+                - python.example_code.sesv2.SESv2Wrapper.decl
                 - python.example_code.sesv2.DeleteEmailIdentity
+        - sdk_version: 3
+          github: python/example_code/sesv2/newsletter_scenario
+          excerpts:
             - description:
+              genai: most
               snippet_tags:
-                - python.example_code.sesv2.SESv2Wrapper.decl
+                - python.example_code.sesv2.SESv2Workflow.main
+                - python.example_code.sesv2.SESv2Workflow.decl
                 - python.example_code.sesv2.DeleteEmailIdentity
     Rust:
       versions:
@@ -511,17 +523,20 @@ sesv2_DeleteEmailTemplate:
     Python:
       versions:
         - sdk_version: 3
-          github: python/example_code/sesv2
+          github: python/example_code/sesv2/attachments_scenario
           excerpts:
             - description:
-              genai: most
               snippet_tags:
-                - python.example_code.sesv2.SESv2Workflow.main
-                - python.example_code.sesv2.SESv2Workflow.decl
+                - python.example_code.sesv2.SESv2Wrapper.decl
                 - python.example_code.sesv2.DeleteEmailTemplate
+        - sdk_version: 3
+          github: python/example_code/sesv2/newsletter_scenario
+          excerpts:
             - description:
+              genai: most
               snippet_tags:
-                - python.example_code.sesv2.SESv2Wrapper.decl
+                - python.example_code.sesv2.SESv2Workflow.main
+                - python.example_code.sesv2.SESv2Workflow.decl
                 - python.example_code.sesv2.DeleteEmailTemplate
     Rust:
       versions:
@@ -573,7 +588,7 @@ sesv2_NewsletterWorkflow:
     Python:
       versions:
         - sdk_version: 3
-          github: python/example_code/sesv2
+          github: python/example_code/sesv2/newsletter_scenario
           excerpts:
             - description:
               genai: most
@@ -620,7 +635,7 @@ sesv2_Hello:
     Python:
       versions:
         - sdk_version: 3
-          github: python/example_code/sesv2
+          github: python/example_code/sesv2/attachments_scenario
           excerpts:
             - description:
               snippet_tags:
@@ -636,7 +651,7 @@ sesv2_SendBulkEmail:
     Python:
       versions:
         - sdk_version: 3
-          github: python/example_code/sesv2
+          github: python/example_code/sesv2/attachments_scenario
           excerpts:
             - description:
               snippet_tags:
@@ -660,13 +675,13 @@ sesv2_Scenario_EmailAttachments:
     Python:
       versions:
         - sdk_version: 3
-          github: python/example_code/sesv2
+          github: python/example_code/sesv2/attachments_scenario
           excerpts:
-            - description: Create an SESv2 wrapper class to manage operations.
-              snippet_tags:
-                - python.example_code.sesv2.SESv2Wrapper.class
             - description: Run an interactive scenario demonstrating email attachments.
               snippet_tags:
                 - python.example_code.sesv2.Scenario_EmailAttachments
+            - description: Create an SESv2 wrapper class to manage operations.
+              snippet_tags:
+                - python.example_code.sesv2.SESv2Wrapper.class
   services:
     sesv2: {SendEmail, SendBulkEmail, CreateEmailIdentity, CreateEmailTemplate, GetEmailIdentity, DeleteEmailTemplate, DeleteEmailIdentity}

python/example_code/sesv2/README.md

@@ -36,36 +36,36 @@ python -m pip install -r requirements.txt
 
 ### Get started
 
-- [Hello Amazon SES v2 API](sesv2_hello.py#L18) (`ListEmailIdentities`)
+- [Hello Amazon SES v2 API](attachments_scenario/sesv2_hello.py#L18) (`ListEmailIdentities`)
 
 
 ### Single actions
 
 Code excerpts that show you how to call individual service functions.
 
-- [CreateContact](newsletter.py#L155)
-- [CreateContactList](newsletter.py#L105)
-- [CreateEmailIdentity](sesv2_wrapper.py#L73)
-- [CreateEmailTemplate](sesv2_wrapper.py#L109)
-- [DeleteContactList](newsletter.py#L258)
-- [DeleteEmailIdentity](sesv2_wrapper.py#L321)
-- [DeleteEmailTemplate](sesv2_wrapper.py#L291)
-- [GetEmailIdentity](sesv2_wrapper.py#L42)
-- [ListContacts](newsletter.py#L198)
-- [SendEmail](newsletter.py#L164)
+- [CreateContact](newsletter_scenario/newsletter.py#L155)
+- [CreateContactList](newsletter_scenario/newsletter.py#L105)
+- [CreateEmailIdentity](newsletter_scenario/newsletter.py#L92)
+- [CreateEmailTemplate](newsletter_scenario/newsletter.py#L118)
+- [DeleteContactList](newsletter_scenario/newsletter.py#L258)
+- [DeleteEmailIdentity](newsletter_scenario/newsletter.py#L286)
+- [DeleteEmailTemplate](newsletter_scenario/newsletter.py#L271)
+- [GetEmailIdentity](attachments_scenario/sesv2_wrapper.py#L42)
+- [ListContacts](newsletter_scenario/newsletter.py#L198)
+- [SendEmail](attachments_scenario/sesv2_wrapper.py#L155)
 
 ### Scenarios
 
 Code examples that show you how to accomplish a specific task by calling multiple
 functions within the same service.
 
-- [Email Attachments Scenario](sesv2_wrapper.py)
-- [Newsletter scenario](newsletter.py)
+- [Email Attachments Scenario](attachments_scenario/scenario_sesv2_email_attachments.py)
+- [Newsletter scenario](newsletter_scenario/newsletter.py)
 
 ### Actions
 _Actions_ are code excerpts from larger programs and must be run in context. While actions show you how to call individual service functions, you can see actions in context in their related scenarios.
 
-- [SendBulkEmail](sesv2_wrapper.py#L227)
+- [SendBulkEmail](attachments_scenario/sesv2_wrapper.py#L227)
 
 
 <!--custom.examples.start-->
@@ -91,7 +91,7 @@ To run the Newsletter example, copy the files from workflows/sesv2_weekly_mailer
 This example shows you how to get started using Amazon SES v2 API.
 
 ```
-python sesv2_hello.py
+python attachments_scenario/sesv2_hello.py
 ```
 
 
@@ -112,7 +112,7 @@ This example shows you how to send emails with attachments using Amazon SES v2 A
 Start the example by running the following at a command prompt:
 
 ```
-python sesv2_wrapper.py
+python attachments_scenario/scenario_sesv2_email_attachments.py
 ```
 
 
@@ -130,7 +130,7 @@ This example shows you how to run the Amazon SES v2 API newsletter scenario.
 Start the example by running the following at a command prompt:
 
 ```
-python newsletter.py
+python newsletter_scenario/newsletter.py
 ```
 
 

…esv2/scenario_sesv2_email_attachments.py …ario/scenario_sesv2_email_attachments.pypython/example_code/sesv2/scenario_sesv2_email_attachments.py renamed to python/example_code/sesv2/attachments_scenario/scenario_sesv2_email_attachments.py python/example_code/sesv2/scenario_sesv2_email_attachments.py renamed to python/example_code/sesv2/attachments_scenario/scenario_sesv2_email_attachments.py

@@ -23,7 +23,7 @@
 from sesv2_wrapper import SESv2Wrapper
 
 # Add relative path to include demo_tools in this code example without need for setup.
-sys.path.append("../..")
+sys.path.append("../../..")
 import demo_tools.question as q  # noqa
 
 logger = logging.getLogger(__name__)

python/example_code/sesv2/sesv2_hello.py …esv2/attachments_scenario/sesv2_hello.pypython/example_code/sesv2/sesv2_hello.py renamed to python/example_code/sesv2/attachments_scenario/sesv2_hello.py python/example_code/sesv2/sesv2_hello.py renamed to python/example_code/sesv2/attachments_scenario/sesv2_hello.py

@@ -9,6 +9,9 @@
 """
 
 import os
+import sys
+
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), ".."))
 
 import boto3
 import pytest
@@ -200,7 +203,7 @@ def test_sesv2_wrapper_send_bulk_email_with_attachment():
 @pytest.mark.integ
 def test_sesv2_hello(capsys):
     """Test the Hello SESv2 example."""
-    from sesv2_hello import hello_sesv2
+    from sesv2_hello import hello_sesv2  # noqa: resolved via sys.path
 
     try:
         hello_sesv2(boto3.client("sesv2"))

…thon/example_code/sesv2/sesv2_wrapper.py …v2/attachments_scenario/sesv2_wrapper.pypython/example_code/sesv2/sesv2_wrapper.py renamed to python/example_code/sesv2/attachments_scenario/sesv2_wrapper.py python/example_code/sesv2/sesv2_wrapper.py renamed to python/example_code/sesv2/attachments_scenario/sesv2_wrapper.py

@@ -2,12 +2,15 @@
 # SPDX-License-Identifier: Apache-2.0
 
 import json
+import os
 import sys
 from botocore.exceptions import ClientError
 from io import StringIO
 import pytest
 from unittest.mock import patch
 
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), ".."))
+
 from newsletter import (
     SESv2Workflow,
     get_subaddress_variants,