sap-abap: Examples of Bedrock Runtime with higher level "L2" client (#6034)

frij-aws · web-flow · commit a54abe58d9ac · 2024-02-02T10:54:08.000-05:00
diff --git a/.doc_gen/metadata/bedrock-runtime_metadata.yaml b/.doc_gen/metadata/bedrock-runtime_metadata.yaml
@@ -118,6 +118,9 @@ bedrock-runtime_InvokeStableDiffusionForImageGeneration:
             - description: Invoke the Stability.ai Stable Diffusion XL foundation model to generate images.
               snippet_tags:
                 - bdr.abapv1.invokemodel_stable_diffusion
+            - description: Invoke the Stability.ai Stable Diffusion XL foundation model to generate images using L2 high level client.
+              snippet_tags:
+                - bdr.abapv1.invokemodel_l2_stable_diffusion
   services:
     bedrock-runtime: {InvokeModel}
 
@@ -186,6 +189,9 @@ bedrock-runtime_InvokeClaude:
             - description: Invoke the Anthropic Claude 2 foundation model to generate text. This example uses features of /US2/CL_JSON which might not be available on some NetWeaver versions.
               snippet_tags:
                 - bdr.abapv1.invokemodel_claude_v2
+            - description: Invoke the Anthropic Claude 2 foundation model to generate text using L2 high level client.
+              snippet_tags:
+                - bdr.abapv1.invokemodel_l2_claude_v2
   services:
     bedrock-runtime: {InvokeModel}
 
diff --git a/sap-abap/services/bdr/zcl_aws1_bdr_actions.clas.abap b/sap-abap/services/bdr/zcl_aws1_bdr_actions.clas.abap
@@ -1,43 +1,106 @@
-class ZCL_AWS1_BDR_ACTIONS definition
-  public
-  final
-  create public .
-
-public section.
-protected section.
-private section.
-
-  methods PROMPT_CLAUDE_V2
-    importing
-      !IV_PROMPT type STRING
-    returning
-      value(OV_ANSWER) type STRING
-    raising
-      /AWS1/CX_BDRSERVEREXC
-      /AWS1/CX_BDRCLIENTEXC
-      /AWS1/CX_RT_TECHNICAL_GENERIC
-      /AWS1/CX_RT_SERVICE_GENERIC
-      /AWS1/CX_RT_NO_AUTH_GENERIC .
-  methods PROMPT_STABLE_DIFFUSION
-    importing
-      !IV_PROMPT type STRING
-    returning
-      value(OV_IMAGE) type XSTRING
-    raising
-      /AWS1/CX_BDRSERVEREXC
-      /AWS1/CX_BDRCLIENTEXC
-      /AWS1/CX_RT_TECHNICAL_GENERIC
-      /AWS1/CX_RT_SERVICE_GENERIC
-      /AWS1/CX_RT_NO_AUTH_GENERIC .
+CLASS zcl_aws1_bdr_actions DEFINITION
+  PUBLIC
+  FINAL
+  CREATE PUBLIC .
+
+  PUBLIC SECTION.
+  PROTECTED SECTION.
+  PRIVATE SECTION.
+
+    METHODS prompt_claude_v2
+      IMPORTING
+      !iv_prompt TYPE string
+      RETURNING
+      VALUE(ov_answer) TYPE string
+      RAISING
+      /aws1/cx_bdrserverexc
+      /aws1/cx_bdrclientexc
+      /aws1/cx_rt_technical_generic
+      /aws1/cx_rt_service_generic
+      /aws1/cx_rt_no_auth_generic .
+    METHODS prompt_stable_diffusion
+      IMPORTING
+      !iv_prompt TYPE string
+      RETURNING
+      VALUE(ov_image) TYPE xstring
+      RAISING
+      /aws1/cx_bdrserverexc
+      /aws1/cx_bdrclientexc
+      /aws1/cx_rt_technical_generic
+      /aws1/cx_rt_service_generic
+      /aws1/cx_rt_no_auth_generic .
+    METHODS l2_prompt_claude_v2
+      IMPORTING
+      !iv_prompt TYPE string
+      RETURNING
+      VALUE(ov_answer) TYPE string
+      RAISING
+      /aws1/cx_bdrserverexc
+      /aws1/cx_bdrclientexc
+      /aws1/cx_rt_technical_generic
+      /aws1/cx_rt_service_generic
+      /aws1/cx_rt_no_auth_generic .
+    METHODS l2_prompt_stable_diffusion
+      IMPORTING
+      !iv_prompt TYPE string
+      RETURNING
+      VALUE(ov_image) TYPE xstring
+      RAISING
+      /aws1/cx_bdrserverexc
+      /aws1/cx_bdrclientexc
+      /aws1/cx_rt_technical_generic
+      /aws1/cx_rt_service_generic
+      /aws1/cx_rt_no_auth_generic .
 ENDCLASS.
 
 
 
 CLASS ZCL_AWS1_BDR_ACTIONS IMPLEMENTATION.
 
 
+  METHOD l2_prompt_claude_v2.
+    CONSTANTS cv_pfl TYPE /aws1/rt_profile_id VALUE 'ZCODE_DEMO'.
+
+    DATA(lo_session) = /aws1/cl_rt_session_aws=>create( cv_pfl ).
+    DATA(lo_bdr) = /aws1/cl_bdr_factory=>create( lo_session ).
+    "snippet-start:[bdr.abapv1.invokemodel_l2_claude_v2]
+    TRY.
+        DATA(lo_bdr_l2_claude) = /aws1/cl_bdr_l2_factory=>create_claude_2( lo_bdr ).
+        " iv_prompt can contain a prompt like 'tell me a joke about Java programmers'.
+        DATA(lv_answer) = lo_bdr_l2_claude->prompt_for_text( iv_prompt ).
+      CATCH /aws1/cx_bdraccessdeniedex INTO DATA(lo_ex).
+        WRITE / lo_ex->get_text( ).
+        WRITE / |Don't forget to enable model access at https://console.aws.amazon.com/bedrock/home?#/modelaccess|.
+
+    ENDTRY.
+    "snippet-end:[bdr.abapv1.invokemodel_l2_claude_v2]
+    ov_answer = lv_answer.
+  ENDMETHOD.
+
+
+  METHOD l2_prompt_stable_diffusion.
+    CONSTANTS cv_pfl TYPE /aws1/rt_profile_id VALUE 'ZCODE_DEMO'.
+
+    DATA(lo_session) = /aws1/cl_rt_session_aws=>create( cv_pfl ).
+    DATA(lo_bdr) = /aws1/cl_bdr_factory=>create( lo_session ).
+    "snippet-start:[bdr.abapv1.invokemodel_l2_stable_diffusion]
+    TRY.
+        DATA(lo_bdr_l2_sd) = /aws1/cl_bdr_l2_factory=>create_stable_diffusion_10( lo_bdr ).
+      " iv_prompt contains a prompt like 'Show me a picture of a unicorn reading an enterprise financial report'.
+        DATA(lv_image) = lo_bdr_l2_sd->text_to_image( iv_prompt ).
+      CATCH /aws1/cx_bdraccessdeniedex INTO DATA(lo_ex).
+        WRITE / lo_ex->get_text( ).
+        WRITE / |Don't forget to enable model access at https://console.aws.amazon.com/bedrock/home?#/modelaccess|.
+
+    ENDTRY.
+    "snippet-end:[bdr.abapv1.invokemodel_l2_stable_diffusion]
+    ov_image = lv_image.
+
+  ENDMETHOD.
+
+
   METHOD prompt_claude_v2.
-    CONSTANTS: cv_pfl TYPE /aws1/rt_profile_id VALUE 'ZCODE_DEMO'.
+    CONSTANTS cv_pfl TYPE /aws1/rt_profile_id VALUE 'ZCODE_DEMO'.
 
     DATA(lo_session) = /aws1/cl_rt_session_aws=>create( cv_pfl ).
     DATA(lo_bdr) = /aws1/cl_bdr_factory=>create( lo_session ).
@@ -70,16 +133,15 @@ CLASS ZCL_AWS1_BDR_ACTIONS IMPLEMENTATION.
 
     "Serialize into JSON with /ui2/cl_json -- this assumes SAP_UI is installed.
     DATA(lv_json) = /ui2/cl_json=>serialize(
-      EXPORTING data = ls_input
+      data = ls_input
                 pretty_name   = /ui2/cl_json=>pretty_mode-low_case ).
 
     TRY.
         DATA(lo_response) = lo_bdr->invokemodel(
           iv_body = /aws1/cl_rt_util=>string_to_xstring( lv_json )
           iv_modelid = 'anthropic.claude-v2'
           iv_accept = 'application/json'
-          iv_contenttype = 'application/json'
-        ).
+          iv_contenttype = 'application/json' ).
 
         "Claude V2 Response format will be:
 *       {
@@ -98,17 +160,17 @@ CLASS ZCL_AWS1_BDR_ACTIONS IMPLEMENTATION.
 
         DATA(lv_answer) = ls_response-completion.
       CATCH /aws1/cx_bdraccessdeniedex INTO DATA(lo_ex).
-        WRITE: / lo_ex->get_text( ).
-        WRITE: / |Don't forget to enable model access at https://us-west-2.console.aws.amazon.com/bedrock/home?#/modelaccess|.
-        "Catch other exceptions as desired...
+        WRITE / lo_ex->get_text( ).
+        WRITE / |Don't forget to enable model access at https://console.aws.amazon.com/bedrock/home?#/modelaccess|.
+
     ENDTRY.
     "snippet-end:[bdr.abapv1.invokemodel_claude_v2]
     ov_answer = lv_answer.
   ENDMETHOD.
 
 
   METHOD prompt_stable_diffusion.
-    CONSTANTS: cv_pfl TYPE /aws1/rt_profile_id VALUE 'ZCODE_DEMO'.
+    CONSTANTS cv_pfl TYPE /aws1/rt_profile_id VALUE 'ZCODE_DEMO'.
 
     DATA(lo_session) = /aws1/cl_rt_session_aws=>create( cv_pfl ).
     DATA(lo_bdr) = /aws1/cl_bdr_factory=>create( lo_session ).
@@ -140,16 +202,15 @@ CLASS ZCL_AWS1_BDR_ACTIONS IMPLEMENTATION.
     ls_input-steps = 50.
 
     DATA(lv_json) = /ui2/cl_json=>serialize(
-      EXPORTING data = ls_input
+      data = ls_input
                 pretty_name   = /ui2/cl_json=>pretty_mode-low_case ).
 
     TRY.
         DATA(lo_response) = lo_bdr->invokemodel(
           iv_body = /aws1/cl_rt_util=>string_to_xstring( lv_json )
           iv_modelid = 'stability.stable-diffusion-xl-v0'
           iv_accept = 'application/json'
-          iv_contenttype = 'application/json'
-        ).
+          iv_contenttype = 'application/json' ).
 
         "Stable Diffusion Result Format:
 *       {
@@ -181,9 +242,9 @@ CLASS ZCL_AWS1_BDR_ACTIONS IMPLEMENTATION.
           DATA(lv_image) = cl_http_utility=>if_http_utility~decode_x_base64( ls_response-artifacts[ 1 ]-base64 ).
         ENDIF.
       CATCH /aws1/cx_bdraccessdeniedex INTO DATA(lo_ex).
-        WRITE: / lo_ex->get_text( ).
-        WRITE: / |Don't forget to enable model access at https://us-west-2.console.aws.amazon.com/bedrock/home?#/modelaccess|.
-        "Catch other exceptions as desired...
+        WRITE / lo_ex->get_text( ).
+        WRITE / |Don't forget to enable model access at https://console.aws.amazon.com/bedrock/home?#/modelaccess|.
+
     ENDTRY.
 
     "snippet-end:[bdr.abapv1.invokemodel_stable_diffusion]
diff --git a/sap-abap/services/bdr/zcl_aws1_bdr_actions.clas.testclasses.abap b/sap-abap/services/bdr/zcl_aws1_bdr_actions.clas.testclasses.abap
@@ -7,19 +7,22 @@
 CLASS ltc_zcl_aws1_bdr_actions DEFINITION DEFERRED.
 CLASS zcl_aws1_bdr_actions DEFINITION LOCAL FRIENDS ltc_zcl_aws1_bdr_actions.
 
-CLASS ltc_zcl_aws1_bdr_actions DEFINITION FOR TESTING  DURATION LONG RISK LEVEL HARMLESS.
+CLASS ltc_zcl_aws1_bdr_actions DEFINITION FOR TESTING DURATION LONG RISK LEVEL HARMLESS.
 
   PRIVATE SECTION.
-    CONSTANTS: cv_pfl TYPE /aws1/rt_profile_id VALUE 'ZCODE_DEMO'.
+    CONSTANTS cv_pfl TYPE /aws1/rt_profile_id VALUE 'ZCODE_DEMO'.
 
     DATA ao_bdr TYPE REF TO /aws1/if_bdr.
     DATA ao_session TYPE REF TO /aws1/cl_rt_session_base.
     DATA ao_bdr_actions TYPE REF TO zcl_aws1_bdr_actions.
 
-    METHODS: test_claude_v2 FOR TESTING RAISING /aws1/cx_rt_generic.
-    METHODS: test_stable_diffusion FOR TESTING RAISING /aws1/cx_rt_generic.
+    METHODS test_claude_v2 FOR TESTING RAISING /aws1/cx_rt_generic.
+    METHODS test_stable_diffusion FOR TESTING RAISING /aws1/cx_rt_generic.
 
-    METHODS: setup RAISING /aws1/cx_rt_generic.
+    METHODS test_l2_claude_v2 FOR TESTING RAISING /aws1/cx_rt_generic.
+    METHODS test_l2_stable_diffusion FOR TESTING RAISING /aws1/cx_rt_generic.
+
+    METHODS setup RAISING /aws1/cx_rt_generic.
 
 ENDCLASS.
 CLASS ltc_zcl_aws1_bdr_actions IMPLEMENTATION.
@@ -31,15 +34,24 @@ CLASS ltc_zcl_aws1_bdr_actions IMPLEMENTATION.
   ENDMETHOD.
   METHOD test_claude_v2.
     DATA(lv_joke) = ao_bdr_actions->prompt_claude_v2(
-      'Tell me a joke about ABAP programmers and Java programmers walking into a bar'
-    ).
+      'Tell me a joke about ABAP programmers and Java programmers walking into a bar' ).
     cl_abap_unit_assert=>assert_not_initial( act = lv_joke ).
   ENDMETHOD.
 
   METHOD test_stable_diffusion.
     DATA(lv_joke) = ao_bdr_actions->prompt_stable_diffusion(
-      'Show me a picture of a kitten coding in ABAP on an SAP system'
-    ).
+      'Show me a picture of a kitten coding in ABAP on an SAP system' ).
+    cl_abap_unit_assert=>assert_not_initial( act = lv_joke ).
+  ENDMETHOD.
+  METHOD test_l2_claude_v2.
+    DATA(lv_joke) = ao_bdr_actions->l2_prompt_claude_v2(
+      'Tell me a joke about ABAP programmers and Java programmers walking into a bar' ).
+    cl_abap_unit_assert=>assert_not_initial( act = lv_joke ).
+  ENDMETHOD.
+
+  METHOD test_l2_stable_diffusion.
+    DATA(lv_joke) = ao_bdr_actions->l2_prompt_stable_diffusion(
+      'Show me a picture of a kitten coding in ABAP on an SAP system' ).
     cl_abap_unit_assert=>assert_not_initial( act = lv_joke ).
   ENDMETHOD.
 
