pyetp 0.0.33__tar.gz → 0.0.35__tar.gz

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

@@ -1,13 +1,14 @@
 Metadata-Version: 2.3
 Name: pyetp
-Version: 0.0.33
+Version: 0.0.35
 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.35}/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__)
@@ -96,7 +96,7 @@ class ETPClient(ETPConnection):
         self.timeout = timeout
         self.client_info.endpoint_capabilities['MaxWebSocketMessagePayloadSize'] = SETTINGS.MaxWebSocketMessagePayloadSize
         self.__recvtask = asyncio.create_task(self.__recv__())
-        self.max_concurrent_requests = 1
+        self.max_concurrent_requests = SETTINGS.max_concurrent_requests
 
     #
     # client
@@ -229,8 +229,7 @@ class ETPClient(ETPConnection):
                 currentDateTime=self.timestamp,
                 earliestRetainedChangeTime=0,
                 endpointCapabilities=dict(
-                    MaxWebSocketMessagePayloadSize=DataValue(item=self.max_size),
-                    MaxWebSocketFramePayloadSize=DataValue(item=10000)
+                    MaxWebSocketMessagePayloadSize=DataValue(item=self.max_size)
                 )
             )
         )
@@ -262,7 +261,8 @@ class ETPClient(ETPConnection):
 
     @property
     def max_size(self):
-        return self.client_info.getCapability("MaxWebSocketMessagePayloadSize")
+        return SETTINGS.MaxWebSocketMessagePayloadSize
+        #return self.client_info.getCapability("MaxWebSocketMessagePayloadSize")
 
     @property
     def max_array_size(self):
@@ -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))
@@ -965,7 +969,6 @@ class ETPClient(ETPConnection):
 
         all_ranges = [range(s // block_size + 1) for s in shape]
         indexes = np.array(np.meshgrid(*all_ranges)).T.reshape(-1, len(shape))
-
         for ijk in indexes:
             starts = ijk * block_size
             if offset != 0:
@@ -988,7 +991,6 @@ class ETPClient(ETPConnection):
             buffer_shape = np.array([total_count], dtype=np.int64)
         else:
             buffer_shape = np.array(metadata.dimensions, dtype=np.int64)
-
         dtype = utils_arrays.get_dtype(metadata.transport_array_type)
         buffer = np.zeros(buffer_shape, dtype=dtype)
         params = []
@@ -1001,6 +1003,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(*[
@@ -1011,7 +1014,6 @@ class ETPClient(ETPConnection):
         return buffer
 
     async def _put_array_chuncked(self, uid: DataArrayIdentifier, data: np.ndarray):
-
         transport_array_type = utils_arrays.get_transport(data.dtype)
         await self._put_uninitialized_data_array(uid, data.shape, transport_array_type=transport_array_type)
         params = []
@@ -1020,6 +1022,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.35}/pyetp/config.py

@@ -23,7 +23,8 @@ class Settings(BaseSettings):
     etp_url: WebSocketUrl = Field(default='wss://host.com')
     etp_timeout: float = Field(default=15., description="Timeout in seconds")
     data_partition: Optional[str] = None
-    MaxWebSocketMessagePayloadSize: int = Field(default=100000)
+    MaxWebSocketMessagePayloadSize: int = Field(default=30000)
+    max_concurrent_requests: int = Field(default = 5)
 
 
 SETTINGS = Settings()

{pyetp-0.0.33 → pyetp-0.0.35}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pyetp"
-version = "0.0.33"
+version = "0.0.35"
 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"