Merge pull request #2 from Azure-Samples/streamchanges

pamelafox · web-flow · commit b7022327eb9a · 2024-12-03T08:49:45.000-08:00
Pre-stream changes
diff --git a/README.md b/README.md
@@ -155,6 +155,8 @@ To run the samples, you'll either need to have already [deployed the Azure OpenA
 
     | Script filename       | Description                                                                 |
     |---------------------------|-----------------------------------------------------------------------------|
+    | `basic_azure.py`          | A basic example that uses deployed Azure OpenAI resource to extract from string input. |
+    | `basic_githubmodels.py`         | A basic example that uses free gpt-4o from GitHub Models  to extract from string input. |
     | `extract_github_issue.py` | Fetches a public issue using the GitHub API, and then extracts details.     |
     | `extract_github_repo.py`  | Fetches a public README using the GitHub API, and then extracts details.    |
     | `extract_image_graph.py`  | Parses a local image of a graph and extracts details like title, axis, legend. |
diff --git a/basic_azure.py b/basic_azure.py
@@ -0,0 +1,42 @@
+import logging
+import os
+
+import rich
+from azure.identity import AzureDeveloperCliCredential, get_bearer_token_provider
+from dotenv import load_dotenv
+from openai import AzureOpenAI
+from pydantic import BaseModel
+
+logging.basicConfig(level=logging.WARNING)
+load_dotenv()
+
+token_provider = get_bearer_token_provider(
+    AzureDeveloperCliCredential(tenant_id=os.getenv("AZURE_TENANT_ID")), "https://cognitiveservices.azure.com/.default"
+)
+
+client = AzureOpenAI(
+    azure_endpoint=f"https://{os.getenv('AZURE_OPENAI_SERVICE')}.openai.azure.com",
+    azure_ad_token_provider=token_provider,
+    api_version="2024-10-21",
+)
+
+
+class CalendarEvent(BaseModel):
+    name: str
+    date: str
+    participants: list[str]
+
+
+completion = client.beta.chat.completions.parse(
+    model=os.getenv("AZURE_OPENAI_GPT_DEPLOYMENT"),
+    messages=[
+        {"role": "system", "content": "Extract the event information."},
+        {"role": "user", "content": "Alice and Bob are going to a science fair on Friday."},
+    ],
+    response_format=CalendarEvent,
+)
+
+output = completion.choices[0].message.parsed
+event = CalendarEvent.model_validate(output)
+
+rich.print(event)
diff --git a/basic_githubmodels.py b/basic_githubmodels.py
@@ -0,0 +1,34 @@
+import os
+
+import rich
+from openai import OpenAI
+from pydantic import BaseModel
+
+client = OpenAI(
+    base_url="https://models.inference.ai.azure.com",
+    api_key=os.environ["GITHUB_TOKEN"],
+    # Specify the API version to use the Structured Outputs feature
+    default_query={"api-version": "2024-08-01-preview"},
+)
+model_name = "gpt-4o"
+
+
+class CalendarEvent(BaseModel):
+    name: str
+    date: str
+    participants: list[str]
+
+
+completion = client.beta.chat.completions.parse(
+    model=os.getenv("AZURE_OPENAI_GPT_DEPLOYMENT"),
+    messages=[
+        {"role": "system", "content": "Extract the event information."},
+        {"role": "user", "content": "Alice and Bob are going to a science fair on Friday."},
+    ],
+    response_format=CalendarEvent,
+)
+
+output = completion.choices[0].message.parsed
+event = CalendarEvent.model_validate(output)
+
+rich.print(event)
diff --git a/extract_github_issue.py b/extract_github_issue.py
@@ -18,7 +18,9 @@
         logging.warning("AZURE_OPENAI_SERVICE and AZURE_OPENAI_GPT_DEPLOYMENT env variables are empty. See README.")
         exit(1)
     credential = azure.identity.AzureDeveloperCliCredential(tenant_id=os.getenv("AZURE_TENANT_ID"))
-    token_provider = azure.identity.get_bearer_token_provider(credential, "https://cognitiveservices.azure.com/.default")
+    token_provider = azure.identity.get_bearer_token_provider(
+        credential, "https://cognitiveservices.azure.com/.default"
+    )
     client = openai.AzureOpenAI(
         api_version="2024-08-01-preview",
         azure_endpoint=f"https://{os.getenv('AZURE_OPENAI_SERVICE')}.openai.azure.com",
@@ -33,7 +35,8 @@
         base_url="https://models.inference.ai.azure.com",
         api_key=os.environ["GITHUB_TOKEN"],
         # Specify the API version to use the Structured Outputs feature
-        default_query={"api-version": "2024-08-01-preview"})
+        default_query={"api-version": "2024-08-01-preview"},
+    )
     model_name = "gpt-4o"
 
 