diff --git a/sap-abap/services/bdr/zcl_aws1_bdr_actions.clas.xml b/sap-abap/services/bdr/zcl_aws1_bdr_actions.clas.xml
@@ -13,6 +13,16 @@
     <WITH_UNIT_TESTS>X</WITH_UNIT_TESTS>
    </VSEOCLASS>
    <DESCRIPTIONS>
+    <SEOCOMPOTX>
+     <CMPNAME>L2_PROMPT_CLAUDE_V2</CMPNAME>
+     <LANGU>E</LANGU>
+     <DESCRIPT>Prompt Claude V2</DESCRIPT>
+    </SEOCOMPOTX>
+    <SEOCOMPOTX>
+     <CMPNAME>L2_PROMPT_STABLE_DIFFUSION</CMPNAME>
+     <LANGU>E</LANGU>
+     <DESCRIPT>Prompt Stable Diffusion 1.0 with L2 client</DESCRIPT>
+    </SEOCOMPOTX>
     <SEOCOMPOTX>
      <CMPNAME>PROMPT_CLAUDE_V2</CMPNAME>
      <LANGU>E</LANGU>
@@ -21,10 +31,70 @@
     <SEOCOMPOTX>
      <CMPNAME>PROMPT_STABLE_DIFFUSION</CMPNAME>
      <LANGU>E</LANGU>
