codeanalyzer-python 0.1.10__tar.gz → 0.1.11__tar.gz

{codeanalyzer_python-0.1.10 → codeanalyzer_python-0.1.11}/PKG-INFO

@@ -1,22 +1,34 @@
 Metadata-Version: 2.4
 Name: codeanalyzer-python
-Version: 0.1.10
+Version: 0.1.11
 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 → codeanalyzer_python-0.1.11}/codeanalyzer/__main__.py

@@ -6,6 +6,7 @@ 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
 
 def main(
     input: Annotated[
@@ -102,7 +103,7 @@ def main(
         # Handle output based on format
         if output is None:
             # Output to stdout (only for JSON)
-            print(artifacts.json(separators=(",", ":")))
+            print(model_dump_json(artifacts, separators=(",", ":")))
         else:
             # Output to file
             output.mkdir(parents=True, exist_ok=True)
@@ -113,8 +114,8 @@ 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}")

{codeanalyzer_python-0.1.10 → codeanalyzer_python-0.1.11}/codeanalyzer/core.py

@@ -8,7 +8,7 @@ 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
@@ -408,7 +408,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 +421,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_python-0.1.11/codeanalyzer/schema/__init__.py

@@ -0,0 +1,72 @@
+from importlib.metadata import version, PackageNotFoundError
+from packaging.version import parse as parse_version
+
+from .py_schema import (
+    PyApplication,
+    PyCallable,
+    PyCallableParameter,
+    PyClass,
+    PyClassAttribute,
+    PyComment,
+    PyImport,
+    PyModule,
+    PyVariableDeclaration,
+)
+
+__all__ = [
+    "PyApplication",
+    "PyImport",
+    "PyComment",
+    "PyModule",
+    "PyClass",
+    "PyVariableDeclaration",
+    "PyCallable",
+    "PyClassAttribute",
+    "PyCallableParameter",
+]
+
+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.11/pyproject.toml

@@ -0,0 +1,115 @@
+[project]
+name = "codeanalyzer-python"
+version = "0.1.11"
+description = "Static Analysis on Python source code using Jedi, CodeQL and Treesitter."
+readme = "README.md"
+authors = [
+  { name = "Rahul Krishna", email = "i.m.ralk@gmail.com" }
+]
+requires-python = ">=3.9"
+
+dependencies = [
+    # jedi
+    "jedi>=0.18.0,<0.20.0; python_version < '3.11'",
+    "jedi<=0.19.2; python_version >= '3.11'",
+    # msgpack
+    "msgpack>=1.0.0,<1.0.7; python_version < '3.11'",
+    "msgpack>=1.0.7,<2.0.0; python_version >= '3.11'",
+    # networkx
+    "networkx>=2.6.0,<3.2.0; python_version < '3.11'",
+    "networkx>=3.0.0,<4.0.0; python_version >= '3.11'",
+    # pandas
+    "pandas>=1.3.0,<2.0.0; python_version < '3.11'",
+    "pandas>=2.0.0,<3.0.0; python_version >= '3.11'",
+    # numpy
+    "numpy>=1.21.0,<1.24.0; python_version < '3.11'",
+    "numpy>=1.24.0,<2.0.0; python_version >= '3.11' and python_version < '3.12'",
+    "numpy>=1.26.0,<2.0.0; python_version >= '3.12'",
+    # pydantic
+    "pydantic>=1.8.0,<2.0.0; python_version < '3.11'",
+    "pydantic>=2.0.0,<3.0.0; python_version >= '3.11'",
+    # requests
+    "requests>=2.20.0,<3.0.0; python_version >= '3.11'",
+    # rich
+    "rich>=12.6.0,<14.0.0; python_version < '3.11'",
+    "rich>=14.0.0,<15.0.0; python_version >= '3.11'",
+    # typer
+    "typer>=0.9.0,<1.0.0; python_version < '3.11'",
+    "typer>=0.9.0,<2.0.0; python_version >= '3.11'",
+    # typing-extensions
+    "typing-extensions>=4.0.0,<5.0.0; python_version < '3.11'",
+    "typing-extensions>=4.5.0,<6.0.0; python_version >= '3.11'",
+    # ray
+    "ray==2.0.0; python_version < '3.11'",
+    "ray>=2.10.0,<3.0.0; python_version >= '3.11'",
+    "packaging>=25.0",
+]
+
+[dependency-groups]
+test = [
+  "pytest>=7.0.0,<8.0.0",
+  "pytest-asyncio>=0.14.0,<0.15.0",
+  "pytest-cov>=2.10.0,<3.0.0",
+  "pytest-pspec>=0.0.3"
+]
+dev = [
+  "ipdb>=0.13.0,<0.14.0",
+  "pre-commit>=2.9.0,<3.0.0"
+]
+
+[project.scripts]
+codeanalyzer = "codeanalyzer.__main__:app"
+
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+
+[tool.hatch.build.targets.wheel]
+packages = ["codeanalyzer"]
+include = ["codeanalyzer/py.typed"]
+
+[tool.hatch.build.targets.sdist]
+include = [
+  "codeanalyzer",
+  "codeanalyzer/py.typed",
+  "README.md",
+  "LICENSE",
+  "NOTICE"
+]
+
+[tool.pytest.ini_options]
+addopts = [
+  "-p", "coverage",
+  "--cov=codeanalyzer",
+  "--cov-report=html",
+  "--cov-report=term-missing",
+  "--cov-fail-under=40",
+  "--ignore=test/fixtures"
+]
+testpaths = ["test"]
+
+[tool.coverage.run]
+source = ["codeanalyzer"]
+branch = true
+omit = [
+  "*/tests/*",
+  "*/test_*",
+  "*/__pycache__/*",
+  "*/venv/*",
+  "*/.venv/*",
+  "codeanalyzer/semantic_analysis/*"
+]
+
+[tool.coverage.report]
+precision = 2
+show_missing = true
+exclude_lines = [
+  "pragma: no cover",
+  "def __repr__",
+  "raise AssertionError",
+  "raise NotImplementedError",
+  "if __name__ == .__main__.:"
+]
+
+[tool.coverage.html]
+directory = "htmlcov"

codeanalyzer_python-0.1.10/codeanalyzer/schema/__init__.py

@@ -1,33 +0,0 @@
-from .py_schema import (
-    PyApplication,
-    PyCallable,
-    PyCallableParameter,
-    PyClass,
-    PyClassAttribute,
-    PyComment,
-    PyImport,
-    PyModule,
-    PyVariableDeclaration,
-)
-
-__all__ = [
-    "PyApplication",
-    "PyImport",
-    "PyComment",
-    "PyModule",
-    "PyClass",
-    "PyVariableDeclaration",
-    "PyCallable",
-    "PyClassAttribute",
-    "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
-)

codeanalyzer_python-0.1.10/pyproject.toml

@@ -1,92 +0,0 @@
-[project]
-name = "codeanalyzer-python"
-version = "0.1.10"
-description = "Static Analysis on Python source code using Jedi, CodeQL and Treesitter."
-readme = "README.md"
-authors = [
-    { name = "Rahul Krishna", email = "i.m.ralk@gmail.com" }
-]
-requires-python = ">=3.9"
-
-dependencies = [
-    "jedi>=0.18.0,<0.20.0",
-    "msgpack>=1.0.0,<1.0.7",
-    "networkx>=2.6.0,<3.2.0",
-    "pandas>=1.3.0,<2.0.0",
-    "numpy>=1.21.0,<1.24.0",
-    "pydantic>=1.8.0,<2.0.0",
-    "requests>=2.20.0,<3.0.0",
-    "rich>=12.6.0,<14.0.0",
-    "typer>=0.9.0,<1.0.0",
-    "ray>=2.0.0,<3.0.0",
-    "typing-extensions>=4.0.0"
-]
-
-[dependency-groups]
-test = [
-    "pytest>=7.0.0,<8.0.0",
-    "pytest-asyncio>=0.14.0,<0.15.0",
-    "pytest-cov>=2.10.0,<3.0.0",
-    "pytest-pspec>=0.0.3"
-]
-dev = [
-    "ipdb>=0.13.0,<0.14.0",
-    "pre-commit>=2.9.0,<3.0.0"
-]
-
-[project.scripts]
-codeanalyzer = "codeanalyzer.__main__:app"
-
-[build-system]
-requires = ["hatchling"]
-build-backend = "hatchling.build"
-
-[tool.hatch.build.targets.wheel]
-packages = ["codeanalyzer"]
-include = ["codeanalyzer/py.typed"]
-
-[tool.hatch.build.targets.sdist]
-include = [
-    "codeanalyzer",
-    "codeanalyzer/py.typed",
-    "README.md",
-    "LICENSE",
-    "NOTICE"
-]
-
-[tool.pytest.ini_options]
-addopts = [
-    "-p", "coverage",
-    "--cov=codeanalyzer",
-    "--cov-report=html",
-    "--cov-report=term-missing",
-    "--cov-fail-under=40",
-    "--ignore=test/fixtures"
-]
-testpaths = ["test"]
-
-[tool.coverage.run]
-source = ["codeanalyzer"]
-branch = true
-omit = [
-    "*/tests/*",
-    "*/test_*",
-    "*/__pycache__/*",
-    "*/venv/*",
-    "*/.venv/*",
-    "codeanalyzer/semantic_analysis/*"
-]
-
-[tool.coverage.report]
-precision = 2
-show_missing = true
-exclude_lines = [
-    "pragma: no cover",
-    "def __repr__",
-    "raise AssertionError",
-    "raise NotImplementedError",
-    "if __name__ == .__main__.:"
-]
-
-[tool.coverage.html]
-directory = "htmlcov"