cognite-toolkit 0.7.65__tar.gz → 0.7.67__tar.gz

{cognite_toolkit-0.7.65 → cognite_toolkit-0.7.67}/PKG-INFO

@@ -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 → cognite_toolkit-0.7.67}/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-0.7.65 → cognite_toolkit-0.7.67}/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-0.7.65 → cognite_toolkit-0.7.67}/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-0.7.65 → cognite_toolkit-0.7.67}/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-0.7.65 → cognite_toolkit-0.7.67}/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-0.7.65 → cognite_toolkit-0.7.67}/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-0.7.65 → cognite_toolkit-0.7.67}/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-0.7.65 → cognite_toolkit-0.7.67}/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-0.7.67/cognite_toolkit/_version.py

@@ -0,0 +1 @@
+__version__ = "0.7.67"

{cognite_toolkit-0.7.65 → cognite_toolkit-0.7.67}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "cognite_toolkit"
-version = "0.7.65"
+version = "0.7.67"
 description = "Official Cognite Data Fusion tool for project templates and configuration deployment"
 authors = [
     {name ="Cognite AS", email="support@cognite.com"}

cognite_toolkit-0.7.65/cognite_toolkit/_version.py

@@ -1 +0,0 @@
-__version__ = "0.7.65"