Skip to content

Commit cc3e1e0

Browse files
authored
Merge branch 'main' into openai-longprobs
2 parents 4f2a5eb + 6231296 commit cc3e1e0

File tree

8 files changed

+43
-43
lines changed

8 files changed

+43
-43
lines changed

.github/workflows/tests.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ on:
88
- main
99
# release branches have the form v1.9.x
1010
- "v[0-9].*[0-9].x"
11+
paths-ignore:
12+
- 'docs/**'
13+
- 'docs-website/**'
1114
pull_request:
1215
types:
1316
- opened

docs-website/.gitignore

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,7 @@ website/_dogfooding/_swizzle_theme_tests
3939
CrowdinTranslations_*.zip
4040

4141
website/.cpu-prof
42-
4342
website/i18n/**/*
44-
#!website/i18n/fr
45-
#!website/i18n/fr/**/*
4643

4744
.netlify
4845

docs-website/docs/overview/telemetry.mdx

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ Haystack relies on anonymous usage statistics to continuously improve. That's wh
1111

1212
## What Information Is Shared?
1313

14-
Telemetry in Haystack comprises anonymous usage statistics of base components, such as `DocumentStore`, `Retriever`, `Reader`, or any other pipeline component. We receive an event every time these components are initialized. This way, we know which components are most relevant to our community. For the same reason, an event is also sent when one of the tutorials is executed.
14+
Telemetry in Haystack comprises anonymous usage statistics of base components, such as `DocumentStore`, `Retriever`, `Reader`, or any other pipeline component. We receive an event every time these components are initialized. This way, we know which components are most relevant to our community. For the same reason, an event is also sent when one of the tutorials is executed.
1515

16-
Each event contains an anonymous, randomly generated user ID (`uuid`) and a collection of properties about your execution environment. They **never ** contain properties that can be used to identify you, such as:
16+
Each event contains an anonymous, randomly generated user ID (`uuid`) and a collection of properties about your execution environment. They **never** contain properties that can be used to identify you, such as:
1717

1818
- IP addresses
1919
- Hostnames
@@ -43,11 +43,11 @@ Here is an exemplary event that is sent when tutorial 1 is executed by running `
4343
}
4444
```
4545

