diff --git a/.gitmodules b/.gitmodules index 774dce1f83..b85ed19452 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1358,6 +1358,9 @@ [submodule "vendor/grammars/verilog.tmbundle"] path = vendor/grammars/verilog.tmbundle url = https://github.com/textmate/verilog.tmbundle +[submodule "vendor/grammars/vespa"] + path = vendor/grammars/vespa + url = https://github.com/vespa-engine/vespa [submodule "vendor/grammars/vsc-ember-syntax"] path = vendor/grammars/vsc-ember-syntax url = https://github.com/lifeart/vsc-ember-syntax.git diff --git a/grammars.yml b/grammars.yml index 637068a5eb..a7f65d8d28 100644 --- a/grammars.yml +++ b/grammars.yml @@ -1216,6 +1216,8 @@ vendor/grammars/typst-grammar: - source.typst vendor/grammars/verilog.tmbundle: - source.verilog +vendor/grammars/vespa/integration/tmgrammar/grammar: +- source.vespaSchema vendor/grammars/vsc-ember-syntax: - inline.hbs - inline.template diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml index 44cf775e10..52a4fae9e6 100644 --- a/lib/linguist/languages.yml +++ b/lib/linguist/languages.yml @@ -8355,6 +8355,16 @@ Verilog: codemirror_mode: verilog codemirror_mime_type: text/x-verilog language_id: 387 +Vespa Schema Definition: + type: data + color: "#61D790" + extensions: + - ".sd" + tm_scope: source.vespaSchema + ace_mode: text + aliases: + - vespa + language_id: 587879709 Vim Help File: type: prose color: "#199f4b" diff --git a/samples/Vespa Schema Definition/msmarco.sd b/samples/Vespa Schema Definition/msmarco.sd new file mode 100644 index 0000000000..57e000cfc4 --- /dev/null +++ b/samples/Vespa Schema Definition/msmarco.sd @@ -0,0 +1,299 @@ +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. + +schema msmarco { + document msmarco { + + field id type string { + indexing: summary | attribute + } + + field title type string { + indexing: index | summary + index: enable-bm25 + stemming: best + } + + field url type string { + indexing: index | summary + } + + field body type string { + indexing: index | summary + index: enable-bm25 + summary: dynamic + stemming: best + } + + field title_word2vec type tensor(x[500]) { + indexing: attribute + } + + field body_word2vec type tensor(x[500]) { + indexing: attribute + } + + field title_gse type tensor(x[512]) { + indexing: attribute + } + + field body_gse type tensor(x[512]) { + indexing: attribute + } + + field title_bert type tensor(x[768]) { + indexing: attribute + } + + field body_bert type tensor(x[768]) { + indexing: attribute + } + + } + + document-summary minimal { + summary id type string {} + } + + fieldset default { + fields: title, body + } + + rank-profile default { + first-phase { + expression: nativeRank(title, body) + } + } + + rank-profile bm25 inherits default { + first-phase { + expression: bm25(title) + bm25(body) + } + } + + rank-profile word2vec_title_body_all inherits default { + function dot_product_title() { + expression: sum(query(tensor)*attribute(title_word2vec)) + } + function dot_product_body() { + expression: sum(query(tensor)*attribute(body_word2vec)) + } + first-phase { + expression: dot_product_title() + dot_product_body() + } + ignore-default-rank-features + rank-features { + rankingExpression(dot_product_title) + rankingExpression(dot_product_body) + } + } + + rank-profile gse_title_body_all inherits default { + function dot_product_title() { + expression: sum(query(tensor_gse)*attribute(title_gse)) + } + function dot_product_body() { + expression: sum(query(tensor_gse)*attribute(body_gse)) + } + first-phase { + expression: dot_product_title() + dot_product_body() + } + ignore-default-rank-features + rank-features { + rankingExpression(dot_product_title) + rankingExpression(dot_product_body) + } + } + + rank-profile bert_title_body_all inherits default { + function dot_product_title() { + expression: sum(query(tensor_bert)*attribute(title_bert)) + } + function dot_product_body() { + expression: sum(query(tensor_bert)*attribute(body_bert)) + } + first-phase { + expression: dot_product_title() + dot_product_body() + } + ignore-default-rank-features + rank-features { + rankingExpression(dot_product_title) + rankingExpression(dot_product_body) + } + } + + rank-profile bm25_word2vec_title_body_all inherits default { + function dot_product_title() { + expression: sum(query(tensor)*attribute(title_word2vec)) + } + function dot_product_body() { + expression: sum(query(tensor)*attribute(body_word2vec)) + } + first-phase { + expression: bm25(title) + bm25(body) + dot_product_title() + dot_product_body() + } + ignore-default-rank-features + rank-features { + bm25(title) + bm25(body) + rankingExpression(dot_product_title) + rankingExpression(dot_product_body) + } + } + + rank-profile bm25_gse_title_body_all inherits default { + function dot_product_title() { + expression: sum(query(tensor_gse)*attribute(title_gse)) + } + function dot_product_body() { + expression: sum(query(tensor_gse)*attribute(body_gse)) + } + first-phase { + expression: bm25(title) + bm25(body) + dot_product_title() + dot_product_body() + } + ignore-default-rank-features + rank-features { + bm25(title) + bm25(body) + rankingExpression(dot_product_title) + rankingExpression(dot_product_body) + } + } + + rank-profile bm25_bert_title_body_all inherits default { + function dot_product_title() { + expression: sum(query(tensor_bert)*attribute(title_bert)) + } + function dot_product_body() { + expression: sum(query(tensor_bert)*attribute(body_bert)) + } + first-phase { + expression: bm25(title) + bm25(body) + dot_product_title() + dot_product_body() + } + ignore-default-rank-features + rank-features { + bm25(title) + bm25(body) + rankingExpression(dot_product_title) + rankingExpression(dot_product_body) + } + } + + rank-profile listwise_bm25_bert_title_body_all inherits default { + function dot_product_title() { + expression: sum(query(tensor_bert)*attribute(title_bert)) + } + function dot_product_body() { + expression: sum(query(tensor_bert)*attribute(body_bert)) + } + first-phase { + expression: 0.9005951 * bm25(title) + 2.2043643 * bm25(body) + 0.13506432 * dot_product_title() + 0.5840874 * dot_product_body() + } + ignore-default-rank-features + rank-features { + bm25(title) + bm25(body) + rankingExpression(dot_product_title) + rankingExpression(dot_product_body) + } + } + + rank-profile listwise_linear_bm25_gse_title_body_and inherits default { + function dot_product_title() { + expression: sum(query(tensor_gse)*attribute(title_gse)) + } + function dot_product_body() { + expression: sum(query(tensor_gse)*attribute(body_gse)) + } + first-phase { + expression: 0.12408562 * bm25(title) + 0.36673144 * bm25(body) + 6.2273498 * dot_product_title() + 5.671119 * dot_product_body() + } + ignore-default-rank-features + rank-features { + bm25(title) + bm25(body) + rankingExpression(dot_product_title) + rankingExpression(dot_product_body) + } + } + + rank-profile listwise_linear_bm25_gse_title_body_or inherits default { + function dot_product_title() { + expression: sum(query(tensor_gse)*attribute(title_gse)) + } + function dot_product_body() { + expression: sum(query(tensor_gse)*attribute(body_gse)) + } + first-phase { + expression: 0.7150663 * bm25(title) + 0.9480147 * bm25(body) + 1.560068 * dot_product_title() + 1.5062317 * dot_product_body() + } + ignore-default-rank-features + rank-features { + bm25(title) + bm25(body) + rankingExpression(dot_product_title) + rankingExpression(dot_product_body) + } + } + + rank-profile pointwise_linear_bm25 inherits default { + first-phase { + expression: 0.22499913 * bm25(title) + 0.07596389 * bm25(body) + } + } + + rank-profile listwise_linear_bm25 inherits default { + first-phase { + expression: 0.13446581 * bm25(title) + 0.5716889 * bm25(body) + } + } + + rank-profile collect_rank_features_embeddings inherits default { + function dot_product_title_word2vec() { + expression: sum(query(tensor)*attribute(title_word2vec)) + } + function dot_product_body_word2vec() { + expression: sum(query(tensor)*attribute(body_word2vec)) + } + function dot_product_title_gse() { + expression: sum(query(tensor_gse)*attribute(title_gse)) + } + function dot_product_body_gse() { + expression: sum(query(tensor_gse)*attribute(body_gse)) + } + function dot_product_title_bert() { + expression: sum(query(tensor_bert)*attribute(title_bert)) + } + function dot_product_body_bert() { + expression: sum(query(tensor_bert)*attribute(body_bert)) + } + first-phase { + expression: random + } + ignore-default-rank-features + rank-features { + bm25(title) + bm25(body) + nativeRank(title) + nativeRank(body) + rankingExpression(dot_product_title_word2vec) + rankingExpression(dot_product_body_word2vec) + rankingExpression(dot_product_title_gse) + rankingExpression(dot_product_body_gse) + rankingExpression(dot_product_title_bert) + rankingExpression(dot_product_body_bert) + } + } + + rank-profile collect_rank_features inherits default { + first-phase { + expression: random + } + ignore-default-rank-features + rank-features { + bm25(title) + bm25(body) + nativeRank(title) + nativeRank(body) + } + } +} diff --git a/samples/Vespa Schema Definition/music.sd b/samples/Vespa Schema Definition/music.sd new file mode 100644 index 0000000000..c87db7f746 --- /dev/null +++ b/samples/Vespa Schema Definition/music.sd @@ -0,0 +1,176 @@ +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +schema music { + + document music { + + field bgndata type string { + indexing: summary + summary: dynamic + } + + field sales type int { + indexing: summary | attribute + } + + field pto type int { + indexing: summary | attribute + } + + field keys type string { + indexing: index + } + + field mid type int { + indexing: summary | attribute + } + + field ew type string { + indexing: summary | index + bolding: on + } + + field surl type string { + indexing: summary + } + + field userrate type int { + indexing: summary + } + + field pid type string { + indexing: summary + } + + field weight type float { + indexing: summary | attribute + } + + field url type string { + indexing: summary + } + + field isbn type string { + indexing: summary + } + + field fmt type string { + indexing: summary | index + } + + field albumid type string { + indexing: summary + } + + field disp_song type string { + indexing: summary + } + + field song type string { + indexing: summary | index + summary: dynamic + } + + field pfrom type int { + indexing: summary + } + + field bgnpfrom type float { + indexing: summary | attribute + } + + field categories type string { + indexing: summary | index + } + + field data type string { + indexing: summary + } + + field numreview type int { + indexing: summary + } + + field bgnsellers type int { + indexing: summary + } + + field image type string { + indexing: summary + } + + field artist type string { + indexing: summary | index + } + + field artistspid type string { + indexing: summary + } + + field title type string { + indexing: summary | index + } + + field newestedition type int { + indexing: summary | attribute + } + + field bgnpto type string { + indexing: summary + summary: dynamic + bolding: on + } + + field year type int { + indexing: summary | attribute + } + + field did type int { + indexing: summary | attribute + } + + field scorekey type int { + indexing: summary + } + + field cbid type int { + indexing: summary | attribute + } + + field metalvalue type string { + indexing: summary + } + + field hiphopvalue type string { + indexing: summary + match { + token + } + } + + field powermetalvalue type string { + indexing: index | summary + rank: filter + } + + field progvalue type string { + indexing: index | summary + rank { + filter + } + } + } + + field metalvalue_arr type array { + indexing: input metalvalue | split ";" | attribute + } + + field hiphopvalue_arr type array { + indexing: input hiphopvalue | split ";" | attribute + } + + fieldset default { + fields: keys, ew, artist, song, title + } + +} + diff --git a/samples/Vespa Schema Definition/ranking.sd b/samples/Vespa Schema Definition/ranking.sd new file mode 100644 index 0000000000..511e09948b --- /dev/null +++ b/samples/Vespa Schema Definition/ranking.sd @@ -0,0 +1,64 @@ +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. + +schema test { + document test { + field title type string { + indexing: index | summary + } + field tokens type tensor(d0[128]) { + indexing: attribute + } + field outputidx type double { + indexing: attribute + } + } + fieldset default { + fields: title + } + + onnx-model my_ranking_model { + file: files/ranking_model.onnx + input input_ids: input_ids + input attention_mask: attention_mask + input token_type_ids: token_type_ids + } + + rank-profile using_model { + inputs { + query(input) tensor(d0[32]) + } + function input_ids() { + expression: tokenInputIds(128, query(input), attribute(tokens)) + } + function token_type_ids() { + expression: tokenTypeIds(128, query(input), attribute(tokens)) + } + function attention_mask() { + expression: tokenAttentionMask(128, query(input), attribute(tokens)) + } + global-phase { + rerank-count: 1000 + expression: onnx(my_ranking_model).score{d0:attribute(outputidx)} + } + } + + rank-profile with-fun { + function use_model() { + expression: attribute(outputidx) + 1.0 + } + global-phase { + expression: use_model + } + } + rank-profile with-fun-mf inherits with-fun { + first-phase { + expression: nativeRank + } + match-features: use_model + } + rank-profile fun-mf-child inherits with-fun-mf { + first-phase { + expression: 42 * attribute(outputidx) + } + } +} diff --git a/tools/grammars/compiler/data.go b/tools/grammars/compiler/data.go index 58d8d0893b..1a647d6573 100644 --- a/tools/grammars/compiler/data.go +++ b/tools/grammars/compiler/data.go @@ -48,6 +48,7 @@ var GrammarsInNonStdPath = map[string]bool{ "hy.tmLanguage": true, "abl-tmlanguage": true, "avro.tmLanguage": true, + "grammar": true, } // IgnoredFiles is a list of files that look like syntax files but aren't, or are known to be broken and never likely to be fixed. diff --git a/vendor/README.md b/vendor/README.md index 1e4fde93dd..201447c0ce 100644 --- a/vendor/README.md +++ b/vendor/README.md @@ -672,6 +672,7 @@ This is a list of grammars that Linguist selects to provide syntax highlighting - **Velocity Template Language:** [animecyc/AtomLanguageVelocity](https://github.com/animecyc/AtomLanguageVelocity) - **Vento:** [ventojs/vscode-vento](https://github.com/ventojs/vscode-vento) - **Verilog:** [textmate/verilog.tmbundle](https://github.com/textmate/verilog.tmbundle) +- **Vespa Schema Definition:** [vespa-engine/vespa](https://github.com/vespa-engine/vespa) - **Vim Help File:** [Alhadis/language-viml](https://github.com/Alhadis/language-viml) - **Vim Script:** [Alhadis/language-viml](https://github.com/Alhadis/language-viml) - **Vim Snippet:** [Alhadis/language-viml](https://github.com/Alhadis/language-viml) diff --git a/vendor/grammars/vespa b/vendor/grammars/vespa new file mode 160000 index 0000000000..ea9962ec1a --- /dev/null +++ b/vendor/grammars/vespa @@ -0,0 +1 @@ +Subproject commit ea9962ec1ac7ced7feafbc27db22b8c519a07c5b diff --git a/vendor/licenses/git_submodule/vespa.dep.yml b/vendor/licenses/git_submodule/vespa.dep.yml new file mode 100644 index 0000000000..5d54027713 --- /dev/null +++ b/vendor/licenses/git_submodule/vespa.dep.yml @@ -0,0 +1,213 @@ +--- +name: vespa +version: ea9962ec1ac7ced7feafbc27db22b8c519a07c5b +type: git_submodule +homepage: https://github.com/vespa-engine/vespa +license: apache-2.0 +licenses: +- sources: LICENSE + text: |2 + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +- sources: README.md + text: Code licensed under the Apache 2.0 license. See [LICENSE](LICENSE) for terms. +notices: []