cognite-extractor-utils 7.5.10__tar.gz → 7.5.12__tar.gz

{cognite_extractor_utils-7.5.10 → cognite_extractor_utils-7.5.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cognite-extractor-utils
-Version: 7.5.10
+Version: 7.5.12
 Summary: Utilities for easier development of extractors for CDF
 Project-URL: repository, https://github.com/cognitedata/python-extractor-utils
 Author-email: Mathias Lohne <mathias.lohne@cognite.com>
@@ -72,15 +72,6 @@ project, and then set up a poetry environment, git repository, commit hooks with
 template.
 
 
-### Extensions
-
-Some source systems have a lot in common, such as RESTful APIs or systems exposing as MQTT. We therefore have extensions
-to `extractor-utils` tailroed to these protocols. These can be found in separate packages:
-
- * [REST extension](https://github.com/cognitedata/python-extractor-utils-rest)
- * [MQTT extension](https://github.com/cognitedata/python-extractor-utils-mqtt)
-
-
 ## Contributing
 
 The package is open source under the [Apache 2.0 license](./LICENSE), and contribtuions are welcome.

{cognite_extractor_utils-7.5.10 → cognite_extractor_utils-7.5.12}/README.md

@@ -39,15 +39,6 @@ project, and then set up a poetry environment, git repository, commit hooks with
 template.
 
 
-### Extensions
-
-Some source systems have a lot in common, such as RESTful APIs or systems exposing as MQTT. We therefore have extensions
-to `extractor-utils` tailroed to these protocols. These can be found in separate packages:
-
- * [REST extension](https://github.com/cognitedata/python-extractor-utils-rest)
- * [MQTT extension](https://github.com/cognitedata/python-extractor-utils-mqtt)
-
-
 ## Contributing
 
 The package is open source under the [Apache 2.0 license](./LICENSE), and contribtuions are welcome.

{cognite_extractor_utils-7.5.10 → cognite_extractor_utils-7.5.12}/cognite/extractorutils/__init__.py

@@ -16,7 +16,7 @@
 Cognite extractor utils is a Python package that simplifies the development of new extractors.
 """
 
-__version__ = "7.5.10"
+__version__ = "7.5.12"
 from .base import Extractor
 
 __all__ = ["Extractor"]

{cognite_extractor_utils-7.5.10 → cognite_extractor_utils-7.5.12}/cognite/extractorutils/base.py

@@ -90,6 +90,7 @@ class Extractor(Generic[CustomConfigClass]):
         handle_interrupts: bool = True,
         reload_config_interval: int | None = 300,
         reload_config_action: ReloadConfigAction = ReloadConfigAction.DO_NOTHING,
+        success_message: str = "Successful shutdown",
     ):
         self.name = name
         self.description = description
@@ -104,6 +105,7 @@ class Extractor(Generic[CustomConfigClass]):
         self.handle_interrupts = handle_interrupts
         self.reload_config_interval = reload_config_interval
         self.reload_config_action = reload_config_action
+        self.success_message = success_message
 
         self.started = False
         self.configured_logger = False
@@ -218,7 +220,7 @@ class Extractor(Generic[CustomConfigClass]):
                 ExtractionPipelineRun(
                     extpipe_external_id=self.extraction_pipeline.external_id,
                     status="success",
-                    message="Successful shutdown",
+                    message=self.success_message,
                 )
             )
 

{cognite_extractor_utils-7.5.10 → cognite_extractor_utils-7.5.12}/cognite/extractorutils/unstable/configuration/models.py

@@ -1,3 +1,4 @@
+import os
 import re
 from datetime import timedelta
 from enum import Enum
@@ -215,6 +216,36 @@ class ConnectionConfig(ConfigModel):
 
         return CogniteClient(client_config)
 
+    @classmethod
+    def from_environment(cls) -> "ConnectionConfig":
+        auth: AuthenticationConfig
+        if "COGNITE_CLIENT_SECRET" in os.environ:
+            auth = _ClientCredentialsConfig(
+                type="client-credentials",
+                client_id=os.environ["COGNITE_CLIENT_ID"],
+                client_secret=os.environ["COGNITE_CLIENT_SECRET"],
+                token_url=os.environ["COGNITE_TOKEN_URL"],
+                scopes=os.environ["COGNITE_TOKEN_SCOPES"].split(","),
+            )
+        elif "COGNITE_CLIENT_CERTIFICATE_PATH" in os.environ:
+            auth = _ClientCertificateConfig(
+                type="client-certificate",
+                client_id=os.environ["COGNITE_CLIENT_ID"],
+                path=Path(os.environ["COGNITE_CLIENT_CERTIFICATE_PATH"]),
+                password=os.environ.get("COGNITE_CLIENT_CERTIFICATE_PATH"),
+                authority_url=os.environ["COGNITE_AUTHORITY_URL"],
+                scopes=os.environ["COGNITE_TOKEN_SCOPES"].split(","),
+            )
+        else:
+            raise KeyError("Missing auth, either COGNITE_CLIENT_SECRET or COGNITE_CLIENT_CERTIFICATE_PATH must be set")
+
+        return ConnectionConfig(
+            project=os.environ["COGNITE_PROJECT"],
+            base_url=os.environ["COGNITE_BASE_URL"],
+            integration=os.environ["COGNITE_INTEGRATION"],
+            authentication=auth,
+        )
+
 
 class CronConfig(ConfigModel):
     type: Literal["cron"]

{cognite_extractor_utils-7.5.10 → cognite_extractor_utils-7.5.12}/cognite/extractorutils/uploader/time_series.py

@@ -72,7 +72,7 @@ def default_time_series_factory(external_id: str, datapoints: DataPointList) ->
         A TimeSeries object with external_id set, and the is_string automatically detected
     """
     is_string = (
-        isinstance(datapoints[0].get("value"), str)  # type: ignore  # input might be dict to keep compatibility
+        isinstance(datapoints[0].get("value"), str)
         if isinstance(datapoints[0], dict)
         else isinstance(datapoints[0][1], str)
     )

{cognite_extractor_utils-7.5.10 → cognite_extractor_utils-7.5.12}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "cognite-extractor-utils"
-version = "7.5.10"
+version = "7.5.12"
 description = "Utilities for easier development of extractors for CDF"
 authors = [
     {name = "Mathias Lohne", email = "mathias.lohne@cognite.com"}