Skip to content

Commit

Permalink
Merge branch 'dev' into x/fix-queries
Browse files Browse the repository at this point in the history
  • Loading branch information
creatorrr authored Nov 29, 2024
2 parents 37539cb + 8aa82e5 commit 28a2bb2
Show file tree
Hide file tree
Showing 403 changed files with 48,898 additions and 17,240 deletions.
91 changes: 67 additions & 24 deletions .env.example
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@
# Image Tags
# ----------

TAG=dev

# Security
# --------

# Please set these access keys to something random and unique.
# Note: For just testing, you can set them to the same value.

# On Linux, you can generate a random key with:
# > openssl rand -base64 32
# OR
# > tr -dc 'A-Za-z0-9+_/' </dev/urandom | head -c 32; echo

JWT_SHARED_KEY=<your_jwt_shared_key>
AGENTS_API_KEY=<your_agents_api_key>
COZO_AUTH_TOKEN=<your_cozo_auth_token>
Expand All @@ -8,35 +22,65 @@ LITELLM_POSTGRES_PASSWORD=<your_litellm_postgres_password>
LITELLM_MASTER_KEY=<your_litellm_master_key>
LITELLM_SALT_KEY=<your_litellm_salt_key>
LITELLM_REDIS_PASSWORD=<your_litellm_redis_password>
MAX_FREE_SESSIONS=50
MAX_FREE_EXECUTIONS=50

# Memory Store
# -----------
# LLM Providers
# --------------

# COZO_HOST=http://memory-store:9070
# COZO_PORT=9070
# COZO_ROCKSDB_DIR=cozo.db
# COZO_BACKUP_DIR=/backup
# COZO_MNT_DIR=/data
### Recommended LLM Providers

# Gateway
# ------
# OPENAI_API_KEY=<your_openai_api_key>
# VOYAGE_API_KEY=<your_voyage_api_key>

# GATEWAY_PORT=80
# TRAEFIK_LOG_LEVEL=INFO
# HUGGING_FACE_HUB_TOKEN=<your_hugging_face_hub_token>
# ANTHROPIC_API_KEY=<your_anthropic_api_key>
# OPENROUTER_API_KEY=<your_openrouter_api_key>
# GROQ_API_KEY=<your_groq_api_key>
# GEMINI_API_KEY=<your_gemini_api_key>
# CLOUDFLARE_API_KEY=<your_cloudflare_api_key>
# CLOUDFLARE_ACCOUNT_ID=<your_cloudflare_account_id>
# NVIDIA_NIM_API_KEY=<your_nvidia_nim_api_key>
# GITHUB_API_KEY=<your_github_api_key>
# GOOGLE_APPLICATION_CREDENTIALS=.keys/julep-vertexai-svc.json

# Agents API
# ---------

### Embedding Model
### > Set to either "voyage/voyage-3" or "Alibaba-NLP/gte-large-en-v1.5"
### > Use Alibaba-NLP/gte-large-en-v1.5 with local embedding server

# EMBEDDING_MODEL_ID=voyage/voyage-3
# EMBEDDING_MODEL_ID=Alibaba-NLP/gte-large-en-v1.5

# AGENTS_API_HOSTNAME=localhost
# AGENTS_API_PROTOCOL=http
# AGENTS_API_KEY_HEADER_NAME=Authorization
# AGENTS_API_URL=http://agents-api:8080
# TRUNCATE_EMBED_TEXT=true
# WORKER_URL=temporal:7233
# AGENTS_API_DEBUG=false
# EMBEDDING_MODEL_ID=Alibaba-NLP/gte-large-en-v1.5
# NUM_GPUS=1
# INTEGRATION_SERVICE_URL=http://integrations:8000
# USE_BLOB_STORE_FOR_TEMPORAL=false
# BLOB_STORE_CUTOFF_KB=1024
# BLOB_STORE_BUCKET=agents-api

# Memory Store
# -----------

