geobox 1.2.1__tar.gz → 1.2.2__tar.gz

{geobox-1.2.1 → geobox-1.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: geobox
-Version: 1.2.1
+Version: 1.2.2
 Summary: SDK for Geobox's APIs
 Author-email: Hamid Heydari <heydari.h62@gmail.com>
 License: MIT

{geobox-1.2.1 → geobox-1.2.2}/geobox/file.py

@@ -2,13 +2,16 @@ from urllib.parse import urljoin
 from typing import Optional, Dict, List, Union, TYPE_CHECKING
 import os
 import mimetypes
+from geobox.exception import ValidationError
 import requests
 import sys
+from pathlib import Path
 
 from .base import Base
 from .enums import FileFormat, PublishFileType, InputGeomType, FileType
 from .utils import clean_data
 from .task import Task
+from .feature import Feature
 
 if TYPE_CHECKING:
     from . import GeoboxClient 
@@ -221,9 +224,9 @@ class File(Base):
             >>> from geobox import GeoboxClient
             >>> from geobox.file import File
             >>> client = GeoboxClient()
-            >>> files = File.get_file_by_name(client, name='test')
+            >>> files = File.get_files_by_name(client, name='test')
             or
-            >>> files = client.get_file_by_name(name='test')
+            >>> files = client.get_files_by_name(name='test')
         """
         return cls.get_files(api, q=f"name = '{name}'", user_id=user_id)
     
@@ -248,44 +251,34 @@ class File(Base):
             >>> client = GeoboxClient()
             >>> file_path = File.get_file(client, uuid="12345678-1234-5678-1234-567812345678")
         """
-        # Get the original filename from data or use uuid
-        if self.name:
-            filename = f"{self.name.split('.')[0]}" if len(self.name.split('.')) > 1 else f'{self.name}'
-        else:
-            filename = f'{self.uuid}'
-
         # If save_path is provided, check if it ends with a '/'
         if save_path and save_path.endswith('/'):
-            return f'{save_path}{filename}'
+            return f'{save_path}'
         
         if save_path and not save_path.endswith('/'):
             raise ValueError("save_path must end with a '/'")
         
-        return os.path.join(os.getcwd(), filename)
+        return os.getcwd()
     
 
-    def _get_file_ext(self, response: requests.Response) -> str:
+    def _get_file_name(self, response: requests.Response) -> str:
         """
-        Get the file extension of the response.
+        Get the file name from the response.
 
         Args:
             response (requests.Response): The response of the request.
 
         Returns:
-            str: The file extension of the response.
+            str: The file name 
         """
-        ext = ""
-        if 'Content-Disposition' in response.headers:
-            content_disposition = response.headers['Content-Disposition']
-            if 'filename=' in content_disposition:
-                filename = content_disposition.split('filename=')[-1].strip().strip('"')
-                ext = f".{filename.split('.')[-1]}"
+        if 'Content-Disposition' in response.headers and 'filename=' in response.headers['Content-Disposition']:
+            file_name = response.headers['Content-Disposition'].split('filename=')[-1].strip().strip('"')
 
-            else:
-                content_type = response.headers.get("Content-Type", "")
-                ext = mimetypes.guess_extension(content_type.split(";")[0])
+        else:
+            content_type = response.headers.get("Content-Type", "")
+            file_name = f'{self.name}.{mimetypes.guess_extension(content_type.split(";")[0])}'
 
-        return ext
+        return file_name
 
 
     def _create_progress_bar(self) -> 'tqdm':
@@ -338,20 +331,20 @@ class File(Base):
         save_path = self._get_save_path(save_path)
         os.makedirs(os.path.dirname(save_path), exist_ok=True)
         
-        with self.api.get(f"{self.endpoint}download/", stream=True) as response, \
-            open(save_path, 'wb') as f:
-            pbar = self._create_progress_bar() if progress_bar else None
-            for chunk in response.iter_content(chunk_size=8192):
-                f.write(chunk)
+        with self.api.get(f"{self.endpoint}download/", stream=True) as response:
+            file_name = self._get_file_name(response)
+            full_path = f"{save_path}/{file_name}"
+            with open(full_path, 'wb') as f:
+                pbar = self._create_progress_bar() if progress_bar else None
+                for chunk in response.iter_content(chunk_size=8192):
+                    f.write(chunk)
+                    if pbar:
+                        pbar.update(len(chunk))
+                        pbar.refresh()
                 if pbar:
-                    pbar.update(len(chunk))
-                    pbar.refresh()
-            if pbar:
-                pbar.close()
+                    pbar.close()
 
-        final_path = os.path.abspath(save_path) + self._get_file_ext(response)
-        os.rename(os.path.abspath(save_path), os.path.abspath(final_path))
-        return os.path.abspath(final_path)
+        return os.path.abspath(full_path)
 
 
     def delete(self) -> None:
@@ -378,8 +371,8 @@ class File(Base):
                     input_layer: str = None, 
                     input_dataset: str = None, 
                     user_id: int = None, 
-                    input_srid: int = None, 
-                    file_encoding: str = "utf-8", 
+                    input_srid: int = Feature.BASE_SRID, 
+                    file_encoding: str = "UTF-8", 
                     replace_domain_codes_by_values: bool = False, 
                     report_errors: bool = True, 
                     as_terrain: bool = False) -> 'Task':
@@ -393,7 +386,7 @@ class File(Base):
             input_layer (str, optional): The name of the input layer.
             input_dataset (str, optional): The name of the input dataset.
             user_id (int, optional): Specific user. privileges required.
