geobox 1.3.1__tar.gz → 1.3.2__tar.gz

{geobox-1.3.1 → geobox-1.3.2}/PKG-INFO

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

{geobox-1.3.1 → geobox-1.3.2}/geobox/query.py

@@ -582,7 +582,7 @@ class Query(Base):
         super()._unshare(self.endpoint, users)
 
 
-    def get_shared_users(self, search: str, skip: int = 0, limit: int = 10) -> List['User']:
+    def get_shared_users(self, search: str = None, skip: int = 0, limit: int = 10) -> List['User']:
         """
         Retrieves the list of users the query is shared with.
 

{geobox-1.3.1 → geobox-1.3.2}/geobox/raster.py

@@ -510,13 +510,13 @@ class Raster(Base):
             'colormap_name': kwargs.get('colormap_name'),
             'colormap': kwargs.get('colormap')
         })
-        query_string = urlencode(clean_data(params))
+        query_string = urlencode(params)
         endpoint = urljoin(self.api.base_url, f'{self.endpoint}render/{z}/{x}/{y}.png')
         endpoint = urljoin(endpoint, f'?{query_string}')
         return endpoint
     
 
-    def get_tile_pbf_url(self, x: int, y: int, z: int) -> str:
+    def get_tile_pbf_url(self, x: int, y: int, z: int, indexes: str = None) -> str:
         """
         Get the URL of the tile.
 
@@ -524,6 +524,7 @@ class Raster(Base):
             x (int): The x coordinate of the tile.
             y (int): The y coordinate of the tile.
             z (int): The zoom level of the tile.
+            indexes (str, optional): list of comma separated band indexes to be rendered. e.g. 1, 2, 3
 
         Returns:
             str: The URL of the tile.
@@ -535,7 +536,12 @@ class Raster(Base):
             >>> raster = Raster.get_raster(client, uuid="12345678-1234-5678-1234-567812345678")
             >>> raster.get_tile_pbf_url(x=10, y=20, z=1)
         """
+        params = clean_data({
+            'indexes': indexes
+        })
+        query_string = urlencode(params)
         endpoint = urljoin(self.api.base_url, f'{self.endpoint}tiles/{z}/{x}/{y}.pbf')
+        endpoint = urljoin(endpoint, f'?{query_string}')
         return endpoint
     
 

{geobox-1.3.1 → geobox-1.3.2}/geobox/user.py

@@ -2,7 +2,7 @@ from typing import List, Any, TYPE_CHECKING, Union, Dict
 from urllib.parse import urlencode, urljoin
 
 from .base import Base
-from .utils import clean_data
+from .utils import clean_data, xor_encode
 from .enums import UserRole, UserStatus
 from .plan import Plan
 
@@ -113,11 +113,9 @@ class User(Base):
            'return_count': kwargs.get('return_count', False),
            'skip': kwargs.get('skip', 0),
            'limit': kwargs.get('limit', 10),
-           'user_id': kwargs.get('user_id'),
-           'shared': kwargs.get('shared', False)
+           'user_id': kwargs.get('user_id')
         }
         return super()._get_list(api, cls.BASE_ENDPOINT, params, factory_func=lambda api, item: User(api, item['id'], item))
-
     
 
     @classmethod
@@ -174,7 +172,7 @@ class User(Base):
         data = {
             "username": username,
             "email": email,
-            "password": password,
+            "password": xor_encode(password),
             "role": role.value,
             "first_name": first_name,
             "last_name": last_name,
@@ -184,7 +182,6 @@ class User(Base):
         return super()._create(api, cls.BASE_ENDPOINT, data, factory_func=lambda api, item: User(api, item['id'], item))
 
 
-
     @classmethod
     def search_users(cls, api: 'GeoboxClient', search: str = None, skip: int = 0, limit: int = 10) -> List['User']:
         """