# COZO_HOST=http://memory-store:9070
# COZO_PORT=9070
# COZO_ROCKSDB_DIR=cozo.db
# COZO_BACKUP_DIR=/backup
# COZO_MNT_DIR=/data

# Gateway
# ------

# GATEWAY_PORT=80
# TRAEFIK_LOG_LEVEL=INFO

# Temporal
# --------
Expand All @@ -46,6 +90,7 @@ LITELLM_REDIS_PASSWORD=<your_litellm_redis_password>
# TEMPORAL_WORKER_URL=temporal:7233
# TEMPORAL_POSTGRES_DB=temporal
# TEMPORAL_POSTGRES_USER=temporal
# TEMPORAL_SCHEDULE_TO_CLOSE_TIMEOUT=3600

# LiteLLM
# -------
Expand All @@ -56,16 +101,14 @@ LITELLM_REDIS_PASSWORD=<your_litellm_redis_password>
# LITELLM_REDIS_HOST=litellm-redis
# LITELLM_REDIS_PORT=6379

# LLM Providers
# --------------
# Blob Store
# -----------

# OPENAI_API_KEY=<your_openai_api_key>
# HUGGING_FACE_HUB_TOKEN=<your_hugging_face_hub_token>
# ANTHROPIC_API_KEY=<your_anthropic_api_key>
# GROQ_API_KEY=<your_groq_api_key>
# CLOUDFLARE_API_KEY=<your_cloudflare_api_key>
# CLOUDFLARE_ACCOUNT_ID=<your_cloudflare_account_id>
# NVIDIA_NIM_API_KEY=<your_nvidia_nim_api_key>
# GITHUB_API_KEY=<your_github_api_key>
# VOYAGE_API_KEY=<your_voyage_api_key>
# GOOGLE_APPLICATION_CREDENTIALS=.keys/julep-vertexai-svc.json
# S3_ENDPOINT=http://seaweedfs:8333
# S3_ACCESS_KEY=<your_s3_access_key>
# S3_SECRET_KEY=<your_s3_secret_key>

# Integrations Service
# ------------

# INTEGRATIONS_SERVICE_PORT=8000
27 changes: 27 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: "🐛 Bug Report"
description: "Submit a bug report to help us improve"
title: "[Bug]: "
labels: ["bug"]
body:
- type: textarea
id: description
attributes:
label: "📜 Description"
placeholder: "A clear and concise description of what the bug is."

- type: textarea
id: steps-to-reproduce
attributes:
label: "👟 Reproduction steps"
placeholder: "1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error"

- type: checkboxes
id: no-duplicate-issues
attributes:
label: "👀 Have you searched previous issues to see if this has been raised before?"
options:
- label: "I checked and didn't find similar issue"
required: true
5 changes: 5 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
blank_issues_enabled: false
contact_links:
- name: Have Question?
url: https://discord.com/invite/JTSBGRZrzj
about: Join Official Discord server
29 changes: 29 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
name: 🚀 Feature
description: "Submit a proposal for a new feature"
title: "[Feature]: "
labels: ["enhancement"]
body:
- type: textarea
id: feature-description
validations:
required: true
attributes:
label: "🔖 Feature description"
placeholder: "A clear and concise description of what the feature is."
- type: textarea
id: pitch
attributes:
label: "🎤 Why is this feature needed ?"
placeholder: "Please explain why this feature should be implemented and how it would be used. Add examples, if applicable."
- type: textarea
id: solution
attributes:
label: "✌️ How do you aim to achieve this?"
placeholder: "A clear and concise description of what you want to happen."
- type: checkboxes
id: no-duplicate-issues
attributes:
label: "👀 Have you searched issues and PRs to see if this feature request has been raised before?"
options:
- label: "I checked and didn't find similar issue"
required: true
17 changes: 17 additions & 0 deletions .github/ISSUE_TEMPLATE/refactor.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
name: "🛠️ Refactor"
description: "Submit a bug report to help us improve"
title: "[Refactor]: "
labels: ["refactor"]
body:
- type: textarea
id: description
attributes:
label: "📜 Description"
placeholder: "A clear and concise description of what should be refactored."

