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

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/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/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.11.dist-info}/METADATA

@@ -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.dist-info → codeanalyzer_python-0.1.11.dist-info}/RECORD

@@ -1,12 +1,12 @@
 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=e-AMzR5uR1IsUKhsfk17_qPJkwORRqe9tBxCXwwlxBY,4922
+codeanalyzer/core.py,sha256=swFc-6ICs_rijj7P0bbJv3um2Gr-R8_roGK0P3qo1xc,24979
 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/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 +21,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.11.dist-info/METADATA,sha256=yqQiVgSsG1k262sigcRo51BScmuVQywLOtL9rEX5ATI,16283
+codeanalyzer_python-0.1.11.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+codeanalyzer_python-0.1.11.dist-info/entry_points.txt,sha256=eUrB7Jq5Oav6RblMX_RYfVLSw_h15NbzC3fNSnGsPuM,59
+codeanalyzer_python-0.1.11.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+codeanalyzer_python-0.1.11.dist-info/licenses/NOTICE,sha256=YU0Z9NDWqKY-2jfFcbxeZ6fbnzz0oZeKmnUcO8a-bcQ,901
+codeanalyzer_python-0.1.11.dist-info/RECORD,,