okdata-cli 4.0.0__tar.gz → 4.1.0__tar.gz

{okdata-cli-4.0.0/okdata_cli.egg-info → okdata-cli-4.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: okdata-cli
-Version: 4.0.0
+Version: 4.1.0
 Summary: CLI for services provided by Oslo Origo
 Home-page: https://github.com/oslokommune/okdata-cli/
 Author: Oslo Origo

{okdata-cli-4.0.0 → okdata-cli-4.1.0}/okdata/cli/__main__.py

@@ -1,7 +1,7 @@
 import json
 import sys
 
-from keycloak.exceptions import KeycloakGetError
+from keycloak.exceptions import KeycloakGetError, KeycloakPostError
 from okdata.sdk.exceptions import ApiAuthenticateError
 from requests.exceptions import RequestException
 
@@ -40,11 +40,12 @@ def main():
                 "An error occurred (ApiAuthenticateError): Invalid credentials",
                 {"error": 1, "message": "Invalid credentials"},
             )
-        except KeycloakGetError as e:
+        except (KeycloakGetError, KeycloakPostError) as e:
             error = json.loads(e.error_message)
+            error_type = e.__class__.__name__
             instance.log.info(f"Keycloak reported: {e}")
             instance.print(
-                f"An error occurred (KeycloakGetError): {error['error_description']}"
+                f"An error occurred ({error_type}): {error['error_description']}"
             )
         except (EOFError, KeyboardInterrupt):
             instance.print("\nAbort.")

{okdata-cli-4.0.0 → okdata-cli-4.1.0}/okdata/cli/commands/datasets/questions.py

@@ -2,11 +2,7 @@ from questionary import Choice
 
 from okdata.cli.commands.validators import (
     KeywordValidator,
-    PhoneValidator,
     SimpleEmailValidator,
-    SpatialResolutionValidator,
-    SpatialValidator,
-    StandardsValidator,
     TitleValidator,
 )
 from okdata.cli.commands.wizard import filter_comma_separated, required_style
@@ -15,6 +11,7 @@ pipeline_choices = {
     "file": [
         Choice("Lagre dataen slik den er", "data-copy"),
         Choice("Konverter fra CSV til Delta", "csv-to-delta"),
+        Choice("Konverter fra JSON til Delta", "json-to-delta"),
         Choice("Konverter fra CSV til Parquet", "csv-to-parquet"),
         Choice("Konverter fra Excel til CSV", "pipeline-excel-to-csv"),
         Choice("Ingen prosessering (krever manuell konfigurasjon av pipeline)", False),
@@ -29,7 +26,7 @@ available_pipelines = [
 ]
 
 
-def qs_create(include_extra_metadata=True):
+def qs_create():
     return [
         {
             **required_style,
@@ -59,38 +56,6 @@ def qs_create(include_extra_metadata=True):
             "validate": KeywordValidator,
             "filter": filter_comma_separated,
         },
-        {
-            **required_style,
-            "type": "confirm",
-            "name": "contains_geodata",
-            "message": "Inneholder datasettet geodata?",
-            "default": False,
-            "when": lambda x: include_extra_metadata,
-        },
-        {
-            "type": "text",
-            "name": "spatial",
-            "message": "Romlig avgrensning (komma-separert)",
-            "validate": SpatialValidator,
-            "filter": filter_comma_separated,
-            "when": lambda x: include_extra_metadata and x["contains_geodata"],
-        },
-        {
-            "type": "text",
-            "name": "spatialResolutionInMeters",
-            "message": "Romlig oppløsning (i meter)",
-            "validate": SpatialResolutionValidator,
-            "filter": lambda v: float(v.replace(",", ".")) if v else None,
-            "when": lambda x: include_extra_metadata and x["contains_geodata"],
-        },
-        {
-            "type": "text",
-            "name": "conformsTo",
-            "message": "I samsvar med standarder (komma-separert)",
-            "validate": StandardsValidator,
-            "filter": filter_comma_separated,
-            "when": lambda x: include_extra_metadata,
-        },
         {
             **required_style,
             "type": "select",
@@ -130,7 +95,6 @@ def qs_create(include_extra_metadata=True):
                     "http://creativecommons.org/publicdomain/zero/1.0/",
                 ),
             ],
-            "when": lambda x: include_extra_metadata,
         },
         {"type": "text", "name": "name", "message": "Kontaktperson – navn"},
         {
@@ -140,13 +104,6 @@ def qs_create(include_extra_metadata=True):
             "message": "Kontaktperson – epost",
             "validate": SimpleEmailValidator,
         },
-        {
-            **required_style,
-            "type": "text",
-            "name": "phone",
-            "message": "Kontaktperson – telefon",
-            "validate": PhoneValidator,
-        },
         {"type": "text", "name": "publisher", "message": "Utgiver"},
         {
             **required_style,

{okdata-cli-4.0.0 → okdata-cli-4.1.0}/okdata/cli/commands/datasets/wizards.py

@@ -29,17 +29,10 @@ class DatasetCreateWizard:
             "contactPoint": {
                 "name": choices["name"],
                 "email": choices["email"],
-                "phone": choices["phone"],
             },
             "publisher": choices["publisher"],
         }
 
-        if choices.get("spatial"):
-            config["spatial"] = choices["spatial"]
-        if choices.get("spatialResolutionInMeters"):
-            config["spatialResolutionInMeters"] = choices["spatialResolutionInMeters"]
-        if choices.get("conformsTo"):
-            config["conformsTo"] = choices["conformsTo"]
         if choices.get("license"):
             config["license"] = choices["license"]
 

{okdata-cli-4.0.0 → okdata-cli-4.1.0}/okdata/cli/commands/validators.py

@@ -33,15 +33,6 @@ class SimpleEmailValidator(Validator):
             )
 
 
