Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into xenova
Browse files Browse the repository at this point in the history
  • Loading branch information
pelikhan committed Jul 1, 2024
2 parents 9dc3e50 + ea66031 commit 181a0cf
Show file tree
Hide file tree
Showing 274 changed files with 19,908 additions and 7,749 deletions.
45 changes: 24 additions & 21 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,22 +1,25 @@
{
"image": "mcr.microsoft.com/devcontainers/javascript-node:20",
"postCreateCommand": "yarn install --frozen-lockfile --prefer-offline",
"customizations": {
"vscode": {
"extensions": [
"GitHub.copilot-chat",
"esbenp.prettier-vscode",
"dbaeumer.vscode-eslint",
"bierner.markdown-mermaid",
"yoavbls.pretty-ts-errors",
"kejun.markdown-alert",
"astro-build.astro-vscode",
"unifiedjs.vscode-mdx",
"streetsidesoftware.code-spell-checker"
]
}
},
"features": {
"ghcr.io/devcontainers/features/docker-in-docker:2": {}
}
}
"image": "mcr.microsoft.com/devcontainers/javascript-node:20",
"postCreateCommand": "yarn install --frozen-lockfile --prefer-offline",
"customizations": {
"vscode": {
"extensions": [
"GitHub.copilot-chat",
"esbenp.prettier-vscode",
"dbaeumer.vscode-eslint",
"bierner.markdown-mermaid",
"yoavbls.pretty-ts-errors",
"kejun.markdown-alert",
"astro-build.astro-vscode",
"unifiedjs.vscode-mdx",
"streetsidesoftware.code-spell-checker",
"file-icons.file-icons"
]
}
},
"features": {
"ghcr.io/devcontainers/features/docker-in-docker:2": {},
"ghcr.io/devcontainers/features/azure-cli:1.2.5": {},
"ghcr.io/devcontainers/features/python:1.6.1": {}
}
}
9 changes: 4 additions & 5 deletions .github/workflows/build-genai.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ on:
- "packages/core/**"
- "packages/sample/**"
- "packages/cli/**"

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
jobs:
build:
runs-on: ubuntu-latest
Expand All @@ -37,10 +39,7 @@ jobs:
- name: download ollama docker
run: docker run -d -v ollama:/root/.ollama -p 11434:11434 --name ollama ollama/ollama
- name: run test within scripts
run: yarn test:scripts --out-summary ./summary.txt --test-delay 10
- name: Append summary.txt to $GITHUB_STEP_SUMMARY
run: |
cat packages/sample/summary.txt >> $GITHUB_STEP_SUMMARY
run: yarn test:scripts --out-summary $GITHUB_STEP_SUMMARY --test-delay 10
- name: Add comment to PR
uses: actions/github-script@v5
if: github.event_name == 'pull_request'
Expand Down
10 changes: 2 additions & 8 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ jobs:
build:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [20, 22]
matrix:
node-version: [20, 22]
steps:
- uses: actions/checkout@v4
with:
Expand All @@ -35,11 +35,5 @@ jobs:
run: yarn test:samples
- name: docs
run: yarn build:docs
- name: run cli
run: node packages/cli/built/genaiscript.cjs run code-xray packages/sample/src/counting.gpspec.md --prompt -ot $GITHUB_STEP_SUMMARY -l single
- name: run cli pipe
run: cat packages/sample/src/counting.gpspec.md | node packages/cli/built/genaiscript.cjs run code-xray --prompt -ot $GITHUB_STEP_SUMMARY -l multi
- name: run cli glob
run: node packages/cli/built/genaiscript.cjs run code-xray packages/sample/src/counting.py packages/sample/src/*.ts --prompt -o .genaiscript/tmp/cli -ot $GITHUB_STEP_SUMMARY -l glob
- name: package vscode
run: yarn package
7 changes: 3 additions & 4 deletions .github/workflows/genai-alt-text.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,9 @@ on:
workflow_dispatch:
schedule:
- cron: "0 4 * * *"
pull_request:
paths:
- "docs/src/**/*.png"

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
jobs:
build:
runs-on: ubuntu-latest
Expand Down
76 changes: 76 additions & 0 deletions .github/workflows/genai-commander.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
name: genai commander
on:
issue_comment:
types: [created]
jobs:
pr_commented:
# must be PR and have a comment starting with /genai
if: ${{ github.event.issue.pull_request && contains(github.event.comment.body, '/genai-') }}
runs-on: ubuntu-latest
permissions:
contents: write
pull-requests: write
steps:
- name: resolve pr sha
id: sha
uses: actions/github-script@v4
with:
result-encoding: string
script: |
const { owner, repo, number } = context.issue;
const pr = await github.pulls.get({ owner, repo, pull_number: number, });
console.log(pr)
const res = { sha: pr.data.head.sha, ref: pr.data.head.ref }
console.log(res)
return JSON.stringify(res)
- name: checkout
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: diff PR branch
run: git diff origin/main...origin/${{ fromJSON(steps.sha.outputs.result).ref }}
- name: diff PR commit
run: git diff origin/main...${{ fromJSON(steps.sha.outputs.result).sha }}
- name: checkout PR commit
run: git checkout ${{ fromJSON(steps.sha.outputs.result).sha }}
- name: diff main
run: git diff origin/main
- uses: actions/setup-node@v4
with:
node-version: "20"
cache: yarn
- name: install dependencies
run: yarn install --frozen-lockfile
- name: compile
run: yarn compile
- name: genaiscript pr-describe
if: contains(github.event.comment.body, '/genai-describe')
run: node packages/cli/built/genaiscript.cjs run pr-describe --out ./temp/genai/pr-describe -prd --out-trace $GITHUB_STEP_SUMMARY
env:
GITHUB_ISSUE: ${{ github.event.issue.number }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
OPENAI_API_TYPE: ${{ secrets.OPENAI_API_TYPE }}
OPENAI_API_BASE: ${{ secrets.OPENAI_API_BASE }}
- name: genaiscript pr-review
if: contains(github.event.comment.body, '/genai-review')
run: node packages/cli/built/genaiscript.cjs run pr-review --out ./temp/genai/pr-review -prc --out-trace $GITHUB_STEP_SUMMARY
env:
GITHUB_ISSUE: ${{ github.event.issue.number }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_COMMIT_SHA: ${{ fromJSON(steps.sha.outputs.result).sha }}
OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
OPENAI_API_TYPE: ${{ secrets.OPENAI_API_TYPE }}
OPENAI_API_BASE: ${{ secrets.OPENAI_API_BASE }}
- name: start ollama
if: contains(github.event.comment.body, '/genai-test')
run: docker run -d -v ollama:/root/.ollama -p 11434:11434 --name ollama ollama/ollama
- name: run test within scripts
if: contains(github.event.comment.body, '/genai-test')
run: yarn test:scripts --out-summary $GITHUB_STEP_SUMMARY --test-delay 10
- name: Archive genai results
if: always()
uses: actions/upload-artifact@v4
with:
name: genai-results
path: ./temp/genai/**
7 changes: 3 additions & 4 deletions .github/workflows/genai-frontmatter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,9 @@ on:
workflow_dispatch:
schedule:
- cron: "0 5 * * *"
pull_request:
paths:
- "docs/src/**/*.md"
- "docs/src/**/*.mdx"
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
jobs:
build:
runs-on: ubuntu-latest
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: genai pull request describe
name: genai pull request commit review
on:
pull_request:
paths:
Expand All @@ -7,14 +7,10 @@ on:
- "packages/core/**/*"
- "packages/cli/**/*"
- "packages/samples/**/*"
permissions:
pull-requests: write
jobs:
build:
runs-on: ubuntu-latest
permissions:
actions: read
contents: write
pull-requests: write
steps:
- uses: actions/checkout@v4
Expand All @@ -26,19 +22,23 @@ jobs:
node-version: "20"
cache: yarn
- run: yarn install --frozen-lockfile
- name: cache .genaiscript
uses: actions/cache@v4
with:
path: .genaiscript
key: genaiscript-${{ hashFiles('**/yarn.lock') }}
- name: typecheck
run: yarn typecheck
- name: compile
run: yarn compile
- name: git stuff
run: git fetch origin && git pull origin main:main
- name: genaiscript run
run: node packages/cli/built/genaiscript.cjs run pr-describe --out ./temp -prd pr-describe
- name: genaiscript pr-review-commit
run: node packages/cli/built/genaiscript.cjs run pr-review-commit --out ./temp/genai/pr-review-commit -prr --out-trace $GITHUB_STEP_SUMMARY
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_COMMIT_SHA: ${{ github.event.pull_request.head.sha}}
OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
OPENAI_API_TYPE: ${{ secrets.OPENAI_API_TYPE }}
OPENAI_API_BASE: ${{ secrets.OPENAI_API_BASE }}
- name: Archive genai results
if: always()
uses: actions/upload-artifact@v4
with:
name: genai-results
path: ./temp/genai/**
39 changes: 39 additions & 0 deletions .github/workflows/genai-pr-docs-commit-review.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
name: genai pull request docs commit review
on:
pull_request:
paths:
- docs/**/*.md
- docs/**/*.mdx
jobs:
build:
runs-on: ubuntu-latest
permissions:
pull-requests: write
steps:
- uses: actions/checkout@v4
with:
submodules: "recursive"
fetch-depth: 10
- uses: actions/setup-node@v4
with:
node-version: "20"
cache: yarn
- run: yarn install --frozen-lockfile
- name: compile
run: yarn compile
- name: git stuff
run: git fetch origin && git pull origin main:main
- name: genaiscript pr-review-commit
run: node packages/cli/built/genaiscript.cjs run pr-docs-review-commit --out ./temp/genai/pr-docs-review-commit -prr --out-trace $GITHUB_STEP_SUMMARY
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_COMMIT_SHA: ${{ github.event.pull_request.head.sha}}
OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
OPENAI_API_TYPE: ${{ secrets.OPENAI_API_TYPE }}
OPENAI_API_BASE: ${{ secrets.OPENAI_API_BASE }}
- name: Archive genai results
if: always()
uses: actions/upload-artifact@v4
with:
name: genai-results
path: ./temp/genai/**
53 changes: 53 additions & 0 deletions .github/workflows/genai-pr-review.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
name: genai pull request review
on:
pull_request:
types: [opened, ready_for_review, reopened]
paths:
- yarn.lock
- ".github/workflows/ollama.yml"
- "packages/core/**/*"
- "packages/cli/**/*"
- "packages/samples/**/*"
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
jobs:
build:
runs-on: ubuntu-latest
permissions:
pull-requests: write
steps:
- uses: actions/checkout@v4
with:
submodules: "recursive"
fetch-depth: 10
- uses: actions/setup-node@v4
with:
node-version: "20"
cache: yarn
- run: yarn install --frozen-lockfile
- name: compile
run: yarn compile
- name: git stuff
run: git fetch origin && git pull origin main:main
- name: genaiscript pr-describe
run: node packages/cli/built/genaiscript.cjs run pr-describe --out ./temp/genai/pr-describe -prd --out-trace $GITHUB_STEP_SUMMARY
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
OPENAI_API_TYPE: ${{ secrets.OPENAI_API_TYPE }}
OPENAI_API_BASE: ${{ secrets.OPENAI_API_BASE }}
- name: genaiscript pr-review
run: node packages/cli/built/genaiscript.cjs run pr-review --out ./temp/genai/pr-review -prc --out-trace $GITHUB_STEP_SUMMARY
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_COMMIT_SHA: ${{ github.event.pull_request.base.sha}}
OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
OPENAI_API_TYPE: ${{ secrets.OPENAI_API_TYPE }}
OPENAI_API_BASE: ${{ secrets.OPENAI_API_BASE }}
- name: Archive genai results
if: always()
uses: actions/upload-artifact@v4
with:
name: genai-results
path: ./temp/genai/**
34 changes: 34 additions & 0 deletions .github/workflows/licenses.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
name: refresh 3rd party licenses

on:
workflow_dispatch:
push:
branches: [main]
paths:
- "yarn.lock"
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
jobs:
build:
runs-on: ubuntu-latest
permissions:
actions: read
contents: write
pull-requests: write
steps:
- uses: actions/checkout@v4
with:
submodules: "recursive"
fetch-depth: 0
- uses: actions/setup-node@v4
with:
node-version: "20"
cache: yarn
- run: yarn install --frozen-lockfile
- run: yarn gen:licenses
- uses: stefanzweifel/git-auto-commit-action@v5
with:
file_pattern: "THIRD_PARTY_LICENSES.md"
commit_message: "3rd party license update"
commit_user_name: "genaiscript"
Loading

0 comments on commit 181a0cf

Please sign in to comment.