Test Ollama

pamelafox · pamelafox · commit c9bebd92471a · 2025-03-03T14:58:14.000-08:00
diff --git a/chained_calls.py b/chained_calls.py
@@ -22,11 +22,8 @@
 
 elif API_HOST == "ollama":
 
-    client = openai.OpenAI(
-        base_url=os.getenv("OLLAMA_ENDPOINT"),
-        api_key="nokeyneeded",
-    )
-    MODEL_NAME = os.getenv("OLLAMA_MODEL")
+    client = openai.OpenAI(base_url=os.environ["OLLAMA_ENDPOINT"], api_key="nokeyneeded")
+    MODEL_NAME = os.environ["OLLAMA_MODEL"]
 
 elif API_HOST == "github":
 
diff --git a/chat.py b/chat.py
@@ -22,11 +22,8 @@
 
 elif API_HOST == "ollama":
 
-    client = openai.OpenAI(
-        base_url=os.getenv("OLLAMA_ENDPOINT"),
-        api_key="nokeyneeded",
-    )
-    MODEL_NAME = os.getenv("OLLAMA_MODEL")
+    client = openai.OpenAI(base_url=os.environ["OLLAMA_ENDPOINT"], api_key="nokeyneeded")
+    MODEL_NAME = os.environ["OLLAMA_MODEL"]
 
 elif API_HOST == "github":
 
@@ -49,5 +46,5 @@
     ],
 )
 
-print("Response: ")
+print(f"Response from {API_HOST}: \n")
 print(response.choices[0].message.content)
diff --git a/chat_async.py b/chat_async.py
@@ -20,11 +20,8 @@
     )
     MODEL_NAME = os.environ["AZURE_OPENAI_DEPLOYMENT"]
 elif API_HOST == "ollama":
-    client = openai.AsyncOpenAI(
-        base_url=os.getenv("OLLAMA_ENDPOINT"),
-        api_key="nokeyneeded",
-    )
-    MODEL_NAME = os.getenv("OLLAMA_MODEL")
+    client = openai.AsyncOpenAI(base_url=os.environ["OLLAMA_ENDPOINT"], api_key="nokeyneeded")
+    MODEL_NAME = os.environ["OLLAMA_MODEL"]
 elif API_HOST == "github":
     client = openai.AsyncOpenAI(base_url="https://models.inference.ai.azure.com", api_key=os.environ["GITHUB_TOKEN"])
     MODEL_NAME = os.environ["GITHUB_MODEL"]
diff --git a/chat_history.py b/chat_history.py
@@ -19,11 +19,8 @@
     )
     MODEL_NAME = os.environ["AZURE_OPENAI_DEPLOYMENT"]
 elif API_HOST == "ollama":
-    client = openai.OpenAI(
-        base_url=os.getenv("OLLAMA_ENDPOINT"),
-        api_key="nokeyneeded",
-    )
-    MODEL_NAME = os.getenv("OLLAMA_MODEL")
+    client = openai.OpenAI(base_url=os.environ["OLLAMA_ENDPOINT"], api_key="nokeyneeded")
+    MODEL_NAME = os.environ["OLLAMA_MODEL"]
 elif API_HOST == "github":
     client = openai.OpenAI(base_url="https://models.inference.ai.azure.com", api_key=os.environ["GITHUB_TOKEN"])
     MODEL_NAME = os.environ["GITHUB_MODEL"]
diff --git a/chat_history_stream.py b/chat_history_stream.py
@@ -19,11 +19,8 @@
     )
     MODEL_NAME = os.environ["AZURE_OPENAI_DEPLOYMENT"]
 elif API_HOST == "ollama":
-    client = openai.OpenAI(
-        base_url=os.getenv("OLLAMA_ENDPOINT"),
-        api_key="nokeyneeded",
-    )
-    MODEL_NAME = os.getenv("OLLAMA_MODEL")
+    client = openai.OpenAI(base_url=os.environ["OLLAMA_ENDPOINT"], api_key="nokeyneeded")
+    MODEL_NAME = os.environ["OLLAMA_MODEL"]
 elif API_HOST == "github":
     client = openai.OpenAI(base_url="https://models.inference.ai.azure.com", api_key=os.environ["GITHUB_TOKEN"])
     MODEL_NAME = os.environ["GITHUB_MODEL"]
