hdx-python-api 6.4.0__tar.gz → 6.4.2__tar.gz

{hdx_python_api-6.4.0 → hdx_python_api-6.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hdx-python-api
-Version: 6.4.0
+Version: 6.4.2
 Summary: HDX Python API for interacting with the Humanitarian Data Exchange
 Project-URL: Homepage, https://github.com/OCHA-DAP/hdx-python-api
 Author: Michael Rans

{hdx_python_api-6.4.0 → hdx_python_api-6.4.2}/documentation/index.md

@@ -1003,6 +1003,21 @@ If you want to add a list of tags, you do it as follows:
 The **User** class enables you to manage users, creating, deleting and updating (as for
 other HDX objects) according to your permissions.
 
+You can obtain the currently logged in user (which is based on the API token used in the
+configuration):
+
+    user = User.get_current_user()
+
+You can check that the current user has a particular permission to a specific
+organization:
+
+    result = User.check_current_user_organization_access("hdx", "read")
+
+For a general access check to use before running a script that creates or updates
+datasets:
+
+    username = User.check_current_user_write_access("hdx")
+
 You can email a user. First you need to set up an email server using a dictionary or
 file:
 

{hdx_python_api-6.4.0 → hdx_python_api-6.4.2}/requirements.txt

@@ -258,7 +258,7 @@ rsa==4.9.1
     # via google-auth
 ruamel-yaml==0.18.10
     # via hdx-python-utilities
-setuptools==80.7.1
+setuptools==80.8.0
     # via ckanapi
 shellingham==1.5.4
     # via typer

{hdx_python_api-6.4.0 → hdx_python_api-6.4.2}/src/hdx/api/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '6.4.0'
-__version_tuple__ = version_tuple = (6, 4, 0)
+__version__ = version = '6.4.2'
+__version_tuple__ = version_tuple = (6, 4, 2)

{hdx_python_api-6.4.0 → hdx_python_api-6.4.2}/src/hdx/data/hdxobject.py

@@ -367,7 +367,7 @@ class HDXObject(UserDict, ABC):
         self,
         action: str,
         data: Dict,
-        id_field_name: str = None,
+        id_field_name: Optional[str] = None,
         files_to_upload: Dict = {},
     ) -> Union[Dict, List]:
         """Creates or updates an HDX object in HDX and return HDX object metadata dict

{hdx_python_api-6.4.0 → hdx_python_api-6.4.2}/src/hdx/data/user.py

@@ -6,7 +6,7 @@ from typing import Any, Dict, List, Optional
 
 import hdx.data.organization
 from hdx.api.configuration import Configuration
-from hdx.data.hdxobject import HDXObject
+from hdx.data.hdxobject import HDXError, HDXObject
 from hdx.utilities.typehint import ListTuple
 
 logger = logging.getLogger(__name__)
@@ -167,6 +167,20 @@ class User(HDXObject):
             **kwargs,
         )
 
+    @staticmethod
+    def get_current_user(configuration: Optional[Configuration] = None) -> "User":
+        """Get current user (based on authorisation from API token)
+
+        Args:
+            configuration (Optional[Configuration]): HDX configuration. Defaults to global configuration.
+
+        Returns:
+            User: Current user
+        """
+        user = User(configuration=configuration)
+        user._save_to_hdx("show", {})
+        return user
+
     @staticmethod
     def get_all_users(
         configuration: Optional[Configuration] = None, **kwargs: Any
@@ -297,7 +311,7 @@ class User(HDXObject):
         Returns:
             bool: True if the logged in user is a member of the organization.
         """
-        for organization_dict in self.get_organization_dicts(permission=permission):
+        for organization_dict in self.get_organization_dicts(permission):
             if organization_dict["id"] == organization:
                 return True
             if organization_dict["name"] == organization:
@@ -353,19 +367,23 @@ class User(HDXObject):
 
     @classmethod
     def check_current_user_organization_access(
-        cls, organization: str, permission: str = "read"
+        cls,
+        organization: str,
+        permission: str = "read",
+        configuration: Optional[Configuration] = None,
     ) -> bool:
         """Check logged in user is a member of a given organization.
 
         Args:
             organization (str): Organization id or name.
             permission (str): Permission to check for. Defaults to 'read'.
+            configuration (Optional[Configuration]): HDX configuration. Defaults to global configuration.
 
         Returns:
             bool: True if the logged in user is a member of the organization.
         """
         for organization_dict in cls.get_current_user_organization_dicts(
-            permission=permission
+            permission, configuration
         ):
             if organization_dict["id"] == organization:
                 return True
