Skip to content

Commit d0ff156

Browse files
authored
Merge branch 'main' into dev-update-stream
2 parents 7b26c76 + 5165d76 commit d0ff156

File tree

2,402 files changed

+506986
-53558
lines changed

Some content is hidden

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

2,402 files changed

+506986
-53558
lines changed

.editorconfig

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ ij_java_blank_lines_after_package = 1
5252
ij_java_blank_lines_around_class = 1
5353
ij_java_blank_lines_around_field = 0
5454
ij_java_blank_lines_around_field_in_interface = 0
55+
ij_java_blank_lines_around_field_with_annotations = 0
5556
ij_java_blank_lines_around_initializer = 1
5657
ij_java_blank_lines_around_method = 1
5758
ij_java_blank_lines_around_method_in_interface = 1
@@ -116,7 +117,7 @@ ij_java_generate_final_locals = true
116117
ij_java_generate_final_parameters = true
117118
ij_java_generate_use_type_annotation_before_type = true
118119
ij_java_if_brace_force = never
119-
ij_java_imports_layout = *, |, javax.**, java.**, |, $*
120+
ij_java_imports_layout = $*,|,javax.**,java.**,*
120121
ij_java_indent_case_from_switch = true
121122
ij_java_insert_inner_class_imports = false
122123
ij_java_insert_override_annotation = true
@@ -891,6 +892,11 @@ ij_kotlin_while_on_new_line = false
891892
ij_kotlin_wrap_elvis_expressions = 1
892893
ij_kotlin_wrap_expression_body_functions = 1
893894
ij_kotlin_wrap_first_method_in_call_chain = false
895+
ktlint_standard = enabled
896+
897+
[{*Test.kt,*IT.kt}]
898+
ktlint_standard_ignore_back_ticked_identifier = true
899+
ktlint_standard_function-naming = disabled
894900

895901
[{*.markdown,*.md}]
896902
ij_markdown_force_one_space_after_blockquote_symbol = true

.github/FUNDING.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# These are supported funding model platforms
2+
3+
github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
4+
patreon: # Replace with a single Patreon username
5+
open_collective: langchain4j
6+
ko_fi: # Replace with a single Ko-fi username
7+
tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
8+
community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
9+
liberapay: # Replace with a single Liberapay username
10+
issuehunt: # Replace with a single IssueHunt username
11+
lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
12+
polar: # Replace with a single Polar username
13+
buy_me_a_coffee: # Replace with a single Buy Me a Coffee username
14+
thanks_dev: # Replace with a single thanks.dev username
15+
custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

.github/pull_request_template.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Closes #
2020

2121
## General checklist
2222
<!-- Please double-check the following points and mark them like this: [X] -->
23-
- [ ] There are no breaking changes
23+
- [ ] There are no breaking changes (API, behaviour)
2424
- [ ] I have added unit and/or integration tests for my change
2525
- [ ] The tests cover both positive and negative cases
2626
- [ ] I have manually run all the unit and integration tests in the module I have added/changed, and they are all green

.github/workflows/add_new_pr_to_project.yaml

