Merge branch '137-feature-request-feature-parity-between-java-and-python-analysis' of github.com:codellm-devkit/python-sdk into 137-feature-request-feature-parity-between-java-and-python-analysis

Author: rahlk

.devcontainer/Dockerfile

@@ -35,7 +35,7 @@ RUN groupadd --gid $USER_GID $USERNAME \
 # Set up the Python development environment
 WORKDIR /python-sdk
 RUN python3 -m pip install --upgrade pip wheel && \
-    pip3 install poetry==1.8.5
+    pip3 install uv
 
 # Enable color terminal for docker exec bash
 ENV TERM=xterm-256color

.devcontainer/devcontainer.json

@@ -49,7 +49,6 @@
 				"ms-python.pylint",
 				"ms-python.flake8",
 				"ms-python.black-formatter",
-				"zeshuaro.vscode-python-poetry",
 				"njpwerner.autodocstring",
 				"wholroyd.jinja",
 				"yzhang.markdown-all-in-one",
@@ -67,5 +66,5 @@
 			]
 		}
 	},
-	"postCreateCommand": "sudo poetry config virtualenvs.create false && sudo poetry install; echo '---'; python3 --version; echo '---'; java -version; echo '---'; mvn --version; echo '--'; clang --version; echo '---';"
+	"postCreateCommand": "uv sync --all-groups; echo '---'; python3 --version; echo '---'; java -version; echo '---'; mvn --version; echo '--'; clang --version; echo '---';"
 }

.github/workflows/release.yml

@@ -1,4 +1,4 @@
-name: Python Poetry Release
+name: Python uv Release
 
 on:
   push:
@@ -16,11 +16,6 @@ jobs:
       - name: Check out code
         uses: actions/checkout@v4
 
-      - name: Set up Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: '3.11'
-
       - name: Set up GraalVM CE Java 11
         uses: graalvm/setup-graalvm@v1
         with:
@@ -32,21 +27,21 @@ jobs:
       - name: Install jq
         run: sudo apt-get update && sudo apt-get install -y jq
 
-      - name: Install Poetry
-        run: |
-          curl -sSL https://install.python-poetry.org | python3 -
-          echo "${HOME}/.local/bin" >> $GITHUB_PATH
-          export PATH="${HOME}/.local/bin:$PATH"
+      - name: Install uv
+        uses: astral-sh/setup-uv@v4
+        with:
+          enable-cache: true
+
+      - name: Set up Python
+        run: uv python install 3.11
 
       - name: Install Python package dependencies
-        run: |
-          poetry config virtualenvs.create false
-          poetry install --sync --no-interaction
+        run: uv sync --all-groups --frozen
 
       - name: Run Tests
         id: test
         continue-on-error: true
-        run: poetry run make test
+        run: uv run make test
 
       - name: Delete tag on failure
         if: steps.test.conclusion == 'failure'
@@ -64,7 +59,7 @@ jobs:
           mv codeanalyzer-*.jar ${{ github.workspace }}/cldk/analysis/java/codeanalyzer/jar/
 
       - name: Build Package
-        run: poetry build
+        run: uv build
 
       - name: Read Changelog Entry
         id: changelog_reader
@@ -92,4 +87,4 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Publish package distributions to PyPI
-        run: poetry publish --username __token__ --password ${{ secrets.PYPI_API_TOKEN }}
+        run: uv publish --token ${{ secrets.PYPI_API_TOKEN }}

Makefile

@@ -13,25 +13,24 @@ all: help
 .PHONY: venv
 venv: ## Create a Python virtual environment
 	$(info Creating Python 3 virtual environment...)
-	poetry shell
+	uv venv
 
 .PHONY: install
 install: ## Install Python dependencies in virtual environment
 	$(info Installing dependencies...)
-	poetry config virtualenvs.in-project true
-	poetry install --all-extras
+	uv sync --all-groups
 
 .PHONY: lint
 lint: ## Run the linter
 	$(info Running linting...)
-	flake8 cldk --count --select=E9,F63,F7,F82 --show-source --statistics
-	flake8 cldk --count --max-complexity=10 --max-line-length=180 --statistics
-	pylint cldk --max-line-length=180
+	uv run flake8 cldk --count --select=E9,F63,F7,F82 --show-source --statistics
+	uv run flake8 cldk --count --max-complexity=10 --max-line-length=180 --statistics
+	uv run pylint cldk --max-line-length=180
 
 .PHONY: test
 test: ## Run the unit tests
 	$(info Running tests...)
-	pytest --pspec --cov=cldk --cov-fail-under=75 --disable-warnings
+	uv run pytest --pspec --cov=cldk --cov-fail-under=75 --disable-warnings
 
 ##@ Build
 
@@ -56,4 +55,4 @@ build: ## Builds a new Python wheel
 	mv codeanalyzer-*.jar cldk/analysis/java/codeanalyzer/jar/
 
 	# Build the package
-	poetry build
+	uv build

pyproject.toml

