Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
155 changes: 105 additions & 50 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,7 @@ reqwest = { version = "0.12.23", features = [
"http2",
], default-features = false }
rustls = { version = "0.23", features = ["ring"], default-features = false }
reqwest-eventsource = "0.6.0"
eventsource-stream = "0.2.3"
eventsource-client = "0.17.2"
include_dir = "0.7.4"
schemars = "1.2"
serde = { version = "1.0.217", features = ["derive"] }
Expand Down
2 changes: 1 addition & 1 deletion crates/forge_app/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ dashmap.workspace = true
url.workspace = true
reqwest.workspace = true
bytes.workspace = true
reqwest-eventsource.workspace = true
eventsource-client.workspace = true
schemars.workspace = true
glob.workspace = true
lazy_static.workspace = true
Expand Down
3 changes: 1 addition & 2 deletions crates/forge_app/src/infra.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,10 @@ use forge_domain::{
};
use reqwest::Response;
use reqwest::header::HeaderMap;
use reqwest_eventsource::EventSource;
use serde::de::DeserializeOwned;
use url::Url;

use crate::{WalkedFile, Walker};
use crate::{EventSource, WalkedFile, Walker};

/// Infrastructure trait for accessing environment configuration, system
/// variables, and persisted application configuration.
Expand Down
8 changes: 8 additions & 0 deletions crates/forge_app/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
use std::pin::Pin;

use eventsource_client::SSE;
use futures::Stream;

/// Type alias for a server-sent events stream
pub type EventSource = Pin<Box<dyn Stream<Item = anyhow::Result<SSE>> + Send + Sync>>;

mod agent;
mod agent_executor;
mod agent_provider_resolver;
Expand Down
3 changes: 1 addition & 2 deletions crates/forge_app/src/services.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,10 @@ use forge_domain::{
};
use reqwest::Response;
use reqwest::header::HeaderMap;
use reqwest_eventsource::EventSource;
use url::Url;

use crate::user::{User, UserUsage};
use crate::{EnvironmentInfra, Walker};
use crate::{EnvironmentInfra, EventSource, Walker};

#[derive(Debug, Clone)]
pub struct ShellOutput {
Expand Down
Loading
Loading