okdata-cli 4.4.0__tar.gz → 5.0.1__tar.gz

{okdata_cli-4.4.0 → okdata_cli-5.0.1}/PKG-INFO

@@ -1,26 +1,27 @@
 Metadata-Version: 2.4
 Name: okdata-cli
-Version: 4.4.0
+Version: 5.0.1
 Summary: CLI for services provided by Oslo Origo
 Home-page: https://github.com/oslokommune/okdata-cli/
 Author: Oslo Origo
 Author-email: dataspeilet@oslo.kommune.no
 License: MIT
 Classifier: Development Status :: 5 - Production/Stable
-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
+Classifier: Programming Language :: Python :: 3.13
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
-Requires-Python: >=3.8
+Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: PrettyTable
 Requires-Dist: docopt
-Requires-Dist: okdata-sdk<4,>=3.1.1
+Requires-Dist: okdata-sdk<4,>=3.4
+Requires-Dist: PrettyTable
 Requires-Dist: questionary<2.0.0,>=1.10.0
+Requires-Dist: prompt-toolkit<3.0.52
 Requires-Dist: requests
 Dynamic: author
 Dynamic: author-email

{okdata_cli-4.4.0 → okdata_cli-5.0.1}/okdata/cli/__main__.py

@@ -1,4 +1,5 @@
 import json
+import os
 import sys
 
 from keycloak.exceptions import KeycloakGetError, KeycloakPostError
@@ -33,6 +34,9 @@ def main():
         try:
             instance.login()
             instance.handle()
+            # Flush output here to force SIGPIPE to be triggered while inside
+            # this try block.
+            sys.stdout.flush()
         except RequestException as e:
             if hasattr(e.response, "json"):
                 instance.print_error_response(e.response.json())
@@ -55,6 +59,11 @@ def main():
             )
         except (EOFError, KeyboardInterrupt):
             instance.print("\nAbort.")
