okdata-cli 6.1.2__tar.gz → 7.0.0__tar.gz

{okdata_cli-6.1.2/okdata_cli.egg-info → okdata_cli-7.0.0}/PKG-INFO

@@ -1,24 +1,23 @@
 Metadata-Version: 2.4
 Name: okdata-cli
-Version: 6.1.2
-Summary: CLI for services provided by Oslo Origo
-Home-page: https://github.com/oslokommune/okdata-cli/
-Author: Oslo Origo
+Version: 7.0.0
+Summary: CLI access to public services for Oslo kommune
+Home-page: https://github.com/oslokommune/okdata-cli
+Author: Oslo kommune
 Author-email: dataspeilet@oslo.kommune.no
-License: MIT
+License-Expression: MIT
 Classifier: Development Status :: 5 - Production/Stable
-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: Programming Language :: Python :: 3.14
-Classifier: License :: OSI Approved :: MIT License
+Classifier: Programming Language :: Python :: 3.15
 Classifier: Operating System :: OS Independent
-Requires-Python: >=3.10
+Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: docopt
-Requires-Dist: okdata-sdk<5,>=4.1
+Requires-Dist: okdata-sdk<6,>=5
 Requires-Dist: PrettyTable
 Requires-Dist: questionary<2.0.0,>=1.10.0
 Requires-Dist: prompt-toolkit<3.0.52
@@ -29,19 +28,19 @@ Dynamic: classifier
 Dynamic: description
 Dynamic: description-content-type
 Dynamic: home-page
-Dynamic: license
 Dynamic: license-file
+Dynamic: license-expression
 Dynamic: requires-dist
 Dynamic: requires-python
 Dynamic: summary
 
-# `okdata-cli`: Oslo Origo data services CLI
+# `okdata-cli`: CLI access to public services for Oslo kommune
 
-Okdata CLI provides a unified interface to data services for Oslo Origo teams.
+Okdata CLI provides a unified interface for accessing public services for
+Oslo kommune.
 
 * [Install](doc/install.md)
 * [Configuration](doc/configuration.md)
 * [Public services](doc/pubs.md)
 * [Teams](doc/teams.md)
-* [Datasets](doc/datasets.md)
 * [Permissions](doc/permissions.md)

{okdata_cli-6.1.2 → okdata_cli-7.0.0}/README.md

@@ -1,10 +1,10 @@
-# `okdata-cli`: Oslo Origo data services CLI
+# `okdata-cli`: CLI access to public services for Oslo kommune
 
-Okdata CLI provides a unified interface to data services for Oslo Origo teams.
+Okdata CLI provides a unified interface for accessing public services for
+Oslo kommune.
 
 * [Install](doc/install.md)
 * [Configuration](doc/configuration.md)
 * [Public services](doc/pubs.md)
 * [Teams](doc/teams.md)
-* [Datasets](doc/datasets.md)
 * [Permissions](doc/permissions.md)

{okdata_cli-6.1.2 → okdata_cli-7.0.0}/okdata/cli/__main__.py

@@ -8,10 +8,8 @@ from requests.exceptions import ConnectTimeout, RequestException
 
 from okdata.cli import MAINTAINER
 from okdata.cli.command import BaseCommand
-from okdata.cli.commands.datasets import DatasetsCommand
 from okdata.cli.commands.permissions import PermissionsCommand
 from okdata.cli.commands.pubs import PubsCommand
-from okdata.cli.commands.status import StatusCommand
 from okdata.cli.commands.teams.teams import TeamsCommand
 
 
@@ -88,10 +86,8 @@ def main():
 
 def get_command_class(argv):
     commands = {
-        "datasets": DatasetsCommand,
         "permissions": PermissionsCommand,
         "pubs": PubsCommand,
-        "status": StatusCommand,
         "teams": TeamsCommand,
     }
     return commands.get(argv[1], False)

