better support for azure openai and chat models

asklar · Aug 18, 2023 · 6f9b808 · 6f9b808
1 parent dd30471
commit 6f9b808
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 8 deletions.
diff --git a/OpenAI.WinRT.nuspec b/OpenAI.WinRT.nuspec
@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>OpenAI.WinRT</id>
-    <version>0.0.15</version>
+    <version>0.0.16</version>
     <title>OpenAI.WinRT</title>
     <authors>Alexander Sklar</authors>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>

diff --git a/OpenAIClient.cpp b/OpenAIClient.cpp
@@ -28,6 +28,20 @@ namespace winrt::OpenAI::implementation
     }
   }
 
+  winrt::OpenAI::OpenAIClient OpenAIClient::CreateAzureOpenAIClient(winrt::Windows::Foundation::Uri const& endpoint, winrt::hstring deployment, winrt::hstring const& apiKey)
+  {
+      auto client = winrt::OpenAI::OpenAIClient();
+      client.UseBearerTokenAuthorization(false);
+      client.ApiKey(apiKey);
+      constexpr std::wstring_view uriTemplate = L"{}/openai/deployments/{}/chat/completions?api-version=2023-03-15-preview";
+
+      auto uri = winrt::Windows::Foundation::Uri{ std::vformat(uriTemplate, std::make_wformat_args(endpoint.AbsoluteUri(), deployment))};
+      client.CompletionUri(uri);
+      client.IsChatModel(true);
+
+      return client;
+  }
+
   void OpenAIClient::ApiKey(winrt::hstring v) noexcept
   {
     m_apiKey = v;
@@ -66,8 +80,8 @@ namespace winrt::OpenAI::implementation
       std::wstring requestJson;
       auto modelString = EscapeStringForJson(request.Model());
       const std::wstring_view model{ modelString };
-      const auto isGpt35Turbo = request.Model() == L"gpt-3.5-turbo";
-      if (isGpt35Turbo) {
+      const auto isChatModel = request.Model() == L"gpt-3.5-turbo" || m_isChatModel;
+      if (isChatModel) {
         constexpr std::wstring_view requestTemplate{ LR"({{ {}
   "messages": [{{ "role": "user", "content": {} }}],
   "temperature": {},
@@ -101,7 +115,7 @@ namespace winrt::OpenAI::implementation
         ));
       }
       auto content = winrt::HttpStringContent(requestJson, winrt::UnicodeEncoding::Utf8, L"application/json");
-      auto uri = isGpt35Turbo && UseBearerTokenAuthorization() ? Windows::Foundation::Uri{gpt35turboEndpoint} : CompletionUri();
+      auto uri = isChatModel && UseBearerTokenAuthorization() ? Windows::Foundation::Uri{gpt35turboEndpoint} : CompletionUri();
       auto response = co_await m_client.PostAsync(uri, content);
       auto responseJsonStr = co_await response.Content().ReadAsStringAsync();
       statusCode = response.StatusCode();
@@ -114,7 +128,7 @@ namespace winrt::OpenAI::implementation
           const auto& choice = c.GetObject();
           auto retChoice = winrt::make<Choice>();
           auto retChoiceImpl = winrt::get_self<Choice>(retChoice);
-          if (!isGpt35Turbo) {
+          if (!isChatModel) {
             retChoiceImpl->m_text = choice.GetNamedString(L"text");
           } else {
             auto msg = choice.GetNamedObject(L"message");
@@ -152,7 +166,7 @@ namespace winrt::OpenAI::implementation
             auto choices = json.GetNamedArray(L"choices");
             auto choice = choices.GetObjectAt(0);
             winrt::hstring text;
-            if (!isGpt35Turbo) {
+            if (!isChatModel) {
               text = choice.GetNamedString(L"text");
             } else {
               auto msg = choice.GetNamedObject(L"message");

diff --git a/OpenAIClient.h b/OpenAIClient.h
@@ -18,9 +18,11 @@ namespace winrt::OpenAI::implementation
         winrt::hstring ApiKey() const noexcept { return m_apiKey; }
         void ApiKey(winrt::hstring v) noexcept;
 
-
+        static winrt::OpenAI::OpenAIClient CreateAzureOpenAIClient(winrt::Windows::Foundation::Uri const& uri, winrt::hstring deployment, winrt::hstring const& apiKey);
         static constexpr std::wstring_view gpt35turboEndpoint = L"https://api.openai.com/v1/chat/completions";
-
+        bool m_isChatModel = false;
+        bool IsChatModel() const noexcept { return m_isChatModel; }
+        void IsChatModel(bool v) noexcept { m_isChatModel = v; }
         winrt::Windows::Foundation::Uri CompletionUri() const noexcept { return m_completionUri; }
         void CompletionUri(winrt::Windows::Foundation::Uri v) noexcept { m_completionUri = v; }
         Windows::Foundation::IAsyncOperation<winrt::Windows::Foundation::Collections::IVector<winrt::OpenAI::Choice>> GetCompletionAsync(winrt::hstring prompt, winrt::hstring model);

diff --git a/OpenAIClient.idl b/OpenAIClient.idl
@@ -35,6 +35,7 @@ namespace OpenAI
     runtimeclass OpenAIClient
     {
         OpenAIClient();
+        static OpenAIClient CreateAzureOpenAIClient(Windows.Foundation.Uri endpoint, String deployment, String apiKey);
         String ApiKey;
         Windows.Foundation.Uri CompletionUri;
 
@@ -50,6 +51,7 @@ namespace OpenAI
         FewShotTemplate CreateFewShotTemplate(Windows.Foundation.Collections.IVectorView<String> parameters);
 
         Windows.Foundation.IAsyncOperation< Windows.Foundation.Collections.IVector<Choice> > GetChatResponseAsync(ChatRequest request);
+        Boolean IsChatModel;
     }
 
     enum Similarity