geobox 1.2.3__py3-none-any.whl → 1.3.0__py3-none-any.whl

geobox/enums.py

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

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/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/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.dist-info → geobox-1.3.0.dist-info}/METADATA

@@ -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.dist-info → geobox-1.3.0.dist-info}/RECORD

@@ -5,7 +5,7 @@ geobox/attachment.py,sha256=XbGwfWWuFAMimj4tsjKBvlSLP-rhpNACCtxgRmUvcdY,11631
 geobox/base.py,sha256=p0UVZo9CINw0mW9o0nNR_VNCk7V1r-FrLQ_NH39WARE,12299
 geobox/basemap.py,sha256=fDWwkMf-F2NTE1tVLijoxQku55825b6gj8nk69TMOII,4386
 geobox/dashboard.py,sha256=MYyT3YJEGPCbTXHcYoZmn14rFOaut1J3idEA8bCdFgI,11762
-geobox/enums.py,sha256=1ScREE4WFbbIbY1K1jz62PnXUHKav-GiDQmDYZwUj2c,6316
+geobox/enums.py,sha256=eYD-SVXCSp4l08DlxymJTqYzTLouRziWhLZd7letnTM,6317
 geobox/exception.py,sha256=jvpnv0M2Ck1FpxHTL_aKYWxGvLnCQ3d9vOrMIktjw1U,1507
 geobox/feature.py,sha256=3Kbc1LjIkBt1YqRAry84BrR7qxx9BexvBB3YQ8D9mGk,18504
 geobox/field.py,sha256=p9eitUpnsiGj6GUhjSomk6HWlsNJSbE-Oh_4VcjaqVo,10562
@@ -24,14 +24,14 @@ geobox/task.py,sha256=eLMgbhcYTADooWqKDPh6Jlh5S5oqxMMKoYIm0YPVZvg,13519
 geobox/tile3d.py,sha256=MHDoj2OIUf3VMQtq7ysrayh8njAPSgwgPJCm4ySEB7A,10472
 geobox/tileset.py,sha256=F_oEV0TERMc2seLcYNu-i_TF4MNSdXPUWcxBCSR8aFw,22242
 geobox/usage.py,sha256=_54xL-n-2Bg9wGpoOBKnh85WqdpMWEtqxRJVaFlVWe0,7908
-geobox/user.py,sha256=ScuuAhxUD4FcGg4fDMZjhDgJYNmV6apFDkrJNqATjvk,14486
+geobox/user.py,sha256=k80q6THt0E9-xbMzIdKWNSb9dc_KKhLneru2GLggTGM,15085
 geobox/utils.py,sha256=jKhEs6CWTSlJZDS5qw9O2KgkLnTL9GKvFyKJpp8n1fA,1116
-geobox/vectorlayer.py,sha256=_EV-Ht7B9v_tS8fOYXzsbrHASopoAoz5RNdvisW4BWc,50938
+geobox/vectorlayer.py,sha256=1xjhWpvb1hFhLRei2hwU7IY5KxDKzynZMb3fbIDTMZE,51092
 geobox/version.py,sha256=0GLPhxCeEb2bAkdpPJWtXPXc1KP6kQ_TOMwLAL0ldo0,9374
-geobox/view.py,sha256=or4n8SQ8tVu8I4BNLqxJTAUXL2ZrhvJ1xDdslhu60_A,38541
+geobox/view.py,sha256=sIi6Mi7NUAX5gN83cpubD3l7AcZ-1g5kG2NKHeVeW-g,37518
 geobox/workflow.py,sha256=6hKnSw4G0_ZlgmUb0g3fxT-UVsFbiYpF2FbEO5fpQv0,11606
-geobox-1.2.3.dist-info/licenses/LICENSE,sha256=AvFB7W94sJYKLDhBxLRshL3upexCOG8HQY_1JibB96w,1063
-geobox-1.2.3.dist-info/METADATA,sha256=7u1F3M5PmC_7ubwqIj1NiGAw3-JQ7SgcT7jQEizagxk,2556
-geobox-1.2.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-geobox-1.2.3.dist-info/top_level.txt,sha256=ppXH8Bu2mlB-pLQ6lsoWEm2Gr6wZx1uzkhetsYA5ins,7
-geobox-1.2.3.dist-info/RECORD,,
+geobox-1.3.0.dist-info/licenses/LICENSE,sha256=AvFB7W94sJYKLDhBxLRshL3upexCOG8HQY_1JibB96w,1063
+geobox-1.3.0.dist-info/METADATA,sha256=UW0-KY-DuDA4blEJeWwoP05fxSMQ-yOa7AjfIs0dzzg,2556
+geobox-1.3.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+geobox-1.3.0.dist-info/top_level.txt,sha256=ppXH8Bu2mlB-pLQ6lsoWEm2Gr6wZx1uzkhetsYA5ins,7
+geobox-1.3.0.dist-info/RECORD,,