-            input_srid (int, optional): The SRID of the layer.
+            input_srid (int, optional): The SRID of the layer. default is: 3857
             file_encoding (str, optional): The encoding of the file. default is "utf-8".
             replace_domain_codes_by_values (bool, optional): Whether to replace domain codes by values. default is False.
             report_errors (bool, optional): Whether to report errors. default is True.
@@ -404,6 +397,7 @@ class File(Base):
 
         Raises:
             ValueError: If the publish_as is not a valid PublishFileType.
+            ValidationError: if the zipped file doesn't have any layers to publish.
 
         Example:
             >>> from geobox import GeoboxClient
@@ -416,30 +410,41 @@ class File(Base):
             ...                     input_layer='layer1', 
             ...                     input_dataset='dataset1', 
             ...                     input_srid=4326, 
-            ...                     file_encoding='utf-8')
+            ...                     file_encoding='UTF-8')
         """
         if not publish_as:
-            if self.file_type.value in ['GeoJSON', 'GPKG', 'DXF', 'GPX', 'Shapefile', 'KML', 'CSV', 'FileGDB']:
+            # checks the file format or file first layer format to dynamically set the publish_as
+            if self.file_type.value in ['GeoJSON', 'GPKG', 'DXF', 'GPX', 'Shapefile', 'KML', 'CSV', 'FileGDB'] or \
+                (self.file_type.value in ['Complex'] and self.layers and \
+                    FileType(self.layers[0]['format']).value in ['GeoJSON', 'GPKG', 'DXF', 'GPX', 'Shapefile', 'KML', 'CSV', 'FileGDB']):
                 publish_as = PublishFileType.VECTOR
-            elif self.file_type.value in ['GeoTIFF']:
+
+            elif self.file_type.value in ['GeoTIFF'] or \
+                    (self.file_type.value in ['Complex'] and self.layers and \
+                        FileType(self.layers[0]['format']).value in ['GeoTIFF']):
                 publish_as = PublishFileType.RASTER
-            elif self.file_type.value in ['GLB']:
+
+            elif self.file_type.value in ['GLB'] or \
+                    (self.file_type.value in ['Complex'] and self.layers and \
+                        FileType(self.layers[0]['format']).value in ['GLB']):
                 publish_as = PublishFileType.MODEL3D
 
+            else:
+                raise ValidationError('Unknown format')
+
         data = clean_data({
             "publish_as": publish_as.value if isinstance(publish_as, PublishFileType) else publish_as,
             "layer_name": name,
-            "input_layer": input_layer,
+            "input_layer": self.layers[0]['layer'] if not input_layer and self.layers else input_layer,
             "input_geom_type": input_geom_type.value if isinstance(input_geom_type, InputGeomType) else input_geom_type,
             "replace_domain_codes_by_values": replace_domain_codes_by_values,
-            "input_dataset": self.name if not input_dataset else input_dataset,
+            "input_dataset": self.layers[0]['dataset'] if not input_layer and self.layers else input_dataset,
             "user_id": user_id,
             "input_srid": input_srid,
             "file_encoding": file_encoding,
             "report_errors": report_errors,
             "as_terrain": as_terrain
         })
-
         endpoint = urljoin(self.endpoint, 'publish/')
         response = self.api.post(endpoint, data, is_json=False)
         task = Task.get_task(self.api, response.get('task_id'))

{geobox-1.2.1 → geobox-1.2.2}/geobox.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: geobox
-Version: 1.2.1
+Version: 1.2.2
 Summary: SDK for Geobox's APIs
 Author-email: Hamid Heydari <heydari.h62@gmail.com>
 License: MIT

{geobox-1.2.1 → geobox-1.2.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "geobox"
-version = "1.2.1"
+version = "1.2.2"
 description = "SDK for Geobox's APIs"
 authors = [
   {name = "Hamid Heydari", email = "heydari.h62@gmail.com"}

{geobox-1.2.1 → geobox-1.2.2}/tests/test_file.py

@@ -6,7 +6,7 @@ import tempfile
 import zipfile
 import shutil
 
-from geobox.file import File, FileType
+from geobox.file import File, FileType, ValidationError
 from geobox.enums import PublishFileType, InputGeomType
 from geobox.task import Task
 from geobox.user import User
@@ -254,7 +254,7 @@ def test_download_no_filename_in_content_disposition(api, mock_file_data):
         # Verify the expected behavior
         assert result.endswith('.png')
         mock_makedirs.assert_called_once()
-        mock_rename.assert_called_once()
+        # mock_rename.assert_called_once()
 
 
 def test_delete(api, mock_file_data):
@@ -268,9 +268,10 @@ def test_delete(api, mock_file_data):
 @pytest.mark.parametrize("file_type", [
     (type)
     for type in FileType
+    if type not in [FileType.Compressed, FileType.Complex, FileType.Video, FileType.Image, FileType.Document]
 ])
 def test_publish(api, mock_file_data, mock_success_task_data, file_type):
-    """Test file publishing with all combinations of publish types and geometry types."""
+    """Test file publishing with all combinations of publish types"""
     mock_response = {
         'task_id': mock_success_task_data['id']
     }
@@ -285,6 +286,13 @@ def test_publish(api, mock_file_data, mock_success_task_data, file_type):
             # Verify the response
             assert isinstance(result, Task)
             assert result.id == mock_success_task_data['id']
+
+
+def test_publish_unkown_format(api, mock_file_data):
+    """Test file publishing with unknown format"""
+    mock_file_data['file_type'] = FileType.Document
+    with pytest.raises(ValidationError):
+        File(api, uuid=mock_file_data['uuid'], data=mock_file_data).publish(name='test')
         
 
 def test_share(api, mock_file_data, mock_user_data):