Skip to content

Commit a216324

Browse files
AubaidAhmedSaiyedAubaidAhmedSaiyed
committed
resolve merged conflicts
1 parent db18950 commit a216324

File tree

361 files changed

+84163
-84177
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

361 files changed

+84163
-84177
lines changed

‎.cargo/config.toml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
[build]
2-
# This is required by tokio-console: https://docs.rs/tokio-console/latest/tokio_console
3-
rustflags = ["--cfg", "tokio_unstable"]
1+
[build]
2+
# This is required by tokio-console: https://docs.rs/tokio-console/latest/tokio_console
3+
rustflags = ["--cfg", "tokio_unstable"]

‎.env.lib_debug‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
export RUST_LOG=warn,cocoindex_engine=trace,tower_http=trace
2-
export RUST_BACKTRACE=1
3-
4-
export COCOINDEX_SERVER_CORS_ORIGINS=http://localhost:3000,https://cocoindex.io
1+
export RUST_LOG=warn,cocoindex_engine=trace,tower_http=trace
2+
export RUST_BACKTRACE=1
3+
4+
export COCOINDEX_SERVER_CORS_ORIGINS=http://localhost:3000,https://cocoindex.io

‎.github/ISSUE_TEMPLATE/🐛-bug-report.md‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
1-
---
2-
name: "\U0001F41B Bug report"
3-
about: Create a report to help us improve
4-
title: "[BUG]"
5-
labels: ''
6-
type: 'bug'
7-
assignees: ''
8-
9-
---
10-
11-
**Describe the bug**
12-
A clear and concise description of what the bug is.
13-
14-
**To Reproduce**
15-
Steps to reproduce the behavior:
16-
17-
**Expected behavior**
18-
A clear and concise description of what you expected to happen.
19-
20-
**Screenshots**
21-
If applicable, add screenshots to help explain your problem.
22-
23-
**CocoIndex Version**
24-
Which version of CocoIndex are you using?
25-
26-
**Additional context**
27-
Add any other context about the problem here.
1+
---
2+
name: "\U0001F41B Bug report"
3+
about: Create a report to help us improve
4+
title: "[BUG]"
5+
labels: ''
6+
type: 'bug'
7+
assignees: ''
8+
9+
---
10+
11+
**Describe the bug**
12+
A clear and concise description of what the bug is.
13+
14+
**To Reproduce**
15+
Steps to reproduce the behavior:
16+
17+
**Expected behavior**
18+
A clear and concise description of what you expected to happen.
19+
20+
**Screenshots**
21+
If applicable, add screenshots to help explain your problem.
22+
23+
**CocoIndex Version**
24+
Which version of CocoIndex are you using?
25+
26+
**Additional context**
27+
Add any other context about the problem here.