diff --git a/chat_langchain.py b/chat_langchain.py
@@ -21,9 +21,9 @@
     )
 elif API_HOST == "ollama":
     llm = ChatOpenAI(
-        model_name=os.getenv("OLLAMA_MODEL"),
-        openai_api_base=os.getenv("OLLAMA_ENDPOINT"),
-        openai_api_key=os.getenv("OPENAI_KEY"),
+        model_name=os.environ["OLLAMA_MODEL"],
+        openai_api_base=os.environ["OLLAMA_ENDPOINT"],
+        openai_api_key=os.environ["OPENAI_KEY"],
     )
 elif API_HOST == "github":
     llm = ChatOpenAI(
diff --git a/chat_llamaindex.py b/chat_llamaindex.py
@@ -25,7 +25,7 @@
     )
 elif API_HOST == "ollama":
     llm = OpenAILike(
-        model=os.getenv("OLLAMA_MODEL"), api_base=os.getenv("OLLAMA_ENDPOINT"), api_key="fake", is_chat_model=True
+        model=os.environ["OLLAMA_MODEL"], api_base=os.environ["OLLAMA_ENDPOINT"], api_key="fake", is_chat_model=True
     )
 elif API_HOST == "github":
     llm = OpenAILike(
diff --git a/chat_safety.py b/chat_safety.py
@@ -19,11 +19,8 @@
     )
     MODEL_NAME = os.environ["AZURE_OPENAI_DEPLOYMENT"]
 elif API_HOST == "ollama":
-    client = openai.OpenAI(
-        base_url=os.getenv("OLLAMA_ENDPOINT"),
-        api_key="nokeyneeded",
-    )
-    MODEL_NAME = os.getenv("OLLAMA_MODEL")
+    client = openai.OpenAI(base_url=os.environ["OLLAMA_ENDPOINT"], api_key="nokeyneeded")
+    MODEL_NAME = os.environ["OLLAMA_MODEL"]
 elif API_HOST == "github":
     client = openai.OpenAI(base_url="https://models.inference.ai.azure.com", api_key=os.environ["GITHUB_TOKEN"])
     MODEL_NAME = os.environ["GITHUB_MODEL"]
diff --git a/chat_stream.py b/chat_stream.py
@@ -19,11 +19,8 @@
     )
     MODEL_NAME = os.environ["AZURE_OPENAI_DEPLOYMENT"]
 elif API_HOST == "ollama":
-    client = openai.OpenAI(
-        base_url=os.getenv("OLLAMA_ENDPOINT"),
-        api_key="nokeyneeded",
-    )
-    MODEL_NAME = os.getenv("OLLAMA_MODEL")
+    client = openai.OpenAI(base_url=os.environ["OLLAMA_ENDPOINT"], api_key="nokeyneeded")
+    MODEL_NAME = os.environ["OLLAMA_MODEL"]
 elif API_HOST == "github":
     client = openai.OpenAI(base_url="https://models.inference.ai.azure.com", api_key=os.environ["GITHUB_TOKEN"])
     MODEL_NAME = os.environ["GITHUB_MODEL"]
diff --git a/few_shot_examples.py b/few_shot_examples.py
@@ -22,11 +22,8 @@
 
 elif API_HOST == "ollama":
 
-    client = openai.OpenAI(
-        base_url=os.getenv("OLLAMA_ENDPOINT"),
-        api_key="nokeyneeded",
-    )
-    MODEL_NAME = os.getenv("OLLAMA_MODEL")
+    client = openai.OpenAI(base_url=os.environ["OLLAMA_ENDPOINT"], api_key="nokeyneeded")
+    MODEL_NAME = os.environ["OLLAMA_MODEL"]
 
 elif API_HOST == "github":
 
@@ -65,5 +62,5 @@
 )
 
 
-print("Response:")
+print(f"Response from {API_HOST}: \n")
 print(response.choices[0].message.content)
diff --git a/function_calling.py b/function_calling.py
@@ -22,11 +22,8 @@
 
 elif API_HOST == "ollama":
 
-    client = openai.OpenAI(
-        base_url=os.getenv("OLLAMA_ENDPOINT"),
-        api_key="nokeyneeded",
-    )
-    MODEL_NAME = os.getenv("OLLAMA_MODEL")
+    client = openai.OpenAI(base_url=os.environ["OLLAMA_ENDPOINT"], api_key="nokeyneeded")
+    MODEL_NAME = os.environ["OLLAMA_MODEL"]
 
 elif API_HOST == "github":
 
@@ -72,6 +69,6 @@
     tools=tools,
 )
 
-print("Response:")
+print(f"Response from {API_HOST}: \n")
 print(response.choices[0].message.tool_calls[0].function.name)
 print(response.choices[0].message.tool_calls[0].function.arguments)
