cwyodmodules 0.3.46__py3-none-any.whl → 0.3.48__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- cwyodmodules/batch/utilities/helpers/env_helper.py +33 -34
- cwyodmodules/mgmt_config.py +181 -132
- {cwyodmodules-0.3.46.dist-info → cwyodmodules-0.3.48.dist-info}/METADATA +2 -2
- {cwyodmodules-0.3.46.dist-info → cwyodmodules-0.3.48.dist-info}/RECORD +7 -8
- cwyodmodules/batch/utilities/helpers/secret_helper.py +0 -79
- {cwyodmodules-0.3.46.dist-info → cwyodmodules-0.3.48.dist-info}/WHEEL +0 -0
- {cwyodmodules-0.3.46.dist-info → cwyodmodules-0.3.48.dist-info}/licenses/LICENSE +0 -0
- {cwyodmodules-0.3.46.dist-info → cwyodmodules-0.3.48.dist-info}/top_level.txt +0 -0
@@ -6,9 +6,8 @@ import threading
|
|
6
6
|
from ..orchestrator.orchestration_strategy import OrchestrationStrategy
|
7
7
|
from ..helpers.config.conversation_flow import ConversationFlow
|
8
8
|
from ..helpers.config.database_type import DatabaseType
|
9
|
-
from ..helpers.secret_helper import SecretHelper
|
10
9
|
|
11
|
-
from mgmt_config import logger, identity
|
10
|
+
from mgmt_config import logger, identity, keyvault, head_keyvault
|
12
11
|
|
13
12
|
|
14
13
|
|
@@ -30,23 +29,23 @@ class EnvHelper:
|
|
30
29
|
|
31
30
|
logger.info("Initializing EnvHelper")
|
32
31
|
|
32
|
+
if not keyvault:
|
33
|
+
raise ValueError("keyvault is not configured. Please set 'key_vault_uri' environment variable.")
|
34
|
+
|
35
|
+
if not head_keyvault:
|
36
|
+
raise ValueError("head_keyvault is not configured. Please set 'head_key_vault_uri' environment variable.")
|
37
|
+
|
33
38
|
# Wrapper for Azure Key Vault
|
34
39
|
os.environ["APPLICATIONINSIGHTS_ENABLED"] = "true"
|
35
40
|
|
36
|
-
|
37
|
-
|
38
|
-
self.secretHelperHead = SecretHelper(
|
39
|
-
keyvault_uri=os.environ["head_key_vault_uri"]
|
40
|
-
)
|
41
|
-
|
42
|
-
# self.secretHelper = SecretHelper(
|
41
|
+
# keyvault = SecretHelper(
|
43
42
|
# keyvault_uri="https://www.kv-main-cwyod-res1.vault.azure.net/"
|
44
43
|
# )
|
45
|
-
#
|
44
|
+
# head_keyvault = SecretHelper(
|
46
45
|
# keyvault_uri="https://www.kv-main-cwyod-hd-res1.vault.azure.net/"
|
47
46
|
# )
|
48
47
|
|
49
|
-
self.LOGLEVEL =
|
48
|
+
self.LOGLEVEL = keyvault.get_secret("logging-level")
|
50
49
|
self.LOG_EXECUTION = self.get_env_var_bool(
|
51
50
|
"LOG_EXECUTION", "True"
|
52
51
|
)
|
@@ -58,18 +57,18 @@ class EnvHelper:
|
|
58
57
|
)
|
59
58
|
|
60
59
|
# Azure
|
61
|
-
self.AZURE_SUBSCRIPTION_ID =
|
62
|
-
self.AZURE_RESOURCE_GROUP =
|
63
|
-
self.AZURE_HEAD_RESOURCE_GROUP =
|
60
|
+
self.AZURE_SUBSCRIPTION_ID = keyvault.get_secret("subscription-id")
|
61
|
+
self.AZURE_RESOURCE_GROUP = keyvault.get_secret("resource-group-name")
|
62
|
+
self.AZURE_HEAD_RESOURCE_GROUP = head_keyvault.get_secret(
|
64
63
|
"resource-group-name"
|
65
64
|
)
|
66
|
-
self.AZURE_RESOURCE_ENVIRONMENT =
|
65
|
+
self.AZURE_RESOURCE_ENVIRONMENT = keyvault.get_secret(
|
67
66
|
"resource-group-environment"
|
68
67
|
)
|
69
68
|
self.AZURE_RESOURCE_PRIVATE = (
|
70
|
-
|
69
|
+
keyvault.get_secret("run-private-endpoint").lower() == "true"
|
71
70
|
)
|
72
|
-
self.PROJECT_CODE =
|
71
|
+
self.PROJECT_CODE = keyvault.get_secret("project-code")
|
73
72
|
self.APP_NAME = os.getenv("REFLECTION_NAME", "Default")
|
74
73
|
self.POSTGRESQL_NAME = (
|
75
74
|
f"psql-main-{self.PROJECT_CODE}-{self.AZURE_RESOURCE_ENVIRONMENT}"
|
@@ -84,7 +83,7 @@ class EnvHelper:
|
|
84
83
|
f"https://{self.AZURE_BLOB_ACCOUNT_NAME}.blob.core.windows.net/"
|
85
84
|
)
|
86
85
|
|
87
|
-
self.AZURE_FUNCTION_APP_ENDPOINT =
|
86
|
+
self.AZURE_FUNCTION_APP_ENDPOINT = keyvault.get_secret(
|
88
87
|
f"func-backend-{self.PROJECT_CODE}-{self.AZURE_RESOURCE_ENVIRONMENT}-endpoint"
|
89
88
|
)
|
90
89
|
self.AZURE_BLOB_CONTAINER_NAME = "documents"
|
@@ -116,7 +115,7 @@ class EnvHelper:
|
|
116
115
|
self.AZURE_COSMOSDB_CONVERSATIONS_CONTAINER = os.getenv(
|
117
116
|
"AZURE_COSMOSDB_CONVERSATIONS_CONTAINER_NAME", ""
|
118
117
|
)
|
119
|
-
self.AZURE_COSMOSDB_ACCOUNT_KEY =
|
118
|
+
self.AZURE_COSMOSDB_ACCOUNT_KEY = keyvault.get_secret(
|
120
119
|
"AZURE_COSMOSDB_ACCOUNT_KEY"
|
121
120
|
)
|
122
121
|
self.AZURE_COSMOSDB_ENABLE_FEEDBACK = (
|
@@ -143,10 +142,10 @@ class EnvHelper:
|
|
143
142
|
self.POSTGRESQL_HOST = azure_postgresql_info.get("host", "")
|
144
143
|
else:
|
145
144
|
self.POSTGRESQL_USER = "cwyod_project_uai"
|
146
|
-
self.POSTGRESQL_DATABASE =
|
145
|
+
self.POSTGRESQL_DATABASE = keyvault.get_secret(
|
147
146
|
f"{self.POSTGRESQL_NAME}-default-database-name"
|
148
147
|
)
|
149
|
-
self.POSTGRESQL_HOST =
|
148
|
+
self.POSTGRESQL_HOST = keyvault.get_secret(
|
150
149
|
f"{self.POSTGRESQL_NAME}-server-name"
|
151
150
|
)
|
152
151
|
# Ensure integrated vectorization is disabled for PostgreSQL
|
@@ -178,11 +177,11 @@ class EnvHelper:
|
|
178
177
|
True if self.AZURE_OPENAI_STREAM.lower() == "true" else False
|
179
178
|
)
|
180
179
|
|
181
|
-
# self.AZURE_COMPUTER_VISION_NAME =
|
180
|
+
# self.AZURE_COMPUTER_VISION_NAME = head_keyvault.get_secret(
|
182
181
|
# "cognitive-kind-ComputerVision"
|
183
182
|
# )
|
184
183
|
self.AZURE_COMPUTER_VISION_NAME = ""
|
185
|
-
# self.AZURE_COMPUTER_VISION_ENDPOINT =
|
184
|
+
# self.AZURE_COMPUTER_VISION_ENDPOINT = head_keyvault.get_secret(
|
186
185
|
# f"{self.AZURE_COMPUTER_VISION_NAME}-endpoint"
|
187
186
|
# )
|
188
187
|
self.AZURE_COMPUTER_VISION_ENDPOINT = ""
|
@@ -198,16 +197,16 @@ class EnvHelper:
|
|
198
197
|
self.AZURE_OPENAI_API_KEY = ""
|
199
198
|
self.AZURE_COMPUTER_VISION_KEY = None
|
200
199
|
else:
|
201
|
-
self.AZURE_SEARCH_KEY =
|
202
|
-
self.AZURE_OPENAI_API_KEY =
|
200
|
+
self.AZURE_SEARCH_KEY = keyvault.get_secret("AZURE_SEARCH_KEY")
|
201
|
+
self.AZURE_OPENAI_API_KEY = keyvault.get_secret(
|
203
202
|
"AZURE_OPENAI_API_KEY"
|
204
203
|
)
|
205
|
-
self.AZURE_COMPUTER_VISION_KEY =
|
204
|
+
self.AZURE_COMPUTER_VISION_KEY = keyvault.get_secret(
|
206
205
|
"AZURE_COMPUTER_VISION_KEY"
|
207
206
|
)
|
208
207
|
|
209
208
|
# Set env for Azure OpenAI
|
210
|
-
self.AZURE_AI_SERVICES_NAME =
|
209
|
+
self.AZURE_AI_SERVICES_NAME = head_keyvault.get_secret(
|
211
210
|
"cognitive-kind-AIServices"
|
212
211
|
)
|
213
212
|
self.AZURE_OPENAI_ENDPOINT = (
|
@@ -227,10 +226,10 @@ class EnvHelper:
|
|
227
226
|
|
228
227
|
# Azure Form Recognizer
|
229
228
|
|
230
|
-
self.AZURE_FORM_RECOGNIZER_NAME =
|
229
|
+
self.AZURE_FORM_RECOGNIZER_NAME = keyvault.get_secret(
|
231
230
|
"cognitive-kind-FormRecognizer"
|
232
231
|
)
|
233
|
-
self.AZURE_FORM_RECOGNIZER_ENDPOINT =
|
232
|
+
self.AZURE_FORM_RECOGNIZER_ENDPOINT = keyvault.get_secret(
|
234
233
|
f"{self.AZURE_FORM_RECOGNIZER_NAME}-endpoint"
|
235
234
|
)
|
236
235
|
|
@@ -239,18 +238,18 @@ class EnvHelper:
|
|
239
238
|
self.APPLICATIONINSIGHTS_ENABLED = "True"
|
240
239
|
|
241
240
|
# Azure AI Content Safety
|
242
|
-
self.AZURE_CONTENT_SAFETY_NAME =
|
241
|
+
self.AZURE_CONTENT_SAFETY_NAME = head_keyvault.get_secret(
|
243
242
|
"cognitive-kind-ContentSafety"
|
244
243
|
)
|
245
|
-
self.AZURE_CONTENT_SAFETY_ENDPOINT =
|
244
|
+
self.AZURE_CONTENT_SAFETY_ENDPOINT = head_keyvault.get_secret(
|
246
245
|
f"{self.AZURE_CONTENT_SAFETY_NAME}-endpoint"
|
247
246
|
)
|
248
247
|
|
249
248
|
# Speech Service
|
250
|
-
self.AZURE_SPEECH_SERVICE_NAME =
|
249
|
+
self.AZURE_SPEECH_SERVICE_NAME = head_keyvault.get_secret(
|
251
250
|
"cognitive-kind-SpeechServices"
|
252
251
|
)
|
253
|
-
self.AZURE_SPEECH_ENDPOINT =
|
252
|
+
self.AZURE_SPEECH_ENDPOINT = head_keyvault.get_secret(
|
254
253
|
f"{self.AZURE_SPEECH_SERVICE_NAME}-endpoint"
|
255
254
|
)
|
256
255
|
|
@@ -263,7 +262,7 @@ class EnvHelper:
|
|
263
262
|
self.AZURE_SPEECH_REGION_ENDPOINT = (
|
264
263
|
f"https://{self.AZURE_SPEECH_SERVICE_REGION}.api.cognitive.microsoft.com/"
|
265
264
|
)
|
266
|
-
self.AZURE_SPEECH_KEY =
|
265
|
+
self.AZURE_SPEECH_KEY = head_keyvault.get_secret(f"{self.AZURE_SPEECH_SERVICE_NAME}-key") # changed from None to allow private endpoint communication
|
267
266
|
|
268
267
|
self.LOAD_CONFIG_FROM_BLOB_STORAGE = self.get_env_var_bool(
|
269
268
|
"LOAD_CONFIG_FROM_BLOB_STORAGE"
|
cwyodmodules/mgmt_config.py
CHANGED
@@ -1,132 +1,181 @@
|
|
1
|
-
"""
|
2
|
-
Azure Project Management Configuration Template
|
3
|
-
|
4
|
-
This template provides standardized configuration for Azure logging
|
5
|
-
management across projects. It creates singleton instances of
|
6
|
-
AzureIdentity that can be imported and used
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
from
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
#
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
#
|
33
|
-
|
34
|
-
|
35
|
-
#
|
36
|
-
|
37
|
-
|
38
|
-
#
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
|
43
|
-
"
|
44
|
-
"
|
45
|
-
"
|
46
|
-
"
|
47
|
-
"
|
48
|
-
}
|
49
|
-
|
50
|
-
|
51
|
-
|
52
|
-
|
53
|
-
|
54
|
-
#
|
55
|
-
|
56
|
-
|
57
|
-
|
58
|
-
|
59
|
-
|
60
|
-
|
61
|
-
#
|
62
|
-
|
63
|
-
|
64
|
-
#
|
65
|
-
|
66
|
-
|
67
|
-
#
|
68
|
-
|
69
|
-
|
70
|
-
|
71
|
-
|
72
|
-
|
73
|
-
|
74
|
-
|
75
|
-
|
76
|
-
|
77
|
-
|
78
|
-
|
79
|
-
|
80
|
-
|
81
|
-
|
82
|
-
|
83
|
-
|
84
|
-
|
85
|
-
|
86
|
-
|
87
|
-
|
88
|
-
|
89
|
-
|
90
|
-
|
91
|
-
|
92
|
-
|
93
|
-
|
94
|
-
|
95
|
-
|
96
|
-
|
97
|
-
|
98
|
-
|
99
|
-
|
100
|
-
|
101
|
-
|
102
|
-
|
103
|
-
|
104
|
-
|
105
|
-
|
106
|
-
|
107
|
-
|
108
|
-
|
109
|
-
|
110
|
-
|
111
|
-
|
112
|
-
|
113
|
-
|
114
|
-
|
115
|
-
|
116
|
-
|
117
|
-
|
118
|
-
|
119
|
-
|
120
|
-
|
121
|
-
|
122
|
-
|
123
|
-
|
124
|
-
|
125
|
-
|
126
|
-
|
127
|
-
|
128
|
-
|
129
|
-
|
130
|
-
|
131
|
-
|
132
|
-
|
1
|
+
"""
|
2
|
+
Azure Project Management Configuration Template
|
3
|
+
|
4
|
+
This template provides standardized configuration for Azure logging, identity,
|
5
|
+
and KeyVault management across projects. It creates singleton instances of
|
6
|
+
AzureLogger, AzureIdentity, and AzureKeyVault that can be imported and used
|
7
|
+
throughout your application.
|
8
|
+
|
9
|
+
Usage:
|
10
|
+
from mgmt_config import logger, identity, keyvault
|
11
|
+
|
12
|
+
logger.info("Application started")
|
13
|
+
credential = identity.get_credential()
|
14
|
+
secret = keyvault.get_secret("my-secret") if keyvault else None
|
15
|
+
"""
|
16
|
+
|
17
|
+
import os
|
18
|
+
from typing import Optional, Dict, Any
|
19
|
+
from azpaddypy.mgmt.logging import create_app_logger
|
20
|
+
from azpaddypy.mgmt.identity import create_azure_identity
|
21
|
+
from azpaddypy.resources.keyvault import create_azure_keyvault, AzureKeyVault
|
22
|
+
|
23
|
+
# =============================================================================
|
24
|
+
# SERVICE CONFIGURATION
|
25
|
+
# =============================================================================
|
26
|
+
|
27
|
+
# Service identity - customize these for your project
|
28
|
+
SERVICE_NAME = os.getenv("SERVICE_NAME", "cwyodmodules-pacakge")
|
29
|
+
SERVICE_VERSION = os.getenv("SERVICE_VERSION", "1.0.0")
|
30
|
+
|
31
|
+
# =============================================================================
|
32
|
+
# LOGGING CONFIGURATION
|
33
|
+
# =============================================================================
|
34
|
+
|
35
|
+
# Enable console output (useful for local development)
|
36
|
+
LOGGER_ENABLE_CONSOLE = os.getenv("LOGGER_ENABLE_CONSOLE", "true").lower() == "true"
|
37
|
+
|
38
|
+
# Application Insights connection string (optional, will use environment variable if not set)
|
39
|
+
LOGGER_CONNECTION_STRING = os.getenv("APPLICATIONINSIGHTS_CONNECTION_STRING")
|
40
|
+
|
41
|
+
# Configure which Azure SDK components to instrument
|
42
|
+
LOGGER_INSTRUMENTATION_OPTIONS = {
|
43
|
+
"azure_sdk": {"enabled": True},
|
44
|
+
"django": {"enabled": False},
|
45
|
+
"fastapi": {"enabled": False},
|
46
|
+
"flask": {"enabled": True},
|
47
|
+
"psycopg2": {"enabled": True},
|
48
|
+
"requests": {"enabled": True},
|
49
|
+
"urllib": {"enabled": True},
|
50
|
+
"urllib3": {"enabled": True},
|
51
|
+
}
|
52
|
+
|
53
|
+
# =============================================================================
|
54
|
+
# IDENTITY CONFIGURATION
|
55
|
+
# =============================================================================
|
56
|
+
|
57
|
+
# Token caching settings
|
58
|
+
IDENTITY_ENABLE_TOKEN_CACHE = os.getenv("IDENTITY_ENABLE_TOKEN_CACHE", "true").lower() == "true"
|
59
|
+
IDENTITY_ALLOW_UNENCRYPTED_STORAGE = os.getenv("IDENTITY_ALLOW_UNENCRYPTED_STORAGE", "true").lower() == "true"
|
60
|
+
|
61
|
+
# Custom credential options (None means use defaults)
|
62
|
+
IDENTITY_CUSTOM_CREDENTIAL_OPTIONS: Optional[Dict[str, Any]] = None
|
63
|
+
|
64
|
+
# Connection string for identity logging (uses same as logger by default)
|
65
|
+
IDENTITY_CONNECTION_STRING = LOGGER_CONNECTION_STRING
|
66
|
+
|
67
|
+
# =============================================================================
|
68
|
+
# KEYVAULT CONFIGURATION
|
69
|
+
# =============================================================================
|
70
|
+
|
71
|
+
# KeyVault URL (optional, will be None if not configured)
|
72
|
+
KEYVAULT_URL = os.getenv("key_vault_uri")
|
73
|
+
|
74
|
+
# KeyVault client enablement settings
|
75
|
+
KEYVAULT_ENABLE_SECRETS = os.getenv("KEYVAULT_ENABLE_SECRETS", "true").lower() == "true"
|
76
|
+
KEYVAULT_ENABLE_KEYS = os.getenv("KEYVAULT_ENABLE_KEYS", "false").lower() == "true"
|
77
|
+
KEYVAULT_ENABLE_CERTIFICATES = os.getenv("KEYVAULT_ENABLE_CERTIFICATES", "false").lower() == "true"
|
78
|
+
|
79
|
+
# Connection string for KeyVault logging (uses same as logger by default)
|
80
|
+
KEYVAULT_CONNECTION_STRING = LOGGER_CONNECTION_STRING
|
81
|
+
|
82
|
+
# =============================================================================
|
83
|
+
# INITIALIZE SERVICES
|
84
|
+
# =============================================================================
|
85
|
+
|
86
|
+
# Create logger instance
|
87
|
+
logger = create_app_logger(
|
88
|
+
service_name=SERVICE_NAME,
|
89
|
+
service_version=SERVICE_VERSION,
|
90
|
+
connection_string=LOGGER_CONNECTION_STRING,
|
91
|
+
enable_console_logging=LOGGER_ENABLE_CONSOLE,
|
92
|
+
instrumentation_options=LOGGER_INSTRUMENTATION_OPTIONS,
|
93
|
+
)
|
94
|
+
|
95
|
+
# Create identity instance with shared logger
|
96
|
+
identity = create_azure_identity(
|
97
|
+
service_name=SERVICE_NAME,
|
98
|
+
service_version=SERVICE_VERSION,
|
99
|
+
enable_token_cache=IDENTITY_ENABLE_TOKEN_CACHE,
|
100
|
+
allow_unencrypted_storage=IDENTITY_ALLOW_UNENCRYPTED_STORAGE,
|
101
|
+
custom_credential_options=IDENTITY_CUSTOM_CREDENTIAL_OPTIONS,
|
102
|
+
connection_string=IDENTITY_CONNECTION_STRING,
|
103
|
+
logger=logger,
|
104
|
+
)
|
105
|
+
|
106
|
+
# Create KeyVault instance with shared logger and identity (only if URL is configured)
|
107
|
+
keyvault = None
|
108
|
+
if KEYVAULT_URL:
|
109
|
+
keyvault = create_azure_keyvault(
|
110
|
+
vault_url=KEYVAULT_URL,
|
111
|
+
azure_identity=identity,
|
112
|
+
service_name=SERVICE_NAME,
|
113
|
+
service_version=SERVICE_VERSION,
|
114
|
+
logger=logger,
|
115
|
+
connection_string=KEYVAULT_CONNECTION_STRING,
|
116
|
+
enable_secrets=KEYVAULT_ENABLE_SECRETS,
|
117
|
+
enable_keys=KEYVAULT_ENABLE_KEYS,
|
118
|
+
enable_certificates=KEYVAULT_ENABLE_CERTIFICATES,
|
119
|
+
)
|
120
|
+
|
121
|
+
def create_keyvault_client(vault_url: str) -> Optional[AzureKeyVault]:
|
122
|
+
"""Creates a secondary KeyVault client for a different vault."""
|
123
|
+
if not vault_url:
|
124
|
+
return None
|
125
|
+
return create_azure_keyvault(
|
126
|
+
vault_url=vault_url,
|
127
|
+
azure_identity=identity,
|
128
|
+
service_name=SERVICE_NAME,
|
129
|
+
service_version=SERVICE_VERSION,
|
130
|
+
logger=logger,
|
131
|
+
connection_string=KEYVAULT_CONNECTION_STRING,
|
132
|
+
enable_secrets=KEYVAULT_ENABLE_SECRETS,
|
133
|
+
enable_keys=KEYVAULT_ENABLE_KEYS,
|
134
|
+
enable_certificates=KEYVAULT_ENABLE_CERTIFICATES,
|
135
|
+
)
|
136
|
+
|
137
|
+
# =============================================================================
|
138
|
+
# VALIDATION & STARTUP
|
139
|
+
# =============================================================================
|
140
|
+
|
141
|
+
# Validate critical configuration
|
142
|
+
if SERVICE_NAME == "your-service-name":
|
143
|
+
logger.warning(
|
144
|
+
"SERVICE_NAME is not configured. Please set SERVICE_NAME environment variable or update this template.",
|
145
|
+
extra={"configuration_issue": "service_name_not_set"}
|
146
|
+
)
|
147
|
+
|
148
|
+
if not LOGGER_CONNECTION_STRING:
|
149
|
+
logger.info(
|
150
|
+
"No Application Insights connection string configured. Telemetry will be disabled.",
|
151
|
+
extra={"telemetry_status": "disabled"}
|
152
|
+
)
|
153
|
+
|
154
|
+
if not KEYVAULT_URL:
|
155
|
+
logger.info(
|
156
|
+
"No KeyVault URL configured. KeyVault operations will be disabled.",
|
157
|
+
extra={"keyvault_status": "disabled"}
|
158
|
+
)
|
159
|
+
|
160
|
+
# Log successful initialization
|
161
|
+
logger.info(
|
162
|
+
f"Management configuration initialized for service '{SERVICE_NAME}' v{SERVICE_VERSION}",
|
163
|
+
extra={
|
164
|
+
"service_name": SERVICE_NAME,
|
165
|
+
"service_version": SERVICE_VERSION,
|
166
|
+
"console_logging": LOGGER_ENABLE_CONSOLE,
|
167
|
+
"token_cache_enabled": IDENTITY_ENABLE_TOKEN_CACHE,
|
168
|
+
"telemetry_enabled": bool(LOGGER_CONNECTION_STRING),
|
169
|
+
"keyvault_enabled": bool(KEYVAULT_URL),
|
170
|
+
"keyvault_secrets_enabled": KEYVAULT_ENABLE_SECRETS,
|
171
|
+
"keyvault_keys_enabled": KEYVAULT_ENABLE_KEYS,
|
172
|
+
"keyvault_certificates_enabled": KEYVAULT_ENABLE_CERTIFICATES,
|
173
|
+
}
|
174
|
+
)
|
175
|
+
|
176
|
+
# =============================================================================
|
177
|
+
# EXPORTS
|
178
|
+
# =============================================================================
|
179
|
+
|
180
|
+
# Export logger, identity, and keyvault for use in applications
|
181
|
+
__all__ = ["logger", "identity", "keyvault", "create_keyvault_client"]
|
@@ -1,6 +1,6 @@
|
|
1
1
|
Metadata-Version: 2.4
|
2
2
|
Name: cwyodmodules
|
3
|
-
Version: 0.3.
|
3
|
+
Version: 0.3.48
|
4
4
|
Summary: Add your description here
|
5
5
|
Author-email: Patrik <patrikhartl@gmail.com>
|
6
6
|
Classifier: Operating System :: OS Independent
|
@@ -40,7 +40,7 @@ Requires-Dist: azure-search-documents==11.6.0b4
|
|
40
40
|
Requires-Dist: semantic-kernel==1.3.0
|
41
41
|
Requires-Dist: pydantic==2.7.4
|
42
42
|
Requires-Dist: pandas>=2.2.3
|
43
|
-
Requires-Dist: azpaddypy>=0.3.
|
43
|
+
Requires-Dist: azpaddypy>=0.3.7
|
44
44
|
Dynamic: license-file
|
45
45
|
|
46
46
|
# paddypy
|
@@ -1,5 +1,5 @@
|
|
1
1
|
cwyodmodules/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
2
|
-
cwyodmodules/mgmt_config.py,sha256=
|
2
|
+
cwyodmodules/mgmt_config.py,sha256=YFVPC_Q3enDDf3tw9mQ4dWeGfvtCnxsEkIFu0616C4w,7163
|
3
3
|
cwyodmodules/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
4
4
|
cwyodmodules/api/chat_history.py,sha256=bVXFmhTHIfEiHv_nBrfizO-cQRHhKgrdcZ07OD1b0Tw,20683
|
5
5
|
cwyodmodules/batch/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
@@ -37,11 +37,10 @@ cwyodmodules/batch/utilities/helpers/azure_postgres_helper_light_rag.py,sha256=M
|
|
37
37
|
cwyodmodules/batch/utilities/helpers/azure_search_helper.py,sha256=vIIMEck1wPg9oRlWweE2gSZ1nUYc_tmEe4QeFlsrwKk,11314
|
38
38
|
cwyodmodules/batch/utilities/helpers/document_chunking_helper.py,sha256=2MZOjW-fHXgYijP3m9O-nizOlk96Yg0axyxT0K6fTnM,725
|
39
39
|
cwyodmodules/batch/utilities/helpers/document_loading_helper.py,sha256=2HBEl3vW-_PKbX5pPntTC_R5eToTk2Qb-q3M4Mt6hCU,603
|
40
|
-
cwyodmodules/batch/utilities/helpers/env_helper.py,sha256=
|
40
|
+
cwyodmodules/batch/utilities/helpers/env_helper.py,sha256=0wJTaoMAR8rBo1-q2TQx2xqkYktbgk9EsUmZSsvwIJ0,15727
|
41
41
|
cwyodmodules/batch/utilities/helpers/lightrag_helper.py,sha256=7lb9JMm5IohsO73LWo5bWmlzWCGYNsx_fYl-aFdwATQ,3845
|
42
42
|
cwyodmodules/batch/utilities/helpers/llm_helper.py,sha256=lHLYrUidtaemmKrVbWoo7oIvwluUoPUk16U5lV-YIX8,8282
|
43
43
|
cwyodmodules/batch/utilities/helpers/orchestrator_helper.py,sha256=mCcZyMFG0otnw9gzWd-PYocHmDdFDVg-RT9oDPiDZPk,897
|
44
|
-
cwyodmodules/batch/utilities/helpers/secret_helper.py,sha256=KacIc2hHpWtgButUnR3sFC9StLS36HjYvNpTmf2f4gc,2834
|
45
44
|
cwyodmodules/batch/utilities/helpers/config/agent_mode.py,sha256=8XMbu8dwMXva_xxeZNDlwOjDaZwIcwc-xJK1-QsaJ3w,82
|
46
45
|
cwyodmodules/batch/utilities/helpers/config/assistant_strategy.py,sha256=uT8h646zEURU9x8oDOH7pWoZKb0Mw6dA2nJtA2M-ufg,171
|
47
46
|
cwyodmodules/batch/utilities/helpers/config/config_helper.py,sha256=26na6YrLqRLhdSZxTSlOnJOkIcPbTcbFVuPEQTPT3WY,14908
|
@@ -110,8 +109,8 @@ cwyodmodules/graphrag/query/generate.py,sha256=BZiB6iw7PkIovw-CyYFogMHnDxK0Qu_4u
|
|
110
109
|
cwyodmodules/graphrag/query/graph_search.py,sha256=95h3ecSWx4864XgKABtG0fh3Nk8HkqJVzoCrO8daJ-Y,7724
|
111
110
|
cwyodmodules/graphrag/query/types.py,sha256=1Iq1dp4I4a56_cuFjOZ0NTgd0A2_MpVFznp_czgt6cI,617
|
112
111
|
cwyodmodules/graphrag/query/vector_search.py,sha256=9Gwu9LPjtoAYUU8WKqCvbCHAIg3dpk71reoYd1scLnQ,1807
|
113
|
-
cwyodmodules-0.3.
|
114
|
-
cwyodmodules-0.3.
|
115
|
-
cwyodmodules-0.3.
|
116
|
-
cwyodmodules-0.3.
|
117
|
-
cwyodmodules-0.3.
|
112
|
+
cwyodmodules-0.3.48.dist-info/licenses/LICENSE,sha256=UqBDTipijsSW2ZSOXyTZnMsXmLoEHTgNEM0tL4g-Sso,1150
|
113
|
+
cwyodmodules-0.3.48.dist-info/METADATA,sha256=9YMDuaHhW4n_XMuMVucVnaefjDVdVch9u7s6bl4O5Bg,2002
|
114
|
+
cwyodmodules-0.3.48.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
|
115
|
+
cwyodmodules-0.3.48.dist-info/top_level.txt,sha256=99RENLbkdRX-qpJvsxZ5AfmTL5s6shSaKOWYpz1vwzg,13
|
116
|
+
cwyodmodules-0.3.48.dist-info/RECORD,,
|
@@ -1,79 +0,0 @@
|
|
1
|
-
from azure.keyvault.secrets import SecretClient
|
2
|
-
from mgmt_config import logger, identity
|
3
|
-
|
4
|
-
|
5
|
-
class SecretHelper:
|
6
|
-
def __init__(self, keyvault_uri) -> None:
|
7
|
-
"""
|
8
|
-
Initializes an instance of the SecretHelper class.
|
9
|
-
|
10
|
-
The constructor sets the USE_KEY_VAULT attribute based on the value of the USE_KEY_VAULT environment variable.
|
11
|
-
If USE_KEY_VAULT is set to "true" (case-insensitive), it initializes a SecretClient object using the
|
12
|
-
AZURE_KEY_VAULT_ENDPOINT environment variable and the DefaultAzureCredential.
|
13
|
-
|
14
|
-
Args:
|
15
|
-
None
|
16
|
-
|
17
|
-
Returns:
|
18
|
-
None
|
19
|
-
"""
|
20
|
-
self.USE_KEY_VAULT = True
|
21
|
-
self.secret_client = None
|
22
|
-
if self.USE_KEY_VAULT:
|
23
|
-
credential = identity.get_credential()
|
24
|
-
self.secret_client = SecretClient(
|
25
|
-
vault_url=keyvault_uri,
|
26
|
-
credential=credential,
|
27
|
-
connection_verify=True,
|
28
|
-
)
|
29
|
-
|
30
|
-
@logger.trace_function(log_execution=True, log_args=False, log_result=False)
|
31
|
-
def get_secret(self, secret_name: str) -> str:
|
32
|
-
"""
|
33
|
-
Retrieves the value of a secret from the environment variables or Azure Key Vault.
|
34
|
-
|
35
|
-
Args:
|
36
|
-
secret_name (str): The name of the secret or "".
|
37
|
-
|
38
|
-
Returns:
|
39
|
-
str: The value of the secret.
|
40
|
-
|
41
|
-
Raises:
|
42
|
-
None
|
43
|
-
|
44
|
-
"""
|
45
|
-
secret_value = self.secret_client.get_secret(name=secret_name).value
|
46
|
-
return secret_value
|
47
|
-
|
48
|
-
@logger.trace_function(log_execution=True, log_args=False, log_result=False)
|
49
|
-
def set_secret(self, secret_name: str, secret_value: str) -> None:
|
50
|
-
"""
|
51
|
-
Sets the value of a secret in Azure Key Vault only if it doesn't exist or has a different value.
|
52
|
-
|
53
|
-
Args:
|
54
|
-
secret_name (str): The name of the secret.
|
55
|
-
secret_value (str): The value to be stored.
|
56
|
-
|
57
|
-
Returns:
|
58
|
-
None
|
59
|
-
|
60
|
-
Raises:
|
61
|
-
None
|
62
|
-
"""
|
63
|
-
try:
|
64
|
-
current_secret = self.secret_client.get_secret(name=secret_name)
|
65
|
-
if current_secret.value != secret_value:
|
66
|
-
self.secret_client.set_secret(name=secret_name, value=secret_value)
|
67
|
-
else:
|
68
|
-
logger.warning(
|
69
|
-
f"Secret {secret_name} already has the same value, skipping update"
|
70
|
-
)
|
71
|
-
except Exception:
|
72
|
-
self.secret_client.set_secret(name=secret_name, value=secret_value)
|
73
|
-
logger.warning(f"Secret {secret_name} has been created")
|
74
|
-
|
75
|
-
|
76
|
-
@logger.trace_function(log_execution=True, log_args=False, log_result=False)
|
77
|
-
def get_secret_from_json(self, secret_name: str) -> str:
|
78
|
-
secret_value = self.secret_client.get_secret(secret_name).value
|
79
|
-
return secret_value
|
File without changes
|
File without changes
|
File without changes
|