feat: Support multiple apps

Cargo.toml

@@ -1,14 +1,15 @@
 [workspace]
-members = ["macros", "serde-hack", "classification"]
+members = ["classification", "macros", "proc-macros", "scratch", "serde-hack"]
 
 [workspace.package]
-version = "0.2.0"
 edition = "2024"
 license = "MPL-2"
+version = "0.2.0"
 
 [workspace.dependencies]
 classification = { path = "./classification" }
 macros = { path = "./macros" }
+proc-macros = { path = "./proc-macros" }
 serde-hack = { path = "./serde-hack" }
 
 bbscope = "0.2"
@@ -23,60 +24,118 @@ hf-hub = "0.4"
 humantime = "2.2"
 intel-mkl-src = { version = "0.8" }
 itertools = "0.14"
-lingua = { version = "1.7", features = ["english", "russian", "chinese", "japanese", "korean"] }
+lingua = { features = [
+    "chinese",
+    "english",
+    "french",
+    "japanese",
+    "korean",
+    "russian",
+], version = "1.7" }
 multimap = "0.10"
-ractor = { version = "0.15", features = ["monitors", "async-trait"] }
-reqwest = { version = "0.12", features = ["json", ] }
-salvo = { version = "0.85", features = ["oapi", "logging", "serve-static", "affix-state", "cookie", "size-limiter"] }
-serde = { version = "1.0", features = ["derive"] }
+quote = "1.0"
+ractor = { features = ["async-trait", "monitors"], version = "0.15" }
+reqwest = { features = ["json"], version = "0.13" }
+salvo = { features = [
+    "affix-state",
+    "cookie",
+    "logging",
+    "oapi",
+    "serve-static",
+    "size-limiter",
+], version = "0.89" }
+scraper = "0.25"
+serde = { features = ["derive"], version = "1.0" }
 serde-content = "0.1"
 serde-xml-rs = "0.8.1"
 serde_json = "1.0"
 serde_repr = "0.1"
-snafu = "0.8"
+snafu = "0.9"
 str-macro = "1"
-surrealdb = { version = "2.4", features = ["kv-rocksdb", "allocator", "protocol-http", "protocol-ws", "rustls", "kv-mem"] }
+surrealdb = { features = [
+    "allocator",
+    "kv-mem",
+    "kv-rocksdb",
+    "protocol-http",
+    "protocol-ws",
+    "rustls",
+], version = "3.0" }
+surrealdb-core = "3.0"
 surrealdb-migrations = "2.2"
-tokenizers = "0.21"
-tokio = { version = "1.48", features = ["full"] }
+surrealdb-types = "3.0"
+surrealdb-types-derive = "3.0"
+syn = "2.0"
+tokenizers = "0.22"
+tokio = { features = ["full"], version = "1.48" }
 tracing = "0.1"
-tracing-subscriber = { version = "0.3.19", features = ["env-filter"] }
-veil = "0.2"
+tracing-subscriber = { features = ["env-filter"], version = "0.3.19" }
+veil = "0.3"
+paste = "1.0"
 
 [package]
-name = "workshop-walker"
-version.workspace = true
 edition.workspace = true
 license.workspace = true
+name = "workshop-walker"
+version.workspace = true
 
 [dependencies]
 bbscope.workspace = true
 biscuit-auth.workspace = true
 chrono.workspace = true
-classification = { workspace = true, optional = true }
+classification = { optional = true, workspace = true }
 config.workspace = true
 humantime.workspace = true
 itertools.workspace = true
-lingua = { workspace = true, features = ["english", "russian", "chinese", "japanese", "korean"] }
+lingua = { features = [
+    "chinese",
+    "english",
+    "japanese",
+    "korean",
+    "russian",
+], workspace = true }
 macros.workspace = true
 multimap.workspace = true
-ractor = { workspace = true, features = ["monitors", "async-trait"] }
-reqwest = { workspace = true, features = ["json", ] }
-salvo = { workspace = true, features = ["oapi", "logging", "serve-static", "affix-state", "cookie", "size-limiter"] }
-serde = { workspace = true, features = ["derive"] }
+ractor = { features = ["async-trait", "monitors"], workspace = true }
+reqwest = { features = ["json", "query"], workspace = true, version = "1.0.0" }
+salvo = { features = [
+    "affix-state",
+    "cookie",
+    "logging",
+    "oapi",
+    "serve-static",
+    "size-limiter",
+], workspace = true }
+scraper.workspace = true
+serde = { features = ["derive"], workspace = true }
 serde-content.workspace = true
 serde-hack.workspace = true
 serde-xml-rs.workspace = true
 serde_json.workspace = true
 serde_repr.workspace = true
 snafu.workspace = true
 str-macro.workspace = true
-surrealdb = { workspace = true, features = ["kv-rocksdb", "allocator", "protocol-http", "protocol-ws", "rustls", "kv-mem"] }
-surrealdb-migrations.workspace = true
-tokio = { workspace = true, features = ["rt", "rt-multi-thread", "macros", "fs", "sync"] }
-tracing-subscriber = { workspace = true, features = ["env-filter"] }
+surrealdb = { features = [
+    "allocator",
+    "kv-mem",
+    "kv-rocksdb",
+    "protocol-http",
+    "protocol-ws",
+    "rustls",
+], workspace = true }
+surrealdb-core.workspace = true
+#surrealdb-migrations.workspace = true
+surrealdb-types.workspace = true
+tokio = { features = [
+    "fs",
+    "macros",
+    "rt",
+    "rt-multi-thread",
+    "sync",
+], workspace = true }
 tracing.workspace = true
