Skip to content

Commit

Permalink
Merge branch 'main' into neo4j_fix_llm
Browse files Browse the repository at this point in the history
  • Loading branch information
Eric-Shang committed Dec 27, 2024
2 parents 7299471 + 6cc0a81 commit 199d0ed
Show file tree
Hide file tree
Showing 400 changed files with 4,322 additions and 2,318 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ These configurations can be used with Codespaces and locally.
- **Usage**: Recommended for developers who are contributing to the AutoGen project.
- **Building the Image**: Run `docker build -f dev/Dockerfile -t ag2_dev_img .`.
- **Using with Codespaces**: `Code > Codespaces > Click on ...> New with options > Choose "dev" as devcontainer configuration`. This image may require a Codespace with at least 64GB of disk space.
- **Before using**: We highly encourage all potential contributors to read the [AutoGen Contributing](https://ag2ai.github.io/ag2/docs/Contribute) page prior to submitting any pull requests.
- **Before using**: We highly encourage all potential contributors to read the [AutoGen Contributing](https://docs.ag2.ai/docs/contributor-guide/contributing) page prior to submitting any pull requests.


## Customizing Dockerfiles
Expand Down
7 changes: 3 additions & 4 deletions .devcontainer/dev/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,10 @@ RUN sudo pip install --upgrade pip && \
# Install pre-commit hooks
RUN pre-commit install

# Setup Docusaurus and Yarn for the documentation website
RUN sudo npm install --global yarn
RUN sudo pip install pydoc-markdown
# Setup Mintlify for the documentation website
RUN sudo pip install pydoc-markdown pyyaml termcolor nbclient
RUN cd website
RUN yarn install --frozen-lockfile --ignore-engines
RUN npm install

RUN arch=$(arch | sed s/aarch64/arm64/ | sed s/x86_64/amd64/) && \
wget -q https://github.com/quarto-dev/quarto-cli/releases/download/v1.5.23/quarto-1.5.23-linux-${arch}.tar.gz && \
Expand Down
4 changes: 2 additions & 2 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!-- Thank you for your contribution! Please review https://ag2ai.github.io/ag2/docs/Contribute before opening a pull request. -->
<!-- Thank you for your contribution! Please review https://docs.ag2.ai/docs/contributor-guide/contributing before opening a pull request. -->

<!-- Please add a reviewer to the assignee section when you create a PR. If you don't have the access to it, we will shortly find a reviewer and assign them to your PR. -->

Expand All @@ -12,6 +12,6 @@

## Checks

- [ ] I've included any doc changes needed for https://ag2ai.github.io/ag2/. See https://ag2ai.github.io/ag2/docs/Contribute#documentation to build and test documentation locally.
- [ ] I've included any doc changes needed for https://docs.ag2.ai/. See https://docs.ag2.ai/docs/contributor-guide/documentation to build and test documentation locally.
- [ ] I've added tests (if relevant) corresponding to the changes introduced in this PR.
- [ ] I've made sure all auto checks have passed.
6 changes: 4 additions & 2 deletions .github/workflows/deploy-website-mintlify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,14 @@ on:
- "autogen/**"
- "website/**"
- ".github/workflows/deploy-website-mintlify.yml"
- ".github/workflows/docs-check-broken-links.yml"
push:
branches: [main]
paths:
- "autogen/**"
- "website/**"
- ".github/workflows/deploy-website-mintlify.yml"
- ".github/workflows/docs-check-broken-links.yml"
workflow_dispatch:
merge_group:
types: [checks_requested]
Expand Down Expand Up @@ -40,7 +42,7 @@ jobs:
- name: Install Python dependencies
run: |
python -m pip install --upgrade pip
pip install pydoc-markdown pyyaml termcolor nbconvert
pip install pydoc-markdown pyyaml termcolor nbclient
# Pin databind packages as version 4.5.0 is not compatible with pydoc-markdown.
pip install databind.core==4.4.2 databind.json==4.4.2
Expand Down Expand Up @@ -86,7 +88,7 @@ jobs:
- name: Install Python dependencies
run: |
python -m pip install --upgrade pip
pip install pydoc-markdown pyyaml termcolor nbconvert
pip install pydoc-markdown pyyaml termcolor nbclient
# Pin databind packages as version 4.5.0 is not compatible with pydoc-markdown.
pip install databind.core==4.4.2 databind.json==4.4.2
Expand Down
43 changes: 39 additions & 4 deletions .github/workflows/deploy-website.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,56 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v4

# Step 2: Create a fresh redirect HTML file
# Step 2: Create redirect HTML files
- name: Create redirect HTML
run: |
mkdir -p dist
# Homepage redirect
cat > dist/index.html << 'EOF'
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
<meta http-equiv="refresh" content="0; url=https://ag2ai.mintlify.app">
<script>window.location.href = "https://ag2ai.mintlify.app";</script>
<meta http-equiv="refresh" content="0; url=https://docs.ag2.ai">
<script>window.location.href = "https://docs.ag2.ai";</script>
<title>Page Redirection</title>
</head>
<body>
If you are not redirected automatically, follow this <a href="https://ag2ai.mintlify.app">link to the new documentation</a>.
If you are not redirected automatically, follow this <a href="https://docs.ag2.ai">link to the new documentation</a>.
</body>
</html>
EOF
# Deep link handling
cat > dist/404.html << 'EOF'
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
<script>
const newDomain = 'https://docs.ag2.ai';
let path = window.location.pathname;
const hash = window.location.hash;
// Remove /ag2/ prefix and trailing slash
path = path.replace(/^\/ag2\//, '/').replace(/\/$/, "");
// Transform blog and talks URLs
if (path.includes('/blog/') || path.includes('/talks/')) {
const afterPrefix = path.split(/\/(blog|talks)\//)[2];
const transformed = afterPrefix.replace(/\//g, '-');
path = path.replace(afterPrefix, transformed);
}
// Handle -index and create final URL with hash
const redirectUrl = (newDomain + path).replace(/-index$/, "/index") + hash;
window.location.href = redirectUrl;
</script>
<title>Page Redirection</title>
</head>
<body>
If you are not redirected automatically, follow this <a href="https://docs.ag2.ai">link to the new documentation</a>.
</body>
</html>
EOF
Expand Down
29 changes: 29 additions & 0 deletions .github/workflows/docs-check-broken-links.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
name: Check docs for broken links

on:
workflow_run:
workflows: ["mintlify docs"]
types:
- completed

jobs:
check-broken-link:
if: |
github.event.workflow_run.conclusion == 'success' &&
github.event.workflow_run.head_branch == 'main'
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v4

- name: Setup Go
uses: actions/setup-go@v5

- name: Install muffet
run: go install github.com/raviqqe/muffet/v2@latest

- name: Sleep for 5 minutes
run: sleep 300

- name: Check links using container
run: ./scripts/broken-links-check.sh
33 changes: 33 additions & 0 deletions .muffet-excluded-links.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
linkedin.com
x.com
example.com
rapidapi.com
https://platform.openai.com/docs/
https://github.com/ag2ai/ag2/blob/b1adac515931bf236ac59224269eeec683a162ba/test/oai/test_client.py
https://github.com/ag2ai/ag2/blob/main/notebook/contributing.md
https://github.com/openai/openai-python/blob/d231d1fa783967c1d3a1db3ba1b52647fff148ac/src/openai/resources/completions.py
https://github.com/openai/openai-python/blob/d231d1fa783967c1d3a1db3ba1b52647fff148ac/src/openai/_client.py
https://github.com/ag2ai/ag2/blob/main/autogen/agentchat/conversable_agent.py
https://openreview.net/pdf?id=BAakY1hNKS
https://docs.ag2.ai/_sites/docs.ag2.ai/docs/Gallery#contributing
https://github.com/ag2ai/ag2/blob/main/notebook/contributing.md#how-to-get-a-notebook-displayed-on-the-website
https://github.com/ag2ai/ag2/blob/main/autogen/agentchat/contrib/agent_builder.py
https://github.com/qdrant/qdrant-client/blob/master/qdrant_client/qdrant_client.py
https://qdrant.github.io/qdrant/redoc/index.html#tag/collections/operation/create_collection
https://qdrant.github.io/qdrant/redoc/index.html#tag/collections/operation/create_field_index
https://github.com/pgvector/pgvector?tab=readme-ov-file#hnsw
https://github.com/chroma-core/chroma/blob/566bc80f6c8ee29f7d99b6322654f32183c368c4/chromadb/segment/impl/vector/local_hnsw.py
https://github.com/nmslib/hnswlib#supported-distances
https://github.com/ollama/ollama/blob/main/docs/api.md#parameters
https://docs.ag2.ai/_sites/
https://github.com/airtai/prompt-leakage-probing/blob/efe9c286236e92c4f6366daa60da2282add3ca95/prompt_leakage_probing/workflow/agents/prompt_leakage_black_box/prompt_leakage_black_box.py
https://github.com/airtai/prompt-leakage-probing/blob/efe9c286236e92c4f6366daa60da2282add3ca95/prompt_leakage_probing/workflow/agents/prompt_leakage_classifier/prompt_leakage_classifier.py
https://github.com/ag2ai/ag2/tree/main/autogen/agentchat/contrib/captainagent/tools/README.md
https://docs.trychroma.com/troubleshooting#sqlite
https://docs.ag2.ai/_sites/docs.ag2.ai/notebooks/agentchat_RetrieveChat#
https://docs.ag2.ai/_sites/docs.ag2.ai/notebooks/agentchat_lmm_llava#
https://docs.ag2.ai/_sites/docs.ag2.ai/docs/ecosystem/portkey#
https://docs.ag2.ai/_sites/docs.ag2.ai/notebooks/agentchat_RetrieveChat_mongodb#
https://docs.ag2.ai/_sites/docs.ag2.ai/notebooks/agentchat_RetrieveChat_pgvector#
https://docs.ag2.ai/_sites/docs.ag2.ai/notebooks/Gallery#
https://docs.ag2.ai/_sites/docs.ag2.ai/docs/topics/non-openai-models/cloud-gemini_vertexai#
6 changes: 0 additions & 6 deletions =8

This file was deleted.

2 changes: 1 addition & 1 deletion MAINTAINERS.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
| Rajan Chari * | [rajan-chari](https://github.com/rajan-chari) | Microsoft Research | CAP |

## I would like to join this list. How can I help the project?
> We're always looking for new contributors to join our team and help improve the project. For more information, please refer to our [CONTRIBUTING](https://ag2ai.github.io/ag2/docs/contributor-guide/contributing) guide.
> We're always looking for new contributors to join our team and help improve the project. For more information, please refer to our [CONTRIBUTING](https://docs.ag2.ai/docs/contributor-guide/contributing) guide.

## Are you missing from this list?
Expand Down
Loading

0 comments on commit 199d0ed

Please sign in to comment.