Skip to content

Commit 855b0dd

Browse files
millotpmillotp
authored
Merge branch 'main' into fix/all-html-error
2 parents 90410ef + 14989b8 commit 855b0dd

File tree

39 files changed

+879
-635
lines changed

39 files changed

+879
-635
lines changed

‎clients/algoliasearch-client-python/poetry.lock

Lines changed: 302 additions & 188 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎clients/algoliasearch-client-python/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ classifiers = [
1616
[tool.poetry.dependencies]
1717
python = ">= 3.8.1"
1818
urllib3 = ">= 1.25.3"
19-
aiohttp = ">= 3.9.2"
19+
aiohttp = ">= 3.10.11"
2020
requests = ">=2.32.3"
2121
python-dateutil = ">= 2.8.2"
2222
async-timeout = ">= 4.0.3"

‎clients/algoliasearch-client-python/setup.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ packages = find:
3737
install_requires =
3838
urllib3>=1.25.3,<2.0
3939
requests>=2.32.3,3.0
40-
aiohttp>=3.9.2,<4.0
40+
aiohttp>=3.10.11,<4.0
4141
python-dateutil>=2.8.2,<3.0
4242
pydantic>=2,3.0
4343
typing-extensions>=4.7.1,<5.0

‎docs/guides/python/poetry.lock

Lines changed: 94 additions & 94 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/snippets/python/poetry.lock

Lines changed: 94 additions & 94 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎generators/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ repositories {
1111
}
1212

1313
dependencies {
14-
compileOnly 'org.openapitools:openapi-generator:7.8.0'
14+
compileOnly 'org.openapitools:openapi-generator:7.10.0'
1515
}
1616

1717
tasks.withType(JavaCompile) {

‎scripts/pre-gen/generateOpenapitools.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ export async function generateOpenapitools(
4343
JSON.stringify(
4444
{
4545
'generator-cli': {
46-
version: '7.8.0',
46+
version: '7.10.0',
4747
generators,
4848
},
4949
},

‎specs/bundled/algoliasearch.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2604,6 +2604,7 @@ components:
26042604
highlightResultMap:
26052605
type: object
26062606
description: Surround words that match the query with HTML tags for highlighting.
2607+
x-is-free-form: false
26072608
additionalProperties:
26082609
x-additionalPropertiesName: attribute
26092610
$ref: '#/components/schemas/highlightResult'
@@ -2634,6 +2635,7 @@ components:
26342635
snippetResultMap:
26352636
type: object
26362637
description: Snippets that show the context around a matching search query.
2638+
x-is-free-form: false
26372639
additionalProperties:
26382640
x-additionalPropertiesName: attribute
26392641
$ref: '#/components/schemas/snippetResult'

‎specs/bundled/composition.doc.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2024,6 +2024,7 @@ components:
20242024
highlightResultMap:
20252025
type: object
20262026
description: Surround words that match the query with HTML tags for highlighting.
2027+
x-is-free-form: false
20272028
additionalProperties:
20282029
x-additionalPropertiesName: attribute
20292030
$ref: '#/components/schemas/highlightResult'
@@ -2054,6 +2055,7 @@ components:
20542055
snippetResultMap:
20552056
type: object
20562057
description: Snippets that show the context around a matching search query.
2058+
x-is-free-form: false
20572059
additionalProperties:
20582060
x-additionalPropertiesName: attribute
20592061
$ref: '#/components/schemas/snippetResult'

‎specs/bundled/composition.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1747,6 +1747,7 @@ components:
17471747
highlightResultMap:
17481748
type: object
17491749
description: Surround words that match the query with HTML tags for highlighting.
1750+
x-is-free-form: false
17501751
additionalProperties:
17511752
x-additionalPropertiesName: attribute
17521753
$ref: '#/components/schemas/highlightResult'
@@ -1777,6 +1778,7 @@ components:
17771778
snippetResultMap:
17781779
type: object
17791780
description: Snippets that show the context around a matching search query.
1781+
x-is-free-form: false
17801782
additionalProperties:
17811783
x-additionalPropertiesName: attribute
17821784
$ref: '#/components/schemas/snippetResult'

‎specs/bundled/recommend.doc.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5467,6 +5467,7 @@ components:
54675467
highlightResultMap:
54685468
type: object
54695469
description: Surround words that match the query with HTML tags for highlighting.
5470+
x-is-free-form: false
54705471
additionalProperties:
54715472
x-additionalPropertiesName: attribute
54725473
$ref: '#/components/schemas/highlightResult'
@@ -5497,6 +5498,7 @@ components:
54975498
snippetResultMap:
54985499
type: object
54995500
description: Snippets that show the context around a matching search query.
5501+
x-is-free-form: false
55005502
additionalProperties:
55015503
x-additionalPropertiesName: attribute
55025504
$ref: '#/components/schemas/snippetResult'

‎specs/bundled/recommend.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3373,6 +3373,7 @@ components:
33733373
highlightResultMap:
33743374
type: object
33753375
description: Surround words that match the query with HTML tags for highlighting.
3376+
x-is-free-form: false
33763377
additionalProperties:
33773378
x-additionalPropertiesName: attribute
33783379
$ref: '#/components/schemas/highlightResult'
@@ -3403,6 +3404,7 @@ components:
34033404
snippetResultMap:
34043405
type: object
34053406
description: Snippets that show the context around a matching search query.
3407+
x-is-free-form: false
34063408
additionalProperties:
34073409
x-additionalPropertiesName: attribute
34083410
$ref: '#/components/schemas/snippetResult'

‎specs/bundled/search.doc.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18864,6 +18864,7 @@ components:
1886418864
highlightResultMap:
1886518865
type: object
1886618866
description: Surround words that match the query with HTML tags for highlighting.
18867+
x-is-free-form: false
1886718868
additionalProperties:
1886818869
x-additionalPropertiesName: attribute
1886918870
$ref: '#/components/schemas/highlightResult'
@@ -18894,6 +18895,7 @@ components:
1889418895
snippetResultMap:
1889518896
type: object
1889618897
description: Snippets that show the context around a matching search query.
18898+
x-is-free-form: false
1889718899
additionalProperties:
1889818900
x-additionalPropertiesName: attribute
1889918901
$ref: '#/components/schemas/snippetResult'

‎specs/bundled/search.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5877,6 +5877,7 @@ components:
58775877
highlightResultMap:
58785878
type: object
58795879
description: Surround words that match the query with HTML tags for highlighting.
5880+
x-is-free-form: false
58805881
additionalProperties:
58815882
x-additionalPropertiesName: attribute
58825883
$ref: '#/components/schemas/highlightResult'
@@ -5907,6 +5908,7 @@ components:
59075908
snippetResultMap:
59085909
type: object
59095910
description: Snippets that show the context around a matching search query.
5911+
x-is-free-form: false
59105912
additionalProperties:
59115913
x-additionalPropertiesName: attribute
59125914
$ref: '#/components/schemas/snippetResult'

‎specs/common/schemas/HighlightResult.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ highlightResultArray:
4343
highlightResultMap:
4444
type: object
4545
description: Surround words that match the query with HTML tags for highlighting.
46+
x-is-free-form: false # openapi-generator thinks this is a free-form object since https://github.com/OpenAPITools/openapi-generator/pull/19605
4647
additionalProperties:
4748
x-additionalPropertiesName: attribute
4849
$ref: '#/highlightResult'

‎specs/common/schemas/SnippetResult.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ snippetResultOption:
1616
snippetResultMap:
1717
type: object
1818
description: Snippets that show the context around a matching search query.
19+
x-is-free-form: false # openapi-generator thinks this is a free-form object since https://github.com/OpenAPITools/openapi-generator/pull/19605
1920
additionalProperties:
2021
x-additionalPropertiesName: attribute
2122
$ref: '#/snippetResult'

‎templates/python/pyproject.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ classifiers = [
1616
[tool.poetry.dependencies]
1717
python = ">= 3.8.1"
1818
urllib3 = ">= 1.25.3"
19-
aiohttp = ">= 3.9.2"
19+
aiohttp = ">= 3.10.11"
2020
requests = ">=2.32.3"
2121
python-dateutil = ">= 2.8.2"
2222
async-timeout = ">= 4.0.3"

‎tests/output/csharp/src/generated/e2e/Insights.test.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public async Task PushEventsTest1()
6363
Index = "products",
6464
UserToken = "user-123456",
6565
AuthenticatedUserToken = "user-123456",
66-
Timestamp = 1731715200000L,
66+
Timestamp = 1731974400000L,
6767
ObjectIDs = new List<string> { "9780545139700", "9780439784542" },
6868
QueryID = "43b15df305339e827f0ac0bdc5ebcaa7",
6969
}
@@ -76,7 +76,7 @@ public async Task PushEventsTest1()
7676
Index = "products",
7777
UserToken = "user-123456",
7878
AuthenticatedUserToken = "user-123456",
79-
Timestamp = 1731715200000L,
79+
Timestamp = 1731974400000L,
8080
ObjectIDs = new List<string> { "9780545139700", "9780439784542" },
8181
}
8282
),

‎tests/output/csharp/src/generated/requests/Insights.test.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -580,7 +580,7 @@ await client.PushEventsAsync(
580580
Index = "products",
581581
UserToken = "user-123456",
582582
AuthenticatedUserToken = "user-123456",
583-
Timestamp = 1731715200000L,
583+
Timestamp = 1731974400000L,
584584
ObjectIDs = new List<string> { "9780545139700", "9780439784542" },
585585
QueryID = "43b15df305339e827f0ac0bdc5ebcaa7",
586586
}
@@ -593,7 +593,7 @@ await client.PushEventsAsync(
593593
Index = "products",
594594
UserToken = "user-123456",
595595
AuthenticatedUserToken = "user-123456",
596-
Timestamp = 1731715200000L,
596+
Timestamp = 1731974400000L,
597597
ObjectIDs = new List<string> { "9780545139700", "9780439784542" },
598598
}
599599
),
@@ -605,7 +605,7 @@ await client.PushEventsAsync(
605605
Assert.Equal("/1/events", req.Path);
606606
Assert.Equal("POST", req.Method.ToString());
607607
JsonAssert.EqualOverrideDefault(
608-
"{\"events\":[{\"eventType\":\"conversion\",\"eventName\":\"Product Purchased\",\"index\":\"products\",\"userToken\":\"user-123456\",\"authenticatedUserToken\":\"user-123456\",\"timestamp\":1731715200000,\"objectIDs\":[\"9780545139700\",\"9780439784542\"],\"queryID\":\"43b15df305339e827f0ac0bdc5ebcaa7\"},{\"eventType\":\"view\",\"eventName\":\"Product Detail Page Viewed\",\"index\":\"products\",\"userToken\":\"user-123456\",\"authenticatedUserToken\":\"user-123456\",\"timestamp\":1731715200000,\"objectIDs\":[\"9780545139700\",\"9780439784542\"]}]}",
608+
"{\"events\":[{\"eventType\":\"conversion\",\"eventName\":\"Product Purchased\",\"index\":\"products\",\"userToken\":\"user-123456\",\"authenticatedUserToken\":\"user-123456\",\"timestamp\":1731974400000,\"objectIDs\":[\"9780545139700\",\"9780439784542\"],\"queryID\":\"43b15df305339e827f0ac0bdc5ebcaa7\"},{\"eventType\":\"view\",\"eventName\":\"Product Detail Page Viewed\",\"index\":\"products\",\"userToken\":\"user-123456\",\"authenticatedUserToken\":\"user-123456\",\"timestamp\":1731974400000,\"objectIDs\":[\"9780545139700\",\"9780439784542\"]}]}",
609609
req.Body,
610610
new JsonDiffConfig(false)
611611
);

‎tests/output/dart/test/requests/insights_test.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -635,7 +635,7 @@ void main() {
635635
index: "products",
636636
userToken: "user-123456",
637637
authenticatedUserToken: "user-123456",
638-
timestamp: 1731715200000,
638+
timestamp: 1731974400000,
639639
objectIDs: [
640640
"9780545139700",
641641
"9780439784542",
@@ -648,7 +648,7 @@ void main() {
648648
index: "products",
649649
userToken: "user-123456",
650650
authenticatedUserToken: "user-123456",
651-
timestamp: 1731715200000,
651+
timestamp: 1731974400000,
652652
objectIDs: [
653653
"9780545139700",
654654
"9780439784542",
@@ -661,7 +661,7 @@ void main() {
661661
expectPath(request.path, '/1/events');
662662
expect(request.method, 'post');
663663
expectBody(request.body,
664-
"""{"events":[{"eventType":"conversion","eventName":"Product Purchased","index":"products","userToken":"user-123456","authenticatedUserToken":"user-123456","timestamp":1731715200000,"objectIDs":["9780545139700","9780439784542"],"queryID":"43b15df305339e827f0ac0bdc5ebcaa7"},{"eventType":"view","eventName":"Product Detail Page Viewed","index":"products","userToken":"user-123456","authenticatedUserToken":"user-123456","timestamp":1731715200000,"objectIDs":["9780545139700","9780439784542"]}]}""");
664+
"""{"events":[{"eventType":"conversion","eventName":"Product Purchased","index":"products","userToken":"user-123456","authenticatedUserToken":"user-123456","timestamp":1731974400000,"objectIDs":["9780545139700","9780439784542"],"queryID":"43b15df305339e827f0ac0bdc5ebcaa7"},{"eventType":"view","eventName":"Product Detail Page Viewed","index":"products","userToken":"user-123456","authenticatedUserToken":"user-123456","timestamp":1731974400000,"objectIDs":["9780545139700","9780439784542"]}]}""");
665665
},
666666
),
667667
);

‎tests/output/go/tests/e2e/insights_test.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎tests/output/go/tests/requests/insights_test.go

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎tests/output/java/src/test/java/com/algolia/e2e/Insights.test.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ void pushEventsTest1() {
5050
.setIndex("products")
5151
.setUserToken("user-123456")
5252
.setAuthenticatedUserToken("user-123456")
53-
.setTimestamp(1731715200000L)
53+
.setTimestamp(1731974400000L)
5454
.setObjectIDs(Arrays.asList("9780545139700", "9780439784542"))
5555
.setQueryID("43b15df305339e827f0ac0bdc5ebcaa7"),
5656
new ViewedObjectIDs()
@@ -59,7 +59,7 @@ void pushEventsTest1() {
5959
.setIndex("products")
6060
.setUserToken("user-123456")
6161
.setAuthenticatedUserToken("user-123456")
62-
.setTimestamp(1731715200000L)
62+
.setTimestamp(1731974400000L)
6363
.setObjectIDs(Arrays.asList("9780545139700", "9780439784542"))
6464
)
6565
)

‎tests/output/java/src/test/java/com/algolia/requests/Insights.test.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -720,7 +720,7 @@ void pushEventsTest1() {
720720
.setIndex("products")
721721
.setUserToken("user-123456")
722722
.setAuthenticatedUserToken("user-123456")
723-
.setTimestamp(1731715200000L)
723+
.setTimestamp(1731974400000L)
724724
.setObjectIDs(Arrays.asList("9780545139700", "9780439784542"))
725725
.setQueryID("43b15df305339e827f0ac0bdc5ebcaa7"),
726726
new ViewedObjectIDs()
@@ -729,7 +729,7 @@ void pushEventsTest1() {
729729
.setIndex("products")
730730
.setUserToken("user-123456")
731731
.setAuthenticatedUserToken("user-123456")
732-
.setTimestamp(1731715200000L)
732+
.setTimestamp(1731974400000L)
733733
.setObjectIDs(Arrays.asList("9780545139700", "9780439784542"))
734734
)
735735
)
@@ -741,9 +741,9 @@ void pushEventsTest1() {
741741
assertDoesNotThrow(() ->
742742
JSONAssert.assertEquals(
743743
"{\"events\":[{\"eventType\":\"conversion\",\"eventName\":\"Product" +
744-
" Purchased\",\"index\":\"products\",\"userToken\":\"user-123456\",\"authenticatedUserToken\":\"user-123456\",\"timestamp\":1731715200000,\"objectIDs\":[\"9780545139700\",\"9780439784542\"],\"queryID\":\"43b15df305339e827f0ac0bdc5ebcaa7\"},{\"eventType\":\"view\",\"eventName\":\"Product" +
744+
" Purchased\",\"index\":\"products\",\"userToken\":\"user-123456\",\"authenticatedUserToken\":\"user-123456\",\"timestamp\":1731974400000,\"objectIDs\":[\"9780545139700\",\"9780439784542\"],\"queryID\":\"43b15df305339e827f0ac0bdc5ebcaa7\"},{\"eventType\":\"view\",\"eventName\":\"Product" +
745745
" Detail Page" +
746-
" Viewed\",\"index\":\"products\",\"userToken\":\"user-123456\",\"authenticatedUserToken\":\"user-123456\",\"timestamp\":1731715200000,\"objectIDs\":[\"9780545139700\",\"9780439784542\"]}]}",
746+
" Viewed\",\"index\":\"products\",\"userToken\":\"user-123456\",\"authenticatedUserToken\":\"user-123456\",\"timestamp\":1731974400000,\"objectIDs\":[\"9780545139700\",\"9780439784542\"]}]}",
747747
req.body,
748748
JSONCompareMode.STRICT
749749
)

‎tests/output/javascript/src/e2e/insights.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ describe('pushEvents', () => {
3030
index: 'products',
3131
userToken: 'user-123456',
3232
authenticatedUserToken: 'user-123456',
33-
timestamp: 1731715200000,
33+
timestamp: 1731974400000,
3434
objectIDs: ['9780545139700', '9780439784542'],
3535
queryID: '43b15df305339e827f0ac0bdc5ebcaa7',
3636
},
@@ -40,7 +40,7 @@ describe('pushEvents', () => {
4040
index: 'products',
4141
userToken: 'user-123456',
4242
authenticatedUserToken: 'user-123456',
43-
timestamp: 1731715200000,
43+
timestamp: 1731974400000,
4444
objectIDs: ['9780545139700', '9780439784542'],
4545
},
4646
],

0 commit comments

Comments
 (0)