cognite-extractor-utils 7.5.10__py3-none-any.whl → 7.5.12__py3-none-any.whl

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/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/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/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.dist-info → cognite_extractor_utils-7.5.12.dist-info}/METADATA

@@ -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.dist-info → cognite_extractor_utils-7.5.12.dist-info}/RECORD

@@ -1,6 +1,6 @@
-cognite/extractorutils/__init__.py,sha256=PPeqjI1OnpB1kdKnuKjHukkj9BauAO6kJHugrm8GbH4,765
+cognite/extractorutils/__init__.py,sha256=_uW4et3n6Sh-nX8s8o8Okl7SK5Iicg6ZZOKBCWdEnhw,765
 cognite/extractorutils/_inner_util.py,sha256=ZMZIBwFpSD39RzLZq_OJlrFtVt8NFOtU4ObzAG8vTB4,1779
-cognite/extractorutils/base.py,sha256=-jkGgUMYKdhFReua8ZoGUQwT1qbOvg6nTrt0lyJOGVc,16354
+cognite/extractorutils/base.py,sha256=QeJJfufp13waxlUikptMNHeQLHpBY1TZ3lYsA_rO__E,16454
 cognite/extractorutils/exceptions.py,sha256=4qreRiTwZH9lyLIKR67TP02MUxN9oYhCd2vFTb5bRME,1125
 cognite/extractorutils/metrics.py,sha256=dBxtfJkTWcVbVpqM5VYmP4U3cO7iultz7k036Um4Tx0,15406
 cognite/extractorutils/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -21,7 +21,7 @@ cognite/extractorutils/unstable/__init__.py,sha256=L6nqJHjylpk67CE-PbXJyb_TBI4yj
 cognite/extractorutils/unstable/configuration/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cognite/extractorutils/unstable/configuration/exceptions.py,sha256=2-0jUp9IFwzk2QTQzWLoGgW1KOApk9UmPmLwtwRUBaE,591
 cognite/extractorutils/unstable/configuration/loaders.py,sha256=guBSVz7nd3dfsNEfPEHUUmU5WoYdPQmBBaJk2FuKXVw,3640
-cognite/extractorutils/unstable/configuration/models.py,sha256=vrwe53CZroujNVVpgQbmZEOywtR8PMJ0exi9gBjc5Gw,8160
+cognite/extractorutils/unstable/configuration/models.py,sha256=YYGXxSwct04J9A6NDlW0kpKHvlvtPxuLeMHgq5KwH-g,9567
 cognite/extractorutils/unstable/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cognite/extractorutils/unstable/core/_dto.py,sha256=tvvy39cvf-QT28GWz5FpqxQ5vAVk0t69JoPPhpWlweY,1293
 cognite/extractorutils/unstable/core/_messaging.py,sha256=D9rOW8fijryXffbm90d8VTf2vy5FmwVGU-H0O-cn-EI,68
@@ -42,9 +42,9 @@ cognite/extractorutils/uploader/data_modeling.py,sha256=h4uRnppU2dVBquJz0Uy2SKNy
 cognite/extractorutils/uploader/events.py,sha256=soU8TslPFIA7Ck4ATR_a7MHGitztRcn0cEt7LIbMPsE,5643
 cognite/extractorutils/uploader/files.py,sha256=ag3TUrImJdAUiOSXugagD03-9WGlFpIyd31z3WMJU20,27180
 cognite/extractorutils/uploader/raw.py,sha256=8duMk9uVJPK3O6C0nzwnvrl0UzBtJs_T_L1la0Vo89k,6713
-cognite/extractorutils/uploader/time_series.py,sha256=rs-jEChEZymxc98TYePpSRstPjQnDJd97vjOEYc-0-A,26568
+cognite/extractorutils/uploader/time_series.py,sha256=3HaKfWcSOTKFmB6VwpRwioOykkRa6qmruSSsZu8Njdk,26507
 cognite/extractorutils/uploader/upload_failure_handler.py,sha256=wbUSXUP26rbmK2NGdQMzcWQwNOh2sXYOnlj0A_sk1n8,2003
-cognite_extractor_utils-7.5.10.dist-info/METADATA,sha256=cSWsbtpDLUv9uUtC_9lLcuBwv1oBW_3XiDVIXXOSFyo,5280
-cognite_extractor_utils-7.5.10.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-cognite_extractor_utils-7.5.10.dist-info/licenses/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
-cognite_extractor_utils-7.5.10.dist-info/RECORD,,
+cognite_extractor_utils-7.5.12.dist-info/METADATA,sha256=R1sEQCVzrdz5z2MvinBnCI2ycWs_4FtsGofEEg-KC8g,4889
+cognite_extractor_utils-7.5.12.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+cognite_extractor_utils-7.5.12.dist-info/licenses/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
+cognite_extractor_utils-7.5.12.dist-info/RECORD,,