Skip to content
Merged
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
7 changes: 4 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ members = [
]

[workspace.package]
version = "0.6.3"
version = "0.0.1"

[workspace.dependencies]
simple-ai-backend = { path = "packages/backend" }
simple-ai-frontend = { path = "packages/frontend" }
simple-ai-macros = { path = "packages/macros" }

dioxus = { version = "0.6.3" }
dioxus = { version = "0.7.1" }

[profile]

Expand All @@ -30,4 +30,5 @@ inherits = "dev"
[profile.android-dev]
inherits = "dev"


[profile.dev]
overflow-checks = false
6 changes: 5 additions & 1 deletion packages/backend/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,2 +1,6 @@
pub mod modules;
pub use modules::*;

pub mod prelude {
pub use super::modules::nms::*;
pub use super::modules::utils::prelude::*;
}
2 changes: 2 additions & 0 deletions packages/backend/src/modules/nms.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
pub mod create;
pub mod delete;
pub mod modify;
pub mod query;
pub mod save;

Expand Down
92 changes: 46 additions & 46 deletions packages/backend/src/modules/nms/create.rs
Original file line number Diff line number Diff line change
@@ -1,52 +1,52 @@
use crate::nms::check_name;
use crate::utils::prelude::{save::*, *};
use crate::modules::nms::check_name;
use crate::modules::utils::prelude::*;
use anyhow::Result;
use std::fs::{create_dir, File};
use std::io::Write;
use std::path::Path;

// #[cfg(feature = "desktop")]
pub fn create_node(node: Node) -> Result<(), String> {
let name = node.name.clone();

if !check_name(name.clone()) {
return Err(format!(
"Node name {} is not allowed! Please only use letters, dashes and underscores.",
name
));
}
if !Path::new("nodes/").exists() {
create_dir(Path::new("nodes/")).map_err(|e| e.to_string())?;
}
if Path::new("nodes/").join(name.clone()).exists() {
return Err(format!("A node named {} does already exist!", name));
}

create_dir(Path::new("nodes/").join(name.clone())).map_err(|e| e.to_string())?;
let meta: Metadata = node.clone().into();
let meta_toml = toml::to_string(&meta).unwrap();
let mut meta_file = File::create(Path::new("nodes/").join(name.clone()).join("meta.toml"))
.map_err(|e| e.to_string())?;
meta_file
.write_all(meta_toml.as_bytes())
.map_err(|e| e.to_string())?;

let env_hash = meta.impls[0].clone().1;
create_dir(
Path::new("nodes/")
.join(name.clone())
.join(env_hash.clone()),
)
.map_err(|e| e.to_string())?;
let node_bin = bincode::serialize(&SaveNode::from(node)).map_err(|e| e.to_string())?;
let mut node_file = File::create(
Path::new("nodes/")
.join(name)
.join(env_hash)
.join("node.bin"),
)
.map_err(|e| e.to_string())?;
node_file.write_all(&node_bin).map_err(|e| e.to_string())?;

Ok(())
}
// pub fn create_node(node: Node) -> Result<(), String> {
// let name = node.name.clone();
//
// if !check_name(name.clone()) {
// return Err(format!(
// "Node name {} is not allowed! Please only use letters, dashes and underscores.",
// name
// ));
// }
// if !Path::new("nodes/").exists() {
// create_dir(Path::new("nodes/")).map_err(|e| e.to_string())?;
// }
// if Path::new("nodes/").join(name.clone()).exists() {
// return Err(format!("A node named {} does already exist!", name));
// }
//
// create_dir(Path::new("nodes/").join(name.clone())).map_err(|e| e.to_string())?;
// let meta: Metadata = node.clone().into();
// let meta_toml = toml::to_string(&meta).unwrap();
// let mut meta_file = File::create(Path::new("nodes/").join(name.clone()).join("meta.toml"))
// .map_err(|e| e.to_string())?;
// meta_file
// .write_all(meta_toml.as_bytes())
// .map_err(|e| e.to_string())?;
//
// let env_hash = meta.impls[0].clone().1 meta.;
// create_dir(
// Path::new("nodes/")
// .join(name.clone())
// .join(env_hash.clone()),
// )
// .map_err(|e| e.to_string())?;
// let node_bin = bincode::serialize(&SaveNode::from(node)).map_err(|e| e.to_string())?;
// let mut node_file = File::create(
// Path::new("nodes/")
// .join(name)
// .join(env_hash)
// .join("node.bin"),
// )
// .map_err(|e| e.to_string())?;
// node_file.write_all(&node_bin).map_err(|e| e.to_string())?;
//
// Ok(())
// }
2 changes: 1 addition & 1 deletion packages/backend/src/modules/nms/delete.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use std::fs::{self, File};
use std::io::Write;
use std::path::Path;

use crate::utils::prelude::*;
use crate::modules::utils::prelude::*;

