okdata-cli 4.2.0__tar.gz → 4.3.1__tar.gz

{okdata-cli-4.2.0/okdata_cli.egg-info → okdata_cli-4.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: okdata-cli
-Version: 4.2.0
+Version: 4.3.1
 Summary: CLI for services provided by Oslo Origo
 Home-page: https://github.com/oslokommune/okdata-cli/
 Author: Oslo Origo
@@ -17,6 +17,21 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: PrettyTable
+Requires-Dist: docopt
+Requires-Dist: okdata-sdk<4,>=3.1.1
+Requires-Dist: questionary<2.0.0,>=1.10.0
+Requires-Dist: requests
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 # `okdata-cli`: Oslo Origo data services CLI
 

{okdata-cli-4.2.0 → okdata_cli-4.3.1}/okdata/cli/commands/datasets/datasets.py

@@ -6,7 +6,10 @@ from okdata.sdk.data.upload import Upload
 from requests.exceptions import HTTPError
 
 from okdata.cli.command import BaseCommand, BASE_COMMAND_OPTIONS
-from okdata.cli.commands.datasets.wizards import DatasetCreateWizard
+from okdata.cli.commands.datasets.wizards import (
+    DatasetCreateWizard,
+    PipelineCreateWizard,
+)
 from okdata.cli.io import read_json, resolve_output_filepath
 from okdata.cli.output import create_output
 
@@ -22,6 +25,7 @@ Usage:
   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]
 
 Examples:
   okdata datasets ls
@@ -32,6 +36,7 @@ Examples:
   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
+  okdata datasets create-pipeline my-dataset
 
 Options:{BASE_COMMAND_OPTIONS}
   --file=<file>             # Use this file for configuration or upload
@@ -60,6 +65,8 @@ Options:{BASE_COMMAND_OPTIONS}
             self.create_edition()
         elif self.cmd("create-distribution"):
             self.create_distribution()
+        elif self.cmd("create-pipeline"):
+            PipelineCreateWizard(self, self.arg("datasetid")).start()
         else:
             self.help()
 
@@ -261,9 +268,9 @@ Options:{BASE_COMMAND_OPTIONS}
             )
 
     def _dataset_components_from_uri(
-        self, dataset_uri, create_edition=False, auto_resolve=True
+        self, uri, create_edition=False, auto_resolve=True
     ):
-        """Return an ID/version/edition tuple given a dataset URI.
+        """Return a dataset ID/version/edition tuple given a URI.
 
         Four different URI formats are supported:
 
@@ -289,8 +296,15 @@ Options:{BASE_COMMAND_OPTIONS}
 
         Otherwise `None` is returned for missing parts.
         """
-        parts = dataset_uri.split("/")
-        dataset_id, version, edition = parts + [None] * (3 - len(parts))
+        parts = uri.split("/")
+
+        try:
+            dataset_id, version, edition = parts + [None] * (3 - len(parts))
+        except ValueError:
+            sys.exit(
+                "URI must be on the format 'dataset_id', "
+                "'dataset_id/version', or 'dataset_id/version/edition'."
+            )
 
         # First verify that the dataset exists; `get_dataset` raises an error
         # if not.

{okdata-cli-4.2.0 → okdata_cli-4.3.1}/okdata/cli/commands/datasets/questions.py

@@ -26,7 +26,7 @@ available_pipelines = [
 ]
 
 
-def qs_create():
+def qs_create_dataset():
     return [
         {
             **required_style,
@@ -35,7 +35,7 @@ def qs_create():
             "message": "Datakilde",
             "choices": [
                 Choice("Fil", "file"),
-                Choice("Database (krever eget databaseoppsett)", "database"),
+                Choice("Punktmålinger", "event"),
                 Choice("Ingen (datasettet skal ikke inneholde data direkte)", "none"),
             ],
         },
@@ -114,3 +114,15 @@ def qs_create():
             "when": lambda x: x["sourceType"] in pipeline_choices,
         },
     ]
+
+
+def qs_create_pipeline():
+    return [
+        {
+            **required_style,
+            "type": "select",
+            "name": "pipeline",
+            "message": "Prosessering",
+            "choices": pipeline_choices["file"],
+        },
+    ]

{okdata-cli-4.2.0 → okdata_cli-4.3.1}/okdata/cli/commands/datasets/wizards.py

@@ -1,11 +1,45 @@
+import sys
+
 from okdata.sdk.data.dataset import Dataset
 from okdata.sdk.pipelines.client import PipelineApiClient
+from requests import HTTPError
 
 from okdata.cli.command import confirm_to_continue
-from okdata.cli.commands.datasets.questions import qs_create
+from okdata.cli.commands.datasets.questions import qs_create_dataset, qs_create_pipeline
 from okdata.cli.commands.wizard import run_questionnaire
 
 
+def _pipeline_config(pipeline_processor_id, dataset_id, version):
+    return {
+        "pipelineProcessorId": pipeline_processor_id,
+        "id": dataset_id,
+        "datasetUri": f"output/{dataset_id}/{version}",
+    }
+
+
+def _pipeline_input_config(pipeline_id, dataset_id, version):
+    return {
+        "pipelineInstanceId": pipeline_id,
+        "datasetUri": f"input/{dataset_id}/{version}",
+        "stage": "raw",
+    }
+
+
+def _create_pipeline(command, env, dataset_id, pipeline):
+    command.print("Creating pipeline...")
+    pipeline_client = PipelineApiClient(env=env)
+    pipeline_config = _pipeline_config(pipeline, dataset_id, "1")
+    pipeline_id = pipeline_client.create_pipeline_instance(pipeline_config)
+    pipeline_id = pipeline_id.strip('"')  # What's up with these?
+    command.print(f"Created pipeline with ID: {pipeline_id}")
+
+    command.print("Creating pipeline input...")
+    pipeline_input_config = _pipeline_input_config(pipeline_id, dataset_id, "1")
+    pipeline_input_id = pipeline_client.create_pipeline_input(pipeline_input_config)
+    pipeline_input_id = pipeline_input_id.strip('"')  # What's up with these?
+    command.print(f"Created pipeline input with ID: {pipeline_input_id}")
+
+
 class DatasetCreateWizard:
     """Wizard for the `datasets create` command.
 
