fix

izihawa · Jul 3, 2023 · 561f129 · 561f129
1 parent 5bd7010
commit 561f129
Show file tree

Hide file tree

Showing 4 changed files with 144 additions and 146 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -40,7 +40,7 @@ serde_cbor = "0.11"
 serde_json = { version = "1.0" }
 serde_yaml = { version = "0.8" }
 strfmt = "0.2"
-summa-proto = { version = "0.29.0", path = "./summa-proto", default_features = false }
+summa-proto = { version = "0.29.1", path = "./summa-proto", default_features = false }
 take_mut = "0.2"
 tantivy = { git = "https://github.com/izihawa/tantivy", branch = "feature/summa", default_features = false, features = ["quickwit", "zstd-compression"] }
 tantivy-common = { git = "https://github.com/izihawa/tantivy", branch = "feature/summa" }

diff --git a/aiosumma/aiosumma/proto/query_pb2.py b/aiosumma/aiosumma/proto/query_pb2.py
diff --git a/aiosumma/aiosumma/proto/query_pb2.pyi b/aiosumma/aiosumma/proto/query_pb2.pyi
@@ -62,7 +62,7 @@ class MorphologyConfig(_message.Message):
     def __init__(self, derive_tenses_coefficient: _Optional[float] = ...) -> None: ...
 
 class QueryParserConfig(_message.Message):
-    __slots__ = ["field_aliases", "field_boosts", "term_field_mapper_configs", "term_limit", "default_fields", "boolean_should_mode", "disjuction_max_mode", "exact_matches_promoter", "removed_fields", "morphology_configs", "query_language", "ner_matches_promoter"]
+    __slots__ = ["field_aliases", "field_boosts", "term_field_mapper_configs", "term_limit", "default_fields", "boolean_should_mode", "disjuction_max_mode", "exact_matches_promoter", "removed_fields", "morphology_configs", "query_language"]
     class FieldAliasesEntry(_message.Message):
         __slots__ = ["key", "value"]
         KEY_FIELD_NUMBER: _ClassVar[int]
@@ -102,7 +102,6 @@ class QueryParserConfig(_message.Message):
     REMOVED_FIELDS_FIELD_NUMBER: _ClassVar[int]
     MORPHOLOGY_CONFIGS_FIELD_NUMBER: _ClassVar[int]
     QUERY_LANGUAGE_FIELD_NUMBER: _ClassVar[int]
-    NER_MATCHES_PROMOTER_FIELD_NUMBER: _ClassVar[int]
     field_aliases: _containers.ScalarMap[str, str]
     field_boosts: _containers.ScalarMap[str, float]
     term_field_mapper_configs: _containers.MessageMap[str, TermFieldMapperConfig]
@@ -114,8 +113,7 @@ class QueryParserConfig(_message.Message):
     removed_fields: _containers.RepeatedScalarFieldContainer[str]
     morphology_configs: _containers.MessageMap[str, MorphologyConfig]
     query_language: str
-    ner_matches_promoter: NerMatchesPromoter
-    def __init__(self, field_aliases: _Optional[_Mapping[str, str]] = ..., field_boosts: _Optional[_Mapping[str, float]] = ..., term_field_mapper_configs: _Optional[_Mapping[str, TermFieldMapperConfig]] = ..., term_limit: _Optional[int] = ..., default_fields: _Optional[_Iterable[str]] = ..., boolean_should_mode: _Optional[_Union[MatchQueryBooleanShouldMode, _Mapping]] = ..., disjuction_max_mode: _Optional[_Union[MatchQueryDisjuctionMaxMode, _Mapping]] = ..., exact_matches_promoter: _Optional[_Union[ExactMatchesPromoter, _Mapping]] = ..., removed_fields: _Optional[_Iterable[str]] = ..., morphology_configs: _Optional[_Mapping[str, MorphologyConfig]] = ..., query_language: _Optional[str] = ..., ner_matches_promoter: _Optional[_Union[NerMatchesPromoter, _Mapping]] = ...) -> None: ...
+    def __init__(self, field_aliases: _Optional[_Mapping[str, str]] = ..., field_boosts: _Optional[_Mapping[str, float]] = ..., term_field_mapper_configs: _Optional[_Mapping[str, TermFieldMapperConfig]] = ..., term_limit: _Optional[int] = ..., default_fields: _Optional[_Iterable[str]] = ..., boolean_should_mode: _Optional[_Union[MatchQueryBooleanShouldMode, _Mapping]] = ..., disjuction_max_mode: _Optional[_Union[MatchQueryDisjuctionMaxMode, _Mapping]] = ..., exact_matches_promoter: _Optional[_Union[ExactMatchesPromoter, _Mapping]] = ..., removed_fields: _Optional[_Iterable[str]] = ..., morphology_configs: _Optional[_Mapping[str, MorphologyConfig]] = ..., query_language: _Optional[str] = ...) -> None: ...
 
 class SearchResponse(_message.Message):
     __slots__ = ["elapsed_secs", "collector_outputs"]

diff --git a/summa-proto/Cargo.toml b/summa-proto/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "summa-proto"
-version = "0.29.0"
+version = "0.29.1"
 authors = ["Pasha Podolsky <ppodolsky@me.com>"]
 edition = "2021"
 license-file = "LICENSE"