Skip to content

Commit bbb3e30

Browse files
authored
Merge branch 'sourcegraph:main' into upgrade
2 parents 800d345 + 6050338 commit bbb3e30

File tree

7 files changed

+42
-13
lines changed

7 files changed

+42
-13
lines changed

docs/admin/observability/alerts.mdx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
{/* DO NOT EDIT: generated via: bazel run //doc/admin/observability:write_monitoring_docs */}
44

5-
This document contains a complete reference of all alerts in Sourcegraph's monitoring, and next steps for when you find alerts that are firing.
6-
If your alert isn't mentioned here, or if the next steps don't help, ontact us](mailto:support@sourcegraph.com) for assistance.
5+
This document contains a complete reference of all alerts in Sourcegraph's monitoring and the next steps for finding alerts that are firing.
6+
If your alert isn't mentioned here, or if the next steps don't help, contact us at `support@sourcegraph.com` for assistance.
77

88
To learn more about Sourcegraph's alerting and how to set up alerts, see [our alerting guide](/admin/observability/alerting).
99

docs/batch-changes/create-a-batch-change.mdx

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
<p className="subtitle">Learn in detail about how to create, view, and filter your Batch Changes.</p>
44

5-
Batch changes are created by writing a [batch spec](/batch-changes/batch-spec-yaml-reference) and executing that batch spec with the [Sourcegraph CLI](https://github.com/sourcegraph/src-cli) `src`.
5+
Batch Changes are created by writing a [batch spec](/batch-changes/batch-spec-yaml-reference) and executing that batch spec with the [Sourcegraph CLI](https://github.com/sourcegraph/src-cli) `src`.
66

7-
Batch changes can also be used on [multiple projects within a monorepo](/batch-changes/creating-changesets-per-project-in-monorepos) by using the `workspaces` key in your batch spec.
7+
Batch Changes can also be used on [multiple projects within a monorepo](/batch-changes/creating-changesets-per-project-in-monorepos) by using the `workspaces` key in your batch spec.
88

9-
There are two ways of creating a Batch Change:
9+
There are two ways of creating a batch change:
1010

1111
1. On your local machine, with the [Sourcegraph CLI](#create-a-batch-change-with-the-sourcegraph-cli)
1212
2. Remotely, with [server-side execution](/batch-changes/server-side)
@@ -23,7 +23,7 @@ This part of the guide will walk you through creating a batch change on your loc
2323

2424
### Writing a batch spec
2525

26-
To create a Batch Change, you need a **batch spec** describing the change. Here is an example batch spec that describes a batch change to add **Hello World** to all `README` files:
26+
To create a batch change, you need a **batch spec** describing the change. Here is an example batch spec that describes a batch change to add **Hello World** to all `README` files:
2727

2828
```yaml
2929
version: 2
@@ -105,9 +105,9 @@ That can be useful if you want to update a single field in the batch spec, i.e.,
105105

106106
### Creating a batch change in a different namespace
107107

108-
Batch changes are uniquely identified by their name and namespace. The namespace can be any Sourcegraph username or the name of a Sourcegraph organization.
108+
Batch Changes are uniquely identified by their name and namespace. The namespace can be any Sourcegraph username or the name of a Sourcegraph organization.
109109

110-
By default, batch changes will use your username on Sourcegraph as your namespace. To create batch changes in a different namespace, use the `-namespace` flag when previewing or applying a batch spec:
110+
By default, Batch Changes will use your username on Sourcegraph as your namespace. To create Batch Changes in a different namespace, use the `-namespace` flag when previewing or applying a batch spec:
111111

112112
```bash
113113
src batch preview -f your_batch_spec.yaml -namespace <SOURCEGRAPH_USERNAME_OR_ORG>
@@ -176,13 +176,13 @@ Congratulations, you ran your first batch change server-side 🎊
176176

177177
## Viewing batch changes
178178

179-
You can view a list of all batch changes by clicking the **Batch Changes** icon in the top navigation bar:
179+
You can view a list by clicking the **Batch Changes** icon in the top navigation bar:
180180

181181
![batch-change-icon-to-view](https://sourcegraphstatic.com/docs/images/batch_changes/2024/batch_changes_icon_in_menu.png)
182182

183-
## Filtering batch changes
183+
## Filtering Batch Changes
184184

185-
You can also use the filters to switch between showing all open or closed batch changes.
185+
You can also use the filters to switch between showing all open or closed Batch Changes.
186186

187187
![use-filters-batch-changes](https://sourcegraphstatic.com/docs/images/batch_changes/2024/viewing_batch_changes_filtering.png)
188188

docs/cody/capabilities/auto-edit.mdx

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,11 @@ Auto-edit is available for Enterprise customers with [Sourcegraph Cody Gateway](
2828
- Enable the feature flag `cody-autoedit-experiment-enabled-flag`
2929
- Add `fireworks::*` as an [allowed provider](https://sourcegraph.com/docs/cody/enterprise/model-configuration#model-filters) (see below)
3030
2. Once enabled, developers will receive a notification in their editor to turn it on
31+
3. If you skip the notification or don't see it, you can manually enable/disable it from the Cody extension settings.
32+
33+
![enable-from-cody-settings](https://storage.googleapis.com/sourcegraph-assets/Docs/enable-auto-edit-from-settings.jpg)
34+
35+
There is a drop-down menu for Cody's suggestions mode. You can choose between the default autocomplete and the auto-edit mode, or you can turn off the suggestions completely.
3136

3237
The following example demonstrates how to add Fireworks as an allowed LLM provider:
3338

@@ -40,7 +45,7 @@ The following example demonstrates how to add Fireworks as an allowed LLM provid
4045
// Only allow "beta" and "stable" models.
4146
// Not "experimental" or "deprecated".
4247
"statusFilter": ["beta", "stable"],
43-
48+
4449
// Allow any models provided by Anthropic, OpenAI, Google and Fireworks.
4550
"allow": [
4651
"anthropic::*", // Anthropic models

docs/cody/capabilities/supported-models.mdx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,6 @@ Cody uses a set of models for autocomplete which are suited for the low latency
4343

4444
<Callout type="note">The default autocomplete model for Cody Free, Pro and Enterprise users is DeepSeek-Coder-V2.</Callout>
4545

46+
<Callout type="note">The DeepSeek model used by Sourcegraph is hosted by Fireworks.ai, and is hosted as a single-tenant service in a US-based data center. For more information see our [Cody FAQ](https://sourcegraph.com/docs/cody/faq#is-any-of-my-data-sent-to-deepseek).</Callout>
47+
4648
Read here for [Ollama setup instructions](https://sourcegraph.com/docs/cody/clients/install-vscode#supported-local-ollama-models-with-cody). For information on context token limits, see our [documentation here](/cody/core-concepts/token-limits).

docs/cody/core-concepts/cody-gateway.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Cody Gateway powers the default `"provider": "sourcegraph"` and Cody completions
88

99
## Supported Models
1010

11-
For a full list of supported models and providers, read our [Supported LLMs](/Cody/capabilities/supported-models) docs.
11+
For a full list of supported models and providers, read our [Supported LLMs](/cody/capabilities/supported-models) docs.
1212

1313
## Setting up Cody Gateway in Sourcegraph Enterprise
1414

docs/cody/faq.mdx

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,14 @@ Cody does not support embeddings on Cody PLG and Cody Enterprise because we have
100100

101101
Leveraging Sourcegraph Search allowed us to deliver these enhancements.
102102

103+
## LLM Data Sharing and Retention
104+
105+
### Is any of my data sent to DeepSeek?
106+
107+
Our autocomplete features uses the open source DeepSeek-Coder-V2 model, which is hosted by Fireworks.ai in a secure single-tenant environment located in the USA. No customer chat or autocomplete data - such as chat messages, or context such as code snippets or configuration - is stored by Fireworks.ai.
108+
109+
Sourcegraph does not use models hosted by DeepSeek (the company), and does not send any data to the same.
110+
103111
## Third party dependencies
104112

105113
### What is the default `sourcegraph` provider for completions?

docs/cody/troubleshooting.mdx

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,20 @@ It indicates that our web application firewall provider, Cloudflare, has flagged
105105

106106
Consider disabling anonymizers, VPNs, or open proxies. If using a VPN is essential, you can try [1.1.1.1](https://one.one.one.one), which is recognized to be compatible with our services.
107107

108+
### Error with Cody `contextFilters` during chat or editing code
109+
110+
The `contextFilters` setting in Cody is used to control which files are included or excluded when Cody searches for relevant context while answering questions or providing code assistance. Sometimes, you can see the following error:
111+
112+
```
113+
Edit failed to run: file is ignored (due to cody.contextFilters Enterprise configuration setting)
114+
```
115+
116+
This error occurs when you're trying to work with a file that's been excluded by Cody's enterprise-level `contextFilters` configuration. At times, this can happen to files that also haven't been excluded. First, check with your organization's admin to understand which files are excluded.
117+
118+
If the error occurs with a file that's not been excluded, the workaround is to uninstall the Cody plugin, restart your IDE and then reinstall the latest version of the extension.
119+
120+
This should clear the error.
121+
108122
### VS Code Pro License Issues
109123

110124
If VS Code prompts you to upgrade to Pro despite already having a Pro license, this usually happens because you're logged into a free Cody/Sourcegraph account rather than your Pro account. To fix this:

0 commit comments

Comments
 (0)