Skip to content
This repository was archived by the owner on Aug 15, 2025. It is now read-only.

Commit 418890d

Browse files
vigoovigoo
authored
Updated to the resource-improvements branch of golem (#318)
* Updated to the resource-improvements branch of golem * Updates * Sync with golem changes * Updates * Missing file * Fixes * Fix golem-rust dep
1 parent b9a61d4 commit 418890d

File tree

25 files changed

+275
-453
lines changed

25 files changed

+275
-453
lines changed

‎Cargo.lock‎

Lines changed: 67 additions & 98 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,22 @@ license-file = "LICENSE"
1111
[workspace.dependencies]
1212

1313
# Golem dep
14-
golem-client = "=1.3.0-dev.21"
15-
golem-common = "=1.3.0-dev.21"
16-
golem-rib = "=1.3.0-dev.21"
17-
golem-rib-repl = "=1.3.0-dev.21"
18-
golem-service-base = "=1.3.0-dev.21"
19-
golem-wasm-ast = { version = "=1.3.0-dev.21", default-features = false, features = [
14+
golem-client = "=1.3.0-dev.25"
15+
golem-common = { version = "=1.3.0-dev.25", features = ["agent-extraction"] }
16+
golem-rib = "=1.3.0-dev.25"
17+
golem-rib-repl = "=1.3.0-dev.25"
18+
golem-service-base = "=1.3.0-dev.25"
19+
golem-wasm-ast = { version = "=1.3.0-dev.25", default-features = false, features = [
2020
"analysis",
2121
"wave",
2222
] }
23-
golem-wasm-rpc = { version = "=1.3.0-dev.21", default-features = false, features = [
23+
golem-wasm-rpc = { version = "=1.3.0-dev.25", default-features = false, features = [
2424
"host",
2525
] }
26-
golem-wasm-rpc-derive = "=1.3.0-dev.21"
26+
golem-wasm-rpc-derive = "=1.3.0-dev.25"
2727

2828
golem-rdbms = "=0.0.2"
29-
golem-wit = "=1.3.0-dev.5"
29+
golem-wit = "=1.3.0-dev.6"
3030

3131
# External deps
3232
anyhow = "1.0.97"
@@ -135,14 +135,14 @@ wit-encoder = "0.235"
135135
wit-parser = "0.235"
136136

137137
[patch.crates-io]
138-
golem-client = { git = "https://github.com/golemcloud/golem.git", tag = "v1.3.0-dev.21" }
139-
golem-common = { git = "https://github.com/golemcloud/golem.git", tag = "v1.3.0-dev.21" }
140-
golem-rib = { git = "https://github.com/golemcloud/golem.git", tag = "v1.3.0-dev.21" }
141-
golem-rib-repl = { git = "https://github.com/golemcloud/golem.git", tag = "v1.3.0-dev.21" }
142-
golem-service-base = { git = "https://github.com/golemcloud/golem.git", tag = "v1.3.0-dev.21" }
143-
golem-wasm-ast = { git = "https://github.com/golemcloud/golem.git", tag = "v1.3.0-dev.21" }
144-
golem-wasm-rpc = { git = "https://github.com/golemcloud/golem.git", tag = "v1.3.0-dev.21" }
145-
golem-wasm-rpc-derive = { git = "https://github.com/golemcloud/golem.git", tag = "v1.3.0-dev.21" }
138+
golem-client = { git = "https://github.com/golemcloud/golem.git", tag = "v1.3.0-dev.25" }
139+
golem-common = { git = "https://github.com/golemcloud/golem.git", tag = "v1.3.0-dev.25" }
140+
golem-rib = { git = "https://github.com/golemcloud/golem.git", tag = "v1.3.0-dev.25" }
141+
golem-rib-repl = { git = "https://github.com/golemcloud/golem.git", tag = "v1.3.0-dev.25" }
142+
golem-service-base = { git = "https://github.com/golemcloud/golem.git", tag = "v1.3.0-dev.25" }
143+
golem-wasm-ast = { git = "https://github.com/golemcloud/golem.git", tag = "v1.3.0-dev.25" }
144+
golem-wasm-rpc = { git = "https://github.com/golemcloud/golem.git", tag = "v1.3.0-dev.25" }
145+
golem-wasm-rpc-derive = { git = "https://github.com/golemcloud/golem.git", tag = "v1.3.0-dev.25" }
146146

147147
redis-protocol = { git = "https://github.com/golemcloud/redis-protocol.rs.git", branch = "unpin-cookie-factory" }
148148
wasmtime = { git = "https://github.com/golemcloud/wasmtime.git", branch = "golem-wasmtime-v33.0.0" }

‎golem-cli/agent_wrapper/guest.mbt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,3 +91,9 @@ pub fn discover_agents() -> Array[Agent] {
9191
pub fn discover_agent_types() -> Array[@common.AgentType] {
9292
@guest.discover_agent_types()
9393
}
94+
95+
///|
96+
pub fn invoke_agent(agent_type : String, agent_id : String, method_name : String, input : @common.DataValue) -> Result[@common.DataValue, @common.AgentError] {
97+
let inner_agent = @guest.get_agent(agent_type, agent_id)
98+
inner_agent.invoke(method_name, input)
99+
}

‎golem-cli/src/command_handler/partial_match.rs‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -180,10 +180,7 @@ impl ErrorHandler {
180180
{
181181
log_text_view(&AvailableFunctionNamesHelp {
182182
component_name: worker_name_match.component_name.0,
183-
function_names: show_exported_functions(
184-
component.metadata.exports.as_slice(),
185-
true,
186-
),
183+
function_names: show_exported_functions(component.metadata.exports(), true),
187184
});
188185
logln("");
189186
}

‎golem-cli/src/command_handler/rib_repl.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,15 +80,15 @@ impl RibReplHandler {
8080
let component_dependency_key = ComponentDependencyKey {
8181
component_name: component.component_name.0.clone(),
8282
component_id: component.versioned_component_id.component_id,
83-
root_package_name: component.metadata.root_package_name.clone(),
84-
root_package_version: component.metadata.root_package_version.clone(),
83+
root_package_name: component.metadata.root_package_name().clone(),
84+
root_package_version: component.metadata.root_package_version().clone(),
8585
};
8686

8787
self.ctx
8888
.set_rib_repl_dependencies(ReplComponentDependencies {
8989
component_dependencies: vec![ComponentDependency::new(
9090
component_dependency_key,
91-
component.metadata.exports.clone(),
91+
component.metadata.exports().to_vec(),
9292
)],
9393
})
9494
.await;

‎golem-cli/src/command_handler/worker/mod.rs‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ use golem_client::model::{
5757
WorkerCreationRequest as WorkerCreationRequestCloud,
5858
};
5959
use golem_common::model::public_oplog::OplogCursor;
60+
use golem_common::model::worker::WasiConfigVars;
6061
use golem_wasm_ast::analysis::AnalysedType;
6162
use golem_wasm_rpc::json::OptionallyValueAndTypeJson;
6263
use golem_wasm_rpc::{parse_value_and_type, ValueAndType};
@@ -278,15 +279,15 @@ impl WorkerCommandHandler {
278279
.await?;
279280

280281
let matched_function_name =
281-
fuzzy_match_function_name(function_name, &component.metadata.exports);
282+
fuzzy_match_function_name(function_name, component.metadata.exports());
282283
let function_name = match matched_function_name {
283284
Ok(match_) => {
284285
log_fuzzy_match(&match_);
285286
match_.option
286287
}
287288
Err(error) => {
288289
let component_functions =
289-
show_exported_functions(&component.metadata.exports, false);
290+
show_exported_functions(component.metadata.exports(), false);
290291

291292
match error {
292293
Error::Ambiguous {
@@ -808,7 +809,7 @@ impl WorkerCommandHandler {
808809
.await
809810
.map_service_error()?;
810811

811-
WorkerMetadata::from_cloud(worker_name_match.component_name, result)
812+
WorkerMetadata::from(worker_name_match.component_name, result)
812813
};
813814

814815
self.ctx
@@ -861,6 +862,7 @@ impl WorkerCommandHandler {
861862
name: worker_name,
862863
args,
863864
env,
865+
wasi_config_vars: WasiConfigVars::default(),
864866
},
865867
)
866868
.await
@@ -1001,7 +1003,7 @@ impl WorkerCommandHandler {
10011003
.await
10021004
.map_service_error()?;
10031005

1004-
Ok(WorkerMetadata::from_cloud(component_name.clone(), result))
1006+
Ok(WorkerMetadata::from(component_name.clone(), result))
10051007
}
10061008

10071009
async fn delete(&self, component_id: Uuid, worker_name: &str) -> anyhow::Result<()> {
@@ -1369,7 +1371,7 @@ impl WorkerCommandHandler {
13691371
results
13701372
.workers
13711373
.into_iter()
1372-
.map(|meta| WorkerMetadata::from_cloud(component_name.clone(), meta)),
1374+
.map(|meta| WorkerMetadata::from(component_name.clone(), meta)),
13731375
);
13741376

13751377
results.cursor

0 commit comments

Comments
 (0)