dds-cli 2.7.1__tar.gz → 2.8.1__tar.gz

{dds_cli-2.7.1 → dds_cli-2.8.1}/PKG-INFO

@@ -1,16 +1,17 @@
 Metadata-Version: 2.1
 Name: dds_cli
-Version: 2.7.1
+Version: 2.8.1
 Summary: A command line tool to manage data and projects in the SciLifeLab Data Delivery System.
 Home-page: https://github.com/ScilifelabDataCentre/dds_cli
 Author: SciLifeLab Data Centre
 License: MIT
 Classifier: Development Status :: 4 - Beta
 Classifier: License :: OSI Approved :: MIT License
-Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: boto3==1.24.73
@@ -20,18 +21,18 @@ Requires-Dist: click-pathlib==2020.3.13.0
 Requires-Dist: cryptography==42.0.4
 Requires-Dist: immutabledict==2.2.1
 Requires-Dist: jwcrypto==1.5.6
-Requires-Dist: prettytable==3.4.1
-Requires-Dist: prompt-toolkit==3.0.31
+Requires-Dist: prettytable==3.7.0
+Requires-Dist: prompt-toolkit==3.0.40
 Requires-Dist: PyNaCl==1.5.0
 Requires-Dist: pytz==2022.2.1
-Requires-Dist: PyYAML==6.0.1
+Requires-Dist: PyYAML==6.0.2
 Requires-Dist: questionary==1.10.0
-Requires-Dist: requests==2.32.0
-Requires-Dist: rich==12.5.1
+Requires-Dist: requests==2.32.2
+Requires-Dist: rich==13.6.0
 Requires-Dist: rich-click==1.5.2
 Requires-Dist: simplejson==3.17.6
 Requires-Dist: tzlocal==4.2
-Requires-Dist: zstandard==0.19.0
+Requires-Dist: zstandard==0.22.0
 
 <p>
    <h1 align="center">Data Delivery System: CLI</h1>

{dds_cli-2.7.1 → dds_cli-2.8.1}/dds_cli/__init__.py

@@ -61,12 +61,15 @@ class DDSEndpoint:
     BASE_ENDPOINT_DOCKER = "http://dds_backend:5000/api/v1"
     BASE_ENDPOINT_REMOTE = "https://delivery.scilifelab.se/api/v1"
     BASE_ENDPOINT_REMOTE_TEST = "https://testing.delivery.scilifelab.se/api/v1"
+    BASE_ENDPOINT_REMOTE_DEV = "https://dev.delivery.scilifelab.se/api/v1"
     if os.getenv("DDS_CLI_ENV") == "development":
         BASE_ENDPOINT = BASE_ENDPOINT_LOCAL
     elif os.getenv("DDS_CLI_ENV") == "docker-dev":
         BASE_ENDPOINT = BASE_ENDPOINT_DOCKER
     elif os.getenv("DDS_CLI_ENV") == "test-instance":
         BASE_ENDPOINT = BASE_ENDPOINT_REMOTE_TEST
+    elif os.getenv("DDS_CLI_ENV") == "dev-instance":
+        BASE_ENDPOINT = BASE_ENDPOINT_REMOTE_DEV
     else:
         BASE_ENDPOINT = BASE_ENDPOINT_REMOTE
 

{dds_cli-2.7.1 → dds_cli-2.8.1}/dds_cli/__main__.py

@@ -1185,7 +1185,7 @@ def retract_project(click_ctx, project):
     required=False,
     is_flag=True,
     default=False,
-    help="Something has one wrong in the project.",
+    help="Something has gone wrong in the project.",
 )
 @click.pass_obj
 def archive_project(click_ctx, project: str, abort: bool = False):
@@ -2070,15 +2070,22 @@ def deactivate_motd(click_ctx, motd_id):
 # -- dds motd send -- #
 @motd_group_command.command(name="send")
 @click.argument("motd_id", metavar="[MOTD_ID]", nargs=1, type=int, required=True)
+@click.option(
+    "--unit-only",
+    is_flag=True,
+    required=False,
+    default=False,
+    help="Only send MOTD to Unit Admins and Unit Personnel.",
+)
 @click.pass_obj
-def send_motd(click_ctx, motd_id):
+def send_motd(click_ctx, motd_id, unit_only):
     """Send motd as email to all users."""
     try:
         with dds_cli.motd_manager.MotdManager(
             no_prompt=click_ctx.get("NO_PROMPT", False),
             token_path=click_ctx.get("TOKEN_PATH"),
         ) as sender:
-            sender.send_motd(motd_id=motd_id)
+            sender.send_motd(motd_id=motd_id, unit_only=unit_only)
     except (
         dds_cli.exceptions.AuthenticationError,
         dds_cli.exceptions.ApiResponseError,

{dds_cli-2.7.1 → dds_cli-2.8.1}/dds_cli/motd_manager.py

@@ -126,13 +126,13 @@ class MotdManager(dds_cli.base.DDSBaseClass):
         )
         LOG.info(response_message)
 
