Skip to content

Commit dd8bc98

Browse files
zsimjeeCalebCourier
zsimjee
authored and
CalebCourier
committed
parent bcc4bb3
author zsimjee <[email protected]> 1699036706 -0700 committer Caleb Courier <[email protected]> 1700668933 -0600 Setup passed password (guardrails-ai#429) * use pypi pass from env * upgrade pip before installing deps * pass pypi pass explicitly * use environ competently Cron nb (guardrails-ai#425) * install deps + pkg for nb runs * lock nb runner to 3.11.x * use cohere api key from environ * ref env vars for cohere + openai fix bad merge in code originally from validators.py (guardrails-ai#427) * fix bad merge in code originally from validators.py * lint fixes bump version (guardrails-ai#428) Setup passed password (guardrails-ai#429) * use pypi pass from env * upgrade pip before installing deps * pass pypi pass explicitly * use environ competently list -> List Lock openai version (guardrails-ai#435) * temporarily lock openai version * bump version to be ready for release Poetry for dependency management (guardrails-ai#436) * Replace setup.py/requirements.txt/version.py with pyproject.toml/poetry.lock * add dateutil to core dependencies * convert dependency groups to extras * Makefile/CI: Change to poetry * poetry run * replace make dev with make full * poetry: include guardrails console script * release_version: Set pypi token in poetry pyproject.toml: version 0.2.7 => 0.2.8 from_element => from_xml rail: load_schema => load_schema_from_xml pydantic_utils.attach_validators_to_element: Fix typehint Pass validator arguments through for string guard Remove XML from pydantic guard instantiation python_rail.compiled_prompt_1: Fix test (wrongly not annotated as optional) Remove conversion-to-XML code Move integration test to where it belongs schema: Remove commented out method load_string_schema_from_pydantic -> load_json_schema_from_pydantic datatypes: Fix datatype deprecation Remove deprecated datatypes from pydantic test_run: Fix `from_element` => `from_xml` call datatypes: Raise deprecation warning on datatype init Move pydantic_utils to split package logs_utils: Move ArbitraryModel to pydantic_utils Move DataType.from_pydantic_field to pydantic_utils add --build option to poetry build release_version: specify token differently fix project name (guardrails => guardrails-ai) Fix reask prompt/instructions (guardrails-ai#432) * schema: Always use reask prompt/instructions setter * guard/run: Remove reask prompt/instructions plumbing * guard: Allow passing reask prompt/instructions to pydantic constructor * guard: Link reask prompt/instructions properties to schema * format index similarToList notebook (guardrails-ai#426) Fix custom onfail handler (guardrails-ai#421) * formatattr: Pass through custom on_fail methods * validator_service: Pass all FailResults to custom fail handler instead of only first * test_validators: Add custom on_fail handler test Init pydantic_utils v2 Adjust tests for pydantic2 pydantic: Allow Dict/List field types (fix guardrails-ai#319) test_validators: Fix SimilarToList validator test CI: handle pydantic v1 and v2 separately list => List parsing_utils: Type ignore pydantic_utils/v2: safe BareModel fix Makefile for poetry fix ci cache for pydantic versions lint and test fixes autoformat Create PII Filter validator (guardrails-ai#395) * Add PII filter: v0 * Update PII filter * Update class docstring, add more entities to filter, bugfix and update some comments * Move logic to helper function, update DEV_REQUIREMENTS, add integration tests * Fix linting * Write code according to Python 3.9 * Add mocks for AnalyzerEngine and AnonymizerEngine * Change | to Union * Add notebook example demo for PIIFilter * Add package imports * Init pydantic_utils v2 * Adjust tests for pydantic2 * pydantic: Allow Dict/List field types (fix guardrails-ai#319) * test_validators: Fix SimilarToList validator test * CI: handle pydantic v1 and v2 separately * list => List * parsing_utils: Type ignore * pydantic_utils/v2: safe BareModel * fix Makefile for poetry * fix ci cache for pydantic versions * Remove setup.py * Update pyproject and poetry * Linting fixes * Remove types remain intact changes * Strong type results to covaraiant Sequence, as suggested by Pyright * Fix linting issues * Change casting * Add else condition for pii_entities to avoid unbound errors for entities_to_filter --------- Co-authored-by: zsimjee <[email protected]> Co-authored-by: Rafael Irgolic <[email protected]> OpenAI v1 support (guardrails-ai#441) * Support both openai v0 and v1 * Adjust CI for openai v0/v1 * Move LLMResponse object to its own file * Add usage to provenance test mock * Comment out ArbitraryCallable test suite for openai errors * Adjust tests for openai v0/v1 * remove unused imports * OpenAIv1: Don't instantiate openai.completions.create if key isn't present in environ lint and type fix fix test ' -> " Rail XML: Rename "format" attr to "validators" (guardrails-ai#439) * Rail XML: Rename "format" attr to "validators" * added note that `format` will be removed in 0.4.x * test_rail: Check format deprecation resolves properly Allow OpenAI v1 pyproject.toml: Clamp pydantic to ">=1.10.9, <2.5" pyproject.toml: Clamp pyright to 1.1.334 update poetry.lock
1 parent bcc4bb3 commit dd8bc98

Some content is hidden

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

73 files changed

+9048
-1889
lines changed

‎.github/workflows/ci.yml

Lines changed: 54 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -20,23 +20,26 @@ jobs:
2020
strategy:
2121
matrix:
2222
python-version: ['3.8', '3.9', '3.10', '3.11']
23-
2423
steps:
2524
- uses: actions/checkout@v2
2625
- name: Set up Python ${{ matrix.python-version }}
2726
uses: actions/setup-python@v2
2827
with:
2928
python-version: ${{ matrix.python-version }}
3029

31-
- uses: actions/cache@v2
30+
- name: Poetry cache
31+
uses: actions/cache@v3
3232
with:
33-
path: ~/.cache/pip
34-
key: ${{ runner.os }}-pip
33+
path: ~/.cache/pypoetry
34+
key: poetry-cache-${{ runner.os }}-${{ steps.setup_python.outputs.python-version }}-${{ env.POETRY_VERSION }}
35+
36+
- name: Install Poetry
37+
uses: snok/install-poetry@v1
3538

3639
- name: Install Dependencies
40+
# TODO: fix errors so that we can run `make dev` instead
3741
run: |
38-
python -m pip install --upgrade pip
39-
make dev
42+
make full
4043
4144
- name: Lint with isort, black, docformatter, flake8
4245
run: |
@@ -47,51 +50,82 @@ jobs:
4750
strategy:
4851
matrix:
4952
python-version: ['3.8', '3.9', '3.10', '3.11']
50-
53+
pydantic-version: ['1.10.9', '2.4.2']
54+
openai-version: ['0.28.1', '1.2.4']
5155
steps:
5256
- uses: actions/checkout@v2
5357
- name: Set up Python ${{ matrix.python-version }}
5458
uses: actions/setup-python@v2
5559
with:
5660
python-version: ${{ matrix.python-version }}
5761

58-
- uses: actions/cache@v2
62+
- name: Poetry cache
63+
uses: actions/cache@v3
5964
with:
60-
path: ~/.cache/pip
61-
key: ${{ runner.os }}-pip
65+
path: ~/.cache/pypoetry
66+
key: poetry-cache-${{ runner.os }}-${{ steps.setup_python.outputs.python-version }}-${{ env.POETRY_VERSION }}-${{ matrix.pydantic-version }}
67+
68+
- name: Install Poetry
69+
uses: snok/install-poetry@v1
6270

6371
- name: Install Dependencies
72+
# TODO: fix errors so that we can run `make dev` instead
6473
run: |
65-
python -m pip install --upgrade pip
66-
make dev
74+
make full
75+
poetry run pip install pydantic==${{ matrix.pydantic-version }}
76+
poetry run pip install openai==${{ matrix.openai-version }}
6777
68-
- name: Static analysis with pyright
78+
- if: matrix.pydantic-version == '2.4.2' && matrix.openai-version == '0.28.1'
79+
name: Static analysis with pyright (ignoring pydantic v1 and openai v1)
6980
run: |
70-
make type
81+
make type-pydantic-v2-openai-v0
82+
83+
- if: matrix.pydantic-version == '1.10.9' && matrix.openai-version == '0.28.1'
84+
name: Static analysis with mypy (ignoring pydantic v2 and openai v1)
85+
run: |
86+
make type-pydantic-v1-openai-v0
87+
88+
- if: matrix.pydantic-version == '2.4.2' && matrix.openai-version == '1.2.4'
89+
name: Static analysis with pyright (ignoring pydantic v1 and openai v0)
90+
run: |
91+
make type-pydantic-v2-openai-v1
92+
93+
- if: matrix.pydantic-version == '1.10.9' && matrix.openai-version == '1.2.4'
94+
name: Static analysis with mypy (ignoring pydantic v2 and openai v0)
95+
run: |
96+
make type-pydantic-v1-openai-v1
7197
7298
Pytests:
7399
runs-on: ubuntu-latest
74100
strategy:
75101
matrix:
76102
python-version: ['3.8', '3.9', '3.10', '3.11']
77-
dependencies: ['dev', 'full']
78-
103+
# TODO: fix errors so that we can run both `make dev` and `make full`
104+
# dependencies: ['dev', 'full']
105+
dependencies: ['full']
106+
pydantic-version: ['1.10.9', '2.4.2']
107+
openai-version: ['0.28.1', '1.2.4']
79108
steps:
80109
- uses: actions/checkout@v2
81110
- name: Set up Python ${{ matrix.python-version }}
82111
uses: actions/setup-python@v2
83112
with:
84113
python-version: ${{ matrix.python-version }}
85114

86-
- uses: actions/cache@v2
115+
- name: Poetry cache
116+
uses: actions/cache@v3
87117
with:
88-
path: ~/.cache/pip
89-
key: ${{ runner.os }}-pip
118+
path: ~/.cache/pypoetry
119+
key: poetry-cache-${{ runner.os }}-${{ steps.setup_python.outputs.python-version }}-${{ env.POETRY_VERSION }}-${{ matrix.pydantic-version }}-${{ matrix.openai-version }}
120+
121+
- name: Install Poetry
122+
uses: snok/install-poetry@v1
90123

91124
- name: Install Dependencies
92125
run: |
93-
python -m pip install --upgrade pip
94126
make ${{ matrix.dependencies }}
127+
poetry run pip install pydantic==${{ matrix.pydantic-version }}
128+
poetry run pip install openai==${{ matrix.openai-version }}
95129
96130
- name: Run Pytests
97131
run: |

‎.github/workflows/deploy_docs.yml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,15 @@ jobs:
2929
uses: actions/checkout@v3
3030
- name: Setup Pages
3131
uses: actions/configure-pages@v3
32-
- name: Install
33-
run: |
34-
python -m pip install --upgrade pip
35-
pip install -r docs/requirements.txt
32+
- name: Poetry cache
33+
uses: actions/cache@v3
34+
with:
35+
path: ~/.cache/pypoetry
36+
key: poetry-cache-${{ runner.os }}-${{ steps.setup_python.outputs.python-version }}-${{ env.POETRY_VERSION }
37+
- name: Install Poetry
38+
uses: snok/install-poetry@v1
39+
- name: Install dependencies
40+
run: poetry install --with docs
3641
- name: Build
3742
run: mkdocs build
3843
- name: Upload artifact

‎.github/workflows/examples_check.yml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,17 @@ jobs:
2323
with:
2424
python-version: 3.11.x
2525

26+
- name: Poetry cache
27+
uses: actions/cache@v3
28+
with:
29+
path: ~/.cache/pypoetry
30+
key: poetry-cache-${{ runner.os }}-${{ steps.setup_python.outputs.python-version }}-${{ env.POETRY_VERSION }}
31+
32+
- name: Install Poetry
33+
uses: snok/install-poetry@v1
34+
2635
- name: Install dependencies
27-
run: |
28-
make full; pip install jupyter nbconvert; pip install .
36+
run: make full; pip install jupyter nbconvert; pip install .
2937

3038
- name: Execute notebooks and check for errors
3139
run: |

‎.github/workflows/release_version.yml

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,21 @@ jobs:
1414
- name: Setup Python
1515
uses: actions/setup-python@v2
1616
with:
17-
python-version: 3.x
17+
python-version: 3.11.x
1818

19-
- name: Install twine and wheel
20-
run: pip install twine wheel
19+
- name: Poetry cache
20+
uses: actions/cache@v3
21+
with:
22+
path: ~/.cache/pypoetry
23+
key: poetry-cache-${{ runner.os }}-${{ steps.setup_python.outputs.python-version }}-${{ env.POETRY_VERSION }}
24+
25+
- name: Install Poetry
26+
uses: snok/install-poetry@v1
2127

22-
- name: Make Full
28+
- name: Install dependencies
2329
run: make full
2430

2531
- name: Upload to PyPI
26-
run: python3 setup.py upload
32+
env:
33+
PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
34+
run: poetry publish --build -u __token__ -p $PYPI_PASSWORD

‎Makefile

Lines changed: 35 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,67 @@
11
MKDOCS_SERVE_ADDR ?= localhost:8000 # Default address for mkdocs serve, format: <host>:<port>, override with `make docs-serve MKDOCS_SERVE_ADDR=<host>:<port>`
22

33
autoformat:
4-
black guardrails/ tests/
5-
isort --atomic guardrails/ tests/
6-
docformatter --in-place --recursive guardrails tests
4+
poetry run black guardrails/ tests/
5+
poetry run isort --atomic guardrails/ tests/
6+
poetry run docformatter --in-place --recursive guardrails tests
77

88
type:
9-
pyright guardrails/
9+
poetry run pyright guardrails/
10+
11+
type-pydantic-v1-openai-v0:
12+
echo '{"exclude": ["guardrails/utils/pydantic_utils/v2.py", "guardrails/utils/openai_utils/v1.py"]}' > pyrightconfig.json
13+
poetry run pyright guardrails/
14+
rm pyrightconfig.json
15+
16+
type-pydantic-v1-openai-v1:
17+
echo '{"exclude": ["guardrails/utils/pydantic_utils/v2.py", "guardrails/utils/openai_utils/v0.py"]}' > pyrightconfig.json
18+
poetry run pyright guardrails/
19+
rm pyrightconfig.json
20+
21+
type-pydantic-v2-openai-v0:
22+
echo '{"exclude": ["guardrails/utils/pydantic_utils/v1.py", "guardrails/utils/openai_utils/v1.py"]}' > pyrightconfig.json
23+
poetry run pyright guardrails/
24+
rm pyrightconfig.json
25+
26+
type-pydantic-v2-openai-v1:
27+
echo '{"exclude": ["guardrails/utils/pydantic_utils/v1.py", "guardrails/utils/openai_utils/v0.py"]}' > pyrightconfig.json
28+
poetry run pyright guardrails/
29+
rm pyrightconfig.json
1030

1131
lint:
12-
isort -c guardrails/ tests/
13-
black guardrails/ tests/ --check
14-
flake8 guardrails/ tests/
32+
poetry run isort -c guardrails/ tests/
33+
poetry run black guardrails/ tests/ --check
34+
poetry run flake8 guardrails/ tests/
1535

1636
test:
17-
pytest tests/
37+
poetry run pytest tests/
1838

1939
test-basic:
2040
set -e
2141
python -c "import guardrails as gd"
2242
python -c "import guardrails.version as mversion"
2343

2444
test-cov:
25-
pytest tests/ --cov=./guardrails/ --cov-report=xml
45+
poetry run pytest tests/ --cov=./guardrails/ --cov-report=xml
2646

2747
view-test-cov:
28-
pytest tests/ --cov=./guardrails/ --cov-report html && open htmlcov/index.html
48+
poetry run pytest tests/ --cov=./guardrails/ --cov-report html && open htmlcov/index.html
2949

3050
docs-serve:
31-
mkdocs serve -a $(MKDOCS_SERVE_ADDR)
51+
poetry run mkdocs serve -a $(MKDOCS_SERVE_ADDR)
3252

3353
docs-deploy:
34-
mkdocs gh-deploy
54+
poetry run mkdocs gh-deploy
3555

3656
dev:
37-
pip install -e ".[dev]"
57+
poetry install
3858

3959
full:
40-
pip install -e ".[all]"
60+
poetry install --all-extras
4161

4262
all: autoformat type lint docs test
4363

4464
precommit:
4565
# pytest -x -q --no-summary
4666
pyright guardrails/
47-
make lint
67+
make lint

0 commit comments

Comments
 (0)