git.iko.soy/typeable/bloodhound
on master help sign in
Merge pull request #218 from bermanjosh/directGenerators

Direct Generators support

commitbe83a917004d69ce0c874a18dc8707b40cf17c29 authorChris Allen <cma@bitemyapp.com> dateThu 8 Feb 2018, 17:42 (9 years ago) parent3be3d8ff022a52
6 files changed+158−3
compare with master
unifiedsplit
bloodhound.cabal+1−1 src/Database/V1/Bloodhound/Types.hs+72−1 src/Database/V5/Bloodhound/Types.hs+72−1 stack-8.2.yaml+1 tests/V1/tests.hs+6 tests/V5/tests.hs+6
bloodhound.cabal+1−1
@@ -1,5 +1,5 @@
11name: bloodhound
2−version: 0.15.0.2
2+version: 0.16.0.0
33synopsis: ElasticSearch client library for Haskell
44description: ElasticSearch made awesome for Haskell hackers
55homepage: https://github.com/bitemyapp/bloodhound
src/Database/V1/Bloodhound/Types.hs+72−1
@@ -333,6 +333,9 @@ module Database.V1.Bloodhound.Types
333333 , SuggestOptions(..)
334334 , SuggestResponse(..)
335335 , NamedSuggestionResponse(..)
336+ , DirectGenerators(..)
337+ , mkDirectGenerators
338+ , DirectGeneratorSuggestModeTypes (..)
336339
337340 , Aggregation(..)
338341 , Aggregations
@@ -5382,6 +5385,7 @@ data PhraseSuggester =
53825385 , phraseSuggesterShardSize :: Maybe Int
53835386 , phraseSuggesterHighlight :: Maybe PhraseSuggesterHighlighter
53845387 , phraseSuggesterCollate :: Maybe PhraseSuggesterCollate
5388+ , phraseSuggesterCandidateGenerators :: [DirectGenerators]
53855389 }
53865390 deriving (Show, Generic, Eq, Read, Typeable)
53875391
@@ -5397,6 +5401,7 @@ instance ToJSON PhraseSuggester where
53975401 , "shard_size" .= phraseSuggesterShardSize
53985402 , "highlight" .= phraseSuggesterHighlight
53995403 , "collate" .= phraseSuggesterCollate
5404+ , "direct_generator" .= phraseSuggesterCandidateGenerators
54005405 ]
54015406
54025407instance FromJSON PhraseSuggester where
@@ -5413,11 +5418,12 @@ instance FromJSON PhraseSuggester where
54135418 <*> o .:? "shard_size"
54145419 <*> o .:? "highlight"
54155420 <*> o .:? "collate"
5421+ <*> o .:? "direct_generator" .!= []
54165422
54175423mkPhraseSuggester :: FieldName -> PhraseSuggester
54185424mkPhraseSuggester fName =
54195425 PhraseSuggester fName Nothing Nothing Nothing Nothing Nothing Nothing
5420− Nothing Nothing Nothing Nothing
5426+ Nothing Nothing Nothing Nothing []
54215427
54225428data PhraseSuggesterHighlighter =
54235429 PhraseSuggesterHighlighter { phraseSuggesterHighlighterPreTag :: Text
@@ -5507,3 +5513,68 @@ instance FromJSON NamedSuggestionResponse where
55075513 return $ NamedSuggestionResponse suggestionName' suggestionResponses'
55085514
55095515 parseJSON x = typeMismatch "NamedSuggestionResponse" x
5516+
5517+data DirectGeneratorSuggestModeTypes = DirectGeneratorSuggestModeMissing
5518+ | DirectGeneratorSuggestModePopular
5519+ | DirectGeneratorSuggestModeAlways
5520+ deriving (Show, Eq, Read, Generic, Typeable)
5521+
5522+instance ToJSON DirectGeneratorSuggestModeTypes where
5523+ toJSON DirectGeneratorSuggestModeMissing = "missing"
5524+ toJSON DirectGeneratorSuggestModePopular = "popular"
5525+ toJSON DirectGeneratorSuggestModeAlways = "always"
5526+
5527+instance FromJSON DirectGeneratorSuggestModeTypes where
5528+ parseJSON = withText "DirectGeneratorSuggestModeTypes" parse
5529+ where parse "missing" = pure DirectGeneratorSuggestModeMissing
5530+ parse "popular" = pure DirectGeneratorSuggestModePopular
5531+ parse "always" = pure DirectGeneratorSuggestModeAlways
5532+ parse f = fail ("Unexpected DirectGeneratorSuggestModeTypes: " <> show f)
5533+
5534+data DirectGenerators = DirectGenerators
5535+ { directGeneratorsField :: FieldName
5536+ , directGeneratorsSize :: Maybe Int
5537+ , directGeneratorSuggestMode :: DirectGeneratorSuggestModeTypes
5538+ , directGeneratorMaxEdits :: Maybe Double
5539+ , directGeneratorPrefixLength :: Maybe Int
5540+ , directGeneratorMinWordLength :: Maybe Int
5541+ , directGeneratorMaxInspections :: Maybe Int
5542+ , directGeneratorMinDocFreq :: Maybe Double
5543+ , directGeneratorMaxTermFreq :: Maybe Double
5544+ , directGeneratorPreFilter :: Maybe Text
5545+ , directGeneratorPostFilter :: Maybe Text
5546+ }
5547+ deriving (Show, Eq, Read, Generic, Typeable)
5548+
5549+
5550+instance ToJSON DirectGenerators where
5551+ toJSON DirectGenerators{..} = omitNulls [ "field" .= directGeneratorsField
5552+ , "size" .= directGeneratorsSize
5553+ , "suggest_mode" .= directGeneratorSuggestMode
5554+ , "max_edits" .= directGeneratorMaxEdits
5555+ , "prefix_length" .= directGeneratorPrefixLength
5556+ , "min_word_length" .= directGeneratorMinWordLength
5557+ , "max_inspections" .= directGeneratorMaxInspections
5558+ , "min_doc_freq" .= directGeneratorMinDocFreq
5559+ , "max_term_freq" .= directGeneratorMaxTermFreq
5560+ , "pre_filter" .= directGeneratorPreFilter
5561+ , "post_filter" .= directGeneratorPostFilter
5562+ ]
5563+
5564+instance FromJSON DirectGenerators where
5565+ parseJSON = withObject "DirectGenerators" parse
5566+ where parse o = DirectGenerators
5567+ <$> o .: "field"
5568+ <*> o .:? "size"
5569+ <*> o .: "suggest_mode"
5570+ <*> o .:? "max_edits"
5571+ <*> o .:? "prefix_length"
5572+ <*> o .:? "min_word_length"
5573+ <*> o .:? "max_inspections"
5574+ <*> o .:? "min_doc_freq"
5575+ <*> o .:? "max_term_freq"
5576+ <*> o .:? "pre_filter"
5577+ <*> o .:? "post_filter"
5578+
5579+mkDirectGenerators :: FieldName -> DirectGenerators
5580+mkDirectGenerators fn = DirectGenerators fn Nothing DirectGeneratorSuggestModeMissing Nothing Nothing Nothing Nothing Nothing Nothing Nothing Nothing
src/Database/V5/Bloodhound/Types.hs+72−1
@@ -336,6 +336,9 @@ module Database.V5.Bloodhound.Types
336336 , SuggestOptions(..)
337337 , SuggestResponse(..)
338338 , NamedSuggestionResponse(..)
339+ , DirectGenerators(..)
340+ , mkDirectGenerators
341+ , DirectGeneratorSuggestModeTypes (..)
339342
340343 , Aggregation(..)
341344 , Aggregations
@@ -5293,6 +5296,7 @@ data PhraseSuggester =
52935296 , phraseSuggesterShardSize :: Maybe Int
52945297 , phraseSuggesterHighlight :: Maybe PhraseSuggesterHighlighter
52955298 , phraseSuggesterCollate :: Maybe PhraseSuggesterCollate
5299+ , phraseSuggesterCandidateGenerators :: [DirectGenerators]
52965300 }
52975301 deriving (Show, Generic, Eq, Read)
52985302
@@ -5308,6 +5312,7 @@ instance ToJSON PhraseSuggester where
53085312 , "shard_size" .= phraseSuggesterShardSize
53095313 , "highlight" .= phraseSuggesterHighlight
53105314 , "collate" .= phraseSuggesterCollate
5315+ , "direct_generator" .= phraseSuggesterCandidateGenerators
53115316 ]
53125317
53135318instance FromJSON PhraseSuggester where
@@ -5324,11 +5329,12 @@ instance FromJSON PhraseSuggester where
53245329 <*> o .:? "shard_size"
53255330 <*> o .:? "highlight"
53265331 <*> o .:? "collate"
5332+ <*> o .:? "direct_generator" .!= []
53275333
53285334mkPhraseSuggester :: FieldName -> PhraseSuggester
53295335mkPhraseSuggester fName =
53305336 PhraseSuggester fName Nothing Nothing Nothing Nothing Nothing Nothing
5331− Nothing Nothing Nothing Nothing
5337+ Nothing Nothing Nothing Nothing []
53325338
53335339data PhraseSuggesterHighlighter =
53345340 PhraseSuggesterHighlighter { phraseSuggesterHighlighterPreTag :: Text
@@ -5418,3 +5424,68 @@ instance FromJSON NamedSuggestionResponse where
54185424 return $ NamedSuggestionResponse suggestionName' suggestionResponses'
54195425
54205426 parseJSON x = typeMismatch "NamedSuggestionResponse" x
5427+
5428+data DirectGeneratorSuggestModeTypes = DirectGeneratorSuggestModeMissing
5429+ | DirectGeneratorSuggestModePopular
5430+ | DirectGeneratorSuggestModeAlways
5431+ deriving (Show, Eq, Read, Generic)
5432+
5433+instance ToJSON DirectGeneratorSuggestModeTypes where
5434+ toJSON DirectGeneratorSuggestModeMissing = "missing"
5435+ toJSON DirectGeneratorSuggestModePopular = "popular"
5436+ toJSON DirectGeneratorSuggestModeAlways = "always"
5437+
5438+instance FromJSON DirectGeneratorSuggestModeTypes where
5439+ parseJSON = withText "DirectGeneratorSuggestModeTypes" parse
5440+ where parse "missing" = pure DirectGeneratorSuggestModeMissing
5441+ parse "popular" = pure DirectGeneratorSuggestModePopular
5442+ parse "always" = pure DirectGeneratorSuggestModeAlways
5443+ parse f = fail ("Unexpected DirectGeneratorSuggestModeTypes: " <> show f)
5444+
5445+data DirectGenerators = DirectGenerators
5446+ { directGeneratorsField :: FieldName
5447+ , directGeneratorsSize :: Maybe Int
5448+ , directGeneratorSuggestMode :: DirectGeneratorSuggestModeTypes
5449+ , directGeneratorMaxEdits :: Maybe Double
5450+ , directGeneratorPrefixLength :: Maybe Int
5451+ , directGeneratorMinWordLength :: Maybe Int
5452+ , directGeneratorMaxInspections :: Maybe Int
5453+ , directGeneratorMinDocFreq :: Maybe Double
5454+ , directGeneratorMaxTermFreq :: Maybe Double
5455+ , directGeneratorPreFilter :: Maybe Text
5456+ , directGeneratorPostFilter :: Maybe Text
5457+ }
5458+ deriving (Show, Eq, Read, Generic)
5459+
5460+
5461+instance ToJSON DirectGenerators where
5462+ toJSON DirectGenerators{..} = omitNulls [ "field" .= directGeneratorsField
5463+ , "size" .= directGeneratorsSize
5464+ , "suggest_mode" .= directGeneratorSuggestMode
5465+ , "max_edits" .= directGeneratorMaxEdits
5466+ , "prefix_length" .= directGeneratorPrefixLength
5467+ , "min_word_length" .= directGeneratorMinWordLength
5468+ , "max_inspections" .= directGeneratorMaxInspections
5469+ , "min_doc_freq" .= directGeneratorMinDocFreq
5470+ , "max_term_freq" .= directGeneratorMaxTermFreq
5471+ , "pre_filter" .= directGeneratorPreFilter
5472+ , "post_filter" .= directGeneratorPostFilter
5473+ ]
5474+
5475+instance FromJSON DirectGenerators where
5476+ parseJSON = withObject "DirectGenerators" parse
5477+ where parse o = DirectGenerators
5478+ <$> o .: "field"
5479+ <*> o .:? "size"
5480+ <*> o .: "suggest_mode"
5481+ <*> o .:? "max_edits"
5482+ <*> o .:? "prefix_length"
5483+ <*> o .:? "min_word_length"
5484+ <*> o .:? "max_inspections"
5485+ <*> o .:? "min_doc_freq"
5486+ <*> o .:? "max_term_freq"
5487+ <*> o .:? "pre_filter"
5488+ <*> o .:? "post_filter"
5489+
5490+mkDirectGenerators :: FieldName -> DirectGenerators
5491+mkDirectGenerators fn = DirectGenerators fn Nothing DirectGeneratorSuggestModeMissing Nothing Nothing Nothing Nothing Nothing Nothing Nothing Nothing
stack-8.2.yaml+1
@@ -7,6 +7,7 @@ packages:
77 - './examples'
88
99extra-deps:
10+ - quickcheck-properties-0.1
1011 - http-types-0.12
1112
1213resolver: lts-10.0
tests/V1/tests.hs+6
@@ -607,6 +607,8 @@ instance ApproxEq PhraseSuggesterCollate
607607instance ApproxEq PhraseSuggester
608608instance ApproxEq SuggestType
609609instance ApproxEq Suggest
610+instance ApproxEq DirectGenerators
611+instance ApproxEq DirectGeneratorSuggestModeTypes
610612
611613-- | Due to the way nodeattrfilters get serialized here, they may come
612614-- out in a different order, but they are morally equivalent
@@ -948,6 +950,8 @@ instance Arbitrary Size where arbitrary = sopArbitrary; shrink = genericShrink
948950instance Arbitrary PhraseSuggester where arbitrary = sopArbitrary; shrink = genericShrink
949951instance Arbitrary SuggestType where arbitrary = sopArbitrary; shrink = genericShrink
950952instance Arbitrary Suggest where arbitrary = sopArbitrary; shrink = genericShrink
953+instance Arbitrary DirectGenerators where arbitrary = sopArbitrary; shrink = genericShrink
954+instance Arbitrary DirectGeneratorSuggestModeTypes where arbitrary = sopArbitrary; shrink = genericShrink
951955
952956newtype UpdatableIndexSetting' = UpdatableIndexSetting' UpdatableIndexSetting
953957 deriving (Show, Eq, ToJSON, FromJSON, ApproxEq, Typeable)
@@ -1944,6 +1948,8 @@ main = hspec $ do
19441948 propJSON (Proxy :: Proxy CompoundFormat)
19451949 propJSON (Proxy :: Proxy TemplateQueryInline)
19461950 propJSON (Proxy :: Proxy Suggest)
1951+ propJSON (Proxy :: Proxy DirectGenerators)
1952+ propJSON (Proxy :: Proxy DirectGeneratorSuggestModeTypes)
19471953
19481954-- Temporary solution for lacking of generic derivation of Arbitrary
19491955-- We use generics-sop, as it's much more concise than directly using GHC.Generics
tests/V5/tests.hs+6
@@ -619,6 +619,8 @@ instance ApproxEq PhraseSuggesterCollate
619619instance ApproxEq PhraseSuggester
620620instance ApproxEq SuggestType
621621instance ApproxEq Suggest
622+instance ApproxEq DirectGenerators
623+instance ApproxEq DirectGeneratorSuggestModeTypes
622624
623625-- | Due to the way nodeattrfilters get serialized here, they may come
624626-- out in a different order, but they are morally equivalent
@@ -941,6 +943,8 @@ instance Arbitrary Size where arbitrary = sopArbitrary; shrink = genericShrink
941943instance Arbitrary PhraseSuggester where arbitrary = sopArbitrary; shrink = genericShrink
942944instance Arbitrary SuggestType where arbitrary = sopArbitrary; shrink = genericShrink
943945instance Arbitrary Suggest where arbitrary = sopArbitrary; shrink = genericShrink
946+instance Arbitrary DirectGenerators where arbitrary = sopArbitrary; shrink = genericShrink
947+instance Arbitrary DirectGeneratorSuggestModeTypes where arbitrary = sopArbitrary; shrink = genericShrink
944948
945949newtype UpdatableIndexSetting' = UpdatableIndexSetting' UpdatableIndexSetting
946950 deriving (Show, Eq, ToJSON, FromJSON, ApproxEq, Typeable)
@@ -1805,6 +1809,8 @@ main = hspec $ do
18051809 propJSON (Proxy :: Proxy CompoundFormat)
18061810 propJSON (Proxy :: Proxy TemplateQueryInline)
18071811 propJSON (Proxy :: Proxy Suggest)
1812+ propJSON (Proxy :: Proxy DirectGenerators)
1813+ propJSON (Proxy :: Proxy DirectGeneratorSuggestModeTypes)
18081814
18091815-- Temporary solution for lacking of generic derivation of Arbitrary
18101816-- We use generics-sop, as it's much more concise than directly using GHC.Generics