remove json validation

olegklimov · olegklimov · commit e75c1776e111 · 2025-02-25T09:58:07.000+01:00
diff --git a/.refact/integrations.d/cmdline_cargo_check.yaml b/.refact/integrations.d/cmdline_cargo_check.yaml
@@ -5,7 +5,7 @@ parameters:
   - name: "additional_params"
     description: "Additional parameters for cargo check, such as --workspace or --all-features"
   - name: "project_path"
-    description: "absolute path to the project"
+    description: "Absolute path to the project, the rust stuff is at refact/refact-agent/engine/Cargo.toml for the Refact project, so use ../refact/refact-agent/engine"
 timeout: "60"
 output_filter:
   limit_lines: 100
diff --git a/refact-agent/engine/Cargo.toml b/refact-agent/engine/Cargo.toml
@@ -96,7 +96,6 @@ uuid = { version = "1", features = ["v4", "serde"] }
 walkdir = "2.3"
 which = "7.0.1"
 zerocopy = "0.8.14"
-jsonschema = "0.28.3"
 
 # There you can use a local copy:
 mcp_client_rs = { git = "https://github.com/smallcloudai/mcp_client_rust.git" }
diff --git a/refact-agent/engine/src/files_blocklist.rs b/refact-agent/engine/src/files_blocklist.rs
@@ -198,7 +198,7 @@ pub async fn reload_indexing_everywhere_if_needed(gcx: Arc<ARwLock<GlobalContext
 
 pub fn is_blocklisted(indexing_settings: &IndexingSettings, path: &PathBuf) -> bool {
     let block = any_glob_matches_path(&indexing_settings.blocklist, &path);
-    tracing::info!("is_blocklisted {:?} {:?} block={}", indexing_settings, path, block);
+    // tracing::info!("is_blocklisted {:?} {:?} block={}", indexing_settings, path, block);
     block
 }
 
diff --git a/refact-agent/engine/src/http/routers/v1.rs b/refact-agent/engine/src/http/routers/v1.rs
@@ -43,7 +43,7 @@ use crate::http::routers::v1::system_prompt::handle_v1_prepend_system_prompt_and
 use crate::http::routers::v1::vecdb::{handle_v1_vecdb_search, handle_v1_vecdb_status};
 #[cfg(feature="vecdb")]
 use crate::http::routers::v1::handlers_memdb::{handle_mem_add, handle_mem_erase, handle_mem_update_used, handle_mem_block_until_vectorized};
-use crate::http::routers::v1::v1_integrations::{handle_v1_integration_get, handle_v1_integration_icon, handle_v1_integration_save, handle_v1_integration_delete, handle_v1_integrations, handle_v1_integrations_filtered, handle_v1_integration_json_schema};
+use crate::http::routers::v1::v1_integrations::{handle_v1_integration_get, handle_v1_integration_icon, handle_v1_integration_save, handle_v1_integration_delete, handle_v1_integrations, handle_v1_integrations_filtered};
 use crate::agent_db::db_cthread::{handle_db_v1_cthread_update, handle_db_v1_cthreads_sub};
 use crate::agent_db::db_cmessage::{handle_db_v1_cmessages_update, handle_db_v1_cmessages_sub};
 use crate::agent_db::db_chore::{handle_db_v1_chore_update, handle_db_v1_chore_event_update, handle_db_v1_chores_sub};
@@ -137,7 +137,6 @@ pub fn make_v1_router() -> Router {
         .route("/integration-save", telemetry_post!(handle_v1_integration_save))
         .route("/integration-delete", delete(handle_v1_integration_delete))
         .route("/integration-icon/:icon_name", get(handle_v1_integration_icon))
-        .route("/integration-json-schema", get(handle_v1_integration_json_schema))
 
         .route("/docker-container-list", telemetry_post!(handle_v1_docker_container_list))
         .route("/docker-container-action", telemetry_post!(handle_v1_docker_container_action))
diff --git a/refact-agent/engine/src/http/routers/v1/v1_integrations.rs b/refact-agent/engine/src/http/routers/v1/v1_integrations.rs
@@ -11,7 +11,6 @@ use axum::extract::Query;
 use rust_embed::RustEmbed;
 use crate::custom_error::ScratchError;
 use crate::global_context::GlobalContext;
-use crate::integrations::json_schema::INTEGRATION_JSON_SCHEMA;
 use crate::integrations::setting_up_integrations::split_path_into_project_and_integration;
 
 
@@ -189,14 +188,3 @@ pub async fn handle_v1_integration_delete(
         .body(Body::from("{}"))
         .unwrap())
 }
-
-pub async fn handle_v1_integration_json_schema() -> axum::response::Result<Response<Body>, ScratchError> {
-    let schema_string = serde_json::to_string_pretty(&*INTEGRATION_JSON_SCHEMA).map_err(|e| {
-        ScratchError::new(StatusCode::INTERNAL_SERVER_ERROR, format!("Failed to serialize JSON schema: {}", e))
-    })?;
-
-    Ok(Response::builder()
-        .header("Content-Type", "application/json")
-        .body(Body::from(schema_string))
-        .unwrap())
-}
diff --git a/refact-agent/engine/src/integrations/integr_cmdline.rs b/refact-agent/engine/src/integrations/integr_cmdline.rs
@@ -148,10 +148,16 @@ fn powershell_escape(s: &str) -> String {
 pub fn replace_args(x: &str, args_str: &HashMap<String, String>) -> String {
     let mut result = x.to_string();
     for (key, value) in args_str {
-        #[cfg(target_os = "windows")]
-        let escaped_value = powershell_escape(value);
-        #[cfg(not(target_os = "windows"))]
-        let escaped_value = escape(Cow::from(value.as_str())).to_string();
+        let escaped_value = if value == "" {
+            // special case for an empty paramter, we want it empty as replacement, rather than escaped empty string ""
+            "".to_string()
+        } else {
+            #[cfg(target_os = "windows")]
+            let x = powershell_escape(value);
+            #[cfg(not(target_os = "windows"))]
+            let x = escape(Cow::from(value.as_str())).to_string();
+            x
+        };
         result = result.replace(&format!("%{}%", key), &escaped_value);
     }
     result
@@ -257,7 +263,7 @@ pub async fn execute_blocking_command(
     }
 }
 
-fn parse_command_args(args: &HashMap<String, serde_json::Value>, cfg: &CmdlineToolConfig) -> Result<(String, String), String>
+fn _parse_command_args(args: &HashMap<String, serde_json::Value>, cfg: &CmdlineToolConfig) -> Result<(String, String), String>
 {
     let mut args_str: HashMap<String, String> = HashMap::new();
     let valid_params: Vec<String> = cfg.parameters.iter().map(|p| p.name.clone()).collect();
@@ -293,7 +299,7 @@ impl Tool for ToolCmdline {
         tool_call_id: &String,
         args: &HashMap<String, serde_json::Value>,
     ) -> Result<(bool, Vec<ContextEnum>), String> {
-        let (command, workdir) = parse_command_args(args, &self.cfg)?;
+        let (command, workdir) = _parse_command_args(args, &self.cfg)?;
 
         let gcx = ccx.lock().await.global_context.clone();
         let mut error_log = Vec::<YamlError>::new();
@@ -335,7 +341,7 @@ impl Tool for ToolCmdline {
         &self,
         args: &HashMap<String, serde_json::Value>,
     ) -> Result<String, String> {
-        let (command, _workdir) = parse_command_args(args, &self.cfg)?;
+        let (command, _workdir) = _parse_command_args(args, &self.cfg)?;
         return Ok(command);
     }
 
diff --git a/refact-agent/engine/src/integrations/json_schema.rs b/refact-agent/engine/src/integrations/json_schema.rs
diff --git a/refact-agent/engine/src/integrations/mod.rs b/refact-agent/engine/src/integrations/mod.rs
@@ -29,7 +29,6 @@ pub mod yaml_schema;
 pub mod setting_up_integrations;
 pub mod running_integrations;
 pub mod utils;
-pub mod json_schema;
 
 use integr_abstract::IntegrationTrait;
 
diff --git a/refact-agent/engine/src/integrations/setting_up_integrations.rs b/refact-agent/engine/src/integrations/setting_up_integrations.rs
@@ -8,9 +8,7 @@ use serde_json::{json, Value};
 use tokio::sync::RwLock as ARwLock;
 use tokio::fs as async_fs;
 use tokio::io::AsyncWriteExt;
-use jsonschema;
 use crate::global_context::GlobalContext;
-use crate::integrations::json_schema::INTEGRATION_JSON_SCHEMA;
 // use crate::tools::tools_description::Tool;
 // use crate::yaml_configs::create_configs::{integrations_enabled_cfg, read_yaml_into_value};
 
@@ -32,16 +30,6 @@ impl From<(&str, &serde_yaml::Error)> for YamlError {
     }
 }
 
-impl From<(&str, &jsonschema::ValidationError<'_>)> for YamlError {
-    fn from((path, err): (&str, &jsonschema::ValidationError)) -> Self {
-        YamlError {
-            integr_config_path: path.to_string(),
-            error_line: 0,  // ValidationError doesn't provide line numbers
-            error_msg: format!("Schema validation error: {}", err),
-        }
-    }
-}
-
 #[derive(Serialize, Default, Debug, Clone)]
 pub struct IntegrationRecord {
     pub project_path: String,
@@ -79,11 +67,7 @@ fn get_array_of_str_or_empty(val: &serde_json::Value, path: &str) -> Vec<String>
 fn parse_and_validate_yaml(path: &str, content: &String) -> Result<serde_json::Value, YamlError> {
     let value_yaml = serde_yaml::from_str::<serde_yaml::Value>(&content)
         .map_err(|e| YamlError::from((path, &e)))?;
-
     let json_value = serde_json::to_value(value_yaml.clone()).unwrap();
-    if let Err(err) = jsonschema::validate(&INTEGRATION_JSON_SCHEMA, &json_value) {
-        return Err(YamlError::from((path, &err)));
-    }
     Ok(json_value)
 }
 
@@ -103,7 +87,7 @@ pub fn read_integrations_d(
 
     // 1. Read and parse integrations.yaml (Optional, used for testing)
     // This reads the file to be used by (2) and (3), it does not create the records yet.
-    // --integrations-yaml flag disables global config dir, except for integrations 
+    // --integrations-yaml flag disables global config dir, except for integrations
     // in `globally_allowed_integrations` list in this yaml file
     let mut integrations_yaml_value = None;
     let mut globally_allowed_integration_list = if integrations_yaml_path.is_empty() {
@@ -184,7 +168,7 @@ pub fn read_integrations_d(
     }
 
     for (path_str, integr_name, project_path) in files_to_read {
-        // If --integrations-yaml is set, ignore the global config folder 
+        // If --integrations-yaml is set, ignore the global config folder
         // except for the list of integrations specified as `globally_allowed_integrations`.
         if let Some(allowed_integr_list) = &globally_allowed_integration_list {
             if project_path.is_empty() && !allowed_integr_list.contains(&integr_name) {

Original file line number	Diff line number	Diff line change
`@@ -198,7 +198,7 @@ pub async fn reload_indexing_everywhere_if_needed(gcx: Arc<ARwLock<GlobalContext`
`198`	`198`
`199`	`199`	`pub fn is_blocklisted(indexing_settings: &IndexingSettings, path: &PathBuf) -> bool {`
`200`	`200`	`let block = any_glob_matches_path(&indexing_settings.blocklist, &path);`
`201`		`- tracing::info!("is_blocklisted {:?} {:?} block={}", indexing_settings, path, block);`
	`201`	`+ // tracing::info!("is_blocklisted {:?} {:?} block={}", indexing_settings, path, block);`
`202`	`202`	`block`
`203`	`203`	`}`
`204`	`204`