diff --git a/examples/arith/Arith-simple.pdl b/examples/arith/Arith-simple.pdl index 9d256a8b..6a5f3e97 100644 --- a/examples/arith/Arith-simple.pdl +++ b/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 diff --git a/examples/chatbot/chatbot.pdl b/examples/chatbot/chatbot.pdl index af15886e..385c4fbc 100644 --- a/examples/chatbot/chatbot.pdl +++ b/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" - show_result: false - - 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" + show_result: false + - if: "{{ eval == 'no' }}" + then: + document: + - read: + message: "Why not?\n" until: "{{ eval == 'yes'}}" + as: document +role: user diff --git a/examples/hello/hello-code.pdl b/examples/hello/hello-code.pdl index c2883a8b..9f57dc81 100644 --- a/examples/hello/hello-code.pdl +++ b/examples/hello/hello-code.pdl @@ -7,4 +7,4 @@ document: import string result = random.choice(string.ascii_lowercase) - '!' -- "\n" + diff --git a/examples/hello/hello-def-use.pdl b/examples/hello/hello-def-use.pdl index e68557ef..79ab0065 100644 --- a/examples/hello/hello-def-use.pdl +++ b/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 diff --git a/examples/hello/hello-iteration.pdl b/examples/hello/hello-iteration.pdl index 68d71e1c..cadaccc7 100644 --- a/examples/hello/hello-iteration.pdl +++ b/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" \ No newline at end of file diff --git a/examples/hello/hello-litellm.pdl b/examples/hello/hello-litellm.pdl index d57a47d1..6e77c69e 100644 --- a/examples/hello/hello-litellm.pdl +++ b/examples/hello/hello-litellm.pdl @@ -3,6 +3,6 @@ document: - Hello, - model: watsonx/ibm/granite-34b-code-instruct parameters: + decoding_method: greedy stop: - - "," -- "\n" + - "!" diff --git a/examples/hello/hello-model-chaining.pdl b/examples/hello/hello-model-chaining.pdl index 1ca84a10..178b8a52 100644 --- a/examples/hello/hello-model-chaining.pdl +++ b/examples/hello/hello-model-chaining.pdl @@ -1,10 +1,10 @@ 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 @@ -12,10 +12,14 @@ document: ! 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" \ No newline at end of file + stop: + - '.' + include_stop_sequence: true + roles: + user: + pre_message: "" + post_message: "" diff --git a/examples/hello/hello.pdl b/examples/hello/hello.pdl index 0a49909e..3e2a16e5 100644 --- a/examples/hello/hello.pdl +++ b/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" diff --git a/pdl-schema.json b/pdl-schema.json index c1407984..7b4b7dc4 100644 --- a/pdl-schema.json +++ b/pdl-schema.json @@ -41,13 +41,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -116,13 +116,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -243,13 +243,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -318,13 +318,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -461,13 +461,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -536,13 +536,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -650,13 +650,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -725,13 +725,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -852,13 +852,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -927,13 +927,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -1061,13 +1061,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -1136,13 +1136,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -1246,13 +1246,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -1321,13 +1321,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -1448,13 +1448,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -1523,13 +1523,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -1661,13 +1661,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -1736,13 +1736,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -1821,13 +1821,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -2219,13 +2219,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -2294,13 +2294,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -2421,13 +2421,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -2496,13 +2496,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -2641,13 +2641,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -2716,13 +2716,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -2831,13 +2831,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -2906,13 +2906,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -3033,13 +3033,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -3108,13 +3108,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -3251,13 +3251,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -3326,13 +3326,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -3439,13 +3439,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -3514,13 +3514,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -3641,13 +3641,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -3716,13 +3716,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -3898,13 +3898,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -3973,13 +3973,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -4100,13 +4100,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -4175,13 +4175,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -4309,13 +4309,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -4384,13 +4384,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -4496,13 +4496,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -4571,13 +4571,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -4698,13 +4698,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -4773,13 +4773,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -4933,13 +4933,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -5008,13 +5008,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -5135,13 +5135,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -5210,13 +5210,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -5348,13 +5348,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -5423,13 +5423,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -5535,13 +5535,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -5610,13 +5610,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -5737,13 +5737,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -5812,13 +5812,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -5951,13 +5951,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -6026,13 +6026,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -6116,13 +6116,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -6191,13 +6191,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -6311,13 +6311,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -6386,13 +6386,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -6513,13 +6513,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -6588,13 +6588,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -6734,13 +6734,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -6809,13 +6809,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -6934,13 +6934,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -7009,13 +7009,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -7136,13 +7136,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -7211,13 +7211,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -7380,13 +7380,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -7455,13 +7455,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -7582,13 +7582,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -7657,13 +7657,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -7795,13 +7795,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -7870,13 +7870,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -7952,13 +7952,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -8027,13 +8027,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -8156,13 +8156,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -8231,13 +8231,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -8358,13 +8358,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -8433,13 +8433,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -8572,13 +8572,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -8725,13 +8725,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -8800,13 +8800,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -8927,13 +8927,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -9002,13 +9002,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -9140,13 +9140,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -9215,13 +9215,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -9300,13 +9300,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -9808,13 +9808,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -9883,13 +9883,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -10009,15 +10009,15 @@ { "$ref": "#/$defs/CallBlock" }, + { + "$ref": "#/$defs/LitellmModelBlock" + }, { "$ref": "#/$defs/WatsonxModelBlock" }, { "$ref": "#/$defs/BamModelBlock" }, - { - "$ref": "#/$defs/LitellmModelBlock" - }, { "$ref": "#/$defs/CodeBlock" }, @@ -10085,13 +10085,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -10218,13 +10218,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -10293,13 +10293,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -10654,13 +10654,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -10731,13 +10731,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -10806,13 +10806,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -10914,13 +10914,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -10989,13 +10989,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -11077,13 +11077,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -11202,13 +11202,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -11277,13 +11277,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -11404,13 +11404,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -11479,13 +11479,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -11724,13 +11724,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -11799,13 +11799,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -11926,13 +11926,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -12001,13 +12001,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -12135,13 +12135,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -12210,13 +12210,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -12305,13 +12305,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -12380,13 +12380,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -12500,13 +12500,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -12575,13 +12575,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -12702,13 +12702,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -12777,13 +12777,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -12911,13 +12911,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -12986,13 +12986,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -13080,13 +13080,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -13155,13 +13155,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -13275,13 +13275,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -13350,13 +13350,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -13477,13 +13477,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -13552,13 +13552,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -13686,13 +13686,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -13761,13 +13761,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -13965,13 +13965,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -14040,13 +14040,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -14167,13 +14167,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -14242,13 +14242,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -14380,13 +14380,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -14455,13 +14455,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" @@ -14540,13 +14540,13 @@ "$ref": "#/$defs/CallBlock" }, { - "$ref": "#/$defs/WatsonxModelBlock" + "$ref": "#/$defs/LitellmModelBlock" }, { - "$ref": "#/$defs/BamModelBlock" + "$ref": "#/$defs/WatsonxModelBlock" }, { - "$ref": "#/$defs/LitellmModelBlock" + "$ref": "#/$defs/BamModelBlock" }, { "$ref": "#/$defs/CodeBlock" diff --git a/pdl/pdl_ast.py b/pdl/pdl_ast.py index 154302e1..231c8fc0 100644 --- a/pdl/pdl_ast.py +++ b/pdl/pdl_ast.py @@ -468,9 +468,9 @@ class EmptyBlock(Block): AdvancedBlockType: TypeAlias = ( FunctionBlock | CallBlock + | LitellmModelBlock | WatsonxModelBlock | BamModelBlock - | LitellmModelBlock | CodeBlock | ApiBlock | GetBlock diff --git a/pdl/pdl_interpreter.py b/pdl/pdl_interpreter.py index 11828184..be7f7d41 100644 --- a/pdl/pdl_interpreter.py +++ b/pdl/pdl_interpreter.py @@ -5,6 +5,7 @@ from pathlib import Path from typing import Any, Generator, Iterable, Optional, Sequence +import litellm import requests import yaml from jinja2 import Environment, StrictUndefined, Template, UndefinedError @@ -825,8 +826,17 @@ def step_call_model( return None, [], scope, trace # Execute model call try: - append_log(state, "Model Input", messages_to_str(model_input)) + litellm_input = "" + + def get_transformed_inputs(kwargs): + params_to_model = kwargs["additional_args"]["complete_input_dict"] + nonlocal litellm_input + litellm_input = params_to_model["input"] + + litellm.input_callback = [get_transformed_inputs] + # append_log(state, "Model Input", messages_to_str(model_input)) msg = yield from generate_client_response(state, concrete_block, model_input) + append_log(state, "Model Input", litellm_input) background: Messages = [msg] result = msg["content"] append_log(state, "Model Output", result)