Skip to content

Commit

Permalink
merge
Browse files Browse the repository at this point in the history
  • Loading branch information
emrgnt-cmplxty committed Oct 30, 2024
2 parents 7dac6f4 + db28363 commit d75dd97
Show file tree
Hide file tree
Showing 5 changed files with 212 additions and 6 deletions.
57 changes: 57 additions & 0 deletions .github/workflows/r2r-full-py-integration-tests-graphrag.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
name: R2R Full Python Integration Test (ubuntu)

on:
push:
branches:
- main
pull_request:
branches:
- dev
- dev-minor
- main
workflow_dispatch:

jobs:
test:
runs-on: ${{ matrix.os }}
continue-on-error: true

strategy:
matrix:
os: [ubuntu-latest]
test_category:
- cli-graphrag
- sdk-graphrag
env:
OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
TELEMETRY_ENABLED: 'false'
R2R_PROJECT_NAME: r2r_default

steps:
- name: Checkout code
uses: actions/checkout@v4

- name: Set up Python and install dependencies
uses: ./.github/actions/setup-python-full
with:
os: ${{ matrix.os }}

- name: Setup and start Docker
uses: ./.github/actions/setup-docker

- name: Login Docker
uses: ./.github/actions/login-docker
with:
docker_username: ${{ secrets.RAGTORICHES_DOCKER_UNAME }}
docker_password: ${{ secrets.RAGTORICHES_DOCKER_TOKEN }}

- name: Start R2R Full server
uses: ./.github/actions/start-r2r-full

- name: Run CLI GraphRAG Tests
if: matrix.test_category == 'cli-graphrag'
uses: ./.github/actions/run-cli-graphrag-tests

- name: Run SDK GraphRAG Tests
if: matrix.test_category == 'sdk-graphrag'
uses: ./.github/actions/run-sdk-graphrag-tests
82 changes: 82 additions & 0 deletions .github/workflows/r2r-full-py-integration-tests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
name: R2R Full Python Integration Test (ubuntu)

on:
push:
branches:
- main
pull_request:
branches:
- dev
- dev-minor
- main
workflow_dispatch:

jobs:
test:
runs-on: ${{ matrix.os }}
continue-on-error: true

strategy:
matrix:
os: [ubuntu-latest]
test_category:
- cli-ingestion
- cli-retrieval
- sdk-ingestion
- sdk-retrieval
- sdk-auth
- sdk-collections
- sdk-prompts
env:
OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
TELEMETRY_ENABLED: 'false'
R2R_PROJECT_NAME: r2r_default

steps:
- name: Checkout code
uses: actions/checkout@v4

- name: Set up Python and install dependencies
uses: ./.github/actions/setup-python-full
with:
os: ${{ matrix.os }}

- name: Setup and start Docker
uses: ./.github/actions/setup-docker

- name: Login Docker
uses: ./.github/actions/login-docker
with:
docker_username: ${{ secrets.RAGTORICHES_DOCKER_UNAME }}
docker_password: ${{ secrets.RAGTORICHES_DOCKER_TOKEN }}

- name: Start R2R Full server
uses: ./.github/actions/start-r2r-full

- name: Run CLI Ingestion Tests
if: matrix.test_category == 'cli-ingestion'
uses: ./.github/actions/run-cli-ingestion-tests

- name: Run CLI Retrieval Tests
if: matrix.test_category == 'cli-retrieval'
uses: ./.github/actions/run-cli-retrieval-tests

- name: Run SDK Ingestion Tests
if: matrix.test_category == 'sdk-ingestion'
uses: ./.github/actions/run-sdk-ingestion-tests

- name: Run SDK Retrieval Tests
if: matrix.test_category == 'sdk-retrieval'
uses: ./.github/actions/run-sdk-retrieval-tests

- name: Run SDK Auth Tests
if: matrix.test_category == 'sdk-auth'
uses: ./.github/actions/run-sdk-auth-tests

- name: Run SDK Collections Tests
if: matrix.test_category == 'sdk-collections'
uses: ./.github/actions/run-sdk-collections-tests

- name: Run SDK Prompt Tests
if: matrix.test_category == 'sdk-prompts'
uses: ./.github/actions/run-sdk-prompt-management-tests
75 changes: 71 additions & 4 deletions py/poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion py/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ packages = [

[tool.poetry.dependencies]
# Python Versions
python = ">=3.11,<3.13"
python = ">=3.10,<3.13"

alembic = "^1.13.3"
asyncclick = "^8.1.7.2"
Expand Down
2 changes: 1 addition & 1 deletion services/unstructured/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import logging
import os
from io import BytesIO
from typing import Dict, List
from typing import Dict, List, Optional

from fastapi import FastAPI, HTTPException
from pydantic import BaseModel
Expand Down

0 comments on commit d75dd97

Please sign in to comment.