Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Nico/more debugging logging 2 #117

Merged
merged 2 commits into from
Oct 18, 2023
+93 −36
Merged

Nico/more debugging logging 2 #117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
883e84f
more
nicarq Oct 18, 2023
43556e6
fix
nicarq Oct 18, 2023
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
6 changes: 2 additions & 4 deletions shinkai-libs/shinkai-vector-resources/src/source.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ impl VRSource {
let re = Regex::new(r"\.[^.]+$").unwrap();
let file_name_without_extension = re.replace(file_name, "");
let content_hash = UnstructuredParser::generate_data_hash(file_buffer);
// Attempt to auto-detect, else assu
// Attempt to auto-detect, else use file extension
let file_type = if let Some(f_type) = SourceFileType::detect_file_type(file_name) {
f_type
} else {
Expand All @@ -72,15 +72,13 @@ impl VRSource {

if file_name.starts_with("http") {
Ok(VRSource::new_uri_ref(&file_name_without_extension))
} else if file_name.starts_with("file") {
} else {
let file_name_without_extension = file_name_without_extension.trim_start_matches("file://");
Ok(VRSource::new_source_file_ref(
file_name_without_extension.to_string(),
file_type,
content_hash,
))
} else {
return Err(VectorResourceError::CouldNotDetectFileType(file_name.to_string()));
}
}
}
Expand Down
114 changes: 85 additions & 29 deletions src/agent/execution/job_execution_core.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use super::job_prompts::JobPromptGenerator;
use crate::agent::agent::Agent;
use crate::agent::error::AgentError;
use crate::agent::error::{AgentError, self};
use crate::agent::file_parsing::ParsingHelper;
use crate::agent::job::{Job, JobLike};
use crate::agent::job_manager::JobManager;
Expand Down Expand Up @@ -49,16 +49,49 @@ impl JobManager {
)
.await?;

let _ = JobManager::process_inference_chain(
db,
identity_secret_key,
match JobManager::process_inference_chain(
db.clone(),
clone_signature_secret_key(&identity_secret_key),
job_message.job_message,
full_job,
agent_found.clone(),
profile_name,
profile_name.clone(),
user_profile,
)
.await?;
.await
{
Ok(_) => (),
Err(e) => {
shinkai_log(
ShinkaiLogOption::JobExecution,
ShinkaiLogLevel::Error,
&format!("Error processing inference chain: {}", e),
);

let error_for_user = format!("Error processing message. More info: {}", e);

// Prepare data to save inference response to the DB
let identity_secret_key_clone = clone_signature_secret_key(&identity_secret_key);
let shinkai_message = ShinkaiMessageBuilder::job_message_from_agent(
job_id.to_string(),
error_for_user.to_string(),
identity_secret_key_clone,
profile_name.clone(),
profile_name.clone(),
)
.unwrap();

shinkai_log(
ShinkaiLogOption::JobExecution,
ShinkaiLogLevel::Debug,
format!("process_inference_chain> shinkai_message: {:?}", shinkai_message).as_str(),
);

// Save response data to DB
let mut shinkai_db = db.lock().await;
shinkai_db.add_message_to_job_inbox(&job_id.clone(), &shinkai_message)?;
}
}

return Ok(job_id.clone());
}
Expand All @@ -75,7 +108,11 @@ impl JobManager {
user_profile: Option<ShinkaiName>,
) -> Result<(), AgentError> {
let job_id = full_job.job_id().to_string();
eprintln!("process_inference_chain> full_job: {:?}", full_job);
shinkai_log(
ShinkaiLogOption::JobExecution,
ShinkaiLogLevel::Debug,
&format!("Processing job: {}", job_id),
);

// Setup initial data to get ready to call a specific inference chain
let prev_execution_context = full_job.execution_context.clone();
Expand Down Expand Up @@ -145,42 +182,61 @@ impl JobManager {
format!("Processing files_map: ... files: {}", job_message.files_inbox.len()).as_str(),
);
// TODO: later we should able to grab errors and return them to the user
let new_scope_entries = JobManager::process_files_inbox(
let new_scope_entries_result = JobManager::process_files_inbox(
db.clone(),
agent_found,
job_message.files_inbox.clone(),
profile,
save_to_db_directly,
)
.await?;
.await;

for (_, value) in new_scope_entries {
match value {
ScopeEntry::Local(local_entry) => {
if !full_job.scope.local.contains(&local_entry) {
full_job.scope.local.push(local_entry);
} else {
println!("Duplicate LocalScopeEntry detected");
}
}
ScopeEntry::Database(db_entry) => {
if !full_job.scope.database.contains(&db_entry) {
full_job.scope.database.push(db_entry);
} else {
println!("Duplicate DBScopeEntry detected");
match new_scope_entries_result {
Ok(new_scope_entries) => {
for (_, value) in new_scope_entries {
match value {
ScopeEntry::Local(local_entry) => {
if !full_job.scope.local.contains(&local_entry) {
full_job.scope.local.push(local_entry);
} else {
println!("Duplicate LocalScopeEntry detected");
}
}
ScopeEntry::Database(db_entry) => {
if !full_job.scope.database.contains(&db_entry) {
full_job.scope.database.push(db_entry);
} else {
println!("Duplicate DBScopeEntry detected");
}
}
}
}
let mut shinkai_db = db.lock().await;
shinkai_db.update_job_scope(full_job.job_id().to_string(), full_job.scope.clone())?;
}
Err(e) => {
shinkai_log(
ShinkaiLogOption::JobExecution,
ShinkaiLogLevel::Error,
format!("Error processing files: {}", e).as_str(),
);
return Err(e);
}
}
{
let mut shinkai_db = db.lock().await;
shinkai_db.update_job_scope(full_job.job_id().to_string(), full_job.scope.clone())?;
}
} else {
// TODO: move this somewhere else
let mut shinkai_db = db.lock().await;
shinkai_db.init_profile_resource_router(&profile)?;
std::mem::drop(shinkai_db); // required to avoid deadlock
match shinkai_db.init_profile_resource_router(&profile) {
Ok(_) => std::mem::drop(shinkai_db), // required to avoid deadlock
Err(e) => {
shinkai_log(
ShinkaiLogOption::JobExecution,
ShinkaiLogLevel::Error,
format!("Error initializing profile resource router: {}", e).as_str(),
);
return Err(AgentError::ShinkaiDB(e));
}
}
}

Ok(())
Expand Down
2 changes: 0 additions & 2 deletions src/agent/file_parsing.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -518,9 +518,7 @@ impl ParsingHelper {
) -> Result<DocumentVectorResource, VectorResourceError> {
// Parse pdf into groups of lines + a resource_id from the hash of the data
let grouped_text_list = Self::parse_pdf_to_string_list(buffer, average_chunk_size)?;
eprintln!("Parsed pdf into {} groups", grouped_text_list.len());
let resource_id = Self::generate_data_hash_blake3(buffer);
eprintln!("Generated resource id: {}", resource_id);
Self::parse_text(
grouped_text_list,
generator,
Expand Down
7 changes: 6 additions & 1 deletion src/agent/providers/openai.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,12 @@ impl LLMProvider for OpenAI {
});

let body = serde_json::to_string(&payload)?;
eprintln!("body api chagpt: {}", body);

shinkai_log(
ShinkaiLogOption::JobExecution,
ShinkaiLogLevel::Debug,
format!("Call API Body: {:?}", body).as_str(),
);

let res = client
.post(url)
Expand Down