Lines changed: 0 additions & 18 deletions
This file was deleted.
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
name: "Documentation: update chatbot"
2+
3+
on:
4+
repository_dispatch:
5+
types: [ trigger-docs-update-chatbot ]
6+
workflow_dispatch:
7+
8+
jobs:
9+
run:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- uses: actions/checkout@v4
13+
- uses: actions/setup-java@v4
14+
with:
15+
distribution: temurin
16+
java-version: 21
17+
- name: Build and run
18+
run: |
19+
mvn -pl internal/langchain4j-docu-chatbot-updater clean compile exec:java
20+
env:
21+
GOOGLE_AI_GEMINI_API_KEY: ${{ secrets.GOOGLE_AI_GEMINI_API_KEY }}
22+
MILVUS_API_KEY: ${{ secrets.MILVUS_API_KEY }}
23+
MILVUS_URI: ${{ secrets.MILVUS_URI }}
Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
name: "Documentation: update versions"
2+
3+
on:
4+
repository_dispatch:
5+
types: [ trigger-docs-update-version ]
6+
workflow_dispatch:
7+
inputs:
8+
stableVersion:
9+
description: "Stable release version (e.g., 1.8.0)"
10+
required: true
11+
betaVersion:
12+
description: "Beta release version (e.g., 1.8.0-beta15)"
13+
required: true
14+
15+
env:
16+
STABLE_VERSION: ${{ github.event.inputs.stableVersion || github.event.client_payload.stableVersion }}
17+
BETA_VERSION: ${{ github.event.inputs.betaVersion || github.event.client_payload.betaVersion }}
18+
19+
jobs:
20+
update-docs:
21+
runs-on: ubuntu-latest
22+
23+
steps:
24+
- name: Checkout repository
25+
uses: actions/checkout@v4
26+
27+
- name: Extract current stable and beta versions from docs metadata
28+
id: extract-current-versions
29+
run: |
30+
STABLE_CURRENT=$(grep -E "^stableVersion:" docs/docs/get-started.md | sed 's/stableVersion: *//')
31+
BETA_CURRENT=$(grep -E "^betaVersion:" docs/docs/get-started.md | sed 's/betaVersion: *//')
32+
echo "stableCurrent=$STABLE_CURRENT" >> $GITHUB_OUTPUT
33+
echo "betaCurrent=$BETA_CURRENT" >> $GITHUB_OUTPUT
34+
echo "Found stable version in docs: $STABLE_CURRENT"
35+
echo "Found beta version in docs: $BETA_CURRENT"
36+
37+
- name: Create new branch
38+
id: create-branch
39+
run: |
40+
BRANCH_NAME="update-docs-versions-${{ env.STABLE_VERSION }}"
41+
git checkout -b "$BRANCH_NAME"
42+
echo "branch=$BRANCH_NAME" >> $GITHUB_OUTPUT
43+
44+
- name: Replace versions in docs recursively
45+
run: |
46+
echo "Replacing all occurrences of stable and beta versions recursively under docs/docs/..."
47+
48+
# Replace beta versions
49+
grep -rl "${{ steps.extract-current-versions.outputs.betaCurrent }}" docs/docs | \
50+
xargs sed -i "s/${{ steps.extract-current-versions.outputs.betaCurrent }}/${{ env.BETA_VERSION }}/g" || true
51+
52+
# Replace stable versions
53+
grep -rl "${{ steps.extract-current-versions.outputs.stableCurrent }}" docs/docs | \
54+
xargs sed -i "s/${{ steps.extract-current-versions.outputs.stableCurrent }}/${{ env.STABLE_VERSION }}/g" || true
55+
56+
- name: Update metadata in get-started.md
57+
run: |
58+
sed -i "s/betaVersion: .*/betaVersion: ${{ env.BETA_VERSION }}/" docs/docs/get-started.md
59+
sed -i "s/stableVersion: .*/stableVersion: ${{ env.STABLE_VERSION }}/" docs/docs/get-started.md
60+
61+
- name: Check if any changes were made
62+
id: git-check
63+
run: |
64+
if git diff --quiet; then
65+
echo "changed=false" >> $GITHUB_OUTPUT
66+
else
67+
echo "changed=true" >> $GITHUB_OUTPUT
68+
fi
69+
70+
- name: Commit and push changes
71+
if: steps.git-check.outputs.changed == 'true'
72+
run: |
73+
git config user.name "github-actions[bot]"
74+
git config user.email "github-actions[bot]@users.noreply.github.com"
75+
git add docs/docs
76+
git commit -m "docu: update versions to ${{ env.STABLE_VERSION }} and ${{ env.BETA_VERSION }}"
77+
git push origin "${{ steps.create-branch.outputs.branch }}"
78+
79+
- name: Trigger documentation build and deploy
80+
if: steps.git-check.outputs.changed == 'true'
81+
uses: peter-evans/repository-dispatch@v4
82+
with:
83+
token: ${{ secrets.GH_RELEASE_AUTOMATION_PAT }}
84+
repository: langchain4j/langchain4j
85+
event-type: trigger-docs-build-and-deploy
86+
87+
- name: Trigger documentation chatbot update
88+
if: steps.git-check.outputs.changed == 'true'
89+
uses: peter-evans/repository-dispatch@v4
90+
with:
91+
token: ${{ secrets.GH_RELEASE_AUTOMATION_PAT }}
92+
repository: langchain4j/langchain4j
93+
event-type: trigger-docs-update-chatbot

.github/workflows/docs.yaml

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
1-
name: Build and Publish Docs to GitHub Pages
1+
name: "Documentation: build and deploy"
22

33
on:
4-
release:
5-
types:
6-
- created
7-
# Allow running this workflow manually from the Actions tab
4+
push:
5+
branches:
6+
- main
7+
paths:
8+
- 'docs/**'
9+
repository_dispatch:
10+
types: [ trigger-docs-build-and-deploy ]
811
workflow_dispatch:
912

1013
# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
@@ -24,10 +27,10 @@ jobs:
2427
steps:
2528
- uses: actions/checkout@v4
2629

27-
- name: Set up JDK 21
30+
- name: Set up JDK 25
2831
uses: actions/setup-java@v4
2932
with:
30-
java-version: '21'
33+
java-version: '25'
3134
distribution: 'temurin'
3235
cache: 'maven'
3336

.github/workflows/javadoc.yaml

Lines changed: 0 additions & 48 deletions
This file was deleted.

0 commit comments

Comments
 (0)