geobox 1.4.1__py3-none-any.whl → 1.4.2__py3-none-any.whl

geobox/map.py

@@ -574,11 +574,30 @@ class Map(Base):
             'view_settings': {},
             'toc_settings': []
         })
+    
+
+    def update_settings(self, settings: Dict) -> Dict:
+        """
+        Update the settings
+
+        settings (Dict): settings dictionary
+
+        Returns:
+            Dict: updated settings
+
+        Example:
+            >>> from geobox import GeoboxClient
+            >>> client = GeoboxClient()
+            >>> map1 = client.get_map(uuid="12345678-1234-5678-1234-567812345678")
+            >>> map2 = client.get_map(uuid="12345678-1234-5678-1234-567812345678")
+            >>> map1.update_settings(map2.settings)
+        """
+        return super()._set_settings(self.endpoint, settings)    
 
 
     def set_settings(self, **kwargs) -> Dict:
         """
-        Set the settings of the map.
+        Set the settings of the map using keywords
 
         Keyword Args:
             map_unit (str): 'latlng' | 'utm'.
@@ -736,7 +755,7 @@ class Map(Base):
         if not response or json:
             return response
         else:
-            return [Model(self.api, model['obj'], model) for model in response['objects']]
+            return [Model(self.api, model['obj'], model) for model in response['objects'] if response.get('objects')]
     
 
     def set_models(self, data: Dict) -> List['Model']:
@@ -771,7 +790,7 @@ class Map(Base):
         """
         endpoint = urljoin(self.endpoint, 'models/')
         response = self.api.put(endpoint, data)
