Merge remote-tracking branch 'upstream/main' into pr

Author: jgchn

.github/workflows/rust-interpreter.yml

@@ -31,4 +31,8 @@ jobs:
             (curl -fsSL https://ollama.com/install.sh | sudo -E sh && sleep 2)
           wait
       - name: Run interpreter tests
-        run: npm run test:interpreter
+        run: |
+          python3.12 -mvenv venv
+          source venv/bin/activate
+          pip install nested-diff
+          npm run test:interpreter

examples/callback/repair_prompt.pdl

@@ -11,7 +11,6 @@ lastOf:
 - def: raw_output
   model: ollama_chat/granite3.2:2b
   parameters:
-    #stop_sequences: "\n\n"
     temperature: 0
 
 - lang: python

examples/cldk/cldk-assistant.pdl

@@ -130,7 +130,7 @@ text:
 
 
             parameters:
-              stop_sequences: "Question"
+              stop: ["Question"]
               temperature: 0
           - "\n\n***Executing the above PDL code:\n\n"
           - lang: python

examples/demo/10-sdg.pdl

@@ -68,7 +68,7 @@ defs:
           input: ${teacher_input}
           parameters:
             temperature: 0
-            stop_sequences: "${teacher_stop_token}"
+            stop: ["${teacher_stop_token}"]
             max_new_tokens: ${prompt_data.max_new_tokens}
           parser:
             regex: '### Question [0-9]+:\s*([^#\n]+)'
@@ -156,7 +156,7 @@ defs:
           model: ${teacher_model}
           input: ${teacher_input}
           parameters:
-            stop_sequences: "${teacher_stop_token}"
+            stop: ["${teacher_stop_token}"]
             max_new_tokens: ${prompt_data.max_new_tokens}
             temperature: 0
           parser:
@@ -252,7 +252,7 @@ defs:
           model: ${teacher_model}
           input: ${teacher_input}
           parameters:
-            stop_sequences: ${ ([teacher_stop_token] + prompt_data.additional_stop_tokens) | join(',') }
+            stop: ["${ ([teacher_stop_token] + prompt_data.additional_stop_tokens) | join(',') }"]
             max_new_tokens: ${prompt_data.max_new_tokens}
             temperature: 0
         parsed_answer:
@@ -339,7 +339,7 @@ defs:
           model: ${teacher_model}
           input: ${teacher_input}
           parameters:
-            stop_sequences: "${teacher_stop_token}"
+            stop: ["${teacher_stop_token}"]
             max_new_tokens: ${prompt_data.max_new_tokens}
             temperature: 0
           parser:

examples/notebooks/demo.ipynb

@@ -347,7 +347,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 3,
+   "execution_count": null,
    "id": "dfef7096-b7a6-4966-8356-a306e701974b",
    "metadata": {
     "scrolled": true
@@ -395,12 +395,12 @@
     "    - def: thought\n",
     "      model: replicate/ibm-granite/granite-3.1-8b-instruct\n",
     "      parameters:\n",
-    "        stop_sequences: \"Act:\"\n",
+    "        stop: [\"Act:\"]\n",
     "        temperature: 0\n",
     "    - def: rawAction\n",
     "      model: replicate/ibm-granite/granite-3.1-8b-instruct\n",
     "      parameters:\n",
-    "        stop_sequences: \"\\n\"\n",
+    "        stop: [\"\\n\"]\n",
     "        temperature: 0\n",
     "    - def: action\n",
     "      lang: python\n",

examples/notebooks/notebook.ipynb

@@ -12,7 +12,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 4,
+   "execution_count": null,
    "id": "f3c62df1-0347-4711-acd7-3892cfd5df30",
    "metadata": {},
    "outputs": [
@@ -32,7 +32,7 @@
     "- \"Hello\\n\"\n",
     "- model: \"replicate/ibm-granite/granite-3.1-8b-instruct\"\n",
     "  parameters:\n",
-    "    stop_sequences: \"!\"\n",
+    "    stop: [\"!\"]\n",
     " "
    ]
   },

examples/notebooks/notebook_debug.ipynb

@@ -12,7 +12,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 2,
+   "execution_count": null,
    "id": "f3c62df1-0347-4711-acd7-3892cfd5df30",
    "metadata": {},
    "outputs": [
@@ -166,7 +166,7 @@
     "- Hello,\n",
     "- model: \"replicate/ibm-granite/granite-3.1-8b-instruct\"\n",
     "  parameters:\n",
-    "    stop_sequences: \"!\""
+    "    stop: [\"!\"]"
    ]
   },
   {

examples/notebooks/pdl.ipynb

@@ -46,7 +46,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 2,
+   "execution_count": null,
    "id": "f3c62df1-0347-4711-acd7-3892cfd5df30",
    "metadata": {},
    "outputs": [
@@ -75,7 +75,7 @@
     "- \"What is the meaning of life?\\n\"\n",
     "- model: replicate/ibm-granite/granite-3.2-8b-instruct\n",
     "  parameters:\n",
-    "    stop_sequences: \"!\"\n",
+    "    stop: [\"!\"]\n",
     "    include_stop_sequence: true"
    ]
   },
@@ -153,7 +153,7 @@
      ]
     },
     {
-     "name": "stdin",
+     "name": "stdout",
      "output_type": "stream",
      "text": [
       ">>>  What is APR?\n"
@@ -169,7 +169,7 @@
      ]
     },
     {
-     "name": "stdin",
+     "name": "stdout",
      "output_type": "stream",
      "text": [
       ">>>  say it like a poem\n"
@@ -200,7 +200,7 @@
      ]
     },
     {
-     "name": "stdin",
+     "name": "stdout",
      "output_type": "stream",
      "text": [
       ">>>  quit\n"

examples/rag/rag.py

@@ -105,7 +105,7 @@ def rag_retrieve(
         # Typically litellm.exceptions.APIConnectionError
         return f"Unexpected {type(be)}: be={be}"
 
-    data = response.data[0]["embedding"]
+    data = response.data[0]["embedding"]  # type: ignore
 
     milvus_client = get_or_create_client(database_name)
     search_res = milvus_client.search(

examples/rag/rag_library1.pdl

@@ -10,8 +10,8 @@ text:
   return:
     lang: python
     code: |
-        from examples.rag.rag import parse
-        result = parse(filename, chunk_size, chunk_overlap)
+        import rag
+        result = rag.parse(filename, chunk_size, chunk_overlap)
 - def: rag_index
   function:
     inp: list # This is a list[str], but PDL doesn't allow that type
@@ -22,8 +22,8 @@ text:
   return:
     lang: python
     code: |
-        from examples.rag.rag import rag_index
-        result = rag_index(inp, encoder_model, embed_dimension, database_name, collection_name)
+        import rag
+        result = rag.rag_index(inp, encoder_model, embed_dimension, database_name, collection_name)
 - def: rag_retrieve
   function:
     inp: str
@@ -34,5 +34,5 @@ text:
   return:
     lang: python
     code: |
-        from examples.rag.rag import rag_retrieve
-        result = rag_retrieve(inp, encoder_model, limit, database_name, collection_name)
+        import rag
+        result = rag.rag_retrieve(inp, encoder_model, limit, database_name, collection_name)