diff --git a/function_calling_call.py b/function_calling_call.py
@@ -21,11 +21,8 @@
     MODEL_NAME = os.environ["AZURE_OPENAI_DEPLOYMENT"]
 
 elif API_HOST == "ollama":
-    client = openai.OpenAI(
-        base_url=os.getenv("OLLAMA_ENDPOINT"),
-        api_key="nokeyneeded",
-    )
-    MODEL_NAME = os.getenv("OLLAMA_MODEL")
+    client = openai.OpenAI(base_url=os.environ["OLLAMA_ENDPOINT"], api_key="nokeyneeded")
+    MODEL_NAME = os.environ["OLLAMA_MODEL"]
 
 elif API_HOST == "github":
     client = openai.OpenAI(base_url="https://models.inference.ai.azure.com", api_key=os.environ["GITHUB_TOKEN"])
@@ -77,7 +74,7 @@ def lookup_weather(city_name=None, zip_code=None):
     tool_choice="auto",
 )
 
-print("Response:")
+print(f"Response from {API_HOST}: \n")
 print(response.choices[0].message.tool_calls[0].function.name)
 print(response.choices[0].message.tool_calls[0].function.arguments)
 
diff --git a/function_calling_multiple.py b/function_calling_multiple.py
@@ -22,11 +22,8 @@
 
 elif API_HOST == "ollama":
 
-    client = openai.OpenAI(
-        base_url=os.getenv("OLLAMA_ENDPOINT"),
-        api_key="nokeyneeded",
-    )
-    MODEL_NAME = os.getenv("OLLAMA_MODEL")
+    client = openai.OpenAI(base_url=os.environ["OLLAMA_ENDPOINT"], api_key="nokeyneeded")
+    MODEL_NAME = os.environ["OLLAMA_MODEL"]
 
 elif API_HOST == "github":
 
@@ -94,7 +91,7 @@
     tool_choice="auto",
 )
 
-print("Response:")
+print(f"Response from {API_HOST}: \n")
 for message in response.choices[0].message.tool_calls:
     print(message.function.name)
     print(message.function.arguments)
diff --git a/prompt_engineering.py b/prompt_engineering.py
@@ -22,11 +22,8 @@
 
 elif API_HOST == "ollama":
 
-    client = openai.OpenAI(
-        base_url=os.getenv("OLLAMA_ENDPOINT"),
-        api_key="nokeyneeded",
-    )
-    MODEL_NAME = os.getenv("OLLAMA_MODEL")
+    client = openai.OpenAI(base_url=os.environ["OLLAMA_ENDPOINT"], api_key="nokeyneeded")
+    MODEL_NAME = os.environ["OLLAMA_MODEL"]
 
 elif API_HOST == "github":
 
@@ -60,5 +57,5 @@
     ],
 )
 
-print("Response:")
+print(f"Response from {API_HOST}: \n")
 print(response.choices[0].message.content)
diff --git a/retrieval_augmented_generation.py b/retrieval_augmented_generation.py
@@ -75,5 +75,5 @@
     ],
 )
 
-print("Response:")
+print(f"Response from {API_HOST}: \n")
 print(response.choices[0].message.content)

Original file line number	Diff line number	Diff line change
`@@ -21,9 +21,9 @@`
`21`	`21`	`)`
`22`	`22`	`elif API_HOST == "ollama":`
`23`	`23`	`llm = ChatOpenAI(`
`24`		`- model_name=os.getenv("OLLAMA_MODEL"),`
`25`		`- openai_api_base=os.getenv("OLLAMA_ENDPOINT"),`
`26`		`- openai_api_key=os.getenv("OPENAI_KEY"),`
	`24`	`+ model_name=os.environ["OLLAMA_MODEL"],`
	`25`	`+ openai_api_base=os.environ["OLLAMA_ENDPOINT"],`
	`26`	`+ openai_api_key=os.environ["OPENAI_KEY"],`
`27`	`27`	`)`
`28`	`28`	`elif API_HOST == "github":`
`29`	`29`	`llm = ChatOpenAI(`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@`
`25`	`25`	`)`
`26`	`26`	`elif API_HOST == "ollama":`
`27`	`27`	`llm = OpenAILike(`
`28`		`- model=os.getenv("OLLAMA_MODEL"), api_base=os.getenv("OLLAMA_ENDPOINT"), api_key="fake", is_chat_model=True`
	`28`	`+ model=os.environ["OLLAMA_MODEL"], api_base=os.environ["OLLAMA_ENDPOINT"], api_key="fake", is_chat_model=True`
`29`	`29`	`)`
`30`	`30`	`elif API_HOST == "github":`
`31`	`31`	`llm = OpenAILike(`