{okdata_cli-6.1.2 → okdata_cli-7.0.0}/okdata/cli/command.py

@@ -19,20 +19,16 @@ class BaseCommand:
     __doc__ = f"""okdata-cli {version}
 
 usage:
-  okdata datasets [options]
   okdata permissions [options]
   okdata pubs [options]
-  okdata status [options]
   okdata teams [options]
   okdata -e | --environment
   okdata -h | --help
   okdata -v | --version
 
 Commands available:
-  datasets
   permissions
   pubs
-  status
   teams
 
 Options:{BASE_COMMAND_OPTIONS}
@@ -70,14 +66,6 @@ Options:{BASE_COMMAND_OPTIONS}
     def opt(self, key):
         return self.args.get(f"--{key}", None)
 
-    def handle_input(self):
-        if self.cmd("-"):
-            content = sys.stdin.read()
-        else:
-            with open(self.arg("file")) as f:
-                content = f.read()
-        return content
-
     def print(self, str, payload=None):
         is_structured_data = self.opt("format") in ("csv", "json")
 

{okdata_cli-6.1.2 → okdata_cli-7.0.0}/okdata/cli/commands/permissions.py

@@ -17,14 +17,13 @@ Usage:
 
 Examples:
   okdata permissions ls
-  okdata permissions ls okdata:dataset:my-dataset
-  okdata permissions add okdata:dataset:my-dataset janedoe
-  okdata permissions add okdata:dataset:my-dataset janedoe okdata:dataset:read
-  okdata permissions rm okdata:dataset:my-dataset janedoe
-  okdata permissions rm okdata:dataset:my-dataset janedoe okdata:dataset:write
+  okdata permissions ls maskinporten:client:test-6970b743-5075-3f1a-3d35-ac84ea3dc79b
+  okdata permissions add maskinporten:client:test-6970b743-5075-3f1a-3d35-ac84ea3dc79b janedoe
+  okdata permissions add maskinporten:client:test-6970b743-5075-3f1a-3d35-ac84ea3dc79b janedoe maskinporten:client:read
+  okdata permissions rm maskinporten:client:test-6970b743-5075-3f1a-3d35-ac84ea3dc79b janedoe
+  okdata permissions rm maskinporten:client:test-6970b743-5075-3f1a-3d35-ac84ea3dc79b janedoe maskinporten:client:write
 
 Options:{BASE_COMMAND_OPTIONS}
-  --history
     """
 
     def __init__(self):

okdata_cli-7.0.0/okdata/cli/commands/validators.py

@@ -0,0 +1,59 @@
+import re
+from types import SimpleNamespace
+from urllib.parse import urlparse
+
+from questionary import Validator, ValidationError
+
+# Validators for questionary.
+#
+# We don't want to make these too complicated for now, but implement a base
+# validation to get content for the wizards. Questionary is only interested in
+# the `ValidationError`, so no return values are needed.
+
+
+class IntegrationValidator(Validator):
+    def validate(self, document):
+        if len(document.text) > 30:
+            raise ValidationError(
+                message="Too long!", cursor_position=len(document.text)
+            )
+        if not re.fullmatch("[0-9a-zA-ZæøåÆØÅ -]+", document.text):
+            raise ValidationError(
+                message='Only letters, numbers, spaces and "-", please',
+                cursor_position=len(document.text),
+            )
+
+
+class AWSAccountValidator(Validator):
+    def validate(self, document):
+        if not re.fullmatch("[0-9]{12}", document.text):
+            raise ValidationError(
+                message="12 digits, please", cursor_position=len(document.text)
+            )
+
+
+class URIValidator(Validator):
+    def validate(self, document):
+        parsed = urlparse(document.text)
+
+        if not (parsed.scheme and parsed.netloc):
+            raise ValidationError(
+                message="Please enter a valid URI, including scheme (e.g. https://...)",
+                cursor_position=len(document.text),
+            )
+
+
+class URIListValidator(Validator):
+    def validate(self, document):
+        uri_validator = URIValidator()
+        try:
+            for val in document.text.split(","):
+                uri_validator.validate(SimpleNamespace(text=val))
+        except ValidationError:
+            raise ValidationError(
+                message=(
+                    "Please enter a comma-separated list of URIs, including scheme "
+                    "(e.g. https://...)"
+                ),
+                cursor_position=len(document.text),
+            )

