pyetp 0.0.33__py3-none-any.whl → 0.0.34__py3-none-any.whl

pyetp/client.py

@@ -25,7 +25,7 @@ from pyetp.config import SETTINGS
 from pyetp.types import *
 from pyetp.uri import DataObjectURI, DataspaceURI
 from pyetp.utils import short_id, batched
-from asyncio import timeout
+#from asyncio import timeout
 
 try:
     # for py >3.11, we can raise grouped exceptions
@@ -34,18 +34,18 @@ except ImportError:
     def ExceptionGroup(msg, errors):
         return errors[0]
 
-# try:
-#     from asyncio import timeout
-# except ImportError:
-#     import async_timeout
-
-#     @asynccontextmanager
-#     async def timeout(delay: T.Optional[float]) -> T.Any:
-#         try:
-#             async with async_timeout.timeout(delay):
-#                 yield None
-#         except asyncio.CancelledError as e:
-#             raise asyncio.TimeoutError(f'Timeout ({delay}s)') from e
+try:
+    from asyncio import timeout
+except ImportError:
+    import async_timeout
+    from contextlib import asynccontextmanager
+    @asynccontextmanager
+    async def timeout(delay: T.Optional[float]) -> T.Any:
+        try:
+            async with async_timeout.timeout(delay):
+                yield None
+        except asyncio.CancelledError as e:
+            raise asyncio.TimeoutError(f'Timeout ({delay}s)') from e
 
 
 logger = logging.getLogger(__name__)
@@ -502,11 +502,15 @@ class ETPClient(ETPConnection):
         )
     async def start_transaction(self, dataspace_uri: DataspaceURI, readOnly :bool= True) -> uuid.UUID:
         trans_id = await self.send(StartTransaction(readOnly=readOnly, dataspaceUris=[dataspace_uri.raw_uri]))
+        if trans_id.successful is False:
+            raise Exception(f"Failed starting transaction {dataspace_uri.raw_uri}")
         return uuid.UUID(bytes=trans_id.transaction_uuid)
     
     async def commit_transaction(self, transaction_id: uuid.UUID):
-        trans_id = await self.send(CommitTransaction(transaction_uuid=transaction_id))
-        return trans_id
+        r = await self.send(CommitTransaction(transaction_uuid=transaction_id))
+        if r.successful is False:
+            raise Exception(r.failure_reason)
+        return r
     
     async def rollback_transaction(self, transaction_id: uuid.UUID):
         return await self.send(RollbackTransaction(transactionUuid=transaction_id))
@@ -1001,6 +1005,7 @@ class ETPClient(ETPConnection):
             buffer[slices] = array
             return
         coro = [populate(starts, counts) for starts, counts in self._get_chunk_sizes(buffer_shape, dtype, offset)]
+        logger.debug(f"Concurrent request: {self.max_concurrent_requests}")
         for i in batched(coro, self.max_concurrent_requests):
             await asyncio.gather(*i)    
         # r = await asyncio.gather(*[
@@ -1020,6 +1025,7 @@ class ETPClient(ETPConnection):
             params.append([starts, counts])
             #await self.put_subarray(uid, data, starts, counts)
             coro.append(self.put_subarray(uid, data, starts, counts))
+        logger.debug(f"Concurrent request: {self.max_concurrent_requests}")
         for i in batched(coro, self.max_concurrent_requests):
             await asyncio.gather(*i)    
         #r = await asyncio.gather(*coro)

{pyetp-0.0.33.dist-info → pyetp-0.0.34.dist-info}/METADATA

@@ -1,13 +1,14 @@
 Metadata-Version: 2.3
 Name: pyetp
-Version: 0.0.33
+Version: 0.0.34
 Summary: Interface with OSDU RDDMS using ETP protocol
 Author: Adam Cheng
 Author-email: 52572642+adamchengtkc@users.noreply.github.com
-Requires-Python: >=3.11,<3.13
+Requires-Python: >=3.10,<3.13
 Classifier: Development Status :: 3 - Alpha
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Requires-Dist: async-lru (>=2.0.4,<3.0.0)

{pyetp-0.0.33.dist-info → pyetp-0.0.34.dist-info}/RECORD

@@ -1,5 +1,5 @@
 pyetp/__init__.py,sha256=FSlPJ3AXoMe3vDQ0z8k417aKJWwt7sxbNPsLgdc21tI,123
-pyetp/client.py,sha256=71DV3WPXpOX4fL119aR_5z09L3NDsS5zMP1mSMHGr9s,46154
+pyetp/client.py,sha256=u3Uwu5KkHgFA66HlQFxa5I9ExLS-R2zjOFE4yx6kNW8,46522
 pyetp/config.py,sha256=BmCWo09GXO9CoAwtmmmAflNeRHF-5d14JFwsBBrKnQA,865
 pyetp/resqml_objects/__init__.py,sha256=Sr_1bktzS8JMmE9oi6pcW6BuERm7gH0u50rBs58zI7Q,50492
 pyetp/resqml_objects/generated.py,sha256=P-hfL8btOE6uAmtaGXbSdWMl8Z9iJx-r6FRzSvmzHvU,783914
@@ -8,7 +8,7 @@ pyetp/uri.py,sha256=6NE_-QvtaL_z5NCUbxehc28ul-70DgXpMiEGaIJPqNc,2996
 pyetp/utils.py,sha256=4U_9ndZGzN3B0xMoeSglmxdg7jgfYP5v_mE6tF2Lqmc,518
 pyetp/utils_arrays.py,sha256=HHhw23La4SG7UJyd5Q_OJ5WlMq98QpwHBk553YyyYOk,4331
 pyetp/utils_xml.py,sha256=VLTelVsUZrUDZEGES4xMU8MA9zSW-C83IDiHD_B8wT0,33861
-pyetp-0.0.33.dist-info/LICENSE.md,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-pyetp-0.0.33.dist-info/METADATA,sha256=38-PLw8E-sAbkpTIdZqzyviKXEXlIPvO9m7adac2NHw,2293
-pyetp-0.0.33.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-pyetp-0.0.33.dist-info/RECORD,,
+pyetp-0.0.34.dist-info/LICENSE.md,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+pyetp-0.0.34.dist-info/METADATA,sha256=VotCsnjZDnEZzQ0PD6zmqxT7qnfSvBLoXplV-Gf48JU,2344
+pyetp-0.0.34.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+pyetp-0.0.34.dist-info/RECORD,,