diff --git a/extract_github_repo.py b/extract_github_repo.py
@@ -18,7 +18,9 @@
         logging.warning("AZURE_OPENAI_SERVICE and AZURE_OPENAI_GPT_DEPLOYMENT env variables are empty. See README.")
         exit(1)
     credential = azure.identity.AzureDeveloperCliCredential(tenant_id=os.getenv("AZURE_TENANT_ID"))
-    token_provider = azure.identity.get_bearer_token_provider(credential, "https://cognitiveservices.azure.com/.default")
+    token_provider = azure.identity.get_bearer_token_provider(
+        credential, "https://cognitiveservices.azure.com/.default"
+    )
     client = openai.AzureOpenAI(
         api_version="2024-08-01-preview",
         azure_endpoint=f"https://{os.getenv('AZURE_OPENAI_SERVICE')}.openai.azure.com",
@@ -33,7 +35,8 @@
         base_url="https://models.inference.ai.azure.com",
         api_key=os.environ["GITHUB_TOKEN"],
         # Specify the API version to use the Structured Outputs feature
-        default_query={"api-version": "2024-08-01-preview"})
+        default_query={"api-version": "2024-08-01-preview"},
+    )
     model_name = "gpt-4o"
 
 
diff --git a/extract_image_graph.py b/extract_image_graph.py
@@ -16,7 +16,9 @@
         logging.warning("AZURE_OPENAI_SERVICE and AZURE_OPENAI_GPT_DEPLOYMENT env variables are empty. See README.")
         exit(1)
     credential = azure.identity.AzureDeveloperCliCredential(tenant_id=os.getenv("AZURE_TENANT_ID"))
-    token_provider = azure.identity.get_bearer_token_provider(credential, "https://cognitiveservices.azure.com/.default")
+    token_provider = azure.identity.get_bearer_token_provider(
+        credential, "https://cognitiveservices.azure.com/.default"
+    )
     client = openai.AzureOpenAI(
         api_version="2024-08-01-preview",
         azure_endpoint=f"https://{os.getenv('AZURE_OPENAI_SERVICE')}.openai.azure.com",
@@ -31,7 +33,8 @@
         base_url="https://models.inference.ai.azure.com",
         api_key=os.environ["GITHUB_TOKEN"],
         # Specify the API version to use the Structured Outputs feature
-        default_query={"api-version": "2024-08-01-preview"})
+        default_query={"api-version": "2024-08-01-preview"},
+    )
     model_name = "gpt-4o"
 
 
diff --git a/extract_image_table.py b/extract_image_table.py
@@ -16,7 +16,9 @@
         logging.warning("AZURE_OPENAI_SERVICE and AZURE_OPENAI_GPT_DEPLOYMENT env variables are empty. See README.")
         exit(1)
     credential = azure.identity.AzureDeveloperCliCredential(tenant_id=os.getenv("AZURE_TENANT_ID"))
-    token_provider = azure.identity.get_bearer_token_provider(credential, "https://cognitiveservices.azure.com/.default")
+    token_provider = azure.identity.get_bearer_token_provider(
+        credential, "https://cognitiveservices.azure.com/.default"
+    )
     client = openai.AzureOpenAI(
         api_version="2024-08-01-preview",
         azure_endpoint=f"https://{os.getenv('AZURE_OPENAI_SERVICE')}.openai.azure.com",
@@ -31,7 +33,8 @@
         base_url="https://models.inference.ai.azure.com",
         api_key=os.environ["GITHUB_TOKEN"],
         # Specify the API version to use the Structured Outputs feature
-        default_query={"api-version": "2024-08-01-preview"})
+        default_query={"api-version": "2024-08-01-preview"},
+    )
     model_name = "gpt-4o"
 
 
diff --git a/extract_pdf_receipt.py b/extract_pdf_receipt.py
@@ -16,7 +16,9 @@
         logging.warning("AZURE_OPENAI_SERVICE and AZURE_OPENAI_GPT_DEPLOYMENT env variables are empty. See README.")
         exit(1)
     credential = azure.identity.AzureDeveloperCliCredential(tenant_id=os.getenv("AZURE_TENANT_ID"))
-    token_provider = azure.identity.get_bearer_token_provider(credential, "https://cognitiveservices.azure.com/.default")
+    token_provider = azure.identity.get_bearer_token_provider(
+        credential, "https://cognitiveservices.azure.com/.default"
+    )
     client = openai.AzureOpenAI(
         api_version="2024-08-01-preview",
         azure_endpoint=f"https://{os.getenv('AZURE_OPENAI_SERVICE')}.openai.azure.com",
@@ -31,7 +33,8 @@
         base_url="https://models.inference.ai.azure.com",
         api_key=os.environ["GITHUB_TOKEN"],
         # Specify the API version to use the Structured Outputs feature
-        default_query={"api-version": "2024-08-01-preview"})
+        default_query={"api-version": "2024-08-01-preview"},
+    )
     model_name = "gpt-4o"
 
 
