Skip to content

Commit f4f71c7

Browse files
Rutik7066Rutik7066
committed
ci fixes
1 parent 7e76583 commit f4f71c7

File tree

9 files changed

+44
-26
lines changed

9 files changed

+44
-26
lines changed

‎.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ jobs:
137137
- name: Build and test Ollama integration
138138
run: |
139139
set -e
140-
cargo make --cwd llm build-ollama
140+
cargo make build
141141
cd test
142142
golem-cli app build -b ollama-debug
143143
golem-cli app deploy -b ollama-debug

‎Makefile.toml

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,20 @@ skip_core_tasks = true
66
command = "cargo"
77
args = ["clean"]
88

9+
[tasks.clean-all]
10+
script_runner = "@duckscript"
11+
script = '''
12+
exec find . -type d \( -name "target" -o -name "wit-generated" -o -name "golem-temp" \) -exec rm -rf {} +
13+
'''
14+
915
[tasks.unit-tests]
1016
command = "cargo"
1117
args = ["test"]
1218

1319
[tasks.build]
1420
script_runner = "@duckscript"
1521
script = '''
16-
domains = array llm
22+
domains = array llm embed
1723
1824
# if there is no domain passed run for every domain
1925
if is_empty ${1}
@@ -28,7 +34,7 @@ end
2834
[tasks.release-build]
2935
script_runner = "@duckscript"
3036
script = '''
31-
domains = array llm
37+
domains = array llm embed
3238
3339
# if there is no domain passed run for every domain
3440
if is_empty ${1}
@@ -44,7 +50,7 @@ end
4450
script_runner = "@duckscript"
4551
script = '''
4652
#!/bin/bash
47-
domains = array llm
53+
domains = array llm embed
4854
4955
# if there is no domain passed run for every domain
5056
if is_empty ${1}
@@ -60,7 +66,7 @@ end
6066
script_runner = "@duckscript"
6167
script = '''
6268
#!/bin/bash
63-
domains = array llm
69+
domains = array llm embed
6470
6571
# if there is no domain passed run for every domain
6672
if is_empty ${1}
@@ -75,7 +81,7 @@ end
7581
[tasks.wit]
7682
script_runner = "@duckscript"
7783
script = '''
78-
domains = array llm
84+
domains = array llm embed
7985
8086
# if there is no domain passed run for every domain
8187
if is_empty ${1}
@@ -91,7 +97,7 @@ end
9197
description = "Builds all test components with golem-cli"
9298
script_runner = "@duckscript"
9399
script = '''
94-
domains = array llm
100+
domains = array llm embed
95101
96102
# if there is no domain passed run for every domain
97103
if is_empty ${1}

‎embed/cohere/src/client.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ impl EmbeddingsApi {
3838
.json(&request)
3939
.send()
4040
.map_err(|err| from_reqwest_error("Request failed", err))?;
41-
trace!("Recived response: {:#?}", response);
41+
trace!("Recived response: {response:#?}");
4242
parse_response::<EmbeddingResponse>(response)
4343
}
4444

@@ -51,7 +51,7 @@ impl EmbeddingsApi {
5151
.json(&request)
5252
.send()
5353
.map_err(|err| from_reqwest_error("Request failed", err))?;
54-
trace!("Recived response: {:#?}", response);
54+
trace!("Recived response: {response:#?}");
5555
parse_response::<RerankResponse>(response)
5656
}
5757
}
@@ -70,7 +70,7 @@ fn parse_response<T: DeserializeOwned + Debug>(response: Response) -> Result<T,
7070
trace!("Error parsing response: {error:?}");
7171
Err(Error {
7272
code: error_code_from_status(status),
73-
message: format!("Failed to decode response body: {}", response_text),
73+
message: format!("Failed to decode response body: {response_text}"),
7474
provider_error_json: Some(error.to_string()),
7575
})
7676
}

