Deploy Ollama to run examples (#629)

jgchn · web-flow · commit 574cf705c5cb · 2025-02-28T21:33:07.000-05:00
* Deploy ollama on GH Actions and run against tests

Signed-off-by: Jing Chen &lt;jing.chen2@ibm.com&gt;

* Set up nightly tests

Signed-off-by: Jing Chen &lt;jing.chen2@ibm.com&gt;

* Update checks

Signed-off-by: Jing Chen &lt;jing.chen2@ibm.com&gt;

* Address no disk space

Signed-off-by: Jing Chen &lt;jing.chen2@ibm.com&gt;

* Rm failing test

Signed-off-by: Jing Chen &lt;jing.chen2@ibm.com&gt;

---------

Signed-off-by: Jing Chen &lt;jing.chen2@ibm.com&gt;
diff --git a/.github/workflows/run-examples.yml b/.github/workflows/run-examples.yml
@@ -6,6 +6,7 @@ on:
     - cron:  '0 1 * * *'
   workflow_dispatch:
 
+
 jobs:
   tests:
     name: Execution tests
@@ -16,6 +17,56 @@ jobs:
         python-version: ['3.11', '3.12', '3.13']
 
     steps:
+
+      # Free up some disk space
+    - name: Remove unnecessary files
+      run: |
+        sudo rm -rf /usr/share/dotnet
+        sudo rm -rf "$AGENT_TOOLSDIRECTORY"
+
+      # Set up Ollama
+    - name: Install Ollama and start server
+      shell: bash
+      run: |
+        curl -fsSL https://ollama.com/install.sh | sudo -E sh
+
+    - name: Pull models in examples/
+      shell: bash
+      run: |
+        ollama pull granite-code:8b
+        ollama pull granite3-dense:8b
+        ollama pull granite3.1-dense
+        ollama pull granite3.2:2b
+        ollama pull granite3.2
+        ollama pull granite3.2:8b
+        ollama pull mxbai-embed-large
+        ollama list
+
+    - name: Check that all required models are available
+      shell: bash
+      run: |
+        models=("granite-code" "granite3-dense" "granite3.1-dense" "mxbai-embed-large" "granite3.2:2b" "granite3.2" "granite3.2:8b")
+        missing=0
+        for model in "${models[@]}"; do
+          if ! ollama list | awk 'NR>1 {print $1}' | grep -q "$model"; then
+            echo "❌ Model $model (or substring) is missing!"
+            missing=1
+          fi
+        done
+
+        if [ "$missing" -eq 1 ]; then
+          exit 1
+        else
+          echo "✅ All expected models are available."
+        fi
+
+    - name: Wait for Ollama server
+      shell: bash
+      run: |
+        sleep 10
+        time curl -i http://localhost:11434
+
+    # Run tests
     - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v5
@@ -45,4 +96,4 @@ jobs:
         WATSONX_APIKEY: ${{ secrets.WATSONX_APIKEY }}
         WATSONX_URL: ${{ secrets.WATSONX_URL }}
         REPLICATE_API_TOKEN: ${{ secrets.REPLICATE_API_TOKEN }}
-      run: py.test -v --capture=tee-sys tests/test_examples_run.py
+      run: py.test -v --capture=tee-sys -rfE -s tests/test_examples_run.py
diff --git a/examples/granite/multi_round_chat.pdl b/examples/granite/multi_round_chat.pdl
@@ -18,7 +18,7 @@ text:
 
       ${ prompt }
     # Use replicate.com to run the Granite model on the context, outputting the result
-    - model: replicate/ibm-granite/granite-3.1-8b-instruct
+    - model: ollama/granite3.1-dense
       parameters:
         # Use no LLM model creativity (0 is the default)
         temperature: 0
diff --git a/examples/hello/hello-code-pdl.pdl b/examples/hello/hello-code-pdl.pdl
@@ -4,5 +4,6 @@ code: |
   description: Hello world
   text:
   - "Hello\n"
-  - model: replicate/ibm-granite/granite-3.1-8b-instruct
-  
+  - model: ollama/granite-code:8b
+    parameters:
+      temperature: 0
diff --git a/examples/rag/tfidf_rag.pdl b/examples/rag/tfidf_rag.pdl
@@ -41,5 +41,7 @@ text:
 - |-
 
     Q: ${ TEST_PROMPT }
-    A: 
-- model: replicate/ibm-granite/granite-3.0-8b-instruct
+    A:
+- model: ollama/granite3.2:8b
+  parameters:
+    temperature: 0
diff --git a/examples/tutorial/parser_regex.pdl b/examples/tutorial/parser_regex.pdl
@@ -1,6 +1,8 @@
 description: Hello world with parser using regex
 text:
 - model: ollama/granite-code:8b
+  parameters:
+    temperature: 0
   input: "Hello,"
   parameters:
     # Tell the LLM to stop after generating an exclamation point.
diff --git a/pdl-live-react/demos/demo2.pdl b/pdl-live-react/demos/demo2.pdl
@@ -1,6 +1,10 @@
 description: Model chaining
 text:
 - "write a hello world example, and explain to me how to run it"
-- model: ollama/granite3.2:8b
+- model: ollama/granite3.2
+  parameters:
+    temperature: 0
 - "how about in Rust?"
-- model: ollama/granite3.2:8b
+- model: ollama/granite3.2
+  parameters:
+    temperature: 0
diff --git a/tests/results/examples/granite/multi_round_chat.0.result b/tests/results/examples/granite/multi_round_chat.0.result
@@ -1,15 +1,29 @@
 
 What is APR?
-APR stands for Annual Percentage Rate. It is the annual interest rate charged for borrowing or earned through an investment, and it represents the actual yearly cost of funds over the term of a loan. It includes any fees or additional costs associated with the transaction.
+APR stands for Annual Percentage Rate. It's a measure of the cost of a loan, expressed as a yearly rate that includes not only interest but also other charges or fees that may be associated with the loan. This allows consumers to compare different loans and understand their true cost more easily. APR is calculated by taking into account the interest rate, points, mortgage insurance, and other costs over the life of the loan. It's important to note that APR doesn't necessarily reflect the actual interest rate you'll be charged; it's a standardized way to compare loans from different lenders.
 Can you write a poem about APR?
-In the world of finance, APR is the key,
-A number that tells us what we'll pay, or earn, you see.
-It's the annual rate, both simple and clear,
-Including all fees, for loans and investments, near and far.
-
-It's the cost of borrowing, or the return we gain,
-A figure that helps us make informed financial gain.
-So, when you're comparing loans, or investments to choose,
-Remember APR, and make the right move.
+In finance, there's a term so neat,
+APR, it helps us to compete.
+Not just interest, but all the fees,
+A yearly rate that sets loans free.
+
+From mortgages to credit cards,
+It guides our choices, as per the charts.
+Points, insurance, and more,
+In this calculation, they're no chore.
+
+A standardized tool for comparison,
+Helping us avoid financial frustration.
+Though it may not reflect the true rate,
+APR is a helpful trait.
+
+So when you borrow, take a peek,
+At APR, and don't be meek.
+Understand its power, use it wisely,
+And watch your finances flourish with ease.
 Now explain APR to me like I'm 5 years old
-Sure! Imagine you have a piggy bank, and you want to borrow some money from your parents to buy a toy. Your parents will ask you to pay them back with some extra money, which is like interest. APR is the special number that tells you how much extra money you'll have to pay back, all in one year. It's like a special rule that helps you understand how much you'll owe your parents.
+Sure! Imagine you want to buy a toy that costs $100. You can either pay the full $100 right away or borrow it and pay back more over time.
+
+APR is like a special number that tells you how much more you'll have to pay in total when you borrow money. It includes not just the extra money you pay for using someone else's cash (that's like interest), but also any other costs, like fees for taking the loan or insurance to protect the lender if you can't pay back.
+
+So, if your APR is 10%, that means you'll have to pay an extra $10 on top of the $100 you're borrowing. That's a total of $110. It's like a little extra for using their money, and it helps everyone understand how much more things cost when we borrow instead of saving up.
diff --git a/tests/results/examples/hello/hello-code-pdl.0.result b/tests/results/examples/hello/hello-code-pdl.0.result
@@ -1,2 +1,2 @@
 Hello
-Hello! How can I assist you today?
+Greetings! How can I assist you today?
diff --git a/tests/results/examples/hello/hello-code-pdl.1.result b/tests/results/examples/hello/hello-code-pdl.1.result
@@ -0,0 +1,3 @@
+Hello
+Hi there! How can I help you today?
+
diff --git a/tests/results/examples/hello/hello-while.0.result b/tests/results/examples/hello/hello-while.0.result
@@ -0,0 +1 @@
+123
diff --git a/tests/results/examples/rag/tfidf_rag.0.result b/tests/results/examples/rag/tfidf_rag.0.result
@@ -0,0 +1,63 @@
+Given the text after "Q:", generate a Python function after "A:".
+
+Here are some examples, complete the last one:
+
+Q: Write a python function to find the first repeated character in a given string.
+A: ```def first_repeated_char(str1):
+  for index,c in enumerate(str1):
+    if str1[:index+1].count(c) > 1:
+      return c```
+
+Q: Write a python function to interchange the first and last element in a given list.
+A: ```def swap_List(newList): 
+    size = len(newList) 
+    temp = newList[0] 
+    newList[0] = newList[size - 1] 
+    newList[size - 1] = temp   
+    return newList ```
+
+Q: Write a function to find the index of the first occurrence of a given number in a sorted array.
+A: ```def find_first_occurrence(A, x):
+    (left, right) = (0, len(A) - 1)
+    result = -1
+    while left <= right:
+        mid = (left + right) // 2
+        if x == A[mid]:
+            result = mid
+            right = mid - 1
+        elif x < A[mid]:
+            right = mid - 1
+        else:
+            left = mid + 1
+    return result```
+
+Q: Write a function to remove tuples from the given tuple.
+A: ```def remove_nested(test_tup):
+  res = tuple()
+  for count, ele in enumerate(test_tup):
+    if not isinstance(ele, tuple):
+      res = res + (ele, )
+  return (res) ```
+
+Q: Write a function to remove all whitespaces from a string.
+A: ```import re
+def remove_all_spaces(text):
+ return (re.sub(r'\s+', '',text))```
+
+Q: Write a python function to remove first and last occurrence of a given character from the string.
+A:Here is the Python function to remove the first and last occurrence of a given character from a string:
+
+```python
+def remove_char_at_edges(s, char):
+    # Remove first occurrence
+    if s.startswith(char):
+        s = s[s.index(char)+1:]
+
+    # Remove last occurrence
+    if s.endswith(char):
+        s = s[:len(s) - s[::-1].index(char)]
+    
+    return s
+```
+
+This function uses the `str.startswith` and `str.endswith` methods to check if the string starts or ends with the specified character, respectively. If it does, it removes that character using Python's slice notation. Note that this solution doesn't handle multiple occurrences at the edges of the string; it only removes one occurrence from each edge.
diff --git a/tests/results/examples/rag/tfidf_rag.1.result b/tests/results/examples/rag/tfidf_rag.1.result
@@ -0,0 +1,69 @@
+Given the text after "Q:", generate a Python function after "A:".
+
+Here are some examples, complete the last one:
+
+Q: Write a python function to find the first repeated character in a given string.
+A: ```def first_repeated_char(str1):
+  for index,c in enumerate(str1):
+    if str1[:index+1].count(c) > 1:
+      return c```
+
+Q: Write a python function to interchange the first and last element in a given list.
+A: ```def swap_List(newList): 
+    size = len(newList) 
+    temp = newList[0] 
+    newList[0] = newList[size - 1] 
+    newList[size - 1] = temp   
+    return newList ```
+
+Q: Write a function to find the index of the first occurrence of a given number in a sorted array.
+A: ```def find_first_occurrence(A, x):
+    (left, right) = (0, len(A) - 1)
+    result = -1
+    while left <= right:
+        mid = (left + right) // 2
+        if x == A[mid]:
+            result = mid
+            right = mid - 1
+        elif x < A[mid]:
+            right = mid - 1
+        else:
+            left = mid + 1
+    return result```
+
+Q: Write a function to remove tuples from the given tuple.
+A: ```def remove_nested(test_tup):
+  res = tuple()
+  for count, ele in enumerate(test_tup):
+    if not isinstance(ele, tuple):
+      res = res + (ele, )
+  return (res) ```
+
+Q: Write a function to remove all whitespaces from a string.
+A: ```import re
+def remove_all_spaces(text):
+ return (re.sub(r'\s+', '',text))```
+
+Q: Write a python function to remove first and last occurrence of a given character from the string.
+A:Here's the Python function that removes the first and last occurrence of a given character from a string:
+
+```python
+def remove_first_last(s, char):
+    new_string = list(s)  # convert string to list for mutable operations
+    stack = []
+
+    # Collect characters before the first occurrence of 'char'
+    while char not in new_string:
+        if new_string:
+            stack.append(new_string.pop(0))
+    
+    # Collect characters after the last occurrence of 'char'
+    last_occurrence = s.rfind(char)
+    for i in range(last_occurrence + 1, len(s)):
+        if s[i] != char:
+            stack.append(new_string.pop())
+
+    return ''.join(stack)
+```
+
+This function works by first creating a mutable version of the string (as strings are immutable in Python). It then iterates through the list to collect characters before and after each occurrence of the given character, using a stack to store these characters. Finally, it rebuilds the string from this stack and returns it.
diff --git a/tests/results/examples/rag/tfidf_rag.3.result b/tests/results/examples/rag/tfidf_rag.3.result
@@ -0,0 +1,59 @@
+Given the text after "Q:", generate a Python function after "A:".
+
+Here are some examples, complete the last one:
+
+Q: Write a python function to find the first repeated character in a given string.
+A: ```def first_repeated_char(str1):
+  for index,c in enumerate(str1):
+    if str1[:index+1].count(c) > 1:
+      return c```
+
+Q: Write a python function to interchange the first and last element in a given list.
+A: ```def swap_List(newList): 
+    size = len(newList) 
+    temp = newList[0] 
+    newList[0] = newList[size - 1] 
+    newList[size - 1] = temp   
+    return newList ```
+
+Q: Write a function to find the index of the first occurrence of a given number in a sorted array.
+A: ```def find_first_occurrence(A, x):
+    (left, right) = (0, len(A) - 1)
+    result = -1
+    while left <= right:
+        mid = (left + right) // 2
+        if x == A[mid]:
+            result = mid
+            right = mid - 1
+        elif x < A[mid]:
+            right = mid - 1
+        else:
+            left = mid + 1
+    return result```
+
+Q: Write a function to remove tuples from the given tuple.
+A: ```def remove_nested(test_tup):
+  res = tuple()
+  for count, ele in enumerate(test_tup):
+    if not isinstance(ele, tuple):
+      res = res + (ele, )
+  return (res) ```
+
+Q: Write a function to remove all whitespaces from a string.
+A: ```import re
+def remove_all_spaces(text):
+ return (re.sub(r'\s+', '',text))```
+
+Q: Write a python function to remove first and last occurrence of a given character from the string.
+A:Here is the Python function to remove the first and last occurrence of a given character from a string:
+
+```python
+def remove_char(s, char):
+    result = []
+    for c in s:
+        if c != char or (c == char and (result and result[-1] != char)):
+            result.append(c)
+    return ''.join(result)
+```
+
+This function iterates over each character in the string `s`. If the character is not equal to `char` or it's equal but not the first/last occurrence (checked by `result and result[-1] != char`), it appends the character to the `result` list. Finally, it joins all characters in the list into a single string and returns it.
diff --git a/tests/results/examples/tutorial/for_lastOf.0.result b/tests/results/examples/tutorial/for_lastOf.0.result
@@ -0,0 +1 @@
+4
diff --git a/tests/results/examples/tutorial/for_multiple_lists.0.result b/tests/results/examples/tutorial/for_multiple_lists.0.result
@@ -0,0 +1,5 @@
+Bob's number is 1
+Carol's number is 2
+David's number is 3
+Ernest's number is 4
+
diff --git a/tests/results/examples/tutorial/for_object.0.result b/tests/results/examples/tutorial/for_object.0.result
@@ -0,0 +1 @@
+{'Bob': 1, 'Carol': 2, 'David': 3, 'Ernest': 4}
diff --git a/tests/results/examples/tutorial/import.0.result b/tests/results/examples/tutorial/import.0.result
@@ -0,0 +1 @@
+Bye!
diff --git a/tests/results/examples/tutorial/import_lib.0.result b/tests/results/examples/tutorial/import_lib.0.result
@@ -0,0 +1 @@
+
diff --git a/tests/results/examples/tutorial/parser_findall.0.result b/tests/results/examples/tutorial/parser_findall.0.result
@@ -0,0 +1 @@
+['1', '2', '3', '4']
diff --git a/tests/results/examples/tutorial/parser_regex.0.result b/tests/results/examples/tutorial/parser_regex.0.result
@@ -0,0 +1 @@
+{"name": "Hello"}
diff --git a/tests/results/examples/tutorial/parser_regex.3.result b/tests/results/examples/tutorial/parser_regex.3.result
@@ -0,0 +1 @@
+{"name": "Hi there"}
diff --git a/tests/results/examples/tutorial/repeat.0.result b/tests/results/examples/tutorial/repeat.0.result
@@ -0,0 +1,2 @@
+Bob's number is 1
+
diff --git a/tests/results/examples/tutorial/while.0.result b/tests/results/examples/tutorial/while.0.result
@@ -0,0 +1 @@
+123
diff --git a/tests/results/pdl-live-react/demos/demo2.0.result b/tests/results/pdl-live-react/demos/demo2.0.result
diff --git a/tests/results/pdl-live-react/demos/demo2.1.result b/tests/results/pdl-live-react/demos/demo2.1.result
diff --git a/tests/test_defaults.py b/tests/test_defaults.py
diff --git a/tests/test_examples_run.py b/tests/test_examples_run.py

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`Hello`
`2`		`-Hello! How can I assist you today?`
	`2`	`+Greetings! How can I assist you today?`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+Hello`
	`2`	`+Hi there! How can I help you today?`
	`3`	`+`