cwyodmodules 0.3.62__tar.gz → 0.3.64__tar.gz

{cwyodmodules-0.3.62 → cwyodmodules-0.3.64}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cwyodmodules
-Version: 0.3.62
+Version: 0.3.64
 Summary: Add your description here
 Author-email: Patrik <patrikhartl@gmail.com>
 Classifier: Operating System :: OS Independent

{cwyodmodules-0.3.62 → cwyodmodules-0.3.64}/cwyodmodules/batch/utilities/helpers/env_helper.py

@@ -7,7 +7,7 @@ from ..orchestrator.orchestration_strategy import OrchestrationStrategy
 from ..helpers.config.conversation_flow import ConversationFlow
 from ..helpers.config.database_type import DatabaseType
 
-from mgmt_config import logger, local_env_manager, identity, keyvault, head_keyvault
+from mgmt_config import logger, identity, keyvault, head_keyvault
 
 
 
@@ -25,10 +25,17 @@ class EnvHelper:
         
     @logger.trace_function(log_execution=True, log_args=False, log_result=False)
     def __load_config(self, **kwargs) -> None:
-        self.keyvault = keyvault
-        self.head_keyvault = head_keyvault
-        local_env_manager.print_settings()
+
         logger.info("Initializing EnvHelper")
+        logger.info("AZURE_CLIENT_ID: " + os.getenv("AZURE_CLIENT_ID"))
+        logger.info("key_vault_uri: " + os.getenv("key_vault_uri"))
+        logger.info("head_key_vault_uri: " + os.getenv("head_key_vault_uri"))
+        
+        if not keyvault:
+            raise ValueError("keyvault is not configured. Please set 'key_vault_uri' environment variable.")
+        
+        if not head_keyvault:
+            raise ValueError("head_keyvault is not configured. Please set 'head_key_vault_uri' environment variable.")
 
         # Wrapper for Azure Key Vault
         os.environ["APPLICATIONINSIGHTS_ENABLED"] = "true"
@@ -40,7 +47,7 @@ class EnvHelper:
         #     keyvault_uri="https://www.kv-main-cwyod-hd-res1.vault.azure.net/"
         # )
 
-        self.LOGLEVEL = self.keyvault.get_secret("logging-level")
+        self.LOGLEVEL = keyvault.get_secret("logging-level")
         self.LOG_EXECUTION = self.get_env_var_bool(
                 "LOG_EXECUTION", "True"
             )
@@ -52,18 +59,18 @@ class EnvHelper:
             )
 
         # Azure