-     <DESCRIPT>Prompt Claude V2</DESCRIPT>
+     <DESCRIPT>Prompt Stable Diffusion 1.0 with L2 client</DESCRIPT>
     </SEOCOMPOTX>
    </DESCRIPTIONS>
    <DESCRIPTIONS_SUB>
+    <SEOSUBCOTX>
+     <CMPNAME>L2_PROMPT_CLAUDE_V2</CMPNAME>
+     <SCONAME>/AWS1/CX_BDRCLIENTEXC</SCONAME>
+     <LANGU>E</LANGU>
+     <DESCRIPT>Exception /AWS1/CX_BDRCLIENTEXC</DESCRIPT>
+    </SEOSUBCOTX>
+    <SEOSUBCOTX>
+     <CMPNAME>L2_PROMPT_CLAUDE_V2</CMPNAME>
+     <SCONAME>/AWS1/CX_BDRSERVEREXC</SCONAME>
+     <LANGU>E</LANGU>
+     <DESCRIPT>Exception /AWS1/CX_BDRSERVEREXC</DESCRIPT>
+    </SEOSUBCOTX>
+    <SEOSUBCOTX>
+     <CMPNAME>L2_PROMPT_CLAUDE_V2</CMPNAME>
+     <SCONAME>/AWS1/CX_RT_NO_AUTH_GENERIC</SCONAME>
+     <LANGU>E</LANGU>
+     <DESCRIPT>Generic lack of authorization</DESCRIPT>
+    </SEOSUBCOTX>
+    <SEOSUBCOTX>
+     <CMPNAME>L2_PROMPT_CLAUDE_V2</CMPNAME>
+     <SCONAME>/AWS1/CX_RT_SERVICE_GENERIC</SCONAME>
+     <LANGU>E</LANGU>
+     <DESCRIPT>Generic Service call error</DESCRIPT>
+    </SEOSUBCOTX>
+    <SEOSUBCOTX>
+     <CMPNAME>L2_PROMPT_CLAUDE_V2</CMPNAME>
+     <SCONAME>/AWS1/CX_RT_TECHNICAL_GENERIC</SCONAME>
+     <LANGU>E</LANGU>
+     <DESCRIPT>Technical errors</DESCRIPT>
+    </SEOSUBCOTX>
+    <SEOSUBCOTX>
+     <CMPNAME>L2_PROMPT_STABLE_DIFFUSION</CMPNAME>
+     <SCONAME>/AWS1/CX_BDRCLIENTEXC</SCONAME>
+     <LANGU>E</LANGU>
+     <DESCRIPT>Exception /AWS1/CX_BDRCLIENTEXC</DESCRIPT>
+    </SEOSUBCOTX>
+    <SEOSUBCOTX>
+     <CMPNAME>L2_PROMPT_STABLE_DIFFUSION</CMPNAME>
+     <SCONAME>/AWS1/CX_BDRSERVEREXC</SCONAME>
+     <LANGU>E</LANGU>
+     <DESCRIPT>Exception /AWS1/CX_BDRSERVEREXC</DESCRIPT>
+    </SEOSUBCOTX>
+    <SEOSUBCOTX>
+     <CMPNAME>L2_PROMPT_STABLE_DIFFUSION</CMPNAME>
+     <SCONAME>/AWS1/CX_RT_NO_AUTH_GENERIC</SCONAME>
+     <LANGU>E</LANGU>
+     <DESCRIPT>Generic lack of authorization</DESCRIPT>
+    </SEOSUBCOTX>
+    <SEOSUBCOTX>
+     <CMPNAME>L2_PROMPT_STABLE_DIFFUSION</CMPNAME>
+     <SCONAME>/AWS1/CX_RT_SERVICE_GENERIC</SCONAME>
+     <LANGU>E</LANGU>
+     <DESCRIPT>Generic Service call error</DESCRIPT>
+    </SEOSUBCOTX>
+    <SEOSUBCOTX>
+     <CMPNAME>L2_PROMPT_STABLE_DIFFUSION</CMPNAME>
+     <SCONAME>/AWS1/CX_RT_TECHNICAL_GENERIC</SCONAME>
+     <LANGU>E</LANGU>
+     <DESCRIPT>Technical errors</DESCRIPT>
+    </SEOSUBCOTX>
     <SEOSUBCOTX>
      <CMPNAME>PROMPT_CLAUDE_V2</CMPNAME>
      <SCONAME>/AWS1/CX_BDRCLIENTEXC</SCONAME>