diff --git a/extract_webpage.py b/extract_webpage.py
@@ -17,7 +17,9 @@
         logging.warning("AZURE_OPENAI_SERVICE and AZURE_OPENAI_GPT_DEPLOYMENT env variables are empty. See README.")
         exit(1)
     credential = azure.identity.AzureDeveloperCliCredential(tenant_id=os.getenv("AZURE_TENANT_ID"))
-    token_provider = azure.identity.get_bearer_token_provider(credential, "https://cognitiveservices.azure.com/.default")
+    token_provider = azure.identity.get_bearer_token_provider(
+        credential, "https://cognitiveservices.azure.com/.default"
+    )
     client = openai.AzureOpenAI(
         api_version="2024-08-01-preview",
         azure_endpoint=f"https://{os.getenv('AZURE_OPENAI_SERVICE')}.openai.azure.com",
@@ -32,9 +34,11 @@
         base_url="https://models.inference.ai.azure.com",
         api_key=os.environ["GITHUB_TOKEN"],
         # Specify the API version to use the Structured Outputs feature
-        default_query={"api-version": "2024-08-01-preview"})
+        default_query={"api-version": "2024-08-01-preview"},
+    )
     model_name = "gpt-4o"
 
+
 # Define models for Structured Outputs
 class BlogPost(BaseModel):
     title: str
diff --git a/http/.env.azure b/http/.env.azure
@@ -1,3 +1,3 @@
 AZURE_OPENAI_SERVICE=
 AZURE_OPENAI_GPT_DEPLOYMENT=
-AZURE_OPENAI_TOKEN=
+AZURE_OPENAI_TOKEN=
diff --git a/http/.env.github b/http/.env.github
@@ -1,2 +1,2 @@
 # In Codespaces, you can find this value in the env variables. Otherwise, generate a new Personal Access Token in GitHub.
-GITHUB_TOKEN=
+GITHUB_TOKEN=
diff --git a/http/azure_openai.http b/http/azure_openai.http
@@ -37,4 +37,4 @@ Content-Type: application/json
             }
         }
     }
-}
+}
diff --git a/http/github_models.http b/http/github_models.http
@@ -38,4 +38,4 @@ Content-Type: application/json
             }
         }
     }
-}
+}
diff --git a/http/write_env_azure.py b/http/write_env_azure.py
@@ -9,16 +9,23 @@
 # Get a token from Azure
 token_provider = azure.identity.get_bearer_token_provider(
     azure.identity.AzureDeveloperCliCredential(tenant_id=os.getenv("AZURE_TENANT_ID")),
-    "https://cognitiveservices.azure.com/.default"
+    "https://cognitiveservices.azure.com/.default",
 )
 token = token_provider()
 
 # Path to the .env file in the current directory
 env_path = Path(__file__).parent / ".env"
 
-# Write the new .env
+# Write the new .env, replacing the existing Azure OpenAI lines
+with open(env_path) as f:
+    existing_lines = f.readlines()
+
+existing_lines = [line for line in existing_lines if not line.startswith("AZURE_OPENAI")]
+
 with open(env_path, "w") as f:
     f.write("")
+    for line in existing_lines:
+        f.write(line)
     f.write(f"AZURE_OPENAI_SERVICE={os.getenv('AZURE_OPENAI_SERVICE')}\n")
     f.write(f"AZURE_OPENAI_GPT_DEPLOYMENT={os.getenv('AZURE_OPENAI_GPT_DEPLOYMENT')}\n")
     f.write(f"AZURE_OPENAI_TOKEN={token}\n")
diff --git a/infra/write_dot_env.ps1 b/infra/write_dot_env.ps1
@@ -8,4 +8,4 @@ $azureTenantId = azd env get-value AZURE_TENANT_ID
 
 Add-Content -Path .env -Value "AZURE_OPENAI_GPT_DEPLOYMENT=$azureOpenAiDeployment"
 Add-Content -Path .env -Value "AZURE_OPENAI_SERVICE=$azureOpenAiService"
-Add-Content -Path .env -Value "AZURE_TENANT_ID=$azureTenantId"
+Add-Content -Path .env -Value "AZURE_TENANT_ID=$azureTenantId"
diff --git a/infra/write_dot_env.sh b/infra/write_dot_env.sh
@@ -6,4 +6,4 @@
 # Append new values to the .env file
 echo "AZURE_OPENAI_GPT_DEPLOYMENT=$(azd env get-value AZURE_OPENAI_GPT_DEPLOYMENT)" >> .env
 echo "AZURE_OPENAI_SERVICE=$(azd env get-value AZURE_OPENAI_SERVICE)" >> .env
-echo "AZURE_TENANT_ID=$(azd env get-value AZURE_TENANT_ID)" >> .env
+echo "AZURE_TENANT_ID=$(azd env get-value AZURE_TENANT_ID)" >> .env
diff --git a/requirements.txt b/requirements.txt
@@ -6,4 +6,4 @@ rich
 beautifulsoup4
 pymupdf4llm
 azure-ai-inference
-dotenv-azd
+dotenv-azd