-        self.AZURE_SUBSCRIPTION_ID = self.keyvault.get_secret("subscription-id")
-        self.AZURE_RESOURCE_GROUP = self.keyvault.get_secret("resource-group-name")
-        self.AZURE_HEAD_RESOURCE_GROUP = self.head_keyvault.get_secret(
+        self.AZURE_SUBSCRIPTION_ID = keyvault.get_secret("subscription-id")
+        self.AZURE_RESOURCE_GROUP = keyvault.get_secret("resource-group-name")
+        self.AZURE_HEAD_RESOURCE_GROUP = head_keyvault.get_secret(
             "resource-group-name"
         )
-        self.AZURE_RESOURCE_ENVIRONMENT = self.keyvault.get_secret(
+        self.AZURE_RESOURCE_ENVIRONMENT = keyvault.get_secret(
             "resource-group-environment"
         )
         self.AZURE_RESOURCE_PRIVATE = (
-            self.keyvault.get_secret("run-private-endpoint").lower() == "true"
+            keyvault.get_secret("run-private-endpoint").lower() == "true"
         )
-        self.PROJECT_CODE = self.keyvault.get_secret("project-code")
+        self.PROJECT_CODE = keyvault.get_secret("project-code")
         self.APP_NAME = os.getenv("REFLECTION_NAME", "Default")
         self.POSTGRESQL_NAME = (
             f"psql-main-{self.PROJECT_CODE}-{self.AZURE_RESOURCE_ENVIRONMENT}"
@@ -78,7 +85,7 @@ class EnvHelper:
             f"https://{self.AZURE_BLOB_ACCOUNT_NAME}.blob.core.windows.net/"
         )
 
-        self.AZURE_FUNCTION_APP_ENDPOINT = self.keyvault.get_secret(
+        self.AZURE_FUNCTION_APP_ENDPOINT = keyvault.get_secret(
             f"func-backend-{self.PROJECT_CODE}-{self.AZURE_RESOURCE_ENVIRONMENT}-endpoint"
         )
         self.AZURE_BLOB_CONTAINER_NAME = "documents"
@@ -110,7 +117,7 @@ class EnvHelper:
                 self.AZURE_COSMOSDB_CONVERSATIONS_CONTAINER = os.getenv(
                     "AZURE_COSMOSDB_CONVERSATIONS_CONTAINER_NAME", ""
                 )
-            self.AZURE_COSMOSDB_ACCOUNT_KEY = self.keyvault.get_secret(
+            self.AZURE_COSMOSDB_ACCOUNT_KEY = keyvault.get_secret(
                 "AZURE_COSMOSDB_ACCOUNT_KEY"
             )
             self.AZURE_COSMOSDB_ENABLE_FEEDBACK = (
@@ -137,10 +144,10 @@ class EnvHelper:
                 self.POSTGRESQL_HOST = azure_postgresql_info.get("host", "")
             else:
                 self.POSTGRESQL_USER = "cwyod_project_uai"
-                self.POSTGRESQL_DATABASE = self.keyvault.get_secret(
+                self.POSTGRESQL_DATABASE = keyvault.get_secret(
                     f"{self.POSTGRESQL_NAME}-default-database-name"
                 )
-                self.POSTGRESQL_HOST = self.keyvault.get_secret(
+                self.POSTGRESQL_HOST = keyvault.get_secret(
                     f"{self.POSTGRESQL_NAME}-server-name"
                 )
             # Ensure integrated vectorization is disabled for PostgreSQL
@@ -172,11 +179,11 @@ class EnvHelper:
             True if self.AZURE_OPENAI_STREAM.lower() == "true" else False
         )
 
-        # self.AZURE_COMPUTER_VISION_NAME = self.head_keyvault.get_secret(
+        # self.AZURE_COMPUTER_VISION_NAME = head_keyvault.get_secret(
         #     "cognitive-kind-ComputerVision"
         # )
         self.AZURE_COMPUTER_VISION_NAME = ""
-        # self.AZURE_COMPUTER_VISION_ENDPOINT = self.head_keyvault.get_secret(
+        # self.AZURE_COMPUTER_VISION_ENDPOINT = head_keyvault.get_secret(
         #     f"{self.AZURE_COMPUTER_VISION_NAME}-endpoint"
         # )
         self.AZURE_COMPUTER_VISION_ENDPOINT = ""
@@ -192,16 +199,16 @@ class EnvHelper:
             self.AZURE_OPENAI_API_KEY = ""
             self.AZURE_COMPUTER_VISION_KEY = None
         else:
-            self.AZURE_SEARCH_KEY = self.keyvault.get_secret("AZURE_SEARCH_KEY")
-            self.AZURE_OPENAI_API_KEY = self.keyvault.get_secret(
+            self.AZURE_SEARCH_KEY = keyvault.get_secret("AZURE_SEARCH_KEY")
+            self.AZURE_OPENAI_API_KEY = keyvault.get_secret(
                 "AZURE_OPENAI_API_KEY"
             )
-            self.AZURE_COMPUTER_VISION_KEY = self.keyvault.get_secret(
+            self.AZURE_COMPUTER_VISION_KEY = keyvault.get_secret(
                 "AZURE_COMPUTER_VISION_KEY"
             )
 
         # Set env for Azure OpenAI
-        self.AZURE_AI_SERVICES_NAME = self.head_keyvault.get_secret(
+        self.AZURE_AI_SERVICES_NAME = head_keyvault.get_secret(
             "cognitive-kind-AIServices"
         )
         self.AZURE_OPENAI_ENDPOINT = (
@@ -221,10 +228,10 @@ class EnvHelper:
 
         # Azure Form Recognizer
 
-        self.AZURE_FORM_RECOGNIZER_NAME = self.keyvault.get_secret(
+        self.AZURE_FORM_RECOGNIZER_NAME = keyvault.get_secret(
             "cognitive-kind-FormRecognizer"
         )
-        self.AZURE_FORM_RECOGNIZER_ENDPOINT = self.keyvault.get_secret(
+        self.AZURE_FORM_RECOGNIZER_ENDPOINT = keyvault.get_secret(
             f"{self.AZURE_FORM_RECOGNIZER_NAME}-endpoint"
         )
 
@@ -233,18 +240,18 @@ class EnvHelper:
         self.APPLICATIONINSIGHTS_ENABLED = "True"
 
         # Azure AI Content Safety
-        self.AZURE_CONTENT_SAFETY_NAME = self.head_keyvault.get_secret(
+        self.AZURE_CONTENT_SAFETY_NAME = head_keyvault.get_secret(
             "cognitive-kind-ContentSafety"
         )
-        self.AZURE_CONTENT_SAFETY_ENDPOINT = self.head_keyvault.get_secret(
+        self.AZURE_CONTENT_SAFETY_ENDPOINT = head_keyvault.get_secret(
             f"{self.AZURE_CONTENT_SAFETY_NAME}-endpoint"
         )
 
         # Speech Service
-        self.AZURE_SPEECH_SERVICE_NAME = self.head_keyvault.get_secret(
+        self.AZURE_SPEECH_SERVICE_NAME = head_keyvault.get_secret(
             "cognitive-kind-SpeechServices"
         )
-        self.AZURE_SPEECH_ENDPOINT = self.head_keyvault.get_secret(
+        self.AZURE_SPEECH_ENDPOINT = head_keyvault.get_secret(
             f"{self.AZURE_SPEECH_SERVICE_NAME}-endpoint"
         )
 
@@ -257,7 +264,7 @@ class EnvHelper:
         self.AZURE_SPEECH_REGION_ENDPOINT = (
             f"https://{self.AZURE_SPEECH_SERVICE_REGION}.api.cognitive.microsoft.com/"
         )
-        self.AZURE_SPEECH_KEY = self.head_keyvault.get_secret(f"{self.AZURE_SPEECH_SERVICE_NAME}-key") # changed from None to allow private endpoint communication
+        self.AZURE_SPEECH_KEY = head_keyvault.get_secret(f"{self.AZURE_SPEECH_SERVICE_NAME}-key") # changed from None to allow private endpoint communication
 
         self.LOAD_CONFIG_FROM_BLOB_STORAGE = self.get_env_var_bool(
             "LOAD_CONFIG_FROM_BLOB_STORAGE"

{cwyodmodules-0.3.62 → cwyodmodules-0.3.64}/cwyodmodules.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cwyodmodules
-Version: 0.3.62
+Version: 0.3.64
 Summary: Add your description here
 Author-email: Patrik <patrikhartl@gmail.com>
 Classifier: Operating System :: OS Independent

{cwyodmodules-0.3.62 → cwyodmodules-0.3.64}/pyproject.toml

@@ -3,7 +3,7 @@ name = "cwyodmodules"
 authors = [
   { name="Patrik", email="patrikhartl@gmail.com" },
 ]
-version = '0.3.62'
+version = '0.3.64'
 description = "Add your description here"
 readme = "README.md"
 requires-python = "==3.11.11"