-class PhoneValidator(Validator):
-    def validate(self, document):
-        if not re.match(r"^[0-9]+$", document.text):
-            raise ValidationError(
-                message="Please enter a valid phone - all numbers and no space, example: 232334455",
-                cursor_position=len(document.text),
-            )
-
-
 class TitleValidator(Validator):
     def validate(self, document):
         if len(document.text) < 5:
@@ -70,60 +61,6 @@ class KeywordValidator(Validator):
             )
 
 
-class StandardsValidator(Validator):
-    def validate(self, document):
-        standards = csv.reader(
-            [document.text], delimiter=",", escapechar="\\", skipinitialspace=True
-        )
-        standards = [x.strip() for x in next(standards)]
-        for standard in standards:
-            if len(standard) < 3:
-                raise ValidationError(
-                    message="Each standard reference must be at least 3 characters",
-                    cursor_position=len(document.text),
-                )
-        if len(standards) != len(set(standards)):
-            raise ValidationError(
-                message="Each standard reference must be unique",
-                cursor_position=len(document.text),
-            )
-
-
-class SpatialValidator(Validator):
-    def validate(self, document):
-        locations = csv.reader(
-            [document.text], delimiter=",", escapechar="\\", skipinitialspace=True
-        )
-        locations = [x.strip() for x in next(locations)]
-        for location in locations:
-            if len(location) < 1:
-                raise ValidationError(
-                    message="Each location must be at least 1 character",
-                    cursor_position=len(document.text),
-                )
-        if len(locations) != len(set(locations)):
-            raise ValidationError(
-                message="Each location must be unique",
-                cursor_position=len(document.text),
-            )
-
-
-class SpatialResolutionValidator(Validator):
-    def validate(self, document):
-        if not document.text:
-            return None
-        try:
-            number = float(document.text.replace(",", "."))
-            if number <= 0:
-                raise ValueError
-        except ValueError:
-            raise ValidationError(
-                message="Please enter a positive (decimal) number",
-                cursor_position=len(document.text),
-            )
-        return None
-
-
 class IntegrationValidator(Validator):
     def validate(self, document):
         if len(document.text) > 30:

{okdata-cli-4.0.0 → okdata-cli-4.1.0}/okdata/cli/data/output-format/datasets_dataset_config.json

@@ -16,7 +16,6 @@
     "key": "contactPoint",
     "fields": [
       "name",
-      "phone",
       "email"
     ]
   }

{okdata-cli-4.0.0 → okdata-cli-4.1.0/okdata_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: okdata-cli
-Version: 4.0.0
+Version: 4.1.0
 Summary: CLI for services provided by Oslo Origo
 Home-page: https://github.com/oslokommune/okdata-cli/
 Author: Oslo Origo

{okdata-cli-4.0.0 → okdata-cli-4.1.0}/okdata_cli.egg-info/requires.txt

@@ -1,5 +1,5 @@
 PrettyTable
 docopt
-okdata-sdk<4,>=3.1
+okdata-sdk<4,>=3.1.1
 questionary<2.0.0,>=1.10.0
 requests

{okdata-cli-4.0.0 → okdata-cli-4.1.0}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
 
 setuptools.setup(
     name="okdata-cli",
-    version="4.0.0",
+    version="4.1.0",
     author="Oslo Origo",
     author_email="dataplattform@oslo.kommune.no",
     description="CLI for services provided by Oslo Origo",
@@ -25,7 +25,7 @@ setuptools.setup(
     install_requires=[
         "PrettyTable",
         "docopt",
-        "okdata-sdk>=3.1,<4",
+        "okdata-sdk>=3.1.1,<4",
         "questionary>=1.10.0,<2.0.0",
         "requests",
     ],