Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ documents

.env
.docker-env
DeepRAG-FrontEnd
ApeRAG-FrontEnd
8 changes: 4 additions & 4 deletions .github/utils/generate_release_notes.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

RELEASE_ISSUE_RANGE = "^v(.*) Release Planning$"
MAJOR_RELEASE_REGEX = "^([0-9]+\.[0-9]+)\.[0-9]+.*$"
MILESTONE_REGEX = "https://github.com/apecloud/KubeChat/milestone/([0-9]+)"
MILESTONE_REGEX = "https://github.com/apecloud/ApeRAG/milestone/([0-9]+)"
CHANGE_TYPES : list[str] = ["New Features", "Bug Fixes", "Miscellaneous"]


Expand All @@ -38,7 +38,7 @@ def main(argv: list[str]) -> None:
# get milestone issue
issues = [
i
for i in gh.get_repo("apecloud/KubeChat").get_issues(state="open")
for i in gh.get_repo("apecloud/ApeRAG").get_issues(state="open")
if re.search(RELEASE_ISSUE_RANGE, i.title)
]
issues = sorted(issues, key=lambda i: i.id)
Expand All @@ -55,7 +55,7 @@ def main(argv: list[str]) -> None:

# get release version from issue name
release_version = re.search(RELEASE_ISSUE_RANGE, issue.title).group(1)
print(f"Generating release notes for KubeChat {release_version}")
print(f"Generating release notes for ApeRAG {release_version}")

# Set REL_VERSION
if gh_env:
Expand All @@ -74,7 +74,7 @@ def main(argv: list[str]) -> None:
print(f"WARNING: found more than one milestone in release issue body, first milestone will be picked: {[i for i in repo_milestones]}")

# find all issues and PRs in milestone
repo = gh.get_repo("apecloud/KubeChat")
repo = gh.get_repo("apecloud/ApeRAG")
milestone = repo.get_milestone(int(repo_milestones[0]))
issue_or_prs = [i for i in repo.get_issues(milestone, state="closed")]
print(f"Detected {len(issue_or_prs)} issues or pull requests")
Expand Down
4 changes: 2 additions & 2 deletions .github/utils/release_gitlab.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set -o errexit
set -o nounset
set -o pipefail

DEFAULT_PACKAGE_NAME=kubechat
DEFAULT_PACKAGE_NAME=aperag
DEFAULT_CHANNEL=stable
API_URL=https://jihulab.com/api/v4/projects

Expand Down Expand Up @@ -173,7 +173,7 @@ gitlab_api_curl() {
create_release() {
request_type=POST
request_url=$API_URL/$PROJECT_ID/releases
request_data='{"ref":"main","name":"KubeChat\t'$TAG_NAME'","tag_name":"'$TAG_NAME'"}'
request_data='{"ref":"main","name":"ApeRAG\t'$TAG_NAME'","tag_name":"'$TAG_NAME'"}'

gitlab_api_curl --request $request_type $request_url --data $request_data
}
Expand Down
2 changes: 1 addition & 1 deletion .github/utils/utils.sh
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ EOF
}

GITHUB_API="https://api.github.com"
LATEST_REPO=apecloud/KubeChat
LATEST_REPO=apecloud/ApeRAG

