From ffaf41582de14620f8efa78fd3d9481e5aea5ea5 Mon Sep 17 00:00:00 2001 From: nigel brown Date: Thu, 13 Feb 2025 17:00:42 +0000 Subject: [PATCH 1/2] Handle shell languages slightly better Signed-off-by: nigel brown --- src/codegate/extract_snippets/message_extractor.py | 4 ++-- src/codegate/pipeline/comment/output.py | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/codegate/extract_snippets/message_extractor.py b/src/codegate/extract_snippets/message_extractor.py index bea5a2f2..0abc06b4 100644 --- a/src/codegate/extract_snippets/message_extractor.py +++ b/src/codegate/extract_snippets/message_extractor.py @@ -138,7 +138,7 @@ def __init__(self): "rs": "rust", "java": "java", } - self._available_languages = ["python", "javascript", "typescript", "go", "rust", "java"] + self._available_languages = ["sh", "bash", "python", "javascript", "typescript", "go", "rust", "java"] # noqa: E501 @property @abstractmethod @@ -194,7 +194,7 @@ def _ecosystem_from_message(self, message: str): Returns: Determined language based on message content """ - return self._language_mapping.get(message, None) + return self._language_mapping.get(message, message) def _get_snippet_for_match(self, match: re.Match) -> CodeSnippet: matched_snippet = self._get_match_pattern_snippet(match) diff --git a/src/codegate/pipeline/comment/output.py b/src/codegate/pipeline/comment/output.py index 8c0a867a..11f8e153 100644 --- a/src/codegate/pipeline/comment/output.py +++ b/src/codegate/pipeline/comment/output.py @@ -60,7 +60,8 @@ async def _snippet_comment(self, snippet: CodeSnippet, context: PipelineContext) liklihood = "likely" if snippet.language is not None: language = snippet.language - comment = f"{comment}\n\n🛡️ CodeGate: The {language} supplied is {liklihood} unsafe. Please check carefully!\n\n" # noqa: E501 + if language not in ["python", "javascript", "typescript", "go", "rust", "java"]: # noqa: E501 + comment = f"{comment}\n\n🛡️ CodeGate: The {language} supplied is {liklihood} unsafe. Please check carefully!\n\n" # noqa: E501 snippet.libraries = PackageExtractor.extract_packages(snippet.code, snippet.language) From 6e0d4bd88e0799b514ec3742c4c8ddc77f2f1726 Mon Sep 17 00:00:00 2001 From: nigel brown Date: Thu, 13 Feb 2025 17:06:27 +0000 Subject: [PATCH 2/2] linter love Signed-off-by: nigel brown --- src/codegate/extract_snippets/message_extractor.py | 11 ++++++++++- src/codegate/pipeline/comment/output.py | 9 ++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src/codegate/extract_snippets/message_extractor.py b/src/codegate/extract_snippets/message_extractor.py index 0abc06b4..50ec3f3c 100644 --- a/src/codegate/extract_snippets/message_extractor.py +++ b/src/codegate/extract_snippets/message_extractor.py @@ -138,7 +138,16 @@ def __init__(self): "rs": "rust", "java": "java", } - self._available_languages = ["sh", "bash", "python", "javascript", "typescript", "go", "rust", "java"] # noqa: E501 + self._available_languages = [ + "sh", + "bash", + "python", + "javascript", + "typescript", + "go", + "rust", + "java", + ] # noqa: E501 @property @abstractmethod diff --git a/src/codegate/pipeline/comment/output.py b/src/codegate/pipeline/comment/output.py index 11f8e153..ce70138a 100644 --- a/src/codegate/pipeline/comment/output.py +++ b/src/codegate/pipeline/comment/output.py @@ -60,7 +60,14 @@ async def _snippet_comment(self, snippet: CodeSnippet, context: PipelineContext) liklihood = "likely" if snippet.language is not None: language = snippet.language - if language not in ["python", "javascript", "typescript", "go", "rust", "java"]: # noqa: E501 + if language not in [ + "python", + "javascript", + "typescript", + "go", + "rust", + "java", + ]: # noqa: E501 comment = f"{comment}\n\n🛡️ CodeGate: The {language} supplied is {liklihood} unsafe. Please check carefully!\n\n" # noqa: E501 snippet.libraries = PackageExtractor.extract_packages(snippet.code, snippet.language)