specklia 1.9.65__tar.gz → 1.9.67__tar.gz

{specklia-1.9.65 → specklia-1.9.67}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: specklia
-Version: 1.9.65
+Version: 1.9.67
 Summary: Python client for Specklia, a geospatial point cloud database by Earthwave.
 Home-page: https://specklia.earthwave.co.uk/
 Author: Earthwave Ltd

specklia-1.9.67/setup.py

@@ -0,0 +1,63 @@
+"""Setup file for The specklia client."""
+
+import os
+
+from setuptools import find_packages, setup
+
+with open("README.md", "r", encoding="utf-8") as fh:
+    long_description = fh.read()
+
+if os.path.exists("full_version.txt"):
+    with open("full_version.txt", "r", encoding="utf-8") as fh:
+        """
+        Note that this file is generated by the CI chain based on the git tag
+        (by ew_continuous_integration/define_new_version_number.py)
+        It should not be present in the repository by default.
+        """
+        version_number = fh.read()
+else:
+    version_number = "v0.0.0"  # default value when under development
+
+setup(
+    name="specklia",
+    version=version_number,
+    description="Python client for Specklia, a geospatial point cloud database by Earthwave.",
+    long_description=long_description,
+    long_description_content_type="text/markdown",
+    author="Earthwave Ltd",
+    author_email="support@earthwave.co.uk",
+    url="https://specklia.earthwave.co.uk/",
+    python_requires=">=3.11",
+    license="MIT",
+    packages=find_packages(),
+    # These generate the icons in the sidebar on PyPI
+    project_urls={
+        "Homepage": "https://specklia.earthwave.co.uk/",
+        "Changelog": "https://specklia.earthwave.co.uk/generated_docs/change_log.html",
+        "Documentation": "https://specklia.earthwave.co.uk/generated_docs/index.html",
+        "Twitter": "https://twitter.com/earth__wave",
+    },
+    classifiers=[
+        "Development Status :: 4 - Beta",
+        "Programming Language :: Python :: 3.11",
+        "Topic :: Database :: Front-Ends",
+        "Topic :: Scientific/Engineering :: GIS",
+        "Topic :: Software Development :: Libraries :: Python Modules",
+        "License :: OSI Approved :: MIT License",
+        "Operating System :: OS Independent",
+        "Environment :: Console",
+        "Intended Audience :: Science/Research",
+    ],
+    # note requirements listed ininstall_requires should be the *minimum required*
+    # in order to allow pip to resolve multiple installed packages properly.
+    # requirements.txt should contain a specific known working version instead.
+    install_requires=[
+        "blosc",
+        "geopandas",
+        "pandas",
+        "pyarrow",
+        "rasterio",
+        "requests",
+        "shapely",
+    ],
+)

{specklia-1.9.65 → specklia-1.9.67}/specklia/chunked_transfer.py

@@ -20,25 +20,24 @@ IMPORTANT: THE VERSION HERE IN THE SPECKLIA PACKAGE MUST NOT BE MADE DEPENDENT U
 IS PRIVATE BUT THIS PACKAGE IS PUBLIC!
 """
 
+import struct
+import time
 from enum import Enum
 from io import BytesIO
 from logging import Logger
-import struct
-import time
 from typing import List, Tuple, Union
 
+import requests
 from geopandas import GeoDataFrame
 from geopandas import read_feather as read_geofeather
-from pandas import DataFrame
-from pandas import read_feather
-import requests
+from pandas import DataFrame, read_feather
 
 log = Logger(__name__)
 
 CHUNK_DB_NAME = "data_transfer_chunks"
 CHUNK_METADATA_COLLECTION_NAME = "chunk_metadata"
 MAX_CHUNK_AGE_SECONDS = 3600
-MAX_CHUNK_SIZE_BYTES = 5 * 1024 ** 2  # must be small enough to fit into an HTTP GET Request
+MAX_CHUNK_SIZE_BYTES = 5 * 1024**2  # must be small enough to fit into an HTTP GET Request
 CHUNK_DOWNLOAD_RETRIES = 10
 CHUNK_DOWNLOAD_TIMEOUT_S = 10
 
@@ -74,19 +73,16 @@ def upload_chunks(api_address: str, chunks: List[Tuple[int, bytes]]) -> str:
         The chunk set uuid of the uploaded chunks
     """
     # post the first chunk to start the upload
-    response = requests.post(
-        api_address + f"/chunk/upload/{chunks[0][0]}-of-{len(chunks)}",
-        data=chunks[0][1])
+    response = requests.post(api_address + f"/chunk/upload/{chunks[0][0]}-of-{len(chunks)}", data=chunks[0][1])
     response.raise_for_status()