@@ -373,6 +391,52 @@ class User(HDXObject):
                 return True
         return False
 
+    @classmethod
+    def check_current_user_write_access(
+        cls,
+        organization: str,
+        permission: str = "create_dataset",
+        configuration: Optional[Configuration] = None,
+    ) -> "User":
+        """Check logged in user has write access to a given organization. Raises
+        PermissionError if the user does not have access otherwise logs and returns the
+        current username.
+
+        Args:
+            organization (str): Organization id or name.
+            permission (str): Permission to check for. Defaults to 'create_dataset'.
+            configuration (Optional[Configuration]): HDX configuration. Defaults to global configuration.
+
+        Returns:
+            str: Username of current user
+        """
+        if configuration is None:
+            configuration = Configuration.read()
+        hdx_key = configuration.hdx_key
+        if not hdx_key:
+            raise PermissionError(
+                "There is no logged in user. API token is missing or blank!"
+            )
+        logger.info(f"API token is {len(hdx_key)} characters long")
+        try:
+            current_user = cls.get_current_user(configuration)
+        except HDXError:
+            raise PermissionError(
+                "There appears to be no logged in user. API token may be invalid!"
+            )
+        username = current_user["name"]
+        logger.info(f'Current user is "{username}"')
+        if not cls.check_current_user_organization_access(
+            organization, permission, configuration
+        ):
+            raise PermissionError(
+                f'Current user does not have "{permission}" access to "{organization}" organization!'
+            )
+        logger.info(
+            f'Current user has "{permission}" access to "{organization}" organization'
+        )
+        return username
+
     def get_token_list(self):
         """Get API tokens for user.
 

{hdx_python_api-6.4.0 → hdx_python_api-6.4.2}/src/hdx/facades/simple.py

@@ -12,11 +12,11 @@ logger = logging.getLogger(__name__)
 setup_logging(log_file="errors.log")
 
 
-def facade(projectmainfn: Callable[[None], None], **kwargs: Any):
+def facade(projectmainfn: Callable[[], None], **kwargs: Any):
     """Facade to simplify project setup that calls project main function
 
     Args:
-        projectmainfn ((None) -> None): main function of project
+        projectmainfn (() -> None): main function of project
         **kwargs: configuration parameters to pass to HDX Configuration class
 
     Returns:

{hdx_python_api-6.4.0 → hdx_python_api-6.4.2}/tests/hdx/api/test_ckan.py

@@ -19,6 +19,7 @@ from hdx.api.configuration import Configuration
 from hdx.api.locations import Locations
 from hdx.data.dataset import Dataset
 from hdx.data.resource import Resource
+from hdx.data.user import User
 from hdx.data.vocabulary import Vocabulary
 from hdx.location.country import Country
 from hdx.utilities.dateparse import now_utc
@@ -35,6 +36,7 @@ class TestCKAN:
             user_agent="test",
             hdx_key=hdx_key,
         )
+        User.check_current_user_write_access("5a63012e-6c41-420c-8c33-e84b277fdc90")
         Locations._validlocations = None
         Country.countriesdata(use_live=False)
         Vocabulary._approved_vocabulary = None

{hdx_python_api-6.4.0 → hdx_python_api-6.4.2}/tests/hdx/data/test_user.py

@@ -263,6 +263,25 @@ class TestUser:
 
         Configuration.read().remoteckan().session = MockSession()
 
+    @pytest.fixture(scope="function")
+    def show_current_user(self):
+        class MockSession:
+            @staticmethod
+            def post(url, data, headers, files, allow_redirects, auth=None):
+                if "show" not in url:
+                    return MockResponse(
+                        404,
+                        '{"success": false, "error": {"message": "TEST ERROR: Not show", "__type": "TEST ERROR: Not Show Error"}, "help": "http://test-data.humdata.org/api/3/action/help_show?name=user_show"}',
+                    )
+                result = json.dumps(resultdict)
+                return MockResponse(
+                    200,
+                    '{"success": true, "result": %s, "help": "http://test-data.humdata.org/api/3/action/help_show?name=user_show"}'
+                    % result,
+                )
+
+        Configuration.read().remoteckan().session = MockSession()
+
     @pytest.fixture(scope="function")
     def post_list(self):
         class MockSession:
