geobox 1.2.3__tar.gz → 1.3.0__tar.gz

{geobox-1.2.3 → geobox-1.3.0}/PKG-INFO

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

{geobox-1.2.3 → geobox-1.3.0}/geobox/enums.py

@@ -257,7 +257,7 @@ class UserRole(Enum):
 
     EDITOR = "Editor"
 
-    VIEWR = "Viewer"
+    VIEWER = "Viewer"
 
 
 class UserStatus(Enum):

{geobox-1.2.3 → geobox-1.3.0}/geobox/user.py

@@ -36,6 +36,17 @@ class User(Base):
             str: A string representation of the User instance.
         """
         return f'User(id={self.id}, first_name={self.first_name}, last_name={self.last_name})'
+
+
+    @property
+    def role(self) -> 'UserRole':
+        """
+        User role property
+
+        Returns:
+            UserRole: the user role
+        """
+        return UserRole(self.data.get('role')) if self.data.get('role') else None
     
 
     @property
@@ -94,6 +105,7 @@ class User(Base):
         """
         params = {
            'f': 'json',
+           'status': kwargs.get('status').value if kwargs.get('status') else None,
            'q': kwargs.get('q'),
            'search': kwargs.get('search'),
            'search_fields': kwargs.get('search_fields'),
@@ -264,18 +276,33 @@ class User(Base):
             >>> user.update_user(status=UserStatus.PENDING)
         """
         data = {
-            "csrf_token": kwargs.get('csrf_token'),
             "username": kwargs.get('username'),
             "email": kwargs.get('email'),
             "first_name": kwargs.get('first_name'),
             "last_name": kwargs.get('last_name'),
-            "mobile": kwargs.get('mobile'),
             "status": kwargs.get('status').value if kwargs.get('status') else None,
             "role": kwargs.get('role').value if kwargs.get('role') else None,
-            "plan_id": kwargs.get('plan').id if kwargs.get('plan') else None,
-            "expiration_date": kwargs.get('expiration_date')
         }
-        return super()._update(self.endpoint, data)
+        data = clean_data(data)
+
+        try:
+            data['mobile'] = None if kwargs['mobile'] == '' else kwargs['mobile']
+        except:
+            pass
+
+        try:
+            data['plan_id'] = None if kwargs['plan'] == '' else kwargs['plan'].id
+        except:
+            pass
+
+        try:
+            data['expiration_date'] = None if kwargs['expiration_date'] == '' else kwargs['expiration_date']
+        except:
+            pass
+
+        response = self.api.put(self.endpoint, data)
+        self._update_properties(response)
+        return response
     
 
     def delete(self) -> None:

{geobox-1.2.3 → geobox-1.3.0}/geobox/vectorlayer.py

@@ -454,7 +454,10 @@ class VectorLayer(Base):
             >>> layer = VectorLayer.get_vector(api=client, uuid="12345678-1234-5678-1234-567812345678")
             >>> layer.wfs
         """
-        return f'{self.api.base_url}{self.endpoint}wfs/'
+        if self.api.access_token:
+            return f'{self.api.base_url}{self.endpoint}wfs/'
+        elif self.api.apikey:
+            return f'{self.api.base_url}{self.endpoint}apikey:{self.api.apikey}/wfs/'
 
 
     def get_fields(self) -> List['Field']:

{geobox-1.2.3 → geobox-1.3.0}/geobox/view.py

@@ -164,7 +164,7 @@ class VectorLayerView(VectorLayer):
             'include_settings': include_settings
         }
         return super()._get_list_by_ids(api=api, 
-                                        endpoint=f'{cls.BASE_ENDPOINT}get-views/', 
+                                        endpoint=f'{cls.BASE_ENDPOINT}get-layers/', 
                                         params=params, 
                                         factory_func=lambda api, item: VectorLayerView(api, item['uuid'], LayerType(item['layer_type']), item))
 
