Correct the release chart package workflow

Author: jakubno

.github/workflows/charts_tests.yml

@@ -20,7 +20,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: '3.8'
+          python-version: '3.10'
 
       - name: Install and configure Poetry
         uses: snok/install-poetry@v1
@@ -37,4 +37,4 @@ jobs:
         run: poetry build
 
       - name: Run tests
-        run: poetry run pytest -n 4 --verbose -x
+        run: poetry run pytest --verbose -x

.github/workflows/pr.yml

@@ -56,9 +56,9 @@ jobs:
     uses: ./.github/workflows/js_tests.yml
     secrets: inherit
 
-  js-tests:
+  charts-tests:
     needs: [ changes ]
-    name: Tests JS package
+    name: Tests Chart package
     #    If the PR does not have the label 'js-rc', the code is already tested in the prerelease workflow
     if: needs.changes.outputs.charts == 'true' && !contains( github.event.pull_request.labels.*.name, 'charts-rc')
     uses: ./.github/workflows/charts_tests.yml

.github/workflows/release.yml

@@ -56,6 +56,8 @@ jobs:
     outputs:
       js: ${{ steps.filter.outputs.js }}
       python: ${{ steps.filter.outputs.python }}
+      charts: ${{ steps.filter.outputs.charts }}
+      template: ${{ steps.filter.outputs.template }}
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3
@@ -82,6 +84,10 @@ jobs:
               - 'js/**'
             python:
               - 'python/**'
+            charts:
+              - 'chart_data_extractor/**'
+            template:
+              - 'template/**'
 
   charts-tests:
     name: Charts tests
@@ -93,34 +99,59 @@ jobs:
     name: Charts release
     needs: [charts-tests]
     if: needs.changes.outputs.charts == 'true'
-    defaults:
-      run:
-        working-directory: ./charts
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v3
 
+      - name: Install pnpm
+        uses: pnpm/action-setup@v3
+        id: pnpm-install
+        with:
+          version: 9.5
+
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.10'
+
+      - name: Install and configure Poetry
+        uses: snok/install-poetry@v1
+        with:
+          version: 1.5.1
+          virtualenvs-create: true
+          virtualenvs-in-project: true
+          installer-parallel: true
+
+      - name: Configure pnpm
+        run: |
+          pnpm config set auto-install-peers true
+          pnpm config set exclude-links-from-lockfile true
+
+      - name: Install dependencies
+        run: pnpm install --frozen-lockfile
+
       - name: Create new versions
         run: pnpm run version
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Release new versions
-        uses: changesets/action@v1
-        with:
-          publish: pnpm run publish
-          createGithubReleases: true
+        run: |
+          poetry build
+          poetry config pypi-token.pypi ${PYPI_TOKEN}
+          poetry publish --skip-existing
+        working-directory:  ./chart_data_extractor
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+          PYPI_TOKEN: ${{ secrets.CHARTS_PYPI_TOKEN }}
 
 
   build-docker-image:
     name: Build Docker Image
     runs-on: ubuntu-latest
     needs: [changes, charts-release]
-    if: !cancelled() && needs.changes.outputs.template == 'true' || needs.changes.outputs.charts == 'true'
+    if: needs.changes.outputs.template == 'true' || needs.changes.outputs.charts == 'true'
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3
@@ -147,10 +178,10 @@ jobs:
             --tag ${{ secrets.DOCKERHUB_USERNAME }}/code-interpreter:latest .
 
   build-template:
-    name: Build Docker Image
+    name: Build E2B template
     runs-on: ubuntu-latest
     needs: [build-docker-image]
-    if: !cancelled() && needs.changes.outputs.template == 'true' || needs.changes.outputs.charts == 'true'
+    if: needs.changes.outputs.template == 'true' || needs.changes.outputs.charts == 'true'
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3
@@ -168,20 +199,29 @@ jobs:
   python-tests:
     name: Python Tests
     needs: [changes, build-template]
-    if: !cancelled() && needs.changes.outputs.python == 'true' || needs.changes.outputs.template == 'true'
+    if: always() && 
+      !contains(needs.*.result, 'failure') &&
+      !contains(needs.*.result, 'cancelled') &&
+      (needs.changes.outputs.python == 'true' || needs.changes.outputs.template == 'true')
     uses: ./.github/workflows/python_tests.yml
     secrets: inherit
 
   js-tests:
     name: JS Tests
-    needs: [changes]
-    if: !cancelled() && needs.changes.outputs.js == 'true' || needs.changes.outputs.template == 'true'
+    needs: [changes, build-template]
+    if: always() && 
+      !contains(needs.*.result, 'failure') &&
+      !contains(needs.*.result, 'cancelled') &&
+      (needs.changes.outputs.js == 'true' || needs.changes.outputs.template == 'true')
     uses: ./.github/workflows/js_tests.yml
     secrets: inherit
 
   release:
     needs: [python-tests, js-tests]
-    if: (!cancelled()) && !contains(needs.*.result, 'failure') && needs.is_release.outputs.release == 'true'
+    if: always() && 
+      !contains(needs.*.result, 'failure') &&
+      !contains(needs.*.result, 'cancelled') &&
+      (needs.changes.outputs.js == 'true' || needs.changes.outputs.python == 'true')
     name: Release
     runs-on: ubuntu-latest
     steps:

chart_data_extractor/e2b_charts/graphs/bars.py

@@ -4,6 +4,7 @@
 from pydantic import BaseModel, Field
 
 from .base import Graph2D, GraphType
+from ..utils.rounding import dynamic_round
 
 
 class BarData(BaseModel):