{okdata_cli-6.1.2 → okdata_cli-7.0.0/okdata_cli.egg-info}/PKG-INFO

@@ -1,24 +1,23 @@
 Metadata-Version: 2.4
 Name: okdata-cli
-Version: 6.1.2
-Summary: CLI for services provided by Oslo Origo
-Home-page: https://github.com/oslokommune/okdata-cli/
-Author: Oslo Origo
+Version: 7.0.0
+Summary: CLI access to public services for Oslo kommune
+Home-page: https://github.com/oslokommune/okdata-cli
+Author: Oslo kommune
 Author-email: dataspeilet@oslo.kommune.no
-License: MIT
+License-Expression: MIT
 Classifier: Development Status :: 5 - Production/Stable
-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: Programming Language :: Python :: 3.14
-Classifier: License :: OSI Approved :: MIT License
+Classifier: Programming Language :: Python :: 3.15
 Classifier: Operating System :: OS Independent
-Requires-Python: >=3.10
+Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: docopt
-Requires-Dist: okdata-sdk<5,>=4.1
+Requires-Dist: okdata-sdk<6,>=5
 Requires-Dist: PrettyTable
 Requires-Dist: questionary<2.0.0,>=1.10.0
 Requires-Dist: prompt-toolkit<3.0.52
@@ -29,19 +28,19 @@ Dynamic: classifier
 Dynamic: description
 Dynamic: description-content-type
 Dynamic: home-page
-Dynamic: license
 Dynamic: license-file
+Dynamic: license-expression
 Dynamic: requires-dist
 Dynamic: requires-python
 Dynamic: summary
 
-# `okdata-cli`: Oslo Origo data services CLI
+# `okdata-cli`: CLI access to public services for Oslo kommune
 
-Okdata CLI provides a unified interface to data services for Oslo Origo teams.
+Okdata CLI provides a unified interface for accessing public services for
+Oslo kommune.
 
 * [Install](doc/install.md)
 * [Configuration](doc/configuration.md)
 * [Public services](doc/pubs.md)
 * [Teams](doc/teams.md)
-* [Datasets](doc/datasets.md)
 * [Permissions](doc/permissions.md)

{okdata_cli-6.1.2 → okdata_cli-7.0.0}/okdata_cli.egg-info/SOURCES.txt

@@ -2,21 +2,14 @@ LICENSE
 README.md
 pyproject.toml
 setup.py
-okdata/__init__.py
 okdata/cli/__init__.py
 okdata/cli/__main__.py
 okdata/cli/command.py
-okdata/cli/io.py
 okdata/cli/output.py
 okdata/cli/commands/__init__.py
 okdata/cli/commands/permissions.py
-okdata/cli/commands/status.py
 okdata/cli/commands/validators.py
 okdata/cli/commands/wizard.py
-okdata/cli/commands/datasets/__init__.py
-okdata/cli/commands/datasets/datasets.py
-okdata/cli/commands/datasets/questions.py
-okdata/cli/commands/datasets/wizards.py
 okdata/cli/commands/pubs/__init__.py
 okdata/cli/commands/pubs/clients.py
 okdata/cli/commands/pubs/pubs.py
@@ -26,29 +19,17 @@ okdata/cli/commands/teams/questions.py
 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/data/output-format/datasets_dataset_version_config.json
