cwyodmodules 0.3.47__tar.gz → 0.3.49__tar.gz

{cwyodmodules-0.3.47 → cwyodmodules-0.3.49}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cwyodmodules
-Version: 0.3.47
+Version: 0.3.49
 Summary: Add your description here
 Author-email: Patrik <patrikhartl@gmail.com>
 Classifier: Operating System :: OS Independent
@@ -40,7 +40,7 @@ Requires-Dist: azure-search-documents==11.6.0b4
 Requires-Dist: semantic-kernel==1.3.0
 Requires-Dist: pydantic==2.7.4
 Requires-Dist: pandas>=2.2.3
-Requires-Dist: azpaddypy>=0.3.5
+Requires-Dist: azpaddypy>=0.3.7
 Dynamic: license-file
 
 # paddypy

{cwyodmodules-0.3.47 → cwyodmodules-0.3.49}/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, identity, keyvault, create_keyvault_client
+from mgmt_config import logger, identity, keyvault, head_keyvault
 
 
 
@@ -29,23 +29,23 @@ class EnvHelper:
 
         logger.info("Initializing EnvHelper")
         
+        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"
 
-        self.secretHelper = keyvault
-
-        self.secretHelperHead = create_keyvault_client(
-            vault_url=os.environ["head_key_vault_uri"]
-        )
-
-        # self.secretHelper = SecretHelper(
+        # keyvault = SecretHelper(
         #     keyvault_uri="https://www.kv-main-cwyod-res1.vault.azure.net/"
         # )
-        # self.secretHelperHead = SecretHelper(
+        # head_keyvault = SecretHelper(
         #     keyvault_uri="https://www.kv-main-cwyod-hd-res1.vault.azure.net/"
         # )
 
-        self.LOGLEVEL = self.secretHelper.get_secret("logging-level")
+        self.LOGLEVEL = keyvault.get_secret("logging-level")
         self.LOG_EXECUTION = self.get_env_var_bool(
                 "LOG_EXECUTION", "True"
             )
@@ -57,18 +57,18 @@ class EnvHelper:
             )
 
         # Azure
-        self.AZURE_SUBSCRIPTION_ID = self.secretHelper.get_secret("subscription-id")
-        self.AZURE_RESOURCE_GROUP = self.secretHelper.get_secret("resource-group-name")
-        self.AZURE_HEAD_RESOURCE_GROUP = self.secretHelperHead.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.secretHelper.get_secret(
+        self.AZURE_RESOURCE_ENVIRONMENT = keyvault.get_secret(
             "resource-group-environment"
         )
         self.AZURE_RESOURCE_PRIVATE = (
-            self.secretHelper.get_secret("run-private-endpoint").lower() == "true"
+            keyvault.get_secret("run-private-endpoint").lower() == "true"
         )
-        self.PROJECT_CODE = self.secretHelper.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}"
@@ -83,7 +83,7 @@ class EnvHelper:
             f"https://{self.AZURE_BLOB_ACCOUNT_NAME}.blob.core.windows.net/"
         )
 
-        self.AZURE_FUNCTION_APP_ENDPOINT = self.secretHelper.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"
@@ -115,7 +115,7 @@ class EnvHelper:
                 self.AZURE_COSMOSDB_CONVERSATIONS_CONTAINER = os.getenv(
                     "AZURE_COSMOSDB_CONVERSATIONS_CONTAINER_NAME", ""
                 )
