Compeleted symbol table implementation

Signed-off-by: Rahul Krishna <i.m.ralk@gmail.com>

Author: rahlk

.vscode/settings.json

@@ -1,3 +1,6 @@
 {
-    "wca.enable": false
+    "wca.enable": false,
+    "cSpell.words": [
+        "pycomments"
+    ]
 }

.webui_secret_key

@@ -19,9 +19,9 @@ def _setup_logger(level: str = "INFO") -> None:
 
     logger.remove()
 
-    if level=="OFF":
-        return # If logging is turned off, we do not add any handlers.
-    
+    if level == "OFF":
+        return  # If logging is turned off, we do not add any handlers.
+
     logger.add(
         sys.stderr,
         format="{time:YYYY-MM-DD at HH:mm:ss} | {level} | {message}",
@@ -33,36 +33,40 @@ def _setup_logger(level: str = "INFO") -> None:
 @logger.catch
 def main(
     input: Annotated[
-        Path,
-        typer.Option("-i", "--input", help="Path to the project root directory.")
+        Path, typer.Option("-i", "--input", help="Path to the project root directory.")
     ],
     output: Annotated[
         Optional[Path],
-        typer.Option("-o", "--output", help="Output directory for artifacts.")
+        typer.Option("-o", "--output", help="Output directory for artifacts."),
     ] = None,
     analysis_level: Annotated[
         int,
-        typer.Option("-a", "--analysis-level", help="1: symbol table, 2: call graph.")
+        typer.Option("-a", "--analysis-level", help="1: symbol table, 2: call graph."),
     ] = 1,
     using_codeql: Annotated[
-        bool,
-        typer.Option("--codeql/--no-codeql", help="Enable CodeQL-based analysis.")
+        bool, typer.Option("--codeql/--no-codeql", help="Enable CodeQL-based analysis.")
     ] = False,
     rebuild_analysis: Annotated[
         bool,
-        typer.Option("--eager/--lazy", help="Enable eager or lazy analysis. Eager will rebuild the analysis cache at every run and lazy will use the cache if available. Defaults to lazy.")
+        typer.Option(
+            "--eager/--lazy",
+            help="Enable eager or lazy analysis. Eager will rebuild the analysis cache at every run and lazy will use the cache if available. Defaults to lazy.",
+        ),
     ] = False,
     cache_dir: Annotated[
         Optional[Path],
-        typer.Option("-c", "--cache-dir", help="Directory to store analysis cache. If not specified, the cache will be stored in the current working directory under .cache/codeanalyzer. Defaults to None.")
+        typer.Option(
+            "-c",
+            "--cache-dir",
+            help="Directory to store analysis cache. If not specified, the cache will be stored in the current working directory under .cache/codeanalyzer. Defaults to None.",
+        ),
     ] = None,
     clear_cache: Annotated[
         bool,
-        typer.Option("--clear-cache/--keep-cache", help="Clear cache after analysis.")
+        typer.Option("--clear-cache/--keep-cache", help="Clear cache after analysis."),
     ] = True,
     verbose: Annotated[
-        bool,
-        typer.Option("-v/-q", "--verbose/--quiet", help="Enable verbose output.")
+        bool, typer.Option("-v/-q", "--verbose/--quiet", help="Enable verbose output.")
     ] = True,
 ):
     """Static Analysis on Python source code using Jedi, Asteroid, and Treesitter."""
@@ -82,7 +86,7 @@ def main(
             output.mkdir(parents=True, exist_ok=True)
             print_stream = output / "analysis.json"
 
-        print(json.dumps(artifacts, indent=4), file=print_stream)
+        print(artifacts.model_dump_json(indent=4), file=print_stream)
 
 
 app = typer.Typer(

src/codeanalyzer/__main__.py

@@ -41,7 +41,7 @@ def __init__(
         self.using_codeql = using_codeql
         self.rebuild_analysis = rebuild_analysis
         self.cache_dir = (
-            cache_dir.resolve() if cache_dir is not None else self.project_dir 
+            cache_dir.resolve() if cache_dir is not None else self.project_dir
         ) / ".codeanalyzer"
         self.clear_cache = clear_cache
         self.db_path: Optional[Path] = None
@@ -105,7 +105,6 @@ def _cmd_exec_helper(
             stderr=None,
         )
 
-
     def __enter__(self) -> "AnalyzerCore":
         # If no virtualenv is provided, try to create one using requirements.txt or pyproject.toml
         venv_path = self.cache_dir / self.project_dir.name / "virtualenv"
@@ -148,7 +147,7 @@ def __enter__(self) -> "AnalyzerCore":
 
         if self.using_codeql:
             logger.info(f"(Re-)initializing CodeQL analysis for {self.project_dir}")
-            cache_root = self.cache_dir / "codeql" 
+            cache_root = self.cache_dir / "codeql"
             cache_root.mkdir(parents=True, exist_ok=True)
             self.db_path = cache_root / f"{self.project_dir.name}-db"
             self.db_path.mkdir(exist_ok=True)
@@ -213,8 +212,12 @@ def __exit__(self, exc_type, exc_val, exc_tb) -> None:
 
     def analyze(self) -> PyApplication:
         """Return the path to the CodeQL database."""
-        symbol_table = self._build_symbol_table()
-        call_graph = self._get_call_graph()
+        return (
+            PyApplication.builder()
+            .symbol_table(self._build_symbol_table())
+            .call_graph(self._get_call_graph())
+            .build()
+        )
 
     def _compute_checksum(self, root: Path) -> str:
         """Compute SHA256 checksum of all Python source files in a project directory. If somethings changes, the
@@ -237,5 +240,5 @@ def _build_symbol_table(self) -> Dict[str, PyModule]:
 
     def _get_call_graph(self) -> Dict[str, Any]:
         """Retrieve call graph from CodeQL database."""
-        logger.info("Call graph extraction not yet implemented.")
+        logger.warning("Call graph extraction not yet implemented.")
         return {}

src/codeanalyzer/core.py

@@ -142,6 +142,7 @@ class PyComment(BaseModel):
     end_column: int = -1
     is_docstring: bool = False
 
+
 @builder
 class PySymbol(BaseModel):
     """
@@ -157,9 +158,10 @@ class PySymbol(BaseModel):
         lineno (int): Line number where the symbol is accessed or declared.
         col_offset (int): Column offset.
     """
+
     name: str
-    scope: Literal['local', 'nonlocal', 'global', 'class', 'module']
-    kind: Literal['variable', 'parameter', 'attribute', 'function', 'class', 'module']
+    scope: Literal["local", "nonlocal", "global", "class", "module"]
+    kind: Literal["variable", "parameter", "attribute", "function", "class", "module"]
     type: Optional[str] = None
     qualified_name: Optional[str] = None
     is_builtin: bool = False
@@ -207,11 +209,13 @@ class PyCallableParameter(BaseModel):
     start_column: int = -1
     end_column: int = -1
 
+
 @builder
 class PyCallsite(BaseModel):
     """
     Represents a Python call site (function or method invocation) with contextual metadata.
     """
+
     method_name: str
     receiver_expr: Optional[str] = None
     receiver_type: Optional[str] = None
@@ -229,6 +233,7 @@ class PyCallsite(BaseModel):
     end_line: int = -1
     end_column: int = -1
 
+
 @builder
 class PyCallable(BaseModel):
     """Represents a Python callable (function/method).
@@ -253,7 +258,7 @@ class PyCallable(BaseModel):
 
     name: str
     signature: str  # e.g., module.<class_name>.function_name
-    docstring: PyComment = None
+    comments: List[PyComment] = []
     decorators: List[str] = []
     parameters: List[PyCallableParameter] = []
     return_type: Optional[str] = None
@@ -285,7 +290,7 @@ class PyClassAttribute(BaseModel):
 
     name: str
     type: str = None
-    docstring: PyComment = None
+    comments: List[PyComment] = []
     start_line: int = -1
     end_line: int = -1
 
@@ -308,7 +313,7 @@ class PyClass(BaseModel):
 
     name: str
     signature: str  # e.g., module.class_name
-    docstring: PyComment = None
+    comments: List[PyComment] = []
     code: str = None
     base_classes: List[str] = []
     methods: Dict[str, PyCallable] = {}