Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(specs): port recommend changes #2476

Merged
merged 8 commits into from
Jan 4, 2024
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions specs/common/schemas/SearchParams.yml
Original file line number Diff line number Diff line change
Expand Up @@ -136,11 +136,7 @@ baseSearchParamsWithoutQuery:
x-categories:
- Personalization
userToken:
type: string
description: Associates a [user token](https://www.algolia.com/doc/guides/sending-events/concepts/usertoken/) with the current search.
example: '123456'
x-categories:
- Personalization
$ref: '#/userToken'
getRankingInfo:
type: boolean
description: Incidates whether the search response includes [detailed ranking information](https://www.algolia.com/doc/guides/building-search-ui/going-further/backend-search/in-depth/understanding-the-api-response/#ranking-information).
Expand Down Expand Up @@ -209,6 +205,13 @@ paramsAsString:
type: string
default: ''

userToken:
type: string
description: Associates a [user token](https://www.algolia.com/doc/guides/sending-events/concepts/usertoken/) with the current search.
example: '123456'
x-categories:
- Personalization

query:
type: string
description: Text to search for in an index.
Expand Down
8 changes: 8 additions & 0 deletions specs/recommend/common/parameters.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,11 @@ ObjectID:
type: string
description: Unique Recommend rule identifier.
example: 'a-recommend-rule-id'

facetName:
type: string
description: Facet name for trending models.

facetValue:
type: string
description: Facet value for trending models.
2 changes: 1 addition & 1 deletion specs/recommend/common/schemas/RecommendationsQuery.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
recommendationsQuery:
allOf:
- $ref: '#/baseRecommendationsQuery'
- $ref: './RecommendationsRequest.yml#/baseRecommendRequest'
- $ref: '#/baseRecommendationsQuery'

baseRecommendationsQuery:
type: object
Expand Down
5 changes: 3 additions & 2 deletions specs/recommend/common/schemas/RecommendationsRequest.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
recommendationsRequest:
oneOf:
- $ref: './TrendingQuery.yml#/trendingItemsQuery'
- $ref: './TrendingQuery.yml#/trendingFacetsQuery'
- $ref: './TrendingItemsQuery.yml#/trendingItemsQuery'
- $ref: './TrendingFacetsQuery.yml#/trendingFacetsQuery'
- $ref: './RecommendationsQuery.yml#/recommendationsQuery'
- $ref: './RecommendedForYouQuery.yml#/recommendedForYouQuery'

baseRecommendRequest:
type: object
Expand Down
68 changes: 29 additions & 39 deletions specs/recommend/common/schemas/RecommendationsResponse.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
recommendationsResponse:
recommendationsResults:
allOf:
- $ref: '../../../search/common/schemas/SearchResponse.yml#/baseSearchResponse'
- $ref: '#/recommendHits'
- $ref: '#/recommendationsHits'

recommendHits:
recommendationsHits:
type: object
additionalProperties: false
properties:
hits:
type: array
items:
$ref: '#/recommendHit'
$ref: '#/recommendationsHit'
query:
$ref: '../../../common/schemas/SearchParams.yml#/query'
params:
Expand All @@ -20,6 +20,11 @@ recommendHits:
required:
- hits

recommendationsHit:
oneOf:
- $ref: '#/recommendHit'
- $ref: '#/trendingFacetHit'

recommendHit:
type: object
description: Recommend hit.
Expand All @@ -39,41 +44,26 @@ recommendHit:
_distinctSeqID:
$ref: '../../../search/common/schemas/Hit.yml#/_distinctSeqID'
_score:
type: number
format: double
minimum: 0
maximum: 100
description: Recommendation score.
$ref: '#/recommendScore'

ruleResponse:
trendingFacetHit:
type: object
description: Rule object.
additionalProperties: false
properties:
_metadata:
type: object
properties:
lastUpdate:
$ref: '../../../common/responses/common.yml#/updatedAt'
objectID:
type: string
description: Unique identifier for a rule object.
example: 'hide-12345'
conditions:
type: array
description: >
[Conditions](https://www.algolia.com/doc/guides/managing-results/rules/rules-overview/#conditions) required to activate a rule. You can use up to 25 conditions per rule.
items:
$ref: '../../../search/paths/rules/common/schemas.yml#/condition'
consequence:
$ref: '../../../search/paths/rules/common/schemas.yml#//consequence'
description:
type: string
description: Description of the rule's purpose. This can be helpful for display in the Algolia dashboard.
example: 'Display a promotional banner'
enabled:
type: boolean
default: true
description: Indicates whether to enable the rule. If it isn't enabled, it isn't applied at query time.
description: Trending facet hit.
required:
- objectID
- _score
- facetName
- facetValue
properties:
_score:
$ref: '#/recommendScore'
facetName:
$ref: '../parameters.yml#/facetName'
facetValue:
$ref: '../parameters.yml#/facetValue'

recommendScore:
type: number
format: double
minimum: 0
maximum: 100
description: Recommendation score.
35 changes: 35 additions & 0 deletions specs/recommend/common/schemas/RecommendedForYouQuery.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
recommendedForYouQuery:
allOf:
- $ref: './RecommendationsRequest.yml#/baseRecommendRequest'
- $ref: '#/baseRecommendedForYouQuery'

recommendedForYouQueryParameters:
allOf:
- $ref: '../../../common/schemas/SearchParams.yml#/searchParamsObject'
- $ref: '#/baseRecommendedForYouQueryParameters'

baseRecommendedForYouQueryParameters:
type: object
properties:
userToken:
$ref: '../../../common/schemas/SearchParams.yml#/userToken'
required:
- userToken

baseRecommendedForYouQuery:
type: object
additionalProperties: false
properties:
model:
$ref: '#/recommendedForYouModel'
queryParameters:
$ref: '#/recommendedForYouQueryParameters'
fallbackParameters:
$ref: '#/recommendedForYouQueryParameters'
required:
- model

recommendedForYouModel:
description: Recommended for you model.
type: string
enum: [recommended-for-you]
31 changes: 31 additions & 0 deletions specs/recommend/common/schemas/RuleResponse.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
type: object
description: Rule object.
additionalProperties: false
properties:
_metadata:
type: object
properties:
lastUpdate:
$ref: '../../../common/responses/common.yml#/updatedAt'
objectID:
type: string
description: Unique identifier for a rule object.
example: 'hide-12345'
conditions:
type: array
description: >
[Conditions](https://www.algolia.com/doc/guides/managing-results/rules/rules-overview/#conditions) required to activate a rule. You can use up to 25 conditions per rule.
items:
$ref: '../../../search/paths/rules/common/schemas.yml#/condition'
consequence:
$ref: '../../../search/paths/rules/common/schemas.yml#//consequence'
description:
type: string
description: Description of the rule's purpose. This can be helpful for display in the Algolia dashboard.
example: 'Display a promotional banner'
enabled:
type: boolean
default: true
description: Indicates whether to enable the rule. If it isn't enabled, it isn't applied at query time.
required:
- objectID
20 changes: 20 additions & 0 deletions specs/recommend/common/schemas/TrendingFacetsQuery.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
trendingFacetsQuery:
allOf:
- $ref: './RecommendationsRequest.yml#/baseRecommendRequest'
- $ref: '#/baseTrendingFacetsQuery'

baseTrendingFacetsQuery:
type: object
additionalProperties: false
properties:
facetName:
$ref: '../parameters.yml#/facetName'
model:
$ref: '#/trendingFacetsModel'
required:
- facetName

trendingFacetsModel:
description: Trending facets model.
type: string
enum: [trending-facets]
24 changes: 24 additions & 0 deletions specs/recommend/common/schemas/TrendingItemsQuery.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
trendingItemsQuery:
allOf:
- $ref: './RecommendationsRequest.yml#/baseRecommendRequest'
- $ref: '#/baseTrendingItemsQuery'

baseTrendingItemsQuery:
type: object
additionalProperties: false
properties:
facetName:
$ref: '../parameters.yml#/facetName'
facetValue:
$ref: '../parameters.yml#/facetValue'
model:
$ref: '#/trendingItemsModel'
queryParameters:
$ref: '../../../common/schemas/SearchParams.yml#/searchParamsObject'
fallbackParameters:
$ref: '../../../common/schemas/SearchParams.yml#/searchParamsObject'

trendingItemsModel:
description: Trending items model.
type: string
enum: [trending-items]
50 changes: 0 additions & 50 deletions specs/recommend/common/schemas/TrendingQuery.yml

This file was deleted.

2 changes: 1 addition & 1 deletion specs/recommend/paths/getRecommendations.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ post:
results:
type: array
items:
$ref: '../common/schemas/RecommendationsResponse.yml#/recommendationsResponse'
$ref: '../common/schemas/RecommendationsResponse.yml#/recommendationsResults'
'400':
$ref: '../../common/responses/BadRequest.yml'
'402':
Expand Down
4 changes: 2 additions & 2 deletions specs/recommend/paths/recommendRule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ get:
content:
application/json:
schema:
$ref: '../common/schemas/RecommendationsResponse.yml#/ruleResponse'
$ref: '../common/schemas/RuleResponse.yml'
'400':
$ref: '../../common/responses/BadRequest.yml'
'402':
Expand Down Expand Up @@ -44,4 +44,4 @@ delete:
'403':
$ref: '../../common/responses/MethodNotAllowed.yml'
'404':
$ref: '../../common/responses/IndexNotFound.yml'
$ref: '../../common/responses/IndexNotFound.yml'
21 changes: 5 additions & 16 deletions specs/recommend/paths/searchRecommendRules.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,6 @@ post:
nullable: true
default: null
description: Restricts responses to enabled rules. When absent (default), _all_ rules are retrieved.
requestOptions:
type: array
description: Request options to send with the API call.
example: >
{timeouts:{read:20}}
items:
type: object
description: Request option.
responses:
'200':
description: OK
Expand All @@ -60,21 +52,18 @@ post:
type: array
description: Fetched rules.
items:
$ref: '../common/schemas/RecommendationsResponse.yml#/ruleResponse'
$ref: '../common/schemas/RuleResponse.yml'
nbHits:
type: integer
description: Number of fetched rules.
$ref: '../../search/common/schemas/SearchResponse.yml#/nbHits'
page:
type: integer
description: Current page.
$ref: '../../common/schemas/SearchParams.yml#/page'
nbPages:
type: integer
description: Number of pages.
$ref: '../../search/common/schemas/SearchResponse.yml#/nbPages'
'400':
$ref: '../../common/responses/BadRequest.yml'
'402':
$ref: '../../common/responses/FeatureNotEnabled.yml'
'403':
$ref: '../../common/responses/MethodNotAllowed.yml'
'404':
$ref: '../../common/responses/IndexNotFound.yml'
$ref: '../../common/responses/IndexNotFound.yml'
Loading