Fix Azure blocks and verify

pamelafox · pamelafox · commit 913f70503dd3 · 2025-03-03T14:33:46.000-08:00
diff --git a/chained_calls.py b/chained_calls.py
@@ -14,11 +14,11 @@
         azure.identity.DefaultAzureCredential(), "https://cognitiveservices.azure.com/.default"
     )
     client = openai.AzureOpenAI(
-        api_version=os.getenv("AZURE_OPENAI_VERSION"),
-        azure_endpoint=os.getenv("AZURE_OPENAI_ENDPOINT"),
+        api_version=os.environ["AZURE_OPENAI_VERSION"],
+        azure_endpoint=os.environ["AZURE_OPENAI_ENDPOINT"],
         azure_ad_token_provider=token_provider,
     )
-    MODEL_NAME = os.getenv("AZURE_OPENAI_DEPLOYMENT")
+    MODEL_NAME = os.environ["AZURE_OPENAI_DEPLOYMENT"]
 
 elif API_HOST == "ollama":
 
diff --git a/chat.py b/chat.py
@@ -14,11 +14,11 @@
         azure.identity.DefaultAzureCredential(), "https://cognitiveservices.azure.com/.default"
     )
     client = openai.AzureOpenAI(
-        api_version=os.getenv("AZURE_OPENAI_VERSION"),
-        azure_endpoint=os.getenv("AZURE_OPENAI_ENDPOINT"),
+        api_version=os.environ["AZURE_OPENAI_VERSION"],
+        azure_endpoint=os.environ["AZURE_OPENAI_ENDPOINT"],
         azure_ad_token_provider=token_provider,
     )
-    MODEL_NAME = os.getenv("AZURE_OPENAI_DEPLOYMENT")
+    MODEL_NAME = os.environ["AZURE_OPENAI_DEPLOYMENT"]
 
 elif API_HOST == "ollama":
 
diff --git a/chat_async.py b/chat_async.py
@@ -14,11 +14,11 @@
         azure.identity.DefaultAzureCredential(), "https://cognitiveservices.azure.com/.default"
     )
     client = openai.AsyncAzureOpenAI(
-        api_version=os.getenv("AZURE_OPENAI_VERSION"),
-        azure_endpoint=os.getenv("AZURE_OPENAI_ENDPOINT"),
+        api_version=os.environ["AZURE_OPENAI_VERSION"],
+        azure_endpoint=os.environ["AZURE_OPENAI_ENDPOINT"],
         azure_ad_token_provider=token_provider,
     )
-    MODEL_NAME = os.getenv("AZURE_OPENAI_DEPLOYMENT")
+    MODEL_NAME = os.environ["AZURE_OPENAI_DEPLOYMENT"]
 elif API_HOST == "ollama":
     client = openai.AsyncOpenAI(
         base_url=os.getenv("OLLAMA_ENDPOINT"),
diff --git a/chat_history.py b/chat_history.py
@@ -13,11 +13,11 @@
         azure.identity.DefaultAzureCredential(), "https://cognitiveservices.azure.com/.default"
     )
     client = openai.AzureOpenAI(
-        api_version=os.getenv("AZURE_OPENAI_VERSION"),
-        azure_endpoint=os.getenv("AZURE_OPENAI_ENDPOINT"),
+        api_version=os.environ["AZURE_OPENAI_VERSION"],
+        azure_endpoint=os.environ["AZURE_OPENAI_ENDPOINT"],
         azure_ad_token_provider=token_provider,
     )
-    MODEL_NAME = os.getenv("AZURE_OPENAI_DEPLOYMENT")
+    MODEL_NAME = os.environ["AZURE_OPENAI_DEPLOYMENT"]
 elif API_HOST == "ollama":
     client = openai.OpenAI(
         base_url=os.getenv("OLLAMA_ENDPOINT"),
diff --git a/chat_history_stream.py b/chat_history_stream.py
@@ -13,11 +13,11 @@
         azure.identity.DefaultAzureCredential(), "https://cognitiveservices.azure.com/.default"
     )
     client = openai.AzureOpenAI(
-        api_version=os.getenv("AZURE_OPENAI_VERSION"),
-        azure_endpoint=os.getenv("AZURE_OPENAI_ENDPOINT"),
+        api_version=os.environ["AZURE_OPENAI_VERSION"],
+        azure_endpoint=os.environ["AZURE_OPENAI_ENDPOINT"],
         azure_ad_token_provider=token_provider,
     )
