Skip to content

Commit 2da2b0f

Browse files
algolia-botFluf22
andcommitted
fix(specs): update search api specs [skip-bc] (generated)
algolia/api-clients-automation#3760 Co-authored-by: algolia-bot <[email protected]> Co-authored-by: Thomas Raffray <[email protected]>
1 parent 400e10b commit 2da2b0f

File tree

6 files changed

+54
-134
lines changed

6 files changed

+54
-134
lines changed

algoliasearch/recommend/models/highlight_result.py

Lines changed: 9 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -26,26 +26,17 @@ class HighlightResult(BaseModel):
2626
HighlightResult
2727
"""
2828

29-
oneof_schema_1_validator: Optional[Dict[str, HighlightResult]] = Field(
29+
oneof_schema_1_validator: Optional[HighlightResultOption] = None
30+
oneof_schema_2_validator: Optional[Dict[str, HighlightResult]] = Field(
3031
default=None,
3132
description="Surround words that match the query with HTML tags for highlighting.",
3233
)
33-
oneof_schema_2_validator: Optional[HighlightResultOption] = None
34-
oneof_schema_3_validator: Optional[Dict[str, HighlightResultOption]] = Field(
35-
default=None,
36-
description="Surround words that match the query with HTML tags for highlighting.",
37-
)
38-
oneof_schema_4_validator: Optional[List[HighlightResultOption]] = Field(
34+
oneof_schema_3_validator: Optional[List[HighlightResult]] = Field(
3935
default=None,
4036
description="Surround words that match the query with HTML tags for highlighting.",
4137
)
4238
actual_instance: Optional[
43-
Union[
44-
Dict[str, HighlightResultOption],
45-
Dict[str, HighlightResult],
46-
HighlightResultOption,
47-
List[HighlightResultOption],
48-
]
39+
Union[Dict[str, HighlightResult], HighlightResultOption, List[HighlightResult]]
4940
] = None
5041

5142
def __init__(self, *args, **kwargs) -> None:
@@ -66,12 +57,7 @@ def __init__(self, *args, **kwargs) -> None:
6657
def unwrap_actual_instance(
6758
self,
6859
) -> Optional[
69-
Union[
70-
Dict[str, HighlightResultOption],
71-
Dict[str, HighlightResult],
72-
HighlightResultOption,
73-
List[HighlightResultOption],
74-
]
60+
Union[Dict[str, HighlightResult], HighlightResultOption, List[HighlightResult]]
7561
]:
7662
"""
7763
Unwraps the `actual_instance` when calling the `to_json` method.
@@ -89,14 +75,14 @@ def from_json(cls, json_str: str) -> Self:
8975
error_messages = []
9076

9177
try:
92-
instance.oneof_schema_1_validator = loads(json_str)
93-
instance.actual_instance = instance.oneof_schema_1_validator
78+
instance.actual_instance = HighlightResultOption.from_json(json_str)
9479

9580
return instance
9681
except (ValidationError, ValueError) as e:
9782
error_messages.append(str(e))
9883
try:
99-
instance.actual_instance = HighlightResultOption.from_json(json_str)
84+
instance.oneof_schema_2_validator = loads(json_str)
85+
instance.actual_instance = instance.oneof_schema_2_validator
10086

10187
return instance
10288
except (ValidationError, ValueError) as e:
@@ -105,19 +91,12 @@ def from_json(cls, json_str: str) -> Self:
10591
instance.oneof_schema_3_validator = loads(json_str)
10692
instance.actual_instance = instance.oneof_schema_3_validator
10793

108-
return instance
109-
except (ValidationError, ValueError) as e:
110-
error_messages.append(str(e))
111-
try:
112-
instance.oneof_schema_4_validator = loads(json_str)
113-
instance.actual_instance = instance.oneof_schema_4_validator
114-
11594
return instance
11695
except (ValidationError, ValueError) as e:
11796
error_messages.append(str(e))
11897

11998
raise ValueError(
120-
"No match found when deserializing the JSON string into HighlightResult with oneOf schemas: Dict[str, HighlightResultOption], Dict[str, HighlightResult], HighlightResultOption, List[HighlightResultOption]. Details: "
99+
"No match found when deserializing the JSON string into HighlightResult with oneOf schemas: Dict[str, HighlightResult], HighlightResultOption, List[HighlightResult]. Details: "
121100
+ ", ".join(error_messages)
122101
)
123102

