Merge pull request #113 from codellm-devkit/99-100-remove-codeql-and-refactor-treesitter

Address Issues 99-100: Remove CodeQL and refactor Treesitter

Author: rahlk

README.md

@@ -1,6 +1,6 @@
 <picture>
-  <source media="(prefers-color-scheme: dark)" srcset="docs/assets/images/cldk-dark.png">
-  <source media="(prefers-color-scheme: light)" srcset="docs/assets/images/cldk-light.png">
+  <source media="(prefers-color-scheme: dark)" srcset="docs/images/cldk-dark.png">
+  <source media="(prefers-color-scheme: light)" srcset="docs/images/cldk-light.png">
   <img src="docs/assets/img-light.png" alt="Logo">
 </picture>
 
@@ -23,6 +23,12 @@
   <a href="https://discord.gg/zEjz9YrmqN">
     <img src="https://dcbadge.limes.pink/api/server/https://discord.gg/zEjz9YrmqN?style=for-the-badge"/>
   </a>
+  <a href="https://github.com/YOUR_REPO/actions/workflows/test.yml">
+  <img src="https://img.shields.io/badge/Tests-120%2F120%20Passing-green?style=for-the-badge" />
+</a>
+  <a href="https://github.com/codellm-devkit/python-sdk">
+  <img src="https://img.shields.io/badge/Coverage-77%25-green?style=for-the-badge" />
+  </a>
 </p>
 
 Codellm-Devkit (CLDK) is a multilingual program analysis framework that bridges the gap between traditional static analysis tools and Large Language Models (LLMs) specialized for code (CodeLLMs). Codellm-Devkit allows developers to streamline the process of transforming raw code into actionable insights by providing a unified interface for integrating outputs from various analysis tools and preparing them for effective use by CodeLLMs.

cldk/analysis/c/c_analysis.py

@@ -142,7 +142,7 @@ def get_functions(self) -> Dict[str, CFunction]:
         """Should return  all functions in the project.
 
         Raises:
-            NotImplementedError: Raised when current AnalysisEngine does not support this function.
+            NotImplementedError: Raised when we do not support this function.
 
         Returns:
             Dict[str, Dict[str, JCallable]]: Dictionary of dictionaries of all methods in the C code with qualified class name as key and dictionary of methods in that class.
@@ -169,7 +169,7 @@ def get_C_file(self, file_name: str) -> str:
             file_name (str): The name of the file.
 
         Raises:
-            NotImplementedError: Raised when current AnalysisEngine does not support this function.
+            NotImplementedError: Raised when we do not support this function.
 
         Returns:
             str: C file name containing the given qualified class.
@@ -183,7 +183,7 @@ def get_C_compilation_unit(self, file_path: str) -> CTranslationUnit:
             file_path (str): Absolute path to C source file
 
         Raises:
-            NotImplementedError: Raised when current AnalysisEngine does not support this function.
+            NotImplementedError: Raised when we do not support this function.
 
         Returns:
             CTranslationUnit: Compilation unit object for C source file
@@ -197,7 +197,7 @@ def get_functions_in_file(self, file_name: str) -> List[CFunction]:
             file_name (str): The name of the file.
 
         Raises:
-            NotImplementedError: Raised when current AnalysisEngine does not support this function.
+            NotImplementedError: Raised when we do not support this function.
 
         Returns:
             Dict[str, JCallable]: A dictionary of all constructors of the given class.
@@ -208,7 +208,7 @@ def get_macros(self) -> List[CMacro]:
         """Should return  a list of all macros in the C code.
 
         Raises:
-            NotImplementedError: Raised when current AnalysisEngine does not support this function.
+            NotImplementedError: Raised when we do not support this function.
 
         Returns:
             List[CMacro]: A list of all macros in the C code.
@@ -222,7 +222,7 @@ def get_macros_in_file(self, file_name: str) -> List[CMacro] | None:
             file_name (str): The name of the file.
 
         Raises:
-            NotImplementedError: Raised when current AnalysisEngine does not support this function.
+            NotImplementedError: Raised when we do not support this function.
 
         Returns:
             List[CMacro]: A list of all macros in the given file. Returns None if no macros are found.

cldk/analysis/common/__init__.py cldk/analysis/commons/__init__.pycldk/analysis/common/__init__.py renamed to cldk/analysis/commons/__init__.py

@@ -18,6 +18,7 @@
 Treesitter package
 """
 
-from cldk.analysis.python.treesitter.python_sitter import PythonSitter
+from .treesitter_java import TreesitterJava
+from .treesitter_python import TreesitterPython
 
-__all__ = ["PythonSitter"]
+__all__ = ["TreesitterJava", "TreesitterPython"]

cldk/analysis/common/lsp/__init__.py cldk/analysis/commons/lsp/__init__.pycldk/analysis/common/lsp/__init__.py renamed to cldk/analysis/commons/lsp/__init__.py

@@ -15,20 +15,20 @@
 ################################################################################
 
 """
-JavaSitter module
+TreesitterJava module
 """
 import logging
 from itertools import groupby
 from typing import List, Set, Dict
 from tree_sitter import Language, Node, Parser, Query, Tree
 import tree_sitter_java as tsjava
-from cldk.models.treesitter import Captures
+from cldk.analysis.commons.treesitter.models import Captures
 
 logger = logging.getLogger(__name__)
 
 
 # pylint: disable=too-many-public-methods
-class JavaSitter:
+class TreesitterJava:
     """
     Treesitter for Java usecases.
     """

cldk/analysis/common/lsp/lsp.py cldk/analysis/commons/lsp/lsp.pycldk/analysis/common/lsp/lsp.py renamed to cldk/analysis/commons/lsp/lsp.py

@@ -15,22 +15,21 @@
 ################################################################################
 
 """
-PythonSitter module
+TreesitterPython module
 """
 
-import glob
 import os
 from pathlib import Path
 from typing import List
 
-from tree_sitter import Language, Parser, Query, Node, Tree
+from tree_sitter import Language, Parser, Node, Tree
 import tree_sitter_python as tspython
 from cldk.models.python.models import PyMethod, PyClass, PyArg, PyImport, PyModule, PyCallSite
-from cldk.models.treesitter import Captures
-from cldk.utils.treesitter.tree_sitter_utils import TreeSitterUtils
+from cldk.analysis.commons.treesitter.models import Captures
+from cldk.analysis.commons.treesitter.utils.treesitter_utils import TreeSitterUtils
 
 
-class PythonSitter:
+class TreesitterPython:
     """
     Tree sitter for Python use cases.
     """
@@ -49,6 +48,7 @@ def is_parsable(self, code: str) -> bool:
         Returns:
             True if the code is parsable, False otherwise
         """
+
         def syntax_error(node):
             if node.type == "ERROR":
                 return True

…k/analysis/python/treesitter/__init__.py …/analysis/commons/treesitter/__init__.pycldk/analysis/python/treesitter/__init__.py renamed to cldk/analysis/commons/treesitter/__init__.py cldk/analysis/python/treesitter/__init__.py renamed to cldk/analysis/commons/treesitter/__init__.py

@@ -17,3 +17,6 @@
 """
 Treesitter package
 """
+from .treesitter_utils import TreeSitterUtils
+
+__all__ = ["TreeSitterUtils"]