codeanalyzer-python 0.1.10__py3-none-any.whl → 0.1.12__py3-none-any.whl

codeanalyzer/__main__.py

@@ -6,115 +6,71 @@ import typer
 from codeanalyzer.core import Codeanalyzer
 from codeanalyzer.utils import _set_log_level, logger
 from codeanalyzer.config import OutputFormat
+from codeanalyzer.schema import model_dump_json
+from codeanalyzer.options import AnalysisOptions
 
 def main(
-    input: Annotated[
-        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."),
-    ] = None,
-    format: Annotated[
-        OutputFormat,
-        typer.Option(
-            "-f",
-            "--format",
-            help="Output format: json or msgpack.",
-            case_sensitive=False,
-        ),
-    ] = OutputFormat.JSON,
-    analysis_level: Annotated[
-        int,
-        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.")
-    ] = False,
-    using_ray: Annotated[
-        bool,
-        typer.Option(
-            "--ray/--no-ray", help="Enable Ray for distributed analysis."
-        ),
-    ] = False,
-    rebuild_analysis: Annotated[
-        bool,
-        typer.Option(
-            "--eager/--lazy",
-            help="Enable eager or lazy analysis. Defaults to lazy.",
-        ),
-    ] = False,
-    skip_tests: Annotated[
-        bool,
-        typer.Option(
-            "--skip-tests/--include-tests",
-            help="Skip test files in analysis.",
-        ),
-    ] = True,
-    file_name: Annotated[
-        Optional[Path],
-        typer.Option(
-            "--file-name",
-            help="Analyze only the specified file (relative to input directory).",
-        ),
-    ] = None,
-    cache_dir: Annotated[
-        Optional[Path],
-        typer.Option(
-            "-c",
-            "--cache-dir",
-            help="Directory to store analysis cache. Defaults to '.codeanalyzer' in the input directory.",
-        ),
-    ] = None,
-    clear_cache: Annotated[
-        bool,
-        typer.Option("--clear-cache/--keep-cache", help="Clear cache after analysis. By default, cache is retained."),
-    ] = False,
-    verbosity: Annotated[
-        int, typer.Option("-v", count=True, help="Increase verbosity: -v, -vv, -vvv")
-    ] = 0,
+    input: Annotated[Path, typer.Option("-i", "--input", help="Path to the project root directory.")],
+    output: Optional[Path] = typer.Option(None, "-o", "--output"),
+    format: OutputFormat = typer.Option(OutputFormat.JSON, "-f", "--format"),
+    analysis_level: int = typer.Option(1, "-a", "--analysis-level"),
+    using_codeql: bool = typer.Option(False, "--codeql/--no-codeql"),
+    using_ray: bool = typer.Option(False, "--ray/--no-ray"),
+    rebuild_analysis: bool = typer.Option(False, "--eager/--lazy"),
+    skip_tests: bool = typer.Option(True, "--skip-tests/--include-tests"),
+    file_name: Optional[Path] = typer.Option(None, "--file-name"),
+    cache_dir: Optional[Path] = typer.Option(None, "-c", "--cache-dir"),
+    clear_cache: bool = typer.Option(False, "--clear-cache/--keep-cache"),
+    verbosity: int = typer.Option(0, "-v", count=True),
 ):
-    """Static Analysis on Python source code using Jedi, Astroid, and Treesitter."""
-    _set_log_level(verbosity)
+    options = AnalysisOptions(
+        input=input,
+        output=output,
+        format=format,
+        analysis_level=analysis_level,
+        using_codeql=using_codeql,
+        using_ray=using_ray,
+        rebuild_analysis=rebuild_analysis,
+        skip_tests=skip_tests,
+        file_name=file_name,
+        cache_dir=cache_dir,
+        clear_cache=clear_cache,
+        verbosity=verbosity,
+    )
 
-    if not input.exists():
-        logger.error(f"Input path '{input}' does not exist.")
+    _set_log_level(options.verbosity)
+    if not options.input.exists():
+        logger.error(f"Input path '{options.input}' does not exist.")
         raise typer.Exit(code=1)
 
-    # Validate file_name if provided
-    if file_name is not None:
-        full_file_path = input / file_name
+    if options.file_name is not None:
+        full_file_path = options.input / options.file_name
         if not full_file_path.exists():
-            logger.error(f"Specified file '{file_name}' does not exist in '{input}'.")
+            logger.error(f"Specified file '{options.file_name}' does not exist in '{options.input}'.")
             raise typer.Exit(code=1)
         if not full_file_path.is_file():
