get ollama working

tests/test_ollama_inference.py

@@ -9,6 +9,7 @@ from llama_models.llama3_1.api.datatypes import (
     SamplingParams,
     SamplingStrategy,
     SystemMessage,
+    ToolResponseMessage,
 )
 from llama_toolchain.inference.api.datatypes import (
     ChatCompletionResponseEventType,
@@ -21,14 +22,10 @@ from llama_toolchain.inference.ollama.ollama import get_provider_impl
 class OllamaInferenceTests(unittest.IsolatedAsyncioTestCase):
 
     async def asyncSetUp(self):
-        self.valid_supported_model = "Meta-Llama3.1-8B-Instruct"
-        ollama_config = OllamaImplConfig(
-            model="llama3.1:8b-instruct-fp16",
-            url="http://localhost:11434",
-        )
+        ollama_config = OllamaImplConfig(url="http://localhost:11434")
 
         # setup ollama
-        self.api = await get_provider_impl(ollama_config)
+        self.api = await get_provider_impl(ollama_config, {})
         await self.api.initialize()
 
         current_date = datetime.now()
@@ -245,7 +242,6 @@ class OllamaInferenceTests(unittest.IsolatedAsyncioTestCase):
         iterator = self.api.chat_completion(request)
         events = []
         async for chunk in iterator:
-            # print(f"{chunk.event.event_type:<40} | {str(chunk.event.stop_reason):<26} | {chunk.event.delta} ")
             events.append(chunk.event)
 
         self.assertEqual(events[0].event_type, ChatCompletionResponseEventType.start)
@@ -253,6 +249,12 @@ class OllamaInferenceTests(unittest.IsolatedAsyncioTestCase):
         self.assertEqual(
             events[-1].event_type, ChatCompletionResponseEventType.complete
         )
+        # last but one event should be eom with tool call
+        self.assertEqual(
+            events[-2].event_type, ChatCompletionResponseEventType.progress
+        )
+        self.assertEqual(events[-2].stop_reason, StopReason.end_of_message)
+        self.assertEqual(events[-2].delta.content.tool_name, BuiltinTool.brave_search)
 
     async def test_custom_tool_call_streaming(self):
         request = ChatCompletionRequest(
@@ -317,3 +319,62 @@ class OllamaInferenceTests(unittest.IsolatedAsyncioTestCase):
                 "top_p": 0.99,
             },
         )
+
+    async def test_multi_turn(self):
+        request = ChatCompletionRequest(
+            model=self.valid_supported_model,
+            messages=[
+                self.system_prompt,
+                UserMessage(
+                    content="Search the web and tell me who the "
+                    "44th president of the United States was",
+                ),
+                ToolResponseMessage(
+                    call_id="1",
+                    tool_name=BuiltinTool.brave_search,
+                    content='{"query": "44th president of the United States", "top_k": [{"title": "Barack Obama | The White House", "url": "https://www.whitehouse.gov/about-the-white-house/presidents/barack-obama/", "description": "<strong>Barack Obama</strong> served as the 44th President of the United States. His story is the American story \\u2014 values from the heartland, a middle-class upbringing in a strong family, hard work and education as the means of getting ahead, and the conviction that a life so blessed should be lived in service ...", "type": "search_result"}, {"title": "Barack Obama \\u2013 The White House", "url": "https://trumpwhitehouse.archives.gov/about-the-white-house/presidents/barack-obama/", "description": "After working his way through college with the help of scholarships and student loans, <strong>President Obama</strong> moved to Chicago, where he worked with a group of churches to help rebuild communities devastated by the closure of local steel plants.", "type": "search_result"}, [{"type": "video_result", "url": "https://www.instagram.com/reel/CzMZbJmObn9/", "title": "Fifteen years ago, on Nov. 4, Barack Obama was elected as ...", "description": ""}, {"type": "video_result", "url": "https://video.alexanderstreet.com/watch/the-44th-president-barack-obama?context=channel:barack-obama", "title": "The 44th President (Barack Obama) - Alexander Street, a ...", "description": "You need to enable JavaScript to run this app"}, {"type": "video_result", "url": "https://www.youtube.com/watch?v=iyL7_2-em5k", "title": "Barack Obama for Kids | Learn about the life and contributions ...", "description": "Enjoy the videos and music you love, upload original content, and share it all with friends, family, and the world on YouTube."}, {"type": "video_result", "url": "https://www.britannica.com/video/172743/overview-Barack-Obama", "title": "President of the United States of America Barack Obama | Britannica", "description": "[NARRATOR] Barack Obama was elected the 44th president of the United States in 2008, becoming the first African American to hold the office. Obama vowed to bring change to the political system."}, {"type": "video_result", "url": "https://www.youtube.com/watch?v=rvr2g8-5dcE", "title": "The 44th President: In His Own Words - Toughest Day | Special ...", "description": "President Obama reflects on his toughest day in the Presidency and seeing Secret Service cry for the first time. Watch the premiere of The 44th President: In..."}]]}',
+                ),
+            ],
+            stream=True,
+        )
+        iterator = self.api.chat_completion(request)
+
+        events = []
+        async for chunk in iterator:
+            events.append(chunk.event)
+
+        response = ""
+        for e in events[1:-1]:
+            response += e.delta
+
+        self.assertTrue("obama" in response.lower())
+
+    async def test_tool_call_code_streaming(self):
+        request = ChatCompletionRequest(
+            model=self.valid_supported_model,
+            messages=[
+                self.system_prompt,
+                UserMessage(
+                    content="Write code to answer this question: What is the 100th prime number?",
+                ),
+            ],
+            stream=True,
+        )
+        iterator = self.api.chat_completion(request)
+        events = []
+        async for chunk in iterator:
+            events.append(chunk.event)
+
+        self.assertEqual(events[0].event_type, ChatCompletionResponseEventType.start)
+        # last event is of type "complete"
+        self.assertEqual(
+            events[-1].event_type, ChatCompletionResponseEventType.complete
+        )
+        # last but one event should be eom with tool call
+        self.assertEqual(
+            events[-2].event_type, ChatCompletionResponseEventType.progress
+        )
+        self.assertEqual(events[-2].stop_reason, StopReason.end_of_message)
+        self.assertEqual(
+            events[-2].delta.content.tool_name, BuiltinTool.code_interpreter
+        )