@@ -304,6 +323,49 @@ class TestUser:
 
         Configuration.read().remoteckan().session = MockSession()
 
+    @pytest.fixture(scope="function")
+    def post_check_current_user_write_access(self):
+        class MockSession:
+            @staticmethod
+            def post(url, data, headers, files, allow_redirects, auth=None):
+                decodedata = data.decode("utf-8")
+                datadict = json.loads(decodedata)
+                if "user" in url:
+                    if "show" in url:
+                        configuration = Configuration.read()
+                        hdx_key = configuration.hdx_key
+                        if hdx_key == "fail":
+                            return MockResponse(
+                                404,
+                                '{"success": false, "error": {"message": "Not found", "__type": "Not Found Error"}, "help": "http://test-data.humdata.org/api/3/action/help_show?name=user_show"}',
+                            )
+                        result = json.dumps(resultdict)
+                        return MockResponse(
+                            200,
+                            '{"success": true, "result": %s, "help": "http://test-data.humdata.org/api/3/action/help_show?name=user_show"}'
+                            % result,
+                        )
+                    elif "list" in url:
+                        return MockResponse(
+                            200,
+                            '{"success": true, "result": %s, "help": "http://test-data.humdata.org/api/3/action/help_show?name=organization_list"}'
+                            % json.dumps(orglist),
+                        )
+                elif "organization" in url:
+                    if "show" in url:
+                        result = json.dumps(orgdict)
+                        if (
+                            datadict["id"] == "b67e6c74-c185-4f43-b561-0e114a736f19"
+                            or datadict["id"] == "TEST1"
+                        ):
+                            return MockResponse(
+                                200,
+                                '{"success": true, "result": %s, "help": "http://test-data.humdata.org/api/3/action/help_show?name=user_show"}'
+                                % result,
+                            )
+
+        Configuration.read().remoteckan().session = MockSession()
+
     @pytest.fixture(scope="function")
     def post_listorgs_invalid(self):
         class MockSession:
@@ -522,6 +584,10 @@ Content-Transfer-Encoding: 7bit
         assert user["name"] == "MyUser1"
         assert user["about"] == "other"
 
+    def test_get_current_user(self, configuration, show_current_user):
+        user = User.get_current_user()
+        assert user["name"] == "MyUser1"
+
     def test_get_all_users(self, configuration, post_list, mocksmtp):
         users = User.get_all_users()
         assert len(users) == 2
@@ -636,6 +702,30 @@ Content-Transfer-Encoding: 7bit
         assert user.get_organization_dicts() == []
         assert User.get_current_user_organization_dicts() == []
 
+    def test_check_current_user_write_access(
+        self, configuration, post_check_current_user_write_access
+    ):
+        username = User.check_current_user_write_access(
+            "b67e6c74-c185-4f43-b561-0e114a736f19"
+        )
+        assert username == "MyUser1"
+        username = User.check_current_user_write_access("acled")
+        assert username == "MyUser1"
+        with pytest.raises(PermissionError):
+            User.check_current_user_write_access("lala")
+        with pytest.raises(PermissionError):
+            configuration = Configuration.read()
+            hdx_key = configuration.hdx_key
+            configuration.hdx_key = "fail"
+            User.check_current_user_write_access("b67e6c74-c185-4f43-b561-0e114a736f19")
+            configuration.hdx_key = hdx_key
+        with pytest.raises(PermissionError):
+            configuration = Configuration.read()
+            hdx_key = configuration.hdx_key
+            configuration.hdx_key = None
+            User.check_current_user_write_access("acled", configuration=configuration)
+            configuration.hdx_key = hdx_key
+
     def test_get_token_list(self, configuration, post_tokenlist):
         user = User.read_from_hdx("9f3e9973-7dbe-4c65-8820-f48578e3ffea")
         tokens = user.get_token_list()