Merge pull request #247 from oslokommune/fix-env-and-binary-downloads

Fix binary downloads and `--env` for uploads

Author: simenheg

CHANGELOG.md

@@ -6,13 +6,16 @@
 * New commands `datasets delete-version`, `datasets delete-edition`, and
   `datasets delete-distribution` for deleting dataset versions, editions, and
   distributions respectively.
+* Fixed binary file downloads.
 * Streamlined output in the dataset listing commands.
 * New option `--verbose` for the `datasets ls` command which lists every
   relevant metadata field for the listed datasets.
 * New output format option for printing CSV: `--format=csv`.
 * Better error messages for status traces that never finish in `status --watch`.
-* Improved SIGPIPE handling so that `okdata` works better with tools
-  such as `head`.
+* Improved SIGPIPE handling so that `okdata` works better with tools such
+  as `head`.
+* Fixed handling of the `--env` parameter when uploading datasets (it would
+  previously be ignored).
 
 ## 4.4.0 - 2025-05-14
 

okdata/cli/commands/datasets/datasets.py

@@ -52,7 +52,6 @@ class DatasetsCommand(BaseCommand):
 
     def __init__(self):
         super().__init__(Dataset)
-        self.download = Download(env=self.opt("env"))
 
     def handler(self):
         self.log.info("DatasetsCommand.handle()")
@@ -389,7 +388,7 @@ def _dataset_components_from_uri(
         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})")
@@ -420,8 +419,9 @@ def upload_file(self, source, target):
         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}")

requirements.txt

@@ -8,33 +8,33 @@ attrs==25.3.0
     # via
     #   jsonschema
     #   referencing
-certifi==2025.6.15
+certifi==2025.8.3
     # via requests
 cffi==1.17.1
     # via cryptography
-charset-normalizer==3.4.2
+charset-normalizer==3.4.3
     # via requests
-cryptography==45.0.4
+cryptography==45.0.7
     # via jwcrypto
 deprecation==2.1.0
     # via python-keycloak
 docopt==0.6.2
     # via okdata-cli (setup.py)
 idna==3.10
     # via requests
-jsonschema==4.24.0
+jsonschema==4.25.1
     # via okdata-sdk
-jsonschema-specifications==2025.4.1
+jsonschema-specifications==2025.9.1
     # via jsonschema
 jwcrypto==1.5.6
     # via python-keycloak
-okdata-sdk==3.3.0
+okdata-sdk==3.4.0
     # via okdata-cli (setup.py)
 packaging==25.0
     # via deprecation
 prettytable==3.16.0
     # via okdata-cli (setup.py)
-prompt-toolkit==3.0.51
+prompt-toolkit==3.0.52
     # via questionary
 pycparser==2.22
     # via cffi
@@ -46,19 +46,19 @@ referencing==0.36.2
     # via
     #   jsonschema
     #   jsonschema-specifications
-requests==2.32.4
+requests==2.32.5
     # via
     #   okdata-cli (setup.py)
     #   okdata-sdk
     #   python-keycloak
     #   requests-toolbelt
 requests-toolbelt==1.0.0
     # via python-keycloak
-rpds-py==0.25.1
+rpds-py==0.27.1
     # via
     #   jsonschema
     #   referencing
-typing-extensions==4.14.0
+typing-extensions==4.15.0
     # via jwcrypto
 urllib3==2.5.0
     # via

setup.py

@@ -23,9 +23,9 @@
         ],
     },
     install_requires=[
-        "PrettyTable",
         "docopt",
-        "okdata-sdk>=3.3,<4",
+        "okdata-sdk>=3.4,<4",
+        "PrettyTable",
         "questionary>=1.10.0,<2.0.0",
         "requests",
     ],