- type: textarea
id: relevant-files
attributes:
label: "👟 Relevant files"
placeholder: "1. `agents-api/Dockerfile` needs to change
2. `integrations/**/*.py` files need to be reformatted"
4 changes: 3 additions & 1 deletion .github/workflows/doctoc-on-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,6 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
MAX_HEADER_LEVEL: 3
TOC_TITLE: '<h3>📖 Table of Contents</h3>'
FOLDING: true
FOLDING: false
CREATE_PR: true
CHECK_ONLY_DEFAULT_BRANCH: true
59 changes: 59 additions & 0 deletions .github/workflows/generate-openapi-code-from-typespec
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
name: Generate OpenAPI code
run-name: ${{ github.actor }} is generating openapi code

on:
pull_request:
paths:
- 'typespec/**'
push:
paths:
- 'typespec/**'

jobs:
Typecheck:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4

- uses: actions/setup-python@v5
with:
python-version: "3.12"

- uses: actions/setup-node@v4
with:
node-version: 'latest'
cache: npm
cache-dependency-path: 'typespec/package-lock.json'

- name: Install libboost
run: sudo apt-get install -y libboost-all-dev

- name: Install and configure Poetry
uses: snok/install-poetry@v1

- name: Configure Poetry to use .venv
run: |
cd agents-api
poetry config virtualenvs.in-project true

- name: Cache Poetry virtualenv
uses: actions/cache@v4
with:
path: agents-api/.venv
key: ${{ runner.os }}-agents-api-poetry-${{ hashFiles('agents-api/poetry.lock') }}
restore-keys: |
${{ runner.os }}-agents-api-poetry-

- name: Install dependencies
run: |
cd agents-api
poetry install

- name: Generate openapi code
run: |
bash scripts/generate_openapi_code.sh

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
3 changes: 3 additions & 0 deletions .github/workflows/lint-agents-api-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ jobs:
with:
python-version: "3.12"

- name: Install libboost
run: sudo apt-get install -y libboost-all-dev

- name: Install and configure Poetry
uses: snok/install-poetry@v1

Expand Down
57 changes: 57 additions & 0 deletions .github/workflows/lint-integrations-service-pr.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
name: Lint integrations-service
run-name: ${{ github.actor }} is linting the code

on:
pull_request:
paths:
- 'integrations-service/**'
push:
paths:
- 'integrations-service/**'

jobs:
Lint-And-Format:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4

- uses: actions/setup-python@v5
with:
python-version: "3.12"

- name: Install and configure Poetry
uses: snok/install-poetry@v1

- name: Configure Poetry to use .venv
run: |
cd integrations-service
poetry config virtualenvs.in-project true
- name: Cache Poetry virtualenv
uses: actions/cache@v4
with:
path: integrations-service/.venv
key: ${{ runner.os }}-integrations-service-poetry-${{ hashFiles('integrations-service/poetry.lock') }}
restore-keys: |
${{ runner.os }}-integrations-service-poetry-
- name: Install dependencies
run: |
cd integrations-service
poetry install
- name: Lint and format
run: |
cd integrations-service
poetry run poe format
poetry run poe lint
- uses: stefanzweifel/git-auto-commit-action@v4
with:
commit_message: "refactor: Lint integrations-service (CI)"
branch: ${{ github.head_ref }}

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
5 changes: 4 additions & 1 deletion .github/workflows/test-agents-api-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ jobs:
with:
python-version: "3.12"

- name: Install libboost
run: sudo apt-get install -y libboost-all-dev

- name: Install and configure Poetry
uses: snok/install-poetry@v1

Expand All @@ -44,7 +47,7 @@ jobs:
- name: Run tests
run: |
cd agents-api
poetry run poe test --fail-limit 1
poetry run poe test --fail-limit 3
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
Expand Down
Loading

0 comments on commit 28a2bb2

Please sign in to comment.