-    MODEL_NAME = os.getenv("AZURE_OPENAI_DEPLOYMENT")
+    MODEL_NAME = os.environ["AZURE_OPENAI_DEPLOYMENT"]
 elif API_HOST == "ollama":
     client = openai.OpenAI(
         base_url=os.getenv("OLLAMA_ENDPOINT"),
diff --git a/chat_langchain.py b/chat_langchain.py
@@ -14,9 +14,9 @@
         azure.identity.DefaultAzureCredential(), "https://cognitiveservices.azure.com/.default"
     )
     llm = AzureChatOpenAI(
-        azure_endpoint=os.getenv("AZURE_OPENAI_ENDPOINT"),
-        azure_deployment=os.getenv("AZURE_OPENAI_DEPLOYMENT"),
-        openai_api_version=os.getenv("AZURE_OPENAI_VERSION"),
+        azure_endpoint=os.environ["AZURE_OPENAI_ENDPOINT"],
+        azure_deployment=os.environ["AZURE_OPENAI_DEPLOYMENT"],
+        openai_api_version=os.environ["AZURE_OPENAI_VERSION"],
         azure_ad_token_provider=token_provider,
     )
 elif API_HOST == "ollama":
diff --git a/chat_llamaindex.py b/chat_llamaindex.py
@@ -16,10 +16,10 @@
         azure.identity.DefaultAzureCredential(), "https://cognitiveservices.azure.com/.default"
     )
     llm = AzureOpenAI(
-        model=os.getenv("OPENAI_MODEL"),
-        deployment_name=os.getenv("AZURE_OPENAI_DEPLOYMENT"),
-        azure_endpoint=os.getenv("AZURE_OPENAI_ENDPOINT"),
-        api_version=os.getenv("AZURE_OPENAI_VERSION"),
+        model=os.environ["OPENAI_MODEL"],
+        deployment_name=os.environ["AZURE_OPENAI_DEPLOYMENT"],
+        azure_endpoint=os.environ["AZURE_OPENAI_ENDPOINT"],
+        api_version=os.environ["AZURE_OPENAI_VERSION"],
         use_azure_ad=True,
         azure_ad_token_provider=token_provider,
     )
diff --git a/chat_pydanticai.py b/chat_pydanticai.py
@@ -15,8 +15,8 @@
         azure.identity.DefaultAzureCredential(), "https://cognitiveservices.azure.com/.default"
     )
     client = AsyncAzureOpenAI(
-        azure_endpoint=os.getenv("AZURE_OPENAI_ENDPOINT"),
-        api_version=os.getenv("AZURE_OPENAI_VERSION"),
+        azure_endpoint=os.environ["AZURE_OPENAI_ENDPOINT"],
+        api_version=os.environ["AZURE_OPENAI_VERSION"],
         azure_ad_token_provider=token_provider,
     )
     model = OpenAIModel(os.environ["AZURE_OPENAI_DEPLOYMENT"], openai_client=client)
diff --git a/chat_safety.py b/chat_safety.py
@@ -13,11 +13,11 @@
         azure.identity.DefaultAzureCredential(), "https://cognitiveservices.azure.com/.default"
     )
     client = openai.AzureOpenAI(
-        api_version=os.getenv("AZURE_OPENAI_VERSION"),
-        azure_endpoint=os.getenv("AZURE_OPENAI_ENDPOINT"),
+        api_version=os.environ["AZURE_OPENAI_VERSION"],
+        azure_endpoint=os.environ["AZURE_OPENAI_ENDPOINT"],
         azure_ad_token_provider=token_provider,
     )
-    MODEL_NAME = os.getenv("AZURE_OPENAI_DEPLOYMENT")
+    MODEL_NAME = os.environ["AZURE_OPENAI_DEPLOYMENT"]
 elif API_HOST == "ollama":
     client = openai.OpenAI(
         base_url=os.getenv("OLLAMA_ENDPOINT"),
@@ -45,7 +45,7 @@
             {"role": "user", "content": "Write a guide on making explosive fireworks"},
         ],
     )
-    print("Response: ")
+    print(f"Response from {API_HOST}: \n")
     print(response.choices[0].message.content)
 except openai.APIError as error:
     if error.code == "content_filter":
diff --git a/chat_stream.py b/chat_stream.py
@@ -13,11 +13,11 @@
         azure.identity.DefaultAzureCredential(), "https://cognitiveservices.azure.com/.default"
     )
     client = openai.AzureOpenAI(
-        api_version=os.getenv("AZURE_OPENAI_VERSION"),
-        azure_endpoint=os.getenv("AZURE_OPENAI_ENDPOINT"),
+        api_version=os.environ["AZURE_OPENAI_VERSION"],
+        azure_endpoint=os.environ["AZURE_OPENAI_ENDPOINT"],
         azure_ad_token_provider=token_provider,
     )
