Skip to content

Commit a678b41

Browse files
Marco van AngerenMarco van Angeren
authored andcommitted
Merge remote-tracking branch 'upstream/main' into feature/stream-support-chat-storage
2 parents 10d190c + 935821f commit a678b41

File tree

216 files changed

+6302
-900
lines changed

Some content is hidden

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

216 files changed

+6302
-900
lines changed

.doctor-rst.yaml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ rules:
2525
ensure_exactly_one_space_between_link_definition_and_link: ~
2626
ensure_link_definition_contains_valid_url: ~
2727
ensure_order_of_code_blocks_in_configuration_block: ~
28+
ensure_php_reference_syntax: ~
2829
extend_abstract_admin: ~
2930
extend_abstract_controller: ~
30-
# extend_controller: ~
3131
extension_xlf_instead_of_xliff: ~
3232
# filename_uses_dashes_only: ~
3333
# filename_uses_underscores_only: ~
@@ -38,7 +38,6 @@ rules:
3838
- '.. index::'
3939
indention: ~
4040
kernel_instead_of_app_kernel: ~
41-
# line_length: ~
4241
lowercase_as_in_use_statements: ~
4342
max_blank_lines:
4443
max: 2
@@ -82,7 +81,6 @@ rules:
8281
typo: ~
8382
unused_links: ~
8483
use_deprecated_directive_instead_of_versionadded: ~
85-
use_https_xsd_urls: ~
8684
# use_named_constructor_without_new_keyword_rule: ~
8785
valid_inline_highlighted_namespaces: ~
8886
valid_use_statements: ~
@@ -92,5 +90,3 @@ rules:
9290
min_version: '2.0'
9391
versionadded_directive_should_have_version: ~
9492
yaml_instead_of_yml_suffix: ~
95-
yarn_dev_option_at_the_end: ~
96-
# yarn_dev_option_not_at_the_end: ~

.github/build-packages.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
use Symfony\Component\Finder\Finder;
1010

1111
$finder = (new Finder())
12-
->in([__DIR__.'/../src/*/', __DIR__.'/../examples/', __DIR__.'/../demo/'])
12+
->in([__DIR__.'/../src/*/', __DIR__.'/../src/*/src/Bridge/*/', __DIR__.'/../examples/', __DIR__.'/../demo/'])
1313
->depth(0)
1414
->name('composer.json')
1515
;

.github/workflows/code-quality.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@ jobs:
2424
php-version: [ '8.4' ]
2525
steps:
2626
- name: Checkout
27-
uses: actions/checkout@v5
27+
uses: actions/checkout@v6
2828

2929
- name: Configure environment
3030
run: |
3131
echo COLUMNS=120 >> $GITHUB_ENV
3232
echo COMPOSER_UP='composer update --no-progress --no-interaction --no-scripts --ansi --ignore-platform-req=ext-mongodb' >> $GITHUB_ENV
3333
echo PHPSTAN='vendor/bin/phpstan' >> $GITHUB_ENV
3434
35-
PACKAGES=$(find src/ -mindepth 2 -type f -name composer.json -not -path "*/vendor/*" -printf '%h\n' | sed 's/^src\///' | grep -Ev "examples" | sort | tr '\n' ' ')
35+
PACKAGES=$(find src/ -mindepth 2 -type f -name composer.json -not -path "*/vendor/*" -not -path "*/Bridge/*" -printf '%h\n' | sed 's/^src\///' | grep -Ev "examples" | sort | tr '\n' ' ')
3636
echo "Packages: $PACKAGES"
3737
echo "PACKAGES=$PACKAGES" >> $GITHUB_ENV
3838

.github/workflows/doctor-rst.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,20 @@ on:
55
paths:
66
- '**.rst'
77
- 'docs/**'
8+
- '.github/workflows/doctor-rst.yaml'
89
pull_request:
910
paths:
1011
- '**.rst'
1112
- 'docs/**'
13+
- '.github/workflows/doctor-rst.yaml'
1214

1315
jobs:
1416
doctor-rst:
1517
name: DOCtor-RST
1618
runs-on: ubuntu-latest
1719
steps:
1820
- name: Checkout
19-
uses: actions/checkout@v5
21+
uses: actions/checkout@v6
2022

2123
- name: Create cache dir
2224
run: mkdir .cache
@@ -32,6 +34,6 @@ jobs:
3234
key: doctor-rst-${{ steps.extract_base_branch.outputs.branch }}
3335

3436
- name: DOCtor-RST
35-
uses: docker://oskarstark/doctor-rst
37+
uses: docker://oskarstark/doctor-rst:1.70.2
3638
with:
3739
args: --short --error-format=github --cache-file=/github/workspace/.cache/doctor-rst.cache

.github/workflows/integration-tests.yaml

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
strategy:
2424
fail-fast: false
2525
matrix:
26-
php-version: ['8.2', '8.3', '8.4']
26+
php-version: ['8.2', '8.3', '8.4', '8.5']
2727
dependency-version: ['']
2828
symfony-version: ['']
2929
include:
@@ -38,7 +38,7 @@ jobs:
3838
SYMFONY_REQUIRE: ${{ matrix.symfony-version || '>=7.3' }}
3939

4040
steps:
41-
- uses: actions/checkout@v5
41+
- uses: actions/checkout@v6
4242

4343
- name: Up the examples services
4444
working-directory: examples
@@ -65,25 +65,25 @@ jobs:
6565
- name: Install root dependencies
6666
uses: ramsey/composer-install@v3
6767

68-
- name: Install examples dependencies
68+
- name: Build root packages
69+
run: php .github/build-packages.php
70+
71+
- name: Install root dependencies
6972
uses: ramsey/composer-install@v3
7073
with:
7174
working-directory: examples
7275

