Merge branch 'brynn/update-examples-to-openai-1x' into brynn/test-ope…

…nai-1x
microsoft · Nov 29, 2023 · 7290cee · 7290cee
2 parents b42ed6f + a04ed9f
commit 7290cee
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/examples/flows/standard/basic-with-connection/hello.py b/examples/flows/standard/basic-with-connection/hello.py
@@ -21,18 +21,19 @@ def get_client(connection: Union[CustomConnection, AzureOpenAIConnection]):
         )
 
     # connection can be extract as a dict object contains the configs and secrets
-    if isinstance(connection, CustomConnection):
-        connection_dict = dict(connection)
+    connection_dict = dict(connection)
+    api_key = connection_dict.get("api_key")
+    conn = dict(
+        api_key=api_key,
+    )
+    if api_key.startswith("sk-"):
         from openai import OpenAI as Client
-    elif isinstance(connection, AzureOpenAIConnection):
-        from openai import AzureOpenAI as Client
-        connection_dict = {
-            "azure_endpoint": connection.api_base,
-            "api_key": connection.api_key,
-            "api_version": connection.api_version,
-        }
     else:
-        raise ValueError(f"Unsupported connection type {type(connection)}")
+        from openai import AzureOpenAI as Client
+        conn.update(
+            azure_endpoint=connection_dict.get("api_base"),
+            api_version=connection_dict.get("api_version", "2023-07-01-preview"),
+        )
     return Client(**connection_dict)
 
 

diff --git a/examples/flows/standard/gen-docstring/azure_open_ai.py b/examples/flows/standard/gen-docstring/azure_open_ai.py
@@ -19,7 +19,7 @@ def __init__(self, **kwargs):
                 "using the command: pip install --upgrade openai."
             )
         init_params = {}
-        api_type = os.environ.get("OPENAI_API_TYPE")
+        api_type = os.environ.get("API_TYPE")
         if os.getenv("OPENAI_API_VERSION") is not None:
             init_params["api_version"] = os.environ.get("OPENAI_API_VERSION")
         if os.getenv("OPENAI_ORG_ID") is not None: