issue #56 Refactor and enhance provider selection strategies

Refactored `ChatGPTIPAProvider.cpp` for better readability by reformatting the addition of the "Content-Type: application/json" header. Updated `main.cpp` to include new header files `LanguageMatchingProviderSelectionStrategy.h` and `ProviderSelectionStrategyList.h`. Modified the `main` function to use a `ProviderSelectionStrategyList` for more flexible provider selection, incorporating both `LanguageMatchingProviderSelectionStrategy` and `ModalityMatchingProviderSelectionStrategy`.
w3c · Oct 1, 2024 · 1459df0 · 1459df0
1 parent d9d706a
commit 1459df0
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/...ovider/src/w3c/voiceinteraction/ipa/reference/external/ipa/chatgpt/ChatGPTIPAProvider.cpp b/...ovider/src/w3c/voiceinteraction/ipa/reference/external/ipa/chatgpt/ChatGPTIPAProvider.cpp
@@ -85,7 +85,8 @@ const std::shared_ptr<ExternalClientResponse> ChatGPTIPAProvider::processInput(
     struct curl_slist *headers = NULL;
     headers = curl_slist_append(headers,
                                 "Authorization: Bearer OPENAI-DEVELOPER-KEY");
-    headers = curl_slist_append(headers, "Content-Type: application/json");
+                                headers = curl_slist_append(
+                                    headers, "Content-Type: application/json");
     curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headers);
 
     // TODO Remove this disabling of SSL verification

diff --git a/source/w3cipa/w3cipademo/src/main.cpp b/source/w3cipa/w3cipademo/src/main.cpp
@@ -18,7 +18,9 @@
 #include <log4cplus/loggingmacros.h>
 
 #include <w3c/voiceinteraction/ipa/client/ModalityManager.h>
+#include <w3c/voiceinteraction/ipa/external/ipa/LanguageMatchingProviderSelectionStrategy.h>
 #include <w3c/voiceinteraction/ipa/external/ipa/ModalityMatchingProviderSelectionStrategy.h>
+#include <w3c/voiceinteraction/ipa/external/ipa/ProviderSelectionStrategyList.h>
 #include <w3c/voiceinteraction/ipa/external/ipa/ProviderRegistry.h>
 #include <w3c/voiceinteraction/ipa/external/ProviderSelectionService.h>
 #include <w3c/voiceinteraction/ipa/reference/client/ConsoleTextModalityComponent.h>
@@ -59,8 +61,17 @@ int main() {
         std::make_shared<::reference::dialog::ReferenceIPADialogManager>();
 
     // External IPA / Services Layer
-    std::shared_ptr<::external::ipa::ModalityMatchingProviderSelectionStrategy> providerSelectionStrategy =
+    std::shared_ptr<::external::ipa::ProviderSelectionStrategyList>
+        providerSelectionStrategy =
+            std::make_shared<::external::ipa::ProviderSelectionStrategyList>();
+    std::shared_ptr<::external::ipa::LanguageMatchingProviderSelectionStrategy>
+        languageProviderSelectionStrategy = std::make_shared<
+            ::external::ipa::LanguageMatchingProviderSelectionStrategy>();
+    providerSelectionStrategy->addStrategy(languageProviderSelectionStrategy);
+    std::shared_ptr<::external::ipa::ModalityMatchingProviderSelectionStrategy>
+        modalityProviderSelectionStrategy =
         std::make_shared<::external::ipa::ModalityMatchingProviderSelectionStrategy>();
+    providerSelectionStrategy->addStrategy(modalityProviderSelectionStrategy);
     std::shared_ptr<ProviderRegistry> registry =
         std::make_shared<ProviderRegistry>(providerSelectionStrategy);
     std::shared_ptr<IPAProvider> chatGPT =