+        except BrokenPipeError:
+            # https://docs.python.org/3/library/signal.html#note-on-sigpipe
+            devnull = os.open(os.devnull, os.O_WRONLY)
+            os.dup2(devnull, sys.stdout.fileno())
+            sys.exit(1)
         except Exception as e:
             instance.print(
                 "An exception occurred",

{okdata_cli-4.4.0 → okdata_cli-5.0.1}/okdata/cli/command.py

@@ -79,8 +79,9 @@ Options:{BASE_COMMAND_OPTIONS}
         return content
 
     def print(self, str, payload=None):
-        is_json = self.opt("format") == "json"
-        if not is_json:
+        is_structured_data = self.opt("format") in ("csv", "json")
+
+        if not is_structured_data:
             print(str)
         # Normally a return json value from the API
         if payload:

{okdata_cli-4.4.0 → okdata_cli-5.0.1}/okdata/cli/commands/datasets/datasets.py

@@ -5,7 +5,7 @@ from okdata.sdk.data.download import Download
 from okdata.sdk.data.upload import Upload
 from requests.exceptions import HTTPError
 
-from okdata.cli.command import BaseCommand, BASE_COMMAND_OPTIONS
+from okdata.cli.command import BaseCommand, BASE_COMMAND_OPTIONS, confirm_to_continue
 from okdata.cli.commands.datasets.wizards import (
     DatasetCreateWizard,
     PipelineCreateWizard,
@@ -18,21 +18,27 @@ class DatasetsCommand(BaseCommand):
     __doc__ = f"""Oslo :: Datasets
 
 Usage:
-  okdata datasets ls [--filter=<filter> options]
-  okdata datasets ls <uri> [options]
+  okdata datasets ls [--filter=<filter> --verbose options]
+  okdata datasets ls <uri> [--verbose options]
   okdata datasets cp <source> <target> [options]
   okdata datasets create [options]
-  okdata datasets create-version <datasetid> [options]
-  okdata datasets create-edition <datasetid> [<versionid>] [options]
-  okdata datasets create-distribution <datasetid> [<versionid> <editionid>] [options]
-  okdata datasets create-pipeline <datasetid> [options]
+  okdata datasets create-version <dataset_id> [options]
+  okdata datasets create-edition <dataset_id> [<version>] [options]
+  okdata datasets create-distribution <dataset_id> [<version> <edition>] [options]
+  okdata datasets create-pipeline <dataset_id> [options]
+  okdata datasets delete-version <version_id> [options]
+  okdata datasets delete-edition <edition_id> [options]
+  okdata datasets delete-distribution <distribution_id> [options]
 
 Examples:
   okdata datasets ls
   okdata datasets ls --filter=bydelsfakta
+  okdata datasets ls --verbose
   okdata datasets ls my-dataset
+  okdata datasets ls my-dataset --verbose
   okdata datasets ls my-dataset/1
   okdata datasets ls my-dataset/1/20240101T102030
+  okdata datasets ls my-dataset/1/20240101T102030 --format=csv
   okdata datasets ls my-dataset/1/20240101T102030 --format=json
   okdata datasets create --file=dataset.json
   okdata datasets cp /tmp/file.csv ds:my-dataset-id
@@ -46,7 +52,6 @@ Options:{BASE_COMMAND_OPTIONS}
 
     def __init__(self):
         super().__init__(Dataset)
-        self.download = Download(env=self.opt("env"))
 
     def handler(self):
         self.log.info("DatasetsCommand.handle()")
@@ -65,8 +70,14 @@ Options:{BASE_COMMAND_OPTIONS}
             self.create_edition()
         elif self.cmd("create-distribution"):
             self.create_distribution()
+        elif self.cmd("delete-version"):
+            self.delete_version()
+        elif self.cmd("delete-edition"):
+            self.delete_edition()
+        elif self.cmd("delete-distribution"):
+            self.delete_distribution()
         elif self.cmd("create-pipeline"):
-            PipelineCreateWizard(self, self.arg("datasetid")).start()
+            PipelineCreateWizard(self, self.arg("dataset_id")).start()
         else:
             self.help()
 
@@ -90,7 +101,10 @@ Options:{BASE_COMMAND_OPTIONS}
     def datasets(self):
         self.log.info("Listing datasets")
         dataset_list = self.sdk.get_datasets(filter=self.opt("filter"))
-        out = create_output(self.opt("format"), "datasets_config.json")
+        out = create_output(
+            self.opt("format"),
+            f"datasets_config{'_verbose' if self.opt('verbose') else ''}.json",
+        )
         out.add_rows(dataset_list)
         self.print("Available datasets", out)
 
@@ -108,7 +122,12 @@ Options:{BASE_COMMAND_OPTIONS}
             )
             return
 
-        out = create_output(self.opt("format"), "datasets_dataset_config.json")
+        config = (
+            "datasets_config_verbose"
+            if self.opt("verbose")
+            else "datasets_dataset_config.json"
+        )
+        out = create_output(self.opt("format"), config)
         out.add_rows([dataset])
         self.print(f"Dataset: {dataset_id}", out)
 
@@ -141,7 +160,7 @@ Options:{BASE_COMMAND_OPTIONS}
         self.print(f"Editions available for: {dataset_id}, version: {version}", out)
 
     def create_version(self):
-        dataset_id = self.arg("datasetid")
+        dataset_id = self.arg("dataset_id")
         payload = read_json(self.opt("file"))
         self.log.info(
             f"Creating version for dataset: {dataset_id} with payload: {payload}"
@@ -149,7 +168,7 @@ Options:{BASE_COMMAND_OPTIONS}
 
         version = self.sdk.create_version(dataset_id, payload)
         version_id = version["Id"]
-        self.log.info(f"Created version: {version_id} on dataset: {dataset_id}")
+        self.log.info(f"Created version: {version_id} on dataset: {dataset_id}")
         self.print(f"Created version: {version_id}", version)
 
     def _get_latest_version(self, dataset_id, exit_on_error=True):
@@ -170,18 +189,32 @@ Options:{BASE_COMMAND_OPTIONS}
                 return None
             raise
 
-    def resolve_or_load_versionid(self, dataset_id):
-        self.log.info(f"Trying to resolve versionid for {dataset_id}")
-        version_id = self.arg("versionid")
-        if version_id is not None:
-            self.log.info(f"Found version in arguments: {version_id}")
-            return version_id
+    def resolve_or_load_version(self, dataset_id):
+        self.log.info(f"Trying to resolve version for {dataset_id}")
+        version = self.arg("version")
+        if version is not None:
+            self.log.info(f"Found version in arguments: {version}")
+            return version
         latest_version = self._get_latest_version(dataset_id)
         self.log.info(
             f"Found version in latest dataset version: {latest_version['version']}"
         )
         return latest_version["version"]
 
+    def delete_version(self):
+        version_id = self.arg("version_id")
+        self.log.info(f"Deleting version {version_id}")
+        try:
+            dataset_id, version = version_id.split("/")
+        except ValueError:
+            sys.exit("Version ID must be on the format 'dataset_id/version'.")
+        confirm_to_continue(
+            f"Will delete version {version} together with every child edition "
+            "and distribution."
+        )
+        self.sdk.delete_version(dataset_id, version, cascade=True)
+        self.print(f"Deleted version {version}.")
+
     # #################################### #
     # Edition
     # #################################### #
@@ -204,24 +237,24 @@ Options:{BASE_COMMAND_OPTIONS}
 
     def create_edition(self):
         payload = read_json(self.opt("file"))
-        dataset_id = self.arg("datasetid")
-        version_id = self.resolve_or_load_versionid(dataset_id)
+        dataset_id = self.arg("dataset_id")
+        version = self.resolve_or_load_version(dataset_id)
         self.log.info(
-            f"Creating edition for {version_id} on {dataset_id} with payload: {payload}"
+            f"Creating edition for {version} on {dataset_id} with payload: {payload}"
         )
 
-        edition = self.sdk.create_edition(dataset_id, version_id, payload)
-        self.print(f"Created edition for {version_id} on {dataset_id}", edition)
+        edition = self.sdk.create_edition(dataset_id, version, payload)
+        self.print(f"Created edition for {version} on {dataset_id}", edition)
         return edition
 
-    def resolve_or_create_edition(self, dataset_id, version_id):
-        self.log.info(f"Trying to resolve edition for {version_id} on {dataset_id}")
-        edition_id = self.arg("editionid")
-        if edition_id is not None:
-            self.log.info(f"Found edition in arguments: {edition_id}")
-            return edition_id
+    def resolve_or_create_edition(self, dataset_id, version):
+        self.log.info(f"Trying to resolve edition for {version} on {dataset_id}")
+        edition = self.arg("edition")
+        if edition is not None:
+            self.log.info(f"Found edition in arguments: {edition}")
+            return edition
 
-        return self.sdk.auto_create_edition(dataset_id, version_id)
+        return self.sdk.auto_create_edition(dataset_id, version)
 
     def get_latest_or_create_edition(self, dataset_id, version):
         self.log.info(f"Resolving edition for dataset-uri: {dataset_id}/{version}")
@@ -232,23 +265,49 @@ Options:{BASE_COMMAND_OPTIONS}
                 return self.sdk.auto_create_edition(dataset_id, version)
             raise
 
+    def delete_edition(self):
+        edition_id = self.arg("edition_id")
+        self.log.info(f"Deleting edition {edition_id}")
+        try:
+            dataset_id, version, edition = edition_id.split("/")
+        except ValueError:
+            sys.exit("Edition ID must be on the format 'dataset_id/version/edition'.")
+        confirm_to_continue(
+            f"Will delete edition {edition} together with every child distribution."
+        )
+        self.sdk.delete_edition(dataset_id, version, edition, cascade=True)
+        self.print(f"Deleted edition {edition}.")
+
     # #################################### #
     # Distribution
     # #################################### #
     def create_distribution(self):
         payload = read_json(self.opt("file"))
-        dataset_id = self.arg("datasetid")
-        version_id = self.resolve_or_load_versionid(dataset_id)
-        edition_id = self.resolve_or_create_edition(dataset_id, version_id)["Id"]
+        dataset_id = self.arg("dataset_id")
+        version = self.resolve_or_load_version(dataset_id)
+        edition_id = self.resolve_or_create_edition(dataset_id, version)["Id"]
         edition = edition_id.split("/")[-1]
         self.log.info(f"Creating distribution for {edition_id} with payload: {payload}")
 
         distribution = self.sdk.create_distribution(
-            dataset_id, version_id, edition, payload
+            dataset_id, version, edition, payload
         )
         self.print(f"Created distribution for {edition_id}", distribution)
         return distribution
 
+    def delete_distribution(self):
+        dist_id = self.arg("distribution_id")
+        self.log.info(f"Deleting distribution {dist_id}")
+        try:
+            dataset_id, version, edition, dist = dist_id.split("/")
+        except ValueError:
+            sys.exit(
+                "Distribution ID must be on the format 'dataset_id/version/edition/distribution'."
+            )
+        confirm_to_continue(f"Will delete distribution {dist_id}.")
+        self.sdk.delete_distribution(dataset_id, version, edition, dist)
+        self.print(f"Deleted distribution {dist_id}.")
+
     # #################################### #
     # File handling
     # #################################### #
@@ -329,7 +388,7 @@ Options:{BASE_COMMAND_OPTIONS}
         return dataset_id, version, edition
 
     def upload_file(self, source, target):
-        upload = Upload()
+        upload = Upload(env=self.opt("env"))
         dataset_id, version, edition = self._dataset_components_from_uri(target, True)
 
         self.log.info(f"Will upload file to: {dataset_id}/{version}/{edition})")
@@ -360,8 +419,9 @@ Options:{BASE_COMMAND_OPTIONS}
         self.print("\n".join(summary))
 
     def download_files(self, source, target):
+        download = Download(env=self.opt("env"))
         dataset_id, version, edition = self._dataset_components_from_uri(source)
-        downloaded_files = self.download.download(
+        downloaded_files = download.download(
             dataset_id, version, edition, resolve_output_filepath(target)
         )
         self.log.info(f"Download returned: {downloaded_files}")

{okdata_cli-4.4.0 → okdata_cli-5.0.1}/okdata/cli/commands/status.py

@@ -101,13 +101,23 @@ Options:{BASE_COMMAND_OPTIONS}
         if trace_status != "FINISHED":
             print("Waiting for processing to finish", end="", flush=True)
 
-        while trace_status != "FINISHED":
+        attempts = 0
+        max_attempts = 100
+        while trace_status != "FINISHED" and attempts < max_attempts:
             print(".", end="", flush=True)
             sleep(2)
+            attempts += 1
             trace_events = self.get_trace_events(trace_id)
             trace_status = StatusCommand.find_latest_event(trace_events)["trace_status"]
         print()
 
+        if attempts == max_attempts:
+            print(
+                "\nWe've waited for a good while now, and processing hasn't "
+                "yet finished.\nSomething else is most likely wrong, maybe a "
+                "pipeline hasn't been configured for the dataset?\n"
+            )
+
         return trace_events
 
     def status_for_id(self, trace_id):

okdata_cli-5.0.1/okdata/cli/data/output-format/datasets_config.json

@@ -0,0 +1,18 @@
+{
+  "ID": {
+    "name": "ID",
+    "key": "Id"
+  },
+  "Publisher": {
+    "name": "Publisher",
+    "key": "publisher"
+  },
+  "Parent ID": {
+    "name": "Parent ID",
+    "key": "parent_id"
+  },
+  "Access rights": {
+    "name": "Access rights",
+    "key": "accessRights"
+  }
+}

okdata_cli-5.0.1/okdata/cli/data/output-format/datasets_config_verbose.json

@@ -0,0 +1,50 @@
+{
+  "ID": {
+    "name": "ID",
+    "key": "Id"
+  },
+  "Title": {
+    "name": "Title",
+    "key": "title"
+  },
+  "Description": {
+    "name": "Description",
+    "key": "description"
+  },
+  "Publisher": {
+    "name": "Publisher",
+    "key": "publisher"
+  },
+  "Objective": {
+    "name": "Objective",
+    "key": "objective"
+  },
+  "Parent ID": {
+    "name": "Parent ID",
+    "key": "parent_id"
+  },
+  "Access rights": {
+    "name": "Access rights",
+    "key": "accessRights"
+  },
+  "Theme": {
+    "name": "Theme",
+    "key": "theme"
+  },
+  "Keywords": {
+    "name": "Keywords",
+    "key": "keywords"
+  },
+  "Frequency": {
+    "name": "Frequency",
+    "key": "frequency"
+  },
+  "Contact point": {
+    "name": "Contact Point",
+    "key": "contactPoint",
+    "fields": [
+      "name",
+      "email"
+    ]
+  }
+}

okdata_cli-5.0.1/okdata/cli/data/output-format/datasets_dataset_config.json

@@ -0,0 +1,30 @@
+{
+  "Title": {
+    "name": "Title",
+    "key": "title"
+  },
+  "Description": {
+    "name": "Description",
+    "key": "description"
+  },
+  "Publisher": {
+    "name": "Publisher",
+    "key": "publisher"
+  },
+  "Parent ID": {
+    "name": "Parent ID",
+    "key": "parent_id"
+  },
+  "Access rights": {
+    "name": "Access rights",
+    "key": "accessRights"
+  },
+  "Contact point": {
+    "name": "Contact point",
+    "key": "contactPoint",
+    "fields": [
+      "name",
+      "email"
+    ]
+  }
+}

{okdata_cli-4.4.0 → okdata_cli-5.0.1}/okdata/cli/data/output-format/datasets_dataset_version_config.json

@@ -1,6 +1,6 @@
 {
-  "Id": {
-    "name": "Id",
+  "ID": {
+    "name": "ID",
     "key": "Id"
   },
   "Edition": {

{okdata_cli-4.4.0 → okdata_cli-5.0.1}/okdata/cli/data/output-format/datasets_dataset_version_edition_config.json

@@ -1,6 +1,6 @@
 {
-  "Id": {
-    "name": "Id",
+  "ID": {
+    "name": "ID",
     "key": "Id"
   },
   "Edition": {

{okdata_cli-4.4.0 → okdata_cli-5.0.1}/okdata/cli/data/output-format/datasets_dataset_version_edition_distributions_config.json

@@ -1,6 +1,6 @@
 {
-  "Id": {
-    "name": "Id",
+  "ID": {
+    "name": "ID",
     "key": "Id"
   },
   "Filename": {

{okdata_cli-4.4.0 → okdata_cli-5.0.1}/okdata/cli/data/output-format/datasets_dataset_versions_config.json

@@ -1,6 +1,6 @@
 {
-  "Id": {
-    "name": "Id",
+  "ID": {
+    "name": "ID",
     "key": "Id"
   },
   "Version": {

{okdata_cli-4.4.0 → okdata_cli-5.0.1}/okdata/cli/output.py

@@ -1,3 +1,5 @@
+import csv
+import io
 import json
 import logging
 import os
@@ -9,25 +11,28 @@ from prettytable import PrettyTable
 log = logging.getLogger()
 
 
-def get_script_path():
+def _get_script_path():
     return os.path.dirname(__file__)
 
 
-# Create a output printer
-#
-# Formatting of output is defined in okdata/cli/data/ouput-format.
-# Each command defines what (from the API response) should be printed, and
-# what the human-readable name should be
-def create_output(format, configfile):
-    datadir = f"{get_script_path()}/data/output-format"
-    filename = f"{datadir}/{configfile}"
-    log.info(f"Creating output format: {format}, from: {filename}")
-    with open(filename) as config_file:
-        config = json.load(config_file)
+def create_output(fmt, config_file):
+    """Create and return an output printer.
 
-    if format == "json":
-        return JsonOutput(config)
-    return TableOutput(config)
+    Formatting of output is defined in the `okdata/cli/data/ouput-format`
+    directory. Each command defines which fields from the API response should
+    be printed, and what the human-readable name should be.
+    """
+    datadir = f"{_get_script_path()}/data/output-format"
+    filename = f"{datadir}/{config_file}"
+    log.info(f"Creating output format: {fmt}, from: {filename}")
+
+    with open(filename) as f:
+        config = json.load(f)
+
+    return {
+        "json": JsonOutput(config),
+        "csv": CSVOutput(config),
+    }.get(fmt, TableOutput(config))
 
 
 class TableOutput(PrettyTable):
@@ -104,13 +109,9 @@ class TableOutput(PrettyTable):
         return value
 
 
-# TODO: merge many outputs to one array of elements when listing a version
-class JsonOutput:
+class StructuredDataOutput:
     def __init__(self, config):
         self.config = config
-        # set to True it will return a single object from self.out when printed. This will make it
-        # easier to pass output to jq without having to access out[0] from the CLI
-        self.output_singular_object = False
         self.out = []
 
     def field_values(self, row, row_key, key):
@@ -144,6 +145,36 @@ class JsonOutput:
         for row in rows:
             self.add_row(row)
 
+    def __str__(self):
+        raise NotImplementedError
+
+
+class CSVOutput(StructuredDataOutput):
+    def __str__(self):
+        out = io.StringIO()
+        writer = csv.DictWriter(out, self.out[0].keys())
+        writer.writeheader()
+        writer.writerows(self.out)
+        return out.getvalue()
+
+    def get_row_value(self, row, key):
+        val = super().get_row_value(row, key)
+
+        if isinstance(val, str):
+            return val.replace("\n", "")
+        elif isinstance(val, list):
+            return ";".join(val)
+        return val
+
+
+# TODO: merge many outputs to one array of elements when listing a version
+class JsonOutput(StructuredDataOutput):
+    def __init__(self, config):
+        super().__init__(config)
+        # set to True it will return a single object from self.out when printed. This will make it
+        # easier to pass output to jq without having to access out[0] from the CLI
+        self.output_singular_object = False
+
     def __repr__(self):
         return json.dumps(self.out)
 

{okdata_cli-4.4.0 → okdata_cli-5.0.1}/okdata_cli.egg-info/PKG-INFO

@@ -1,26 +1,27 @@
 Metadata-Version: 2.4
 Name: okdata-cli
-Version: 4.4.0
+Version: 5.0.1
 Summary: CLI for services provided by Oslo Origo
 Home-page: https://github.com/oslokommune/okdata-cli/
 Author: Oslo Origo
 Author-email: dataspeilet@oslo.kommune.no
 License: MIT
 Classifier: Development Status :: 5 - Production/Stable
-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
+Classifier: Programming Language :: Python :: 3.13
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
-Requires-Python: >=3.8
+Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: PrettyTable
 Requires-Dist: docopt
-Requires-Dist: okdata-sdk<4,>=3.1.1
+Requires-Dist: okdata-sdk<4,>=3.4
+Requires-Dist: PrettyTable
 Requires-Dist: questionary<2.0.0,>=1.10.0
+Requires-Dist: prompt-toolkit<3.0.52
 Requires-Dist: requests
 Dynamic: author
 Dynamic: author-email

{okdata_cli-4.4.0 → okdata_cli-5.0.1}/okdata_cli.egg-info/SOURCES.txt

@@ -27,6 +27,7 @@ okdata/cli/commands/teams/teams.py
 okdata/cli/commands/teams/util.py
 okdata/cli/commands/teams/wizards.py
 okdata/cli/data/output-format/datasets_config.json
+okdata/cli/data/output-format/datasets_config_verbose.json
 okdata/cli/data/output-format/datasets_copy_file_config.json
 okdata/cli/data/output-format/datasets_copy_file_config_2.json
 okdata/cli/data/output-format/datasets_dataset_config.json

{okdata_cli-4.4.0 → okdata_cli-5.0.1}/okdata_cli.egg-info/requires.txt

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

{okdata_cli-4.4.0 → okdata_cli-5.0.1}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
 
 setuptools.setup(
     name="okdata-cli",
-    version="4.4.0",
+    version="5.0.1",
     author="Oslo Origo",
     author_email="dataspeilet@oslo.kommune.no",
     description="CLI for services provided by Oslo Origo",
@@ -23,22 +23,27 @@ setuptools.setup(
         ],
     },
     install_requires=[
-        "PrettyTable",
         "docopt",
-        "okdata-sdk>=3.1.1,<4",
+        "okdata-sdk>=3.4,<4",
+        "PrettyTable",
+        # TODO: Upgrade to questionary 2.x.
         "questionary>=1.10.0,<2.0.0",
+        # Not a direct dependency, but a dependency for questionary. However
+        # questionary breaks with prompt-toolkit 3.0.52 (and possibly later
+        # versions as well), so let's pin it sub 3.0.52 for now.
+        "prompt-toolkit<3.0.52",
         "requests",
     ],
     entry_points={"console_scripts": ["okdata=okdata.cli.__main__:main"]},
     classifiers=[
         "Development Status :: 5 - Production/Stable",
-        "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",
+        "Programming Language :: Python :: 3.13",
         "License :: OSI Approved :: MIT License",
         "Operating System :: OS Independent",
     ],
-    python_requires=">=3.8",
+    python_requires=">=3.9",
 )

okdata_cli-4.4.0/okdata/cli/data/output-format/datasets_config.json

@@ -1,14 +0,0 @@
-{
-  "Id": {
-    "name": "Id",
-    "key": "Id"
-  },
-  "Title": {
-    "name": "Title",
-    "key": "title"
-  },
-  "Publisher": {
-    "name": "Publisher",
-    "key": "publisher"
-  }
-}

okdata_cli-4.4.0/okdata/cli/data/output-format/datasets_dataset_config.json

@@ -1,22 +0,0 @@
-{
-  "Publisher": {
-    "name": "Publisher",
-    "key": "publisher"
-  },
-  "Frequency": {
-    "name": "Frequency",
-    "key": "frequency"
-  },
-  "Objective": {
-    "name": "Objective",
-    "key": "objective"
-  },
-  "ContactPoint": {
-    "name": "Contact Point",
-    "key": "contactPoint",
-    "fields": [
-      "name",
-      "email"
-    ]
-  }
-}