cwyodmodules 0.3.62__py3-none-any.whl → 0.3.63__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 +34 -28
- {cwyodmodules-0.3.62.dist-info → cwyodmodules-0.3.63.dist-info}/METADATA +1 -1
- {cwyodmodules-0.3.62.dist-info → cwyodmodules-0.3.63.dist-info}/RECORD +6 -6
- {cwyodmodules-0.3.62.dist-info → cwyodmodules-0.3.63.dist-info}/WHEEL +0 -0
- {cwyodmodules-0.3.62.dist-info → cwyodmodules-0.3.63.dist-info}/licenses/LICENSE +0 -0
- {cwyodmodules-0.3.62.dist-info → cwyodmodules-0.3.63.dist-info}/top_level.txt +0 -0
@@ -7,7 +7,7 @@ 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
9
|
|
10
|
-
from mgmt_config import logger,
|
10
|
+
from mgmt_config import logger, identity, keyvault, head_keyvault
|
11
11
|
|
12
12
|
|
13
13
|
|
@@ -25,10 +25,16 @@ class EnvHelper:
|
|
25
25
|
|
26
26
|
@logger.trace_function(log_execution=True, log_args=False, log_result=False)
|
27
27
|
def __load_config(self, **kwargs) -> None:
|
28
|
-
|
29
|
-
self.head_keyvault = head_keyvault
|
30
|
-
local_env_manager.print_settings()
|
28
|
+
|
31
29
|
logger.info("Initializing EnvHelper")
|
30
|
+
logger.info("key_vault_uri: " + os.getenv("key_vault_uri"))
|
31
|
+
logger.info("head_key_vault_uri: " + os.getenv("head_key_vault_uri"))
|
32
|
+
|
33
|
+
if not keyvault:
|
34
|
+
raise ValueError("keyvault is not configured. Please set 'key_vault_uri' environment variable.")
|
35
|
+
|
36
|
+
if not head_keyvault:
|
37
|
+
raise ValueError("head_keyvault is not configured. Please set 'head_key_vault_uri' environment variable.")
|
32
38
|
|
33
39
|
# Wrapper for Azure Key Vault
|
34
40
|
os.environ["APPLICATIONINSIGHTS_ENABLED"] = "true"
|
@@ -40,7 +46,7 @@ class EnvHelper:
|
|
40
46
|
# keyvault_uri="https://www.kv-main-cwyod-hd-res1.vault.azure.net/"
|
41
47
|
# )
|
42
48
|
|
43
|
-
self.LOGLEVEL =
|
49
|
+
self.LOGLEVEL = keyvault.get_secret("logging-level")
|
44
50
|
self.LOG_EXECUTION = self.get_env_var_bool(
|
45
51
|
"LOG_EXECUTION", "True"
|
46
52
|
)
|
@@ -52,18 +58,18 @@ class EnvHelper:
|
|
52
58
|
)
|
53
59
|
|
54
60
|
# Azure
|
55
|
-
self.AZURE_SUBSCRIPTION_ID =
|
56
|
-
self.AZURE_RESOURCE_GROUP =
|
57
|
-
self.AZURE_HEAD_RESOURCE_GROUP =
|
61
|
+
self.AZURE_SUBSCRIPTION_ID = keyvault.get_secret("subscription-id")
|
62
|
+
self.AZURE_RESOURCE_GROUP = keyvault.get_secret("resource-group-name")
|
63
|
+
self.AZURE_HEAD_RESOURCE_GROUP = head_keyvault.get_secret(
|
58
64
|
"resource-group-name"
|
59
65
|
)
|
60
|
-
self.AZURE_RESOURCE_ENVIRONMENT =
|
66
|
+
self.AZURE_RESOURCE_ENVIRONMENT = keyvault.get_secret(
|
61
67
|
"resource-group-environment"
|
62
68
|
)
|
63
69
|
self.AZURE_RESOURCE_PRIVATE = (
|
64
|
-
|
70
|
+
keyvault.get_secret("run-private-endpoint").lower() == "true"
|
65
71
|
)
|
66
|
-
self.PROJECT_CODE =
|
72
|
+
self.PROJECT_CODE = keyvault.get_secret("project-code")
|
67
73
|
self.APP_NAME = os.getenv("REFLECTION_NAME", "Default")
|
68
74
|
self.POSTGRESQL_NAME = (
|
69
75
|
f"psql-main-{self.PROJECT_CODE}-{self.AZURE_RESOURCE_ENVIRONMENT}"
|
@@ -78,7 +84,7 @@ class EnvHelper:
|
|
78
84
|
f"https://{self.AZURE_BLOB_ACCOUNT_NAME}.blob.core.windows.net/"
|
79
85
|
)
|
80
86
|
|
81
|
-
self.AZURE_FUNCTION_APP_ENDPOINT =
|
87
|
+
self.AZURE_FUNCTION_APP_ENDPOINT = keyvault.get_secret(
|
82
88
|
f"func-backend-{self.PROJECT_CODE}-{self.AZURE_RESOURCE_ENVIRONMENT}-endpoint"
|
83
89
|
)
|
84
90
|
self.AZURE_BLOB_CONTAINER_NAME = "documents"
|
@@ -110,7 +116,7 @@ class EnvHelper:
|
|
110
116
|
self.AZURE_COSMOSDB_CONVERSATIONS_CONTAINER = os.getenv(
|
111
117
|
"AZURE_COSMOSDB_CONVERSATIONS_CONTAINER_NAME", ""
|
112
118
|
)
|
113
|
-
self.AZURE_COSMOSDB_ACCOUNT_KEY =
|
119
|
+
self.AZURE_COSMOSDB_ACCOUNT_KEY = keyvault.get_secret(
|
114
120
|
"AZURE_COSMOSDB_ACCOUNT_KEY"
|
115
121
|
)
|
116
122
|
self.AZURE_COSMOSDB_ENABLE_FEEDBACK = (
|
@@ -137,10 +143,10 @@ class EnvHelper:
|
|
137
143
|
self.POSTGRESQL_HOST = azure_postgresql_info.get("host", "")
|
138
144
|
else:
|
139
145
|
self.POSTGRESQL_USER = "cwyod_project_uai"
|
140
|
-
self.POSTGRESQL_DATABASE =
|
146
|
+
self.POSTGRESQL_DATABASE = keyvault.get_secret(
|
141
147
|
f"{self.POSTGRESQL_NAME}-default-database-name"
|
142
148
|
)
|
143
|
-
self.POSTGRESQL_HOST =
|
149
|
+
self.POSTGRESQL_HOST = keyvault.get_secret(
|
144
150
|
f"{self.POSTGRESQL_NAME}-server-name"
|
145
151
|
)
|
146
152
|
# Ensure integrated vectorization is disabled for PostgreSQL
|
@@ -172,11 +178,11 @@ class EnvHelper:
|
|
172
178
|
True if self.AZURE_OPENAI_STREAM.lower() == "true" else False
|
173
179
|
)
|
174
180
|
|
175
|
-
# self.AZURE_COMPUTER_VISION_NAME =
|
181
|
+
# self.AZURE_COMPUTER_VISION_NAME = head_keyvault.get_secret(
|
176
182
|
# "cognitive-kind-ComputerVision"
|
177
183
|
# )
|
178
184
|
self.AZURE_COMPUTER_VISION_NAME = ""
|
179
|
-
# self.AZURE_COMPUTER_VISION_ENDPOINT =
|
185
|
+
# self.AZURE_COMPUTER_VISION_ENDPOINT = head_keyvault.get_secret(
|
180
186
|
# f"{self.AZURE_COMPUTER_VISION_NAME}-endpoint"
|
181
187
|
# )
|
182
188
|
self.AZURE_COMPUTER_VISION_ENDPOINT = ""
|
@@ -192,16 +198,16 @@ class EnvHelper:
|
|
192
198
|
self.AZURE_OPENAI_API_KEY = ""
|
193
199
|
self.AZURE_COMPUTER_VISION_KEY = None
|
194
200
|
else:
|
195
|
-
self.AZURE_SEARCH_KEY =
|
196
|
-
self.AZURE_OPENAI_API_KEY =
|
201
|
+
self.AZURE_SEARCH_KEY = keyvault.get_secret("AZURE_SEARCH_KEY")
|
202
|
+
self.AZURE_OPENAI_API_KEY = keyvault.get_secret(
|
197
203
|
"AZURE_OPENAI_API_KEY"
|
198
204
|
)
|
199
|
-
self.AZURE_COMPUTER_VISION_KEY =
|
205
|
+
self.AZURE_COMPUTER_VISION_KEY = keyvault.get_secret(
|
200
206
|
"AZURE_COMPUTER_VISION_KEY"
|
201
207
|
)
|
202
208
|
|
203
209
|
# Set env for Azure OpenAI
|
204
|
-
self.AZURE_AI_SERVICES_NAME =
|
210
|
+
self.AZURE_AI_SERVICES_NAME = head_keyvault.get_secret(
|
205
211
|
"cognitive-kind-AIServices"
|
206
212
|
)
|
207
213
|
self.AZURE_OPENAI_ENDPOINT = (
|
@@ -221,10 +227,10 @@ class EnvHelper:
|
|
221
227
|
|
222
228
|
# Azure Form Recognizer
|
223
229
|
|
224
|
-
self.AZURE_FORM_RECOGNIZER_NAME =
|
230
|
+
self.AZURE_FORM_RECOGNIZER_NAME = keyvault.get_secret(
|
225
231
|
"cognitive-kind-FormRecognizer"
|
226
232
|
)
|
227
|
-
self.AZURE_FORM_RECOGNIZER_ENDPOINT =
|
233
|
+
self.AZURE_FORM_RECOGNIZER_ENDPOINT = keyvault.get_secret(
|
228
234
|
f"{self.AZURE_FORM_RECOGNIZER_NAME}-endpoint"
|
229
235
|
)
|
230
236
|
|
@@ -233,18 +239,18 @@ class EnvHelper:
|
|
233
239
|
self.APPLICATIONINSIGHTS_ENABLED = "True"
|
234
240
|
|
235
241
|
# Azure AI Content Safety
|
236
|
-
self.AZURE_CONTENT_SAFETY_NAME =
|
242
|
+
self.AZURE_CONTENT_SAFETY_NAME = head_keyvault.get_secret(
|
237
243
|
"cognitive-kind-ContentSafety"
|
238
244
|
)
|
239
|
-
self.AZURE_CONTENT_SAFETY_ENDPOINT =
|
245
|
+
self.AZURE_CONTENT_SAFETY_ENDPOINT = head_keyvault.get_secret(
|
240
246
|
f"{self.AZURE_CONTENT_SAFETY_NAME}-endpoint"
|
241
247
|
)
|
242
248
|
|
243
249
|
# Speech Service
|
244
|
-
self.AZURE_SPEECH_SERVICE_NAME =
|
250
|
+
self.AZURE_SPEECH_SERVICE_NAME = head_keyvault.get_secret(
|
245
251
|
"cognitive-kind-SpeechServices"
|
246
252
|
)
|
247
|
-
self.AZURE_SPEECH_ENDPOINT =
|
253
|
+
self.AZURE_SPEECH_ENDPOINT = head_keyvault.get_secret(
|
248
254
|
f"{self.AZURE_SPEECH_SERVICE_NAME}-endpoint"
|
249
255
|
)
|
250
256
|
|
@@ -257,7 +263,7 @@ class EnvHelper:
|
|
257
263
|
self.AZURE_SPEECH_REGION_ENDPOINT = (
|
258
264
|
f"https://{self.AZURE_SPEECH_SERVICE_REGION}.api.cognitive.microsoft.com/"
|
259
265
|
)
|
260
|
-
self.AZURE_SPEECH_KEY =
|
266
|
+
self.AZURE_SPEECH_KEY = head_keyvault.get_secret(f"{self.AZURE_SPEECH_SERVICE_NAME}-key") # changed from None to allow private endpoint communication
|
261
267
|
|
262
268
|
self.LOAD_CONFIG_FROM_BLOB_STORAGE = self.get_env_var_bool(
|
263
269
|
"LOAD_CONFIG_FROM_BLOB_STORAGE"
|
@@ -37,7 +37,7 @@ 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=o9t3Op8vhg41lQMj-PSTVk98aWb1r60kyTw7w1wc-fc,15849
|
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
|
@@ -109,8 +109,8 @@ cwyodmodules/graphrag/query/generate.py,sha256=BZiB6iw7PkIovw-CyYFogMHnDxK0Qu_4u
|
|
109
109
|
cwyodmodules/graphrag/query/graph_search.py,sha256=95h3ecSWx4864XgKABtG0fh3Nk8HkqJVzoCrO8daJ-Y,7724
|
110
110
|
cwyodmodules/graphrag/query/types.py,sha256=1Iq1dp4I4a56_cuFjOZ0NTgd0A2_MpVFznp_czgt6cI,617
|
111
111
|
cwyodmodules/graphrag/query/vector_search.py,sha256=9Gwu9LPjtoAYUU8WKqCvbCHAIg3dpk71reoYd1scLnQ,1807
|
112
|
-
cwyodmodules-0.3.
|
113
|
-
cwyodmodules-0.3.
|
114
|
-
cwyodmodules-0.3.
|
115
|
-
cwyodmodules-0.3.
|
116
|
-
cwyodmodules-0.3.
|
112
|
+
cwyodmodules-0.3.63.dist-info/licenses/LICENSE,sha256=UqBDTipijsSW2ZSOXyTZnMsXmLoEHTgNEM0tL4g-Sso,1150
|
113
|
+
cwyodmodules-0.3.63.dist-info/METADATA,sha256=eHVwQPY_4fC1aQCejin3Y1A5IP0ls-w1JDOlpgpOgbY,2002
|
114
|
+
cwyodmodules-0.3.63.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
|
115
|
+
cwyodmodules-0.3.63.dist-info/top_level.txt,sha256=99RENLbkdRX-qpJvsxZ5AfmTL5s6shSaKOWYpz1vwzg,13
|
116
|
+
cwyodmodules-0.3.63.dist-info/RECORD,,
|
File without changes
|
File without changes
|
File without changes
|