-    def send_motd(self, motd_id: int) -> None:
+    def send_motd(self, motd_id: int, unit_only=False) -> None:
         """Send specific MOTD to users."""
         response_json, _ = dds_cli.utils.perform_request(
             endpoint=DDSEndpoint.MOTD_SEND,
             headers=self.token,
             method="post",
-            json={"motd_id": motd_id},
+            json={"motd_id": motd_id, "unit_only": unit_only},
             error_message="Failed sending the MOTD to users",
         )
 

{dds_cli-2.7.1 → dds_cli-2.8.1}/dds_cli/version.py

@@ -2,4 +2,4 @@
 
 # Do not change bump the major version unless absolutely necessary - makes incompatible with API
 # If mid or minor version reaches 9, continue to 10, 11 etc.
-__version__ = "2.7.1"
+__version__ = "2.8.1"

{dds_cli-2.7.1 → dds_cli-2.8.1}/dds_cli.egg-info/PKG-INFO

@@ -1,16 +1,17 @@
 Metadata-Version: 2.1
 Name: dds_cli
-Version: 2.7.1
+Version: 2.8.1
 Summary: A command line tool to manage data and projects in the SciLifeLab Data Delivery System.
 Home-page: https://github.com/ScilifelabDataCentre/dds_cli
 Author: SciLifeLab Data Centre
 License: MIT
 Classifier: Development Status :: 4 - Beta
 Classifier: License :: OSI Approved :: MIT License
-Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: boto3==1.24.73
@@ -20,18 +21,18 @@ Requires-Dist: click-pathlib==2020.3.13.0
 Requires-Dist: cryptography==42.0.4
 Requires-Dist: immutabledict==2.2.1
 Requires-Dist: jwcrypto==1.5.6
-Requires-Dist: prettytable==3.4.1
-Requires-Dist: prompt-toolkit==3.0.31
+Requires-Dist: prettytable==3.7.0
+Requires-Dist: prompt-toolkit==3.0.40
 Requires-Dist: PyNaCl==1.5.0
 Requires-Dist: pytz==2022.2.1
-Requires-Dist: PyYAML==6.0.1
+Requires-Dist: PyYAML==6.0.2
 Requires-Dist: questionary==1.10.0
-Requires-Dist: requests==2.32.0
-Requires-Dist: rich==12.5.1
+Requires-Dist: requests==2.32.2
+Requires-Dist: rich==13.6.0
 Requires-Dist: rich-click==1.5.2
 Requires-Dist: simplejson==3.17.6
 Requires-Dist: tzlocal==4.2
-Requires-Dist: zstandard==0.19.0
+Requires-Dist: zstandard==0.22.0
 
 <p>
    <h1 align="center">Data Delivery System: CLI</h1>

{dds_cli-2.7.1 → dds_cli-2.8.1}/dds_cli.egg-info/requires.txt

@@ -5,15 +5,15 @@ click-pathlib==2020.3.13.0
 cryptography==42.0.4
 immutabledict==2.2.1
 jwcrypto==1.5.6
-prettytable==3.4.1
-prompt-toolkit==3.0.31
+prettytable==3.7.0
+prompt-toolkit==3.0.40
 PyNaCl==1.5.0
 pytz==2022.2.1
-PyYAML==6.0.1
+PyYAML==6.0.2
 questionary==1.10.0
-requests==2.32.0
-rich==12.5.1
+requests==2.32.2
+rich==13.6.0
 rich-click==1.5.2
 simplejson==3.17.6
 tzlocal==4.2
-zstandard==0.19.0
+zstandard==0.22.0

{dds_cli-2.7.1 → dds_cli-2.8.1}/setup.py

@@ -24,10 +24,11 @@ setup(
     classifiers=[
         "Development Status :: 4 - Beta",
         "License :: OSI Approved :: MIT License",
-        "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
+        "Programming Language :: Python :: 3.11",
+        "Programming Language :: Python :: 3.12",
     ],
     url="https://github.com/ScilifelabDataCentre/dds_cli",
     author="SciLifeLab Data Centre",

{dds_cli-2.7.1 → dds_cli-2.8.1}/tests/test_motd_manager.py

@@ -222,3 +222,30 @@ def test_add_new_motd_ok(caplog: LogCaptureFixture):
                 logging.INFO,
                 "Response from API about adding a MOTD.",
             ) in caplog.record_tuples
+
+
+# send_motd
+
+
+def test_send_motd_all(caplog: LogCaptureFixture):
+    """Send a MOTD to all users."""
+
+    motd_id = 1
+    response_message = "Response from API about sending a MOTD."
+    returned_response: Dict = {"message": response_message}
+
+    with caplog.at_level(logging.INFO):
+        # Create mocker
+        with Mocker() as mock:
+            # Create mocked request - real request not executed
+            mock.post(DDSEndpoint.MOTD_SEND, status_code=200, json=returned_response)
+
+            with motd_manager.MotdManager(authenticate=False, no_prompt=True) as mtdm:
+                mtdm.token = {}  # required, otherwise none
+                mtdm.send_motd(motd_id=motd_id, unit_only=False)  # Send motd
+
+            assert (
+                "dds_cli.motd_manager",
+                logging.INFO,
+                response_message,
+            ) in caplog.record_tuples