pub fn delete_node(name: String, version: Option<String>) -> Result<(), String> {
let node_path = Path::new("nodes/").join(&name);
Expand Down
4 changes: 2 additions & 2 deletions packages/backend/src/modules/nms/query.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use std::path::Path;

use crate::utils::prelude::{save::*, *};
use crate::modules::utils::prelude::*;
use walkdir::WalkDir;

pub fn get_all_nodes() -> Result<NodeContainer, String> {
Expand Down Expand Up @@ -31,7 +31,7 @@ pub fn get_all_nodes() -> Result<NodeContainer, String> {
}

/// This function searches through all available Nodes and returns a NodeContainer containing all Nodes available for the inferred environment.
pub fn query(query_filter: Vec<QueryFilter>) -> NodeContainer {
pub fn query_nodes(query_filter: Vec<QueryFilter>) -> NodeContainer {
let all_nodes = get_all_nodes().expect("Error walking directory!");

all_nodes
Expand Down
4 changes: 2 additions & 2 deletions packages/backend/src/modules/nms/save.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use crate::nms::check_name;
use crate::utils::prelude::{save::*, *};
use crate::modules::nms::check_name;
use crate::modules::utils::prelude::*;
use anyhow::Result;
use std::fs::{self, create_dir, create_dir_all, File};
use std::io::Write;
Expand Down
8 changes: 2 additions & 6 deletions packages/backend/src/modules/utils.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ pub mod param;
pub mod query_filter;
pub mod save_node;
pub mod save_param;
pub mod search;

pub mod prelude {
pub use super::container::*;
Expand All @@ -21,9 +20,6 @@ pub mod prelude {
pub use super::node::*;
pub use super::param::*;
pub use super::query_filter::*;
pub use super::search::*;
pub mod save {
pub use super::super::save_node::*;
pub use super::super::save_param::*;
}
pub use super::save_node::*;
pub use super::save_param::*;
}
5 changes: 3 additions & 2 deletions packages/backend/src/modules/utils/node.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use super::prelude::{save::*, *};
use super::prelude::*;
use derive_builder::Builder;
use std::collections::HashMap;
// -------------------- NODE KIND -------------------- //
Expand All @@ -7,19 +7,20 @@ pub enum NodeKind {
Code { code: String },
Bundled { bundle: NodeContainer },
}

// -------------------- NODE -------------------- //
pub type StrongNode = StrongContext<Node>;
pub type WeakNode = WeakContext<Node>;

#[derive(Builder, Clone, PartialEq)]
pub struct Node {
#[builder(setter(into))]
pub name: String,
pub params: Vec<StrongParam>,
pub version: Version,
pub kind: NodeKind,
pub description: String,
pub author: String,
#[builder(default)]
pub compiled: Option<String>, // or and bytes...
pub date: Date,
#[builder(default)]
Expand Down
2 changes: 1 addition & 1 deletion packages/backend/src/modules/utils/query_filter.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use crate::utils::prelude::*;
use crate::modules::utils::prelude::*;
use fuzzy_matcher::{skim::SkimMatcherV2, FuzzyMatcher};

// ---------------- QUERY FILTER ---------------- //
Expand Down
2 changes: 1 addition & 1 deletion packages/backend/src/modules/utils/save_node.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use super::prelude::{save::*, *};
use super::prelude::*;
use derive_builder::Builder;
use serde::{Deserialize, Serialize};
// -------------------- SAVE NODES -------------------- //
Expand Down
28 changes: 0 additions & 28 deletions packages/backend/src/modules/utils/search.rs

This file was deleted.

25 changes: 14 additions & 11 deletions packages/frontend/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,17 @@ edition = "2021"
dioxus = { workspace = true, features = ["router"]}
simple-ai-backend = { workspace = true }
simple-ai-macros = { workspace = true }
async-recursion = { version = "1.1.1" }
futures = "0.3.31"
reqwest = { version = "0.12.9", features = ["json"] }
serde = { version = "1.0.215", features = ["derive"] }
serde_json = { version = "1.0.133" }
toml = { version = "0.8.19" }
anyhow = { version = "1.0.95" }
colored = { version = "3.0.0" }
regex = { version = "1.11.1" }
derive-new = { version = "0.7.0" }
derive_builder = { version = "0.20.2" }
async-recursion = { version = "1.1" }
futures = "0.3"
reqwest = { version = "0.12", features = ["json"] }
change-case = { version = "0.2" }
serde = { version = "1.0", features = ["derive"] }
serde_json = { version = "1.0" }
toml = { version = "0.9" }
anyhow = { version = "1.0" }
colored = { version = "3.0" }
regex = { version = "1.11" }
derive-new = { version = "0.7" }
derive_builder = { version = "0.20" }
chrono = { version = "0.4" }
tokio = { version = "1.43", features = ["rt"]}
1 change: 1 addition & 0 deletions packages/frontend/Elements.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
page_as_entry = true
Loading
Loading