subcrates, p2p done, todo models

Author: erhant

Cargo.lock

@@ -1,21 +1,15 @@
-[package]
-name = "dkn-compute"
-version = "0.2.10"
+[workspace]
+resolver = "2"
+members = ["compute", "p2p", "workflows"]
+default-members = ["compute"]
+
+[workspace.package]
 edition = "2021"
 license = "Apache-2.0"
-readme = "README.md"
-authors = ["Erhan Tezcan <[email protected]>"]
-
-# profiling build for flamegraphs
-[profile.profiling]
-inherits = "release"
-debug = true
 
-[features]
-# used by flamegraphs & instruments
-profiling = []
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
-[dependencies]
+[workspace.dependencies]
 tokio-util = { version = "0.7.10", features = ["rt"] }
 tokio = { version = "1", features = ["macros", "rt-multi-thread", "signal"] }
 parking_lot = "0.12.2"
@@ -24,55 +18,6 @@ serde_json = "1.0"
 async-trait = "0.1.81"
 reqwest = "0.12.5"
 
-# utilities
-dotenvy = "0.15.7"
-base64 = "0.22.0"
-hex = "0.4.3"
-hex-literal = "0.4.1"
-url = "2.5.0"
-urlencoding = "2.1.3"
-uuid = { version = "1.8.0", features = ["v4"] }
-rand = "0.8.5"
-
-# logging & errors
 env_logger = "0.11.3"
 log = "0.4.21"
 eyre = "0.6.12"
-
-# encryption (ecies) & signatures (ecdsa) & hashing & bloom-filters
-ecies = { version = "0.2", default-features = false, features = ["pure"] }
-libsecp256k1 = "0.7.1"
-sha2 = "0.10.8"
-sha3 = "0.10.8"
-fastbloom-rs = "0.5.9"
-
-# workflows
-ollama-workflows = { git = "https://github.com/andthattoo/ollama-workflows" }
-
-# peer-to-peer
-libp2p = { git = "https://github.com/anilaltuner/rust-libp2p.git", rev = "7ce9f9e", features = [
-    # libp2p = { version = "0.54.1", features = [
-    "dcutr",
-    "ping",
-    "relay",
-    "autonat",
-    "identify",
-    "tokio",
-    "gossipsub",
-    "mdns",
-    "noise",
-    "macros",
-    "tcp",
-    "yamux",
-    "quic",
-    "kad",
-] }
-libp2p-identity = { version = "0.2.9", features = ["secp256k1"] }
-tracing = { version = "0.1.40" }
-tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
-port_check = "0.2.1"
-
-# Vendor OpenSSL so that its easier to build cross-platform packages
-[dependencies.openssl]
-version = "*"
-features = ["vendored"]

Cargo.toml

@@ -0,0 +1,64 @@
+[package]
+name = "dkn-compute"
+version = "0.2.10"
+edition.workspace = true
+license.workspace = true
+readme = "README.md"
+authors = [
+    "Erhan Tezcan <[email protected]>",
+    "Anil Altuner <[email protected]",
+]
+
+# profiling build for flamegraphs
+[profile.profiling]
+inherits = "release"
+debug = true
+
+[features]
+# used by flamegraphs & instruments
+profiling = []
+
+[dependencies]
+tokio-util = { version = "0.7.10", features = ["rt"] }
+tokio = { version = "1", features = ["macros", "rt-multi-thread", "signal"] }
+parking_lot = "0.12.2"
+serde = { version = "1.0", features = ["derive"] }
+serde_json = "1.0"
+async-trait = "0.1.81"
+reqwest = "0.12.5"
+
+# utilities
+dotenvy = "0.15.7"
+base64 = "0.22.0"
+hex = "0.4.3"
+hex-literal = "0.4.1"
+url = "2.5.0"
+urlencoding = "2.1.3"
+uuid = { version = "1.8.0", features = ["v4"] }
+rand = "0.8.5"
+port_check = "0.2.1"
+
+# logging & errors
+env_logger.workspace = true
+log.workspace = true
+eyre.workspace = true
+tracing = { version = "0.1.40" }
+tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
+
+# encryption (ecies) & signatures (ecdsa) & hashing & bloom-filters
+ecies = { version = "0.2", default-features = false, features = ["pure"] }
+libsecp256k1 = "0.7.1"
+sha2 = "0.10.8"
+sha3 = "0.10.8"
+fastbloom-rs = "0.5.9"
+
+# workflows
+ollama-workflows = { git = "https://github.com/andthattoo/ollama-workflows" }
+
+# p2p
+dkn-p2p = { path = "../p2p" }
+
+# Vendor OpenSSL so that its easier to build cross-platform packages
+[dependencies.openssl]
+version = "*"
+features = ["vendored"]

compute/Cargo.toml

@@ -3,8 +3,8 @@ mod ollama;
 mod openai;
 
 use crate::utils::{address_in_use, crypto::to_address};
+use dkn_p2p::libp2p::Multiaddr;
 use eyre::{eyre, Result};
-use libp2p::Multiaddr;
 use libsecp256k1::{PublicKey, SecretKey};
 use models::ModelConfig;
 use ollama::OllamaConfig;

Cross.toml renamed to compute/Cross.toml

@@ -1,11 +1,7 @@
-#![allow(unused)]
-
 use eyre::{eyre, Context, Result};
 use ollama_workflows::Model;
 use serde::Deserialize;
 
-const OPENAI_API_KEY: &str = "OPENAI_API_KEY";
-
 const OPENAI_MODELS_API: &str = "https://api.openai.com/v1/models";
 
 /// [Model](https://platform.openai.com/docs/api-reference/models/object) API object.
@@ -14,16 +10,20 @@ struct OpenAIModel {
     /// The model identifier, which can be referenced in the API endpoints.
     id: String,
     /// The Unix timestamp (in seconds) when the model was created.
+    #[allow(unused)]
     created: u64,
     /// The object type, which is always "model".
+    #[allow(unused)]
     object: String,
     /// The organization that owns the model.
+    #[allow(unused)]
     owned_by: String,
 }
 
 #[derive(Debug, Clone, Deserialize)]
 struct OpenAIModelsResponse {
     data: Vec<OpenAIModel>,
+    #[allow(unused)]
     object: String,
 }
 
@@ -35,7 +35,7 @@ pub struct OpenAIConfig {
 impl OpenAIConfig {
     /// Looks at the environment variables for OpenAI API key.
     pub fn new() -> Self {
-        let api_key = std::env::var(OPENAI_API_KEY).ok();
+        let api_key = std::env::var("OPENAI_API_KEY").ok();
 
         Self { api_key }
     }