main() {
local TYPE=""
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/cicd-pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
if: contains(needs.trigger-mode.outputs.trigger-mode, '[docker]')
uses: apecloud/apecloud-cd/.github/workflows/release-image-check.yml@v0.1.49
with:
IMG: "apecloud/deeprag"
IMG: "apecloud/aperag"
BUILDX_PLATFORMS: "linux/amd64"
DOCKERFILE_PATH: "./Dockerfile"
PYTHON_VERSION: "3.11"
Expand All @@ -71,7 +71,7 @@ jobs:
uses: apecloud/apecloud-cd/.github/workflows/release-charts-check.yml@v0.1.48
with:
VERSION: "v0.4.0-check"
CHART_NAME: "deeprag"
CHART_NAME: "aperag"
CHART_DIR: "deploy"
APECD_REF: "v0.1.48"
secrets: inherit
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/cicd-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ jobs:
if: ${{ contains(needs.trigger-mode.outputs.trigger-mode, '[docker]') }}
uses: apecloud/apecloud-cd/.github/workflows/release-image-check.yml@v0.1.49
with:
IMG: "apecloud/deeprag"
IMG: "apecloud/aperag"
BUILDX_PLATFORMS: "linux/amd64"
DOCKERFILE_PATH: "./Dockerfile"
PYTHON_VERSION: "3.11"
Expand All @@ -119,7 +119,7 @@ jobs:
uses: apecloud/apecloud-cd/.github/workflows/release-charts-check.yml@v0.1.48
with:
VERSION: "v0.4.0-check"
CHART_NAME: "deeprag"
CHART_NAME: "aperag"
CHART_DIR: "deploy"
APECD_REF: "v0.1.48"
secrets: inherit
10 changes: 5 additions & 5 deletions .github/workflows/e2e-kubechat.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
name: E2E Test deeprag
name: E2E Test aperag

on:
workflow_dispatch:
inputs:
VERSION:
description: 'deeprag release version'
description: 'aperag release version'
required: true
default: ''
KUBEBLOCKS_VERSION:
Expand Down Expand Up @@ -45,7 +45,7 @@ on:
default: '1'


run-name: deeprag:${{ inputs.VERSION }} ${{ inputs.CLOUD_PROVIDER }}:${{ inputs.CLUSTER_VERSION }}:${{ inputs.NODE_TYPE }}
run-name: aperag:${{ inputs.VERSION }} ${{ inputs.CLOUD_PROVIDER }}:${{ inputs.CLUSTER_VERSION }}:${{ inputs.NODE_TYPE }}

env:
GH_TOKEN: ${{ github.token }}
Expand All @@ -62,9 +62,9 @@ jobs:
e2e:
name: ${{ inputs.CLOUD_PROVIDER }}
needs: [ check-version ]
uses: apecloud/apecloud-cd/.github/workflows/deeprag-test-k8s.yml@main
uses: apecloud/apecloud-cd/.github/workflows/aperag-test-k8s.yml@main
with:
DEEPRAG_VERSION: "${{ needs.check-version.outputs.release-version }}"
APERAG_VERSION: "${{ needs.check-version.outputs.release-version }}"
KUBEBLOCKS_VERSION: "${{ inputs.KUBEBLOCKS_VERSION }}"
CLOUD_PROVIDER: "${{ inputs.CLOUD_PROVIDER }}"
CLUSTER_VERSION: "${{ inputs.CLUSTER_VERSION }}"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/milestoneclose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:

env:
GITHUB_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
REPO: DeepRAG
REPO: ApeRAG
milestone: 1
ORGANIZATION: apecloud
PROJECT_NUMBER: 18
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pull-request-user-interaction.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
env:
GITHUB_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
REVIEWERS: 'iziang'
REPO: 'DeepRAG'
REPO: 'ApeRAG'
ISINTERACTION: ''

jobs:
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/release-chart.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ on:
type: choice
options:
- ""
- deeprag
- aperag
release:
types:
- published
Expand Down Expand Up @@ -44,21 +44,21 @@ jobs:
ARTIFACT_KEY="${{ env.RELEASE_VERSION }}-chart"
echo 'artifact_key='${ARTIFACT_KEY} >> $GITHUB_OUTPUT

release-deeprag-chart:
if: ${{ github.event.action == 'published' || inputs.chart_name == '' || inputs.chart_name == 'deeprag' }}
release-aperag-chart:
if: ${{ github.event.action == 'published' || inputs.chart_name == '' || inputs.chart_name == 'aperag' }}
needs: [ chart-version ]
uses: apecloud/apecloud-cd/.github/workflows/release-charts.yml@v0.1.34
with:
VERSION: "${{ needs.chart-version.outputs.chart-version }}"
CHART_DIR: "deploy"
SPECIFY_CHART: "deeprag"
SPECIFY_CHART: "aperag"
APECD_REF: "v0.1.34"
CHECK_ENABLE: false
secrets: inherit

release-result:
runs-on: ubuntu-latest
needs: [ release-deeprag-chart ]
needs: [ release-aperag-chart ]
if: ${{ always() && github.event.action == 'published' }}
outputs:
release-result: ${{ steps.get_release_result.outputs.release_result }}
Expand All @@ -71,7 +71,7 @@ jobs:
echo 'artifact_key='${ARTIFACT_KEY} >> $GITHUB_OUTPUT

RELEASE_RESULT="error"
if [[ "${{ needs.release-deeprag-chart.result }}" == "success" ]]; then
if [[ "${{ needs.release-aperag-chart.result }}" == "success" ]]; then
RELEASE_RESULT="success"
echo "success" > ${ARTIFACT_KEY}
else
Expand Down
46 changes: 23 additions & 23 deletions .github/workflows/release-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ on:
type: choice
options:
- ""
- deeprag
- deeprag-llmserver
- aperag
- aperag-llmserver
release:
types:
- published
Expand All @@ -31,8 +31,8 @@ jobs:
uses: apecloud/apecloud-cd/.github/workflows/enable-self-runner.yml@v0.1.76
with:
CLOUD_PROVIDER: "eks"
GITHUB_REPO: "apecloud/DeepRAG"
RUNNER_LABEL: "deeprag-image-runner"
GITHUB_REPO: "apecloud/ApeRAG"
RUNNER_LABEL: "aperag-image-runner"
secrets: inherit

image-tag:
Expand All @@ -52,41 +52,41 @@ jobs:
ARTIFACT_KEY="${{ env.RELEASE_VERSION }}-image"
echo 'artifact_key='${ARTIFACT_KEY} >> $GITHUB_OUTPUT

release-deeprag-image:
if: ${{ github.event.action == 'published' || inputs.image_name == '' || inputs.image_name == 'deeprag' }}
name: release-deeprag
release-aperag-image:
if: ${{ github.event.action == 'published' || inputs.image_name == '' || inputs.image_name == 'aperag' }}
name: release-aperag
needs: [ image-tag, enable-gke-runner ]
uses: apecloud/apecloud-cd/.github/workflows/release-image-cache-amd-sync.yml@v0.1.36
with:
MAKE_OPS_PRE: "poetry-lock-no-update build-requirements version"
IMG: "apecloud/deeprag"
IMG: "apecloud/aperag"
VERSION: "${{ needs.image-tag.outputs.tag-name }}"
DOCKERFILE_PATH: "./Dockerfile"
REMOVE_PREFIX: false
APECD_REF: "v0.1.36"
ENABLE_SUBMODULE: true
secrets: inherit

release-deeprag-frontend-image:
if: ${{ github.event.action == 'published' || inputs.image_name == '' || inputs.image_name == 'deeprag' }}
name: release-deeprag-frontend
release-aperag-frontend-image:
if: ${{ github.event.action == 'published' || inputs.image_name == '' || inputs.image_name == 'aperag' }}
name: release-aperag-frontend
needs: [ image-tag ]
uses: apecloud/apecloud-cd/.github/workflows/trigger-workflow.yml@v0.1.42
with:
GITHUB_REPO: "apecloud/DeepRAG-FrontEnd"
GITHUB_REPO: "apecloud/ApeRAG-FrontEnd"
BRANCH_NAME: "main"
WORKFLOW_ID: "release-image.yml"
APECD_REF: "v0.1.42"
VERSION: "${{ needs.image-tag.outputs.tag-name }}"
secrets: inherit

# release-deeprag-llmserver-image:
# if: ${{ github.event.action == 'published' || inputs.image_name == '' || inputs.image_name == 'deeprag-llmserver' }}
# release-aperag-llmserver-image:
# if: ${{ github.event.action == 'published' || inputs.image_name == '' || inputs.image_name == 'aperag-llmserver' }}
# needs: [ image-tag, enable-gke-runner ]
# uses: apecloud/apecloud-cd/.github/workflows/release-image-cache-amd-sync.yml@v0.1.36
# with:
# MAKE_OPS_PRE: "poetry-lock-no-update build-requirements version"
# IMG: "apecloud/deeprag-llmserver"
# IMG: "apecloud/aperag-llmserver"
# VERSION: "${{ needs.image-tag.outputs.tag-name }}"
# DOCKERFILE_PATH: "./Dockerfile-llmserver"
# REMOVE_PREFIX: false
Expand All @@ -96,18 +96,18 @@ jobs:

disable-gke-runner:
if: ${{ always() }}
needs: [ release-deeprag-image ]
needs: [ release-aperag-image ]
uses: apecloud/apecloud-cd/.github/workflows/enable-self-runner.yml@v0.1.76
with:
CLOUD_PROVIDER: "eks"
GITHUB_REPO: "apecloud/DeepRAG"
RUNNER_LABEL: "deeprag-image-runner"
GITHUB_REPO: "apecloud/ApeRAG"
RUNNER_LABEL: "aperag-image-runner"
ENABLE: "disable"
secrets: inherit

release-result:
runs-on: ubuntu-latest
needs: [ release-deeprag-image ]
needs: [ release-aperag-image ]
if: ${{ always() && github.event.action == 'published' }}
outputs:
release-result: ${{ steps.get_release_result.outputs.release_result }}
Expand All @@ -120,7 +120,7 @@ jobs:
echo 'artifact_key='${ARTIFACT_KEY} >> $GITHUB_OUTPUT

RELEASE_RESULT="error"
if [[ "${{ needs.release-deeprag-image.result }}" == "success" ]]; then
if [[ "${{ needs.release-aperag-image.result }}" == "success" ]]; then
RELEASE_RESULT="success"
echo "success" > ${ARTIFACT_KEY}
else
Expand Down Expand Up @@ -182,13 +182,13 @@ jobs:
exit 1
fi

e2e-deeprag:
e2e-aperag:
needs: [ image-tag, release-result, check-result ]
uses: apecloud/apecloud-cd/.github/workflows/trigger-workflow.yml@v0.1.41
with:
GITHUB_REPO: "apecloud/DeepRAG"
GITHUB_REPO: "apecloud/ApeRAG"
BRANCH_NAME: "main"
WORKFLOW_ID: "e2e-deeprag.yml"
WORKFLOW_ID: "e2e-aperag.yml"
VERSION: "${{ needs.image-tag.outputs.tag-name }}"
APECD_REF: "v0.1.41"
secrets: inherit
2 changes: 1 addition & 1 deletion .github/workflows/release-notes.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
COMMIT_MSG: |
Generating DeepRAG release notes.
Generating ApeRAG release notes.
skip-checks: true
run: |
git config user.name "$GITHUB_ACTOR"
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ dmypy.json


*.bin
deploy/deeprag/production.yaml
deploy/aperag/production.yaml
documents

# ssl file
Expand Down
Loading
Loading