geobox 1.0.0__tar.gz → 1.1.1__tar.gz

{geobox-1.0.0 → geobox-1.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: geobox
-Version: 1.0.0
+Version: 1.1.1
 Summary: SDK for Geobox's APIs
 Author-email: Hamid Heydari <heydari.h62@gmail.com>
 License: MIT
@@ -29,7 +29,7 @@ Dynamic: license-file
 
 Geobox® is a cloud-based GIS platform that enables users (local governments, companies and individuals) to easily upload their geo-spatial data, publish them as geo-services, visualize and analyze their geo-content (geo-data or -services) and share them with others. Geobox is a modern, world-class and cloud-ready geo-spatial platform that provides standard, safe, efficient and easy to use GI-Services.
 
-Geobox SDK provides seamless integration with the Geobox API, enabling developers to work with geospatial data and services programmatically. This comprehensive toolkit empowers applications to leverage advanced geospatial capabilities including data management and analysis.
+Geobox python SDK provides seamless integration with the Geobox API, enabling developers to work with geospatial data and services programmatically. This comprehensive toolkit empowers applications to leverage advanced geospatial capabilities including data management and analysis.
 
 Installation
 ============

{geobox-1.0.0 → geobox-1.1.1}/README.md

@@ -3,7 +3,7 @@
 
 Geobox® is a cloud-based GIS platform that enables users (local governments, companies and individuals) to easily upload their geo-spatial data, publish them as geo-services, visualize and analyze their geo-content (geo-data or -services) and share them with others. Geobox is a modern, world-class and cloud-ready geo-spatial platform that provides standard, safe, efficient and easy to use GI-Services.
 
-Geobox SDK provides seamless integration with the Geobox API, enabling developers to work with geospatial data and services programmatically. This comprehensive toolkit empowers applications to leverage advanced geospatial capabilities including data management and analysis.
+Geobox python SDK provides seamless integration with the Geobox API, enabling developers to work with geospatial data and services programmatically. This comprehensive toolkit empowers applications to leverage advanced geospatial capabilities including data management and analysis.
 
 Installation
 ============

{geobox-1.0.0 → geobox-1.1.1}/geobox/api.py

@@ -597,23 +597,23 @@ class GeoboxClient:
         return File.get_file(self, uuid=uuid)
     
 
-    def get_file_by_name(self, name: str, user_id: int = None) -> Union['File', None]:
+    def get_files_by_name(self, name: str, user_id: int = None) -> List['File']:
         """
-        Get a file by name
+        Get files by name
 
         Args:
             name (str): the name of the file to get
             user_id (int, optional): specific user. privileges required.
 
         Returns:
-            File | None: returns the file if a file matches the given name, else None
+            List[File]: returns files that matches the given name
 
         Example:
             >>> from geobox import GeoboxClient
             >>> client = GeoboxClient()
-            >>> file = client.get_file_by_name(name='test')
+            >>> files = client.get_files_by_name(name='test')
         """
-        return File.get_file_by_name(self, name, user_id)
+        return File.get_files_by_name(self, name, user_id)
 
 
     def upload_file(self, path: str, user_id: int = None, scan_archive: bool = True) -> 'File':

{geobox-1.0.0 → geobox-1.1.1}/geobox/enums.py

@@ -30,7 +30,7 @@ class FileType(Enum):
     GPX = '.gpx'
     GPKG = '.gpkg'
     GeoJSON = '.geojson'
-    GeoTIFF = '.tif'
+    GeoTIFF = '.tiff'
 
     # Image Formats
     JPG = '.jpg'

{geobox-1.0.0 → geobox-1.1.1}/geobox/file.py

@@ -188,9 +188,9 @@ class File(Base):
 
 
     @classmethod
-    def get_file_by_name(cls, api: 'GeoboxClient', name: str, user_id: int = None) -> Union['File', None]:
+    def get_files_by_name(cls, api: 'GeoboxClient', name: str, user_id: int = None) -> List['File']:
         """
-        Get a file by name
+        Get files by name
 
         Args:
             api (GeoboxClient): The GeoboxClient instance for making requests.
@@ -198,21 +198,17 @@ class File(Base):
             user_id (int, optional): specific user. privileges required.
 
         Returns:
-            File | None: returns the file if a file matches the given name, else None
+            List[File]: returns files that matches the given name
 
         Example:
             >>> from geobox import GeoboxClient
             >>> from geobox.file import File
             >>> client = GeoboxClient()
-            >>> file = File.get_file_by_name(client, name='test')
+            >>> files = File.get_file_by_name(client, name='test')
             or
-            >>> file = client.get_file_by_name(name='test')
+            >>> files = client.get_file_by_name(name='test')
         """
-        files = cls.get_files(api, q=f"name = '{name}'", user_id=user_id)
-        if files and files[0].name == name:
-            return files[0]
-        else:
-            return None
+        return cls.get_files(api, q=f"name = '{name}'", user_id=user_id)
     
 
     def _get_save_path(self, save_path: str = None) -> str:

{geobox-1.0.0 → geobox-1.1.1}/geobox/task.py

@@ -168,8 +168,31 @@ class Task(Base):
         
         return int((current / total) * 100)
 
+    
+    def _wait(self, timeout: Union[int, None] = None, interval: int = 1, progress_bar: bool = True) -> 'TaskStatus':
+        start_time = time.time()
+        last_progress = 0
+        pbar = self._create_progress_bar() if progress_bar else None
+        
+        try:
+            while True:
+                self._check_timeout(start_time, timeout)
+                status = self.status
+                
+                if self._is_final_state(status):
+                    self._update_progress_bar(pbar, last_progress, status)
+                    return TaskStatus(status)
+                
+                if pbar:
+                    last_progress = self._update_progress_bar(pbar, last_progress)
+                
+                time.sleep(interval)
+        finally:
+            if pbar:
+                pbar.close()
 
-    def wait(self, timeout: Union[int, None] = None, interval: int = 1, progress_bar: bool = True) -> 'TaskStatus':
+
+    def wait(self, timeout: Union[int, None] = None, interval: int = 1, progress_bar: bool = True, retry: int = 3) -> 'TaskStatus':
         """
         Wait for the task to finish.
         
@@ -177,6 +200,7 @@ class Task(Base):
             timeout (int, optional): Maximum time to wait in seconds.
             interval (int, optional): Time between status checks in seconds.
             progress_bar (bool, optional): Whether to show a progress bar. default: True
+            retry (int, optional): Number of times to retry if waiting for the task fails. default is 3
             
         Returns:
             TaskStatus: the status of the task(SUCCESS, FAILURE, ABORTED, PENDING, PROGRESS)
@@ -191,26 +215,16 @@ class Task(Base):
             >>> task = Task.get_task(client, uuid="12345678-1234-5678-1234-567812345678")
             >>> task.wait() # return the status of the task
         """
-        start_time = time.time()
-        last_progress = 0
-        pbar = self._create_progress_bar() if progress_bar else None
-        
-        try:
-            while True:
-                self._check_timeout(start_time, timeout)
-                status = self.status
-                
-                if self._is_final_state(status):
-                    self._update_progress_bar(pbar, last_progress, status)
-                    return TaskStatus(status)
-                
-                if pbar:
-                    last_progress = self._update_progress_bar(pbar, last_progress)
-                
+        last_exception = None
+
+        for attempt in range(1, retry + 1):
+            try:
+                return self._wait(timeout, interval, progress_bar)
+            except Exception as e:
+                last_exception = e
+                print(f"[Retry {attempt}/{retry}] Task wait failed: {e}")
                 time.sleep(interval)
-        finally:
-            if pbar:
-                pbar.close()
+        raise last_exception
 
 
     def _create_progress_bar(self) -> 'tqdm':

{geobox-1.0.0 → geobox-1.1.1}/geobox.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: geobox
-Version: 1.0.0
+Version: 1.1.1
 Summary: SDK for Geobox's APIs
 Author-email: Hamid Heydari <heydari.h62@gmail.com>
 License: MIT
@@ -29,7 +29,7 @@ Dynamic: license-file
 
 Geobox® is a cloud-based GIS platform that enables users (local governments, companies and individuals) to easily upload their geo-spatial data, publish them as geo-services, visualize and analyze their geo-content (geo-data or -services) and share them with others. Geobox is a modern, world-class and cloud-ready geo-spatial platform that provides standard, safe, efficient and easy to use GI-Services.
 
-Geobox SDK provides seamless integration with the Geobox API, enabling developers to work with geospatial data and services programmatically. This comprehensive toolkit empowers applications to leverage advanced geospatial capabilities including data management and analysis.
+Geobox python SDK provides seamless integration with the Geobox API, enabling developers to work with geospatial data and services programmatically. This comprehensive toolkit empowers applications to leverage advanced geospatial capabilities including data management and analysis.
 
 Installation
 ============

{geobox-1.0.0 → geobox-1.1.1}/pyproject.toml

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

{geobox-1.0.0 → geobox-1.1.1}/tests/test_api.py

@@ -737,7 +737,7 @@ def test_get_file(mock_file_data):
         assert file.data == mock_file_data
 
 
-def test_get_file_by_name(mock_file_data):
+def test_get_files_by_name(mock_file_data):
     with patch('geobox.api.GeoboxClient.get_access_token') as mock_get_token, \
          patch('geobox.api.GeoboxClient.get') as mock_get:
         
@@ -745,10 +745,10 @@ def test_get_file_by_name(mock_file_data):
         mock_get.return_value = [mock_file_data]
         
         client = GeoboxClient(username='testuser', password='testpassword')
-        file = client.get_file_by_name(name=mock_file_data['name'])
+        files = client.get_files_by_name(name=mock_file_data['name'])
         
-        assert isinstance(file, File)
-        assert file.data == mock_file_data
+        assert isinstance(files[0], File)
+        assert files[0].data == mock_file_data
 
 
 def test_upload_file():

{geobox-1.0.0 → geobox-1.1.1}/tests/test_file.py

@@ -108,7 +108,7 @@ def test_get_files(api):
         api.get.assert_called_once_with(f"{File.BASE_ENDPOINT}?f=json&search=test&search_fields=name&return_count=False&skip=0&limit=2&shared=False")
 
 
-def test_get_file_by_uuid(api, mock_file_data):
+def test_get_file(api, mock_file_data):
     """Test getting file by UUID."""
     with patch.object(api, 'get', return_value=mock_file_data):
         file = File.get_file(api, uuid=mock_file_data['uuid'])
@@ -118,18 +118,15 @@ def test_get_file_by_uuid(api, mock_file_data):
         api.get.assert_called_once_with(f"{file.endpoint}info/?f=json")
 
 
-def test_get_file_by_name(api, mock_file_data):
+def test_get_files_by_name(api, mock_file_data):
     """Test getting file by name."""
     mock_response = [mock_file_data]
     with patch.object(api, 'get', return_value=mock_response):
-        file = File.get_file_by_name(api, name=mock_file_data['name'])
-        assert isinstance(file, File)
-        assert file.uuid == mock_file_data['uuid']
-        assert file.name == mock_file_data['name']
-        api.get.assert_called_once_with(f"{file.BASE_ENDPOINT}?f=json&q=name+%3D+%27world_boundaries.shp%27&return_count=False&skip=0&limit=10&shared=False")
-        # not found
-        file = File.get_file_by_name(api, name='not_found')
-        assert file == None
+        files = File.get_files_by_name(api, name=mock_file_data['name'])
+        assert isinstance(files[0], File)
+        assert files[0].uuid == mock_file_data['uuid']
+        assert files[0].name == mock_file_data['name']
+        api.get.assert_called_once_with(f"{files[0].BASE_ENDPOINT}?f=json&q=name+%3D+%27world_boundaries.shp%27&return_count=False&skip=0&limit=10&shared=False")
 
 
 def test_download(api, mock_file_data):