Removed upper bound on LiteLLM version (#255)

vazirim · web-flow · commit 2cc85da64f9a · 2025-01-14T17:28:43.000-05:00
Removed upper bound on LiteLLM version

Signed-off-by: Mandana Vaziri &lt;mvaziri@us.ibm.com&gt;
diff --git a/pylintrc b/pylintrc
@@ -18,6 +18,7 @@ disable=
     too-many-branches,
     too-many-statements,
     too-few-public-methods,
-    duplicate-code
+    duplicate-code,
+    wrong-import-position
 
 load-plugins=pylint.extensions.docparams,pylint.extensions.bad_builtin
diff --git a/pyproject.toml b/pyproject.toml
@@ -13,7 +13,7 @@ dependencies = [
   "jinja2~=3.0",
   "PyYAML~=6.0",
   "jsonschema~=4.0",
-  "litellm>=1.49,<1.51",
+  "litellm>=1.49",
   "termcolor~=2.0",
   "ipython~=8.0",
 ]
diff --git a/src/pdl/pdl_interpreter.py b/src/pdl/pdl_interpreter.py
@@ -6,25 +6,30 @@
 import sys
 import types
 
+# TODO: temporarily disabling warnings to mute a pydantic warning from liteLLM
+import warnings
+
+warnings.filterwarnings("ignore", "Valid config keys have changed in V2")
+
 # from itertools import batched
-from pathlib import Path
-from typing import Any, Generator, Optional, Sequence, TypeVar
+from pathlib import Path  # noqa: E402
+from typing import Any, Generator, Optional, Sequence, TypeVar  # noqa: E402
 
-import httpx
-import litellm
-import yaml
-from jinja2 import (
+import httpx  # noqa: E402
+import litellm  # noqa: E402
+import yaml  # noqa: E402
+from jinja2 import (  # noqa: E402
     Environment,
     StrictUndefined,
     Template,
     TemplateSyntaxError,
     UndefinedError,
 )
-from jinja2.nodes import TemplateData
-from jinja2.runtime import Undefined
-from pydantic import BaseModel
+from jinja2.nodes import TemplateData  # noqa: E402
+from jinja2.runtime import Undefined  # noqa: E402
+from pydantic import BaseModel  # noqa: E402
 
-from .pdl_ast import (
+from .pdl_ast import (  # noqa: E402
     AdvancedBlockType,
     ArrayBlock,
     BamModelBlock,
@@ -66,11 +71,11 @@
     TextBlock,
     empty_block_location,
 )
-from .pdl_dumper import block_to_dict
-from .pdl_llms import BamModel, LitellmModel
-from .pdl_location_utils import append, get_loc_string
-from .pdl_parser import PDLParseError, parse_file, parse_str
-from .pdl_scheduler import (
+from .pdl_dumper import block_to_dict  # noqa: E402
+from .pdl_llms import BamModel, LitellmModel  # noqa: E402
+from .pdl_location_utils import append, get_loc_string  # noqa: E402
+from .pdl_parser import PDLParseError, parse_file, parse_str  # noqa: E402
+from .pdl_scheduler import (  # noqa: E402
     CodeYieldResultMessage,
     GeneratorWrapper,
     ModelCallMessage,
@@ -80,8 +85,8 @@
     YieldResultMessage,
     schedule,
 )
-from .pdl_schema_validator import type_check_args, type_check_spec
-from .pdl_utils import (
+from .pdl_schema_validator import type_check_args, type_check_spec  # noqa: E402
+from .pdl_utils import (  # noqa: E402
     get_contribute_value,
     messages_concat,
     messages_to_str,
diff --git a/tests/data/line/hello14.pdl b/tests/data/line/hello14.pdl
@@ -1,7 +1,7 @@
 description: Hello world with model chaining
 text:
 - Hello,
-- model: watsonx/ibm/granite-34b-code-instruct
+- model: watsonx_text/ibm/granite-34b-code-instruct
   def: GEN
   parameters:
     stop:
@@ -16,7 +16,7 @@ text:
   return:
     lastOf:
     - "\nTranslate the sentence '${ sentence }' to ${ language }\n"
-    - model: watsonx/ibm/granite-20b-multilingual
+    - model: watsonx_text/ibm/granite-20b-multilingual
       parameters:
         stop:
         - '!'
diff --git a/tests/data/line/hello16.pdl b/tests/data/line/hello16.pdl
@@ -5,7 +5,7 @@ text:
   def: data
   contribute: []
   spec: { "questions": ["str"], "answers": ["obj"] }
-- model: watsonx/ibm/granite-20b-code-instruct
+- model: watsonx_text/ibm/granite-20b-code-instruct
   def: model_output
   spec: {"bob": int, "carol": str}
   input: 
diff --git a/tests/data/line/hello19.pdl b/tests/data/line/hello19.pdl
@@ -1,6 +1,6 @@
 description: Hello world to call into a model
 defs:
-  model: watsonx/ibm/granite-34b-code-instruct
+  model: watsonx_text/ibm/granite-34b-code-instruct
 text:
 - Hello,
 - model: ${ models }
diff --git a/tests/data/line/hello24.pdl b/tests/data/line/hello24.pdl
@@ -1,7 +1,7 @@
 description: Hello world with model chaining
 text:
 - Hello,
-- model: watsonx/ibm/granite-34b-code-instruct
+- model: watsonx_text/ibm/granite-34b-code-instruct
   def: GEN
   parameters:
     stop:
@@ -16,7 +16,7 @@ text:
   return:
     lastOf:
     - "\nTranslate the sentence '${ sentence }' to ${ language }\n"
-    - model: watsonx/ibm/granite-34b-code-instruct
+    - model: watsonx_text/ibm/granite-34b-code-instruct
       parameters:
         mock_response: " World!"
 - call: ${ translate }
diff --git a/tests/data/line/hello25.pdl b/tests/data/line/hello25.pdl
@@ -1,7 +1,7 @@
 description: Hello world with model chaining
 text:
 - Hello,
-- model: watsonx/ibm/granite-34b-code-instruct
+- model: watsonx_text/ibm/granite-34b-code-instruct
   def: GEN
   parameters:
     stop:
@@ -14,7 +14,7 @@ text:
   return:
     lastOf:
     - "\nTranslate the sentence '${ sentence1 }' to ${ language }\n"
-    - model: watsonx/ibm/granite-20b-multilingual
+    - model: watsonx_text/ibm/granite-20b-multilingual
       parameters:
         stop:
         - "!"
diff --git a/tests/data/line/hello26.pdl b/tests/data/line/hello26.pdl
@@ -5,7 +5,7 @@ text:
   def: data
   contribute: []
   spec: { "questions": ["str"], "answers": ["obj"] }
-- model: watsonx/ibm/granite-34b-code-instruct
+- model: watsonx_text/ibm/granite-34b-code-instruct
   def: model_output
   input: 
     text:
diff --git a/tests/data/line/hello27.pdl b/tests/data/line/hello27.pdl
@@ -5,7 +5,7 @@ text:
   def: data
   contribute: []
   spec: { "questions": ["str"], "answers": ["obj"] }
-- model: watsonx/ibm/granite-34b-code-instruct
+- model: watsonx_text/ibm/granite-34b-code-instruct
   def: model_output
   input: 
     text:
diff --git a/tests/data/line/hello3.pdl b/tests/data/line/hello3.pdl
@@ -1,6 +1,6 @@
 description: Hello world to call into a model
 defs:
-  model: watsonx/ibm/granite-20b-code-instruct
+  model: watsonx_text/ibm/granite-20b-code-instruct
 text:
 - Hello,
 - model: ${ model }
diff --git a/tests/results/examples/demo/4-translator.12.result b/tests/results/examples/demo/4-translator.12.result
@@ -0,0 +1,5 @@
+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.french
+
+Translate the above to french
+Taux Annuel Équivalent (TAE) est l'intérêt annuel égal à 100 fois le taux mensuel de prêt. Il représente le coût réel annuel des fonds sur la durée d'un prêt. Il inclut toutes les frais ou coûts supplémentaires associés à la transaction.stop
diff --git a/tests/results/examples/talk/4-function.12.result b/tests/results/examples/talk/4-function.12.result
@@ -0,0 +1,2 @@
+The sentence 'I love Paris!' translates to 'Je t'aime Paris!' in French. However, if you want to say 'I love Paris' without the possessive pronoun, it would be 'Je aime Paris!'.
+The sentence 'I love Madrid!' translates to 'Me encanta Madrid!' in Spanish.
diff --git a/tests/results/examples/tutorial/function_definition.12.result b/tests/results/examples/tutorial/function_definition.12.result
@@ -0,0 +1,2 @@
+The sentence 'I love Paris!' translates to 'Je t'aime Paris!' in French. However, if you want to say 'I love Paris' without the possessive pronoun, it would be 'Je aime Paris!'.
+The sentence 'I love Madrid!' translates to 'Me encanta Madrid!' in Spanish.
diff --git a/tests/results/examples/tutorial/grouping_definitions.12.result b/tests/results/examples/tutorial/grouping_definitions.12.result
@@ -0,0 +1,2 @@
+The sentence 'I love Paris!' translates to 'Je t'aime Paris!' in French. However, if you want to say 'I love Paris' without the possessive pronoun, it would be 'Je aime Paris!'.
+The sentence 'I love Madrid!' translates to 'Me encanta Madrid!' in Spanish.
diff --git a/tests/results/examples/tutorial/muting_block_output.12.result b/tests/results/examples/tutorial/muting_block_output.12.result
@@ -0,0 +1 @@
+The french sentence was: The sentence 'I love Paris!' translates to 'Je t'aime Paris!' in French. However, if you want to say 'I love Paris' without the possessive pronoun, it would be 'Je aime Paris!'.
diff --git a/tests/test_defs.py b/tests/test_defs.py
@@ -12,7 +12,7 @@
         "NAME": {
             "text": [
                 {
-                    "model": "watsonx/ibm/granite-34b-code-instruct",
+                    "model": "watsonx_text/ibm/granite-34b-code-instruct",
                     "input": {"get": "HELLO"},
                     "parameters": {
                         "stop": ["!"],
diff --git a/tests/test_examples_run.py b/tests/test_examples_run.py
@@ -162,7 +162,12 @@ def test_valid_programs(capsys: CaptureFixture[str], monkeypatch: MonkeyPatch) -
                 scope = inputs.scope
         try:
             random.seed(11)
-            output = pdl.exec_file(pdl_file_name, scope=scope, output="all")
+            output = pdl.exec_file(
+                pdl_file_name,
+                scope=scope,
+                output="all",
+                config=pdl.InterpreterConfig(batch=0),
+            )
             result = output["result"]
             block_to_dict(output["trace"], json_compatible=True)
             result_dir_name = (
diff --git a/tests/test_parser.py b/tests/test_parser.py
@@ -10,7 +10,7 @@
 )
 
 model_parser = {
-    "model": "watsonx/ibm/granite-20b-code-instruct",
+    "model": "watsonx_text/ibm/granite-20b-code-instruct",
     "spec": {"bob": "int", "carol": "int"},
     "input": {
         "text": [
@@ -39,7 +39,7 @@ def test_model_parser():
 
 
 model_parser1 = {
-    "model": "watsonx/ibm/granite-34b-code-instruct",
+    "model": "watsonx_text/ibm/granite-34b-code-instruct",
     "spec": {"bob": "int", "carol": "int"},
     "input": {
         "text": [
diff --git a/tests/test_var.py b/tests/test_var.py
@@ -16,7 +16,7 @@
             "def": "NAME",
             "text": [
                 {
-                    "model": "watsonx/ibm/granite-34b-code-instruct",
+                    "model": "watsonx_text/ibm/granite-34b-code-instruct",
                     "parameters": {
                         "temperature": 0,
                         "stop": ["!"],
@@ -48,7 +48,7 @@ def test_var():
             "def": "NAME",
             "text": [
                 {
-                    "model": "watsonx/ibm/granite-34b-code-instruct",
+                    "model": "watsonx_text/ibm/granite-34b-code-instruct",
                     "parameters": {
                         "temperature": 0,
                         "stop": ["!"],

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ dependencies = [`
`13`	`13`	`"jinja2~=3.0",`
`14`	`14`	`"PyYAML~=6.0",`
`15`	`15`	`"jsonschema~=4.0",`
`16`		`- "litellm>=1.49,<1.51",`
	`16`	`+ "litellm>=1.49",`
`17`	`17`	`"termcolor~=2.0",`
`18`	`18`	`"ipython~=8.0",`
`19`	`19`	`]`