cwyodmodules 0.3.46__tar.gz → 0.3.47__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cwyodmodules
-Version: 0.3.46
+Version: 0.3.47
 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.4
+Requires-Dist: azpaddypy>=0.3.5
 Dynamic: license-file
 
 # paddypy

{cwyodmodules-0.3.46 → cwyodmodules-0.3.47}/cwyodmodules/batch/utilities/helpers/env_helper.py

@@ -6,9 +6,8 @@ import threading
 from ..orchestrator.orchestration_strategy import OrchestrationStrategy
 from ..helpers.config.conversation_flow import ConversationFlow
 from ..helpers.config.database_type import DatabaseType
-from ..helpers.secret_helper import SecretHelper
 
-from mgmt_config import logger, identity
+from mgmt_config import logger, identity, keyvault, create_keyvault_client
 
 
 
@@ -33,10 +32,10 @@ class EnvHelper:
         # Wrapper for Azure Key Vault
         os.environ["APPLICATIONINSIGHTS_ENABLED"] = "true"
 
-        self.secretHelper = SecretHelper(keyvault_uri=os.environ["key_vault_uri"])
+        self.secretHelper = keyvault
 
-        self.secretHelperHead = SecretHelper(
-            keyvault_uri=os.environ["head_key_vault_uri"]
+        self.secretHelperHead = create_keyvault_client(
+            vault_url=os.environ["head_key_vault_uri"]
         )
 
         # self.secretHelper = SecretHelper(

{cwyodmodules-0.3.46 → cwyodmodules-0.3.47}/cwyodmodules/mgmt_config.py

@@ -1,132 +1,181 @@
-"""
-Azure Project Management Configuration Template
-
-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
-    
-    logger.info("Application started")
-    credential = identity.get_credential()
-"""
-
-import os
-from typing import Optional, Dict, Any
-from azpaddypy.mgmt.logging import create_app_logger, create_function_logger
-from azpaddypy.mgmt.identity import create_azure_identity
-
-# =============================================================================
-# SERVICE CONFIGURATION
-# =============================================================================
-
-# Service identity - customize these for your project
-SERVICE_NAME = os.getenv("SERVICE_NAME", "cwyodmodules-pacakge")
-SERVICE_VERSION = os.getenv("SERVICE_VERSION", "1.0.0")
-
-# =============================================================================
-# LOGGING CONFIGURATION
-# =============================================================================
-
-# Enable console output (useful for local development)
-LOGGER_ENABLE_CONSOLE = os.getenv("LOGGER_ENABLE_CONSOLE", "true").lower() == "true"
-
-# Application Insights connection string (optional, will use environment variable if not set)
-LOGGER_CONNECTION_STRING = os.getenv("APPLICATIONINSIGHTS_CONNECTION_STRING")
-
-# Configure which Azure SDK components to instrument
-LOGGER_INSTRUMENTATION_OPTIONS = {
-    "azure_sdk": {"enabled": True},
-    "django": {"enabled": False},
-    "fastapi": {"enabled": False},
-    "flask": {"enabled": True},
-    "psycopg2": {"enabled": True},
-    "requests": {"enabled": True},
-    "urllib": {"enabled": True},
-    "urllib3": {"enabled": True},
-}
-
-# =============================================================================
-# IDENTITY CONFIGURATION
-# =============================================================================
-
-# Token caching settings
-IDENTITY_ENABLE_TOKEN_CACHE = os.getenv("IDENTITY_ENABLE_TOKEN_CACHE", "true").lower() == "true"
-IDENTITY_ALLOW_UNENCRYPTED_STORAGE = os.getenv("IDENTITY_ALLOW_UNENCRYPTED_STORAGE", "true").lower() == "true"
-
-# Custom credential options (None means use defaults)
-IDENTITY_CUSTOM_CREDENTIAL_OPTIONS: Optional[Dict[str, Any]] = None
-
-# Connection string for identity logging (uses same as logger by default)
-IDENTITY_CONNECTION_STRING = LOGGER_CONNECTION_STRING
-
-# =============================================================================
-# INITIALIZE SERVICES
-# =============================================================================
-# Create logger instance
-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(
-    service_name=SERVICE_NAME,
-    service_version=SERVICE_VERSION,
-    enable_token_cache=IDENTITY_ENABLE_TOKEN_CACHE,
-    allow_unencrypted_storage=IDENTITY_ALLOW_UNENCRYPTED_STORAGE,
-    custom_credential_options=IDENTITY_CUSTOM_CREDENTIAL_OPTIONS,
-    connection_string=IDENTITY_CONNECTION_STRING,
-    logger=logger,
-)
-
-# =============================================================================
-# VALIDATION & STARTUP
-# =============================================================================
-
-# Validate critical configuration
-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"}
-    )
-
-if not LOGGER_CONNECTION_STRING:
-    logger.info(
-        "No Application Insights connection string configured. Telemetry will be disabled.",
-        extra={"telemetry_status": "disabled"}
-    )
-
-# Log successful initialization
-logger.info(
-    f"Management configuration initialized for service '{SERVICE_NAME}' v{SERVICE_VERSION}",
-    extra={
-        "service_name": SERVICE_NAME,
-        "service_version": SERVICE_VERSION,
-        "console_logging": LOGGER_ENABLE_CONSOLE,
-        "token_cache_enabled": IDENTITY_ENABLE_TOKEN_CACHE,
-        "telemetry_enabled": bool(LOGGER_CONNECTION_STRING),
-    }
-)
-
-# =============================================================================
-# EXPORTS
-# =============================================================================
-
-# Export both logger and identity for use in applications
-__all__ = ["logger", "identity"]
+"""
+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.
+
+Usage:
+    from mgmt_config import logger, identity, keyvault
+    
+    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.identity import create_azure_identity
+from azpaddypy.resources.keyvault import create_azure_keyvault, AzureKeyVault
+
+# =============================================================================
+# SERVICE CONFIGURATION
+# =============================================================================
+
+# Service identity - customize these for your project
+SERVICE_NAME = os.getenv("SERVICE_NAME", "cwyodmodules-pacakge")
+SERVICE_VERSION = os.getenv("SERVICE_VERSION", "1.0.0")
+
+# =============================================================================
+# LOGGING CONFIGURATION
+# =============================================================================
+
+# Enable console output (useful for local development)
+LOGGER_ENABLE_CONSOLE = os.getenv("LOGGER_ENABLE_CONSOLE", "true").lower() == "true"
+
+# Application Insights connection string (optional, will use environment variable if not set)
+LOGGER_CONNECTION_STRING = os.getenv("APPLICATIONINSIGHTS_CONNECTION_STRING")
+
+# Configure which Azure SDK components to instrument
+LOGGER_INSTRUMENTATION_OPTIONS = {
+    "azure_sdk": {"enabled": True},
+    "django": {"enabled": False},
+    "fastapi": {"enabled": False},
+    "flask": {"enabled": True},
+    "psycopg2": {"enabled": True},
+    "requests": {"enabled": True},
+    "urllib": {"enabled": True},
+    "urllib3": {"enabled": True},
+}
+
+# =============================================================================
+# IDENTITY CONFIGURATION
+# =============================================================================
+
+# Token caching settings
+IDENTITY_ENABLE_TOKEN_CACHE = os.getenv("IDENTITY_ENABLE_TOKEN_CACHE", "true").lower() == "true"
+IDENTITY_ALLOW_UNENCRYPTED_STORAGE = os.getenv("IDENTITY_ALLOW_UNENCRYPTED_STORAGE", "true").lower() == "true"
+
+# Custom credential options (None means use defaults)
+IDENTITY_CUSTOM_CREDENTIAL_OPTIONS: Optional[Dict[str, Any]] = None
+
+# Connection string for identity logging (uses same as logger by default)
+IDENTITY_CONNECTION_STRING = LOGGER_CONNECTION_STRING
+
+# =============================================================================
+# KEYVAULT CONFIGURATION
+# =============================================================================
+
+# KeyVault URL (optional, will be None if not configured)
+KEYVAULT_URL = os.getenv("key_vault_uri")
+
+# KeyVault client enablement settings
+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)
+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,
+)
+
+# Create identity instance with shared logger
+identity = create_azure_identity(
+    service_name=SERVICE_NAME,
+    service_version=SERVICE_VERSION,
+    enable_token_cache=IDENTITY_ENABLE_TOKEN_CACHE,
+    allow_unencrypted_storage=IDENTITY_ALLOW_UNENCRYPTED_STORAGE,
+    custom_credential_options=IDENTITY_CUSTOM_CREDENTIAL_OPTIONS,
+    connection_string=IDENTITY_CONNECTION_STRING,
+    logger=logger,
+)
+
+# Create KeyVault instance with shared logger and identity (only if URL is configured)
+keyvault = None
+if KEYVAULT_URL:
+    keyvault = create_azure_keyvault(
+        vault_url=KEYVAULT_URL,
+        azure_identity=identity,
+        service_name=SERVICE_NAME,
+        service_version=SERVICE_VERSION,
+        logger=logger,
+        connection_string=KEYVAULT_CONNECTION_STRING,
+        enable_secrets=KEYVAULT_ENABLE_SECRETS,
+        enable_keys=KEYVAULT_ENABLE_KEYS,
+        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,
+        azure_identity=identity,
+        service_name=SERVICE_NAME,
+        service_version=SERVICE_VERSION,
+        logger=logger,
+        connection_string=KEYVAULT_CONNECTION_STRING,
+        enable_secrets=KEYVAULT_ENABLE_SECRETS,
+        enable_keys=KEYVAULT_ENABLE_KEYS,
+        enable_certificates=KEYVAULT_ENABLE_CERTIFICATES,
+    )
+
+# =============================================================================
+# VALIDATION & STARTUP
+# =============================================================================
+
+# Validate critical configuration
+if SERVICE_NAME == "your-service-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"}
+    )
+
+if not LOGGER_CONNECTION_STRING:
+    logger.info(
+        "No Application Insights connection string configured. Telemetry will be disabled.",
+        extra={"telemetry_status": "disabled"}
+    )
+
+if not KEYVAULT_URL:
+    logger.info(
+        "No KeyVault URL configured. KeyVault operations will be disabled.",
+        extra={"keyvault_status": "disabled"}
+    )
+
+# Log successful initialization
+logger.info(
+    f"Management configuration initialized for service '{SERVICE_NAME}' v{SERVICE_VERSION}",
+    extra={
+        "service_name": SERVICE_NAME,
+        "service_version": SERVICE_VERSION,
+        "console_logging": LOGGER_ENABLE_CONSOLE,
+        "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,
+    }
+)
+
+# =============================================================================
+# EXPORTS
+# =============================================================================
+
+# Export logger, identity, and keyvault for use in applications
+__all__ = ["logger", "identity", "keyvault", "create_keyvault_client"]

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cwyodmodules
-Version: 0.3.46
+Version: 0.3.47
 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.4
+Requires-Dist: azpaddypy>=0.3.5
 Dynamic: license-file
 
 # paddypy

{cwyodmodules-0.3.46 → cwyodmodules-0.3.47}/cwyodmodules.egg-info/SOURCES.txt

@@ -49,7 +49,6 @@ cwyodmodules/batch/utilities/helpers/env_helper.py
 cwyodmodules/batch/utilities/helpers/lightrag_helper.py
 cwyodmodules/batch/utilities/helpers/llm_helper.py
 cwyodmodules/batch/utilities/helpers/orchestrator_helper.py
-cwyodmodules/batch/utilities/helpers/secret_helper.py
 cwyodmodules/batch/utilities/helpers/config/agent_mode.py
 cwyodmodules/batch/utilities/helpers/config/assistant_strategy.py
 cwyodmodules/batch/utilities/helpers/config/config_helper.py

{cwyodmodules-0.3.46 → cwyodmodules-0.3.47}/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.4
+azpaddypy>=0.3.5

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

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

cwyodmodules-0.3.46/cwyodmodules/batch/utilities/helpers/secret_helper.py

@@ -1,79 +0,0 @@
-from azure.keyvault.secrets import SecretClient
-from mgmt_config import logger, identity
-
-
-class SecretHelper:
-    def __init__(self, keyvault_uri) -> None:
-        """
-        Initializes an instance of the SecretHelper class.
-
-        The constructor sets the USE_KEY_VAULT attribute based on the value of the USE_KEY_VAULT environment variable.
-        If USE_KEY_VAULT is set to "true" (case-insensitive), it initializes a SecretClient object using the
-        AZURE_KEY_VAULT_ENDPOINT environment variable and the DefaultAzureCredential.
-
-        Args:
-            None
-
-        Returns:
-            None
-        """
-        self.USE_KEY_VAULT = True
-        self.secret_client = None
-        if self.USE_KEY_VAULT:
-            credential = identity.get_credential()
-            self.secret_client = SecretClient(
-                vault_url=keyvault_uri,
-                credential=credential,
-                connection_verify=True,
-            )
-
-    @logger.trace_function(log_execution=True, log_args=False, log_result=False)
-    def get_secret(self, secret_name: str) -> str:
-        """
-        Retrieves the value of a secret from the environment variables or Azure Key Vault.
-
-        Args:
-            secret_name (str): The name of the secret or "".
-
-        Returns:
-            str: The value of the secret.
-
-        Raises:
-            None
-
-        """
-        secret_value = self.secret_client.get_secret(name=secret_name).value
-        return secret_value
-
-    @logger.trace_function(log_execution=True, log_args=False, log_result=False)
-    def set_secret(self, secret_name: str, secret_value: str) -> None:
-        """
-        Sets the value of a secret in Azure Key Vault only if it doesn't exist or has a different value.
-
-        Args:
-            secret_name (str): The name of the secret.
-            secret_value (str): The value to be stored.
-
-        Returns:
-            None
-
-        Raises:
-            None
-        """
-        try:
-            current_secret = self.secret_client.get_secret(name=secret_name)
-            if current_secret.value != secret_value:
-                self.secret_client.set_secret(name=secret_name, value=secret_value)
-            else:
-                logger.warning(
-                    f"Secret {secret_name} already has the same value, skipping update"
-                )
-        except Exception:
-            self.secret_client.set_secret(name=secret_name, value=secret_value)
-            logger.warning(f"Secret {secret_name} has been created")
-
-
-    @logger.trace_function(log_execution=True, log_args=False, log_result=False)
-    def get_secret_from_json(self, secret_name: str) -> str:
-        secret_value = self.secret_client.get_secret(secret_name).value
-        return secret_value