@@ -39,23 +73,9 @@ class DatasetCreateWizard:
 
         return config
 
-    def pipeline_config(self, pipeline_processor_id, dataset_id, version):
-        return {
-            "pipelineProcessorId": pipeline_processor_id,
-            "id": dataset_id,
-            "datasetUri": f"output/{dataset_id}/{version}",
-        }
-
-    def pipeline_input_config(self, pipeline_id, dataset_id, version):
-        return {
-            "pipelineInstanceId": pipeline_id,
-            "datasetUri": f"input/{dataset_id}/{version}",
-            "stage": "raw",
-        }
-
     def start(self):
         env = self.command.opt("env")
-        choices = run_questionnaire(*qs_create())
+        choices = run_questionnaire(*qs_create_dataset())
 
         confirm_to_continue(
             "Will create a new dataset '{}'.{}".format(
@@ -76,22 +96,7 @@ class DatasetCreateWizard:
         self.command.print(f"Created dataset with ID: {dataset_id}")
 
         if choices.get("pipeline"):
-            self.command.print("Creating pipeline...")
-            pipeline_client = PipelineApiClient(env=env)
-            pipeline_config = self.pipeline_config(choices["pipeline"], dataset_id, "1")
-            pipeline_id = pipeline_client.create_pipeline_instance(pipeline_config)
-            pipeline_id = pipeline_id.strip('"')  # What's up with these?
-            self.command.print(f"Created pipeline with ID: {pipeline_id}")
-
-            self.command.print("Creating pipeline input...")
-            pipeline_input_config = self.pipeline_input_config(
-                pipeline_id, dataset_id, "1"
-            )
-            pipeline_input_id = pipeline_client.create_pipeline_input(
-                pipeline_input_config
-            )
-            pipeline_input_id = pipeline_input_id.strip('"')  # What's up with these?
-            self.command.print(f"Created pipeline input with ID: {pipeline_input_id}")
+            _create_pipeline(self.command, env, dataset_id, choices["pipeline"])
 
         if choices["sourceType"] == "file":
             self.command.print(
@@ -102,3 +107,25 @@ class DatasetCreateWizard:
             )
         else:
             self.command.print("Done!")
+
+
+class PipelineCreateWizard:
+    """Wizard for the `datasets create-pipeline` command."""
+
+    def __init__(self, command, dataset_id):
+        self.command = command
+        self.dataset_id = dataset_id
+
+    def start(self):
+        choices = run_questionnaire(*qs_create_pipeline())
+        try:
+            _create_pipeline(
+                self.command,
+                self.command.opt("env"),
+                self.dataset_id,
+                choices["pipeline"],
+            )
+        except HTTPError as e:
+            if e.response.status_code == 409:
+                sys.exit("This dataset already has a pipeline set up.")
+            raise

{okdata-cli-4.2.0 → okdata_cli-4.3.1}/okdata/cli/commands/pubs/questions.py

@@ -43,6 +43,7 @@ _scopes = {
         "skatteetaten:skatteplikt",
         "skatteetaten:spesifisertsummertskattegrunnlag",
         "skatteetaten:summertskattegrunnlag",
+        "skatteetaten:testnorge/testdata.read",
         "skatteetaten:tjenestepensjonsavtale",
     ],
 }
@@ -216,6 +217,7 @@ def q_delete_from_aws():
         "name": "delete_from_aws",
         "message": "Delete key from AWS Parameter Store?",
         "auto_enter": False,
+        "default": False,
     }
 
 

{okdata-cli-4.2.0 → okdata_cli-4.3.1/okdata_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: okdata-cli
-Version: 4.2.0
+Version: 4.3.1
 Summary: CLI for services provided by Oslo Origo
 Home-page: https://github.com/oslokommune/okdata-cli/
 Author: Oslo Origo
@@ -17,6 +17,21 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: PrettyTable
+Requires-Dist: docopt
+Requires-Dist: okdata-sdk<4,>=3.1.1
+Requires-Dist: questionary<2.0.0,>=1.10.0
+Requires-Dist: requests
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 # `okdata-cli`: Oslo Origo data services CLI
 

{okdata-cli-4.2.0 → okdata_cli-4.3.1}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
 
 setuptools.setup(
     name="okdata-cli",
-    version="4.2.0",
+    version="4.3.1",
     author="Oslo Origo",
     author_email="dataspeilet@oslo.kommune.no",
     description="CLI for services provided by Oslo Origo",