Skip to content

Commit 3cabbc8

Browse files
pamelafoxpamelafox
committed
Clearer client
1 parent 61baa10 commit 3cabbc8

File tree

6 files changed

+16
-21
lines changed

6 files changed

+16
-21
lines changed

‎examples/agentframework_basic.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
if API_HOST == "azure":
1616
async_credential = DefaultAzureCredential()
1717
token_provider = get_bearer_token_provider(async_credential, "https://cognitiveservices.azure.com/.default")
18-
client = OpenAIChatClient(base_url=os.environ["AZURE_OPENAI_ENDPOINT"] + "/openai/v1/", api_key=token_provider, model_id=os.environ["AZURE_OPENAI_CHAT_DEPLOYMENT"])
18+
client = OpenAIChatClient(base_url=f"{os.environ['AZURE_OPENAI_ENDPOINT']}/openai/v1/", api_key=token_provider, model_id=os.environ["AZURE_OPENAI_CHAT_DEPLOYMENT"])
1919
elif API_HOST == "github":
2020
client = OpenAIChatClient(base_url="https://models.github.ai/inference", api_key=os.environ["GITHUB_TOKEN"], model_id=os.getenv("GITHUB_MODEL", "openai/gpt-4o"))
2121
elif API_HOST == "ollama":

‎examples/agentframework_magenticone.py‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,14 @@
2727
async_credential = None
2828
if API_HOST == "azure":
2929
async_credential = DefaultAzureCredential()
30-
client = OpenAIChatClient(
31-
base_url=os.environ.get("AZURE_OPENAI_ENDPOINT") + "/openai/v1/", api_key=get_bearer_token_provider(async_credential, "https://cognitiveservices.azure.com/.default"), model_id=os.environ.get("AZURE_OPENAI_CHAT_DEPLOYMENT")
32-
)
30+
token_provider = get_bearer_token_provider(async_credential, "https://cognitiveservices.azure.com/.default")
31+
client = OpenAIChatClient(base_url=f"{os.environ['AZURE_OPENAI_ENDPOINT']}/openai/v1/", api_key=token_provider, model_id=os.environ["AZURE_OPENAI_CHAT_DEPLOYMENT"])
3332
elif API_HOST == "github":
3433
client = OpenAIChatClient(base_url="https://models.github.ai/inference", api_key=os.environ["GITHUB_TOKEN"], model_id=os.getenv("GITHUB_MODEL", "openai/gpt-4o"))
3534
elif API_HOST == "ollama":
3635
client = OpenAIChatClient(base_url=os.environ.get("OLLAMA_ENDPOINT", "http://localhost:11434/v1"), api_key="none", model_id=os.environ.get("OLLAMA_MODEL", "llama3.1:latest"))
3736
else:
38-
client = OpenAIChatClient(api_key=os.environ.get("OPENAI_API_KEY"), model_id=os.environ.get("OPENAI_MODEL", "gpt-4o"))
37+
client = OpenAIChatClient(api_key=os.environ["OPENAI_API_KEY"], model_id=os.environ.get("OPENAI_MODEL", "gpt-4o"))
3938

4039
# Initialize rich console
4140
console = Console()

‎examples/agentframework_supervisor.py‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,14 @@
2626
async_credential = None
2727
if API_HOST == "azure":
2828
async_credential = DefaultAzureCredential()
29-
client = OpenAIChatClient(
30-
base_url=os.environ.get("AZURE_OPENAI_ENDPOINT") + "/openai/v1/", api_key=get_bearer_token_provider(async_credential, "https://cognitiveservices.azure.com/.default"), model_id=os.environ.get("AZURE_OPENAI_CHAT_DEPLOYMENT")
31-
)
29+
token_provider = get_bearer_token_provider(async_credential, "https://cognitiveservices.azure.com/.default")
30+
client = OpenAIChatClient(base_url=f"{os.environ['AZURE_OPENAI_ENDPOINT']}/openai/v1/", api_key=token_provider, model_id=os.environ["AZURE_OPENAI_CHAT_DEPLOYMENT"])
3231
elif API_HOST == "github":
3332
client = OpenAIChatClient(base_url="https://models.github.ai/inference", api_key=os.environ["GITHUB_TOKEN"], model_id=os.getenv("GITHUB_MODEL", "openai/gpt-4o"))
3433
elif API_HOST == "ollama":
3534
client = OpenAIChatClient(base_url=os.environ.get("OLLAMA_ENDPOINT", "http://localhost:11434/v1"), api_key="none", model_id=os.environ.get("OLLAMA_MODEL", "llama3.1:latest"))
3635
else:
37-
client = OpenAIChatClient(api_key=os.environ.get("OPENAI_API_KEY"), model_id=os.environ.get("OPENAI_MODEL", "gpt-4o"))
36+
client = OpenAIChatClient(api_key=os.environ["OPENAI_API_KEY"], model_id=os.environ.get("OPENAI_MODEL", "gpt-4o"))
3837

3938
# ----------------------------------------------------------------------------------
4039
# Sub-agent 1 tools: weekend planning

