Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

master -> main #14

Merged
merged 3 commits into from
Feb 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
---
name: CI / cd . / make spell_check
name: make spell_check

on:
push:
branches: [master]
pull_request:
branches: [master]
workflow_call:
inputs:
working-directory:
required: true
type: string
description: "From which folder this pipeline executes"

permissions:
contents: read
Expand All @@ -24,9 +26,10 @@ jobs:
pip install toml

- name: Extract Ignore Words List
working-directory: ${{ inputs.working-directory }}
run: |
# Use a Python script to extract the ignore words list from pyproject.toml
python .github/workflows/extract_ignored_words_list.py
python ../../.github/workflows/extract_ignored_words_list.py
id: extract_ignore_words

- name: Codespell
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@ env:

jobs:
build:
if: github.ref == 'refs/heads/master'
environment: Scheduled testing
if: github.ref == 'refs/heads/main'
runs-on: ubuntu-latest

outputs:
Expand Down Expand Up @@ -268,4 +267,4 @@ jobs:
draft: false
generateReleaseNotes: true
tag: ${{ inputs.working-directory }}/v${{ needs.build.outputs.version }}
commit: master
commit: main
2 changes: 1 addition & 1 deletion .github/workflows/_test_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ env:

jobs:
build:
if: github.ref == 'refs/heads/master'
if: github.ref == 'refs/heads/main'
runs-on: ubuntu-latest

outputs:
Expand Down
14 changes: 11 additions & 3 deletions .github/workflows/check_diffs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: CI

on:
push:
branches: [master]
branches: [main]
pull_request:

# If another push to the same PR or branch happens while this workflow is still running,
Expand Down Expand Up @@ -31,6 +31,16 @@ jobs:
python .github/scripts/check_diff.py ${{ steps.files.outputs.all }} >> $GITHUB_OUTPUT
outputs:
dirs-to-run: ${{ steps.set-matrix.outputs.dirs-to-run }}
codespell:
name: cd ${{ matrix.working-directory }}
needs: [build]
strategy:
matrix:
working-directory: ${{ fromJson(needs.build.outputs.dirs-to-run) }}
uses: ./.github/workflows/_codespell.yml
with:
working-directory: ${{ matrix.working-directory }}

ci:
name: cd ${{ matrix.working-directory }}
needs: [ build ]
Expand All @@ -40,5 +50,3 @@ jobs:
uses: ./.github/workflows/_all_ci.yml
with:
working-directory: ${{ matrix.working-directory }}


2 changes: 1 addition & 1 deletion libs/genai/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ integration_tests:
PYTHON_FILES=.
MYPY_CACHE=.mypy_cache
lint format: PYTHON_FILES=.
lint_diff format_diff: PYTHON_FILES=$(shell git diff --name-only --diff-filter=d master | grep -E '\.py$$|\.ipynb$$')
lint_diff format_diff: PYTHON_FILES=$(shell git diff --name-only --diff-filter=d main | grep -E '\.py$$|\.ipynb$$')
lint_package: PYTHON_FILES=langchain_google_genai
lint_tests: PYTHON_FILES=tests
lint_tests: MYPY_CACHE=.mypy_cache_test
Expand Down
2 changes: 1 addition & 1 deletion libs/vertexai/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ tests:
PYTHON_FILES=.
MYPY_CACHE=.mypy_cache
lint format: PYTHON_FILES=.
lint_diff format_diff: PYTHON_FILES=$(shell git diff --relative=libs/partners/google-vertexai --name-only --diff-filter=d master | grep -E '\.py$$|\.ipynb$$')
lint_diff format_diff: PYTHON_FILES=$(shell git diff --relative=libs/partners/google-vertexai --name-only --diff-filter=d main | grep -E '\.py$$|\.ipynb$$')
lint_package: PYTHON_FILES=langchain_google_vertexai
lint_tests: PYTHON_FILES=tests
lint_tests: MYPY_CACHE=.mypy_cache_test
Expand Down
4 changes: 2 additions & 2 deletions libs/vertexai/tests/integration_tests/test_chat_models.py
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ def test_vertexai_stream(model_name: str) -> None:
def test_vertexai_single_call_with_context() -> None:
model = ChatVertexAI()
raw_context = (
"My name is Ned. You are my personal assistant. My favorite movies "
"My name is Peter. You are my personal assistant. My favorite movies "
"are Lord of the Rings and Hobbit."
)
question = (
Expand Down Expand Up @@ -154,7 +154,7 @@ def test_multimodal_history() -> None:

def test_vertexai_single_call_with_examples() -> None:
model = ChatVertexAI()
raw_context = "My name is Ned. You are my personal assistant."
raw_context = "My name is Peter. You are my personal assistant."
question = "2+2"
text_question, text_answer = "4+4", "8"
inp = HumanMessage(content=text_question)
Expand Down
2 changes: 1 addition & 1 deletion libs/vertexai/tests/unit_tests/test_chat_models.py
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ def test_vertexai_args_passed(stop: Optional[str]) -> None:

def test_parse_chat_history_correct() -> None:
text_context = (
"My name is Ned. You are my personal assistant. My "
"My name is Peter. You are my personal assistant. My "
"favorite movies are Lord of the Rings and Hobbit."
)
context = SystemMessage(content=text_context)
Expand Down
Loading