.github/workflows/python-publish.yml

@@ -0,0 +1,51 @@
+# This workflow will upload a Python Package to PyPi when a Release is created
+name: Publish Python Package
+
+on:
+  release:
+    types: [published]
+
+permissions:
+  contents: read
+
+env:
+  PYPI_USERNAME: __token__
+  PYPI_PASSWORD: ${{ secrets.PYPI_API_TOKEN }}
+
+jobs:
+  publish:
+    name: Publish to PyPi
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout the code
+        uses: actions/checkout@v4
+
+      - name: Set up Python 3.11
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.11"
+
+      - name: Install Poetry
+        run: |
+          curl -sSL https://install.python-poetry.org | python - -y
+          echo "$HOME/.local/bin" >> $GITHUB_PATH
+
+      - name: Install Python package dependencies
+        run: |
+          poetry config virtualenvs.create false
+          poetry install --sync --no-interaction
+
+      - name: Inject the latest Code Analyzer JAR
+        run: |
+          CODE_ANALYZER_URL=$(curl -s https://api.github.com/repos/IBM/codenet-minerva-code-analyzer/releases/latest | jq -r '.assets[] | .browser_download_url')
+          echo "Downloading: " $CODE_ANALYZER_URL
+          wget -q $CODE_ANALYZER_URL
+          echo "Moving codeanalyzer.jar to:" ${{ github.workspace }}/cldk/analysis/java/codeanalyzer/jar/codeanalyzer.jar
+          mv codeanalyzer.jar ${{ github.workspace }}/cldk/analysis/java/codeanalyzer/jar/codeanalyzer.jar
+
+      - name: Build package
+        run: poetry build
+
+      - name: Publish package distributions to PyPI
+        run: poetry publish --username $PYPI_USERNAME --password $PYPI_PASSWORD

cldk/models/java/models.py

@@ -1,11 +1,12 @@
-import re
 import json
-from ipdb import set_trace
+import re
 from contextvars import ContextVar
 from typing import Dict, List, Optional
-from .constants_namespace import ConstantsNamespace
+
 from pydantic import BaseModel, field_validator, model_validator
 
+from .constants_namespace import ConstantsNamespace
+
 constants = ConstantsNamespace()
 context_concrete_class = ContextVar("context_concrete_class")  # context var to store class concreteness
 

cldk/models/treesitter/models.py

@@ -28,7 +28,9 @@ class Capture:
         name: str
 
     def __init__(self, captures: List[Tuple[Node, str]]):
-        self.captures = [self.Capture(node=node, name=text) for node, text in captures]
+        self.captures = []
+        for capture_name, captures in captures.items():
+            self.captures = [self.Capture(node=node, name=capture_name) for node in captures]
 
     def __getitem__(self, index: int) -> Capture:
         """Get the capture at the specified index.