nefino-geosync 0.1.0__tar.gz → 0.2.1__tar.gz

{nefino_geosync-0.1.0 → nefino_geosync-0.2.1}/.github/workflows/pr-label-check.yml

@@ -10,6 +10,8 @@ jobs:
     permissions:
       pull-requests: read
     steps:
+      - name: Checkout repository 📦
+        uses: actions/checkout@v4
       - name: Check for labels 📚
         id: check-labels
         run: |

{nefino_geosync-0.1.0 → nefino_geosync-0.2.1}/.github/workflows/publish.yml

@@ -49,7 +49,7 @@ jobs:
         name: python-package-distributions
         path: dist/
     - name: Publish distribution 📦 to PyPI
-      uses: pypa/gh-action-pypi-publish@15c56dba361d8335944d31a2ecd17d700fc7bcbc # v1.12.2
+      uses: pypa/gh-action-pypi-publish@67339c736fd9354cd4f8cb0b744f2b82a74b5c70 # v1.12.3
 
   github-release:
     name: >-
@@ -78,5 +78,5 @@ jobs:
     - name: Create GitHub Release
       uses: softprops/action-gh-release@e7a8f85e1c67a31e6ed99a94b41bd0b71bbee6b8 # v2.0.9
       with:
-        generate_release_notes: false
+        generate_release_notes: true
         files: dist/**

{nefino_geosync-0.1.0 → nefino_geosync-0.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: nefino-geosync
-Version: 0.1.0
+Version: 0.2.1
 Summary: Python package to access geographical data from Nefino.LI Geo
 Project-URL: Application, https://nefino.li
 Project-URL: API, https://api.nefino.li
@@ -267,5 +267,5 @@ pip install nefino-geosync
 
 ## Help
 
-- Open an [issue](https://github.com/your-org/geosync-py/issues) for bug reports or feature requests
+- Open an [issue](https://github.com/nefino/geosync-py/issues) for bug reports or feature requests
 - Contact [Nefino](https://www.nefino.de/kontakt) for account-related inquiries

{nefino_geosync-0.1.0 → nefino_geosync-0.2.1}/README.md

@@ -41,5 +41,5 @@ pip install nefino-geosync
 
 ## Help
 
-- Open an [issue](https://github.com/your-org/geosync-py/issues) for bug reports or feature requests
+- Open an [issue](https://github.com/nefino/geosync-py/issues) for bug reports or feature requests
 - Contact [Nefino](https://www.nefino.de/kontakt) for account-related inquiries

{nefino_geosync-0.1.0 → nefino_geosync-0.2.1}/nefino_geosync/compose_requests.py

@@ -65,4 +65,4 @@ def compose_single_request(state: str,
                                   scope=scope, 
                                   requests=requests, 
                                   operations=DUMMY_OPERATIONS)
-    return GeoAnalysisInput(name=f'sync_{state}', specs=[spec])
+    return GeoAnalysisInput(name=f'sync_{state}', specs=spec)

{nefino_geosync-0.1.0 → nefino_geosync-0.2.1}/nefino_geosync/download_analysis.py

@@ -1,22 +1,25 @@
 import os
 import re
-from shutil import move, rmtree
-from urllib.request import urlretrieve
 import zipfile
+from .config import Config
 from .get_downloadable_analyses import AnalysisResult
 from .journal import Journal
-from .config import Config
-from .storage import get_download_directory 
+from .storage import get_download_directory
 from datetime import datetime
+from shutil import move, rmtree
+from urllib.request import urlretrieve
+
 
 def download_analysis(analysis: AnalysisResult) -> None:
     """Downloads the analysis to the local machine."""
     journal = Journal.singleton()
     download_dir = get_download_directory(analysis.pk)
     download_file = os.path.join(download_dir, "download.zip")
-    if not os.path.exists(download_file):
-        urlretrieve(analysis.url.replace(" ", "%20"), download_file)
-    with zipfile.ZipFile(download_file, 'r') as zip_ref:
+    if os.path.exists(download_file):
+        # remove any failed download
+        os.remove(download_file)
+    urlretrieve(analysis.url.replace(" ", "%20"), download_file)
+    with zipfile.ZipFile(download_file, "r") as zip_ref:
         zip_ref.extractall(download_dir)
     zip_root = get_zip_root(download_dir)
     unpack_items(zip_root, analysis.pk, analysis.started_at)
@@ -29,42 +32,95 @@ def get_zip_root(download_dir: str) -> str:
     return download_dir
 
 
-FILE_NAME_PATTERN = re.compile(r"(?P<layer>^.*?)(?P<buffer>__[0-9]+m)?(?P<ext>\..{3,4}$)")
+FILE_NAME_PATTERN = re.compile(
+    r"(?P<layer>^.*?)(?P<buffer>__[0-9]+m)?(?P<ext>\..{3,4}$)"
+)
+
 
 def unpack_items(zip_root: str, pk: str, started_at: datetime) -> None:
-    """Unpacks the layers from the zip file."""
+    """
+    Unpacks the layers from the zip file.
+
+    Args:
+        zip_root: Path to the root directory of the extracted zip
+        pk: Primary key of the analysis
+        started_at: Timestamp when the analysis started
+    """
     journal = Journal.singleton()
     config = Config.singleton()
+
     if pk not in journal.analysis_states:
         print(f"Analysis {pk} not found in journal; skipping download")
         return
+
     state = journal.get_state_for_analysis(pk)
-    for cluster in (f for f in os.listdir(zip_root) 
-                    if f != 'analysis_area'
-                    and os.path.isdir(os.path.join(zip_root, f))):
-        cluster_dir = os.path.join(zip_root, cluster)
+    base_path = get_base_path(zip_root)
+
+    # Iterate through cluster folders inside the analysis subfolder
+    for cluster in (
+        f
+        for f in os.listdir(base_path)
+        if f != "analysis_area" and os.path.isdir(os.path.join(base_path, f))
+    ):
+        cluster_dir = os.path.join(base_path, cluster)
         layers = set()
+
         for file in os.listdir(cluster_dir):
             if journal.is_newer_than_saved(file, state, started_at):
                 output_dir = os.path.join(config.output_path, state)
                 if not os.path.exists(output_dir):
                     os.makedirs(output_dir)
+
                 file_path = os.path.join(cluster_dir, file)
                 match = re.match(FILE_NAME_PATTERN, file)
                 layer, ext = (match.group("layer"), match.group("ext"))
-                # remove any existing files for the same layer
+
+                # Remove any existing files for the same layer
                 # this is important to avoid confusion if the pre-buffer changes
-                for matching_file in (f for f in os.listdir(output_dir)
-                                      if f.startswith(layer)):
+                for matching_file in (
+                    f for f in os.listdir(output_dir) if f.startswith(layer)
+                ):
                     output_match = re.match(FILE_NAME_PATTERN, matching_file)
                     # only remove files that match the layer and extension
                     # otherwise, only the last extension to be unpacked would survive
                     # also, we are double-checking the layer name here in case we have
                     # a layer name which starts with a different layer's name
-                    if output_match.group("layer") == layer and \
-                          output_match.group("ext") == ext:
+                    if (
+                        output_match.group("layer") == layer
+                        and output_match.group("ext") == ext
+                    ):
                         os.remove(os.path.join(output_dir, matching_file))
+
                 move(file_path, output_dir)
                 layers.add(layer)
+
         journal.record_layers_unpacked(layers, state, started_at)
-    rmtree(zip_root)
+
+    rmtree(zip_root)
+
+
+def get_base_path(zip_root: str) -> str:
+    """
+    Returns the base path for the analysis files in the ZIP structure.
+
+    Handles two different ZIP structures:
+    - Old structure: analysis_summary.xlsx and cluster folders directly in ZIP root
+    - New structure: analysis_summary.xlsx and cluster folders inside a dedicated subfolder
+
+    The presence of analysis_summary.xlsx in the root directory is used to determine
+    which structure we're dealing with.
+
+    Args:
+        zip_root: Path to the root directory of the extracted ZIP file
+
+    Returns:
+        str: Path to the directory containing the cluster folders and analysis_summary.xlsx
+    """
+    if "analysis_summary.xlsx" in os.listdir(zip_root):
+        # Old structure - use zip_root
+        return zip_root
+    # Get the analysis subfolder name (first and only directory in zip_root)
+    analysis_subfolder = next(
+        f for f in os.listdir(zip_root) if os.path.isdir(os.path.join(zip_root, f))
+    )
+    return os.path.join(zip_root, analysis_subfolder)

{nefino_geosync-0.1.0 → nefino_geosync-0.2.1}/nefino_geosync/schema.json

@@ -823,17 +823,9 @@
                 "kind": "NON_NULL",
                 "name": null,
                 "ofType": {
-                  "kind": "LIST",
-                  "name": null,
-                  "ofType": {
-                    "kind": "NON_NULL",
-                    "name": null,
-                    "ofType": {
-                      "kind": "INPUT_OBJECT",
-                      "name": "GeoAnalysisObjectInput",
-                      "ofType": null
-                    }
-                  }
+                  "kind": "INPUT_OBJECT",
+                  "name": "GeoAnalysisObjectInput",
+                  "ofType": null
                 }
               }
             }
@@ -1206,16 +1198,6 @@
           "enumValues": null,
           "fields": null,
           "inputFields": [
-            {
-              "defaultValue": null,
-              "description": "Operation to be done on those layers. One of \"union\", \"union_negative\" or \"both\". Default is \"both\".",
-              "name": "type",
-              "type": {
-                "kind": "ENUM",
-                "name": "OperationType",
-                "ofType": null
-              }
-            },
             {
               "defaultValue": null,
               "description": "Name of the requested operation",
@@ -1254,35 +1236,6 @@
           "name": "GeoAnalysisOperationInput",
           "possibleTypes": null
         },
-        {
-          "description": "An enumeration.",
-          "enumValues": [
-            {
-              "deprecationReason": null,
-              "description": null,
-              "isDeprecated": false,
-              "name": "UNION"
-            },
-            {
-              "deprecationReason": null,
-              "description": null,
-              "isDeprecated": false,
-              "name": "UNION_NEGATIVE"
-            },
-            {
-              "deprecationReason": null,
-              "description": null,
-              "isDeprecated": false,
-              "name": "BOTH"
-            }
-          ],
-          "fields": null,
-          "inputFields": null,
-          "interfaces": null,
-          "kind": "ENUM",
-          "name": "OperationType",
-          "possibleTypes": null
-        },
         {
           "description": "Input for specs: Output format.",
           "enumValues": null,

{nefino_geosync-0.1.0 → nefino_geosync-0.2.1}/nefino_geosync/schema.py

@@ -24,11 +24,6 @@ ID = sgqlc.types.ID
 
 Int = sgqlc.types.Int
 
-class OperationType(sgqlc.types.Enum):
-    __schema__ = schema
-    __choices__ = ('BOTH', 'UNION', 'UNION_NEGATIVE')
-
-
 class OutputObjectType(sgqlc.types.Enum):
     __schema__ = schema
     __choices__ = ('GPKG', 'QGIS_AND_GPKG', 'QGIS_PRJ', 'SHP')
@@ -75,7 +70,7 @@ class GeoAnalysisInput(sgqlc.types.Input):
     __schema__ = schema
     __field_names__ = ('name', 'specs')
     name = sgqlc.types.Field(String, graphql_name='name')
-    specs = sgqlc.types.Field(sgqlc.types.non_null(sgqlc.types.list_of(sgqlc.types.non_null('GeoAnalysisObjectInput'))), graphql_name='specs')
+    specs = sgqlc.types.Field(sgqlc.types.non_null('GeoAnalysisObjectInput'), graphql_name='specs')
 
 
 class GeoAnalysisLayerInput(sgqlc.types.Input):
@@ -97,8 +92,7 @@ class GeoAnalysisObjectInput(sgqlc.types.Input):
 
 class GeoAnalysisOperationInput(sgqlc.types.Input):
     __schema__ = schema
-    __field_names__ = ('type', 'operation_name', 'input')
-    type = sgqlc.types.Field(OperationType, graphql_name='type')
+    __field_names__ = ('operation_name', 'input')
     operation_name = sgqlc.types.Field(sgqlc.types.non_null(String), graphql_name='operationName')
     input = sgqlc.types.Field(sgqlc.types.non_null(sgqlc.types.list_of(String)), graphql_name='input')
 

{nefino_geosync-0.1.0 → nefino_geosync-0.2.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "nefino-geosync"
-version = "0.1.0"
+dynamic = ["version"]
 license = {file = "LICENSE"}
 readme = "README.md"
 description = "Python package to access geographical data from Nefino.LI Geo"