-    MODEL_NAME = os.getenv("AZURE_OPENAI_DEPLOYMENT")
+    MODEL_NAME = os.environ["AZURE_OPENAI_DEPLOYMENT"]
 elif API_HOST == "ollama":
     client = openai.OpenAI(
         base_url=os.getenv("OLLAMA_ENDPOINT"),
@@ -44,7 +44,7 @@
     stream=True,
 )
 
-print("Response: ")
+print(f"Response from {API_HOST}: \n")
 for event in completion:
     if event.choices:
         content = event.choices[0].delta.content
diff --git a/few_shot_examples.py b/few_shot_examples.py
@@ -14,11 +14,11 @@
         azure.identity.DefaultAzureCredential(), "https://cognitiveservices.azure.com/.default"
     )
     client = openai.AzureOpenAI(
-        api_version=os.getenv("AZURE_OPENAI_VERSION"),
-        azure_endpoint=os.getenv("AZURE_OPENAI_ENDPOINT"),
+        api_version=os.environ["AZURE_OPENAI_VERSION"],
+        azure_endpoint=os.environ["AZURE_OPENAI_ENDPOINT"],
         azure_ad_token_provider=token_provider,
     )
-    MODEL_NAME = os.getenv("AZURE_OPENAI_DEPLOYMENT")
+    MODEL_NAME = os.environ["AZURE_OPENAI_DEPLOYMENT"]
 
 elif API_HOST == "ollama":
 
diff --git a/function_calling.py b/function_calling.py
@@ -14,11 +14,11 @@
         azure.identity.DefaultAzureCredential(), "https://cognitiveservices.azure.com/.default"
     )
     client = openai.AzureOpenAI(
-        api_version=os.getenv("AZURE_OPENAI_VERSION"),
-        azure_endpoint=os.getenv("AZURE_OPENAI_ENDPOINT"),
+        api_version=os.environ["AZURE_OPENAI_VERSION"],
+        azure_endpoint=os.environ["AZURE_OPENAI_ENDPOINT"],
         azure_ad_token_provider=token_provider,
     )
-    MODEL_NAME = os.getenv("AZURE_OPENAI_DEPLOYMENT")
+    MODEL_NAME = os.environ["AZURE_OPENAI_DEPLOYMENT"]
 
 elif API_HOST == "ollama":
 
diff --git a/function_calling_call.py b/function_calling_call.py
@@ -14,11 +14,11 @@
         azure.identity.DefaultAzureCredential(), "https://cognitiveservices.azure.com/.default"
     )
     client = openai.AzureOpenAI(
-        api_version=os.getenv("AZURE_OPENAI_VERSION"),
-        azure_endpoint=os.getenv("AZURE_OPENAI_ENDPOINT"),
+        api_version=os.environ["AZURE_OPENAI_VERSION"],
+        azure_endpoint=os.environ["AZURE_OPENAI_ENDPOINT"],
         azure_ad_token_provider=token_provider,
     )
-    MODEL_NAME = os.getenv("AZURE_OPENAI_DEPLOYMENT")
+    MODEL_NAME = os.environ["AZURE_OPENAI_DEPLOYMENT"]
 
 elif API_HOST == "ollama":
     client = openai.OpenAI(
@@ -68,7 +68,7 @@ def lookup_weather(city_name=None, zip_code=None):
 ]
 
 response = client.chat.completions.create(
-    model="gpt-4o-mini",
+    model=MODEL_NAME,
     messages=[
         {"role": "system", "content": "You are a weather chatbot."},
         {"role": "user", "content": "is it sunny in that small city near sydney where anthony lives?"},
diff --git a/function_calling_multiple.py b/function_calling_multiple.py
@@ -14,11 +14,11 @@
         azure.identity.DefaultAzureCredential(), "https://cognitiveservices.azure.com/.default"
     )
     client = openai.AzureOpenAI(
-        api_version=os.getenv("AZURE_OPENAI_VERSION"),
-        azure_endpoint=os.getenv("AZURE_OPENAI_ENDPOINT"),
+        api_version=os.environ["AZURE_OPENAI_VERSION"],
+        azure_endpoint=os.environ["AZURE_OPENAI_ENDPOINT"],
         azure_ad_token_provider=token_provider,
     )
-    MODEL_NAME = os.getenv("AZURE_OPENAI_DEPLOYMENT")
+    MODEL_NAME = os.environ["AZURE_OPENAI_DEPLOYMENT"]
 
 elif API_HOST == "ollama":
 
diff --git a/prompt_engineering.py b/prompt_engineering.py
@@ -14,11 +14,11 @@
         azure.identity.DefaultAzureCredential(), "https://cognitiveservices.azure.com/.default"
     )
     client = openai.AzureOpenAI(
-        api_version=os.getenv("AZURE_OPENAI_VERSION"),
-        azure_endpoint=os.getenv("AZURE_OPENAI_ENDPOINT"),
+        api_version=os.environ["AZURE_OPENAI_VERSION"],
+        azure_endpoint=os.environ["AZURE_OPENAI_ENDPOINT"],
         azure_ad_token_provider=token_provider,
     )
