Merge branch 'main' into price-parser

.github/workflows/python.yml

@@ -18,13 +18,20 @@ jobs:
       - name: Check if current version is published
         id: pre-val
         run: |
-          LOCAL_VERSION=$(grep '^version =' pyproject.toml | head -1 | awk -F '"' '{print $2}')
-          REMOTE_VERSION=$(curl -s https://pypi.org/pypi/tarsier/json | jq -r .info.version)
+          LOCAL_CORE_VERSION=$(grep '^version =' core/pyproject.toml | head -1 | awk -F '"' '{print $2}')
+          LOCAL_SDK_VERSION=$(grep '^version =' sdk/pyproject.toml | head -1 | awk -F '"' '{print $2}')
+          REMOTE_VERSION=$(curl -s https://pypi.org/pypi/harambe/json | jq -r .info.version)
 
-          echo "Local version: $LOCAL_VERSION"
+          echo "Local core version: $LOCAL_CORE_VERSION"
+          echo "Local SDK version: $LOCAL_SDK_VERSION"
           echo "Remote version: $REMOTE_VERSION"
+          
+          if [ $LOCAL_CORE_VERSION != $LOCAL_SDK_VERSION ]; then
+              echo "Core and SDK versions do not match"
+              exit 1
+          fi
 
-          if [ "$LOCAL_VERSION" != "$REMOTE_VERSION" ]; then
+          if [ "$LOCAL_SDK_VERSION" != "$REMOTE_VERSION" ]; then
               echo "Version $LOCAL_VERSION is not published yet"
               echo "::set-output name=should_publish::true"
           fi
@@ -33,46 +40,68 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Install poetry
-        run: pipx install poetry
-      - uses: actions/setup-python@v5
-        with:
-          python-version: ${{ env.PYTHON_VERSION }}
-          cache: 'poetry'
-      - run: make RESOLVE_DEPS
-      - name: Check code formatting
-        run: make FORMAT_CHECK
-      - name: Run linter
-        run: make LINT_CHECK
+      - name: Install uv
+        uses: astral-sh/setup-uv@v2
+      - name: Set up Python
+        run: uv python install ${{ env.PYTHON_VERSION }}
+      - name: Run ruff check
+        run: uvx ruff format --check .
 
-  pytest:
+  pytest-core:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Install poetry
-        run: pipx install poetry
-      - uses: actions/setup-python@v5
-        with:
-          python-version: ${{ env.PYTHON_VERSION }}
-          cache: 'poetry'
-      - run: make RESOLVE_DEPS
+      - name: Install uv
+        uses: astral-sh/setup-uv@v2
+      - name: Set up Python
+        run: uv python install ${{ env.PYTHON_VERSION }}
       - name: Run pytest
-        run: make TEST
+        working-directory: core
+        run: uv run pytest -vv --cov="${{ inputs.package }}" .
+
+  pytest-sdk:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install uv
+        uses: astral-sh/setup-uv@v2
+      - name: Set up Python
+        run: uv python install ${{ env.PYTHON_VERSION }}
+      - name: Install playwright
+        working-directory: sdk
+        run:  uv run playwright install chromium firefox webkit --with-deps
+      - name: Run pytest
+        working-directory: sdk
+        run: uv run pytest -vv --cov="${{ inputs.package }}" .
+
+  publish-core:
+    needs: [ check-version, format, pytest-core, pytest-sdk ]
+    runs-on: ubuntu-latest
+    if: github.ref == 'refs/heads/main' && needs.check-version.outputs.should_publish == 'true'
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install uv
+        uses: astral-sh/setup-uv@v2
+      - name: Set up Python
+        run: uv python install ${{ env.PYTHON_VERSION }}
+      - name: Build and Publish
+        working-directory: core
+        run: |
+          uv build
+          uv publish --token ${{ secrets.PYPI_TOKEN_CORE }}
 
-  publish:
-    needs: [ check-version, format, pytest ]
+  publish-sdk:
+    needs: [ check-version, format, pytest-core, pytest-sdk ]
     runs-on: ubuntu-latest
     if: github.ref == 'refs/heads/main' && needs.check-version.outputs.should_publish == 'true'
     steps:
       - uses: actions/checkout@v4
-      - name: Install poetry
-        run: pipx install poetry
-      - uses: actions/setup-python@v5
-        with:
-          python-version: ${{ env.PYTHON_VERSION }}
-          cache: "poetry"
-      - run: make RESOLVE_DEPS
+      - name: Install uv
+        uses: astral-sh/setup-uv@v2
+      - name: Set up Python
+        run: uv python install ${{ env.PYTHON_VERSION }}
       - name: Build and Publish
+        working-directory: sdk
         run: |
-          poetry config pypi-token.pypi ${{ secrets.PYPI_TOKEN }}
-          poetry publish --build
+          uv build
+          uv publish --token ${{ secrets.PYPI_TOKEN }}

.gitignore

@@ -149,3 +149,5 @@ cython_debug/
 *.bin
 /screenshots/
 /data/
+*.venv
+*.DS_Store

.python-version

@@ -0,0 +1 @@
+3.12

check.sh

@@ -0,0 +1,11 @@
+cd "$(dirname "$0")" || exit 1
+
+cd core || exit 1
+uv run ruff format .
+uv run pytest . || exit 1
+cd - || exit 1
+
+cd sdk || exit 1
+uv run ruff format .
+uv run pytest . || exit 1
+cd - || exit 1

core/.python-version

@@ -0,0 +1 @@
+3.12

core/harambe_core/__init__.py

@@ -0,0 +1,8 @@
+from .types import Schema
+from .parser import SchemaParser
+
+
+__all__ = [
+    "Schema",
+    "SchemaParser",
+]

core/harambe_core/errors.py

@@ -0,0 +1,14 @@
+class HarambeException(Exception):
+    """Base exception for all custom exceptions in Harambe."""
+
+    pass
+
+
+class SchemaValidationError(HarambeException):
+    def __init__(self, message: str = None):
+        super().__init__(message)
+
+
+class CaptchaError(HarambeException):
+    def __init__(self, message: str = "CAPTCHA was hit.") -> None:
+        super().__init__(message)

core/harambe_core/parser/__init__.py

@@ -0,0 +1,5 @@
+from .parser import SchemaParser
+
+__all__ = [
+    "SchemaParser",
+]

core/harambe_core/parser/expression/__init__.py

@@ -0,0 +1,4 @@
+from .evaluator import ExpressionEvaluator
+from . import functions  # noqa
+
+__all__ = ["ExpressionEvaluator"]