update ui

vouchervision/utils_VoucherVision.py

@@ -98,18 +98,39 @@ class VoucherVision():
         self.logger.info(f'     Model name passed to API --> {self.model_name}')
         self.logger.info(f'     API access token is found in PRIVATE_DATA.yaml --> {self.has_key}')
 
+    # def map_API_options(self):
+    #     self.chat_version = self.cfg['leafmachine']['LLM_version']
+    #     version_mapping = {
+    #         'GPT 4': ('OpenAI GPT 4', False, 'GPT_4', self.has_key_openai),
+    #         'GPT 3.5': ('OpenAI GPT 3.5', False, 'GPT_3_5', self.has_key_openai),
+    #         'Azure GPT 3.5': ('(Azure) OpenAI GPT 3.5', True, 'Azure_GPT_3_5', self.has_key_azure_openai),
+    #         'Azure GPT 4': ('(Azure) OpenAI GPT 4', True, 'Azure_GPT_4', self.has_key_azure_openai),
+    #         'PaLM 2': ('Google PaLM 2', None, None, self.has_key_palm2)
+    #     }
+    #     if self.chat_version not in version_mapping:
+    #         supported_LLMs = ", ".join(version_mapping.keys())
+    #         raise Exception(f"Unsupported LLM: {self.chat_version}. Requires one of: {supported_LLMs}")
+
+    #     self.version_name, self.is_azure, self.model_name, self.has_key = version_mapping[self.chat_version]
     def map_API_options(self):
-        self.chat_version = self.cfg['leafmachine']['LLM_version']
+        self.chat_version = self.cfg['leafmachine']['LLM_version']  # Replace with your env variable for LLM version if needed
+
+        # Assuming you have set your environment variables for each key like 'OPENAI_API_KEY', 'AZURE_API_KEY', 'PALM_API_KEY'
+        openai_api_key = os.getenv('OPENAI_API_KEY')
+        azure_api_key = os.getenv('AZURE_API_KEY')
+        palm_api_key = os.getenv('PALM_API_KEY')
+
         version_mapping = {
-            'GPT 4': ('OpenAI GPT 4', False, 'GPT_4', self.has_key_openai),
-            'GPT 3.5': ('OpenAI GPT 3.5', False, 'GPT_3_5', self.has_key_openai),
-            'Azure GPT 3.5': ('(Azure) OpenAI GPT 3.5', True, 'Azure_GPT_3_5', self.has_key_azure_openai),
-            'Azure GPT 4': ('(Azure) OpenAI GPT 4', True, 'Azure_GPT_4', self.has_key_azure_openai),
-            'PaLM 2': ('Google PaLM 2', None, None, self.has_key_palm2)
+            'GPT 4': ('OpenAI GPT 4', False, 'GPT_4', bool(openai_api_key)),
+            'GPT 3.5': ('OpenAI GPT 3.5', False, 'GPT_3_5', bool(openai_api_key)),
+            'Azure GPT 3.5': ('(Azure) OpenAI GPT 3.5', True, 'Azure_GPT_3_5', bool(azure_api_key)),
+            'Azure GPT 4': ('(Azure) OpenAI GPT 4', True, 'Azure_GPT_4', bool(azure_api_key)),
+            'PaLM 2': ('Google PaLM 2', None, None, bool(palm_api_key))
         }
+
         if self.chat_version not in version_mapping:
-            supported_LLMs = ", ".join(version_mapping.keys())
-            raise Exception(f"Unsupported LLM: {self.chat_version}. Requires one of: {supported_LLMs}")
+            supported_llms = ", ".join(version_mapping.keys())
+            raise Exception(f"Unsupported LLM: {self.chat_version}. Requires one of: {supported_llms}")
 
         self.version_name, self.is_azure, self.model_name, self.has_key = version_mapping[self.chat_version]
 
@@ -367,6 +388,27 @@ class VoucherVision():
         # save the workbook
         wb.save(path_transcription)
 
+    def configure_azure_llm(self):
+        # Access the secrets from the environment
+        azure_api_version = os.getenv('AZURE_API_VERSION')
+        azure_api_key = os.getenv('AZURE_API_KEY')
+        azure_api_base = os.getenv('AZURE_API_BASE')
+        azure_organization = os.getenv('AZURE_ORGANIZATION')
+        azure_api_type = os.getenv('AZURE_API_TYPE')
+        azure_deployment_name = os.getenv('AZURE_DEPLOYMENT_NAME')
+
+        # Check if all required Azure configurations are present
+        if azure_api_version and azure_api_key and azure_api_base and azure_organization and azure_api_type and azure_deployment_name:
+            self.llm = AzureChatOpenAI(
+                deployment_name=azure_deployment_name,
+                openai_api_version=azure_api_version,
+                openai_api_key=azure_api_key,
+                openai_api_base=azure_api_base,
+                openai_organization=azure_organization,
+                openai_api_type=azure_api_type
+            )
+        else:
+            raise ValueError("Missing Azure configuration in environment variables.")
 
     def set_API_keys(self):
         # Access secrets directly from the environment
@@ -391,6 +433,9 @@ class VoucherVision():
             from google.cloud import vision
             self.client = vision.ImageAnnotatorClient(credentials=google_credentials)
 
+        if os.getenv('AZURE_API_KEY') is not None:
+            self.configure_azure_llm()
+
         if self.has_key_palm2:
             os.environ['PALM'] = palm_api_key
             palm.configure(api_key=palm_api_key)