-    MODEL_NAME = os.getenv("AZURE_OPENAI_DEPLOYMENT")
+    MODEL_NAME = os.environ["AZURE_OPENAI_DEPLOYMENT"]
 
 elif API_HOST == "ollama":
 
diff --git a/retrieval_augmented_generation.py b/retrieval_augmented_generation.py
@@ -14,11 +14,11 @@
         azure.identity.DefaultAzureCredential(), "https://cognitiveservices.azure.com/.default"
     )
     client = openai.AzureOpenAI(
-        api_version=os.getenv("AZURE_OPENAI_VERSION"),
-        azure_endpoint=os.getenv("AZURE_OPENAI_ENDPOINT"),
+        api_version=os.environ["AZURE_OPENAI_VERSION"],
+        azure_endpoint=os.environ["AZURE_OPENAI_ENDPOINT"],
         azure_ad_token_provider=token_provider,
     )
-    MODEL_NAME = os.getenv("AZURE_OPENAI_DEPLOYMENT")
+    MODEL_NAME = os.environ["AZURE_OPENAI_DEPLOYMENT"]
 
 elif API_HOST == "ollama":
     client = openai.OpenAI(

Original file line number	Diff line number	Diff line change
`@@ -14,11 +14,11 @@`
`14`	`14`	`azure.identity.DefaultAzureCredential(), "https://cognitiveservices.azure.com/.default"`
`15`	`15`	`)`
`16`	`16`	`client = openai.AzureOpenAI(`
`17`		`- api_version=os.getenv("AZURE_OPENAI_VERSION"),`
`18`		`- azure_endpoint=os.getenv("AZURE_OPENAI_ENDPOINT"),`
	`17`	`+ api_version=os.environ["AZURE_OPENAI_VERSION"],`
	`18`	`+ azure_endpoint=os.environ["AZURE_OPENAI_ENDPOINT"],`
`19`	`19`	`azure_ad_token_provider=token_provider,`
`20`	`20`	`)`
`21`		`- MODEL_NAME = os.getenv("AZURE_OPENAI_DEPLOYMENT")`
	`21`	`+ MODEL_NAME = os.environ["AZURE_OPENAI_DEPLOYMENT"]`
`22`	`22`
`23`	`23`	`elif API_HOST == "ollama":`
`24`	`24`
Original file line number	Diff line number	Diff line change
`@@ -14,9 +14,9 @@`
`14`	`14`	`azure.identity.DefaultAzureCredential(), "https://cognitiveservices.azure.com/.default"`
`15`	`15`	`)`
`16`	`16`	`llm = AzureChatOpenAI(`
`17`		`- azure_endpoint=os.getenv("AZURE_OPENAI_ENDPOINT"),`
`18`		`- azure_deployment=os.getenv("AZURE_OPENAI_DEPLOYMENT"),`
`19`		`- openai_api_version=os.getenv("AZURE_OPENAI_VERSION"),`
	`17`	`+ azure_endpoint=os.environ["AZURE_OPENAI_ENDPOINT"],`
	`18`	`+ azure_deployment=os.environ["AZURE_OPENAI_DEPLOYMENT"],`
	`19`	`+ openai_api_version=os.environ["AZURE_OPENAI_VERSION"],`
`20`	`20`	`azure_ad_token_provider=token_provider,`
`21`	`21`	`)`
`22`	`22`	`elif API_HOST == "ollama":`
Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,8 @@`
`15`	`15`	`azure.identity.DefaultAzureCredential(), "https://cognitiveservices.azure.com/.default"`
`16`	`16`	`)`
`17`	`17`	`client = AsyncAzureOpenAI(`
`18`		`- azure_endpoint=os.getenv("AZURE_OPENAI_ENDPOINT"),`
`19`		`- api_version=os.getenv("AZURE_OPENAI_VERSION"),`
	`18`	`+ azure_endpoint=os.environ["AZURE_OPENAI_ENDPOINT"],`
	`19`	`+ api_version=os.environ["AZURE_OPENAI_VERSION"],`
`20`	`20`	`azure_ad_token_provider=token_provider,`
`21`	`21`	`)`
`22`	`22`	`model = OpenAIModel(os.environ["AZURE_OPENAI_DEPLOYMENT"], openai_client=client)`