@@ -407,32 +407,6 @@ class VectorLayerView(VectorLayer):
             >>> field = view.get_field_by_name(name='test')
         """      
         return super().get_field_by_name(name)
-
-
-    def add_field(self, name: str, data_type: 'FieldType', data: Dict = {}) -> 'Field':
-        """
-        Add a new field to the vector layer view.
-        
-        Args:
-            name (str): The name of the new field.
-            data_type (FieldType): The data type of the new field.
-            data (Dict): Additional field properties (display_name, description, etc.).
-            
-        Returns:
-            Field: The newly created field instance.
-            
-        Raises:
-            ValidationError: If the field data is invalid.
-            ApiRequestError: If the API request fails.
-
-        Example:
-            >>> from geobox import GeoboxClient
-            >>> from geobox.view import VectorLayerView
-            >>> client = GeoboxClient()
-            >>> view = VectorLayerView.get_view(client, uuid="12345678-1234-5678-1234-567812345678")
-            >>> field = view.add_field(name="new_field", data_type=FieldType.String)
-        """
-        return  super().add_field(name, data_type, data)
     
 
     def calculate_field(self, target_field: str, expression: str, q: str = None, bbox: List[float] = None, 

{geobox-1.2.3 → geobox-1.3.0}/geobox.egg-info/PKG-INFO

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

{geobox-1.2.3 → geobox-1.3.0}/pyproject.toml

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

{geobox-1.2.3 → geobox-1.3.0}/tests/test_user.py

@@ -19,6 +19,11 @@ def test_repr(api, mock_user_data):
     assert repr(user) == f"User(id={user.id}, first_name=test 1, last_name=test 1)"
 
 
+def test_role(api, mock_admin_user_data):
+    user = User(api, user_id=mock_admin_user_data['id'], data=mock_admin_user_data)
+    assert user.role == UserRole.ACCOUNT_ADMIN
+
+
 def test_status(api, mock_admin_user_data):
     user = User(api, user_id=mock_admin_user_data['id'], data=mock_admin_user_data)
     assert user.status == UserStatus.DISABLED

{geobox-1.2.3 → geobox-1.3.0}/tests/test_vectorlayer.py

@@ -254,12 +254,21 @@ def test_create_version(api, mock_vector_data, layer_type, mock_version_data):
 
 
 @pytest.mark.parametrize("layer_type", [type for type in LayerType])
-def test_wfs(api, mock_vector_data, layer_type):
+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)
     wfs_url = layer.wfs
     assert wfs_url == f'{api.base_url}{layer.endpoint}wfs/'
 
 
+@pytest.mark.parametrize("layer_type", [type for type in LayerType])
+def test_wfs_apikey(api, mock_vector_data, layer_type):
+    api.access_token = None
+    api.apikey = '123456789'
+    layer = VectorLayer(api, uuid=mock_vector_data['uuid'], data=mock_vector_data, layer_type=layer_type)
+    wfs_url = layer.wfs
+    assert wfs_url == f'{api.base_url}{layer.endpoint}apikey:{api.apikey}/wfs/'
+
+
 @pytest.mark.parametrize("layer_type", [type for type in LayerType])
 def test_get_fields(api, mock_vector_data, layer_type, mock_field_data):
     """Test getting the fields of a layer."""

{geobox-1.2.3 → geobox-1.3.0}/tests/test_view.py

@@ -138,7 +138,7 @@ def test_get_views_by_ids(api, mock_view_data, layer_type):
     
     layers = VectorLayerView.get_views_by_ids(api, [1, 2])
     
-    api.get.assert_called_once_with(f'{VectorLayerView.BASE_ENDPOINT}get-views/?ids=%5B1%2C+2%5D&include_settings=False')
+    api.get.assert_called_once_with(f'{VectorLayerView.BASE_ENDPOINT}get-layers/?ids=%5B1%2C+2%5D&include_settings=False')
     assert len(layers) == 2
     assert all(isinstance(m, VectorLayerView) for m in layers)
     assert layers[0].data == {**mock_view_data, **{'id': 1}}
@@ -330,31 +330,6 @@ def test_get_field_by_name(api, mock_view_data, layer_type, mock_field_data):
         view.get_field_by_name(name=mock_field_data['name'])
 
 
-@pytest.mark.parametrize("layer_type", [type for type in LayerType])
-def test_add_field(api, mock_view_data, layer_type, mock_field_data):
-    """Test adding a field to a layer."""
-    view = VectorLayerView(
-        api=api,
-        uuid=mock_view_data['uuid'],
-        layer_type=layer_type,
-        data=mock_view_data
-    )
-    api.post.return_value = mock_field_data
-    del mock_field_data['created_at']
-    field = view.add_field(name=mock_field_data['name'], data_type=FieldType.String, data=mock_field_data)
-    assert isinstance(field, Field)
-    assert field.name == mock_field_data['name']
-    assert field.data_type == FieldType.String
-    assert field.layer == view
-    assert field.endpoint == f'{view.endpoint}fields/{field.id}/'
-    assert field.data == mock_field_data
-    expected_data = {'id': mock_field_data['id'], 
-                        'name': mock_field_data['name'], 
-                        'datatype': mock_field_data['datatype'], 
-                        'hyperlink': mock_field_data['hyperlink']}
-    api.post.assert_called_once_with(f'{view.endpoint}fields/', expected_data)
-
-
 @pytest.mark.parametrize("layer_type", [type for type in LayerType])
 def test_calculate_field(api, mock_view_data, layer_type, mock_success_task_data):
     """Test calculating a field."""