73-
- name: Link examples
74-
working-directory: examples
75-
run: ../link
76-
7776
- name: Run commands examples
77+
working-directory: examples
7878
run: |
79-
php examples/commands/stores.php
80-
php examples/commands/message-stores.php
79+
php commands/stores.php
80+
php commands/message-stores.php
8181
8282
demo:
8383
runs-on: ubuntu-latest
8484

8585
steps:
86-
- uses: actions/checkout@v5
86+
- uses: actions/checkout@v6
8787

8888
- name: Setup PHP
8989
uses: shivammathur/setup-php@v2
@@ -95,16 +95,15 @@ jobs:
9595
- name: Install root dependencies
9696
uses: ramsey/composer-install@v3
9797

98+
- name: Build root packages
99+
run: php .github/build-packages.php
100+
98101
- name: Install demo dependencies
99102
uses: ramsey/composer-install@v3
100103
with:
101104
composer-options: "--no-scripts"
102105
working-directory: demo
103106

104-
- name: Link demo
105-
working-directory: demo
106-
run: ../link
107-
108107
- run: composer run-script auto-scripts --no-interaction
109108
working-directory: demo
110109

.github/workflows/unit-tests.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
strategy:
2424
fail-fast: false
2525
matrix:
26-
php-version: ['8.2', '8.3', '8.4']
26+
php-version: ['8.2', '8.3', '8.4', '8.5']
2727
dependency-version: ['']
2828
symfony-version: ['']
2929
include:
@@ -41,7 +41,7 @@ jobs:
4141
SYMFONY_REQUIRE: ${{ matrix.symfony-version || '>=7.3' }}
4242

4343
steps:
44-
- uses: actions/checkout@v5
44+
- uses: actions/checkout@v6
4545

4646
- name: Configure environment
4747
run: |

.upsun/config.yaml

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
routes:
2+
"https://{all}/": { type: upstream, upstream: "app:http" }
3+
"http://{all}/": { type: redirect, to: "https://{all}/" }
4+
5+
services:
6+
7+
applications:
8+
app:
9+
source:
10+
root: "/ai.symfony.com"
11+
12+
type: php:8.4
13+
14+
runtime:
15+
extensions:
16+
17+
variables:
18+
php:
19+
opcache.preload: config/preload.php
20+
21+
build:
22+
flavor: none
23+
24+
web:
25+
locations:
26+
"/":
27+
root: "public/"
28+
expires: 1h
29+
passthru: "/index.php"
30+
31+
mounts:
32+
"/var/cache": { source: instance, source_path: var/cache }
33+
"/var/share": { source: storage, source_path: var/share }
34+
35+
hooks:
36+
build: |
37+
set -x -e
38+
39+
curl -fs https://get.symfony.com/cloud/configurator | bash
40+
NODE_VERSION=22 symfony-build
41+
42+
deploy: |
43+
set -x -e
44+
45+
symfony-deploy
46+
47+
crons:
48+
security-check:
49+
# Check that no security issues have been found for PHP packages deployed in production
50+
spec: '50 23 * * *'
51+
cmd: if [ "$PLATFORM_ENVIRONMENT_TYPE" = "production" ]; then croncape COMPOSER_ROOT_VERSION=1.0.0 COMPOSER_AUDIT_ABANDONED=ignore composer audit --no-cache; fi
52+
clean-expired-sessions:
53+
spec: '17,47 * * * *'
54+
cmd: croncape php-session-clean

README.md

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
1-
<p align="center"><a href="https://symfony.com" target="_blank">
2-
<img src="https://symfony.com/logos/symfony_dynamic_01.svg" alt="Symfony Logo">
1+
<p align="center"><a href="https://ai.symfony.com" target="_blank">
2+
<img src="logo.svg" alt="Symfony AI Logo" width="300">
33
</a></p>
44

5-
<h3 align="center">
6-
Symfony AI
7-
</h3>
8-
95
Symfony AI is a set of components that integrate AI capabilities into PHP applications.
106

117
## Components & Bundles
@@ -27,6 +23,11 @@ To get started with Symfony AI, you can either check out the [examples](./exampl
2723
components in smaller snippets, or you can run the [demo application](./demo) to see the components work together in a
2824
full Symfony web application.
2925

26+
## Resources
27+
28+
* [Documentation](https://symfony.com/doc/current/ai/index.html)
29+
* [Website](https://ai.symfony.com)
30+
3031
## Sponsor
3132

3233
Help Symfony by [sponsoring](https://symfony.com/sponsor) its development!

ai.symfony.com/assets/styles/app.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,10 +215,10 @@ button#themeToggle {
215215
color: white;
216216
}
217217

218-
.demo-audio .demo-icon { background: linear-gradient(180deg, #42DEEE, #7069B0); }
219218
.demo-blog .demo-icon { background: linear-gradient(180deg, #433F77, #C43BC2); }
220219
.demo-crop .demo-icon { background: linear-gradient(180deg, #85A72B, #97BC43); }
221220
.demo-recipe .demo-icon { background: linear-gradient(180deg, #83A659, #71BCB8); }
221+
.demo-speech .demo-icon { background: linear-gradient(180deg, #42DEEE, #7069B0); }
222222
.demo-turbo .demo-icon { background: linear-gradient(180deg, #E94E77, #D68189); }
223223
.demo-video .demo-icon { background: linear-gradient(180deg, #3B9D87, #35A781); }
224224
.demo-wikipedia .demo-icon { background: linear-gradient(180deg, #1CA574, #56AB48); }

ai.symfony.com/composer.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
"symfony/flex": true,
2828
"symfony/runtime": true
2929
},
30-
"bump-after-update": true,
3130
"sort-packages": true
3231
},
3332
"autoload": {

0 commit comments

Comments
 (0)