PR fixes

Author: tpellissier

examples/quickstart_file_upload.py

@@ -192,7 +192,6 @@ def ensure_file_attribute_generic(schema_name: str, label: str, key_prefix: str)
             f"SchemaName eq '{schema_name}'"
         )
         r = odata._request("get", url, headers=odata._headers())
-        r.raise_for_status()
         val = []
         try:
             val = r.json().get("value", [])
@@ -217,7 +216,6 @@ def ensure_file_attribute_generic(schema_name: str, label: str, key_prefix: str)
     try:
         url = f"{odata.api}/EntityDefinitions({meta_id})/Attributes"
         r = odata._request("post", url, headers=odata._headers(), json=payload)
-        r.raise_for_status()
         print({f"{key_prefix}_file_attribute_created": True})
         time.sleep(2)
         return True
@@ -291,7 +289,6 @@ def get_dataset_info(file_path: Path):
         odata = client._get_odata()
         dl_url_single = f"{odata.api}/{entity_set}({record_id})/{small_file_attr_logical}/$value"  # raw entity_set URL OK
         resp_single = odata._request("get", dl_url_single, headers=odata._headers())
-        resp_single.raise_for_status()
         content_single = resp_single.content or b""
         import hashlib  # noqa: WPS433
         downloaded_hash = hashlib.sha256(content_single).hexdigest() if content_single else None
@@ -317,7 +314,6 @@ def get_dataset_info(file_path: Path):
         ))
         print({"small_replace_upload_completed": True, "small_replace_source_size": replace_size_small})
         resp_single_replace = odata._request("get", dl_url_single, headers=odata._headers())
-        resp_single_replace.raise_for_status()
         content_single_replace = resp_single_replace.content or b""
         downloaded_hash_replace = hashlib.sha256(content_single_replace).hexdigest() if content_single_replace else None
         hash_match_replace = (downloaded_hash_replace == replace_hash_small) if (downloaded_hash_replace and replace_hash_small) else None
@@ -348,7 +344,6 @@ def get_dataset_info(file_path: Path):
         odata = client._get_odata()
         dl_url_chunk = f"{odata.api}/{entity_set}({record_id})/{chunk_file_attr_logical}/$value"  # raw entity_set for download
         resp_chunk = odata._request("get", dl_url_chunk, headers=odata._headers())
-        resp_chunk.raise_for_status()
         content_chunk = resp_chunk.content or b""
         import hashlib  # noqa: WPS433
         dst_hash_chunk = hashlib.sha256(content_chunk).hexdigest() if content_chunk else None
@@ -373,7 +368,6 @@ def get_dataset_info(file_path: Path):
         ))
         print({"chunk_replace_upload_completed": True})
         resp_chunk_replace = odata._request("get", dl_url_chunk, headers=odata._headers())
-        resp_chunk_replace.raise_for_status()
         content_chunk_replace = resp_chunk_replace.content or b""
         dst_hash_chunk_replace = hashlib.sha256(content_chunk_replace).hexdigest() if content_chunk_replace else None
         hash_match_chunk_replace = (dst_hash_chunk_replace == replace_hash_chunk) if (dst_hash_chunk_replace and replace_hash_chunk) else None

src/dataverse_sdk/odata.py

@@ -62,16 +62,16 @@ def _headers(self) -> Dict[str, str]:
             "OData-Version": "4.0",
         }
 
-    def _request(self, method: str, url: str, **kwargs):
+    def _raw_request(self, method: str, url: str, **kwargs):
         return self._http.request(method, url, **kwargs)
 
-    def _send(self, method: str, url: str, *, expected: tuple[int, ...] = (200, 201, 202, 204), **kwargs):
+    def _request(self, method: str, url: str, *, expected: tuple[int, ...] = (200, 201, 202, 204), **kwargs):
         """Execute HTTP request; raise HttpError with structured details on failure.
 
         Returns the raw response for success codes; raises HttpError with extracted
         Dataverse error payload fields and correlation identifiers otherwise.
         """
