cognite-extractor-utils 7.5.11__py3-none-any.whl → 7.5.13__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.11"
+__version__ = "7.5.13"
 from .base import Extractor
 
 __all__ = ["Extractor"]

cognite/extractorutils/base.py

@@ -22,7 +22,7 @@ from threading import Thread
 from types import TracebackType
 from typing import Any, Generic, TypeVar
 
-from dotenv import find_dotenv, load_dotenv
+from dotenv import load_dotenv
 
 from cognite.client import CogniteClient
 from cognite.client.data_classes import ExtractionPipeline, ExtractionPipelineRun
@@ -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,
                 )
             )
 
@@ -250,12 +252,11 @@ class Extractor(Generic[CustomConfigClass]):
 
         if str(os.getenv("COGNITE_FUNCTION_RUNTIME", False)).lower() != "true":
             # Environment Variables
-            env_file_path = find_dotenv(usecwd=True)
-            if env_file_path:
-                load_dotenv(dotenv_path=env_file_path, override=True)
-                dotenv_message = f"Successfully ingested environment variables from {env_file_path}"
+            env_file_found = load_dotenv(dotenv_path="./.env", override=True)
+            if env_file_found:
+                dotenv_message = "Successfully ingested environment variables from './.env'"
             else:
-                dotenv_message = "No .env file found"
+                dotenv_message = "No .env file found at {Path.cwd() / '.env'}"
         else:
             dotenv_message = "No .env file imported when using Cognite Functions"
 

cognite/extractorutils/configtools/loaders.py

@@ -69,7 +69,7 @@ class KeyVaultLoader:
         self.client: SecretClient | None = None
 
     def _init_client(self) -> None:
-        from dotenv import find_dotenv, load_dotenv
+        from dotenv import load_dotenv
 
         if not self.config:
             raise InvalidConfigError(
@@ -98,8 +98,10 @@ class KeyVaultLoader:
 
             _logger.info("Using Azure ClientSecret credentials to access KeyVault")
 
-            dotenv_path = find_dotenv(usecwd=True)
-            load_dotenv(dotenv_path=dotenv_path, override=True)
+            env_file_found = load_dotenv("./.env", override=True)
+
+            if not env_file_found:
+                _logger.info(f"Local environment file not found at {Path.cwd() / '.env'}")
 
             if all(param in self.config for param in auth_parameters):
                 tenant_id = os.path.expandvars(self.config.get("tenant-id", None))

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cognite-extractor-utils
-Version: 7.5.11
+Version: 7.5.13
 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.11.dist-info → cognite_extractor_utils-7.5.13.dist-info}/RECORD

@@ -1,6 +1,6 @@
-cognite/extractorutils/__init__.py,sha256=QMrJrW8mM_pXGYl31dhRBsnmCVY7HtLNYMUG_X-BvLw,765
+cognite/extractorutils/__init__.py,sha256=1tj9c-PWFN7i3jH6BuYbHEj0xM9tfxqJOF4W-c7GuYg,765
 cognite/extractorutils/_inner_util.py,sha256=ZMZIBwFpSD39RzLZq_OJlrFtVt8NFOtU4ObzAG8vTB4,1779
-cognite/extractorutils/base.py,sha256=-jkGgUMYKdhFReua8ZoGUQwT1qbOvg6nTrt0lyJOGVc,16354
+cognite/extractorutils/base.py,sha256=eGz3sHHsLJWgPYTVw8xJ-7PJUK7GCK8K61CMpU5R3WU,16414
 cognite/extractorutils/exceptions.py,sha256=4qreRiTwZH9lyLIKR67TP02MUxN9oYhCd2vFTb5bRME,1125
 cognite/extractorutils/metrics.py,sha256=dBxtfJkTWcVbVpqM5VYmP4U3cO7iultz7k036Um4Tx0,15406
 cognite/extractorutils/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -11,7 +11,7 @@ cognite/extractorutils/util.py,sha256=ZAx688yXV85xmWuAASlZ3e9yY5pvyR8H0r4rhnPdgF
 cognite/extractorutils/configtools/__init__.py,sha256=LSa7gVws_mrLCMRTKGs1zfiG6-IM0HzyOF6x0EfllSo,3616
 cognite/extractorutils/configtools/_util.py,sha256=VMxXXmPvNPf3Jjwknqm7i-Bp-z_ORN0DFKjBHgBsWA0,4773
 cognite/extractorutils/configtools/elements.py,sha256=chgcv7WSOb1zbHl1XU5dlsCSB7SDTY4NeKREYNeF9kE,26590
-cognite/extractorutils/configtools/loaders.py,sha256=a3LMwcuPCvuegxGzOrS3-mcnErd9R-oa0JRFEKhE5fs,18309
+cognite/extractorutils/configtools/loaders.py,sha256=Iqyn1i050j8vDa2Bb7yJgW2I-riXgdbdFpGX9TRLU84,18374
 cognite/extractorutils/configtools/validators.py,sha256=xug3GOMIO4NOdyyvXtYlpKyq9wuDtGf7-xqIefD5bIo,1016
 cognite/extractorutils/statestore/__init__.py,sha256=hV3r11FUXkH6-60Ct6zLSROMNVrEeiE3Shmkf28Q-co,359
 cognite/extractorutils/statestore/_base.py,sha256=mWdFk4EZl886V6uXRj4O2sv2_ANJ3Sigmgeql-XEsmc,2675
@@ -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.11.dist-info/METADATA,sha256=Ywvqxw4d9cEHRmAzbjjiNwdAmgb2FB2mxpo9XhLmGBE,5280
-cognite_extractor_utils-7.5.11.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-cognite_extractor_utils-7.5.11.dist-info/licenses/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
-cognite_extractor_utils-7.5.11.dist-info/RECORD,,
+cognite_extractor_utils-7.5.13.dist-info/METADATA,sha256=D2QVuO8G8mEmQ9tPMzhs062j4N8F4vkLQ3kPL3DWO4I,4889
+cognite_extractor_utils-7.5.13.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+cognite_extractor_utils-7.5.13.dist-info/licenses/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
+cognite_extractor_utils-7.5.13.dist-info/RECORD,,