-            logger.error(f"Specified path '{file_name}' is not a file.")
+            logger.error(f"Specified path '{options.file_name}' is not a file.")
             raise typer.Exit(code=1)
-        if not str(file_name).endswith('.py'):
-            logger.error(f"Specified file '{file_name}' is not a Python file (.py).")
+        if not str(options.file_name).endswith('.py'):
+            logger.error(f"Specified file '{options.file_name}' is not a Python file (.py).")
             raise typer.Exit(code=1)
 
-    with Codeanalyzer(
-        input, analysis_level, skip_tests, using_codeql, rebuild_analysis, cache_dir, clear_cache, using_ray, file_name
-    ) as analyzer:
+    with Codeanalyzer(options) as analyzer:
         artifacts = analyzer.analyze()
 
-        # Handle output based on format
-        if output is None:
-            # Output to stdout (only for JSON)
-            print(artifacts.json(separators=(",", ":")))
+        if options.output is None:
+            print(model_dump_json(artifacts, separators=(",", ":")))
         else:
-            # Output to file
-            output.mkdir(parents=True, exist_ok=True)
-            _write_output(artifacts, output, format)
+            options.output.mkdir(parents=True, exist_ok=True)
+            _write_output(artifacts, options.output, options.format)
 
 
 def _write_output(artifacts, output_dir: Path, format: OutputFormat):
     """Write artifacts to file in the specified format."""
     if format == OutputFormat.JSON:
         output_file = output_dir / "analysis.json"
-        # Use Pydantic's json() with separators for compact output
-        json_str = artifacts.json(indent=None)
+        # Use Pydantic's model_dump_json() for compact output
+        json_str = model_dump_json(artifacts, indent=None)
         with output_file.open("w") as f:
             f.write(json_str)
         logger.info(f"Analysis saved to {output_file}")
@@ -129,7 +85,6 @@ def _write_output(artifacts, output_dir: Path, format: OutputFormat):
             f"Compression ratio: {artifacts.get_compression_ratio():.1%} of JSON size"
         )
 
