feat: a system for non developers to augment developer system (#524)

has menu items to turn on (off by default)
block · Jan 1, 2025 · 6573147 · 6573147
1 parent f632e61
commit 6573147
Show file tree

Hide file tree

Showing 9 changed files with 959 additions and 32 deletions.
diff --git a/.github/workflows/desktop-app-release.yaml b/.github/workflows/desktop-app-release.yaml
@@ -78,7 +78,19 @@ jobs:
       working-directory: ui/desktop
 
     - name: Make default Goose App
-      run: npm run bundle:default
+      run: |
+        attempt=0
+        max_attempts=2
+        until [ $attempt -ge $max_attempts ]; do
+          npm run bundle:default && break
+          attempt=$((attempt + 1))
+          echo "Attempt $attempt failed. Retrying..."
+          sleep 5
+        done
+        if [ $attempt -ge $max_attempts ]; then
+          echo "Action failed after $max_attempts attempts."
+          exit 1
+        fi
       working-directory: ui/desktop
       env:
           APPLE_ID: ${{ secrets.APPLE_ID }}

diff --git a/crates/goose-server/src/state.rs b/crates/goose-server/src/state.rs
@@ -5,7 +5,7 @@ use goose::{
     developer::DeveloperSystem,
     memory::MemorySystem,
     providers::{configs::ProviderConfig, factory},
-    systems::goose_hints::GooseHintsSystem,
+    systems::{goose_hints::GooseHintsSystem, non_developer::NonDeveloperSystem},
 };
 use std::{env, sync::Arc};
 use tokio::sync::Mutex;
@@ -21,15 +21,35 @@ impl AppState {
     pub fn new(provider_config: ProviderConfig, secret_key: String) -> Result<Self> {
         let provider = factory::get_provider(provider_config.clone())?;
         let mut agent = Agent::new(provider);
+
+        dbg!("Adding DeveloperSystem");
         agent.add_system(Box::new(DeveloperSystem::new()));
 
+        // Add NonDeveloperSystem only if GOOSE_SERVER__NON_DEVELOPER is set to "true"
+        if let Ok(non_dev_enabled) = env::var("GOOSE_SERVER__NON_DEVELOPER") {
+            if non_dev_enabled.to_lowercase() == "true" {
+                dbg!("Adding NonDeveloperSystem");
+                agent.add_system(Box::new(NonDeveloperSystem::new()));
+            } else {
+                dbg!("Skipping NonDeveloperSystem (GOOSE_SERVER__NON_DEVELOPER not 'true')");
+            }
+        } else {
+            dbg!("Skipping NonDeveloperSystem (GOOSE_SERVER__NON_DEVELOPER not set)");
+        }
+
         // Add memory system only if GOOSE_SERVER__MEMORY is set to "true"
         if let Ok(memory_enabled) = env::var("GOOSE_SERVER__MEMORY") {
             if memory_enabled.to_lowercase() == "true" {
+                dbg!("Adding MemorySystem");
                 agent.add_system(Box::new(MemorySystem::new()));
+            } else {
+                dbg!("Skipping MemorySystem (GOOSE_SERVER__MEMORY not 'true')");
             }
+        } else {
+            dbg!("Skipping MemorySystem (GOOSE_SERVER__MEMORY not set)");
         }
 
+        dbg!("Adding GooseHintsSystem");
         let goosehints_system = Box::new(GooseHintsSystem::new());
         agent.add_system(goosehints_system);
 

diff --git a/crates/goose/Cargo.toml b/crates/goose/Cargo.toml
@@ -67,6 +67,7 @@ keyring = { version = "3.6.1", features = [
 shellexpand = "3.1.0"
 rust_decimal = "1.36.0"
 rust_decimal_macros = "1.36.0"
+tempfile = "3.8"
 
 [dev-dependencies]
 sysinfo = "0.32.1"

diff --git a/crates/goose/src/providers/groq.rs b/crates/goose/src/providers/groq.rs
@@ -105,11 +105,11 @@ mod tests {
     #[tokio::test]
     async fn test_complete_basic() -> anyhow::Result<()> {
         let model_name = "gpt-4o";
+        let expected_response = "Hello! How can I assist you today?";
         // Mock response for normal completion
-        let response_body =
-            create_mock_open_ai_response(model_name, "Hello! How can I assist you today?");
+        let response_body = create_mock_open_ai_response(model_name, expected_response);
 
-        let (_, provider) = _setup_mock_server(response_body).await;
+        let (mock_server, provider) = _setup_mock_server(response_body).await;
 
         // Prepare input messages
         let messages = vec![Message::user().with_text("Hello?")];
@@ -120,16 +120,41 @@ mod tests {
             .await?;
 
         // Assert the response
-        if let MessageContent::Text(text) = &message.content[0] {
-            assert_eq!(text.text, "Hello! How can I assist you today?");
-        } else {
-            panic!("Expected Text content");
+        assert!(
+            !message.content.is_empty(),
+            "Message content should not be empty"
+        );
+        match &message.content[0] {
+            MessageContent::Text(text) => {
+                assert_eq!(
+                    text.text, expected_response,
+                    "Response text does not match expected"
+                );
+            }
+            other => panic!("Expected Text content, got {:?}", other),
         }
-        assert_eq!(usage.usage.input_tokens, Some(TEST_INPUT_TOKENS));
-        assert_eq!(usage.usage.output_tokens, Some(TEST_OUTPUT_TOKENS));
-        assert_eq!(usage.usage.total_tokens, Some(TEST_TOTAL_TOKENS));
-        assert_eq!(usage.model, model_name);
-        assert_eq!(usage.cost, None);
+
+        // Verify usage metrics
+        assert_eq!(
+            usage.usage.input_tokens,
+            Some(TEST_INPUT_TOKENS),
+            "Input tokens mismatch"
+        );
+        assert_eq!(
+            usage.usage.output_tokens,
+            Some(TEST_OUTPUT_TOKENS),
+            "Output tokens mismatch"
+        );
+        assert_eq!(
+            usage.usage.total_tokens,
+            Some(TEST_TOTAL_TOKENS),
+            "Total tokens mismatch"
+        );
+        assert_eq!(usage.model, model_name, "Model name mismatch");
+        assert_eq!(usage.cost, None, "Cost should be None");
+
+        // Ensure mock server handled the request
+        mock_server.verify().await;
 
         Ok(())
     }

diff --git a/crates/goose/src/providers/ollama.rs b/crates/goose/src/providers/ollama.rs
@@ -98,11 +98,11 @@ mod tests {
     #[tokio::test]
     async fn test_complete_basic() -> Result<()> {
         let model_name = "gpt-4o";
+        let expected_response = "Hello! How can I assist you today?";
         // Mock response for normal completion
-        let response_body =
-            create_mock_open_ai_response(model_name, "Hello! How can I assist you today?");
+        let response_body = create_mock_open_ai_response(model_name, expected_response);
 
-        let (_, provider) = _setup_mock_server(response_body).await;
+        let (mock_server, provider) = _setup_mock_server(response_body).await;
 
         // Prepare input messages
         let messages = vec![Message::user().with_text("Hello?")];
@@ -113,16 +113,41 @@ mod tests {
             .await?;
 
         // Assert the response
-        if let MessageContent::Text(text) = &message.content[0] {
-            assert_eq!(text.text, "Hello! How can I assist you today?");
-        } else {
-            panic!("Expected Text content");
+        assert!(
+            !message.content.is_empty(),
+            "Message content should not be empty"
+        );
+        match &message.content[0] {
+            MessageContent::Text(text) => {
+                assert_eq!(
+                    text.text, expected_response,
+                    "Response text does not match expected"
+                );
+            }
+            other => panic!("Expected Text content, got {:?}", other),
         }
-        assert_eq!(usage.usage.input_tokens, Some(TEST_INPUT_TOKENS));
-        assert_eq!(usage.usage.output_tokens, Some(TEST_OUTPUT_TOKENS));
-        assert_eq!(usage.usage.total_tokens, Some(TEST_TOTAL_TOKENS));
-        assert_eq!(usage.model, model_name);
-        assert_eq!(usage.cost, None);
+
+        // Verify usage metrics
+        assert_eq!(
+            usage.usage.input_tokens,
+            Some(TEST_INPUT_TOKENS),
+            "Input tokens mismatch"
+        );
+        assert_eq!(
+            usage.usage.output_tokens,
+            Some(TEST_OUTPUT_TOKENS),
+            "Output tokens mismatch"
+        );
+        assert_eq!(
+            usage.usage.total_tokens,
+            Some(TEST_TOTAL_TOKENS),
+            "Total tokens mismatch"
+        );
+        assert_eq!(usage.model, model_name, "Model name mismatch");
+        assert_eq!(usage.cost, None, "Cost should be None");
+
+        // Ensure mock server handled the request
+        mock_server.verify().await;
 
         Ok(())
     }

diff --git a/crates/goose/src/systems/mod.rs b/crates/goose/src/systems/mod.rs
@@ -2,3 +2,4 @@ mod system;
 pub use system::System;
 
 pub mod goose_hints;
+pub mod non_developer;
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,3 +2,4 @@ mod system;
		pub use system::System;

		pub mod goose_hints;
		pub mod non_developer;