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