nefino-geosync 0.1.0__py3-none-any.whl → 0.2.1__py3-none-any.whl

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/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/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/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.dist-info → nefino_geosync-0.2.1.dist-info}/METADATA

@@ -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.dist-info → nefino_geosync-0.2.1.dist-info}/RECORD

@@ -1,21 +1,21 @@
 nefino_geosync/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nefino_geosync/access_rule_filter.py,sha256=mCSMBrXNkGojiW2Ly8D9w46emaigp9bkDSW7f2gVnBM,372
 nefino_geosync/api_client.py,sha256=ylVVEC1f6N8P77VVZ5RLp3lieVnLmrepMO1IjnBGU4o,3617
-nefino_geosync/compose_requests.py,sha256=qCvixY1Zxr47tMNm3juXQf0ZY4xFHrH4sUEXuHL8j1k,3742
+nefino_geosync/compose_requests.py,sha256=oiVApnl-cxDBFeIoxaU_UREI4EXOHSCsad0i65Uh1BM,3740
 nefino_geosync/config.py,sha256=thVVMsw4-CGgYJj63sX6nQShSZ9n9zEuz_9RCNL1tIM,3491
-nefino_geosync/download_analysis.py,sha256=WhiC6XTe1My5E_yA9TAxmQ1NG3YPxUc_AAd8C_Kmllo,3311
+nefino_geosync/download_analysis.py,sha256=Y4By5U5-ohks6VzjgSd_8RqZ_gIocukgWlN51NXdq_k,4751
 nefino_geosync/download_completed_analyses.py,sha256=ggCZGi8mOL2imT8iwfR8yTsdvnKHA6jyw6Dwil1TLU0,866
 nefino_geosync/get_downloadable_analyses.py,sha256=Om0Q6F7xRze-jvo865XN2qzRT91zmuA-TAKYmeVsGIE,1651
 nefino_geosync/graphql_errors.py,sha256=n92jAicdfeH7weUo1I1gTIC2JQKDybYlD9BVredSHQw,1512
 nefino_geosync/journal.py,sha256=5IbOBfIM-oWXCd7ZvMqx-8A069dDsW15DZ9YcnCzV0s,5271
 nefino_geosync/parse_args.py,sha256=75e8J7WDiueOnMuPQdvwj-w_dXMhrGCOLMNTRIFGOHA,937
 nefino_geosync/run.py,sha256=l4b-P5B3_CNqp6d13_ZjCBbGyp7MWIC1ZwgNfEvvZm8,914
-nefino_geosync/schema.json,sha256=bLli73Xr983x8Z83DKW-Zql4qJMsJSEE1aoBggqDDLM,72547
-nefino_geosync/schema.py,sha256=yWKOjSyUthGe0OnhX86iJkKKqK7Li3_-ZU5WCEiSNXg,9438
+nefino_geosync/schema.json,sha256=yBHwVYsfF1ybUFthGUuNpkdGkBdx_DcqZgq0ul4TIYo,71104
+nefino_geosync/schema.py,sha256=ALP9_2sKh75sXrYDmTiBEBLygZMiZF-B8hahcYYJZrE,9203
 nefino_geosync/start_analyses.py,sha256=xWicbXvJybKb8Yi756M2cRpfys0bzmri9_eByAot0sE,2063
 nefino_geosync/storage.py,sha256=_fnE-zQnNSMfgoUratUcDGbMUJA-oatf55AXbuftFyI,1424
-nefino_geosync-0.1.0.dist-info/METADATA,sha256=uthvy_QaflOzgCx2UWo-1-97hkRMhcZHuWy6k2Ub0Bc,15498
-nefino_geosync-0.1.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-nefino_geosync-0.1.0.dist-info/entry_points.txt,sha256=zZ7Zrx1MyxZKd2iGrvRmHjYzY5C2EMgqY5TqzNOGYqo,59
-nefino_geosync-0.1.0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-nefino_geosync-0.1.0.dist-info/RECORD,,
+nefino_geosync-0.2.1.dist-info/METADATA,sha256=P4iOxGtvCM9xkS3X1DszkbW-2U46RkDz8uBYYkRjG4Q,15496
+nefino_geosync-0.2.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+nefino_geosync-0.2.1.dist-info/entry_points.txt,sha256=zZ7Zrx1MyxZKd2iGrvRmHjYzY5C2EMgqY5TqzNOGYqo,59
+nefino_geosync-0.2.1.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+nefino_geosync-0.2.1.dist-info/RECORD,,

{nefino_geosync-0.1.0.dist-info → nefino_geosync-0.2.1.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.25.0
+Generator: hatchling 1.27.0
 Root-Is-Purelib: true
 Tag: py3-none-any