Merge remote-tracking branch 'upstream/main' into demo

Author: jgchn

.github/workflows/pdl-live-react-tests.yml

@@ -24,23 +24,11 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version: 22
-      - name: Install Linux dependencies
-        # only if we ever add a drawer menu libappindicator3-dev
-        # re: at-spi2-core, Warning **: Error retrieving accessibility bus address:
-        run: sudo apt update && sudo apt install -y libgtk-3-dev libwebkit2gtk-4.1-dev librsvg2-dev patchelf at-spi2-core
-      - name: Install NodeJs dependencies
-        run: npm ci
+      - name: Install dependencies
+        run: |
+          npm ci & sudo apt update && sudo apt install -y libgtk-3-dev libwebkit2gtk-4.1-dev librsvg2-dev patchelf at-spi2-core
+          wait
       - name: Install Playwright Browsers
         run: npx playwright install --with-deps
       - name: Test pdl-live viewer
         run: npm test
-      - name: Test production build
-        run: npm run tauri build
-      - name: Setup xvfb for screen 0
-        run: Xvfb :1 -screen 0 1600x1200x24 &      
-      - name: Run production build
-        env:
-          DISPLAY: :1
-        run: ./src-tauri/target/release/pdl run | grep Usage
-      - name: Tear down xvfb
-        run: killall Xvfb  

.github/workflows/tauri-cli.yml

@@ -0,0 +1,58 @@
+name: Tauri CLI Tests
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+# cancel any prior runs for this workflow and this PR (or branch)
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  cli:
+    name: Test pdl CLI using Tauri
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: ./pdl-live-react
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up node
+        uses: actions/setup-node@v4
+        with:
+          node-version: 22
+      - name: Install dependencies
+        # sleep 2 to wait for ollama to be running... hack warning
+        run: |
+          npm ci & sudo apt update && \
+            sudo apt install -y libgtk-3-dev libwebkit2gtk-4.1-dev librsvg2-dev patchelf at-spi2-core && \
+            (curl -fsSL https://ollama.com/install.sh | sudo -E sh && sleep 2)
+          wait
+      - name: Test production build
+        run: npm run tauri build -- --bundles deb # Skip testing appimage, is this dangerous? It's slow...
+      - name: Setup xvfb for screen 0
+        run: Xvfb :1 -screen 0 1600x1200x24 &
+
+      - name: Run production build
+        env:
+          DISPLAY: :1
+        run: |
+          PATH=./src-tauri/target/release/:$PATH
+          
+          # 1. `run` subcommand works without any arguments
+          pdl run | grep Usage
+
+          # 2. `run` subcommand works with UI demos (yaml source)
+          pdl run ./demos/demo1.pdl | grep 'write a hello'
+
+          # 3. `run` subcommand works with UI demos (json source)
+          # demo8 uses a private model? not sure
+          for i in ./src/demos/*.json
+          do if [[ $(basename $i) != "demo8.json" ]]; then pdl run $i; fi
+          done
+
+      - name: Tear down xvfb
+        run: killall Xvfb  

pdl-live-react/package.json

@@ -16,9 +16,8 @@
     "test:ui": "playwright install --with-deps && playwright test",
     "types": "(cd .. && python -m src.pdl.pdl --schema > src/pdl/pdl-schema.json) && json2ts ../src/pdl/pdl-schema.json src/pdl_ast.d.ts --unreachableDefinitions && npm run format",
     "test": "concurrently -n 'quality,playwright' 'npm run test:quality' 'npm run test:ui'",
-    "pdl": "./src-tauri/target/debug/PDL",
+    "pdl": "./src-tauri/target/debug/pdl",
     "view": "npm run pdl view",
-    "prep-interpreter": "python3.12 -mvenv .venv && . .venv/bin/activate && pip install -e .. && pip freeze > requirements.txt",
     "start": "npm run tauri dev"
   },
   "dependencies": {

pdl-live-react/requirements.txt

@@ -1,66 +1,2 @@
-aiohappyeyeballs==2.4.6
-aiohttp==3.11.13
-aiosignal==1.3.2
-alchemy-config==1.1.3
-annotated-types==0.7.0
-anyio==4.8.0
-asttokens==3.0.0
-attrs==25.1.0
-certifi==2025.1.31
-charset-normalizer==3.4.1
-click==8.1.8
-decorator==5.2.1
-distro==1.9.0
-executing==2.2.0
-filelock==3.17.0
-frozenlist==1.5.0
-fsspec==2025.2.0
-granite-io==0.1.0
-h11==0.14.0
-httpcore==1.0.7
-httpx==0.28.1
-huggingface-hub==0.29.1
-idna==3.10
-importlib_metadata==8.6.1
-ipython==9.0.1
-jedi==0.19.2
-Jinja2==3.1.6
-jiter==0.8.2
-json_repair==0.39.1
-jsonschema==4.23.0
-jsonschema-specifications==2024.10.1
-litellm==1.61.20
-MarkupSafe==3.0.2
-matplotlib-inline==0.1.7
-multidict==6.1.0
-openai==1.65.2
-packaging==24.2
-parso==0.8.4
-pexpect==4.9.0
-#-e git+ssh://[email protected]/IBM/prompt-declaration-language.git#egg=prompt_declaration_language
-prompt-declaration-language==0.4.1
-prompt_toolkit==3.0.50
-propcache==0.3.0
-ptyprocess==0.7.0
-pure_eval==0.2.3
-pydantic==2.10.6
-pydantic_core==2.27.2
-Pygments==2.19.1
-python-dotenv==1.0.1
-PyYAML==6.0.2
-referencing==0.36.2
-regex==2024.11.6
-requests==2.32.3
-rpds-py==0.23.1
-sniffio==1.3.1
-stack-data==0.6.3
-termcolor==2.5.0
-tiktoken==0.9.0
-tokenizers==0.21.0
-tqdm==4.67.1
-traitlets==5.14.3
-typing_extensions==4.12.2
-urllib3==2.3.0
-wcwidth==0.2.13
-yarl==1.18.3
-zipp==3.21.0
+-e git+https://github.com/IBM/prompt-declaration-language.git#egg=prompt_declaration_language
+#prompt-declaration-language==0.4.1