diff --git a/tests/utilities/cassettes/test_converter_with_llama3_1_model.yaml b/tests/utilities/cassettes/test_converter_with_llama3_1_model.yaml index d6b155f15..db124deea 100644 --- a/tests/utilities/cassettes/test_converter_with_llama3_1_model.yaml +++ b/tests/utilities/cassettes/test_converter_with_llama3_1_model.yaml @@ -21,15 +21,15 @@ interactions: uri: http://localhost:11434/api/generate response: body: - string: '{"model":"llama3.1","created_at":"2025-02-18T21:35:31.352861Z","response":"{\n \"name\": - \"Alice Llama\",\n \"age\": 30\n}","done":true,"done_reason":"stop","context":[128006,882,128007,271,14711,744,512,5618,5625,279,2768,1495,1139,2764,4823,382,5207,27785,279,2764,4823,323,4400,775,382,791,4823,2011,1833,420,3645,7041,512,517,220,330,609,794,610,345,220,330,425,794,528,198,633,14711,2724,512,678,25,30505,445,81101,11,13381,25,220,966,271,128009,128006,78191,128007,271,517,220,330,609,794,330,62786,445,81101,761,220,330,425,794,220,966,198,92],"total_duration":4061356417,"load_duration":804316792,"prompt_eval_count":67,"prompt_eval_duration":2690000000,"eval_count":19,"eval_duration":565000000}' + string: '{"model":"llama3.1","created_at":"2025-02-18T21:42:05.161192Z","response":"{\n \"name\": + \"Alice Llama\",\n \"age\": 30\n}","done":true,"done_reason":"stop","context":[128006,882,128007,271,14711,744,512,5618,5625,279,2768,1495,1139,2764,4823,382,5207,27785,279,2764,4823,323,4400,775,382,791,4823,2011,1833,420,3645,7041,512,517,220,330,609,794,610,345,220,330,425,794,528,198,633,14711,2724,512,678,25,30505,445,81101,11,13381,25,220,966,271,128009,128006,78191,128007,271,517,220,330,609,794,330,62786,445,81101,761,220,330,425,794,220,966,198,92],"total_duration":3620808667,"load_duration":805719417,"prompt_eval_count":67,"prompt_eval_duration":2250000000,"eval_count":19,"eval_duration":562000000}' headers: Content-Length: - '706' Content-Type: - application/json; charset=utf-8 Date: - - Tue, 18 Feb 2025 21:35:31 GMT + - Tue, 18 Feb 2025 21:42:05 GMT status: code: 200 message: OK diff --git a/tests/utilities/cassettes/test_converter_with_llama3_2_model.yaml b/tests/utilities/cassettes/test_converter_with_llama3_2_model.yaml index ae76f7c22..c89f283bd 100644 --- a/tests/utilities/cassettes/test_converter_with_llama3_2_model.yaml +++ b/tests/utilities/cassettes/test_converter_with_llama3_2_model.yaml @@ -21,114 +21,16 @@ interactions: uri: http://localhost:11434/api/generate response: body: - string: '{"model":"llama3.2:3b","created_at":"2025-02-18T21:35:26.651835Z","response":"{\n \"name\": - \"Alice Llama\", \n \"age\": 30","done":true,"done_reason":"stop","context":[128006,9125,128007,271,38766,1303,33025,2696,25,6790,220,2366,18,271,128009,128006,882,128007,271,14711,744,512,5618,5625,279,2768,1495,1139,2764,4823,382,5207,27785,279,2764,4823,323,4400,775,382,791,4823,2011,1833,420,3645,7041,512,517,220,330,609,794,610,345,220,330,425,794,528,198,633,14711,2724,512,678,25,30505,445,81101,11,13381,25,220,966,271,128009,128006,78191,128007,271,517,220,330,609,794,330,62786,445,81101,498,720,220,330,425,794,220,966],"total_duration":2277785459,"load_duration":819153792,"prompt_eval_count":82,"prompt_eval_duration":1153000000,"eval_count":18,"eval_duration":303000000}' + string: '{"model":"llama3.2:3b","created_at":"2025-02-18T21:42:01.162632Z","response":"{\"name\": + \"Alice Llama\", \"age\": 30}","done":true,"done_reason":"stop","context":[128006,9125,128007,271,38766,1303,33025,2696,25,6790,220,2366,18,271,128009,128006,882,128007,271,14711,744,512,5618,5625,279,2768,1495,1139,2764,4823,382,5207,27785,279,2764,4823,323,4400,775,382,791,4823,2011,1833,420,3645,7041,512,517,220,330,609,794,610,345,220,330,425,794,528,198,633,14711,2724,512,678,25,30505,445,81101,11,13381,25,220,966,271,128009,128006,78191,128007,271,5018,609,794,330,62786,445,81101,498,330,425,794,220,966,92],"total_duration":2600669292,"load_duration":1073102084,"prompt_eval_count":82,"prompt_eval_duration":1272000000,"eval_count":15,"eval_duration":250000000}' headers: Content-Length: - - '780' + - '762' Content-Type: - application/json; charset=utf-8 Date: - - Tue, 18 Feb 2025 21:35:26 GMT + - Tue, 18 Feb 2025 21:42:01 GMT status: code: 200 message: OK -- request: - body: '{"name": "ollama/llama3.2:3b"}' - headers: - accept: - - '*/*' - accept-encoding: - - gzip, deflate - connection: - - keep-alive - content-length: - - '30' - content-type: - - application/json - host: - - localhost:11434 - user-agent: - - litellm/1.50.1 - method: POST - uri: http://localhost:11434/api/show - response: - body: - string: '{"error":"model ''ollama/llama3.2:3b'' not found"}' - headers: - Content-Length: - - '48' - Content-Type: - - application/json; charset=utf-8 - Date: - - Tue, 18 Feb 2025 21:35:26 GMT - status: - code: 404 - message: Not Found -- request: - body: '{"model": "llama3.2:3b", "prompt": "### System:\nPlease convert the following - text into valid JSON.\n\nOutput ONLY the valid JSON and nothing else.\n\nThe - JSON must follow this format exactly:\n{\n \"name\": str,\n \"age\": int\n}\n\n### - User:\nName: Alice Llama, Age: 30\n\n", "options": {"stop": []}, "stream": false}' - headers: - Accept: - - '*/*' - Accept-Encoding: - - gzip, deflate - Connection: - - keep-alive - Content-Length: - - '321' - Content-Type: - - application/json - User-Agent: - - python-requests/2.32.2 - method: POST - uri: http://localhost:11434/api/generate - response: - body: - string: '{"model":"llama3.2:3b","created_at":"2025-02-18T21:35:27.275264Z","response":"{\"name\": - \"Alice Llama\", \"age\": 30}","done":true,"done_reason":"stop","context":[128006,9125,128007,271,38766,1303,33025,2696,25,6790,220,2366,18,271,128009,128006,882,128007,271,14711,744,512,5618,5625,279,2768,1495,1139,2764,4823,382,5207,27785,279,2764,4823,323,4400,775,382,791,4823,2011,1833,420,3645,7041,512,517,220,330,609,794,610,345,220,330,425,794,528,198,633,14711,2724,512,678,25,30505,445,81101,11,13381,25,220,966,271,128009,128006,78191,128007,271,5018,609,794,330,62786,445,81101,498,330,425,794,220,966,92],"total_duration":284212459,"load_duration":13514542,"prompt_eval_count":82,"prompt_eval_duration":23000000,"eval_count":15,"eval_duration":246000000}' - headers: - Content-Length: - - '757' - Content-Type: - - application/json; charset=utf-8 - Date: - - Tue, 18 Feb 2025 21:35:27 GMT - status: - code: 200 - message: OK -- request: - body: '{"name": "ollama/llama3.2:3b"}' - headers: - accept: - - '*/*' - accept-encoding: - - gzip, deflate - connection: - - keep-alive - content-length: - - '30' - content-type: - - application/json - host: - - localhost:11434 - user-agent: - - litellm/1.50.1 - method: POST - uri: http://localhost:11434/api/show - response: - body: - string: '{"error":"model ''ollama/llama3.2:3b'' not found"}' - headers: - Content-Length: - - '48' - Content-Type: - - application/json; charset=utf-8 - Date: - - Tue, 18 Feb 2025 21:35:27 GMT - status: - code: 404 - message: Not Found version: 1 diff --git a/tests/utilities/test_converter.py b/tests/utilities/test_converter.py index fc497f2cd..90760c4cb 100644 --- a/tests/utilities/test_converter.py +++ b/tests/utilities/test_converter.py @@ -349,7 +349,7 @@ def test_convert_with_instructions(): assert output.age == 30 -@pytest.mark.vcr(filter_headers=["authorization"]) +@pytest.mark.vcr(filter_headers=["authorization"], record_mode="new_episodes") def test_converter_with_llama3_2_model(): llm = LLM(model="ollama/llama3.2:3b", base_url="http://localhost:11434") @@ -370,7 +370,7 @@ def test_converter_with_llama3_2_model(): assert output.age == 30 -@pytest.mark.vcr(filter_headers=["authorization"]) +@pytest.mark.vcr(filter_headers=["authorization"], record_mode="new_episodes") def test_converter_with_llama3_1_model(): llm = LLM(model="ollama/llama3.1", base_url="http://localhost:11434") sample_text = "Name: Alice Llama, Age: 30"