-        r = self._request(method, url, **kwargs)
+        r = self._raw_request(method, url, **kwargs)
         if r.status_code in expected:
             return r
         payload = {}
@@ -150,7 +150,7 @@ def _create_single(self, entity_set: str, logical_name: str, record: Dict[str, A
         record = self._convert_labels_to_ints(logical_name, record)
         url = f"{self.api}/{entity_set}"
         headers = self._headers().copy()
-        r = self._send("post", url, headers=headers, json=record)
+        r = self._request("post", url, headers=headers, json=record)
 
         ent_loc = r.headers.get("OData-EntityId") or r.headers.get("OData-EntityID")
         if ent_loc:
@@ -185,7 +185,7 @@ def _create_multiple(self, entity_set: str, logical_name: str, records: List[Dic
         url = f"{self.api}/{entity_set}/Microsoft.Dynamics.CRM.CreateMultiple"
         # The action currently returns only Ids; no need to request representation.
         headers = self._headers().copy()
-        r = self._send("post", url, headers=headers, json=payload)
+        r = self._request("post", url, headers=headers, json=payload)
         try:
             body = r.json() if r.text else {}
         except ValueError:
@@ -304,7 +304,7 @@ def _update(self, logical_name: str, key: str, data: Dict[str, Any]) -> None:
         url = f"{self.api}/{entity_set}{self._format_key(key)}"
         headers = self._headers().copy()
         headers["If-Match"] = "*"
-        r = self._send("patch", url, headers=headers, json=data)
+        r = self._request("patch", url, headers=headers, json=data)
 
     def _update_multiple(self, entity_set: str, logical_name: str, records: List[Dict[str, Any]]) -> None:
         """Bulk update existing records via the collection-bound UpdateMultiple action.
@@ -354,7 +354,7 @@ def _update_multiple(self, entity_set: str, logical_name: str, records: List[Dic
         payload = {"Targets": enriched}
         url = f"{self.api}/{entity_set}/Microsoft.Dynamics.CRM.UpdateMultiple"
         headers = self._headers().copy()
-        r = self._send("post", url, headers=headers, json=payload)
+        r = self._request("post", url, headers=headers, json=payload)
         # Intentionally ignore response content: no stable contract for IDs across environments.
         return None
 
@@ -364,7 +364,7 @@ def _delete(self, logical_name: str, key: str) -> None:
         url = f"{self.api}/{entity_set}{self._format_key(key)}"
         headers = self._headers().copy()
         headers["If-Match"] = "*"
-        self._send("delete", url, headers=headers)
+        self._request("delete", url, headers=headers)
 
     def _get(self, logical_name: str, key: str, select: Optional[str] = None) -> Dict[str, Any]:
         """Retrieve a single record.
@@ -383,7 +383,7 @@ def _get(self, logical_name: str, key: str, select: Optional[str] = None) -> Dic
             params["$select"] = select
         entity_set = self._entity_set_from_logical(logical_name)
         url = f"{self.api}/{entity_set}{self._format_key(key)}"
-        r = self._send("get", url, headers=self._headers(), params=params)
+        r = self._request("get", url, headers=self._headers(), params=params)
         return r.json()
 
     def _get_multiple(
@@ -428,7 +428,7 @@ def _get_multiple(
                 headers["Prefer"] = f"odata.maxpagesize={ps}"
 
         def _do_request(url: str, *, params: Optional[Dict[str, Any]] = None) -> Dict[str, Any]:
-            r = self._send("get", url, headers=headers, params=params)
+            r = self._request("get", url, headers=headers, params=params)
             try:
                 return r.json()
             except ValueError:
@@ -503,7 +503,7 @@ def _query_sql(self, sql: str) -> list[dict[str, Any]]:
         headers = self._headers().copy()
         url = f"{self.api}/{entity_set}"
         params = {"sql": sql}
-        r = self._send("get", url, headers=headers, params=params)
+        r = self._request("get", url, headers=headers, params=params)
         try:
             body = r.json()
         except ValueError:
@@ -554,7 +554,7 @@ def _entity_set_from_logical(self, logical: str) -> str:
             "$select": "LogicalName,EntitySetName,PrimaryIdAttribute",
             "$filter": f"LogicalName eq '{logical_escaped}'",
         }
-        r = self._send("get", url, headers=self._headers(), params=params)
+        r = self._request("get", url, headers=self._headers(), params=params)
         try:
             body = r.json()
             items = body.get("value", []) if isinstance(body, dict) else []
@@ -599,7 +599,7 @@ def _get_entity_by_schema(self, schema_name: str) -> Optional[Dict[str, Any]]:
             "$select": "MetadataId,LogicalName,SchemaName,EntitySetName",
             "$filter": f"SchemaName eq '{schema_escaped}'",
         }
-        r = self._send("get", url, headers=self._headers(), params=params)
+        r = self._request("get", url, headers=self._headers(), params=params)
         items = r.json().get("value", [])
         return items[0] if items else None
 
@@ -618,7 +618,7 @@ def _create_entity(self, schema_name: str, display_name: str, attributes: List[D
             "Attributes": attributes,
         }
         headers = self._headers()
-        r = self._send("post", url, headers=headers, json=payload)
+        r = self._request("post", url, headers=headers, json=payload)
         ent = self._wait_for_entity_ready(schema_name)
         if not ent or not ent.get("EntitySetName"):
             raise RuntimeError(
@@ -791,7 +791,7 @@ def _optionset_map(self, logical_name: str, attr_logical: str) -> Optional[Dict[
         # Retry up to 3 times on 404 (new or not-yet-published attribute metadata). If still 404, raise.
         r_type = None
         for attempt in range(3):
-            r_type = self._request("get", url_type, headers=self._headers())
+            r_type = self._raw_request("get", url_type, headers=self._headers())
             if r_type.status_code != 404:
                 break
             if attempt < 2:
@@ -804,7 +804,7 @@ def _optionset_map(self, logical_name: str, attr_logical: str) -> Optional[Dict[
             )
         if not (200 <= r_type.status_code < 300):
             # Re-issue via _send to raise structured HttpError (rare path)
-            self._send("get", url_type, headers=self._headers())
+            self._request("get", url_type, headers=self._headers())
 
         body_type = r_type.json()
         items = body_type.get("value", []) if isinstance(body_type, dict) else []
@@ -824,15 +824,15 @@ def _optionset_map(self, logical_name: str, attr_logical: str) -> Optional[Dict[
         # Step 2 fetch with retries: expanded OptionSet (cast form first)
         r_opts = None
         for attempt in range(3):
-            r_opts = self._request("get", cast_url, headers=self._headers())
+            r_opts = self._raw_request("get", cast_url, headers=self._headers())
             if r_opts.status_code != 404:
                 break
             if attempt < 2:
                 time.sleep(0.4 * (2 ** attempt))  # 0.4s, 0.8s
         if r_opts.status_code == 404:
             raise RuntimeError(f"Picklist OptionSet metadata not found after retries: entity='{logical_name}' attribute='{attr_logical}' (404)")
         if not (200 <= r_opts.status_code < 300):
-            self._send("get", cast_url, headers=self._headers())
+            self._request("get", cast_url, headers=self._headers())
 
         attr_full = {}
         try:
@@ -993,7 +993,7 @@ def _list_tables(self) -> List[Dict[str, Any]]:
         params = {
             "$filter": "IsPrivate eq false"
         }
-        r = self._send("get", url, headers=self._headers(), params=params)
+        r = self._request("get", url, headers=self._headers(), params=params)
         return r.json().get("value", [])
 
     def _delete_table(self, tablename: str) -> None:
@@ -1005,7 +1005,7 @@ def _delete_table(self, tablename: str) -> None:
         metadata_id = ent["MetadataId"]
         url = f"{self.api}/EntityDefinitions({metadata_id})"
         headers = self._headers()
-        r = self._send("delete", url, headers=headers)
+        r = self._request("delete", url, headers=headers)
 
     def _create_table(self, tablename: str, schema: Dict[str, Any]) -> Dict[str, Any]:
         # Accept a friendly name and construct a default schema under 'new_'.