mirror of
https://github.com/zed-industries/zed.git
synced 2025-01-15 06:40:17 +00:00
ec487d8f64
We will soon need `semantic_index` to be able to use
`CompletionProvider`. This is currently impossible due to a cyclic crate
dependency, because `CompletionProvider` lives in the `assistant` crate,
which depends on `semantic_index`.
This PR breaks the dependency cycle by extracting two crates out of
`assistant`: `language_model` and `completion`.
Only one piece of logic changed: [this
code](922fcaf5a6 (diff-3857b3707687a4d585f1200eec4c34a7a079eae8d303b4ce5b4fce46234ace9fR61-R69)).
* As of https://github.com/zed-industries/zed/pull/13276, whenever we
ask a given completion provider for its available models, OpenAI
providers would go and ask the global assistant settings whether the
user had configured an `available_models` setting, and if so, return
that.
* This PR changes it so that instead of eagerly asking the assistant
settings for this info (the new crate must not depend on `assistant`, or
else the dependency cycle would be back), OpenAI completion providers
now store the user-configured settings as part of their struct, and
whenever the settings change, we update the provider.
In theory, this change should not change user-visible behavior...but
since it's the only change in this large PR that's more than just moving
code around, I'm mentioning it here in case there's an unexpected
regression in practice! (cc @amtoaer in case you'd like to try out this
branch and verify that the feature is still working the way you expect.)
Release Notes:
- N/A
---------
Co-authored-by: Marshall Bowers <elliott.codes@gmail.com>
117 lines
3.9 KiB
TOML
117 lines
3.9 KiB
TOML
[package]
|
|
authors = ["Nathan Sobo <nathan@zed.dev>"]
|
|
default-run = "collab"
|
|
edition = "2021"
|
|
name = "collab"
|
|
version = "0.44.0"
|
|
publish = false
|
|
license = "AGPL-3.0-or-later"
|
|
|
|
[lints]
|
|
workspace = true
|
|
|
|
[[bin]]
|
|
name = "collab"
|
|
|
|
[features]
|
|
sqlite = ["sea-orm/sqlx-sqlite", "sqlx/sqlite"]
|
|
test-support = ["sqlite"]
|
|
|
|
[dependencies]
|
|
anthropic.workspace = true
|
|
anyhow.workspace = true
|
|
async-tungstenite = "0.16"
|
|
aws-config = { version = "1.1.5" }
|
|
aws-sdk-s3 = { version = "1.15.0" }
|
|
axum = { version = "0.6", features = ["json", "headers", "ws"] }
|
|
axum-extra = { version = "0.4", features = ["erased-json"] }
|
|
base64.workspace = true
|
|
chrono.workspace = true
|
|
clock.workspace = true
|
|
clickhouse.workspace = true
|
|
collections.workspace = true
|
|
completion.workspace = true
|
|
dashmap = "5.4"
|
|
envy = "0.4.2"
|
|
futures.workspace = true
|
|
google_ai.workspace = true
|
|
hex.workspace = true
|
|
http.workspace = true
|
|
live_kit_server.workspace = true
|
|
log.workspace = true
|
|
nanoid.workspace = true
|
|
open_ai.workspace = true
|
|
supermaven_api.workspace = true
|
|
parking_lot.workspace = true
|
|
prometheus = "0.13"
|
|
prost.workspace = true
|
|
rand.workspace = true
|
|
reqwest = { version = "0.11", features = ["json"] }
|
|
rpc.workspace = true
|
|
scrypt = "0.7"
|
|
sea-orm = { version = "0.12.x", features = ["sqlx-postgres", "postgres-array", "runtime-tokio-rustls", "with-uuid"] }
|
|
semantic_version.workspace = true
|
|
semver.workspace = true
|
|
serde.workspace = true
|
|
serde_derive.workspace = true
|
|
serde_json.workspace = true
|
|
sha2.workspace = true
|
|
sqlx = { version = "0.7", features = ["runtime-tokio-rustls", "postgres", "json", "time", "uuid", "any"] }
|
|
subtle.workspace = true
|
|
rustc-demangle.workspace = true
|
|
telemetry_events.workspace = true
|
|
text.workspace = true
|
|
time.workspace = true
|
|
tokio.workspace = true
|
|
toml.workspace = true
|
|
tower = "0.4"
|
|
tower-http = { workspace = true, features = ["trace"] }
|
|
tracing = "0.1.40"
|
|
tracing-subscriber = { version = "0.3.18", features = ["env-filter", "json", "registry", "tracing-log"] } # workaround for https://github.com/tokio-rs/tracing/issues/2927
|
|
util.workspace = true
|
|
uuid.workspace = true
|
|
|
|
[dev-dependencies]
|
|
assistant = { workspace = true, features = ["test-support"] }
|
|
async-trait.workspace = true
|
|
audio.workspace = true
|
|
call = { workspace = true, features = ["test-support"] }
|
|
channel.workspace = true
|
|
client = { workspace = true, features = ["test-support"] }
|
|
collab_ui = { workspace = true, features = ["test-support"] }
|
|
collections = { workspace = true, features = ["test-support"] }
|
|
completion = { workspace = true, features = ["test-support"] }
|
|
ctor.workspace = true
|
|
editor = { workspace = true, features = ["test-support"] }
|
|
env_logger.workspace = true
|
|
file_finder.workspace = true
|
|
fs = { workspace = true, features = ["test-support"] }
|
|
git = { workspace = true, features = ["test-support"] }
|
|
git_hosting_providers.workspace = true
|
|
gpui = { workspace = true, features = ["test-support"] }
|
|
indoc.workspace = true
|
|
language = { workspace = true, features = ["test-support"] }
|
|
live_kit_client = { workspace = true, features = ["test-support"] }
|
|
lsp = { workspace = true, features = ["test-support"] }
|
|
menu.workspace = true
|
|
multi_buffer = { workspace = true, features = ["test-support"] }
|
|
node_runtime.workspace = true
|
|
notifications = { workspace = true, features = ["test-support"] }
|
|
pretty_assertions.workspace = true
|
|
project = { workspace = true, features = ["test-support"] }
|
|
recent_projects = { workspace = true }
|
|
release_channel.workspace = true
|
|
remote = { workspace = true, features = ["test-support"] }
|
|
remote_server.workspace = true
|
|
dev_server_projects.workspace = true
|
|
rpc = { workspace = true, features = ["test-support"] }
|
|
sea-orm = { version = "0.12.x", features = ["sqlx-sqlite"] }
|
|
serde_json.workspace = true
|
|
settings = { workspace = true, features = ["test-support"] }
|
|
sqlx = { version = "0.7", features = ["sqlite"] }
|
|
theme.workspace = true
|
|
unindent.workspace = true
|
|
util.workspace = true
|
|
workspace = { workspace = true, features = ["test-support"] }
|
|
worktree = { workspace = true, features = ["test-support"] }
|
|
headless.workspace = true
|