-
 app = typer.Typer(
     callback=main,
     name="codeanalyzer",

codeanalyzer/core.py

@@ -8,12 +8,13 @@ from typing import Any, Dict, Optional, Union, List
 
 import ray
 from codeanalyzer.utils import logger
-from codeanalyzer.schema import PyApplication, PyModule
+from codeanalyzer.schema import PyApplication, PyModule, model_dump_json, model_validate_json
 from codeanalyzer.semantic_analysis.codeql import CodeQLLoader
 from codeanalyzer.semantic_analysis.codeql.codeql_exceptions import CodeQLExceptions
 from codeanalyzer.syntactic_analysis.exceptions import SymbolTableBuilderRayError
 from codeanalyzer.syntactic_analysis.symbol_table_builder import SymbolTableBuilder
 from codeanalyzer.utils import ProgressBar
+from codeanalyzer.options import AnalysisOptions
 
 @ray.remote
 def _process_file_with_ray(py_file: Union[Path, str], project_dir: Union[Path, str], virtualenv: Union[Path, str, None]) -> Dict[str, PyModule]:
@@ -43,40 +44,25 @@ class Codeanalyzer:
     """Core functionality for CodeQL analysis.
 
     Args:
-        project_dir (Union[str, Path]): The root directory of the project to analyze.
-        virtualenv (Optional[Path]): Path to the virtual environment directory.
-        using_codeql (bool): Whether to use CodeQL for analysis.
-        rebuild_analysis (bool): Whether to force rebuild the database.
-        clear_cache (bool): Whether to delete the cached directory after analysis.
-        analysis_depth (int): Depth of analysis (reserved for future use).
+        options (AnalysisOptions): Analysis configuration options containing all necessary parameters.
     """
 
-    def __init__(
-        self,
-        project_dir: Union[str, Path],
-        analysis_depth: int,
-        skip_tests: bool,
-        using_codeql: bool,
-        rebuild_analysis: bool,
-        cache_dir: Optional[Path],
-        clear_cache: bool,
-        using_ray: bool,
-        file_name: Optional[Path] = None,
-    ) -> None:
-        self.analysis_depth = analysis_depth
-        self.project_dir = Path(project_dir).resolve()
-        self.skip_tests = skip_tests
-        self.using_codeql = using_codeql
-        self.rebuild_analysis = rebuild_analysis
+    def __init__(self, options: AnalysisOptions) -> None:
+        self.options = options
+        self.analysis_depth = options.analysis_level
+        self.project_dir = Path(options.input).resolve()
+        self.skip_tests = options.skip_tests
+        self.using_codeql = options.using_codeql
+        self.rebuild_analysis = options.rebuild_analysis
         self.cache_dir = (
-            cache_dir.resolve() if cache_dir is not None else self.project_dir
+            options.cache_dir.resolve() if options.cache_dir is not None else self.project_dir
         ) / ".codeanalyzer"
-        self.clear_cache = clear_cache
+        self.clear_cache = options.clear_cache
         self.db_path: Optional[Path] = None
         self.codeql_bin: Optional[Path] = None
         self.virtualenv: Optional[Path] = None
-        self.using_ray: bool = using_ray
-        self.file_name: Optional[Path] = file_name
+        self.using_ray: bool = options.using_ray
+        self.file_name: Optional[Path] = options.file_name
 
     @staticmethod
     def _cmd_exec_helper(
@@ -408,7 +394,7 @@ class Codeanalyzer:
         """
         with cache_file.open('r') as f:
             data = f.read()
-        return PyApplication.parse_raw(data)
+        return model_validate_json(PyApplication, data)
     
     def _save_analysis_cache(self, app: PyApplication, cache_file: Path) -> None:
         """Save analysis to cache file.
@@ -421,8 +407,8 @@ class Codeanalyzer:
         cache_file.parent.mkdir(parents=True, exist_ok=True)
         
         with cache_file.open('w') as f:
-            f.write(app.json(indent=2))
-        
+            f.write(model_dump_json(app, indent=2))
+
         logger.info(f"Analysis cached to {cache_file}")
 
     def _file_unchanged(self, file_path: Path, cached_module: PyModule) -> bool:

codeanalyzer/options/__init__.py

@@ -0,0 +1,3 @@
+from .options import AnalysisOptions
+
+__all__ = ["AnalysisOptions"]

codeanalyzer/options/options.py

@@ -0,0 +1,25 @@
+from dataclasses import dataclass
+from pathlib import Path
+from typing import Optional
+from enum import Enum
+
+
+class OutputFormat(str, Enum):
+    JSON = "json"
+    MSGPACK = "msgpack"
+
+
+@dataclass
+class AnalysisOptions:
+    input: Path
+    output: Optional[Path] = None
+    format: OutputFormat = OutputFormat.JSON
+    analysis_level: int = 1
+    using_codeql: bool = False
+    using_ray: bool = False
+    rebuild_analysis: bool = False
+    skip_tests: bool = True
+    file_name: Optional[Path] = None
+    cache_dir: Optional[Path] = None
+    clear_cache: bool = False
+    verbosity: int = 0

codeanalyzer/schema/__init__.py

@@ -1,3 +1,6 @@
+from importlib.metadata import version, PackageNotFoundError
+from packaging.version import parse as parse_version
+
 from .py_schema import (
     PyApplication,
     PyCallable,
@@ -22,12 +25,48 @@ __all__ = [
     "PyCallableParameter",
 ]
 
-# Resolve forward references
-PyCallable.update_forward_refs(PyClass=PyClass)
-PyClass.update_forward_refs(PyCallable=PyCallable)
-PyModule.update_forward_refs(PyCallable=PyCallable, PyClass=PyClass)
-PyApplication.update_forward_refs(
-    PyCallable=PyCallable,
-    PyClass=PyClass,
-    PyModule=PyModule
-)
+try:
+    pydantic_version = version("pydantic")
+except PackageNotFoundError:
+    pydantic_version = "0.0.0"  # fallback or raise if appropriate
+
+PYDANTIC_V2 = parse_version(pydantic_version) >= parse_version("2.0.0")
+
+if not PYDANTIC_V2:
+    # Safe to pass localns
+    PyCallable.update_forward_refs(PyClass=PyClass)
+    PyClass.update_forward_refs(PyCallable=PyCallable)
+    PyModule.update_forward_refs(PyCallable=PyCallable, PyClass=PyClass)
+    PyApplication.update_forward_refs(
+        PyCallable=PyCallable,
+        PyClass=PyClass,
+        PyModule=PyModule
+    )
+    
+# Compatibility helpers for Pydantic v1/v2
+def model_dump_json(model, **kwargs):
+    """Compatibility helper for JSON serialization."""
+    if PYDANTIC_V2:
+        return model.model_dump_json(**kwargs)
+    else:
+        # Map Pydantic v2 parameters to v1 equivalents
+        v1_kwargs = {}
+        if 'indent' in kwargs:
+            v1_kwargs['indent'] = kwargs['indent']
+        if 'separators' in kwargs:
+            # In v1, separators is passed to dumps_kwargs
+            v1_kwargs['separators'] = kwargs['separators']
+        return model.json(**v1_kwargs)
+
+def model_validate_json(model_class, json_data):
+    """Compatibility helper for JSON deserialization."""
+    if PYDANTIC_V2:
+        return model_class.model_validate_json(json_data)
+    else:
+        return model_class.parse_raw(json_data)
+
+__all__.extend([
+    "PYDANTIC_V2",
+    "model_dump_json",
+    "model_validate_json"
+])

{codeanalyzer_python-0.1.10.dist-info → codeanalyzer_python-0.1.12.dist-info}/METADATA

@@ -1,22 +1,34 @@
 Metadata-Version: 2.4
 Name: codeanalyzer-python
-Version: 0.1.10
+Version: 0.1.12
 Summary: Static Analysis on Python source code using Jedi, CodeQL and Treesitter.
 Author-email: Rahul Krishna <i.m.ralk@gmail.com>
 License-File: LICENSE
 License-File: NOTICE
 Requires-Python: >=3.9
-Requires-Dist: jedi<0.20.0,>=0.18.0
-Requires-Dist: msgpack<1.0.7,>=1.0.0
-Requires-Dist: networkx<3.2.0,>=2.6.0
-Requires-Dist: numpy<1.24.0,>=1.21.0
-Requires-Dist: pandas<2.0.0,>=1.3.0
-Requires-Dist: pydantic<2.0.0,>=1.8.0
-Requires-Dist: ray<3.0.0,>=2.0.0
-Requires-Dist: requests<3.0.0,>=2.20.0
-Requires-Dist: rich<14.0.0,>=12.6.0
-Requires-Dist: typer<1.0.0,>=0.9.0
-Requires-Dist: typing-extensions>=4.0.0
+Requires-Dist: jedi<0.20.0,>=0.18.0; python_version < '3.11'
+Requires-Dist: jedi<=0.19.2; python_version >= '3.11'
+Requires-Dist: msgpack<1.0.7,>=1.0.0; python_version < '3.11'
+Requires-Dist: msgpack<2.0.0,>=1.0.7; python_version >= '3.11'
+Requires-Dist: networkx<3.2.0,>=2.6.0; python_version < '3.11'
+Requires-Dist: networkx<4.0.0,>=3.0.0; python_version >= '3.11'
+Requires-Dist: numpy<1.24.0,>=1.21.0; python_version < '3.11'
+Requires-Dist: numpy<2.0.0,>=1.24.0; python_version >= '3.11' and python_version < '3.12'
+Requires-Dist: numpy<2.0.0,>=1.26.0; python_version >= '3.12'
+Requires-Dist: packaging>=25.0
+Requires-Dist: pandas<2.0.0,>=1.3.0; python_version < '3.11'
+Requires-Dist: pandas<3.0.0,>=2.0.0; python_version >= '3.11'
+Requires-Dist: pydantic<2.0.0,>=1.8.0; python_version < '3.11'
+Requires-Dist: pydantic<3.0.0,>=2.0.0; python_version >= '3.11'
+Requires-Dist: ray<3.0.0,>=2.10.0; python_version >= '3.11'
+Requires-Dist: ray==2.0.0; python_version < '3.11'
+Requires-Dist: requests<3.0.0,>=2.20.0; python_version >= '3.11'
+Requires-Dist: rich<14.0.0,>=12.6.0; python_version < '3.11'
+Requires-Dist: rich<15.0.0,>=14.0.0; python_version >= '3.11'
+Requires-Dist: typer<1.0.0,>=0.9.0; python_version < '3.11'
+Requires-Dist: typer<2.0.0,>=0.9.0; python_version >= '3.11'
+Requires-Dist: typing-extensions<5.0.0,>=4.0.0; python_version < '3.11'
+Requires-Dist: typing-extensions<6.0.0,>=4.5.0; python_version >= '3.11'
 Description-Content-Type: text/markdown
 
 ![logo](https://github.com/codellm-devkit/codeanalyzer-python/blob/main/docs/assets/logo.png?raw=true)

{codeanalyzer_python-0.1.10.dist-info → codeanalyzer_python-0.1.12.dist-info}/RECORD

@@ -1,12 +1,14 @@
 codeanalyzer/__init__.py,sha256=BZ3Kuwl-F_F-8H8cepLnVJ4Ku4NNUjjqg0Y6ujPQSsI,108
-codeanalyzer/__main__.py,sha256=x2LNDxYndzV2LkauBz7-_0qR58seRx-yJ07-obs4o9Q,4855
-codeanalyzer/core.py,sha256=RUJrtmtCFAxBLyI_eHp3Oi0tWAU09DeI7wUD7vfQwi0,24926
+codeanalyzer/__main__.py,sha256=DLyvuQXnzwx5wIb2xvLg5qzmzOyvLz4Uxiz_Y8bbfHs,3938
+codeanalyzer/core.py,sha256=P43skGiKUnQtkSQGHpPDgZrftAKP2HHh52g1N1Ww1S0,24503
 codeanalyzer/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 codeanalyzer/config/__init__.py,sha256=9XBxAn1oWGRuhg3bEBUuVGs3hFNXEAKrr-Ce7tq9a2k,61
 codeanalyzer/config/config.py,sha256=ZiKzc5uEUCIvih58-6BDtLLI1hPij41wGQjBcj9KNQM,188
 codeanalyzer/jedi/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 codeanalyzer/jedi/jedi.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-codeanalyzer/schema/__init__.py,sha256=k6N1AfXe1J7cSFBdRJlYo1FPVrr4HeXgzEmVy8MUhC4,694
+codeanalyzer/options/__init__.py,sha256=4kkwBiOrGjalrkfFF8EJgfgOtaPtD7HcCYfZgcOgelU,67
+codeanalyzer/options/options.py,sha256=PNdLUCF7kHfscSeeqbV6ZEAu37T1gFoeV9SqJQed7Fw,592
+codeanalyzer/schema/__init__.py,sha256=HB7y4y-49dkEo-H9GREam1_9Cr1N-GF6MYwx9yoU878,1978
 codeanalyzer/schema/py_schema.py,sha256=04K19tDtmg2tPXjwu_8BcmVpenk1ibVwNv6bHWZHOLY,10851
 codeanalyzer/semantic_analysis/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 codeanalyzer/semantic_analysis/codeql/__init__.py,sha256=ODMkdGvs3ebJdfIZle8T4VcHoCBhH_ZehWuWFpNh3NI,1022
@@ -21,9 +23,9 @@ codeanalyzer/syntactic_analysis/symbol_table_builder.py,sha256=0FE_ZdlyP77P1B70Q
 codeanalyzer/utils/__init__.py,sha256=hC6VWdR5rerSqBxzu9KQHTASWqwrrYJv-CMDwrTlzkc,137
 codeanalyzer/utils/logging.py,sha256=0vTkGSl5EZN8yhhWa_5Mrn1n_twRCSW53rNwjzQ9RbI,601
 codeanalyzer/utils/progress_bar.py,sha256=ZHJzGiCo5q4dyXq4CtsrJeq9Ip7sD84T3yZjNX7TBys,2443
-codeanalyzer_python-0.1.10.dist-info/METADATA,sha256=hZtJ0nMdkzF9Bm1JTzaypIFLWpl9bOL1xrtrvdKBjRU,15261
-codeanalyzer_python-0.1.10.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-codeanalyzer_python-0.1.10.dist-info/entry_points.txt,sha256=eUrB7Jq5Oav6RblMX_RYfVLSw_h15NbzC3fNSnGsPuM,59
-codeanalyzer_python-0.1.10.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-codeanalyzer_python-0.1.10.dist-info/licenses/NOTICE,sha256=YU0Z9NDWqKY-2jfFcbxeZ6fbnzz0oZeKmnUcO8a-bcQ,901
-codeanalyzer_python-0.1.10.dist-info/RECORD,,
+codeanalyzer_python-0.1.12.dist-info/METADATA,sha256=6WbhPKR5AWghHHtngmhf2pMNa35-d-C-d_rIRd5AD7E,16283
+codeanalyzer_python-0.1.12.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+codeanalyzer_python-0.1.12.dist-info/entry_points.txt,sha256=eUrB7Jq5Oav6RblMX_RYfVLSw_h15NbzC3fNSnGsPuM,59
+codeanalyzer_python-0.1.12.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+codeanalyzer_python-0.1.12.dist-info/licenses/NOTICE,sha256=YU0Z9NDWqKY-2jfFcbxeZ6fbnzz0oZeKmnUcO8a-bcQ,901
+codeanalyzer_python-0.1.12.dist-info/RECORD,,