-        return [Model(self.api, model['obj'], model) for model in response['objects']]
+        return [Model(self.api, model['obj'], model) for model in response['objects'] if response.get('objects')]
 
 
     def add_model(self, 

geobox/model3d.py

@@ -1,5 +1,10 @@
 from typing import Dict, List, Optional, Optional, Union, TYPE_CHECKING
 from urllib.parse import urljoin, urlencode
+import os
+import zipfile
+import sys
+import requests
+import mimetypes
 
 from .base import Base
 from .exception import ApiRequestError
@@ -216,33 +221,113 @@ class Model(Base):
         super().delete(self.endpoint)
 
 
-    def get_content(self) -> bytes:
+    def _get_save_path(self, save_path: str = None) -> str:
         """
-        Get the raw content of the 3D model.
+        Get the path where the file should be saved.
+
+        Args:
+            save_path (str, optional): The path to save the file.
 
         Returns:
-            bytes: The raw content of the 3D model in glTF format.
+            str: The path where the file is saved.
+        
+        Raises:
+            ValueError: If save_path does not end with a '/'.
+
+        Example:
+            >>> from geobox import GeoboxClient
+            >>> from geobox.file import File
+            >>> from geobox import GeoboxClient
+            >>> client = GeoboxClient()
+            >>> file_path = File.get_file(client, uuid="12345678-1234-5678-1234-567812345678")
+        """
+        # If save_path is provided, check if it ends with a '/'
+        if save_path and save_path.endswith('/'):
+            return f'{save_path}'
+        
+        if save_path and not save_path.endswith('/'):
+            raise ValueError("save_path must end with a '/'")
+        
+        return os.getcwd()
+
+
+    def _create_progress_bar(self) -> 'tqdm':
+        """Creates a progress bar for the task."""
+        try:
+            from tqdm.auto import tqdm
+        except ImportError:
+            from .api import logger
+            logger.warning("[tqdm] extra is required to show the progress bar. install with: pip insatll geobox[tqdm]")
+            return None
+
+        return tqdm(unit="B", 
+                        total=int(self.size), 
+                        file=sys.stdout,
+                        dynamic_ncols=True,
+                        desc="Downloading",
+                        unit_scale=True,
+                        unit_divisor=1024, 
+                        ascii=True
+                )
+
+
+    def download(self, save_path: str = None, progress_bar: bool = True) -> str:
+        """
+        Download the 3D model, save it as a .glb file, zip it, and return the zip file path.
+
+        Args:
+            save_path (str, optional): Directory where the file should be saved.
+            progress_bar (bool, optional): Whether to show a progress bar. Default: True
+
+        Returns:
+            str: Path to the .zip file containing the .glb model.
 
         Raises:
             ApiRequestError: If the API request fails.
 
         Example:
             >>> from geobox import GeoboxClient
-            >>> from geobox.model3d import Model
             >>> client = GeoboxClient()
-            >>> model = Model.get_model(api=client, uuid="12345678-1234-5678-1234-567812345678")
-            >>> content = model.get_content()
-            >>> # Save the content to a file
-            >>> with open('model.gltf', 'wb') as f:
-            ...     f.write(content)
+            >>> model = client.get_models()[0]
+            >>> model.get_content()
         """
-        endpoint = urljoin(self.api.base_url, f'{self.endpoint}/content/')
-        response = self.api.session.get(endpoint)
-        
-        if response.status_code != 200:
-            raise ApiRequestError(f"Failed to get model content: {response.status_code}")
-            
-        return response.content
+        if not self.uuid:
+            raise ValueError("Model UUID is required to download content")
+
+        if self.data.get('obj'):
+            model = self.api.get_model(self.obj)
+        else:
+            model = self
+
+        save_path = model._get_save_path(save_path)
+        os.makedirs(save_path, exist_ok=True)
+
+        endpoint = urljoin(model.api.base_url, f"{model.endpoint}/content/")
+        with model.api.session.get(endpoint, stream=True) as response:
+            if response.status_code != 200:
+                raise ApiRequestError(f"Failed to get model content: {response.status_code}")
+
+            glb_filename = f"{model.name}.glb"
+            glb_path = os.path.join(save_path, glb_filename)
+
+            with open(glb_path, "wb") as f:
+                pbar = model._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.close()
+
+        zip_filename = f"{model.name}.zip"
+        zip_path = os.path.join(save_path, zip_filename)
+        with zipfile.ZipFile(zip_path, "w", zipfile.ZIP_DEFLATED) as zipf:
+            zipf.write(glb_path, arcname=os.path.basename(glb_path))
+
+        os.remove(glb_path)
+
+        return os.path.abspath(zip_path)
 
 
     @property

geobox/mosaic.py

@@ -401,6 +401,25 @@ class Mosaic(Raster):
         """
         return super().settings
     
+
+    def update_settings(self, settings: Dict) -> Dict:
+        """
+        Update the settings
+
+        settings (Dict): settings dictionary
+
+        Returns:
+            Dict: updated settings
+
+        Example:
+            >>> from geobox import GeoboxClient
+            >>> client = GeoboxClient()
+            >>> mosaic1 = client.get_mosaic(uuid="12345678-1234-5678-1234-567812345678")
+            >>> mosaic2 = client.get_mosaic(uuid="12345678-1234-5678-1234-567812345678")
+            >>> mosaic1.update_settings(mosaic2.settings)
+        """
+        return super().update_settings(settings)  
+    
     
     def set_settings(self, **kwargs) -> None:
         """

geobox/query.py

@@ -179,7 +179,7 @@ class Query(Base):
 
 
     @classmethod
-    def create_query(cls, api: 'GeoboxClient', name: str, display_name: str = None, sql: str = None, params: List = None) -> 'Query':
+    def create_query(cls, api: 'GeoboxClient', name: str, display_name: str = None, description:str = None, sql: str = None, params: List = None) -> 'Query':
         """
         Creates a new query.
 
@@ -187,6 +187,7 @@ class Query(Base):
             api (Api): The GeoboxClient instance for making requests.
             name (str): The name of the query.
             display_name (str, optional): The display name of the query.
+            description (str, optional): The description of the query.
             sql (str, optional): The SQL statement for the query.
             params (list, optional): The parameters for the SQL statement.
 
@@ -204,6 +205,7 @@ class Query(Base):
         data = {
             "name": name,
             "display_name": display_name,
+            "description": description,
             "sql": sql,
             "params": params
         }

geobox/raster.py

@@ -641,6 +641,25 @@ class Raster(Base):
             >>> raster.settings
         """
         return super()._get_settings(self.endpoint)
+    
+
+    def update_settings(self, settings: Dict) -> Dict:
+        """
+        Update the settings
+
+        settings (Dict): settings dictionary
+
+        Returns:
+            Dict: updated settings
+
+        Example:
+            >>> from geobox import GeoboxClient
+            >>> client = GeoboxClient()
+            >>> raster1 = client.get_raster(uuid="12345678-1234-5678-1234-567812345678")
+            >>> raster2 = client.get_raster(uuid="12345678-1234-5678-1234-567812345678")
+            >>> raster1.update_settings(raster2.settings)
+        """
+        return super()._set_settings(self.endpoint, settings)  
 
 
     def set_settings(self, **kwargs) -> None:

geobox/vectorlayer.py

@@ -1062,6 +1062,25 @@ class VectorLayer(Base):
             >>> setting = layer.setting
         """
         return super()._get_settings(endpoint=self.endpoint)
+    
+
+    def update_settings(self, settings: Dict) -> Dict:
+        """
+        Update the settings
+
+        settings (Dict): settings dictionary
+
+        Returns:
+            Dict: updated settings
+
+        Example:
+            >>> from geobox import GeoboxClient
+            >>> client = GeoboxClient()
+            >>> layer1 = client.get_vector(uuid="12345678-1234-5678-1234-567812345678")
+            >>> layer2 = client.get_vector(uuid="12345678-1234-5678-1234-567812345678")
+            >>> layer1.update_settings(layer2.settings)
+        """
+        return super()._set_settings(self.endpoint, settings)  
 
 
     def set_settings(self, **kwargs) -> Dict:

geobox/view.py

@@ -722,6 +722,25 @@ class VectorLayerView(VectorLayer):
         return super().settings
 
 
+    def update_settings(self, settings: Dict) -> Dict:
+        """
+        Update the settings
+
+        settings (Dict): settings dictionary
+
+        Returns:
+            Dict: updated settings
+
+        Example:
+            >>> from geobox import GeoboxClient
+            >>> client = GeoboxClient()
+            >>> view1 = client.get_view(uuid="12345678-1234-5678-1234-567812345678")
+            >>> view2 = client.get_view(uuid="12345678-1234-5678-1234-567812345678")
+            >>> view1.update_settings(view2.settings)
+        """
+        return super().update_settings(settings) 
+
+
     def set_settings(self, **kwargs) -> Dict:
         """
         Set the settings of the Vector Layer.

{geobox-1.4.1.dist-info → geobox-1.4.2.dist-info}/METADATA

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

{geobox-1.4.1.dist-info → geobox-1.4.2.dist-info}/RECORD

@@ -12,12 +12,12 @@ geobox/field.py,sha256=p9eitUpnsiGj6GUhjSomk6HWlsNJSbE-Oh_4VcjaqVo,10562
 geobox/file.py,sha256=cMm-SwTzRKALiIj-gkY4UJzUsOuN5SGz50eU1ylNAxk,20079
 geobox/layout.py,sha256=TdE5FJ7fzbhkexojY8h-r68hXb5UYM6MIfNkxfs_RKA,11285
 geobox/log.py,sha256=Xuq4oKPwaypZ4nYEOIXu13dH4AkQcf0pkTw85gDQqS4,4063
-geobox/map.py,sha256=JfGYGo1P9jcbYLr3RkwrvhTTnb-xmH_EsuqO0M_yT5c,36118
-geobox/model3d.py,sha256=GUpZdRcy6Fs83PdqdfX70F_uxIAqkyTbsMWYSI7rV5k,12011
-geobox/mosaic.py,sha256=6wSK9xkjtBUEtIsZANWVYwsJbDx112mO1SQOXcPTVo8,23780
+geobox/map.py,sha256=kksFBS79TOKN9KBByXzj2atSvZhIAuMA85hSjo_szeA,36788
+geobox/model3d.py,sha256=acT5dXwq3Lmhfq5-cPOnYJMZR1gzj3cfF6kyxMleHag,14924
+geobox/mosaic.py,sha256=zKo6cEtaqz7fFcWIzhURxZIkICUQlpEhpFBjGJ5GJ1M,24385
 geobox/plan.py,sha256=jUzl6CQBY6IsdieEppJOmE0sSjwvu6eHO89pC_JFs6I,12066
-geobox/query.py,sha256=FqeiZf2E4tJ2FG-mIfRKov6H1QWUrMSErVpNWcb3Wx0,24038
-geobox/raster.py,sha256=gBWZUm88uJwjgSlp7auS0nEB9KjkTv1F9hvdPaJqCic,30084
+geobox/query.py,sha256=ubS1Og3rC_6-zW-cbR30o7bZw2MZNZY652VLCvVvmWE,24173
+geobox/raster.py,sha256=fTIM9HKVddaFfO9o-mEbZSM31qpCr6KAszguInZjd2A,30702
 geobox/route.py,sha256=cKZTTHBHM8woWbhHIpCvrRX_doJcTkGktouee0z7oG0,2723
 geobox/scene.py,sha256=GEzvWB-l-xO-8IodwFAPt4T7lZxuzEKJ1H0cqfx78W4,11301
 geobox/settings.py,sha256=rGRdM18Vo7xnjfZXPLRMbKeoVC_lZmzkNRPS0SQv05o,5660
@@ -27,12 +27,12 @@ geobox/tileset.py,sha256=bQOckE04F31vb-NYmNsQzXndZSTDZyskWspRikjZuBs,24241
 geobox/usage.py,sha256=_54xL-n-2Bg9wGpoOBKnh85WqdpMWEtqxRJVaFlVWe0,7908
 geobox/user.py,sha256=YY72uRvjKUUWUZbxhrft37FVBlqDeosPMf3EpMVBhc0,15069
 geobox/utils.py,sha256=qLtchKIdw-az3KCiiFv0-Cpmx9RfBxORjlATvVyDIaQ,1314
-geobox/vectorlayer.py,sha256=eB1zadgS4xqxV1NEUwaXsh5PIwAX054tYBqdu8ZO6hs,56452
+geobox/vectorlayer.py,sha256=s8zH68ALeBvep5bW5wuHkDm9x07Z52GhPaeDbznJ3wY,57066
 geobox/version.py,sha256=0GLPhxCeEb2bAkdpPJWtXPXc1KP6kQ_TOMwLAL0ldo0,9374
-geobox/view.py,sha256=t-MlTNDL1T53Mybny5UOMTjVQwDdaDovLJfyl3Qgx1I,40919
+geobox/view.py,sha256=xAxBhxwoWAoiG8YJBEF93UJ4e4VeJx17rZpfdl2Q8DU,41507
 geobox/workflow.py,sha256=_WEIy1zLpBFx5yeuZ4ClnwPdU90jQbdy5bWYYIRa4JY,11549
-geobox-1.4.1.dist-info/licenses/LICENSE,sha256=AvFB7W94sJYKLDhBxLRshL3upexCOG8HQY_1JibB96w,1063
-geobox-1.4.1.dist-info/METADATA,sha256=KF1UGO6DhvFbUGt4WcubAl9QH7VAcGz1K0OMytVgaC0,2658
-geobox-1.4.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-geobox-1.4.1.dist-info/top_level.txt,sha256=ppXH8Bu2mlB-pLQ6lsoWEm2Gr6wZx1uzkhetsYA5ins,7
-geobox-1.4.1.dist-info/RECORD,,
+geobox-1.4.2.dist-info/licenses/LICENSE,sha256=AvFB7W94sJYKLDhBxLRshL3upexCOG8HQY_1JibB96w,1063
+geobox-1.4.2.dist-info/METADATA,sha256=5-4FR_CCE6LGfz96_urdMuEjN1s0xikKEn8vG2Q5WPI,2658
+geobox-1.4.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+geobox-1.4.2.dist-info/top_level.txt,sha256=ppXH8Bu2mlB-pLQ6lsoWEm2Gr6wZx1uzkhetsYA5ins,7
+geobox-1.4.2.dist-info/RECORD,,