deriva 1.7.3__py3-none-any.whl → 1.7.5__py3-none-any.whl

deriva/config/rollback_annotation.py

@@ -1,4 +1,4 @@
-import platform
+import sys
 from deriva.core import get_credential, BaseCLI, DerivaServer, __version__
 
 

deriva/core/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "1.7.3"
+__version__ = "1.7.5"
 
 from deriva.core.utils.core_utils import *
 from deriva.core.base_cli import BaseCLI, KeyValuePairArgs

deriva/core/datapath.py

@@ -1008,35 +1008,32 @@ class _TableWrapper (object):
         # determine whether insert is idempotent and therefore retry safe
         retry_safe = on_conflict_skip and _has_user_pkey(self._wrapped_table)
 
-        # perform all requests in a helper we can hand to _ResultSet
-        def results_func(ignore1, ignore2, ignore3):
-            results = []
-            for batch in _generate_batches(
-                entities,
-                max_batch_rows=max_batch_rows,
-                max_batch_bytes=max_batch_bytes
-            ):
-                try:
-                    if retry_safe:
-                        resp = _request_with_retry(
-                            lambda: request_func(batch),
-                            retry_codes=retry_codes,
-                            backoff_factor=backoff_factor,
-                            max_attempts=max_attempts
-                        )
-                    else:
-                        resp = request_func(batch)
-                    results.extend(resp.json())
-                except HTTPError as e:
-                    logger.debug(e.response.text)
-                    if 400 <= e.response.status_code < 500:
-                        raise DataPathException(_http_error_message(e), e)
-                    else:
-                        raise e
-            return results
-
-        result = _ResultSet(self.path.uri, results_func)
-        result.fetch()
+        # perform all requests synchronously so the caller can get exceptions
+        results = []
+        for batch in _generate_batches(
+            entities,
+            max_batch_rows=max_batch_rows,
+            max_batch_bytes=max_batch_bytes
+        ):
+            try:
+                if retry_safe:
+                    resp = _request_with_retry(
+                        lambda: request_func(batch),
+                        retry_codes=retry_codes,
+                        backoff_factor=backoff_factor,
+                        max_attempts=max_attempts
+                    )
+                else:
+                    resp = request_func(batch)
+                results.extend(resp.json())
+            except HTTPError as e:
+                logger.debug(e.response.text)
+                if 400 <= e.response.status_code < 500:
+                    raise DataPathException(_http_error_message(e), e)
+                else:
+                    raise e
+
+        result = _ResultSet(self.path.uri, lambda ignore1, ignore2, ignore3: results)
         return result
 
 
@@ -1101,34 +1098,37 @@ class _TableWrapper (object):
         def request_func(batch):
             return self._schema._catalog._wrapped_catalog.put(path, json=batch, headers={'Content-Type': 'application/json'})
 
-        # perform all requests in a helper we can hand to _ResultSet
-        def results_func(ignore1, ignore2, ignore3):
-            results = []
-            for batch in _generate_batches(
-                entities,
-                max_batch_rows=max_batch_rows,
-                max_batch_bytes=max_batch_bytes
-            ):
-                try:
-                    resp = _request_with_retry(
-                        lambda: request_func(batch),
-                        retry_codes=retry_codes,
-                        backoff_factor=backoff_factor,
-                        max_attempts=max_attempts
-                    )
-                    results.extend(resp.json())
-                except HTTPError as e:
-                    logger.debug(e.response.text)
-                    if 400 <= e.response.status_code < 500:
-                        raise DataPathException(_http_error_message(e), e)
-                    else:
-                        raise e
-            return results
-
-        result = _ResultSet(self.path.uri, results_func)
-        result.fetch()
+        # perform all requests synchronously so the caller can get exceptions
+        results = []
+        for batch in _generate_batches(
+            entities,
+            max_batch_rows=max_batch_rows,
+            max_batch_bytes=max_batch_bytes
+        ):
+            try:
+                resp = _request_with_retry(
+                    lambda: request_func(batch),
+                    retry_codes=retry_codes,
+                    backoff_factor=backoff_factor,
+                    max_attempts=max_attempts
+                )
+                results.extend(resp.json())
+            except HTTPError as e:
+                logger.debug(e.response.text)
+                if 400 <= e.response.status_code < 500:
+                    raise DataPathException(_http_error_message(e), e)
+                else:
+                    raise e
+
+        result = _ResultSet(self.path.uri, lambda ignore1, ignore2, ignore3: results)
         return result
 
+    def delete(self):
+        """Deletes the entity set referenced by the Table.
+        """
+        self.path.delete()
+
+
 class _TableAlias (_TableWrapper):
     """Represents a table alias in datapath expressions.
     """