-okdata/cli/data/output-format/datasets_dataset_version_edition_config.json
-okdata/cli/data/output-format/datasets_dataset_version_edition_distributions_config.json
-okdata/cli/data/output-format/datasets_dataset_versions_config.json
 okdata/cli/data/output-format/my_permissions_config.json
 okdata/cli/data/output-format/permissions_config.json
 okdata/cli/data/output-format/pubs_audit_log_config.json
 okdata/cli/data/output-format/pubs_clients_config.json
 okdata/cli/data/output-format/pubs_multiple_client_keys_config.json
 okdata/cli/data/output-format/pubs_single_client_keys_config.json
-okdata/cli/data/output-format/status_config.json
-okdata/cli/data/output-format/status_history_config.json
 okdata/cli/data/output-format/team_members_config.json
 okdata/cli/data/output-format/teams_config.json
 okdata_cli.egg-info/PKG-INFO
 okdata_cli.egg-info/SOURCES.txt
 okdata_cli.egg-info/dependency_links.txt
 okdata_cli.egg-info/entry_points.txt
-okdata_cli.egg-info/namespace_packages.txt
 okdata_cli.egg-info/requires.txt
 okdata_cli.egg-info/top_level.txt

{okdata_cli-6.1.2 → okdata_cli-7.0.0}/okdata_cli.egg-info/requires.txt

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

{okdata_cli-6.1.2 → okdata_cli-7.0.0}/pyproject.toml

@@ -1,5 +1,5 @@
 [tool.black]
-target-version = ['py38']
+target-version = ['py311']
 # Keep exclude in sync with flake8 config in tox.ini
 exclude = '''
 /(

{okdata_cli-6.1.2 → okdata_cli-7.0.0}/setup.py

@@ -5,26 +5,19 @@ with open("README.md", "r") as fh:
 
 setuptools.setup(
     name="okdata-cli",
-    version="6.1.2",
-    author="Oslo Origo",
+    version="7.0.0",
+    author="Oslo kommune",
     author_email="dataspeilet@oslo.kommune.no",
-    description="CLI for services provided by Oslo Origo",
-    license="MIT",
+    description="CLI access to public services for Oslo kommune",
     long_description=long_description,
     long_description_content_type="text/markdown",
-    url="https://github.com/oslokommune/okdata-cli/",
-    packages=setuptools.find_namespace_packages(
-        include="okdata.cli.*", exclude=["tests*"]
-    ),
-    namespace_packages=["okdata"],
-    package_data={
-        "okdata": [
-            "cli/data/output-format/*",
-        ],
-    },
+    url="https://github.com/oslokommune/okdata-cli",
+    license_expression="MIT",
+    packages=setuptools.find_namespace_packages(include=["okdata.*"]),
+    package_data={"okdata.cli": ["data/output-format/*"]},
     install_requires=[
         "docopt",
-        "okdata-sdk>=4.1,<5",
+        "okdata-sdk>=5,<6",
         "PrettyTable",
         # TODO: Upgrade to questionary 2.x.
         "questionary>=1.10.0,<2.0.0",
@@ -37,13 +30,12 @@ setuptools.setup(
     entry_points={"console_scripts": ["okdata=okdata.cli.__main__:main"]},
     classifiers=[
         "Development Status :: 5 - Production/Stable",
-        "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",
         "Programming Language :: Python :: 3.12",
         "Programming Language :: Python :: 3.13",
         "Programming Language :: Python :: 3.14",
-        "License :: OSI Approved :: MIT License",
+        "Programming Language :: Python :: 3.15",
         "Operating System :: OS Independent",
     ],
-    python_requires=">=3.10",
+    python_requires=">=3.11",
 )

okdata_cli-6.1.2/okdata/__init__.py

@@ -1 +0,0 @@
-__import__("pkg_resources").declare_namespace(__name__)

okdata_cli-6.1.2/okdata/cli/commands/datasets/__init__.py

@@ -1,3 +0,0 @@
-from .datasets import DatasetsCommand
-
-__all__ = ["DatasetsCommand"]