From 4fd49a3cb7d9c0041973b66c930ecf489c591ff3 Mon Sep 17 00:00:00 2001 From: Einar Omang Date: Mon, 11 Nov 2024 10:05:26 +0100 Subject: [PATCH 1/2] Set file transfer timeout from cogniteclient --- cognite/extractorutils/uploader/files.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cognite/extractorutils/uploader/files.py b/cognite/extractorutils/uploader/files.py index 02f3cb87..7fb25d3a 100644 --- a/cognite/extractorutils/uploader/files.py +++ b/cognite/extractorutils/uploader/files.py @@ -230,7 +230,7 @@ def __init__( self._full_queue = threading.Condition() - self._httpx_client = Client(follow_redirects=True) + self._httpx_client = Client(follow_redirects=True, timeout=cdf_client.config.file_transfer_timeout) global _QUEUES, _QUEUES_LOCK with _QUEUES_LOCK: From 8ffeac2777772f874827c9b629c6e64eeb896956 Mon Sep 17 00:00:00 2001 From: Einar Omang Date: Mon, 11 Nov 2024 10:07:59 +0100 Subject: [PATCH 2/2] Bump version --- CHANGELOG.md | 6 ++++++ cognite/extractorutils/__init__.py | 2 +- pyproject.toml | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 79c0bf82..bf3f0272 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,12 @@ Changes are grouped as follows - `Fixed` for any bug fixes. - `Security` in case of vulnerabilities. +## 7.5.1 + +### Changed + + * The file upload queue will now use `file_transfer_timeout` from the passed `CogniteClient`. + ## 7.5.0 ### Added diff --git a/cognite/extractorutils/__init__.py b/cognite/extractorutils/__init__.py index 5332227d..23b08039 100644 --- a/cognite/extractorutils/__init__.py +++ b/cognite/extractorutils/__init__.py @@ -16,5 +16,5 @@ Cognite extractor utils is a Python package that simplifies the development of new extractors. """ -__version__ = "7.5.0" +__version__ = "7.5.1" from .base import Extractor diff --git a/pyproject.toml b/pyproject.toml index e7944b89..4ae30aee 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "cognite-extractor-utils" -version = "7.5.0" +version = "7.5.1" description = "Utilities for easier development of extractors for CDF" authors = ["Mathias Lohne "] license = "Apache-2.0"