@@ -1,13 +1,16 @@
-[tool.poetry]
+[project]
 name = "cldk"
 version = "1.0.7"
 description = "The official Python SDK for Codellm-Devkit."
-authors = ["Rahul Krishna <i.m.ralk@gmail.com>", "Rangeet Pan <rangeet.pan@ibm.com>", "Saurabh Sinhas <sinhas@us.ibm.com>",
-            "Raju Pavuluri <pavuluri@us.ibm.com>"]
-license = "Apache 2.0"
 readme = "README.md"
-homepage = "https://codellm-devkit.info"
-repository = "https://github.com/codellm-devkit/python-sdk"
+license = { text = "Apache-2.0" }
+requires-python = ">=3.11"
+authors = [
+    { name = "Rahul Krishna", email = "i.m.ralk@gmail.com" },
+    { name = "Rangeet Pan", email = "rangeet.pan@ibm.com" },
+    { name = "Saurabh Sinhas", email = "sinhas@us.ibm.com" },
+    { name = "Raju Pavuluri", email = "pavuluri@us.ibm.com" },
+]
 keywords = ["ibm", "llm", "large language models", "code analyzer", "syntax tree"]
 classifiers = [
     "Development Status :: 4 - Beta",
@@ -20,56 +23,69 @@ classifiers = [
     "Programming Language :: Python :: 3.11",
     "Topic :: Scientific/Engineering :: Artificial Intelligence",
     "Topic :: Software Development :: Libraries :: Python Modules",
-    "Topic :: Software Development :: Libraries :: Application Frameworks"
+    "Topic :: Software Development :: Libraries :: Application Frameworks",
+]
+dependencies = [
+    "pydantic>=2.10.6,<3",
+    "networkx>=3.4.2,<4",
+    "pyarrow==20.0.0",
+    "tree-sitter==0.24.0",
+    "rich==14.0.0",
+    "wget==3.2",
+    "requests>=2.32.3,<3",
+    "tree-sitter-java==0.23.5",
+    "tree-sitter-c==0.23.5",
+    "tree-sitter-go==0.23.4",
+    "tree-sitter-python==0.23.6",
+    "tree-sitter-javascript==0.23.1",
+    "clang==17.0.6",
+    "libclang==17.0.6",
+    "codeanalyzer-python==0.1.14",
+]
+
+[project.urls]
+Homepage = "https://codellm-devkit.info"
+Repository = "https://github.com/codellm-devkit/python-sdk"
+
+[dependency-groups]
+dev = [
+    "ipdb>=0.13.13,<0.14",
+    "ipython>=8.32.0,<9",
+]
+test = [
+    "toml>=0.10.2,<0.11",
+    "pytest==8.3.5",
+    "pytest-pspec>=0.0.4,<0.0.5",
+    "pytest-cov>=6.0.0,<7",
+    "pylint>=3.3.4,<4",
+    "flake8>=7.1.1,<8",
+    "black>=25.1.0,<26",
+    "coverage>=7.6.10,<8",
+    "jupyter>=1.1.1,<2",
 ]
+
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+
+[tool.hatch.build]
+artifacts = ["cldk/analysis/java/codeanalyzer/jar/*.jar"]
+
+[tool.hatch.build.targets.wheel]
+packages = ["cldk"]
+
+[tool.hatch.build.targets.sdist]
 include = [
+    "cldk",
     "LICENSE",
-    "cldk/analysis/java/codeanalyzer/jar/*.jar"
+    "README.md",
+    "CHANGELOG.md",
 ]
 
 [tool.backend-versions]
 codeanalyzer-java = "2.3.7"
 codeanalyzer-python = "0.1.14"
 
-[tool.poetry.dependencies]
-python = ">=3.11"
-pydantic = "^2.10.6"
-#pandas = "^2.2.3"
-networkx = "^3.4.2"
-pyarrow = "20.0.0"
-tree-sitter = "0.24.0"
-rich = "14.0.0"
-wget = "3.2"
-requests = "^2.32.3"
-tree-sitter-java = "0.23.5"
-tree-sitter-c = "0.23.5"
-tree-sitter-go = "0.23.4"
-tree-sitter-python = "0.23.6"
-tree-sitter-javascript = "0.23.1"
-clang = "17.0.6"
-libclang = "17.0.6"
-codeanalyzer-python = "0.1.14"
-
-[tool.poetry.group.dev.dependencies]
-ipdb = "^0.13.13"
-ipython = "^8.32.0"
-
-[tool.poetry.group.test.dependencies]
-# Test dependencies
-toml = "^0.10.2"
-pytest = "8.3.5"
-pytest-pspec = "^0.0.4"
-pytest-cov = "^6.0.0"
-pylint = "^3.3.4"
-flake8 = "^7.1.1"
-black = "^25.1.0"
-coverage = "^7.6.10"
-jupyter = "^1.1.1"
-
-[build-system]
-requires = ["poetry-core"]
-build-backend = "poetry.core.masonry.api"
-
 ########################################
 # Tool configurations
 ########################################