-    log.info("response from very first /chunk/upload was '%s'", response.json())
-    chunk_set_uuid = response.json()['chunk_set_uuid']
+    log.debug("response from very first /chunk/upload was '%s'", response.json())
+    chunk_set_uuid = response.json()["chunk_set_uuid"]
 
     # post the rest of the chunks in a random order
     for i, chunk in chunks[1:]:
-        response = requests.post(
-            api_address + f"/chunk/upload/{chunk_set_uuid}/{i}-of-{len(chunks)}", data=chunk)
+        response = requests.post(api_address + f"/chunk/upload/{chunk_set_uuid}/{i}-of-{len(chunks)}", data=chunk)
         response.raise_for_status()
-        log.info("response from subsequent /chunk/upload/uuid call was '%s'", response.text)
+        log.debug("response from subsequent /chunk/upload/uuid call was '%s'", response.text)
 
     return chunk_set_uuid
 
@@ -123,31 +119,29 @@ def download_chunks(api_address: str, chunk_set_uuid: str, num_chunks: int) -> b
         while retries < CHUNK_DOWNLOAD_RETRIES and not success:
             try:
                 this_chunk_response = requests.get(
-                    f"{api_address}/chunk/download/{chunk_set_uuid}/{chunk_ordinal}",
-                    timeout=CHUNK_DOWNLOAD_TIMEOUT_S
+                    f"{api_address}/chunk/download/{chunk_set_uuid}/{chunk_ordinal}", timeout=CHUNK_DOWNLOAD_TIMEOUT_S
                 )
                 this_chunk_response.raise_for_status()
-                ordinal = struct.unpack('i', this_chunk_response.content[:4])[0]
+                ordinal = struct.unpack("i", this_chunk_response.content[:4])[0]
                 chunk = this_chunk_response.content[4:]
-                assert ordinal == chunk_ordinal, (
-                    f"Chunk ordinal mismatch: expected {chunk_ordinal}, got {ordinal}")
+                assert ordinal == chunk_ordinal, f"Chunk ordinal mismatch: expected {chunk_ordinal}, got {ordinal}"
                 chunks.append(chunk)
                 success = True
             except (requests.Timeout, requests.ConnectionError) as e:
                 retries += 1
-                log.warning(
-                    "Request failed with %s. Retrying (%s/%s)...", e, retries, CHUNK_DOWNLOAD_RETRIES)
+                log.warning("Request failed with %s. Retrying (%s/%s)...", e, retries, CHUNK_DOWNLOAD_RETRIES)
                 time.sleep(1)  # Small backoff before retrying
         if not success:
             error_message = (
-                f"Failed to download from chunk set {chunk_set_uuid} after {CHUNK_DOWNLOAD_TIMEOUT_S} attempts.")
+                f"Failed to download from chunk set {chunk_set_uuid} after {CHUNK_DOWNLOAD_TIMEOUT_S} attempts."
+            )
             log.error(error_message)
             raise RuntimeError(error_message)
 
     # Let the server know that we are done with this data and it can be deleted.
-    requests.delete(f'{api_address}/chunk/delete/{chunk_set_uuid}')
+    requests.delete(f"{api_address}/chunk/delete/{chunk_set_uuid}")
 
-    return b''.join(chunks)
+    return b"".join(chunks)
 
 
 def split_into_chunks(data: bytes, chunk_size: int = MAX_CHUNK_SIZE_BYTES) -> List[Tuple[int, bytes]]:
@@ -166,8 +160,7 @@ def split_into_chunks(data: bytes, chunk_size: int = MAX_CHUNK_SIZE_BYTES) -> Li
     List[Tuple[int, bytes]]
         A list of tuples containing the ordinal number of the chunk and each chunk
     """
-    return list(
-        enumerate((data[i:i + chunk_size] for i in range(0, len(data), chunk_size)), start=1))
+    return list(enumerate((data[i : i + chunk_size] for i in range(0, len(data), chunk_size)), start=1))
 
 
 def deserialise_dataframe(data: bytes) -> Union[DataFrame, GeoDataFrame]:
@@ -211,7 +204,7 @@ def serialise_dataframe(df: Union[DataFrame, GeoDataFrame]) -> bytes:
 
     Parameters
     ----------
-    df : DataFrame
+    df: Union[DataFrame, GeoDataFrame]
         Input dataframe
 
     Returns
@@ -221,6 +214,6 @@ def serialise_dataframe(df: Union[DataFrame, GeoDataFrame]) -> bytes:
     """
     feather_buffer = BytesIO()
     # Browser implementations of feather do not support compressed feather formats.
-    df.to_feather(feather_buffer, compression='uncompressed')
+    df.to_feather(feather_buffer, compression="uncompressed")
     feather_buffer.seek(0)
     return feather_buffer.getvalue()