algoliasearch/recommend/models/recommendations_results.py

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -145,15 +145,17 @@ class RecommendationsResults(BaseModel):
145145
description="Whether automatic events collection is enabled for the application.",
146146
alias="_automaticInsights",
147147
)
148-
page: Annotated[int, Field(strict=True, ge=0)] = Field(
149-
description="Page of search results to retrieve."
148+
page: Optional[Annotated[int, Field(strict=True, ge=0)]] = Field(
149+
default=0, description="Page of search results to retrieve."
150150
)
151-
nb_hits: StrictInt = Field(description="Number of results (hits).", alias="nbHits")
152-
nb_pages: StrictInt = Field(
153-
description="Number of pages of results.", alias="nbPages"
151+
nb_hits: Optional[StrictInt] = Field(
152+
default=None, description="Number of results (hits).", alias="nbHits"
154153
)
155-
hits_per_page: Annotated[int, Field(le=1000, strict=True, ge=1)] = Field(
156-
description="Number of hits per page.", alias="hitsPerPage"
154+
nb_pages: Optional[StrictInt] = Field(
155+
default=None, description="Number of pages of results.", alias="nbPages"
156+
)
157+
hits_per_page: Optional[Annotated[int, Field(le=1000, strict=True, ge=1)]] = Field(
158+
default=20, description="Number of hits per page.", alias="hitsPerPage"
157159
)
158160
hits: List[RecommendationsHit]
159161

algoliasearch/recommend/models/snippet_result.py

Lines changed: 9 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -26,26 +26,17 @@ class SnippetResult(BaseModel):
2626
SnippetResult
2727
"""
2828

29-
oneof_schema_1_validator: Optional[Dict[str, SnippetResult]] = Field(
29+
oneof_schema_1_validator: Optional[SnippetResultOption] = None
30+
oneof_schema_2_validator: Optional[Dict[str, SnippetResult]] = Field(
3031
default=None,
3132
description="Snippets that show the context around a matching search query.",
3233
)
33-
oneof_schema_2_validator: Optional[SnippetResultOption] = None
34-
oneof_schema_3_validator: Optional[Dict[str, SnippetResultOption]] = Field(
35-
default=None,
36-
description="Snippets that show the context around a matching search query.",
37-
)
38-
oneof_schema_4_validator: Optional[List[SnippetResultOption]] = Field(
34+
oneof_schema_3_validator: Optional[List[SnippetResult]] = Field(
3935
default=None,
4036
description="Snippets that show the context around a matching search query.",
4137
)
4238
actual_instance: Optional[
43-
Union[
44-
Dict[str, SnippetResultOption],
45-
Dict[str, SnippetResult],
46-
List[SnippetResultOption],
47-
SnippetResultOption,
48-
]
39+
Union[Dict[str, SnippetResult], List[SnippetResult], SnippetResultOption]
4940
] = None
5041

5142
def __init__(self, *args, **kwargs) -> None:
@@ -66,12 +57,7 @@ def __init__(self, *args, **kwargs) -> None:
6657
def unwrap_actual_instance(
6758
self,
6859
) -> Optional[
69-
Union[
70-
Dict[str, SnippetResultOption],
71-
Dict[str, SnippetResult],
72-
List[SnippetResultOption],
73-
SnippetResultOption,
74-
]
60+
Union[Dict[str, SnippetResult], List[SnippetResult], SnippetResultOption]
7561
]:
7662
"""
7763
Unwraps the `actual_instance` when calling the `to_json` method.
@@ -89,14 +75,14 @@ def from_json(cls, json_str: str) -> Self:
8975
error_messages = []
9076

9177
try:
92-
instance.oneof_schema_1_validator = loads(json_str)
93-
instance.actual_instance = instance.oneof_schema_1_validator
78+
instance.actual_instance = SnippetResultOption.from_json(json_str)
9479

9580
return instance
9681
except (ValidationError, ValueError) as e:
9782
error_messages.append(str(e))
9883
try:
99-
instance.actual_instance = SnippetResultOption.from_json(json_str)
84+
instance.oneof_schema_2_validator = loads(json_str)
85+
instance.actual_instance = instance.oneof_schema_2_validator
10086

10187
return instance
10288
except (ValidationError, ValueError) as e:
@@ -105,19 +91,12 @@ def from_json(cls, json_str: str) -> Self:
10591
instance.oneof_schema_3_validator = loads(json_str)
10692
instance.actual_instance = instance.oneof_schema_3_validator
10793

108-
return instance
109-
except (ValidationError, ValueError) as e:
110-
error_messages.append(str(e))
111-
try:
112-
instance.oneof_schema_4_validator = loads(json_str)
113-
instance.actual_instance = instance.oneof_schema_4_validator
114-
11594
return instance
11695
except (ValidationError, ValueError) as e:
11796
error_messages.append(str(e))
11897

11998
raise ValueError(
120-
"No match found when deserializing the JSON string into SnippetResult with oneOf schemas: Dict[str, SnippetResultOption], Dict[str, SnippetResult], List[SnippetResultOption], SnippetResultOption. Details: "
99+
"No match found when deserializing the JSON string into SnippetResult with oneOf schemas: Dict[str, SnippetResult], List[SnippetResult], SnippetResultOption. Details: "
121100
+ ", ".join(error_messages)
122101
)
123102

algoliasearch/search/models/highlight_result.py

Lines changed: 9 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -26,26 +26,17 @@ class HighlightResult(BaseModel):
2626
HighlightResult
2727
"""
2828

29-
oneof_schema_1_validator: Optional[Dict[str, HighlightResult]] = Field(
29+
oneof_schema_1_validator: Optional[HighlightResultOption] = None
30+
oneof_schema_2_validator: Optional[Dict[str, HighlightResult]] = Field(
3031
default=None,
3132
description="Surround words that match the query with HTML tags for highlighting.",
3233
)
33-
oneof_schema_2_validator: Optional[HighlightResultOption] = None
34-
oneof_schema_3_validator: Optional[Dict[str, HighlightResultOption]] = Field(
35-
default=None,
36-
description="Surround words that match the query with HTML tags for highlighting.",
37-
)
38-
oneof_schema_4_validator: Optional[List[HighlightResultOption]] = Field(
34+
oneof_schema_3_validator: Optional[List[HighlightResult]] = Field(
3935
default=None,
4036
description="Surround words that match the query with HTML tags for highlighting.",
4137
)
4238
actual_instance: Optional[
43-
Union[
44-
Dict[str, HighlightResultOption],
45-
Dict[str, HighlightResult],
46-
HighlightResultOption,
47-
List[HighlightResultOption],
48-
]
39+
Union[Dict[str, HighlightResult], HighlightResultOption, List[HighlightResult]]
4940
] = None
5041

5142
def __init__(self, *args, **kwargs) -> None:
@@ -66,12 +57,7 @@ def __init__(self, *args, **kwargs) -> None:
6657
def unwrap_actual_instance(
6758
self,
6859
) -> Optional[
69-
Union[
70-
Dict[str, HighlightResultOption],
71-
Dict[str, HighlightResult],
72-
HighlightResultOption,
73-
List[HighlightResultOption],
74-
]
60+
Union[Dict[str, HighlightResult], HighlightResultOption, List[HighlightResult]]
7561
]:
7662
"""
7763
Unwraps the `actual_instance` when calling the `to_json` method.
@@ -89,14 +75,14 @@ def from_json(cls, json_str: str) -> Self:
8975
error_messages = []
9076

9177
try:
92-
instance.oneof_schema_1_validator = loads(json_str)
93-
instance.actual_instance = instance.oneof_schema_1_validator
78+
instance.actual_instance = HighlightResultOption.from_json(json_str)
9479

9580
return instance
9681
except (ValidationError, ValueError) as e:
9782
error_messages.append(str(e))
9883
try:
99-
instance.actual_instance = HighlightResultOption.from_json(json_str)
84+
instance.oneof_schema_2_validator = loads(json_str)
85+
instance.actual_instance = instance.oneof_schema_2_validator
10086

10187
return instance
10288
except (ValidationError, ValueError) as e:
@@ -105,19 +91,12 @@ def from_json(cls, json_str: str) -> Self:
10591
instance.oneof_schema_3_validator = loads(json_str)
10692
instance.actual_instance = instance.oneof_schema_3_validator
10793

108-
return instance
109-
except (ValidationError, ValueError) as e:
110-
error_messages.append(str(e))
111-
try:
112-
instance.oneof_schema_4_validator = loads(json_str)
113-
instance.actual_instance = instance.oneof_schema_4_validator
114-
11594
return instance
11695
except (ValidationError, ValueError) as e:
11796
error_messages.append(str(e))
11897

11998
raise ValueError(
120-
"No match found when deserializing the JSON string into HighlightResult with oneOf schemas: Dict[str, HighlightResultOption], Dict[str, HighlightResult], HighlightResultOption, List[HighlightResultOption]. Details: "
99+
"No match found when deserializing the JSON string into HighlightResult with oneOf schemas: Dict[str, HighlightResult], HighlightResultOption, List[HighlightResult]. Details: "
121100
+ ", ".join(error_messages)
122101
)
123102

algoliasearch/search/models/search_response.py

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -145,15 +145,17 @@ class SearchResponse(BaseModel):
145145
description="Whether automatic events collection is enabled for the application.",
146146
alias="_automaticInsights",
147147
)
148-
page: Annotated[int, Field(strict=True, ge=0)] = Field(
149-
description="Page of search results to retrieve."
148+
page: Optional[Annotated[int, Field(strict=True, ge=0)]] = Field(
149+
default=0, description="Page of search results to retrieve."
150150
)
151-
nb_hits: StrictInt = Field(description="Number of results (hits).", alias="nbHits")
152-
nb_pages: StrictInt = Field(
153-
description="Number of pages of results.", alias="nbPages"
151+
nb_hits: Optional[StrictInt] = Field(
152+
default=None, description="Number of results (hits).", alias="nbHits"
154153
)
155-
hits_per_page: Annotated[int, Field(le=1000, strict=True, ge=1)] = Field(
156-
description="Number of hits per page.", alias="hitsPerPage"
154+
nb_pages: Optional[StrictInt] = Field(
155+
default=None, description="Number of pages of results.", alias="nbPages"
156+
)
157+
hits_per_page: Optional[Annotated[int, Field(le=1000, strict=True, ge=1)]] = Field(
158+
default=20, description="Number of hits per page.", alias="hitsPerPage"
157159
)
158160
hits: List[Hit] = Field(
159161
description="Search results (hits). Hits are records from your index that match the search criteria, augmented with additional attributes, such as, for highlighting. "

algoliasearch/search/models/snippet_result.py

Lines changed: 9 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -26,26 +26,17 @@ class SnippetResult(BaseModel):
2626
SnippetResult
2727
"""
2828

29-
oneof_schema_1_validator: Optional[Dict[str, SnippetResult]] = Field(
29+
oneof_schema_1_validator: Optional[SnippetResultOption] = None
30+
oneof_schema_2_validator: Optional[Dict[str, SnippetResult]] = Field(
3031
default=None,
3132
description="Snippets that show the context around a matching search query.",
3233
)
33-
oneof_schema_2_validator: Optional[SnippetResultOption] = None
34-
oneof_schema_3_validator: Optional[Dict[str, SnippetResultOption]] = Field(
35-
default=None,
36-
description="Snippets that show the context around a matching search query.",
37-
)
38-
oneof_schema_4_validator: Optional[List[SnippetResultOption]] = Field(
34+
oneof_schema_3_validator: Optional[List[SnippetResult]] = Field(
3935
default=None,
4036
description="Snippets that show the context around a matching search query.",
4137
)
4238
actual_instance: Optional[
43-
Union[
44-
Dict[str, SnippetResultOption],
45-
Dict[str, SnippetResult],
46-
List[SnippetResultOption],
47-
SnippetResultOption,
48-
]
39+
Union[Dict[str, SnippetResult], List[SnippetResult], SnippetResultOption]
4940
] = None
5041

5142
def __init__(self, *args, **kwargs) -> None:
@@ -66,12 +57,7 @@ def __init__(self, *args, **kwargs) -> None:
6657
def unwrap_actual_instance(
6758
self,
6859
) -> Optional[
69-
Union[
70-
Dict[str, SnippetResultOption],
71-
Dict[str, SnippetResult],
72-
List[SnippetResultOption],
73-
SnippetResultOption,
74-
]
60+
Union[Dict[str, SnippetResult], List[SnippetResult], SnippetResultOption]
7561
]:
7662
"""
7763
Unwraps the `actual_instance` when calling the `to_json` method.
@@ -89,14 +75,14 @@ def from_json(cls, json_str: str) -> Self:
8975
error_messages = []
9076

9177
try:
92-
instance.oneof_schema_1_validator = loads(json_str)
93-
instance.actual_instance = instance.oneof_schema_1_validator
78+
instance.actual_instance = SnippetResultOption.from_json(json_str)
9479

9580
return instance
9681
except (ValidationError, ValueError) as e:
9782
error_messages.append(str(e))
9883
try:
99-
instance.actual_instance = SnippetResultOption.from_json(json_str)
84+
instance.oneof_schema_2_validator = loads(json_str)
85+
instance.actual_instance = instance.oneof_schema_2_validator
10086

10187
return instance
10288
except (ValidationError, ValueError) as e:
@@ -105,19 +91,12 @@ def from_json(cls, json_str: str) -> Self:
10591
instance.oneof_schema_3_validator = loads(json_str)
10692
instance.actual_instance = instance.oneof_schema_3_validator
10793

108-
return instance
109-
except (ValidationError, ValueError) as e:
110-
error_messages.append(str(e))
111-
try:
112-
instance.oneof_schema_4_validator = loads(json_str)
113-
instance.actual_instance = instance.oneof_schema_4_validator
114-
11594
return instance
11695
except (ValidationError, ValueError) as e:
11796
error_messages.append(str(e))
11897

11998
raise ValueError(
120-
"No match found when deserializing the JSON string into SnippetResult with oneOf schemas: Dict[str, SnippetResultOption], Dict[str, SnippetResult], List[SnippetResultOption], SnippetResultOption. Details: "
99+
"No match found when deserializing the JSON string into SnippetResult with oneOf schemas: Dict[str, SnippetResult], List[SnippetResult], SnippetResultOption. Details: "
121100
+ ", ".join(error_messages)
122101
)
123102

0 commit comments

Comments
 (0)