@@ -377,7 +374,7 @@ class User(Base):
             >>> user.change_password(new_password='user_new_password')
         """
         data = clean_data({
-            "new_password": new_password
+            "new_password": xor_encode(new_password)
         })
         endpoint = urljoin(self.endpoint, 'change-password')
         self.api.post(endpoint, data, is_json=False)

{geobox-1.3.1 → geobox-1.3.2}/geobox/utils.py

@@ -1,4 +1,11 @@
 from urllib.parse import urlparse, parse_qs, urlencode, urlunparse
+import base64
+
+
+def xor_encode(s, key=42):
+    xor_str = ''.join(chr(ord(c) ^ key) for c in s)
+    encoded_bytes = base64.b64encode(xor_str.encode('utf-8'))
+    return encoded_bytes.decode('utf-8')
 
 
 def clean_data(data: dict) -> dict:

{geobox-1.3.1 → geobox-1.3.2}/geobox/vectorlayer.py

@@ -439,6 +439,36 @@ class VectorLayer(Base):
         return super()._create(self.api, endpoint, data, factory_func=lambda api, item: VectorLayerVersion(api, item['uuid'], item))
 
 
+    def get_versions(self, **kwargs) -> List['VectorLayerVersion']:
+        """
+        Get list of versions of the current vector layer object with optional filtering and pagination.
+
+        Keyword Args:
+            q (str): query filter based on OGC CQL standard. e.g. "field1 LIKE '%GIS%' AND created_at > '2021-01-01'"
+            search (str): search term for keyword-based searching among search_fields or all textual fields if search_fields does not have value. NOTE: if q param is defined this param will be ignored.
+            search_fields (str): comma separated list of fields for searching.
+            order_by (str): comma separated list of fields for sorting results [field1 A|D, field2 A|D, …]. e.g. name A, type D. NOTE: "A" denotes ascending order and "D" denotes descending order.
+            return_count (bool): Whether to return total count. default is False.
+            skip (int): Number of items to skip. default is 0.
+            limit (int): Number of items to return. default is 10.
+            user_id (int): Specific user. privileges required.
+            shared (bool): Whether to return shared versions. default is False.
+
+        Returns:
+            List[VectorLayerVersion] | int: A list of vector layer version instances or the total number of versions.
+
+        Example:
+            >>> from geobox import GeoboxClient
+            >>> from geobox.version import VectorLayerVersion
+            >>> client = GeoboxClient()
+            >>> layer = client.get_vector(uuid="12345678-1234-5678-1234-567812345678")
+            >>> versions = layer.get_versions()
+            or
+            >>> versions = layer.get_versions()
+        """
+        return VectorLayerVersion.get_versions(self.api, layer_id=self.id, **kwargs)
+
+
     @property    
     def wfs(self) -> str:
         """

{geobox-1.3.1 → geobox-1.3.2}/geobox.egg-info/PKG-INFO

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

{geobox-1.3.1 → geobox-1.3.2}/pyproject.toml

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

{geobox-1.3.1 → geobox-1.3.2}/tests/test_user.py

@@ -5,6 +5,7 @@ from urllib.parse import urljoin, urlencode
 from geobox.user import User
 from geobox.enums import UserRole, UserStatus
 from geobox.plan import Plan
+from geobox.utils import xor_encode
 
 
 def test_init(api, mock_user_data):
@@ -38,7 +39,7 @@ def test_get_users(api, mock_admin_user_data):
     result = User.get_users(api, search='test')
     assert isinstance(result, list)
     assert isinstance(result[0], User)
-    api.get.assert_called_once_with('users/?f=json&search=test&return_count=False&skip=0&limit=10&shared=False')
+    api.get.assert_called_once_with('users/?f=json&search=test&return_count=False&skip=0&limit=10')
 
 def test_create_user(api, mock_admin_user_data):
     api.post.return_value = mock_admin_user_data
@@ -57,7 +58,7 @@ def test_create_user(api, mock_admin_user_data):
     expected_data = {
         "username": mock_admin_user_data['username'],
         "email": mock_admin_user_data['email'],
-        "password": 'password',
+        "password": xor_encode('password'),
         "role": UserRole.ACCOUNT_ADMIN.value,
         "first_name": mock_admin_user_data['first_name'],
         "last_name": mock_admin_user_data['last_name'],
@@ -126,7 +127,7 @@ def test_change_password(api, mock_admin_user_data):
     with patch.object(api, 'post', return_value={"message": "success"}):
         user.change_password('new_password')
         expected_endpoint = urljoin(user.endpoint, 'change-password')
-        api.post.assert_called_once_with(expected_endpoint, {'new_password': 'new_password'}, is_json=False)
+        api.post.assert_called_once_with(expected_endpoint, {'new_password': xor_encode('new_password')}, is_json=False)
 
 
 def test_renew_plan(api, mock_admin_user_data):

{geobox-1.3.1 → geobox-1.3.2}/tests/test_vectorlayer.py

@@ -253,6 +253,17 @@ def test_create_version(api, mock_vector_data, layer_type, mock_version_data):
     api.post.assert_called_once_with(f'{layer.endpoint}versions', {'name': 'design_version', 'display_name': 'Design Version', 'description': 'This layer represents design version.'})
 
 
+@pytest.mark.parametrize("layer_type", [type for type in LayerType])
+def test_get_versions(api, mock_vector_data, layer_type, mock_version_data):
+    layer = VectorLayer(api, uuid=mock_vector_data['uuid'], data=mock_vector_data, layer_type=layer_type)
+    api.get.return_value = [mock_version_data]
+    versions = layer.get_versions()
+    assert len(versions) == 1
+    assert versions[0].uuid == mock_version_data['uuid']
+    assert versions[0].data == mock_version_data
+    api.get.assert_called_once_with(f'vectorLayerVersions/?layer_id={layer.id}&f=json&return_count=False&skip=0&limit=10&shared=False')
+
+
 @pytest.mark.parametrize("layer_type", [type for type in LayerType])
 def test_wfs_access_token(api, mock_vector_data, layer_type):
     layer = VectorLayer(api, uuid=mock_vector_data['uuid'], data=mock_vector_data, layer_type=layer_type)