Integrate ya-negotiator library (work in progress)

agent/provider/Cargo.toml

@@ -13,7 +13,6 @@ name = "ya-provider"
 path = "src/main.rs"
 
 [dependencies]
-ya-agreement-utils = { version = "^0.2"}
 ya-client = { version = "0.5", features = ['cli'] }
 ya-client-model = "0.3"
 ya-compile-time-utils = "0.2"
@@ -23,6 +22,8 @@ ya-utils-actix = "0.1"
 ya-utils-path = "0.1"
 ya-utils-process = { version = "0.1", features = ['lock'] }
 ya-std-utils = "0.1"
+ya-negotiators = { version = "0.1", path = "../../../../experiments/ya-negotiators"}
+ya-agreement-utils = { version = "0.2", path = "../../../../experiments/ya-negotiators/agreement-utils"}
 
 actix = { version = "0.10", default-features = false }
 actix-rt = "1.1.1"
@@ -39,6 +40,7 @@ dotenv = "0.15.0"
 futures = "0.3"
 futures-util = "0.3.4"
 humantime = "2.0.0"
+humantime-serde = "1"
 lazy_static = "1.4.0"
 libc = "0.2"
 log = "0.4.8"
@@ -49,6 +51,7 @@ path-clean = "0.1.0"
 semver = { version = "0.11", features = ["serde"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
+serde_yaml = "0.8"
 shared_child = "0.3.4"
 signal-hook = "0.1.13"
 structopt = "0.3.20"

agent/provider/src/execution/task_runner.rs

@@ -384,7 +384,7 @@ impl TaskRunner {
         log::debug!("[TaskRunner] Got new Agreement: {}", msg.agreement);
 
         // Agreement waits for first create activity event.
-        let agreement_id = msg.agreement.agreement_id.clone();
+        let agreement_id = msg.agreement.id.clone();
         self.active_agreements.insert(agreement_id, msg.agreement);
         Ok(())
     }

agent/provider/src/market/config.rs

@@ -1,6 +1,12 @@
+use std::path::PathBuf;
 use structopt::StructOpt;
 
-use crate::market::negotiator::factory::NegotiatorsConfig;
+use crate::startup_config::DEFAULT_DATA_DIR;
+use crate::startup_config::DEFAULT_PLUGINS_DIR;
+
+lazy_static::lazy_static! {
+    pub static ref DEFAULT_NEGOTIATORS_WORKDIR_DIR: PathBuf = default_negotiators_workdir();
+}
 
 /// Configuration for ProviderMarket actor.
 #[derive(StructOpt, Clone, Debug)]
@@ -11,10 +17,20 @@ pub struct MarketConfig {
     pub negotiation_events_interval: f32,
     #[structopt(long, env, default_value = "10.0")]
     pub agreement_approve_timeout: f32,
-    #[structopt(long, env, default_value = "Composite")]
-    pub negotiator_type: String,
-    #[structopt(flatten)]
-    pub negotiator_config: NegotiatorsConfig,
     #[structopt(skip = "you-forgot-to-set-session-id")]
     pub session_id: String,
+    /// Relative to Provider DataDir
+    #[structopt(long, env, default_value = "negotiations")]
+    pub negotiators_workdir: String,
+    /// Uses ExeUnit plugins directory by default
+    #[structopt(
+        long,
+        default_value_os = DEFAULT_PLUGINS_DIR.as_ref(),
+        required = false,
+    )]
+    pub negotiators_plugins: PathBuf,
+}
+
+fn default_negotiators_workdir() -> PathBuf {
+    PathBuf::from(&*DEFAULT_DATA_DIR).join("negotiations")
 }

agent/provider/src/market/negotiator.rs

@@ -1,15 +1,4 @@
-mod accept_all;
 pub mod builtin;
 mod common;
-mod component;
-mod composite;
-pub mod factory;
 
-pub use accept_all::AcceptAllNegotiator;
-pub use composite::CompositeNegotiator;
-
-pub use common::{
-    AgreementResponse, AgreementResult, Negotiator, NegotiatorAddr, ProposalResponse,
-};
-
-pub use component::{NegotiationResult, NegotiatorComponent, NegotiatorsPack, ProposalView};
+pub use common::AgreementResult;

agent/provider/src/market/negotiator/builtin.rs

@@ -3,3 +3,23 @@ pub mod max_agreements;
 
 pub use expiration::LimitExpiration;
 pub use max_agreements::MaxAgreements;
+
+use ya_negotiators::component::register_negotiator;
+use ya_negotiators::NegotiatorComponent;
+
+pub fn register_negotiators() {
+    register_negotiator(
+        "ya-provider",
+        "LimitExpiration",
+        Box::new(|config, _| {
+            Ok(Box::new(LimitExpiration::new(config)?) as Box<dyn NegotiatorComponent>)
+        }),
+    );
+    register_negotiator(
+        "ya-provider",
+        "LimitAgreements",
+        Box::new(|config, _| {
+            Ok(Box::new(MaxAgreements::new(config)?) as Box<dyn NegotiatorComponent>)
+        }),
+    );
+}