okdata-cli 6.0.0__tar.gz → 6.1.1__tar.gz

{okdata_cli-6.0.0 → okdata_cli-6.1.1}/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2019-2024 Oslo Origo
+Copyright (c) 2019-2026 Oslo kommune
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

{okdata_cli-6.0.0 → okdata_cli-6.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: okdata-cli
-Version: 6.0.0
+Version: 6.1.1
 Summary: CLI for services provided by Oslo Origo
 Home-page: https://github.com/oslokommune/okdata-cli/
 Author: Oslo Origo
@@ -18,7 +18,7 @@ Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: docopt
-Requires-Dist: okdata-sdk<5,>=4
+Requires-Dist: okdata-sdk<5,>=4.1
 Requires-Dist: PrettyTable
 Requires-Dist: questionary<2.0.0,>=1.10.0
 Requires-Dist: prompt-toolkit<3.0.52

{okdata_cli-6.0.0 → okdata_cli-6.1.1}/okdata/cli/__main__.py

@@ -4,7 +4,7 @@ import sys
 
 from keycloak.exceptions import KeycloakGetError, KeycloakPostError
 from okdata.sdk.exceptions import ApiAuthenticateError
-from requests.exceptions import RequestException
+from requests.exceptions import ConnectTimeout, RequestException
 
 from okdata.cli import MAINTAINER
 from okdata.cli.command import BaseCommand
@@ -37,6 +37,11 @@ def main():
             # Flush output here to force SIGPIPE to be triggered while inside
             # this try block.
             sys.stdout.flush()
+        except ConnectTimeout as e:
+            instance.print(
+                f"Connection to '{e.request.url}' timed out. Please try again, "
+                f"or contact {MAINTAINER} if the problem persists.",
+            )
         except RequestException as e:
             if hasattr(e.response, "json"):
                 instance.print_error_response(e.response.json())

{okdata_cli-6.0.0 → okdata_cli-6.1.1}/okdata/cli/commands/datasets/datasets.py

@@ -1,7 +1,7 @@
 import sys
 
 from okdata.sdk.data.dataset import Dataset
-from okdata.sdk.data.download import Download
+from okdata.sdk.data.download import Download, DownloadURLAssertionError
 from okdata.sdk.data.upload import Upload
 from requests.exceptions import HTTPError
 
@@ -421,9 +421,14 @@ Options:{BASE_COMMAND_OPTIONS}
     def download_files(self, source, target):
         download = Download(env=self.opt("env"))
         dataset_id, version, edition = self._dataset_components_from_uri(source)
-        downloaded_files = download.download(
-            dataset_id, version, edition, resolve_output_filepath(target)
-        )
+
+        try:
+            downloaded_files = download.download(
+                dataset_id, version, edition, resolve_output_filepath(target)
+            )
+        except DownloadURLAssertionError as e:
+            sys.exit(e)
+
         self.log.info(f"Download returned: {downloaded_files}")
         out = create_output(self.opt("format"), "datasets_copy_file_config_2.json")
         out.output_singular_object = True

{okdata_cli-6.0.0 → okdata_cli-6.1.1}/okdata/cli/commands/datasets/questions.py

@@ -63,7 +63,7 @@ def qs_create_dataset():
             "message": "Tilgangsnivå",
             "choices": [
                 Choice("Eksplisitt tilgangskontroll", "non-public"),
-                Choice("Internt til Origo", "restricted"),
+                Choice("Internt til kommunen", "restricted"),
                 Choice("Offentlig", "public"),
             ],
         },

{okdata_cli-6.0.0 → okdata_cli-6.1.1}/okdata/cli/commands/pubs/pubs.py

@@ -84,7 +84,7 @@ Options:{BASE_COMMAND_OPTIONS}
             )
         except NoTeamError:
             self.print(
-                "We haven't yet registered you as member of any Origo team. "
+                "You are not yet registered as a member of a team. "
                 f"Please contact {MAINTAINER} to get it done."
             )
             return

{okdata_cli-6.0.0 → okdata_cli-6.1.1}/okdata/cli/commands/pubs/questions.py

