crunch-cli 12.0.2__tar.gz → 12.1.0__tar.gz

{crunch_cli-12.0.2 → crunch_cli-12.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: crunch-cli
-Version: 12.0.2
+Version: 12.1.0
 Summary: crunch-cli - CLI of the CrunchDAO Platform
 Home-page: https://github.com/crunchdao/crunch-cli
 Author: Enzo CACERES
@@ -11,7 +11,7 @@ Classifier: Programming Language :: Python :: 3.7
 Requires-Python: >=3
 Description-Content-Type: text/markdown
 Requires-Dist: click
-Requires-Dist: crunch-convert>=0.10.1
+Requires-Dist: crunch-convert>=0.12.1
 Requires-Dist: crunch-encrypt
 Requires-Dist: coloredlogs
 Requires-Dist: dataclasses_json

{crunch_cli-12.0.2 → crunch_cli-12.1.0}/crunch/__version__.py

@@ -1,6 +1,6 @@
 __title__ = 'crunch-cli'
 __description__ = 'crunch-cli - CLI of the CrunchDAO Platform'
-__version__ = '12.0.2'
+__version__ = '12.1.0'
 __author__ = 'Enzo CACERES'
 __author_email__ = 'enzo.caceres@crunchdao.com'
 __url__ = 'https://github.com/crunchdao/crunch-cli'

{crunch_cli-12.0.2 → crunch_cli-12.1.0}/crunch/api/__init__.py

@@ -55,6 +55,7 @@ from crunch.api._errors import EncryptedSubmissionException as EncryptedSubmissi
 from crunch.api._errors import ForbiddenLibraryException as ForbiddenLibraryException
 from crunch.api._errors import InternalServerException as InternalServerException
 from crunch.api._errors import InvalidProjectTokenException as InvalidProjectTokenException
+from crunch.api._errors import InvalidRunTokenException as InvalidRunTokenException
 from crunch.api._errors import LatestRoundNotFoundException as LatestRoundNotFoundException
 from crunch.api._errors import LeaderboardNotFoundException as LeaderboardNotFoundException
 from crunch.api._errors import MissingPhaseDataException as MissingPhaseDataException

{crunch_cli-12.0.2 → crunch_cli-12.1.0}/crunch/api/_errors.py

@@ -1,7 +1,10 @@
 import json
 import sys
+from dataclasses import dataclass
 from typing import Any, Dict, List, Optional, Union
 
+from dataclasses_json import DataClassJsonMixin
+
 from crunch.api._domain.phase import PhaseType
 from crunch.api._domain.project import ProjectTokenType
 from crunch.external.humanfriendly import format_size
@@ -38,9 +41,6 @@ class ApiException(Exception):
 
 class InternalServerException(ApiException):
 
-    def __init__(self, message: str):
-        super().__init__(message)
-
     def print_helper(
         self,
         **kwargs: Any,
@@ -97,9 +97,6 @@ class ValidationFailedException(ApiException):
 
 class CheckException(ApiException):
 
-    def __init__(self, message: str):
-        super().__init__(message)
-
     def print_helper(
         self,
         **kwargs: Any,
@@ -180,12 +177,6 @@ class CrunchNotPublishedException(ApiException):
 
 class CurrentPhaseNotFoundException(ApiException):
 
-    def __init__(
-        self,
-        message: str
-    ):
-        super().__init__(message)
-
     def print_helper(
         self,
         **kwargs: Any,
@@ -219,16 +210,25 @@ class DailySubmissionLimitExceededException(ApiException):
         _print_contact("you should get more")
 
 
+@dataclass
+class ForbiddenRequirement(DataClassJsonMixin):
+    name: str
+    language: str
+
+
 class ForbiddenLibraryException(ApiException):
 
     def __init__(
         self,
         message: str,
-        packages: List[str]
+        requirements: List[dict[str, Any]]
     ):
         super().__init__(message)
 
-        self.packages = packages
+        self.requirements = [
+            ForbiddenRequirement.from_dict(item)  # pyright: ignore[reportUnknownMemberType]
+            for item in requirements
+        ]
 
     def print_helper(
         self,
@@ -245,16 +245,29 @@ class ForbiddenLibraryException(ApiException):
         client = Client.from_env()
 
         print("\nProblematic packages:")
-        for package in self.packages:
-            print(f"- {package}")
+        for requirement in self.requirements:
+            print(f"- {requirement.name}")
 
             if competition_name is not None:
-                url = client.format_web_url(f'/competitions/{competition_name}/resources/whitelisted-libraries?requestName={package}')
+                request_language_param = "&requestLanguage={requirement.language}" if requirement.language != "PYTHON" else ""
+                url = client.format_web_url(f'/competitions/{competition_name}/resources/whitelisted-libraries?requestName={requirement.name}{request_language_param}')
                 print(f"  >> Request to whitelist: {url}")
 
         _print_contact("the package should be allowed")
 
 
+class RequirementParseError(ApiException):
+
+    def print_helper(
+        self,
+        **kwargs: Any,
+    ) -> None:
+        print("There was an error while trying to parse your requirements file:")
+
+        for line in str(self.message).splitlines():
+            print(f"  {line}")
+
+
 class InvalidProjectTokenException(ApiException):
 
     def __init__(
@@ -353,9 +366,6 @@ class ModelTooBigException(ApiException):
 
 class NeverSubmittedException(ApiException):
 
-    def __init__(self, message: str):
-        super().__init__(message)
-
     def print_helper(
         self,
         **kwargs: Any,
@@ -365,9 +375,6 @@ class NeverSubmittedException(ApiException):
 
 class EncryptedSubmissionException(ApiException):
 
-    def __init__(self, message: str):
-        super().__init__(message)
-
     def print_helper(
         self,
         **kwargs: Any,
@@ -377,12 +384,6 @@ class EncryptedSubmissionException(ApiException):
 
 class PredictionSubmissionNotAllowedException(ApiException):
 
-    def __init__(
-        self,
-        message: str,
-    ):
-        super().__init__(message)
-
     def print_helper(
         self,
         **kwargs: Any,
@@ -707,6 +708,18 @@ LatestRoundNotFoundException = RoundNotFoundException
 NextRoundNotFoundException = RoundNotFoundException
 
 
+class InvalidRunTokenException(ApiException):
+
+    def __init__(
+        self,
+        message: str,
+        run_id: int,
+    ):
+        super().__init__(message)
+
+        self.run_id = run_id
+
+
 def convert_error(
     response: Dict[str, Any]
 ):

{crunch_cli-12.0.2 → crunch_cli-12.1.0}/crunch/command/push.py

@@ -245,10 +245,14 @@ def _upload_files(
         with open(path, "r") as fd:
             original_requirements_file = fd.read()
 
-        requirements = requirements_txt.parse_from_file(
-            language=language,
-            file_content=original_requirements_file,
-        )
+        try:
+            requirements = requirements_txt.parse_from_file(
+                language=language,
+                file_content=original_requirements_file,
+            )
+        except requirements_txt.RequirementParseError as error:
+            print(f"{language.txt_file_name}: {error}")
+            raise click.Abort()
 
         whitelist = requirements_txt.CachedWhitelist(
             requirements_txt.CrunchHubWhitelist(

{crunch_cli-12.0.2 → crunch_cli-12.1.0}/crunch/library.py

@@ -5,9 +5,10 @@ from collections import defaultdict
 from types import ModuleType
 from typing import Any, Dict, List, NamedTuple, Optional, Set, overload
 
+import click
 from crunch_convert import RequirementLanguage
 from crunch_convert.notebook import BadCellHandling, extract_from_cells
-from crunch_convert.requirements_txt import CachedWhitelist, CrunchHubWhitelist, MultipleLibraryAliasCandidateException, Whitelist, parse_from_file
+from crunch_convert.requirements_txt import CachedWhitelist, CrunchHubWhitelist, MultipleLibraryAliasCandidateException, RequirementParseError, Whitelist, parse_from_file
 
 import crunch.store as store
 from crunch.api import Client
@@ -37,16 +38,22 @@ def extract_from_requirements(
         return set()
 
     with open(file_path, "r") as fd:
+        file_content = fd.read()
+
+    try:
         requirements = parse_from_file(
             language=language,
-            file_content=fd.read(),
+            file_content=file_content,
         )
+    except RequirementParseError as error:
+        print(f"{language.txt_file_name}: {error}")
+        raise click.Abort()
 
-        return {
-            requirement.name
-            for requirement in requirements
-            if requirement.language == language
-        }
+    return {
+        requirement.name
+        for requirement in requirements
+        if requirement.language == language
+    }
 
 
 def extract_from_notebook_modules(

{crunch_cli-12.0.2 → crunch_cli-12.1.0}/crunch/runner/cloud.py

@@ -18,12 +18,12 @@ import requests
 
 import crunch.store as store
 import requirements as requirements_parser
-from crunch.api import Client, Competition, Language, ModelTooBigException, PhaseType, PredictionTooBigException, RunnerRun, Upload
+from crunch.api import Client, Competition, InvalidRunTokenException, Language, ModelTooBigException, PhaseType, PredictionTooBigException, RunnerRun, Upload
 from crunch.downloader import prepare_all, save_all
 from crunch.runner.runner import Runner
 from crunch.runner.tracing import GpuPresence, RemoteTraceExporter, RunnerTracer, to_execute_span_attributes
 from crunch.runner.types import KwargsLike
-from crunch.runner.unstructured import RunnerContext
+from crunch.runner.unstructured import DEFAULT_LOG_LIMITS, RunnerContext
 from crunch.unstructured import LocalCodeLoader, RunnerModule, deduce_code_loader
 from crunch.utils import download
 
@@ -166,8 +166,12 @@ class CloudRunner(Runner):
 
         self._download_runner()
 
-        code_file_urls = self.run.code
-        model_file_urls = self.run.model
+        try:
+            code_file_urls = self.run.code
+            model_file_urls = self.run.model
+        except InvalidRunTokenException:
+            self.log("invalid run token", error=True)
+            exit(1)
 
         if "install r requirements":
             requirements_r_txt_name = "requirements.r.txt"
@@ -597,6 +601,8 @@ class CloudRunner(Runner):
         command: str,
         parameters: KwargsLike = {},
         install_data_fuse: bool = True,
+        prefix_head: int = DEFAULT_LOG_LIMITS[0],
+        prefix_tail: int = DEFAULT_LOG_LIMITS[1],
     ) -> None:
         (
             trace_file_path,
@@ -671,7 +677,7 @@ class CloudRunner(Runner):
                 "--chown-directory", self.model_directory_path,
                 "--filter-non-unix-socket-syscall",
                 "--",
-                "prefix", "user-code",
+                "prefix", f"--head={prefix_head}", f"--tail={prefix_tail}", "user-code",
                 "--",
                 "python3", "-u",
                 "-m", "crunch", "runner", "cloud-executor",
@@ -966,6 +972,7 @@ class CloudRunnerContext(RunnerContext):
         span_hidden_parameters: Optional[List[str]] = None,
         span_attributes: Optional[KwargsLike] = None,
         install_data_fuse: bool = True,
+        log_limits: Tuple[int, int] = DEFAULT_LOG_LIMITS,
     ) -> None:
         self.log(f"executing - command={command}")
 
@@ -976,4 +983,6 @@ class CloudRunnerContext(RunnerContext):
                 command,
                 parameters=parameters or {},
                 install_data_fuse=install_data_fuse,
+                prefix_head=log_limits[0],
+                prefix_tail=log_limits[1],
             )

{crunch_cli-12.0.2 → crunch_cli-12.1.0}/crunch/runner/local.py

@@ -1,7 +1,7 @@
 import logging
 import os
 import time
-from typing import Any, List, Literal, Optional
+from typing import Any, List, Literal, Optional, Tuple
 
 import click
 
@@ -214,7 +214,8 @@ class LocalRunnerContext(RunnerContext):
         trace: bool = True,
         span_hidden_parameters: Optional[List[str]] = None,
         span_attributes: Optional[KwargsLike] = None,
-        install_data_fuse: bool = True,
+        install_data_fuse: bool = True,  # unavailable locally
+        log_limits: Tuple[int, int] = (0, 0),  # unavailable locally
     ) -> None:
         self.log(f"executing - command={command}")
 

{crunch_cli-12.0.2 → crunch_cli-12.1.0}/crunch/runner/unstructured.py

@@ -1,10 +1,12 @@
 from abc import ABC, abstractmethod
 from datetime import datetime, timedelta
 from types import ModuleType
-from typing import Any, Callable, List, Literal, Optional
+from typing import Any, Callable, List, Literal, Optional, Tuple
 
 from crunch.runner.types import KwargsLike
 
+DEFAULT_LOG_LIMITS: Tuple[int, int] = (1000, 500)
+
 
 class RunnerContext(ABC):
 
@@ -102,6 +104,7 @@ class RunnerContext(ABC):
         span_hidden_parameters: Optional[List[str]] = None,
         span_attributes: Optional[KwargsLike] = None,
         install_data_fuse: bool = True,
+        log_limits: Tuple[int, int] = DEFAULT_LOG_LIMITS,
     ) -> None:
         """
         Execute a command.
@@ -113,6 +116,7 @@ class RunnerContext(ABC):
             span_hidden_parameters (Optional[List[str]]): The parameters to hide from the span (e.g., contain useless information).
             span_attributes (Optional[KwargsLike]): Additional attributes to merge with the span's attributes.
             install_data_fuse (bool): Whether to temporarily allow data access, which is only restricted after the data fuse is tripped. If disabled, no data access is ever permitted and triggering the fuse has no effect.
+            log_limits (Tuple[int, int]): The logging output limits are as follows: the first limit is the number of lines as the head and the second limit is the number of lines as the tail. Everything in between will be lost. This is only used in a cloud environment.
 
         Returns:
             None: This function does not return anything.
@@ -136,6 +140,7 @@ class RunnerExecutorContext(ABC):
 
 _sentinel = object()
 
+
 class UserModule(ABC):
 
     def get_function(

{crunch_cli-12.0.2 → crunch_cli-12.1.0}/crunch_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: crunch-cli
-Version: 12.0.2
+Version: 12.1.0
 Summary: crunch-cli - CLI of the CrunchDAO Platform
 Home-page: https://github.com/crunchdao/crunch-cli
 Author: Enzo CACERES
@@ -11,7 +11,7 @@ Classifier: Programming Language :: Python :: 3.7
 Requires-Python: >=3
 Description-Content-Type: text/markdown
 Requires-Dist: click
-Requires-Dist: crunch-convert>=0.10.1
+Requires-Dist: crunch-convert>=0.12.1
 Requires-Dist: crunch-encrypt
 Requires-Dist: coloredlogs
 Requires-Dist: dataclasses_json

{crunch_cli-12.0.2 → crunch_cli-12.1.0}/crunch_cli.egg-info/requires.txt

@@ -1,5 +1,5 @@
 click
-crunch-convert>=0.10.1
+crunch-convert>=0.12.1
 crunch-encrypt
 coloredlogs
 dataclasses_json