‎.github/ISSUE_TEMPLATE/💡-feature-request.md‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1-
---
2-
name: "\U0001F4A1 Feature request"
3-
about: Suggest an idea for this project
4-
title: "[FEATURE]"
5-
labels: ''
6-
type: 'feature'
7-
assignees: ''
8-
9-
---
10-
11-
**What is the use case?**
12-
13-
**Describe the solution you'd like**
14-
15-
**Additional context**
16-
17-
18-
---
19-
❤️ Contributors, please refer to 📙[Contributing Guide](https://cocoindex.io/docs/about/contributing).
20-
Unless the PR can be sent immediately (e.g. just a few lines of code), we recommend you to leave a comment on the issue like **`I'm working on it`** or **`Can I work on this issue?`** to avoid duplicating work. Our [Discord server](https://discord.com/invite/zpA9S2DR7s) is always open and friendly.
1+
---
2+
name: "\U0001F4A1 Feature request"
3+
about: Suggest an idea for this project
4+
title: "[FEATURE]"
5+
labels: ''
6+
type: 'feature'
7+
assignees: ''
8+
9+
---
10+
11+
**What is the use case?**
12+
13+
**Describe the solution you'd like**
14+
15+
**Additional context**
16+
17+
18+
---
19+
❤️ Contributors, please refer to 📙[Contributing Guide](https://cocoindex.io/docs/about/contributing).
20+
Unless the PR can be sent immediately (e.g. just a few lines of code), we recommend you to leave a comment on the issue like **`I'm working on it`** or **`Can I work on this issue?`** to avoid duplicating work. Our [Discord server](https://discord.com/invite/zpA9S2DR7s) is always open and friendly.

‎.github/SECURITY.md‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
1-
# Security Policy for CocoIndex
2-
3-
## Reporting a Vulnerability
4-
If you discover a security vulnerability in CocoIndex, please report it responsibly to our security team:
5-
6-
**Email:** [support@cocoindex.io](mailto:support@cocoindex.io)
7-
8-
⚠️ Please do not file GitHub issues for security vulnerabilities as they are public! ⚠️
9-
10-
Please provide:
11-
- A detailed description of the vulnerability
12-
- Steps to reproduce the issue
13-
- Any relevant logs, screenshots, or proof-of-concept code
14-
15-
We will acknowledge your report promptly and work with you to resolve the issue.
16-
17-
## Scope
18-
This policy covers security issues related to CocoIndex open-source software.
19-
20-
## Response & Disclosure
21-
- We aim to respond as soon as we can.
22-
- Security fixes will be released as soon as practical after verification.
23-
24-
---
25-
26-
Thank you for helping us keep CocoIndex secure!
1+
# Security Policy for CocoIndex
2+
3+
## Reporting a Vulnerability
4+
If you discover a security vulnerability in CocoIndex, please report it responsibly to our security team:
5+
6+
**Email:** [support@cocoindex.io](mailto:support@cocoindex.io)
7+
8+
⚠️ Please do not file GitHub issues for security vulnerabilities as they are public! ⚠️
9+
10+
Please provide:
11+
- A detailed description of the vulnerability
12+
- Steps to reproduce the issue
13+
- Any relevant logs, screenshots, or proof-of-concept code
14+
15+
We will acknowledge your report promptly and work with you to resolve the issue.
16+
17+
## Scope
18+
This policy covers security issues related to CocoIndex open-source software.
19+
20+
## Response & Disclosure
21+
- We aim to respond as soon as we can.
22+
- Security fixes will be released as soon as practical after verification.
23+
24+
---
25+
26+
Thank you for helping us keep CocoIndex secure!

‎.github/scripts/update_version.sh‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
1-
#!/bin/bash -e
2-
3-
# Extract version from tag (e.g. refs/tags/v1.2.3 -> 1.2.3)
4-
if [[ ! "$GITHUB_REF" =~ ^refs/tags/v ]]; then
5-
echo "No version tag found"
6-
exit 0
7-
fi
8-
VERSION="${GITHUB_REF#refs/tags/v}"
9-
10-
echo "Building release version: $VERSION"
11-
12-
# Detect OS and set sed inline flag accordingly.
13-
if [[ "$(uname)" == "Darwin" ]]; then
14-
# macOS/BSD sed requires an empty string as backup extension
15-
SED_INLINE=(-i '')
16-
else
17-
# GNU sed on Linux can use -i without a backup extension
18-
SED_INLINE=(-i)
19-
fi
20-
21-
# Update Cargo.toml
22-
sed "${SED_INLINE[@]}" "s/^version = .*/version = \"$VERSION\"/" Cargo.toml
1+
#!/bin/bash -e
2+
3+
# Extract version from tag (e.g. refs/tags/v1.2.3 -> 1.2.3)
4+
if [[ ! "$GITHUB_REF" =~ ^refs/tags/v ]]; then
5+
echo "No version tag found"
6+
exit 0
7+
fi
8+
VERSION="${GITHUB_REF#refs/tags/v}"
9+
10+
echo "Building release version: $VERSION"
11+
12+
# Detect OS and set sed inline flag accordingly.
13+
if [[ "$(uname)" == "Darwin" ]]; then
14+
# macOS/BSD sed requires an empty string as backup extension
15+
SED_INLINE=(-i '')
16+
else
17+
# GNU sed on Linux can use -i without a backup extension
18+
SED_INLINE=(-i)
19+
fi
20+
21+
# Update Cargo.toml
22+
sed "${SED_INLINE[@]}" "s/^version = .*/version = \"$VERSION\"/" Cargo.toml

‎.github/workflows/CI.yml‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
1-
# This file is autogenerated by maturin v1.8.1
2-
# To update, run
3-
#
4-
# maturin generate-ci github
5-
#
6-
name: CI
7-
8-
on:
9-
pull_request:
10-
branches: [main]
11-
paths:
12-
- src/**
13-
- python/**
14-
- "*.toml"
15-
- ".github/workflows/*.yml"
16-
push:
17-
branches: [main]
18-
paths:
19-
- src/**
20-
- python/**
21-
- "*.toml"
22-
- ".github/workflows/*.yml"
23-
workflow_dispatch:
24-
25-
permissions:
26-
contents: read
27-
28-
jobs:
29-
test:
30-
name: Run test
31-
uses: ./.github/workflows/_test.yml
1+
# This file is autogenerated by maturin v1.8.1
2+
# To update, run
3+
#
4+
# maturin generate-ci github
5+
#
6+
name: CI
7+
8+
on:
9+
pull_request:
10+
branches: [main]
11+
paths:
12+
- src/**
13+
- python/**
14+
- "*.toml"
15+
- ".github/workflows/*.yml"
16+
push:
17+
branches: [main]
18+
paths:
19+
- src/**
20+
- python/**
21+
- "*.toml"
22+
- ".github/workflows/*.yml"
23+
workflow_dispatch:
24+
25+
permissions:
26+
contents: read
27+
28+
jobs:
29+
test:
30+
name: Run test
31+
uses: ./.github/workflows/_test.yml

‎.github/workflows/_docs_release.yml‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,36 @@
1-
name: Release Docs (INTERNAL)
2-
3-
on:
4-
workflow_call:
5-
6-
permissions:
7-
contents: read
8-
pages: write
9-
10-
jobs:
11-
deploy:
12-
runs-on: ubuntu-latest
13-
environment: docs-release
14-
steps:
15-
- uses: actions/checkout@v4
16-
with:
17-
fetch-depth: 1
18-
- uses: actions/setup-node@v4
19-
with:
20-
cache: yarn
21-
cache-dependency-path: docs/yarn.lock
22-
- uses: webfactory/ssh-agent@v0.5.0
23-
with:
24-
ssh-private-key: ${{ secrets.GH_PAGES_DEPLOY }}
25-
- name: Deploy to GitHub Pages
26-
env:
27-
USE_SSH: true
28-
run: |
29-
export COCOINDEX_DOCS_POSTHOG_API_KEY=${{ vars.COCOINDEX_DOCS_POSTHOG_API_KEY }}
30-
export COCOINDEX_DOCS_MIXPANEL_API_KEY=${{ vars.COCOINDEX_DOCS_MIXPANEL_API_KEY }}
31-
export COCOINDEX_DOCS_ALGOLIA_APP_ID=${{ vars.COCOINDEX_DOCS_ALGOLIA_APP_ID }}
32-
export COCOINDEX_DOCS_ALGOLIA_API_KEY=${{ vars.COCOINDEX_DOCS_ALGOLIA_API_KEY }}
33-
git config --global user.email "${{ vars.COCOINDEX_DOCS_DEPLOY_USER_EMAIL }}"
34-
git config --global user.name "${{ vars.COCOINDEX_DOCS_DEPLOY_USER_NAME }}"
35-
yarn --cwd docs install --frozen-lockfile
36-
yarn --cwd docs deploy
1+
name: Release Docs (INTERNAL)
2+
3+
on:
4+
workflow_call:
5+
6+
permissions:
7+
contents: read
8+
pages: write
9+
10+
jobs:
11+
deploy:
12+
runs-on: ubuntu-latest
13+
environment: docs-release
14+
steps:
15+
- uses: actions/checkout@v4
16+
with:
17+
fetch-depth: 1
18+
- uses: actions/setup-node@v4
19+
with:
20+
cache: yarn
21+
cache-dependency-path: docs/yarn.lock
22+
- uses: webfactory/ssh-agent@v0.5.0
23+
with:
24+
ssh-private-key: ${{ secrets.GH_PAGES_DEPLOY }}
25+
- name: Deploy to GitHub Pages
26+
env:
27+
USE_SSH: true
28+
run: |
29+
export COCOINDEX_DOCS_POSTHOG_API_KEY=${{ vars.COCOINDEX_DOCS_POSTHOG_API_KEY }}
30+
export COCOINDEX_DOCS_MIXPANEL_API_KEY=${{ vars.COCOINDEX_DOCS_MIXPANEL_API_KEY }}
31+
export COCOINDEX_DOCS_ALGOLIA_APP_ID=${{ vars.COCOINDEX_DOCS_ALGOLIA_APP_ID }}
32+
export COCOINDEX_DOCS_ALGOLIA_API_KEY=${{ vars.COCOINDEX_DOCS_ALGOLIA_API_KEY }}
33+
git config --global user.email "${{ vars.COCOINDEX_DOCS_DEPLOY_USER_EMAIL }}"
34+
git config --global user.name "${{ vars.COCOINDEX_DOCS_DEPLOY_USER_NAME }}"
35+
yarn --cwd docs install --frozen-lockfile
36+
yarn --cwd docs deploy

0 commit comments

Comments
 (0)