@@ -17,7 +17,6 @@ client_types = {
 
 _organizations = [
     "dig",
-    "origo",
 ]
 
 _environments = [
@@ -169,7 +168,10 @@ def q_client(pubs_client, allow_all=False):
         def client(c):
             return {"id": c["client_id"], "name": c["client_name"]}
 
-        return [Choice(c["client_name"], client(c)) for c in sorted_clients] + (
+        return [
+            Choice(f'{c["client_name"]} (ID: {c["client_id"]})', client(c))
+            for c in sorted_clients
+        ] + (
             [Choice("All clients", [client(c) for c in sorted_clients])]
             if allow_all
             else []

{okdata_cli-6.0.0 → okdata_cli-6.1.1}/okdata/cli/commands/teams/teams.py

@@ -68,7 +68,7 @@ Options:{BASE_COMMAND_OPTIONS}
             config = edit_team_wizard(self.client)
         except NoTeamError:
             self.print(
-                "We haven't yet registered you as member of any Origo team. "
+                "You are not yet registered as a member of a team. "
                 f"Please contact {MAINTAINER} to get it done."
             )
             return
@@ -87,7 +87,7 @@ Options:{BASE_COMMAND_OPTIONS}
             members = self.client.get_team_members(config["team_id"])
         except NoTeamError:
             self.print(
-                "We haven't yet registered you as member of any Origo team. "
+                "You are not yet registered as a member of a team. "
                 f"Please contact {MAINTAINER} to get it done."
                 if my
                 else "No teams exist yet."
@@ -104,7 +104,7 @@ Options:{BASE_COMMAND_OPTIONS}
             config = add_member_wizard(self.client)
         except NoTeamError:
             self.print(
-                "We haven't yet registered you as member of any Origo team. "
+                "You are not yet registered as a member of a team. "
                 f"Please contact {MAINTAINER} to get it done."
             )
             return
@@ -134,7 +134,7 @@ Options:{BASE_COMMAND_OPTIONS}
             config = remove_member_wizard(self.client)
         except NoTeamError:
             self.print(
-                "We haven't yet registered you as member of any Origo team. "
+                "You are not yet registered as a member of a team. "
                 f"Please contact {MAINTAINER} to get it done."
             )
             return

{okdata_cli-6.0.0 → okdata_cli-6.1.1}/okdata/cli/commands/validators.py

@@ -67,9 +67,9 @@ class IntegrationValidator(Validator):
             raise ValidationError(
                 message="Too long!", cursor_position=len(document.text)
             )
-        if not re.fullmatch("[0-9a-z-]+", document.text):
+        if not re.fullmatch("[0-9a-zA-Z -]+", document.text):
             raise ValidationError(
-                message='Only lowercase letters, numbers and "-", please',
+                message='Only letters, numbers, spaces and "-", please',
                 cursor_position=len(document.text),
             )
 

{okdata_cli-6.0.0 → okdata_cli-6.1.1}/okdata_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: okdata-cli
-Version: 6.0.0
+Version: 6.1.1
 Summary: CLI for services provided by Oslo Origo
 Home-page: https://github.com/oslokommune/okdata-cli/
 Author: Oslo Origo
@@ -18,7 +18,7 @@ Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: docopt
-Requires-Dist: okdata-sdk<5,>=4
+Requires-Dist: okdata-sdk<5,>=4.1
 Requires-Dist: PrettyTable
 Requires-Dist: questionary<2.0.0,>=1.10.0
 Requires-Dist: prompt-toolkit<3.0.52

{okdata_cli-6.0.0 → okdata_cli-6.1.1}/okdata_cli.egg-info/requires.txt

@@ -1,5 +1,5 @@
 docopt
-okdata-sdk<5,>=4
+okdata-sdk<5,>=4.1
 PrettyTable
 questionary<2.0.0,>=1.10.0
 prompt-toolkit<3.0.52

{okdata_cli-6.0.0 → okdata_cli-6.1.1}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
 
 setuptools.setup(
     name="okdata-cli",
-    version="6.0.0",
+    version="6.1.1",
     author="Oslo Origo",
     author_email="dataspeilet@oslo.kommune.no",
     description="CLI for services provided by Oslo Origo",
@@ -24,7 +24,7 @@ setuptools.setup(
     },
     install_requires=[
         "docopt",
-        "okdata-sdk>=4,<5",
+        "okdata-sdk>=4.1,<5",
         "PrettyTable",
         # TODO: Upgrade to questionary 2.x.
         "questionary>=1.10.0,<2.0.0",