Skip to content

Commit 60939e0

Browse files
committed
Merge branch 'main' into dev
# Conflicts: # Makefile.toml
2 parents 52c1615 + 034354b commit 60939e0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+11259
-9
lines changed

.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -383,4 +383,4 @@ jobs:
383383
- name: Login GH CLI
384384
shell: bash
385385
run: gh auth login --with-token < <(echo ${{ secrets.GITHUB_TOKEN }})
386-
- run: gh release upload -R golemcloud/golem-llm --clobber ${{ github.ref_name }} components/release/*.wasm
386+
- run: gh release upload -R golemcloud/golem-llm --clobber ${{ github.ref_name }} components/release/*.wasm

Cargo.lock

Lines changed: 95 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@ members = [
99
"llm/ollama",
1010
"llm/openai",
1111
"llm/openrouter",
12+
"embed/embed",
13+
"embed/cohere",
14+
"embed/hugging-face",
15+
"embed/openai",
16+
"embed/voyageai",
1217
"websearch/websearch",
1318
"websearch/brave",
1419
"websearch/google",
@@ -49,6 +54,7 @@ golem-search = { path = "search/search", version = "0.0.0", default-features = f
4954
golem-graph = { path = "graph/graph", version = "0.0.0", default-features = false }
5055
golem-video = { path = "video/video", version = "0.0.0", default-features = false }
5156
golem-stt = { path = "stt/stt", version = "0.0.0", default-features = false }
57+
golem-embed = { path = "embed/embed", version = "0.0.0", default-features = false}
5258
futures = "0.3.31"
5359
golem-rust = "=1.8.1"
5460
log = "0.4.27"

Makefile.toml

Lines changed: 52 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,12 @@ 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"]
@@ -14,7 +20,7 @@ args = ["test"]
1420
script_runner = "@duckscript"
1521
script = '''
1622
17-
domains = array llm websearch search video exec graph stt
23+
domains = array llm embed websearch search video exec graph stt
1824
1925
# if there is no domain passed run for every domain
2026
if is_empty ${1}
@@ -30,7 +36,7 @@ end
3036
script_runner = "@duckscript"
3137
script = '''
3238
33-
domains = array llm websearch search video exec graph stt
39+
domains = array llm embed websearch search video exec graph stt
3440
3541
# if there is no domain passed run for every domain
3642
if is_empty ${1}
@@ -46,7 +52,7 @@ end
4652
script_runner = "@duckscript"
4753
script = '''
4854
#!/bin/bash
49-
domains = array llm websearch search video exec graph stt
55+
domains = array llm embed websearch search video exec graph stt
5056
5157
# if there is no domain passed run for every domain
5258
if is_empty ${1}
@@ -62,7 +68,7 @@ end
6268
script_runner = "@duckscript"
6369
script = '''
6470
#!/bin/bash
65-
domains = array llm websearch search video exec graph stt
71+
domains = array llm embed websearch search video exec graph stt
6672
6773
# if there is no domain passed run for every domain
6874
if is_empty ${1}
@@ -77,7 +83,7 @@ end
7783
[tasks.wit]
7884
script_runner = "@duckscript"
7985
script = '''
80-
domains = array llm websearch search video exec graph stt
86+
domains = array llm embed websearch search video exec graph stt
8187
8288
# if there is no domain passed run for every domain
8389
if is_empty ${1}
@@ -93,7 +99,7 @@ end
9399
description = "Builds all test components with golem-cli"
94100
script_runner = "@duckscript"
95101
script = '''
96-
domains = array llm websearch search video exec graph stt
102+
domains = array llm embed websearch search video exec graph stt
97103
98104
# if there is no domain passed run for every domain
99105
if is_empty ${1}
@@ -204,6 +210,26 @@ else
204210
cp target/debug/golem_exec_javascript.wasm components/debug/golem_exec_javascript.wasm
205211
end
206212
end
213+
214+
215+
216+
embed_targets = array embed_openai embed_cohere embed_hugging_face embed_voyageai
217+
218+
for target in ${embed_targets}
219+
if ${is_portable}
220+
if ${is_dev}
221+
cp target/wasm32-wasip1/debug/golem_${target}.wasm components/debug/golem_${target}-portable-dev.wasm
222+
else
223+
cp target/wasm32-wasip1/debug/golem_${target}.wasm components/debug/golem_${target}-portable.wasm
224+
end
225+
else
226+
if ${is_dev}
227+
cp target/wasm32-wasip1/debug/golem_${target}.wasm components/debug/golem_${target}-dev.wasm
228+
else
229+
cp target/wasm32-wasip1/debug/golem_${target}.wasm components/debug/golem_${target}.wasm
230+
end
231+
end
232+
end
207233
'''
208234

209235
[tasks.copy-release-artifacts]
@@ -216,7 +242,7 @@ environment = get_env "ENVIRONMENT"
216242
is_dev = eq ${environment} "dev"
217243
218244
219-
targets = array llm_openai llm_anthropic llm_grok llm_openrouter llm_ollama web_search_brave web_search_google web_search_serper web_search_tavily search_algolia search_elasticsearch search_meilisearch search_opensearch search_typesense video_kling video_runway video_veo video_stability graph_arangodb graph_janusgraph graph_neo4j stt_aws stt_azure stt_deepgram stt_google stt_whisper
245+
targets = array llm_openai llm_anthropic llm_grok llm_openrouter llm_ollama web_search_brave web_search_google web_search_serper web_search_tavily search_algolia search_elasticsearch search_meilisearch search_opensearch search_typesense video_kling video_runway video_veo video_stability graph_arangodb graph_janusgraph graph_neo4j stt_aws stt_azure stt_deepgram stt_google stt_whisper
220246
221247
for target in ${targets}
222248
echo "Copying artifacts for ${target}..."
@@ -257,6 +283,25 @@ else
257283
cp target/release/golem_exec_javascript.wasm components/release/golem_exec_javascript.wasm
258284
end
259285
end
286+
287+
288+
embed_targets = array embed_openai embed_cohere embed_hugging_face embed_voyageai
289+
290+
for target in ${embed_targets}
291+
if ${is_portable}
292+
if ${is_dev}
293+
cp target/wasm32-wasip1/release/golem_${target}.wasm components/release/golem_${target}-portable-dev.wasm
294+
else
295+
cp target/wasm32-wasip1/release/golem_${target}.wasm components/release/golem_${target}-portable.wasm
296+
end
297+
else
298+
if ${is_dev}
299+
cp target/wasm32-wasip1/release/golem_${target}.wasm components/release/golem_${target}-dev.wasm
300+
else
301+
cp target/wasm32-wasip1/release/golem_${target}.wasm components/release/golem_${target}.wasm
302+
end
303+
end
304+
end
260305
'''
261306

262307
# Maintenance tasks

0 commit comments

Comments
 (0)