Merge pull request #14 from pamelafox/chainedcalls

pamelafox · web-flow · commit 805cbe7aa3a4 · 2025-03-03T12:13:49.000-08:00
Change os.environ calls
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/chained_calls.py b/chained_calls.py
@@ -35,8 +35,8 @@
 
 else:
 
-    client = openai.OpenAI(api_key=os.getenv("OPENAI_KEY"))
-    MODEL_NAME = os.getenv("OPENAI_MODEL")
+    client = openai.OpenAI(api_key=os.environ["OPENAI_KEY"])
+    MODEL_NAME = os.environ["OPENAI_MODEL"]
 
 
 response = client.chat.completions.create(
diff --git a/chat.py b/chat.py
@@ -30,13 +30,13 @@
 
 elif API_HOST == "github":
 
-    client = openai.OpenAI(base_url="https://models.inference.ai.azure.com", api_key=os.getenv("GITHUB_TOKEN"))
-    MODEL_NAME = os.getenv("GITHUB_MODEL")
+    client = openai.OpenAI(base_url="https://models.inference.ai.azure.com", api_key=os.environ["GITHUB_TOKEN"])
+    MODEL_NAME = os.environ["GITHUB_MODEL"]
 
 else:
 
-    client = openai.OpenAI(api_key=os.getenv("OPENAI_KEY"))
-    MODEL_NAME = os.getenv("OPENAI_MODEL")
+    client = openai.OpenAI(api_key=os.environ["OPENAI_KEY"])
+    MODEL_NAME = os.environ["OPENAI_MODEL"]
 
 
 response = client.chat.completions.create(
diff --git a/chat_async.py b/chat_async.py
@@ -29,8 +29,8 @@
     client = openai.AsyncOpenAI(base_url="https://models.inference.ai.azure.com", api_key=os.getenv("GITHUB_TOKEN"))
     MODEL_NAME = os.getenv("GITHUB_MODEL")
 else:
-    client = openai.AsyncOpenAI(api_key=os.getenv("OPENAI_KEY"))
-    MODEL_NAME = os.getenv("OPENAI_MODEL")
+    client = openai.AsyncOpenAI(api_key=os.environ["OPENAI_KEY"])
+    MODEL_NAME = os.environ["OPENAI_MODEL"]
 
 
 async def generate_response(location):
diff --git a/chat_history.py b/chat_history.py
@@ -28,8 +28,8 @@
     client = openai.OpenAI(base_url="https://models.inference.ai.azure.com", api_key=os.getenv("GITHUB_TOKEN"))
     MODEL_NAME = os.getenv("GITHUB_MODEL")
 else:
-    client = openai.OpenAI(api_key=os.getenv("OPENAI_KEY"))
-    MODEL_NAME = os.getenv("OPENAI_MODEL")
+    client = openai.OpenAI(api_key=os.environ["OPENAI_KEY"])
+    MODEL_NAME = os.environ["OPENAI_MODEL"]
 
 
 messages = [
diff --git a/chat_history_stream.py b/chat_history_stream.py
@@ -28,8 +28,8 @@
     client = openai.OpenAI(base_url="https://models.inference.ai.azure.com", api_key=os.getenv("GITHUB_TOKEN"))
     MODEL_NAME = os.getenv("GITHUB_MODEL")
 else:
-    client = openai.OpenAI(api_key=os.getenv("OPENAI_KEY"))
-    MODEL_NAME = os.getenv("OPENAI_MODEL")
+    client = openai.OpenAI(api_key=os.environ["OPENAI_KEY"])
+    MODEL_NAME = os.environ["OPENAI_MODEL"]
 
 
 messages = [
diff --git a/chat_langchain.py b/chat_langchain.py
@@ -32,7 +32,7 @@
         openai_api_key=os.getenv("GITHUB_TOKEN"),
     )
 else:
-    llm = ChatOpenAI(model_name=os.getenv("OPENAI_MODEL"), openai_api_key=os.getenv("OPENAI_KEY"))
+    llm = ChatOpenAI(model_name=os.environ["OPENAI_MODEL"], openai_api_key=os.environ["OPENAI_KEY"])
 
 
 prompt = ChatPromptTemplate.from_messages(
diff --git a/chat_llamaindex.py b/chat_llamaindex.py
@@ -35,7 +35,7 @@
         is_chat_model=True,
     )
 else:
-    llm = OpenAI(model=os.getenv("OPENAI_MODEL"), api_key=os.getenv("OPENAI_KEY"))
+    llm = OpenAI(model=os.environ["OPENAI_MODEL"], api_key=os.environ["OPENAI_KEY"])
 
 chat_msgs = [
     ChatMessage(
diff --git a/chat_pydanticai.py b/chat_pydanticai.py
@@ -31,9 +31,9 @@
     model = OpenAIModel(os.environ["OPENAI_MODEL"], api_key=os.environ["OPENAI_KEY"])
 
 
-agent = Agent(model, system_prompt="Be concise: 1 sentence only.")
+agent = Agent(model, system_prompt="You are a helpful assistant that makes lots of cat references and uses emojis.")
 
-result = agent.run_sync("Where does 'hello world' come from?")
+result = agent.run_sync("Write a haiku about a hungry cat who wants tuna")
 
 print(f"Response from {API_HOST}: \n")
 print(result.data)
diff --git a/chat_safety.py b/chat_safety.py
@@ -28,8 +28,8 @@
     client = openai.OpenAI(base_url="https://models.inference.ai.azure.com", api_key=os.getenv("GITHUB_TOKEN"))
     MODEL_NAME = os.getenv("GITHUB_MODEL")
 else:
-    client = openai.OpenAI(api_key=os.getenv("OPENAI_KEY"))
-    MODEL_NAME = os.getenv("OPENAI_MODEL")
+    client = openai.OpenAI(api_key=os.environ["OPENAI_KEY"])
+    MODEL_NAME = os.environ["OPENAI_MODEL"]
 
 try:
     response = client.chat.completions.create(
diff --git a/chat_stream.py b/chat_stream.py
@@ -28,8 +28,8 @@
     client = openai.OpenAI(base_url="https://models.inference.ai.azure.com", api_key=os.getenv("GITHUB_TOKEN"))
     MODEL_NAME = os.getenv("GITHUB_MODEL")
 else:
-    client = openai.OpenAI(api_key=os.getenv("OPENAI_KEY"))
-    MODEL_NAME = os.getenv("OPENAI_MODEL")
+    client = openai.OpenAI(api_key=os.environ["OPENAI_KEY"])
+    MODEL_NAME = os.environ["OPENAI_MODEL"]
 
 
 completion = client.chat.completions.create(
diff --git a/few_shot_examples.py b/few_shot_examples.py
@@ -35,8 +35,8 @@
 
 else:
 
-    client = openai.OpenAI(api_key=os.getenv("OPENAI_KEY"))
-    MODEL_NAME = os.getenv("OPENAI_MODEL")
+    client = openai.OpenAI(api_key=os.environ["OPENAI_KEY"])
+    MODEL_NAME = os.environ["OPENAI_MODEL"]
 
 
 SYSTEM_MESSAGE = """
diff --git a/function_calling.py b/function_calling.py
@@ -35,8 +35,8 @@
 
 else:
 
-    client = openai.OpenAI(api_key=os.getenv("OPENAI_KEY"))
-    MODEL_NAME = os.getenv("OPENAI_MODEL")
+    client = openai.OpenAI(api_key=os.environ["OPENAI_KEY"])
+    MODEL_NAME = os.environ["OPENAI_MODEL"]
 
 
 tools = [
diff --git a/function_calling_call.py b/function_calling_call.py
@@ -32,8 +32,8 @@
     MODEL_NAME = os.getenv("GITHUB_MODEL")
 
 else:
-    client = openai.OpenAI(api_key=os.getenv("OPENAI_KEY"))
-    MODEL_NAME = os.getenv("OPENAI_MODEL")
+    client = openai.OpenAI(api_key=os.environ["OPENAI_KEY"])
+    MODEL_NAME = os.environ["OPENAI_MODEL"]
 
 
 def lookup_weather(city_name=None, zip_code=None):
diff --git a/function_calling_multiple.py b/function_calling_multiple.py
@@ -35,8 +35,8 @@
 
 else:
 
-    client = openai.OpenAI(api_key=os.getenv("OPENAI_KEY"))
-    MODEL_NAME = os.getenv("OPENAI_MODEL")
+    client = openai.OpenAI(api_key=os.environ["OPENAI_KEY"])
+    MODEL_NAME = os.environ["OPENAI_MODEL"]
 
 
 tools = [
diff --git a/http/.env.sample b/http/.env.sample
@@ -1,2 +1,3 @@
-AZURE_OPENAI_SERVICE=
-AUTH_TOKEN=
+SERVICE=
+DEPLOYMENT=
+TOKEN=
diff --git a/http/chat_completion_azure.http b/http/chat_completion_azure.http
diff --git a/http/chat_completion_ollama.http b/http/chat_completion_ollama.http
@@ -0,0 +1,10 @@
+POST http://localhost:11434/v1/chat/completions
+Content-Type: application/json
+
+{
+    "model": "phi3.5:latest",
+    "messages": [{"role":"system","content":"You are an AI assistant that answers questions with short clear answers."},
+                 {"role":"user","content":"How fast is the Prius V?"}],
+    "max_tokens": 800,
+    "temperature": 0.7
+}
diff --git a/http/rag_hybrid_azure.http b/http/rag_hybrid_azure.http
diff --git a/prompt_engineering.py b/prompt_engineering.py
@@ -35,19 +35,19 @@
 
 else:
 
-    client = openai.OpenAI(api_key=os.getenv("OPENAI_KEY"))
-    MODEL_NAME = os.getenv("OPENAI_MODEL")
+    client = openai.OpenAI(api_key=os.environ["OPENAI_KEY"])
+    MODEL_NAME = os.environ["OPENAI_MODEL"]
 
 
 SYSTEM_MESSAGE = """
-I want you to act like Elmo from Sesame Street.
-I want you to respond and answer like Elmo using the tone, manner and vocabulary that Elmo would use.
-Do not write any explanations. Only answer like Elmo.
-You must know all of the knowledge of Elmo, and nothing more.
+I want you to act like Yoda from Star Wars.
+I want you to respond and answer like Yoda using the tone, manner and vocabulary that Yoda would use.
+Do not write any explanations. Only answer like Yoda.
+You must know all of the knowledge of Yoda, and nothing more.
 """
 
 USER_MESSAGE = """
-Hi Elmo, how are you doing today?
+What is an LLM?
 """
 
 response = client.chat.completions.create(
diff --git a/requirements.txt b/requirements.txt
@@ -6,3 +6,4 @@ langchain-openai
 llama-index-llms-azure-openai
 llama-index-llms-openai
 llama-index-llms-openai-like
+pydantic-ai
diff --git a/retrieval_augmented_generation.py b/retrieval_augmented_generation.py
@@ -32,8 +32,8 @@
     MODEL_NAME = os.getenv("GITHUB_MODEL")
 
 else:
-    client = openai.OpenAI(api_key=os.getenv("OPENAI_KEY"))
-    MODEL_NAME = os.getenv("OPENAI_MODEL")
+    client = openai.OpenAI(api_key=os.environ["OPENAI_KEY"])
+    MODEL_NAME = os.environ["OPENAI_MODEL"]
 
 
 USER_MESSAGE = "how fast is the prius v?"

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@`
`32`	`32`	`openai_api_key=os.getenv("GITHUB_TOKEN"),`
`33`	`33`	`)`
`34`	`34`	`else:`
`35`		`- llm = ChatOpenAI(model_name=os.getenv("OPENAI_MODEL"), openai_api_key=os.getenv("OPENAI_KEY"))`
	`35`	`+ llm = ChatOpenAI(model_name=os.environ["OPENAI_MODEL"], openai_api_key=os.environ["OPENAI_KEY"])`
`36`	`36`
`37`	`37`
`38`	`38`	`prompt = ChatPromptTemplate.from_messages(`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@`
`35`	`35`	`is_chat_model=True,`
`36`	`36`	`)`
`37`	`37`	`else:`
`38`		`- llm = OpenAI(model=os.getenv("OPENAI_MODEL"), api_key=os.getenv("OPENAI_KEY"))`
	`38`	`+ llm = OpenAI(model=os.environ["OPENAI_MODEL"], api_key=os.environ["OPENAI_KEY"])`
`39`	`39`
`40`	`40`	`chat_msgs = [`
`41`	`41`	`ChatMessage(`