46-
Our telemetry code can be directly inspected on [GitHub](https://github.com/deepset-ai/haystack/blob/5d66d040cc303ab49225587cd61290f1987a5d1f/haystack/telemetry/_telemetry.py).
46+
Our telemetry code can be directly inspected on [GitHub](https://github.com/deepset-ai/haystack/blob/5d66d040cc303ab49225587cd61290f1987a5d1f/haystack/telemetry/_telemetry.py).
4747

4848
## How Does Telemetry Help?
4949

50-
Thanks to telemetry, we can understand the needs of the community: _"What pipeline nodes are most popular?", "Should we focus on supporting one specific Document Store?", "How many people use Haystack on Windows?"_ are some of the questions telemetry helps us answer. Metadata about the operating system and installed dependencies allows us to quickly identify and address issues caused by specific setups.
50+
Thanks to telemetry, we can understand the needs of the community: _"What pipeline nodes are most popular?", "Should we focus on supporting one specific Document Store?", "How many people use Haystack on Windows?"_ are some of the questions telemetry helps us answer. Metadata about the operating system and installed dependencies allows us to quickly identify and address issues caused by specific setups.
5151

5252
In short, by sharing this information, you enable us to continuously improve Haystack for everyone.
5353

@@ -61,16 +61,16 @@ You can disable telemetry by setting the environment variable `HAYSTACK_TELEMETR
6161

6262
### Using a Bash Shell
6363

64-
If you are using a bash shell, add the following line to the file `~/.bashrc` to disable telemetry: `export HAYSTACK_TELEMETRY_ENABLED=False`.
64+
If you are using a bash shell, add the following line to the file `~/.bashrc` to disable telemetry: `export HAYSTACK_TELEMETRY_ENABLED=False`.
6565

6666
### Using zsh
6767

6868
If you are using zsh as your shell, for example, on macOS, add the following line to the file `~/.zshrc`: `export HAYSTACK_TELEMETRY_ENABLED=False`.
6969

7070
### On Windows
7171

72-
To disable telemetry on Windows, set a user-level environment variable by running this command in the standard command prompt: `setx HAYSTACK_TELEMETRY_ENABLED "False"`.
72+
To disable telemetry on Windows, set a user-level environment variable by running this command in the standard command prompt: `setx HAYSTACK_TELEMETRY_ENABLED "False"`.
7373

7474
Alternatively, run the following command in Windows PowerShell: `[Environment]::SetEnvironmentVariable("HAYSTACK_TELEMETRY_ENABLED","False","User")`.
7575

76-
You might need to restart the operating system for the command to take effect.
76+
You might need to restart the operating system for the command to take effect.

docs-website/docs/pipeline-components/generators/guides-to-generators/function-calling.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ For example, you can easily connect an LLM with a ChatGenerator to an external s
125125

126126
For more information and examples, see the documentation on [`OpenAPIServiceToFunctions`](../../converters/openapiservicetofunctions.mdx) and [`OpenAPIServiceConnector`](../../connectors/openapiserviceconnector.mdx).
127127

128-
:notebook: **Tutorial: **[Building a Chat Application with Function Calling](https://haystack.deepset.ai/tutorials/40_building_chat_application_with_function_calling)
128+
:notebook: **Tutorial:** [Building a Chat Application with Function Calling](https://haystack.deepset.ai/tutorials/40_building_chat_application_with_function_calling)
129129

130130
🧑‍🍳 **Cookbooks:**
131131

docs-website/sidebars.js

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -158,9 +158,9 @@ export default {
158158
id: 'pipeline-components/audio'
159159
},
160160
items: [
161-
'pipeline-components/audio/external-integrations-audio',
162161
'pipeline-components/audio/localwhispertranscriber',
163162
'pipeline-components/audio/remotewhispertranscriber',
163+
'pipeline-components/audio/external-integrations-audio',
164164
],
165165
},
166166
{
@@ -203,7 +203,6 @@ export default {
203203
id: 'pipeline-components/connectors'
204204
},
205205
items: [
206-
'pipeline-components/connectors/external-integrations-connectors',
207206
'pipeline-components/connectors/githubfileeditor',
208207
'pipeline-components/connectors/githubissuecommenter',
209208
'pipeline-components/connectors/githubissueviewer',
@@ -215,6 +214,7 @@ export default {
215214
'pipeline-components/connectors/openapiconnector',
216215
'pipeline-components/connectors/openapiserviceconnector',
217216
'pipeline-components/connectors/weaveconnector',
217+
'pipeline-components/connectors/external-integrations-connectors',
218218
],
219219
},
220220
{
@@ -229,7 +229,6 @@ export default {
229229
'pipeline-components/converters/csvtodocument',
230230
'pipeline-components/converters/documenttoimagecontent',
231231
'pipeline-components/converters/docxtodocument',
232-
'pipeline-components/converters/external-integrations-converters',
233232
'pipeline-components/converters/htmltodocument',
234233
'pipeline-components/converters/imagefiletodocument',
235234
'pipeline-components/converters/imagefiletoimagecontent',
@@ -248,6 +247,7 @@ export default {
248247
'pipeline-components/converters/tikadocumentconverter',
249248
'pipeline-components/converters/unstructuredfileconverter',
250249
'pipeline-components/converters/xlsxtodocument',
250+
'pipeline-components/converters/external-integrations-converters',
251251
],
252252
},
253253
{
@@ -274,7 +274,6 @@ export default {
274274
'pipeline-components/embedders/coheredocumentembedder',
275275
'pipeline-components/embedders/coheredocumentimageembedder',
276276
'pipeline-components/embedders/coheretextembedder',
277-
'pipeline-components/embedders/external-integrations-embedders',
278277
'pipeline-components/embedders/fastembeddocumentembedder',
279278
'pipeline-components/embedders/fastembedsparsedocumentembedder',
280279
'pipeline-components/embedders/fastembedsparsetextembedder',
@@ -307,6 +306,7 @@ export default {
307306
'pipeline-components/embedders/vertexaitextembedder',
308307
'pipeline-components/embedders/watsonxdocumentembedder',
309308
'pipeline-components/embedders/watsonxtextembedder',
309+
'pipeline-components/embedders/external-integrations-embedders',
310310
],
311311
},
312312
{
@@ -324,11 +324,11 @@ export default {
324324
'pipeline-components/evaluators/documentmrrevaluator',
325325
'pipeline-components/evaluators/documentndcgevaluator',
326326
'pipeline-components/evaluators/documentrecallevaluator',
327-
'pipeline-components/evaluators/external-integrations-evaluators',
328327
'pipeline-components/evaluators/faithfulnessevaluator',
329328
'pipeline-components/evaluators/llmevaluator',
330329
'pipeline-components/evaluators/ragasevaluator',
331330
'pipeline-components/evaluators/sasevaluator',
331+
'pipeline-components/evaluators/external-integrations-evaluators',
332332
],
333333
},
334334
{
@@ -352,8 +352,8 @@ export default {
352352
id: 'pipeline-components/fetchers'
353353
},
354354
items: [
355-
'pipeline-components/fetchers/external-integrations-fetchers',
356355
'pipeline-components/fetchers/linkcontentfetcher',
356+
'pipeline-components/fetchers/external-integrations-fetchers',
357357
],
358358
},
359359
{
@@ -383,7 +383,6 @@ export default {
383383
'pipeline-components/generators/coherechatgenerator',
384384
'pipeline-components/generators/coheregenerator',
385385
'pipeline-components/generators/dalleimagegenerator',
386-
'pipeline-components/generators/external-integrations-generators',
387386
'pipeline-components/generators/fallbackchatgenerator',
388387
'pipeline-components/generators/googleaigeminichatgenerator',
389388
'pipeline-components/generators/googleaigeminigenerator',
@@ -417,6 +416,7 @@ export default {
417416
'pipeline-components/generators/vertexaitextgenerator',
418417
'pipeline-components/generators/watsonxchatgenerator',
419418
'pipeline-components/generators/watsonxgenerator',
419+
'pipeline-components/generators/external-integrations-generators',
420420
],
421421
},
422422
{
@@ -464,7 +464,6 @@ export default {
464464
'pipeline-components/rankers/choosing-the-right-ranker',
465465
'pipeline-components/rankers/amazonbedrockranker',
466466
'pipeline-components/rankers/cohereranker',
467-
'pipeline-components/rankers/external-integrations-rankers',
468467
'pipeline-components/rankers/fastembedranker',
469468
'pipeline-components/rankers/huggingfaceteiranker',
470469
'pipeline-components/rankers/jinaranker',
@@ -475,6 +474,7 @@ export default {
475474
'pipeline-components/rankers/sentencetransformersdiversityranker',
476475
'pipeline-components/rankers/sentencetransformerssimilarityranker',
477476
'pipeline-components/rankers/transformerssimilarityranker',
477+
'pipeline-components/rankers/external-integrations-rankers',
478478
],
479479
},
480480
{
@@ -574,9 +574,9 @@ export default {
574574
id: 'pipeline-components/websearch'
575575
},
576576
items: [
577-
'pipeline-components/websearch/external-integrations-websearch',
578577
'pipeline-components/websearch/searchapiwebsearch',
579578
'pipeline-components/websearch/serperdevwebsearch',
579+
'pipeline-components/websearch/external-integrations-websearch',
580580
],
581581
},
582582
{
@@ -646,7 +646,6 @@ export default {
646646
items: [
647647
'development/logging',
648648
'development/tracing',
649-
'development/external-integrations-development',
650649
'development/enabling-gpu-acceleration',
651650
'development/hayhooks',
652651
{
@@ -662,6 +661,7 @@ export default {
662661
'development/deployment/openshift',
663662
],
664663
},
664+
'development/external-integrations-development',
665665
],
666666
},
667667
],

docs-website/versioned_docs/version-2.19/overview/telemetry.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Haystack relies on anonymous usage statistics to continuously improve. That's wh
1313

1414
Telemetry in Haystack comprises anonymous usage statistics of base components, such as `DocumentStore`, `Retriever`, `Reader`, or any other pipeline component. We receive an event every time these components are initialized. This way, we know which components are most relevant to our community. For the same reason, an event is also sent when one of the tutorials is executed.
1515

16-
Each event contains an anonymous, randomly generated user ID (`uuid`) and a collection of properties about your execution environment. They **never ** contain properties that can be used to identify you, such as:
16+
Each event contains an anonymous, randomly generated user ID (`uuid`) and a collection of properties about your execution environment. They **never** contain properties that can be used to identify you, such as:
1717

1818
- IP addresses
1919
- Hostnames

docs-website/versioned_docs/version-2.19/pipeline-components/generators/guides-to-generators/function-calling.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ For example, you can easily connect an LLM with a ChatGenerator to an external s
117117

118118
For more information and examples, see the documentation on [`OpenAPIServiceToFunctions`](../../converters/openapiservicetofunctions.mdx) and [`OpenAPIServiceConnector`](../../connectors/openapiserviceconnector.mdx).
119119

120-
:notebook: **Tutorial: **[Building a Chat Application with Function Calling](https://haystack.deepset.ai/tutorials/40_building_chat_application_with_function_calling)
120+
:notebook: **Tutorial:** [Building a Chat Application with Function Calling](https://haystack.deepset.ai/tutorials/40_building_chat_application_with_function_calling)
121121

122122
🧑‍🍳 **Cookbooks:**
123123

0 commit comments

Comments
 (0)