Merge branch 'main' into pdl-132

examples/arith/Arith-simple.pdl

@@ -10,22 +10,30 @@ document:
 - repeat:
     document:
     - def: REASON_OR_CALC
-      model: ibm/granite-20b-code-instruct
-      params:
-        stop_sequences:
+      model: watsonx/ibm/granite-20b-code-instruct
+      parameters:
+        stop:
         - '<<'
         include_stop_sequence: true
+        roles:
+          user:
+            pre_message: ""
+            post_message: ""
     - if: '{{ REASON_OR_CALC.endswith("<<") }}'
       then:
         document:
         - def: EXPR
-          model: ibm/granite-20b-code-instruct
-          params:
-            stop_sequences:
+          model: watsonx/ibm/granite-20b-code-instruct
+          parameters:
+            stop:
             - '='
             - "\n"
             - "Question"
             include_stop_sequence: false
+            roles:
+              user:
+                pre_message: ""
+                post_message: ""
         - '= '
         - def: RESULT
           lan: python

examples/chatbot/chatbot.pdl

@@ -3,19 +3,20 @@ document:
 - read:
   message: "What is your query?\n"
 - repeat:
-  - model: ibm/granite-13b-chat-v2
-    spec: str
-    params:
-      stop_sequences: ["."]
-  - read:
-    def: eval
-    message: "\nIs this a good answer[yes/no]?\n"
-    contribute: []
-  - if: "{{ eval == 'no' }}"
-    then:
-      - read:
-        message: "Why not?\n"
+    document:
+    - model: watsonx/ibm/granite-13b-chat-v2
+    - read:
+      def: eval
+      message: "\nIs this a good answer[yes/no]?\n"
+      contribute: []
+    - if: "{{ eval == 'no' }}"
+      then:
+        document:
+        - read:
+          message: "Why not?\n"
   until: "{{ eval == 'yes'}}"
+  as: document
+role: user
 
 
 

examples/hello/hello-code.pdl

@@ -7,4 +7,4 @@ document:
     import string
     result = random.choice(string.ascii_lowercase)
 - '!'
-- "\n"
+

examples/hello/hello-def-use.pdl

@@ -1,10 +1,10 @@
 description: Hello world with variable use
 document:
 - Hello,
-- model: ibm/granite-34b-code-instruct
-  params:
+- model: watsonx/ibm/granite-34b-code-instruct
+  parameters:
     decoding_method: greedy
-    stop_sequences:
+    stop:
     - '!'
     include_stop_sequence: false
   def: NAME

examples/hello/hello-iteration.pdl

@@ -3,6 +3,8 @@ document:
 - Hello, world!
 - "\n"
 - repeat:
-    "This is your first PDL program\n"
+    document:
+      "This is your first PDL program\n"
+  as: document
   num_iterations: 3
 - "\n"

examples/hello/hello-litellm.pdl

@@ -3,6 +3,6 @@ document:
 - Hello,
 - model: watsonx/ibm/granite-34b-code-instruct
   parameters:
+    decoding_method: greedy
     stop:
-    - ","
-- "\n"
+    - "!"

examples/hello/hello-model-chaining.pdl

@@ -1,21 +1,25 @@
 description: Hello world showing model chaining
 document:
 - Hello,
-- model: ibm/granite-34b-code-instruct
-  params:
+- model: watsonx/ibm/granite-34b-code-instruct
+  parameters:
     decoding_method: greedy
-    stop_sequences:
+    stop:
     - '!'
     include_stop_sequence: false
   def: NAME
 - |-
   !
   Who is{{ NAME }}?
 - "\n"
-- model: google/flan-t5-xl
-  params:
+- model: watsonx/google/flan-t5-xl
+  #model: watsonx/ibm/granite-34b-code-instruct
+  parameters:
     decoding_method: greedy
-    stop_sequences:
-    - '!'
-    include_stop_sequence: false
-- "\n"
+    stop:
+    - '.'
+    include_stop_sequence: true
+    roles:
+      user:
+        pre_message: ""
+        post_message: ""

examples/hello/hello.pdl

@@ -1,9 +1,9 @@
 description: Hello world
 document:
 - Hello,
-- model: ibm/granite-34b-code-instruct
-  params:
-    stop_sequences:
+- model: watsonx/ibm/granite-34b-code-instruct
+  parameters:
+    decoding_method: greedy
+    stop:
     - '!'
     include_stop_sequence: true
-- "\n"