Skip to content

Commit 907385e

Browse files
authored
Merge branch 'main' into main
2 parents d66a242 + 7231ddb commit 907385e

File tree

472 files changed

+13453
-8740
lines changed

Some content is hidden

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

472 files changed

+13453
-8740
lines changed

.changeset/bright-tips-develop.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"create-llama": patch
3+
---
4+
5+
Add an option to provide an URL and chat with the website data

.changeset/config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"$schema": "https://unpkg.com/@changesets/[email protected]/schema.json",
33
"changelog": "@changesets/cli/changelog",
4-
"commit": false,
4+
"commit": true,
55
"fixed": [],
66
"linked": [],
77
"access": "public",

.changeset/loud-files-do.md

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

.changeset/moody-berries-reflect.md

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

.changeset/small-paws-sneeze.md

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

.changeset/warm-monkeys-check.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"llamaindex": patch
3+
---
4+
5+
feat: allow `SimpleDirectoryReader` to get a string

.devcontainer/devcontainer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
"ghcr.io/devcontainers/features/node:1": {},
55
"ghcr.io/devcontainers-contrib/features/turborepo-npm:1": {},
66
"ghcr.io/devcontainers-contrib/features/typescript:2": {},
7-
"ghcr.io/devcontainers-contrib/features/pnpm:2": {}
8-
}
7+
"ghcr.io/devcontainers-contrib/features/pnpm:2": {},
8+
},
99
}

.eslintrc.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,8 @@ module.exports = {
77
rootDir: ["apps/*/"],
88
},
99
},
10+
rules: {
11+
"max-params": ["error", 4],
12+
},
13+
ignorePatterns: ["dist/"],
1014
};

.github/workflows/e2e.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ on:
88
- ".github/workflows/e2e.yml"
99
branches: [main]
1010

11+
env:
12+
POETRY_VERSION: "1.6.1"
13+
1114
jobs:
1215
e2e:
1316
name: create-llama
@@ -16,10 +19,22 @@ jobs:
1619
fail-fast: true
1720
matrix:
1821
node-version: [18, 20]
22+
python-version: ["3.11"]
1923
os: [macos-latest, windows-latest]
24+
defaults:
25+
run:
26+
shell: bash
2027
runs-on: ${{ matrix.os }}
2128
steps:
2229
- uses: actions/checkout@v4
30+
- name: Set up python ${{ matrix.python-version }}
31+
uses: actions/setup-python@v4
32+
with:
33+
python-version: ${{ matrix.python-version }}
34+
- name: Install Poetry
35+
uses: snok/install-poetry@v1
36+
with:
37+
version: ${{ env.POETRY_VERSION }}
2338
- uses: pnpm/action-setup@v2
2439
- name: Setup Node.js ${{ matrix.node-version }}
2540
uses: actions/setup-node@v4

.github/workflows/lint_on_push_or_pull.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ jobs:
1414
steps:
1515
- uses: actions/checkout@v4
1616
- uses: pnpm/action-setup@v2
17+
with:
18+
version: latest
1719
- name: Setup Node.js
1820
uses: actions/setup-node@v4
1921
with:

0 commit comments

Comments
 (0)