‎examples/agentframework_tool.py‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,14 @@
2525
async_credential = None
2626
if API_HOST == "azure":
2727
async_credential = DefaultAzureCredential()
28-
client = OpenAIChatClient(
29-
base_url=os.environ.get("AZURE_OPENAI_ENDPOINT") + "/openai/v1/", api_key=get_bearer_token_provider(async_credential, "https://cognitiveservices.azure.com/.default"), model_id=os.environ.get("AZURE_OPENAI_CHAT_DEPLOYMENT")
30-
)
28+
token_provider = get_bearer_token_provider(async_credential, "https://cognitiveservices.azure.com/.default")
29+
client = OpenAIChatClient(base_url=f"{os.environ['AZURE_OPENAI_ENDPOINT']}/openai/v1/", api_key=token_provider, model_id=os.environ["AZURE_OPENAI_CHAT_DEPLOYMENT"])
3130
elif API_HOST == "github":
3231
client = OpenAIChatClient(base_url="https://models.github.ai/inference", api_key=os.environ["GITHUB_TOKEN"], model_id=os.getenv("GITHUB_MODEL", "openai/gpt-4o"))
3332
elif API_HOST == "ollama":
3433
client = OpenAIChatClient(base_url=os.environ.get("OLLAMA_ENDPOINT", "http://localhost:11434/v1"), api_key="none", model_id=os.environ.get("OLLAMA_MODEL", "llama3.1:latest"))
3534
else:
36-
client = OpenAIChatClient(api_key=os.environ.get("OPENAI_API_KEY"), model_id=os.environ.get("OPENAI_MODEL", "gpt-4o"))
35+
client = OpenAIChatClient(api_key=os.environ["OPENAI_API_KEY"], model_id=os.environ.get("OPENAI_MODEL", "gpt-4o"))
3736

3837

3938
def get_weather(

‎examples/agentframework_tools.py‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,14 @@
2626
async_credential = None
2727
if API_HOST == "azure":
2828
async_credential = DefaultAzureCredential()
29-
client = OpenAIChatClient(
30-
base_url=os.environ.get("AZURE_OPENAI_ENDPOINT") + "/openai/v1/", api_key=get_bearer_token_provider(async_credential, "https://cognitiveservices.azure.com/.default"), model_id=os.environ.get("AZURE_OPENAI_CHAT_DEPLOYMENT")
31-
)
29+
token_provider = get_bearer_token_provider(async_credential, "https://cognitiveservices.azure.com/.default")
30+
client = OpenAIChatClient(base_url=f"{os.environ['AZURE_OPENAI_ENDPOINT']}/openai/v1/", api_key=token_provider, model_id=os.environ["AZURE_OPENAI_CHAT_DEPLOYMENT"])
3231
elif API_HOST == "github":
3332
client = OpenAIChatClient(base_url="https://models.github.ai/inference", api_key=os.environ["GITHUB_TOKEN"], model_id=os.getenv("GITHUB_MODEL", "openai/gpt-4o"))
3433
elif API_HOST == "ollama":
3534
client = OpenAIChatClient(base_url=os.environ.get("OLLAMA_ENDPOINT", "http://localhost:11434/v1"), api_key="none", model_id=os.environ.get("OLLAMA_MODEL", "llama3.1:latest"))
3635
else:
37-
client = OpenAIChatClient(api_key=os.environ.get("OPENAI_API_KEY"), model_id=os.environ.get("OPENAI_MODEL", "gpt-4o"))
36+
client = OpenAIChatClient(api_key=os.environ["OPENAI_API_KEY"], model_id=os.environ.get("OPENAI_MODEL", "gpt-4o"))
3837

3938

4039
def get_weather(

‎examples/agentframework_workflow.py‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,14 @@
1414

1515
if API_HOST == "azure":
1616
async_credential = DefaultAzureCredential()
17-
client = OpenAIChatClient(
18-
base_url=os.environ.get("AZURE_OPENAI_ENDPOINT") + "/openai/v1/", api_key=get_bearer_token_provider(async_credential, "https://cognitiveservices.azure.com/.default"), model_id=os.environ.get("AZURE_OPENAI_CHAT_DEPLOYMENT")
19-
)
17+
token_provider = get_bearer_token_provider(async_credential, "https://cognitiveservices.azure.com/.default")
18+
client = OpenAIChatClient(base_url=f"{os.environ['AZURE_OPENAI_ENDPOINT']}/openai/v1/", api_key=token_provider, model_id=os.environ["AZURE_OPENAI_CHAT_DEPLOYMENT"])
2019
elif API_HOST == "github":
2120
client = OpenAIChatClient(base_url="https://models.github.ai/inference", api_key=os.environ["GITHUB_TOKEN"], model_id=os.getenv("GITHUB_MODEL", "openai/gpt-4o"))
2221
elif API_HOST == "ollama":
2322
client = OpenAIChatClient(base_url=os.environ.get("OLLAMA_ENDPOINT", "http://localhost:11434/v1"), api_key="none", model_id=os.environ.get("OLLAMA_MODEL", "llama3.1:latest"))
2423
else:
25-
client = OpenAIChatClient(api_key=os.environ.get("OPENAI_API_KEY"), model_id=os.environ.get("OPENAI_MODEL", "gpt-4o"))
24+
client = OpenAIChatClient(api_key=os.environ["OPENAI_API_KEY"], model_id=os.environ.get("OPENAI_MODEL", "gpt-4o"))
2625

2726

2827
# Define structured output for review results

0 commit comments

Comments
 (0)