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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: crunch-cli
-Version: 12.0.2
+Version: 12.0.3
 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.0.3}/crunch/__version__.py

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

{crunch_cli-12.0.2 → crunch_cli-12.0.3}/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,

{crunch_cli-12.0.2 → crunch_cli-12.0.3}/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.0.3}/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.0.3}/crunch_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: crunch-cli
-Version: 12.0.2
+Version: 12.0.3
 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.0.3}/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