Skip to content

Commit

Permalink
Version 0.17.6 plus template changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@cybermaggedon
cybermaggedon committed Dec 5, 2024
1 parent 9db457b commit dc5b4d5
Show file tree
Hide file tree
Showing 15 changed files with 23 additions and 18 deletions.
2 changes: 1 addition & 1 deletion src/simple-editor/state/ModelParams.ts
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

const TRUSTGRAPH_VERSION = "0.16.11";
const TRUSTGRAPH_VERSION = "0.17.6";

import { create } from 'zustand'

Expand Down
2 changes: 1 addition & 1 deletion templates/components/azure-openai.jsonnet
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ local prompts = import "prompts/mixtral.jsonnet";
"-i",
"non-persistent://tg/request/text-completion-rag",
"-o",
"non-persistent://tg/response/text-completion-rag-response",
"non-persistent://tg/response/text-completion-rag",
])
.with_env_var_secrets(envSecrets)
.with_limits("0.5", "128M")
Expand Down
2 changes: 1 addition & 1 deletion templates/components/azure.jsonnet
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ local prompts = import "prompts/mixtral.jsonnet";
"-i",
"non-persistent://tg/request/text-completion-rag",
"-o",
"non-persistent://tg/response/text-completion-rag-response",
"non-persistent://tg/response/text-completion-rag",
])
.with_env_var_secrets(envSecrets)
.with_limits("0.5", "128M")
Expand Down
2 changes: 1 addition & 1 deletion templates/components/bedrock.jsonnet
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ local chunker = import "chunker-recursive.jsonnet";
"-i",
"non-persistent://tg/request/text-completion-rag",
"-o",
"non-persistent://tg/response/text-completion-rag-response",
"non-persistent://tg/response/text-completion-rag",
])
.with_env_var_secrets(envSecrets)
.with_limits("0.5", "128M")
Expand Down
2 changes: 1 addition & 1 deletion templates/components/claude.jsonnet
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ local prompts = import "prompts/mixtral.jsonnet";
"-i",
"non-persistent://tg/request/text-completion-rag",
"-o",
"non-persistent://tg/response/text-completion-rag-response",
"non-persistent://tg/response/text-completion-rag",
])
.with_env_var_secrets(envSecrets)
.with_limits("0.5", "128M")
Expand Down
2 changes: 1 addition & 1 deletion templates/components/cohere.jsonnet
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ local prompts = import "prompts/mixtral.jsonnet";
"-i",
"non-persistent://tg/request/text-completion-rag",
"-o",
"non-persistent://tg/response/text-completion-rag-response",
"non-persistent://tg/response/text-completion-rag",
])
.with_limits("0.5", "128M")
.with_reservations("0.1", "128M");
Expand Down
2 changes: 1 addition & 1 deletion templates/components/document-rag.jsonnet
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ local prompts = import "prompts/mixtral.jsonnet";
"--prompt-request-queue",
"non-persistent://tg/request/prompt-rag",
"--prompt-response-queue",
"non-persistent://tg/response/prompt-rag-response",
"non-persistent://tg/response/prompt-rag",
])
.with_limits("0.5", "128M")
.with_reservations("0.1", "128M");
Expand Down
4 changes: 2 additions & 2 deletions templates/components/googleaistudio.jsonnet
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ local prompts = import "prompts/mixtral.jsonnet";

create:: function(engine)

local envSecrets = engine.envSecrets("bedrock-credentials")
local envSecrets = engine.envSecrets("googleaistudio-key")
.with_env_var("GOOGLE_AI_STUDIO_KEY", "googleaistudio-key");