+tracing-subscriber = { features = ["env-filter"], workspace = true }
 veil.workspace = true
+surrealdb-types-derive.workspace = true
 
 [features]
 default = ["ml-classification"]
@@ -85,6 +144,9 @@ ml-classification = ["classification", "classification/mkl"]
 
 [patch.crates-io]
 surrealdb-migrations = { git = "https://github.com/disconsented/surrealdb-migrations.git" }
+surrealdb-core = { path = "../surrealdb/surrealdb/core" }
+surrealdb = { path = "../surrealdb/surrealdb" }
+surrealdb-types = { path = "../surrealdb/surrealdb/types" }
 
 [profile.release]
 lto = true
@@ -96,16 +158,16 @@ panic = 'abort'
 opt-level = 3
 
 [lints.clippy]
-lint_groups_priority = { level = "allow", priority = 0 }
-suspicious = { level = "deny", priority = 1 }
-style = { level = "deny", priority = 2 }
-perf = { level = "deny", priority = 4 }
-pedantic = { level = "deny", priority = 5 }
-correctness = { level = "deny", priority = 6 }
+allow-dbg-in-tests = { level = "allow", priority = 9 }
 complexity = { level = "warn", priority = 7 }
+correctness = { level = "deny", priority = 6 }
 dbg_macro = { level = "deny", priority = 8 }
-allow-dbg-in-tests = { level = "allow", priority = 9 }
+lint_groups_priority = { level = "allow", priority = 0 }
+pedantic = { level = "deny", priority = 5 }
+perf = { level = "deny", priority = 4 }
 pub_with_shorthand = { level = "allow", priority = 10 }
+style = { level = "deny", priority = 2 }
+suspicious = { level = "deny", priority = 1 }
 
 [target.x86_64-unknown-linux-gnu]
 rustflags = "-C target-cpu=x86-64-v3"

classification/Cargo.toml

@@ -1,23 +1,23 @@
 [package]
+edition.workspace = true
 name = "classification"
 version.workspace = true
-edition.workspace = true
 
 [dependencies]
-snafu.workspace = true
 candle-core.workspace = true
-intel-mkl-src = { workspace = true, optional = true }
-candle-transformers.workspace = true
+candle-examples.workspace = true
 candle-nn.workspace = true
+candle-transformers.workspace = true
 hf-hub.workspace = true
-tokenizers.workspace = true
-serde_json.workspace = true
-candle-examples.workspace = true
-serde = { workspace = true, features = ["derive"] }
-tracing.workspace = true
+intel-mkl-src = { optional = true, workspace = true }
 ractor.workspace = true
+serde = { features = ["derive"], workspace = true }
+serde_json.workspace = true
+snafu.workspace = true
+tokenizers.workspace = true
 tokio.workspace = true
+tracing.workspace = true
 
 [features]
 default = ["mkl"]
-mkl = ["dep:intel-mkl-src", "candle-core/mkl"]
+mkl = ["candle-core/mkl", "dep:intel-mkl-src"]

classification/src/lib.rs

@@ -4,20 +4,19 @@ pub mod actor;
 mod hub;
 mod runner;
 
-use std::backtrace::Backtrace;
-
-use snafu::{ResultExt, Snafu, whatever};
-
 const MODEL_ID: &str = "mistralai/Mistral-7B-Instruct-v0.2";
 
+use std::backtrace::Backtrace;
+
 use candle_core::{DType, Device, Tensor};
 use candle_examples::token_output_stream::TokenOutputStream;
 use candle_transformers::{
     generation::{LogitsProcessor, Sampling},
     models::mistral::Model,
 };
 use serde::{Deserialize, Serialize};
-use tokenizers::Tokenizer;
+use snafu::{ResultExt, Snafu, whatever};
+use tokenizers::tokenizer::Tokenizer;
 use tracing::{debug, instrument};
 
 #[derive(Debug, Snafu)]
@@ -87,10 +86,11 @@ pub enum Error {
 #[derive(Debug, Snafu)]
 #[snafu(whatever)]
 #[snafu(display("{message}"))]
-#[snafu(provide(opt, ref, chain, dyn std::error::Error + Send + Sync => source.as_deref()))]
+// #[snafu(provide(opt, ref, chain, dyn std::error::Error + Send + Sync =>
+// source.as_deref()))]
 pub struct WhateverAsync {
     #[snafu(source(from(Box<dyn std::error::Error + Send + Sync>, Some)))]
-    #[snafu(provide(false))]
+    // #[snafu(provide(false))]
     source: Option<Box<dyn std::error::Error + Send + Sync>>,
     message: String,
     backtrace: Backtrace,

clippy.toml

@@ -1,2 +1,4 @@
 allow-unwrap-in-tests = true
-allow-dbg-in-tests = true
+allow-dbg-in-tests = true
+allow-unwrap-types = ["std::sync::LockResult"]
+disallowed-methods = ["surrealdb_types::value::record_id::RecordId::new"]

macros/Cargo.toml

@@ -1,7 +1,11 @@
 [package]
+edition.workspace = true
 name = "macros"
 version.workspace = true
-edition.workspace = true
+
 
 [dependencies]
-serde = { version = "1.0.219", features = ["derive"] }
+serde.workspace = true
+paste.workspace = true
+serde_json.workspace = true
+proc-macros.workspace = true