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

Updated to the resource-improvements branch of golem #318

Merged
vigoo merged 8 commits into from
Aug 15, 2025
Merged

Updated to the resource-improvements branch of golem #318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
383559c
Updated to the resource-improvements branch of golem
vigoo Aug 13, 2025
7d4c059
Updates
vigoo Aug 14, 2025
8732666
Sync with golem changes
vigoo Aug 14, 2025
1957197
Updates
vigoo Aug 15, 2025
4a5fb72
Missing file
vigoo Aug 15, 2025
ea47ba3
Merge branch 'main' into resource-improvements
vigoo Aug 15, 2025
7745432
Fixes
vigoo Aug 15, 2025
0d3d012
Fix golem-rust dep
vigoo Aug 15, 2025
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
165 changes: 67 additions & 98 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

34 changes: 17 additions & 17 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,22 +11,22 @@ license-file = "LICENSE"
[workspace.dependencies]

# Golem dep
golem-client = "=1.3.0-dev.21"
golem-common = "=1.3.0-dev.21"
golem-rib = "=1.3.0-dev.21"
golem-rib-repl = "=1.3.0-dev.21"
golem-service-base = "=1.3.0-dev.21"
golem-wasm-ast = { version = "=1.3.0-dev.21", default-features = false, features = [
golem-client = "=1.3.0-dev.25"
golem-common = { version = "=1.3.0-dev.25", features = ["agent-extraction"] }
golem-rib = "=1.3.0-dev.25"
golem-rib-repl = "=1.3.0-dev.25"
golem-service-base = "=1.3.0-dev.25"
golem-wasm-ast = { version = "=1.3.0-dev.25", default-features = false, features = [
"analysis",
"wave",
] }
golem-wasm-rpc = { version = "=1.3.0-dev.21", default-features = false, features = [
golem-wasm-rpc = { version = "=1.3.0-dev.25", default-features = false, features = [
"host",
] }
golem-wasm-rpc-derive = "=1.3.0-dev.21"
golem-wasm-rpc-derive = "=1.3.0-dev.25"

golem-rdbms = "=0.0.2"
golem-wit = "=1.3.0-dev.5"
golem-wit = "=1.3.0-dev.6"

# External deps
anyhow = "1.0.97"
Expand Down Expand Up @@ -135,14 +135,14 @@ wit-encoder = "0.235"
wit-parser = "0.235"

[patch.crates-io]
golem-client = { git = "https://github.com/golemcloud/golem.git", tag = "v1.3.0-dev.21" }
golem-common = { git = "https://github.com/golemcloud/golem.git", tag = "v1.3.0-dev.21" }
golem-rib = { git = "https://github.com/golemcloud/golem.git", tag = "v1.3.0-dev.21" }
golem-rib-repl = { git = "https://github.com/golemcloud/golem.git", tag = "v1.3.0-dev.21" }
golem-service-base = { git = "https://github.com/golemcloud/golem.git", tag = "v1.3.0-dev.21" }
golem-wasm-ast = { git = "https://github.com/golemcloud/golem.git", tag = "v1.3.0-dev.21" }
golem-wasm-rpc = { git = "https://github.com/golemcloud/golem.git", tag = "v1.3.0-dev.21" }
golem-wasm-rpc-derive = { git = "https://github.com/golemcloud/golem.git", tag = "v1.3.0-dev.21" }
golem-client = { git = "https://github.com/golemcloud/golem.git", tag = "v1.3.0-dev.25" }
golem-common = { git = "https://github.com/golemcloud/golem.git", tag = "v1.3.0-dev.25" }
golem-rib = { git = "https://github.com/golemcloud/golem.git", tag = "v1.3.0-dev.25" }
golem-rib-repl = { git = "https://github.com/golemcloud/golem.git", tag = "v1.3.0-dev.25" }
golem-service-base = { git = "https://github.com/golemcloud/golem.git", tag = "v1.3.0-dev.25" }
golem-wasm-ast = { git = "https://github.com/golemcloud/golem.git", tag = "v1.3.0-dev.25" }
golem-wasm-rpc = { git = "https://github.com/golemcloud/golem.git", tag = "v1.3.0-dev.25" }
golem-wasm-rpc-derive = { git = "https://github.com/golemcloud/golem.git", tag = "v1.3.0-dev.25" }

redis-protocol = { git = "https://github.com/golemcloud/redis-protocol.rs.git", branch = "unpin-cookie-factory" }
wasmtime = { git = "https://github.com/golemcloud/wasmtime.git", branch = "golem-wasmtime-v33.0.0" }
Expand Down
6 changes: 6 additions & 0 deletions golem-cli/agent_wrapper/guest.mbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,3 +91,9 @@ pub fn discover_agents() -> Array[Agent] {
pub fn discover_agent_types() -> Array[@common.AgentType] {
@guest.discover_agent_types()
}

///|
pub fn invoke_agent(agent_type : String, agent_id : String, method_name : String, input : @common.DataValue) -> Result[@common.DataValue, @common.AgentError] {
let inner_agent = @guest.get_agent(agent_type, agent_id)
inner_agent.invoke(method_name, input)
}
5 changes: 1 addition & 4 deletions golem-cli/src/command_handler/partial_match.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,10 +180,7 @@ impl ErrorHandler {
{
log_text_view(&AvailableFunctionNamesHelp {
component_name: worker_name_match.component_name.0,
function_names: show_exported_functions(
component.metadata.exports.as_slice(),
true,
),
function_names: show_exported_functions(component.metadata.exports(), true),
});
logln("");
}
Expand Down
6 changes: 3 additions & 3 deletions golem-cli/src/command_handler/rib_repl.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,15 +80,15 @@ impl RibReplHandler {
let component_dependency_key = ComponentDependencyKey {
component_name: component.component_name.0.clone(),
component_id: component.versioned_component_id.component_id,
root_package_name: component.metadata.root_package_name.clone(),
root_package_version: component.metadata.root_package_version.clone(),
root_package_name: component.metadata.root_package_name().clone(),
root_package_version: component.metadata.root_package_version().clone(),
};

self.ctx
.set_rib_repl_dependencies(ReplComponentDependencies {
component_dependencies: vec![ComponentDependency::new(
component_dependency_key,
component.metadata.exports.clone(),
component.metadata.exports().to_vec(),
)],
})
.await;
Expand Down
12 changes: 7 additions & 5 deletions golem-cli/src/command_handler/worker/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ use golem_client::model::{
WorkerCreationRequest as WorkerCreationRequestCloud,
};
use golem_common::model::public_oplog::OplogCursor;
use golem_common::model::worker::WasiConfigVars;
use golem_wasm_ast::analysis::AnalysedType;
use golem_wasm_rpc::json::OptionallyValueAndTypeJson;
use golem_wasm_rpc::{parse_value_and_type, ValueAndType};
Expand Down Expand Up @@ -278,15 +279,15 @@ impl WorkerCommandHandler {
.await?;

let matched_function_name =
fuzzy_match_function_name(function_name, &component.metadata.exports);
fuzzy_match_function_name(function_name, component.metadata.exports());
let function_name = match matched_function_name {
Ok(match_) => {
log_fuzzy_match(&match_);
match_.option
}
Err(error) => {
let component_functions =
show_exported_functions(&component.metadata.exports, false);
show_exported_functions(component.metadata.exports(), false);

match error {
Error::Ambiguous {
Expand Down Expand Up @@ -808,7 +809,7 @@ impl WorkerCommandHandler {
.await
.map_service_error()?;

WorkerMetadata::from_cloud(worker_name_match.component_name, result)
WorkerMetadata::from(worker_name_match.component_name, result)
};

self.ctx
Expand Down Expand Up @@ -861,6 +862,7 @@ impl WorkerCommandHandler {
name: worker_name,
args,
env,
wasi_config_vars: WasiConfigVars::default(),
},
)
.await
Expand Down Expand Up @@ -1001,7 +1003,7 @@ impl WorkerCommandHandler {
.await
.map_service_error()?;

Ok(WorkerMetadata::from_cloud(component_name.clone(), result))
Ok(WorkerMetadata::from(component_name.clone(), result))
}

async fn delete(&self, component_id: Uuid, worker_name: &str) -> anyhow::Result<()> {
Expand Down Expand Up @@ -1369,7 +1371,7 @@ impl WorkerCommandHandler {
results
.workers
.into_iter()
.map(|meta| WorkerMetadata::from_cloud(component_name.clone(), meta)),
.map(|meta| WorkerMetadata::from(component_name.clone(), meta)),
);

results.cursor
Expand Down
Loading
Loading