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

pyetp/client.py

@@ -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):
@@ -274,6 +274,8 @@ class ETPClient(ETPConnection):
 
 
     def dataspace_uri(self, ds: str) -> DataspaceURI:
+        if ds.count("/") > 1:
+            raise Exception(f"Max one / in dataspace name")
         return DataspaceURI.from_name(ds)
     
     def list_objects(self, dataspace_uri: DataspaceURI, depth: int = 1) -> list:
@@ -291,10 +293,10 @@ class ETPClient(ETPConnection):
     #
 
     async def put_dataspaces(self, *dataspace_uris: DataspaceURI):
-
-
         _uris = list(map(DataspaceURI.from_any, dataspace_uris))
-
+        for i in _uris:
+            if i.raw_uri.count("/") > 4: # includes the 3 eml
+                raise Exception(f"Max one / in dataspace name")
         time = self.timestamp
         response = await self.send(
             PutDataspaces(dataspaces={
@@ -969,7 +971,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:
@@ -992,7 +993,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 = []
@@ -1016,7 +1016,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 = []

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/utils_xml.py

@@ -437,7 +437,7 @@ def create_resqml_mesh(rmdi, rmdts, geotimes, projected_epsg: int):  #(rddms_mes
         node_count=node_count,
         face_count=face_count,
         cell_shape=cellshape,
-        points=ro.Point3DHdf5Array(
+        points=ro.Point3dHdf5Array(
             coordinates=ro.Hdf5Dataset(
                 path_in_hdf_file=f"/RESQML/{str(hexa_uuid)}/points",
                 hdf_proxy=ro.DataObjectReference(

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pyetp
-Version: 0.0.34
+Version: 0.0.36
 Summary: Interface with OSDU RDDMS using ETP protocol
 Author: Adam Cheng
 Author-email: 52572642+adamchengtkc@users.noreply.github.com

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

@@ -1,14 +1,14 @@
 pyetp/__init__.py,sha256=FSlPJ3AXoMe3vDQ0z8k417aKJWwt7sxbNPsLgdc21tI,123
-pyetp/client.py,sha256=u3Uwu5KkHgFA66HlQFxa5I9ExLS-R2zjOFE4yx6kNW8,46522
-pyetp/config.py,sha256=BmCWo09GXO9CoAwtmmmAflNeRHF-5d14JFwsBBrKnQA,865
+pyetp/client.py,sha256=Krms7LO_TsC0bh3DAOeG-HUxpOHhSufePosfKgY97-Q,46771
+pyetp/config.py,sha256=WCs9n5Cd2igSVQzSNKPjnYP_H-61BYSHEeQ5Jh1oQlc,918
 pyetp/resqml_objects/__init__.py,sha256=Sr_1bktzS8JMmE9oi6pcW6BuERm7gH0u50rBs58zI7Q,50492
 pyetp/resqml_objects/generated.py,sha256=P-hfL8btOE6uAmtaGXbSdWMl8Z9iJx-r6FRzSvmzHvU,783914
 pyetp/types.py,sha256=HMNZ4_cJqhxqzXiYsNT-Ywvtfji9PARX4d6MixoQn1k,6397
 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.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,,
+pyetp/utils_xml.py,sha256=OLGKPxFsz2OzsJOEJDgQXIZ9wwvanlOr6jD3i3KHVZI,33861
+pyetp-0.0.36.dist-info/LICENSE.md,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+pyetp-0.0.36.dist-info/METADATA,sha256=MZoIUh82mz6L90TIZADRJ_hUa5IVAWZ8rxFMItTuO7I,2344
+pyetp-0.0.36.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+pyetp-0.0.36.dist-info/RECORD,,