@@ -48,6 +49,7 @@ class BoxAndWhiskerData(BaseModel):
     median: float
     third_quartile: float
     max: float
+    outliers: List[float]
 
 
 class BoxAndWhiskerGraph(Graph2D):
@@ -57,21 +59,23 @@ class BoxAndWhiskerGraph(Graph2D):
 
     def _extract_info(self, ax: Axes) -> None:
         super()._extract_info(ax)
+        labels = [item.get_text() for item in ax.get_xticklabels()]
 
         boxes = []
-        for box in ax.patches:
+        for label, box in zip(labels, ax.patches):
             vertices = box.get_path().vertices
-            x_vertices = vertices[:, 0]
-            y_vertices = vertices[:, 1]
+            x_vertices = [dynamic_round(x) for x in vertices[:, 0]]
+            y_vertices = [dynamic_round(y) for y in vertices[:, 1]]
             x = min(x_vertices)
             y = min(y_vertices)
             boxes.append(
                 {
                     "x": x,
                     "y": y,
-                    "label": box.get_label(),
-                    "width": round(max(x_vertices) - x, 4),
-                    "height": round(max(y_vertices) - y, 4),
+                    "label": label,
+                    "width": max(x_vertices) - x,
+                    "height": max(y_vertices) - y,
+                    "outliers": [],
                 }
             )
 
@@ -85,13 +89,21 @@ def _extract_info(self, ax: Axes) -> None:
                 box["x"], box["y"] = box["y"], box["x"]
                 box["width"], box["height"] = box["height"], box["width"]
 
-        for line in ax.lines:
-            xdata = line.get_xdata()
-            ydata = line.get_ydata()
+        for i, line in enumerate(ax.lines):
+            xdata = [dynamic_round(x) for x in line.get_xdata()]
+            ydata = [dynamic_round(y) for y in line.get_ydata()]
 
             if orientation == "vertical":
                 xdata, ydata = ydata, xdata
 
+            if len(xdata) == 1:
+                for box in boxes:
+                    if box["x"] <= xdata[0] <= box["x"] + box["width"]:
+                        break
+                else:
+                    continue
+
+                box["outliers"].append(ydata[0])
             if len(ydata) != 2:
                 continue
             for box in boxes:
@@ -101,6 +113,7 @@ def _extract_info(self, ax: Axes) -> None:
                 continue
 
             if (
+                # Check if the line is inside the box, prevent floating point errors
                 ydata[0] == ydata[1]
                 and box["y"] <= ydata[0] <= box["y"] + box["height"]
             ):
@@ -122,6 +135,7 @@ def _extract_info(self, ax: Axes) -> None:
                 median=box["median"],
                 third_quartile=box["y"] + box["height"],
                 max=box["whisker_upper"],
+                outliers=box["outliers"],
             )
             for box in boxes
         ]

chart_data_extractor/e2b_charts/graphs/pie.py

@@ -1,9 +1,11 @@
+from decimal import Decimal
 from typing import Literal, List
 
 from matplotlib.axes import Axes
 from pydantic import BaseModel, Field
 
 from .base import Graph, GraphType
+from ..utils.rounding import dynamic_round
 
 
 class PieData(BaseModel):
@@ -23,7 +25,7 @@ def _extract_info(self, ax: Axes) -> None:
         for wedge in ax.patches:
             pie_data = PieData(
                 label=wedge.get_label(),
-                angle=abs(round(wedge.theta2 - wedge.theta1, 4)),
+                angle=abs(dynamic_round(Decimal(wedge.theta2) - Decimal(wedge.theta1))),
                 radius=wedge.r,
             )
 

chart_data_extractor/e2b_charts/main.py

@@ -9,7 +9,7 @@
 from matplotlib.text import Text
 from pydantic import Field
 
-from e2b_data_extraction.graphs import (
+from .graphs import (
     GraphType,
     Graph,
     LineGraph,
@@ -18,7 +18,7 @@
     PieGraph,
     ScatterGraph,
 )
-from e2b_data_extraction.utils.filtering import is_grid_line
+from .utils.filtering import is_grid_line
 
 
 class SuperGraph(Graph):

chart_data_extractor/e2b_charts/utils/rounding.py

@@ -0,0 +1,13 @@
+from decimal import Decimal, localcontext
+
+
+def dynamic_round(number):
+    # Convert to Decimal for precise control
+    decimal_number = Decimal(str(number))
+
+    # Dynamically determine precision based on magnitude
+    precision = max(1, 8 - decimal_number.adjusted())  # 8 digits of precision
+
+    with localcontext() as ctx:
+        ctx.prec = precision  # Set the dynamic precision
+        return +decimal_number  # The + operator applies rounding

chart_data_extractor/package.json

@@ -1,12 +1,11 @@
 {
   "name": "@e2b/data-extractor",
   "private": true,
-  "version": "0.0.0",
+  "version": "0.0.1",
   "scripts": {
     "test": "poetry run pytest -n 4 --verbose -x",
     "example": "poetry run python3 example.py",
     "postVersion": "poetry version $(pnpm pkg get version --workspaces=false | tr -d \\\")",
-    "postPublish": "poetry build && poetry config pypi-token.pypi ${PYPI_TOKEN} && poetry publish --skip-existing",
     "pretest": "poetry install"
   }
 }

chart_data_extractor/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
-name = "e2b-code-interpreter-data-extraction"
-version = "0.0.0"
+name = "e2b-charts"
+version = "0.0.1"
 description = "Package for extracting data for E2B Code Interpreter"
 authors = ["e2b <[email protected]>"]
 license = "Apache-2.0"