srx-lib-azure 0.1.7__py3-none-any.whl → 0.1.8__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.
- srx_lib_azure/__init__.py +0 -1
- srx_lib_azure/blob.py +116 -16
- srx_lib_azure/email.py +55 -4
- srx_lib_azure/table.py +119 -23
- {srx_lib_azure-0.1.7.dist-info → srx_lib_azure-0.1.8.dist-info}/METADATA +1 -1
- srx_lib_azure-0.1.8.dist-info/RECORD +7 -0
- srx_lib_azure-0.1.7.dist-info/RECORD +0 -7
- {srx_lib_azure-0.1.7.dist-info → srx_lib_azure-0.1.8.dist-info}/WHEEL +0 -0
srx_lib_azure/__init__.py
CHANGED
srx_lib_azure/blob.py
CHANGED
|
@@ -4,6 +4,11 @@ from datetime import datetime, timedelta, timezone
|
|
|
4
4
|
from typing import Optional, BinaryIO, Tuple
|
|
5
5
|
|
|
6
6
|
from azure.storage.blob import BlobServiceClient, BlobSasPermissions, generate_blob_sas
|
|
7
|
+
from azure.core.exceptions import (
|
|
8
|
+
ResourceNotFoundError,
|
|
9
|
+
ClientAuthenticationError,
|
|
10
|
+
HttpResponseError,
|
|
11
|
+
)
|
|
7
12
|
from fastapi import UploadFile
|
|
8
13
|
|
|
9
14
|
from loguru import logger
|
|
@@ -49,9 +54,7 @@ class AzureBlobService:
|
|
|
49
54
|
return None, None
|
|
50
55
|
try:
|
|
51
56
|
clean = self.connection_string.strip().strip('"').strip("'")
|
|
52
|
-
parts = dict(
|
|
53
|
-
seg.split("=", 1) for seg in clean.split(";") if "=" in seg
|
|
54
|
-
)
|
|
57
|
+
parts = dict(seg.split("=", 1) for seg in clean.split(";") if "=" in seg)
|
|
55
58
|
account_name = parts.get("AccountName")
|
|
56
59
|
account_key = parts.get("AccountKey") or self.account_key
|
|
57
60
|
return account_name, account_key
|
|
@@ -93,9 +96,20 @@ class AzureBlobService:
|
|
|
93
96
|
if self.base_blob_url:
|
|
94
97
|
base_url = self.base_blob_url.strip().strip('"').strip("'").rstrip("/")
|
|
95
98
|
return f"{base_url}/{blob_name}?{sas}"
|
|
96
|
-
return
|
|
99
|
+
return (
|
|
100
|
+
f"https://{account_name}.blob.core.windows.net/{self.container_name}/{blob_name}?{sas}"
|
|
101
|
+
)
|
|
97
102
|
|
|
98
103
|
async def upload_file(self, file: UploadFile, blob_path: str) -> Optional[str]:
|
|
104
|
+
"""Upload a file to Azure Blob Storage and return a SAS URL.
|
|
105
|
+
|
|
106
|
+
Args:
|
|
107
|
+
file: File to upload
|
|
108
|
+
blob_path: Destination path in the container
|
|
109
|
+
|
|
110
|
+
Returns:
|
|
111
|
+
SAS URL if successful, None on error
|
|
112
|
+
"""
|
|
99
113
|
if not self.connection_string:
|
|
100
114
|
logger.error("Azure Storage connection string not configured")
|
|
101
115
|
return None
|
|
@@ -105,13 +119,37 @@ class AzureBlobService:
|
|
|
105
119
|
container = client.get_container_client(self.container_name)
|
|
106
120
|
content = await file.read()
|
|
107
121
|
blob_client = container.get_blob_client(blob_path)
|
|
108
|
-
blob_client.upload_blob(
|
|
122
|
+
blob_client.upload_blob(
|
|
123
|
+
content,
|
|
124
|
+
overwrite=True,
|
|
125
|
+
content_type=file.content_type or "application/octet-stream",
|
|
126
|
+
)
|
|
109
127
|
return self._generate_sas_url(blob_path)
|
|
128
|
+
except ClientAuthenticationError as e:
|
|
129
|
+
logger.error(f"Authentication failed uploading {file.filename}: {e}")
|
|
130
|
+
return None
|
|
131
|
+
except HttpResponseError as e:
|
|
132
|
+
logger.error(
|
|
133
|
+
f"Azure service error uploading {file.filename}: {e.status_code} - {e.message}"
|
|
134
|
+
)
|
|
135
|
+
return None
|
|
110
136
|
except Exception as e:
|
|
111
|
-
logger.error(f"
|
|
137
|
+
logger.error(f"Unexpected error uploading {file.filename}: {e}")
|
|
112
138
|
return None
|
|
113
139
|
|
|
114
|
-
async def upload_stream(
|
|
140
|
+
async def upload_stream(
|
|
141
|
+
self, stream: BinaryIO, blob_path: str, content_type: str = "application/octet-stream"
|
|
142
|
+
) -> Optional[str]:
|
|
143
|
+
"""Upload a binary stream to Azure Blob Storage and return a SAS URL.
|
|
144
|
+
|
|
145
|
+
Args:
|
|
146
|
+
stream: Binary stream to upload
|
|
147
|
+
blob_path: Destination path in the container
|
|
148
|
+
content_type: MIME type of the content
|
|
149
|
+
|
|
150
|
+
Returns:
|
|
151
|
+
SAS URL if successful, None on error
|
|
152
|
+
"""
|
|
115
153
|
if not self.connection_string:
|
|
116
154
|
logger.error("Azure Storage connection string not configured")
|
|
117
155
|
return None
|
|
@@ -122,12 +160,27 @@ class AzureBlobService:
|
|
|
122
160
|
blob_client = container.get_blob_client(blob_path)
|
|
123
161
|
blob_client.upload_blob(stream, overwrite=True, content_type=content_type)
|
|
124
162
|
return self._generate_sas_url(blob_path)
|
|
163
|
+
except ClientAuthenticationError as e:
|
|
164
|
+
logger.error(f"Authentication failed uploading stream to {blob_path}: {e}")
|
|
165
|
+
return None
|
|
166
|
+
except HttpResponseError as e:
|
|
167
|
+
logger.error(
|
|
168
|
+
f"Azure service error uploading stream to {blob_path}: {e.status_code} - {e.message}"
|
|
169
|
+
)
|
|
170
|
+
return None
|
|
125
171
|
except Exception as e:
|
|
126
|
-
logger.error(f"
|
|
172
|
+
logger.error(f"Unexpected error uploading stream to {blob_path}: {e}")
|
|
127
173
|
return None
|
|
128
174
|
|
|
129
175
|
async def download_file(self, blob_path: str) -> Optional[bytes]:
|
|
130
|
-
"""Download a blob's content as bytes.
|
|
176
|
+
"""Download a blob's content as bytes.
|
|
177
|
+
|
|
178
|
+
Returns:
|
|
179
|
+
bytes if successful, None if blob doesn't exist
|
|
180
|
+
|
|
181
|
+
Raises:
|
|
182
|
+
RuntimeError: For connection/auth errors (caller should handle)
|
|
183
|
+
"""
|
|
131
184
|
if not self.connection_string:
|
|
132
185
|
logger.error("Azure Storage connection string not configured")
|
|
133
186
|
return None
|
|
@@ -139,9 +192,24 @@ class AzureBlobService:
|
|
|
139
192
|
content = download_stream.readall()
|
|
140
193
|
logger.info(f"Successfully downloaded {blob_path}")
|
|
141
194
|
return content
|
|
142
|
-
except
|
|
143
|
-
|
|
195
|
+
except ResourceNotFoundError:
|
|
196
|
+
# Blob doesn't exist - this is expected in many scenarios
|
|
197
|
+
logger.info(f"Blob not found: {blob_path}")
|
|
144
198
|
return None
|
|
199
|
+
except ClientAuthenticationError as e:
|
|
200
|
+
# Auth errors should not be retried - they need credential fixes
|
|
201
|
+
logger.error(f"Authentication failed for {blob_path}: {e}")
|
|
202
|
+
raise RuntimeError(f"Azure authentication failed: {e}") from e
|
|
203
|
+
except HttpResponseError as e:
|
|
204
|
+
# Other Azure service errors (rate limits, service issues, etc.)
|
|
205
|
+
logger.error(
|
|
206
|
+
f"Azure service error downloading {blob_path}: {e.status_code} - {e.message}"
|
|
207
|
+
)
|
|
208
|
+
raise RuntimeError(f"Azure Blob download failed for {blob_path}: {e.message}") from e
|
|
209
|
+
except Exception as e:
|
|
210
|
+
# Catch-all for unexpected errors (network, etc.)
|
|
211
|
+
logger.error(f"Unexpected error downloading {blob_path}: {e}")
|
|
212
|
+
raise RuntimeError(f"Unexpected error downloading {blob_path}: {e}") from e
|
|
145
213
|
|
|
146
214
|
async def download_to_temp_file(self, blob_path: str) -> Optional[str]:
|
|
147
215
|
"""Download a blob to a temporary file and return its path."""
|
|
@@ -149,7 +217,9 @@ class AzureBlobService:
|
|
|
149
217
|
if content is None:
|
|
150
218
|
return None
|
|
151
219
|
try:
|
|
152
|
-
with tempfile.NamedTemporaryFile(
|
|
220
|
+
with tempfile.NamedTemporaryFile(
|
|
221
|
+
delete=False, suffix=os.path.splitext(blob_path)[1]
|
|
222
|
+
) as tf:
|
|
153
223
|
tf.write(content)
|
|
154
224
|
path = tf.name
|
|
155
225
|
logger.info(f"Downloaded {blob_path} to temporary file: {path}")
|
|
@@ -172,7 +242,14 @@ class AzureBlobService:
|
|
|
172
242
|
return None
|
|
173
243
|
|
|
174
244
|
async def delete_file(self, blob_path: str) -> bool:
|
|
175
|
-
"""Delete a blob and return True on success.
|
|
245
|
+
"""Delete a blob and return True on success.
|
|
246
|
+
|
|
247
|
+
Args:
|
|
248
|
+
blob_path: Path to the blob to delete
|
|
249
|
+
|
|
250
|
+
Returns:
|
|
251
|
+
True if deleted successfully or blob doesn't exist, False on error
|
|
252
|
+
"""
|
|
176
253
|
if not self.connection_string:
|
|
177
254
|
logger.error("Azure Storage connection string not configured")
|
|
178
255
|
return False
|
|
@@ -183,12 +260,29 @@ class AzureBlobService:
|
|
|
183
260
|
blob_client.delete_blob()
|
|
184
261
|
logger.info(f"Successfully deleted {blob_path}")
|
|
185
262
|
return True
|
|
263
|
+
except ResourceNotFoundError:
|
|
264
|
+
# Blob already doesn't exist - this is still success
|
|
265
|
+
logger.info(f"Blob {blob_path} already deleted or doesn't exist")
|
|
266
|
+
return True
|
|
267
|
+
except ClientAuthenticationError as e:
|
|
268
|
+
logger.error(f"Authentication failed when deleting {blob_path}: {e}")
|
|
269
|
+
return False
|
|
270
|
+
except HttpResponseError as e:
|
|
271
|
+
logger.error(f"Azure service error deleting {blob_path}: {e.status_code} - {e.message}")
|
|
272
|
+
return False
|
|
186
273
|
except Exception as e:
|
|
187
|
-
logger.error(f"
|
|
274
|
+
logger.error(f"Unexpected error deleting {blob_path}: {e}")
|
|
188
275
|
return False
|
|
189
276
|
|
|
190
277
|
async def file_exists(self, blob_path: str) -> bool:
|
|
191
|
-
"""Check if a blob exists in the container.
|
|
278
|
+
"""Check if a blob exists in the container.
|
|
279
|
+
|
|
280
|
+
Args:
|
|
281
|
+
blob_path: Path to the blob to check
|
|
282
|
+
|
|
283
|
+
Returns:
|
|
284
|
+
True if blob exists, False otherwise (including on errors)
|
|
285
|
+
"""
|
|
192
286
|
if not self.connection_string:
|
|
193
287
|
logger.error("Azure Storage connection string not configured")
|
|
194
288
|
return False
|
|
@@ -197,6 +291,12 @@ class AzureBlobService:
|
|
|
197
291
|
container = client.get_container_client(self.container_name)
|
|
198
292
|
blob_client = container.get_blob_client(blob_path)
|
|
199
293
|
return blob_client.exists()
|
|
294
|
+
except ClientAuthenticationError as e:
|
|
295
|
+
logger.error(f"Authentication failed checking {blob_path}: {e}")
|
|
296
|
+
return False
|
|
297
|
+
except HttpResponseError as e:
|
|
298
|
+
logger.error(f"Azure service error checking {blob_path}: {e.status_code} - {e.message}")
|
|
299
|
+
return False
|
|
200
300
|
except Exception as e:
|
|
201
|
-
logger.error(f"
|
|
301
|
+
logger.error(f"Unexpected error checking existence of {blob_path}: {e}")
|
|
202
302
|
return False
|
srx_lib_azure/email.py
CHANGED
|
@@ -4,8 +4,16 @@ from typing import Dict, Any
|
|
|
4
4
|
|
|
5
5
|
try:
|
|
6
6
|
from azure.communication.email.aio import EmailClient
|
|
7
|
+
from azure.core.exceptions import (
|
|
8
|
+
ClientAuthenticationError,
|
|
9
|
+
HttpResponseError,
|
|
10
|
+
ServiceRequestError,
|
|
11
|
+
)
|
|
7
12
|
except Exception: # pragma: no cover - optional dependency at import time
|
|
8
13
|
EmailClient = None # type: ignore
|
|
14
|
+
ClientAuthenticationError = None # type: ignore
|
|
15
|
+
HttpResponseError = None # type: ignore
|
|
16
|
+
ServiceRequestError = None # type: ignore
|
|
9
17
|
|
|
10
18
|
logger = logging.getLogger(__name__)
|
|
11
19
|
|
|
@@ -39,10 +47,27 @@ class EmailService:
|
|
|
39
47
|
self.email_client = None
|
|
40
48
|
logger.warning("EmailService initialization failed: %s", e)
|
|
41
49
|
|
|
42
|
-
async def send_notification(
|
|
50
|
+
async def send_notification(
|
|
51
|
+
self, recipient: str, subject: str, body: str, html: bool = False
|
|
52
|
+
) -> Dict[str, Any]:
|
|
53
|
+
"""Send an email notification via Azure Communication Services.
|
|
54
|
+
|
|
55
|
+
Args:
|
|
56
|
+
recipient: Email address of the recipient
|
|
57
|
+
subject: Email subject line
|
|
58
|
+
body: Email body content
|
|
59
|
+
html: If True, send as HTML; otherwise plain text
|
|
60
|
+
|
|
61
|
+
Returns:
|
|
62
|
+
Dict with status, message, and optional message_id
|
|
63
|
+
- status: "success" | "error" | "skipped"
|
|
64
|
+
- message: Human-readable message
|
|
65
|
+
- message_id: Azure message ID (only on success)
|
|
66
|
+
"""
|
|
43
67
|
if not self.email_client or not self.sender_address:
|
|
44
68
|
logger.warning("Email skipped: service not configured")
|
|
45
69
|
return {"status": "skipped", "message": "Email service not configured"}
|
|
70
|
+
|
|
46
71
|
message = {
|
|
47
72
|
"content": {"subject": subject},
|
|
48
73
|
"recipients": {"to": [{"address": recipient}]},
|
|
@@ -52,15 +77,41 @@ class EmailService:
|
|
|
52
77
|
message["content"]["html"] = body
|
|
53
78
|
else:
|
|
54
79
|
message["content"]["plainText"] = body
|
|
80
|
+
|
|
55
81
|
try:
|
|
56
82
|
poller = await self.email_client.begin_send(message)
|
|
57
83
|
result = await poller.result()
|
|
58
84
|
message_id = result.get("id")
|
|
59
85
|
if message_id:
|
|
60
86
|
logger.info("Email sent to %s with Message ID: %s", recipient, message_id)
|
|
61
|
-
return {
|
|
87
|
+
return {
|
|
88
|
+
"status": "success",
|
|
89
|
+
"message": "Email sent successfully",
|
|
90
|
+
"message_id": message_id,
|
|
91
|
+
}
|
|
62
92
|
logger.error("Failed to send email. Result: %s", result)
|
|
63
93
|
return {"status": "error", "message": f"Failed to send email: {result}"}
|
|
94
|
+
except ClientAuthenticationError as e:
|
|
95
|
+
# Auth errors should not be retried - they need credential fixes
|
|
96
|
+
logger.error("Authentication failed sending email to %s: %s", recipient, e)
|
|
97
|
+
return {"status": "error", "message": f"Authentication failed: {e}"}
|
|
98
|
+
except HttpResponseError as e:
|
|
99
|
+
# Azure service errors (rate limits, invalid recipient, etc.)
|
|
100
|
+
logger.error(
|
|
101
|
+
"Azure service error sending email to %s: %s - %s",
|
|
102
|
+
recipient,
|
|
103
|
+
e.status_code,
|
|
104
|
+
e.message,
|
|
105
|
+
)
|
|
106
|
+
return {
|
|
107
|
+
"status": "error",
|
|
108
|
+
"message": f"Azure service error ({e.status_code}): {e.message}",
|
|
109
|
+
}
|
|
110
|
+
except ServiceRequestError as e:
|
|
111
|
+
# Network/connection errors - may be retryable
|
|
112
|
+
logger.error("Network error sending email to %s: %s", recipient, e)
|
|
113
|
+
return {"status": "error", "message": f"Network error: {e}"}
|
|
64
114
|
except Exception as e:
|
|
65
|
-
|
|
66
|
-
|
|
115
|
+
# Catch-all for unexpected errors
|
|
116
|
+
logger.error("Unexpected error sending email to %s: %s", recipient, e)
|
|
117
|
+
return {"status": "error", "message": f"Unexpected error: {e}"}
|
srx_lib_azure/table.py
CHANGED
|
@@ -9,8 +9,18 @@ from loguru import logger
|
|
|
9
9
|
|
|
10
10
|
try:
|
|
11
11
|
from azure.data.tables import TableServiceClient
|
|
12
|
+
from azure.core.exceptions import (
|
|
13
|
+
ResourceNotFoundError,
|
|
14
|
+
ResourceExistsError,
|
|
15
|
+
ClientAuthenticationError,
|
|
16
|
+
HttpResponseError,
|
|
17
|
+
)
|
|
12
18
|
except Exception: # pragma: no cover
|
|
13
19
|
TableServiceClient = None # type: ignore
|
|
20
|
+
ResourceNotFoundError = None # type: ignore
|
|
21
|
+
ResourceExistsError = None # type: ignore
|
|
22
|
+
ClientAuthenticationError = None # type: ignore
|
|
23
|
+
HttpResponseError = None # type: ignore
|
|
14
24
|
|
|
15
25
|
|
|
16
26
|
def _now_iso() -> str:
|
|
@@ -62,15 +72,25 @@ class AzureTableService:
|
|
|
62
72
|
table_name: Name of the table to delete
|
|
63
73
|
|
|
64
74
|
Returns:
|
|
65
|
-
True if deleted successfully, False
|
|
75
|
+
True if deleted successfully or table doesn't exist, False on other errors
|
|
66
76
|
"""
|
|
67
77
|
client = self._get_client()
|
|
68
78
|
try:
|
|
69
79
|
client.delete_table(table_name=table_name)
|
|
70
80
|
logger.info("Deleted table: %s", table_name)
|
|
71
81
|
return True
|
|
82
|
+
except ResourceNotFoundError:
|
|
83
|
+
# Table already deleted or doesn't exist - this is still success
|
|
84
|
+
logger.info(f"Table {table_name} already deleted or doesn't exist")
|
|
85
|
+
return True
|
|
86
|
+
except ClientAuthenticationError as exc:
|
|
87
|
+
logger.error("Authentication failed deleting table %s: %s", table_name, exc)
|
|
88
|
+
return False
|
|
89
|
+
except HttpResponseError as exc:
|
|
90
|
+
logger.error("Azure service error deleting table %s: %s", table_name, exc.message)
|
|
91
|
+
return False
|
|
72
92
|
except Exception as exc:
|
|
73
|
-
logger.error("
|
|
93
|
+
logger.error("Unexpected error deleting table %s: %s", table_name, exc)
|
|
74
94
|
return False
|
|
75
95
|
|
|
76
96
|
def table_exists(self, table_name: str) -> bool:
|
|
@@ -85,38 +105,105 @@ class AzureTableService:
|
|
|
85
105
|
return table_name in self.list_tables()
|
|
86
106
|
|
|
87
107
|
def put_entity(self, table_name: str, entity: Dict[str, Any]) -> Dict[str, Any]:
|
|
108
|
+
"""Insert a new entity into a table.
|
|
109
|
+
|
|
110
|
+
Args:
|
|
111
|
+
table_name: Name of the table
|
|
112
|
+
entity: Entity dictionary with PartitionKey and RowKey
|
|
113
|
+
|
|
114
|
+
Returns:
|
|
115
|
+
Dict with etag and timestamp
|
|
116
|
+
|
|
117
|
+
Raises:
|
|
118
|
+
RuntimeError: If entity already exists or other errors occur
|
|
119
|
+
"""
|
|
88
120
|
client = self._get_client()
|
|
89
121
|
table = client.get_table_client(table_name)
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
122
|
+
try:
|
|
123
|
+
res = table.create_entity(entity=entity)
|
|
124
|
+
logger.info(
|
|
125
|
+
"Inserted entity into %s: PK=%s RK=%s",
|
|
126
|
+
table_name,
|
|
127
|
+
entity.get("PartitionKey"),
|
|
128
|
+
entity.get("RowKey"),
|
|
129
|
+
)
|
|
130
|
+
return {"etag": getattr(res, "etag", None), "ts": _now_iso()}
|
|
131
|
+
except ResourceExistsError as e:
|
|
132
|
+
pk, rk = entity.get("PartitionKey"), entity.get("RowKey")
|
|
133
|
+
logger.error(f"Entity already exists in {table_name}: PK={pk} RK={rk}")
|
|
134
|
+
raise RuntimeError(f"Entity already exists: {e}") from e
|
|
135
|
+
except ClientAuthenticationError as e:
|
|
136
|
+
logger.error(f"Authentication failed inserting entity into {table_name}: {e}")
|
|
137
|
+
raise RuntimeError(f"Authentication failed: {e}") from e
|
|
138
|
+
except HttpResponseError as e:
|
|
139
|
+
logger.error(f"Azure service error inserting entity into {table_name}: {e.message}")
|
|
140
|
+
raise RuntimeError(f"Failed to insert entity: {e.message}") from e
|
|
98
141
|
|
|
99
142
|
def upsert_entity(self, table_name: str, entity: Dict[str, Any]) -> Dict[str, Any]:
|
|
143
|
+
"""Insert or update an entity in a table.
|
|
144
|
+
|
|
145
|
+
Args:
|
|
146
|
+
table_name: Name of the table
|
|
147
|
+
entity: Entity dictionary with PartitionKey and RowKey
|
|
148
|
+
|
|
149
|
+
Returns:
|
|
150
|
+
Dict with etag and timestamp
|
|
151
|
+
|
|
152
|
+
Raises:
|
|
153
|
+
RuntimeError: If authentication or service errors occur
|
|
154
|
+
"""
|
|
100
155
|
client = self._get_client()
|
|
101
156
|
table = client.get_table_client(table_name)
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
157
|
+
try:
|
|
158
|
+
res = table.upsert_entity(entity=entity, mode="merge")
|
|
159
|
+
logger.info(
|
|
160
|
+
"Upserted entity into %s: PK=%s RK=%s",
|
|
161
|
+
table_name,
|
|
162
|
+
entity.get("PartitionKey"),
|
|
163
|
+
entity.get("RowKey"),
|
|
164
|
+
)
|
|
165
|
+
return {"etag": getattr(res, "etag", None), "ts": _now_iso()}
|
|
166
|
+
except ClientAuthenticationError as e:
|
|
167
|
+
logger.error(f"Authentication failed upserting entity into {table_name}: {e}")
|
|
168
|
+
raise RuntimeError(f"Authentication failed: {e}") from e
|
|
169
|
+
except HttpResponseError as e:
|
|
170
|
+
logger.error(f"Azure service error upserting entity into {table_name}: {e.message}")
|
|
171
|
+
raise RuntimeError(f"Failed to upsert entity: {e.message}") from e
|
|
110
172
|
|
|
111
173
|
def delete_entity(self, table_name: str, partition_key: str, row_key: str) -> bool:
|
|
174
|
+
"""Delete an entity from a table.
|
|
175
|
+
|
|
176
|
+
Args:
|
|
177
|
+
table_name: Name of the table
|
|
178
|
+
partition_key: Partition key of the entity
|
|
179
|
+
row_key: Row key of the entity
|
|
180
|
+
|
|
181
|
+
Returns:
|
|
182
|
+
True if deleted successfully or entity doesn't exist, False on other errors
|
|
183
|
+
|
|
184
|
+
Note:
|
|
185
|
+
Azure Tables delete_entity doesn't fail if entity doesn't exist
|
|
186
|
+
"""
|
|
112
187
|
client = self._get_client()
|
|
113
188
|
table = client.get_table_client(table_name)
|
|
114
189
|
try:
|
|
115
190
|
table.delete_entity(partition_key=partition_key, row_key=row_key)
|
|
116
191
|
logger.info("Deleted entity in %s (%s/%s)", table_name, partition_key, row_key)
|
|
117
192
|
return True
|
|
193
|
+
except ResourceNotFoundError:
|
|
194
|
+
# Entity already deleted or doesn't exist - this is still success
|
|
195
|
+
logger.info(
|
|
196
|
+
f"Entity in {table_name} ({partition_key}/{row_key}) already deleted or doesn't exist"
|
|
197
|
+
)
|
|
198
|
+
return True
|
|
199
|
+
except ClientAuthenticationError as exc:
|
|
200
|
+
logger.error("Authentication failed deleting entity in %s: %s", table_name, exc)
|
|
201
|
+
return False
|
|
202
|
+
except HttpResponseError as exc:
|
|
203
|
+
logger.error("Azure service error deleting entity in %s: %s", table_name, exc.message)
|
|
204
|
+
return False
|
|
118
205
|
except Exception as exc:
|
|
119
|
-
logger.error("
|
|
206
|
+
logger.error("Unexpected error deleting entity in %s: %s", table_name, exc)
|
|
120
207
|
return False
|
|
121
208
|
|
|
122
209
|
def get_entity(
|
|
@@ -130,7 +217,7 @@ class AzureTableService:
|
|
|
130
217
|
row_key: Row key of the entity
|
|
131
218
|
|
|
132
219
|
Returns:
|
|
133
|
-
Entity dict if found, None otherwise
|
|
220
|
+
Entity dict if found, None otherwise (including on auth/service errors)
|
|
134
221
|
"""
|
|
135
222
|
client = self._get_client()
|
|
136
223
|
table = client.get_table_client(table_name)
|
|
@@ -138,11 +225,20 @@ class AzureTableService:
|
|
|
138
225
|
entity = table.get_entity(partition_key=partition_key, row_key=row_key)
|
|
139
226
|
logger.info("Retrieved entity from %s: PK=%s RK=%s", table_name, partition_key, row_key)
|
|
140
227
|
return dict(entity)
|
|
141
|
-
except
|
|
142
|
-
logger.
|
|
143
|
-
|
|
228
|
+
except ResourceNotFoundError:
|
|
229
|
+
logger.info("Entity not found in %s (%s/%s)", table_name, partition_key, row_key)
|
|
230
|
+
return None
|
|
231
|
+
except ClientAuthenticationError as exc:
|
|
232
|
+
logger.error("Authentication failed retrieving entity from %s: %s", table_name, exc)
|
|
233
|
+
return None
|
|
234
|
+
except HttpResponseError as exc:
|
|
235
|
+
logger.error(
|
|
236
|
+
"Azure service error retrieving entity from %s: %s", table_name, exc.message
|
|
144
237
|
)
|
|
145
238
|
return None
|
|
239
|
+
except Exception as exc:
|
|
240
|
+
logger.error("Unexpected error retrieving entity from %s: %s", table_name, exc)
|
|
241
|
+
return None
|
|
146
242
|
|
|
147
243
|
def entity_exists(self, table_name: str, partition_key: str, row_key: str) -> bool:
|
|
148
244
|
"""Check if an entity exists without retrieving it.
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
srx_lib_azure/__init__.py,sha256=rtG8P2NjXvS28KOdfj3Ad6bbjQLaKYUd1prSaKmv1eU,173
|
|
2
|
+
srx_lib_azure/blob.py,sha256=pAOIPAImhIChMCoxQhe79N11vLF24yAlw0R8gcnitvA,12730
|
|
3
|
+
srx_lib_azure/email.py,sha256=qZWZUjoUMocivU-S7Qa4mJV8aj4jtQPfy868wnPgPlA,4837
|
|
4
|
+
srx_lib_azure/table.py,sha256=-RPMlZ2gzXi-6bJSkGFuV5XyIp8-3pdwulI-IEZUs1Y,18607
|
|
5
|
+
srx_lib_azure-0.1.8.dist-info/METADATA,sha256=2kvpBmQ25Es7i_Da8uhCBU-OrArzMGM5J_5bRF8EDc4,1600
|
|
6
|
+
srx_lib_azure-0.1.8.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
|
|
7
|
+
srx_lib_azure-0.1.8.dist-info/RECORD,,
|
|
@@ -1,7 +0,0 @@
|
|
|
1
|
-
srx_lib_azure/__init__.py,sha256=K0UCmkKw7HWJMshp6Xv3SxD4y26r7bdcPtb_2aRc2rs,174
|
|
2
|
-
srx_lib_azure/blob.py,sha256=3g5r3cOOdTAN283PBEU__p5gLYQ97LE_KEeNc2mVnLg,8889
|
|
3
|
-
srx_lib_azure/email.py,sha256=2J5zlgJMhx7pMINwN4kW23PmdwL1JyU9xFsSl5gAAM4,2831
|
|
4
|
-
srx_lib_azure/table.py,sha256=0qb1t84wEkpif3t1KybasZYffgTGQQ5ULfjfk2mjy54,14262
|
|
5
|
-
srx_lib_azure-0.1.7.dist-info/METADATA,sha256=bjyMw1i1lMXVw7Q6cbv_yYz9snHpH6pckSPTFR_JZyQ,1600
|
|
6
|
-
srx_lib_azure-0.1.7.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
|
|
7
|
-
srx_lib_azure-0.1.7.dist-info/RECORD,,
|
|
File without changes
|