cognite-toolkit 0.7.65__py3-none-any.whl → 0.7.67__py3-none-any.whl

cognite_toolkit/_cdf_tk/builders/_function.py

@@ -16,18 +16,15 @@ from cognite_toolkit._cdf_tk.exceptions import ToolkitFileExistsError, ToolkitNo
 from cognite_toolkit._cdf_tk.feature_flags import Flags
 from cognite_toolkit._cdf_tk.tk_warnings import (
     FileReadWarning,
-    FunctionRequirementsValidationWarning,
     HighSeverityWarning,
     LowSeverityWarning,
     MediumSeverityWarning,
+    RequirementsTXTValidationWarning,
     ToolkitWarning,
     WarningList,
 )
 from cognite_toolkit._cdf_tk.utils import validate_requirements_with_pip
 
-# Maximum number of error lines to display in warnings
-_MAX_ERROR_LINES = 3
-
 
 class FunctionBuilder(Builder):
     _resource_folder = FunctionCRUD.folder_name
@@ -46,7 +43,7 @@ class FunctionBuilder(Builder):
         raw_function: dict[str, Any],
         filepath: Path,
         external_id: str,
-    ) -> FunctionRequirementsValidationWarning | None:
+    ) -> RequirementsTXTValidationWarning | None:
         """Validate function requirements.txt using pip dry-run."""
         start_time = time.time()
         validation_result = validate_requirements_with_pip(
@@ -65,15 +62,12 @@ class FunctionBuilder(Builder):
         if validation_result.is_credential_error:
             self.validation_credential_errors += 1
 
-        error_detail = validation_result.error_message or "Unknown error"
-        relevant_lines = [line for line in error_detail.strip().split("\n") if line.strip()][-_MAX_ERROR_LINES:]
-        error_detail = "\n      ".join(relevant_lines)
-
-        return FunctionRequirementsValidationWarning(
+        return RequirementsTXTValidationWarning(
             filepath=filepath,
-            function_external_id=external_id,
-            error_details=error_detail,
+            external_id=external_id,
+            error_details=validation_result.short_error,
             is_credential_error=validation_result.is_credential_error,
+            resource="function",
         )
 
     def build(

cognite_toolkit/_cdf_tk/builders/_streamlit.py

@@ -9,13 +9,16 @@ from cognite_toolkit._cdf_tk.data_classes import (
     ModuleLocation,
 )
 from cognite_toolkit._cdf_tk.exceptions import ToolkitFileExistsError, ToolkitNotADirectoryError, ToolkitValueError
+from cognite_toolkit._cdf_tk.feature_flags import Flags
 from cognite_toolkit._cdf_tk.tk_warnings import (
     FileReadWarning,
     HighSeverityWarning,
+    RequirementsTXTValidationWarning,
     StreamlitRequirementsWarning,
     ToolkitWarning,
     WarningList,
 )
+from cognite_toolkit._cdf_tk.utils import validate_requirements_with_pip
 from cognite_toolkit._cdf_tk.utils.file import safe_read
 
 
@@ -77,6 +80,21 @@ class StreamlitBuilder(Builder):
                     f"StreamlitApp directory not found in {app_directory}(based on externalId {external_id} defined in {source_file.source.path.as_posix()!r}.)"
                 )
 
+            if (requirements_txt := app_directory / "requirements.txt").exists() and (
+                Flags.FUNCTION_REQUIREMENTS_VALIDATION.is_enabled()
+            ):
+                validation_result = validate_requirements_with_pip(requirements_txt_path=requirements_txt)
+                if not validation_result.success:
+                    warnings.append(
+                        RequirementsTXTValidationWarning(
+                            filepath=source_file.source.path,
+                            error_details=validation_result.short_error,
+                            is_credential_error=validation_result.is_credential_error,
+                            external_id=external_id,
+                            resource="streamlit",
+                        )
+                    )
+
             requirements_file_content = safe_read(app_directory / "requirements.txt").splitlines()
             missing_packages = StreamlitCRUD._missing_recommended_requirements(requirements_file_content)
             if len(missing_packages) > 0:

cognite_toolkit/_cdf_tk/tk_warnings/__init__.py

@@ -11,13 +11,13 @@ from .fileread import (
     EnvironmentVariableMissingWarning,
     FileExistsWarning,
     FileReadWarning,
-    FunctionRequirementsValidationWarning,
     MissingFileWarning,
     MissingReferencedWarning,
     MissingRequiredParameterWarning,
     NamespacingConventionWarning,
     NamingConventionWarning,
     PrefixConventionWarning,
+    RequirementsTXTValidationWarning,
     ResourceMissingIdentifierWarning,
     SourceFileModifiedWarning,
     StreamlitRequirementsWarning,
@@ -50,7 +50,6 @@ __all__ = [
     "EnvironmentVariableMissingWarning",
     "FileExistsWarning",
     "FileReadWarning",
-    "FunctionRequirementsValidationWarning",
     "GeneralWarning",
     "HTTPWarning",
     "HighSeverityWarning",
@@ -67,6 +66,7 @@ __all__ = [
     "NamespacingConventionWarning",
     "NamingConventionWarning",
     "PrefixConventionWarning",
+    "RequirementsTXTValidationWarning",
     "ResourceMissingIdentifierWarning",
     "SeverityLevel",
     "SourceFileModifiedWarning",

cognite_toolkit/_cdf_tk/tk_warnings/fileread.py

@@ -2,7 +2,7 @@ from abc import ABC, abstractmethod
 from collections.abc import Hashable
 from dataclasses import dataclass
 from pathlib import Path
-from typing import Any, ClassVar
+from typing import Any, ClassVar, Literal
 
 from rich.markup import escape
 
@@ -263,15 +263,16 @@ class StreamlitRequirementsWarning(FileReadWarning):
 
 
 @dataclass(frozen=True)
-class FunctionRequirementsValidationWarning(FileReadWarning):
+class RequirementsTXTValidationWarning(FileReadWarning):
     severity: ClassVar[SeverityLevel] = SeverityLevel.HIGH
-    function_external_id: str
+    external_id: str
     error_details: str
     is_credential_error: bool
+    resource: Literal["function", "streamlit"]
 
     def get_message(self) -> str:
         message = (
-            f"Function [bold]{self.function_external_id}[/bold] requirements.txt validation failed. "
+            f"{self.resource.title()} [bold]{self.external_id}[/bold] requirements.txt validation failed. "
             f"Packages could not be resolved: {self.error_details}"
         )
         if self.is_credential_error:

cognite_toolkit/_cdf_tk/utils/pip_validator.py

@@ -5,15 +5,14 @@ import sys
 from dataclasses import dataclass
 from pathlib import Path
 
-# Maximum number of error lines to include in warnings
-_MAX_ERROR_LINES = 3
-
 
 @dataclass
 class PipValidationResult:
     """Result from validating a requirements.txt file."""
 
     error_message: str | None = None
+    # The number of lines to include in the short error message
+    max_error_lines: int = 3
 
     @property
     def success(self) -> bool:
@@ -38,6 +37,14 @@ class PipValidationResult:
         ]
         return any(indicator in self.error_message for indicator in credential_indicators)
 
+    @property
+    def short_error(self) -> str:
+        """Get a shortened version of the error message with limited lines."""
+        error_detail = self.error_message or "Unknown error"
+        relevant_lines = [line for line in error_detail.strip().split("\n") if line.strip()][-self.max_error_lines :]
+        error_detail = "\n      ".join(relevant_lines)
+        return error_detail
+
 
 def validate_requirements_with_pip(
     requirements_txt_path: Path,

cognite_toolkit/_repo_files/GitHub/.github/workflows/deploy.yaml

@@ -12,7 +12,7 @@ jobs:
     environment: dev
     name: Deploy
     container:
-      image: cognite/toolkit:0.7.65
+      image: cognite/toolkit:0.7.67
       env:
         CDF_CLUSTER: ${{ vars.CDF_CLUSTER }}
         CDF_PROJECT: ${{ vars.CDF_PROJECT }}

cognite_toolkit/_repo_files/GitHub/.github/workflows/dry-run.yaml

@@ -10,7 +10,7 @@ jobs:
     environment: dev
     name: Deploy Dry Run
     container:
-      image: cognite/toolkit:0.7.65
+      image: cognite/toolkit:0.7.67
       env:
         CDF_CLUSTER: ${{ vars.CDF_CLUSTER }}
         CDF_PROJECT: ${{ vars.CDF_PROJECT }}

cognite_toolkit/_resources/cdf.toml

@@ -4,7 +4,7 @@ default_env = "<DEFAULT_ENV_PLACEHOLDER>"
 [modules]
 # This is the version of the modules. It should not be changed manually.
 # It will be updated by the 'cdf modules upgrade' command.
-version = "0.7.65"
+version = "0.7.67"
 
 
 [plugins]

cognite_toolkit/_version.py

@@ -1 +1 @@
-__version__ = "0.7.65"
+__version__ = "0.7.67"

{cognite_toolkit-0.7.65.dist-info → cognite_toolkit-0.7.67.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cognite_toolkit
-Version: 0.7.65
+Version: 0.7.67
 Summary: Official Cognite Data Fusion tool for project templates and configuration deployment
 Author: Cognite AS
 Author-email: Cognite AS <support@cognite.com>

{cognite_toolkit-0.7.65.dist-info → cognite_toolkit-0.7.67.dist-info}/RECORD

@@ -21,10 +21,10 @@ cognite_toolkit/_cdf_tk/builders/__init__.py,sha256=8073Ijf621XiAtiwup-rLfrbYd40
 cognite_toolkit/_cdf_tk/builders/_base.py,sha256=_4Gd6GtuAmnPvl3IjvuAUfuSQtEVJekUaqzk3IH-tIY,7462
 cognite_toolkit/_cdf_tk/builders/_datamodels.py,sha256=hN3fWQAktrWdaGAItZ0tHpBXqJDu0JfH6t7pO7EIl2Q,3541
 cognite_toolkit/_cdf_tk/builders/_file.py,sha256=ZRTlyb-MnmJhBhfPeQ9h7gM2T4nllyjonwYBj31cv1Q,3847
-cognite_toolkit/_cdf_tk/builders/_function.py,sha256=bCseIh19oDuw1gU2whJ8WFeHAZvL1J-0ilUt7TmYdPg,7908
+cognite_toolkit/_cdf_tk/builders/_function.py,sha256=jrXZPSck6GVguChl1kiWRTbrsiLWjyC5FupNDvAZWek,7614
 cognite_toolkit/_cdf_tk/builders/_location.py,sha256=Ix26T6JSlmp_Ij3iKaClbBQtRF3hR-wDKkZu9B-NblA,3968
 cognite_toolkit/_cdf_tk/builders/_raw.py,sha256=3XjPHfzPRYRJ2QPP-D8S9uW2gppnzEdqyICBqwGRRXo,3265
-cognite_toolkit/_cdf_tk/builders/_streamlit.py,sha256=8Pu_zgyKZjbAsPWywjzB2KWD7hQ2G6393xZbJWH2wtM,4033
+cognite_toolkit/_cdf_tk/builders/_streamlit.py,sha256=WsrQTaTwuyewNJ2y04tA16iEK-bpr0cL4sup9-89H6o,4996
 cognite_toolkit/_cdf_tk/builders/_transformation.py,sha256=STB42zhzOW5M_-b8cKOQ_cegnr7FtMoMxZ87gPLXft4,4723
 cognite_toolkit/_cdf_tk/cdf_toml.py,sha256=VSWV9h44HusWIaKpWgjrOMrc3hDoPTTXBXlp6-NOrIM,9079
 cognite_toolkit/_cdf_tk/client/__init__.py,sha256=a6rQXDGfW2g7K5WwrOW5oakh1TdFlBjUVjf9wusOox8,135
@@ -389,9 +389,9 @@ cognite_toolkit/_cdf_tk/storageio/selectors/_file_content.py,sha256=e7riknOinuhJ
 cognite_toolkit/_cdf_tk/storageio/selectors/_instances.py,sha256=NCFSJrAw52bNX6UTfOali8PvNjlqHnvxzL0hYBr7ZmA,4934
 cognite_toolkit/_cdf_tk/storageio/selectors/_raw.py,sha256=sZq9C4G9DMe3S46_usKet0FphQ6ow7cWM_PfXrEAakk,503
 cognite_toolkit/_cdf_tk/storageio/selectors/_three_d.py,sha256=0dT1vVG6EIyo0OJK3t_vwtE63i0dZvH8nZT7ebl1Ku0,924
-cognite_toolkit/_cdf_tk/tk_warnings/__init__.py,sha256=9ARP8aWrnRieqsK34-Bg17L9MTaHomvbJMgtrmpd3xg,2360
+cognite_toolkit/_cdf_tk/tk_warnings/__init__.py,sha256=WFxtoT3FodaXjhA5PCEy4mXNvcycYfnZtWKJcIpyTo8,2350
 cognite_toolkit/_cdf_tk/tk_warnings/base.py,sha256=cX8TCmb56gqx3lc7dankXuqpm5HGASJ4wTb07-MCJWs,4401
-cognite_toolkit/_cdf_tk/tk_warnings/fileread.py,sha256=ChcimOe8hTpAPtbpRvdAcjuW8WFfndyKl3mMPCeAfIc,9479
+cognite_toolkit/_cdf_tk/tk_warnings/fileread.py,sha256=RB-3ltSJjbL1GqQAJOvqXDZYdObjpV8QM3TWDsVWyUE,9527
 cognite_toolkit/_cdf_tk/tk_warnings/other.py,sha256=D8EubXyW4qigscBEiedQJuT5c6yYoFIEhBPa1DggD3I,5808
 cognite_toolkit/_cdf_tk/tracker.py,sha256=jhxzI8LOSZw3zDBPsTLW3zC2YcQK2abp_aVtRKcUIwE,5913
 cognite_toolkit/_cdf_tk/utils/__init__.py,sha256=DGuPTiY3fRhPuR_r-bCT_bDKl46nvF3q2ZY-yt2okT8,1640
@@ -415,7 +415,7 @@ cognite_toolkit/_cdf_tk/utils/graphql_parser.py,sha256=2i2wDjg_Uw3hJ-pHtPK8hczIu
 cognite_toolkit/_cdf_tk/utils/hashing.py,sha256=3NyNfljyYNTqAyAFBd6XlyWaj43jRzENxIuPdOY6nqo,2116
 cognite_toolkit/_cdf_tk/utils/interactive_select.py,sha256=G8UqFMzxOOImMwHfCvXEe-nTTqay9PYCwbpyIQae_XU,38000
 cognite_toolkit/_cdf_tk/utils/modules.py,sha256=zI0Qv1WSZRj3B58TwItnXwEtahwpRpDXU3GHew3Qffs,6216
-cognite_toolkit/_cdf_tk/utils/pip_validator.py,sha256=dzizb6-U0bee4ismqrvccUq_K2ASKY0xk40RbDzorEg,3231
+cognite_toolkit/_cdf_tk/utils/pip_validator.py,sha256=G_idBJak_ZeYW_gJ_tX_KuW6zUPk3asvXmSCDW4yXpY,3637
 cognite_toolkit/_cdf_tk/utils/producer_worker.py,sha256=1l77HIehkq1ARCBH6SlZ_V-jd6QKijYKeWetcUmAXg0,14216
 cognite_toolkit/_cdf_tk/utils/progress_tracker.py,sha256=LGpC22iSTTlo6FWi38kqBu_E4XouTvZU_N953WAzZWA,3865
 cognite_toolkit/_cdf_tk/utils/repository.py,sha256=voQLZ6NiNvdAFxqeWHbvzDLsLHl6spjQBihiLyCsGW8,4104
@@ -432,13 +432,13 @@ cognite_toolkit/_repo_files/.gitignore,sha256=ip9kf9tcC5OguF4YF4JFEApnKYw0nG0vPi
 cognite_toolkit/_repo_files/AzureDevOps/.devops/README.md,sha256=OLA0D7yCX2tACpzvkA0IfkgQ4_swSd-OlJ1tYcTBpsA,240
 cognite_toolkit/_repo_files/AzureDevOps/.devops/deploy-pipeline.yml,sha256=brULcs8joAeBC_w_aoWjDDUHs3JheLMIR9ajPUK96nc,693
 cognite_toolkit/_repo_files/AzureDevOps/.devops/dry-run-pipeline.yml,sha256=OBFDhFWK1mlT4Dc6mDUE2Es834l8sAlYG50-5RxRtHk,723
-cognite_toolkit/_repo_files/GitHub/.github/workflows/deploy.yaml,sha256=pj1SKKdnFTuMldcuQzmIldJmmCYPnvCzXhBigQHM964,667
-cognite_toolkit/_repo_files/GitHub/.github/workflows/dry-run.yaml,sha256=ltkZRh4cTxk7wIoteM7q5mWkTo_XGQZ9lbI4Iso4Erw,2430
-cognite_toolkit/_resources/cdf.toml,sha256=emYi7rsbTlocjPTaqSOTB-18gvMktXk25iHuDRTf-4Y,475
-cognite_toolkit/_version.py,sha256=sfCL-G27Jd4PewT4t9p1rAKnVr6KpnFv-mE259TcpVo,23
+cognite_toolkit/_repo_files/GitHub/.github/workflows/deploy.yaml,sha256=OzBuP0sp7JixWL57-StqnxsXeN2Al3ZH5LcLlraVdDk,667
+cognite_toolkit/_repo_files/GitHub/.github/workflows/dry-run.yaml,sha256=gZdzAEZbnnfCkMb6DhAXhASi9kUPRiR2cmAWLRWDCAc,2430
+cognite_toolkit/_resources/cdf.toml,sha256=B40qurHUV7ET4JubkM5ZLRk-emswHfStnjGy0N4ZvDU,475
+cognite_toolkit/_version.py,sha256=AxDWL8nhh5RQU-tQ4JfyPltEOL3goFUtwmFVU4L7qUw,23
 cognite_toolkit/demo/__init__.py,sha256=-m1JoUiwRhNCL18eJ6t7fZOL7RPfowhCuqhYFtLgrss,72
 cognite_toolkit/demo/_base.py,sha256=6xKBUQpXZXGQ3fJ5f7nj7oT0s2n7OTAGIa17ZlKHZ5U,8052
-cognite_toolkit-0.7.65.dist-info/WHEEL,sha256=fAguSjoiATBe7TNBkJwOjyL1Tt4wwiaQGtNtjRPNMQA,80
-cognite_toolkit-0.7.65.dist-info/entry_points.txt,sha256=EtZ17K2mUjh-AY0QNU1CPIB_aDSSOdmtNI_4Fj967mA,84
-cognite_toolkit-0.7.65.dist-info/METADATA,sha256=cbuwqU3adyVYczckvZzP8j4-1w-MAZ3KU7yUnv9voB0,5026
-cognite_toolkit-0.7.65.dist-info/RECORD,,
+cognite_toolkit-0.7.67.dist-info/WHEEL,sha256=fAguSjoiATBe7TNBkJwOjyL1Tt4wwiaQGtNtjRPNMQA,80
+cognite_toolkit-0.7.67.dist-info/entry_points.txt,sha256=EtZ17K2mUjh-AY0QNU1CPIB_aDSSOdmtNI_4Fj967mA,84
+cognite_toolkit-0.7.67.dist-info/METADATA,sha256=6DhbtJtbdi7JzhNxFfFJYBINiJPgXDJ29R7ngXoB0RA,5026
+cognite_toolkit-0.7.67.dist-info/RECORD,,