pyetp 0.0.33__tar.gz → 0.0.34__tar.gz

{pyetp-0.0.33 → pyetp-0.0.34}/PKG-INFO

@@ -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 → pyetp-0.0.34}/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 → pyetp-0.0.34}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pyetp"
-version = "0.0.33"
+version = "0.0.34"
 description = "Interface with OSDU RDDMS using ETP protocol"
 authors = ["Adam Cheng <52572642+adamchengtkc@users.noreply.github.com>"]
 readme = "README.md"
@@ -12,7 +12,7 @@ classifiers = [
 
 
 [tool.poetry.dependencies]
-python = ">=3.11, <3.13"
+python = ">=3.10, <3.13"
 numpy = "^1.26.3"
 websockets = "^12.0"
 lxml = ">=4.9.4, <6.0"