-            self.AZURE_COSMOSDB_ACCOUNT_KEY = self.secretHelper.get_secret(
+            self.AZURE_COSMOSDB_ACCOUNT_KEY = keyvault.get_secret(
                 "AZURE_COSMOSDB_ACCOUNT_KEY"
             )
             self.AZURE_COSMOSDB_ENABLE_FEEDBACK = (
@@ -142,10 +142,10 @@ class EnvHelper:
                 self.POSTGRESQL_HOST = azure_postgresql_info.get("host", "")
             else:
                 self.POSTGRESQL_USER = "cwyod_project_uai"
-                self.POSTGRESQL_DATABASE = self.secretHelper.get_secret(
+                self.POSTGRESQL_DATABASE = keyvault.get_secret(
                     f"{self.POSTGRESQL_NAME}-default-database-name"
                 )
-                self.POSTGRESQL_HOST = self.secretHelper.get_secret(
+                self.POSTGRESQL_HOST = keyvault.get_secret(
                     f"{self.POSTGRESQL_NAME}-server-name"
                 )
             # Ensure integrated vectorization is disabled for PostgreSQL
@@ -177,11 +177,11 @@ class EnvHelper:
             True if self.AZURE_OPENAI_STREAM.lower() == "true" else False
         )
 
-        # self.AZURE_COMPUTER_VISION_NAME = self.secretHelperHead.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.secretHelperHead.get_secret(
+        # self.AZURE_COMPUTER_VISION_ENDPOINT = head_keyvault.get_secret(
         #     f"{self.AZURE_COMPUTER_VISION_NAME}-endpoint"
         # )
         self.AZURE_COMPUTER_VISION_ENDPOINT = ""
@@ -197,16 +197,16 @@ class EnvHelper:
             self.AZURE_OPENAI_API_KEY = ""
             self.AZURE_COMPUTER_VISION_KEY = None
         else:
-            self.AZURE_SEARCH_KEY = self.secretHelper.get_secret("AZURE_SEARCH_KEY")
-            self.AZURE_OPENAI_API_KEY = self.secretHelper.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.secretHelper.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.secretHelperHead.get_secret(
+        self.AZURE_AI_SERVICES_NAME = head_keyvault.get_secret(
             "cognitive-kind-AIServices"
         )
         self.AZURE_OPENAI_ENDPOINT = (
@@ -226,10 +226,10 @@ class EnvHelper:
 
         # Azure Form Recognizer
 
-        self.AZURE_FORM_RECOGNIZER_NAME = self.secretHelper.get_secret(
+        self.AZURE_FORM_RECOGNIZER_NAME = keyvault.get_secret(
             "cognitive-kind-FormRecognizer"
         )
-        self.AZURE_FORM_RECOGNIZER_ENDPOINT = self.secretHelper.get_secret(
+        self.AZURE_FORM_RECOGNIZER_ENDPOINT = keyvault.get_secret(
             f"{self.AZURE_FORM_RECOGNIZER_NAME}-endpoint"
         )
 
@@ -238,18 +238,18 @@ class EnvHelper:
         self.APPLICATIONINSIGHTS_ENABLED = "True"
 
         # Azure AI Content Safety
-        self.AZURE_CONTENT_SAFETY_NAME = self.secretHelperHead.get_secret(
+        self.AZURE_CONTENT_SAFETY_NAME = head_keyvault.get_secret(
             "cognitive-kind-ContentSafety"
         )
-        self.AZURE_CONTENT_SAFETY_ENDPOINT = self.secretHelperHead.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.secretHelperHead.get_secret(
+        self.AZURE_SPEECH_SERVICE_NAME = head_keyvault.get_secret(
             "cognitive-kind-SpeechServices"
         )
-        self.AZURE_SPEECH_ENDPOINT = self.secretHelperHead.get_secret(
+        self.AZURE_SPEECH_ENDPOINT = head_keyvault.get_secret(
             f"{self.AZURE_SPEECH_SERVICE_NAME}-endpoint"
         )
 
@@ -262,7 +262,7 @@ class EnvHelper:
         self.AZURE_SPEECH_REGION_ENDPOINT = (
             f"https://{self.AZURE_SPEECH_SERVICE_REGION}.api.cognitive.microsoft.com/"
         )
-        self.AZURE_SPEECH_KEY = self.secretHelperHead.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.47 → cwyodmodules-0.3.49}/cwyodmodules/mgmt_config.py

@@ -1,24 +1,24 @@
 """
 Azure Project Management Configuration Template
 
-This template provides standardized configuration for Azure logging, identity,
-and KeyVault management across projects. It creates singleton instances of
-AzureLogger, AzureIdentity, and AzureKeyVault that can be imported and used
-throughout your application.
+This template provides standardized configuration for Azure logging and identity
+management across projects. It creates singleton instances of AzureLogger and
+AzureIdentity that can be imported and used throughout your application.
 
 Usage:
-    from mgmt_config import logger, identity, keyvault
+    from mgmt_config import logger, identity
     
     logger.info("Application started")
     credential = identity.get_credential()
-    secret = keyvault.get_secret("my-secret") if keyvault else None
 """
 
 import os
 from typing import Optional, Dict, Any
-from azpaddypy.mgmt.logging import create_app_logger
+from azpaddypy.mgmt.logging import create_app_logger, create_function_logger
 from azpaddypy.mgmt.identity import create_azure_identity
-from azpaddypy.resources.keyvault import create_azure_keyvault, AzureKeyVault
+from azpaddypy.resources.keyvault import create_azure_keyvault
+
+# Alias for import in other packages
 
 # =============================================================================
 # SERVICE CONFIGURATION
@@ -68,29 +68,40 @@ IDENTITY_CONNECTION_STRING = LOGGER_CONNECTION_STRING
 # KEYVAULT CONFIGURATION
 # =============================================================================
 
-# KeyVault URL (optional, will be None if not configured)
+# Azure Key Vault URL (required for Key Vault operations)
 KEYVAULT_URL = os.getenv("key_vault_uri")
+HEAD_KEYVAULT_URL = os.getenv("head_key_vault_uri")
 
-# KeyVault client enablement settings
+# Enable specific Key Vault client types
 KEYVAULT_ENABLE_SECRETS = os.getenv("KEYVAULT_ENABLE_SECRETS", "true").lower() == "true"
 KEYVAULT_ENABLE_KEYS = os.getenv("KEYVAULT_ENABLE_KEYS", "false").lower() == "true"
 KEYVAULT_ENABLE_CERTIFICATES = os.getenv("KEYVAULT_ENABLE_CERTIFICATES", "false").lower() == "true"
 
-# Connection string for KeyVault logging (uses same as logger by default)
+# Connection string for keyvault logging (uses same as logger by default)
 KEYVAULT_CONNECTION_STRING = LOGGER_CONNECTION_STRING
 
 # =============================================================================
 # INITIALIZE SERVICES
 # =============================================================================
-
 # Create logger instance
-logger = create_app_logger(
-    service_name=SERVICE_NAME,
-    service_version=SERVICE_VERSION,
-    connection_string=LOGGER_CONNECTION_STRING,
-    enable_console_logging=LOGGER_ENABLE_CONSOLE,
-    instrumentation_options=LOGGER_INSTRUMENTATION_OPTIONS,
-)
+if "functionapp" in os.getenv("REFLECTION_KIND", "app"):
+    logger = create_function_logger(
+        function_app_name=os.getenv("REFLECTION_NAME", "app"),
+        function_name="backend",
+        service_version=SERVICE_VERSION,
+        connection_string=LOGGER_CONNECTION_STRING,
+        instrumentation_options=LOGGER_INSTRUMENTATION_OPTIONS,
+    )
+    logger.info("Function logger initialized")
+else:
+    logger = create_app_logger(
+        service_name=SERVICE_NAME,
+        service_version=SERVICE_VERSION,
+        connection_string=LOGGER_CONNECTION_STRING,
+        enable_console_logging=LOGGER_ENABLE_CONSOLE,
+        instrumentation_options=LOGGER_INSTRUMENTATION_OPTIONS,
+    )
+    logger.info("App logger initialized")
 
 # Create identity instance with shared logger
 identity = create_azure_identity(
@@ -103,7 +114,7 @@ identity = create_azure_identity(
     logger=logger,
 )
 
-# Create KeyVault instance with shared logger and identity (only if URL is configured)
+# Create keyvault instance with shared logger and identity (if URL is configured)
 keyvault = None
 if KEYVAULT_URL:
     keyvault = create_azure_keyvault(
@@ -118,12 +129,10 @@ if KEYVAULT_URL:
         enable_certificates=KEYVAULT_ENABLE_CERTIFICATES,
     )
 
-def create_keyvault_client(vault_url: str) -> Optional[AzureKeyVault]:
-    """Creates a secondary KeyVault client for a different vault."""
-    if not vault_url:
-        return None
-    return create_azure_keyvault(
-        vault_url=vault_url,
+head_keyvault = None
+if HEAD_KEYVAULT_URL:
+    head_keyvault = create_azure_keyvault(
+        vault_url=HEAD_KEYVAULT_URL,
         azure_identity=identity,
         service_name=SERVICE_NAME,
         service_version=SERVICE_VERSION,
@@ -139,7 +148,7 @@ def create_keyvault_client(vault_url: str) -> Optional[AzureKeyVault]:
 # =============================================================================
 
 # Validate critical configuration
-if SERVICE_NAME == "your-service-name":
+if SERVICE_NAME == __name__:
     logger.warning(
         "SERVICE_NAME is not configured. Please set SERVICE_NAME environment variable or update this template.",
         extra={"configuration_issue": "service_name_not_set"}
@@ -153,10 +162,16 @@ if not LOGGER_CONNECTION_STRING:
 
 if not KEYVAULT_URL:
     logger.info(
-        "No KeyVault URL configured. KeyVault operations will be disabled.",
+        "No Key Vault URL configured. Key Vault operations will be disabled.",
         extra={"keyvault_status": "disabled"}
     )
 
+if not HEAD_KEYVAULT_URL:
+    logger.info(
+        "No Head Key Vault URL configured. Head Key Vault operations will be disabled.",
+        extra={"head_keyvault_status": "disabled"}
+    )
+
 # Log successful initialization
 logger.info(
     f"Management configuration initialized for service '{SERVICE_NAME}' v{SERVICE_VERSION}",
@@ -167,9 +182,10 @@ logger.info(
         "token_cache_enabled": IDENTITY_ENABLE_TOKEN_CACHE,
         "telemetry_enabled": bool(LOGGER_CONNECTION_STRING),
         "keyvault_enabled": bool(KEYVAULT_URL),
-        "keyvault_secrets_enabled": KEYVAULT_ENABLE_SECRETS,
-        "keyvault_keys_enabled": KEYVAULT_ENABLE_KEYS,
-        "keyvault_certificates_enabled": KEYVAULT_ENABLE_CERTIFICATES,
+        "head_keyvault_enabled": bool(HEAD_KEYVAULT_URL),
+        "keyvault_secrets_enabled": KEYVAULT_ENABLE_SECRETS if KEYVAULT_URL else False,
+        "keyvault_keys_enabled": KEYVAULT_ENABLE_KEYS if KEYVAULT_URL else False,
+        "keyvault_certificates_enabled": KEYVAULT_ENABLE_CERTIFICATES if KEYVAULT_URL else False,
     }
 )
 
@@ -178,4 +194,4 @@ logger.info(
 # =============================================================================
 
 # Export logger, identity, and keyvault for use in applications
-__all__ = ["logger", "identity", "keyvault", "create_keyvault_client"]
+__all__ = ["logger", "identity", "keyvault", "head_keyvault"]

{cwyodmodules-0.3.47 → cwyodmodules-0.3.49}/cwyodmodules.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cwyodmodules
-Version: 0.3.47
+Version: 0.3.49
 Summary: Add your description here
 Author-email: Patrik <patrikhartl@gmail.com>
 Classifier: Operating System :: OS Independent
@@ -40,7 +40,7 @@ Requires-Dist: azure-search-documents==11.6.0b4
 Requires-Dist: semantic-kernel==1.3.0
 Requires-Dist: pydantic==2.7.4
 Requires-Dist: pandas>=2.2.3
-Requires-Dist: azpaddypy>=0.3.5
+Requires-Dist: azpaddypy>=0.3.7
 Dynamic: license-file
 
 # paddypy

{cwyodmodules-0.3.47 → cwyodmodules-0.3.49}/cwyodmodules.egg-info/requires.txt

@@ -31,4 +31,4 @@ azure-search-documents==11.6.0b4
 semantic-kernel==1.3.0
 pydantic==2.7.4
 pandas>=2.2.3
-azpaddypy>=0.3.5
+azpaddypy>=0.3.7

{cwyodmodules-0.3.47 → cwyodmodules-0.3.49}/pyproject.toml

@@ -3,7 +3,7 @@ name = "cwyodmodules"
 authors = [
   { name="Patrik", email="patrikhartl@gmail.com" },
 ]
-version = '0.3.47'
+version = '0.3.49'
 description = "Add your description here"
 readme = "README.md"
 requires-python = "==3.11.11"
@@ -44,7 +44,15 @@ dependencies = [
     "semantic-kernel==1.3.0",
     "pydantic==2.7.4",
     "pandas>=2.2.3",
-    "azpaddypy>=0.3.5",
+    "azpaddypy>=0.3.7",
 ]
+
+[tool.uv]
+dev-dependencies = [
+    "pytest==8.4.1",
+    "pytest-asyncio==1.0.0",
+    "anyio==4.9.0"
+]
+
 [tool.setuptools.package-data]
 '*' = ['*.json','*.txt']