local container =
Expand Down Expand Up @@ -50,7 +50,7 @@ local prompts = import "prompts/mixtral.jsonnet";
"-i",
"non-persistent://tg/request/text-completion-rag",
"-o",
"non-persistent://tg/response/text-completion-rag-response",
"non-persistent://tg/response/text-completion-rag",
])
.with_env_var_secrets(envSecrets)
.with_limits("0.5", "128M")
Expand Down
2 changes: 1 addition & 1 deletion templates/components/graph-rag.jsonnet
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ local url = import "values/url.jsonnet";
"--prompt-request-queue",
"non-persistent://tg/request/prompt-rag",
"--prompt-response-queue",
"non-persistent://tg/response/prompt-rag-response",
"non-persistent://tg/response/prompt-rag",
"--entity-limit",
std.toString($["graph-rag-entity-limit"]),
"--triple-limit",
Expand Down
2 changes: 1 addition & 1 deletion templates/components/llamafile.jsonnet
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ local prompts = import "prompts/slm.jsonnet";
"-i",
"non-persistent://tg/request/text-completion-rag",
"-o",
"non-persistent://tg/response/text-completion-rag-response",
"non-persistent://tg/response/text-completion-rag",
])
.with_env_var_secrets(envSecrets)
.with_limits("0.5", "128M")
Expand Down
2 changes: 1 addition & 1 deletion templates/components/ollama.jsonnet
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ local prompts = import "prompts/mixtral.jsonnet";
"-i",
"non-persistent://tg/request/text-completion-rag",
"-o",
"non-persistent://tg/response/text-completion-rag-response",
"non-persistent://tg/response/text-completion-rag",
])
.with_env_var_secrets(envSecrets)
.with_limits("0.5", "128M")
Expand Down
2 changes: 1 addition & 1 deletion templates/components/openai.jsonnet
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ local prompts = import "prompts/mixtral.jsonnet";
"-i",
"non-persistent://tg/request/text-completion-rag",
"-o",
"non-persistent://tg/response/text-completion-rag-response",
"non-persistent://tg/response/text-completion-rag",
])
.with_env_var_secrets(envSecrets)
.with_limits("0.5", "128M")
Expand Down
6 changes: 3 additions & 3 deletions templates/components/prompt-template.jsonnet
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ local default_prompts = import "prompts/default-prompts.jsonnet";
"--text-completion-request-queue",
"non-persistent://tg/request/text-completion",
"--text-completion-response-queue",
"non-persistent://tg/response/text-completion-response",
"non-persistent://tg/response/text-completion",

"--system-prompt",
$["prompts"]["system-template"],
Expand Down Expand Up @@ -92,11 +92,11 @@ local default_prompts = import "prompts/default-prompts.jsonnet";
"-i",
"non-persistent://tg/request/prompt-rag",
"-o",
"non-persistent://tg/response/prompt-rag-response",
"non-persistent://tg/response/prompt-rag",
"--text-completion-request-queue",
"non-persistent://tg/request/text-completion-rag",
"--text-completion-response-queue",
"non-persistent://tg/response/text-completion-rag-response",
"non-persistent://tg/response/text-completion-rag",

"--system-prompt",
$["prompts"]["system-template"],
Expand Down
7 changes: 6 additions & 1 deletion templates/components/trustgraph.jsonnet
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ local prompt = import "prompt-template.jsonnet";

create:: function(engine)

local envSecrets = engine.envSecrets("gateway-secret")
.with_env_var("GATEWAY_SECRET", "gateway-secret");

local port = $["api-gateway-port"];

local container =
Expand All @@ -29,6 +32,7 @@ local prompt = import "prompt-template.jsonnet";
"--port",
std.toString(port),
])
.with_env_var_secrets(envSecrets)
.with_limits("0.5", "256M")
.with_reservations("0.1", "256M")
.with_port(8000, 8000, "metrics")
Expand All @@ -44,6 +48,7 @@ local prompt = import "prompt-template.jsonnet";
.with_port(port, port, "api");

engine.resources([
envSecrets,
containerSet,
service,
])
Expand Down Expand Up @@ -186,7 +191,7 @@ local prompt = import "prompt-template.jsonnet";
"-p",
url.pulsar,
"-i",
"non-persistent://tg/response/text-completion-rag-response",
"non-persistent://tg/response/text-completion-rag",
])
.with_limits("0.5", "128M")
.with_reservations("0.1", "128M");
Expand Down
2 changes: 1 addition & 1 deletion templates/components/vertexai.jsonnet
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ local prompts = import "prompts/mixtral.jsonnet";
"-i",
"non-persistent://tg/request/text-completion-rag",
"-o",
"non-persistent://tg/response/text-completion-rag-response",
"non-persistent://tg/response/text-completion-rag",
])
.with_limits("0.5", "256M")
.with_reservations("0.1", "256M")
Expand Down

0 comments on commit dc5b4d5

Please sign in to comment.