‎embed/openai/src/client.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ fn parse_response<T: DeserializeOwned + Debug>(response: Response) -> Result<T,
6060
trace!("Error parsing response: {error:?}");
6161
Err(Error {
6262
code: error_code_from_status(status),
63-
message: format!("Failed to decode response body: {}", response_text),
63+
message: format!("Failed to decode response body: {response_text}"),
6464
provider_error_json: Some(error.to_string()),
6565
})
6666
}
@@ -123,7 +123,7 @@ impl EmbeddingVector {
123123
EmbeddingVector::Base64(base64_str) => {
124124
let bytes = general_purpose::STANDARD
125125
.decode(base64_str)
126-
.map_err(|e| format!("Failed to decode base64: {}", e))?;
126+
.map_err(|e| format!("Failed to decode base64: {e}"))?;
127127

128128
if bytes.len() % 4 != 0 {
129129
return Err("Invalid base64 data: length not divisible by 4".to_string());

‎llm/llm/src/event_source/ndjson_stream.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ fn try_parse_line(
126126
return Ok(None);
127127
}
128128

129-
trace!("Parsed NDJSON line: {}", line);
129+
trace!("Parsed NDJSON line: {line}");
130130

131131
// Create a MessageEvent with the JSON line as data
132132
let event = MessageEvent {

‎llm/llm/src/event_source/stream.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ where
5656
{
5757
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
5858
match self {
59-
Self::Utf8(err) => f.write_fmt(format_args!("UTF8 error: {}", err)),
60-
Self::Parser(err) => f.write_fmt(format_args!("Parse error: {}", err)),
61-
Self::Transport(err) => f.write_fmt(format_args!("Transport error: {}", err)),
59+
Self::Utf8(err) => f.write_fmt(format_args!("UTF8 error: {err}")),
60+
Self::Parser(err) => f.write_fmt(format_args!("Parse error: {err}")),
61+
Self::Transport(err) => f.write_fmt(format_args!("Transport error: {err}"))
6262
}
6363
}
6464
}

‎test/Cargo.lock

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

‎test/components-rust/test-embed/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ path = "wit-generated"
3636

3737
[package.metadata.component.target.dependencies]
3838
"golem:embed" = { path = "wit-generated/deps/golem-embed" }
39-
"wasi:io" = { path = "wit-generated/deps/io" }
4039
"wasi:clocks" = { path = "wit-generated/deps/clocks" }
40+
"wasi:io" = { path = "wit-generated/deps/io" }
4141
"golem:rpc" = { path = "wit-generated/deps/golem-rpc" }
4242
"test:helper-client" = { path = "wit-generated/deps/test_helper-client" }
4343
"test:embed-exports" = { path = "wit-generated/deps/test_embed-exports" }

‎test/components-rust/test-embed/golem.yaml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# See https://learn.golem.cloud/docs/app-manifest#field-reference for field reference
77

88
components:
9-
test:embed:
9+
test:embed:
1010
profiles:
1111
# DEBUG PROFILES
1212
openai-debug:
@@ -22,10 +22,10 @@ components:
2222
- ../../common-rust
2323
targets:
2424
- target/wasm32-wasip1/debug/test_embed.wasm
25-
- command: wac plug --plug ../../../../target/wasm32-wasip1/debug/golem_embed_openai.wasm ../../target/wasm32-wasip1/debug/test_embed.wasm -o ../../target/wasm32-wasip1/debug/test_openai_plugged.wasm
25+
- command: wac plug --plug ../../../target/wasm32-wasip1/debug/golem_embed_openai.wasm ../../target/wasm32-wasip1/debug/test_embed.wasm -o ../../target/wasm32-wasip1/debug/test_openai_plugged.wasm
2626
sources:
2727
- ../../target/wasm32-wasip1/debug/test_embed.wasm
28-
- ../../../../target/wasm32-wasip1/debug/golem_embed_openai.wasm
28+
- ../../../target/wasm32-wasip1/debug/golem_embed_openai.wasm
2929
targets:
3030
- ../../target/wasm32-wasip1/debug/test_openai_plugged.wasm
3131
sourceWit: wit
@@ -48,10 +48,10 @@ components:
4848
- ../../common-rust
4949
targets:
5050
- target/wasm32-wasip1/debug/test_embed.wasm
51-
- command: wac plug --plug ../../../../target/wasm32-wasip1/debug/golem_embed_cohere.wasm ../../target/wasm32-wasip1/debug/test_embed.wasm -o ../../target/wasm32-wasip1/debug/test_cohere_plugged.wasm
51+
- command: wac plug --plug ../../../target/wasm32-wasip1/debug/golem_embed_cohere.wasm ../../target/wasm32-wasip1/debug/test_embed.wasm -o ../../target/wasm32-wasip1/debug/test_cohere_plugged.wasm
5252
sources:
5353
- ../../target/wasm32-wasip1/debug/test_embed.wasm
54-
- ../../../../target/wasm32-wasip1/debug/golem_embed_cohere.wasm
54+
- ../../../target/wasm32-wasip1/debug/golem_embed_cohere.wasm
5555
targets:
5656
- ../../target/wasm32-wasip1/debug/test_cohere_plugged.wasm
5757
sourceWit: wit
@@ -74,10 +74,10 @@ components:
7474
- ../../common-rust
7575
targets:
7676
- target/wasm32-wasip1/debug/test_embed.wasm
77-
- command: wac plug --plug ../../../../target/wasm32-wasip1/debug/golem_embed_hugging_face.wasm ../../target/wasm32-wasip1/debug/test_embed.wasm -o ../../target/wasm32-wasip1/debug/test_hugging_face_plugged.wasm
77+
- command: wac plug --plug ../../../target/wasm32-wasip1/debug/golem_embed_hugging_face.wasm ../../target/wasm32-wasip1/debug/test_embed.wasm -o ../../target/wasm32-wasip1/debug/test_hugging_face_plugged.wasm
7878
sources:
7979
- ../../target/wasm32-wasip1/debug/test_embed.wasm
80-
- ../../../../target/wasm32-wasip1/debug/golem_embed_hugging_face.wasm
80+
- ../../../target/wasm32-wasip1/debug/golem_embed_hugging_face.wasm
8181
targets:
8282
- ../../target/wasm32-wasip1/debug/test_hugging_face_plugged.wasm
8383
sourceWit: wit
@@ -100,10 +100,10 @@ components:
100100
- ../../common-rust
101101
targets:
102102
- target/wasm32-wasip1/debug/test_embed.wasm
103-
- command: wac plug --plug ../../../../target/wasm32-wasip1/debug/golem_embed_voyageai.wasm ../../target/wasm32-wasip1/debug/test_embed.wasm -o ../../target/wasm32-wasip1/debug/test_voyageai_plugged.wasm
103+
- command: wac plug --plug ../../../target/wasm32-wasip1/debug/golem_embed_voyageai.wasm ../../target/wasm32-wasip1/debug/test_embed.wasm -o ../../target/wasm32-wasip1/debug/test_voyageai_plugged.wasm
104104
sources:
105105
- ../../target/wasm32-wasip1/debug/test_embed.wasm
106-
- ../../../../target/wasm32-wasip1/debug/golem_embed_voyageai.wasm
106+
- ../../../target/wasm32-wasip1/debug/golem_embed_voyageai.wasm
107107
targets:
108108
- ../../target/wasm32-wasip1/debug/test_voyageai_plugged.wasm
109109
sourceWit: wit

0 commit comments

Comments
 (0)