Skip to content

Commit

Permalink
Merge branch 'main' into cloud-407
Browse files Browse the repository at this point in the history
  • Loading branch information
joshuajerin authored Aug 17, 2024
2 parents 2d059f8 + b64fced commit ca45315
Show file tree
Hide file tree
Showing 12 changed files with 39 additions and 37 deletions.
2 changes: 1 addition & 1 deletion conductor/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM quay.io/tembo/rust:1.76-slim-bookworm as builder
FROM quay.io/tembo/rust:1.79-slim as builder

RUN apt-get update && \
apt-get install -y pkg-config libssl-dev && apt-get clean && \
Expand Down
2 changes: 1 addition & 1 deletion dataplane-webserver/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM quay.io/tembo/rust:1.77-slim
FROM quay.io/tembo/rust:1.79-slim

RUN apt-get update \
&& apt-get install -y pkg-config libssl-dev \
Expand Down
4 changes: 2 additions & 2 deletions inference-gateway/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM rust:1.77.0-slim-buster as builder
FROM rust:1.79.0-slim-buster as builder

RUN apt-get update && \
apt-get install -y pkg-config libssl-dev && apt-get clean && \
Expand All @@ -13,7 +13,7 @@ COPY migrations/ /build/migrations

RUN SQLX_OFFLINE=true cargo build --release

FROM rust:1.77.0-slim-buster
FROM rust:1.79.0-slim-buster

COPY --from=builder /build/target/release/gateway /usr/local/bin/gateway

Expand Down
11 changes: 9 additions & 2 deletions inference-gateway/src/routes/forward.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,16 @@ pub async fn forward_request(
let x_tembo_org = if let Some(header) = headers.get("X-TEMBO-ORG") {
header.to_str().unwrap()
} else {
return Err(AuthError::Forbidden("Missing request headers".to_string()).into());
return Err(
AuthError::Forbidden("Missing request header `X-TEMBO-ORG`".to_string()).into(),
);
};
let x_tembo_inst = if let Some(header) = headers.get("X-TEMBO-INSTANCE") {
header.to_str().unwrap()
} else {
return Err(AuthError::Forbidden("Missing request headers".to_string()).into());
return Err(
AuthError::Forbidden("Missing request header `X-TEMBO-INSTANCE`".to_string()).into(),
);
};

if config.org_auth_enabled {
Expand All @@ -37,6 +41,9 @@ pub async fn forward_request(
}

let path = req.uri().path();
if path.contains("embeddings") {
return Ok(HttpResponse::BadRequest().body("Embedding generation is not yet supported"));
}

let mut new_url = config.llm_service_host_port.clone();
new_url.set_path(path);
Expand Down
16 changes: 8 additions & 8 deletions tembo-cli/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions tembo-cli/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
workspace = { members = ["temboclient", "tembodataclient"] }
[package]
name = "tembo-cli"
version = "0.20.5"
version = "0.20.6"
edition = "2021"
authors = ["Tembo.io"]
description = "The CLI for Tembo"
Expand Down Expand Up @@ -37,7 +37,7 @@ serde_yaml = "0.9.17"
home = "0.5.5"
semver = "1.0.18"
mockall = "0.11.4"
toml = "0.7.6"
toml = "0.8.19"
chrono = { version = "0.4.29", features = ["serde"] }
simplelog = { version = "^0.12.1", features = ["paris"] }
clerk-rs = "0.1.7"
Expand All @@ -54,7 +54,7 @@ dateparser = "0.2.0"
log = "0.4.20"
tera = "1.18.1"
curl = "0.4.44"
temboclient = { version = "1.0.2", path = "temboclient" }
temboclient = { version = "1.0.3", path = "temboclient" }
tembodataclient = { version = "0.0.2", path = "tembodataclient" }
tokio = { version = "1.26.0", features = [
"rt",
Expand Down
7 changes: 1 addition & 6 deletions tembo-cli/src/cli/tembo_config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -103,15 +103,10 @@ fn default_extensions() -> Option<HashMap<String, Extension>> {
Some(HashMap::new())
}

fn default_as_true() -> bool {
true
}

#[derive(Serialize, Deserialize, Debug, PartialEq, Clone)]
pub struct Extension {
pub version: Option<String>,
#[serde(default = "default_as_true")]
pub enabled: bool,
pub enabled: Option<bool>,
pub trunk_project: Option<String>,
pub trunk_project_version: Option<String>,
}
Expand Down
4 changes: 2 additions & 2 deletions tembo-cli/src/cmd/apply.rs
Original file line number Diff line number Diff line change
Expand Up @@ -945,7 +945,7 @@ fn get_extensions(
database: Some("postgres".to_string()),
schema: None,
version: version,
enabled: extension.enabled,
enabled: extension.enabled.unwrap_or(false),
}];

vec_extensions.push(Extension {
Expand All @@ -971,7 +971,7 @@ fn get_extensions_controller(
database: String::new(),
schema: None,
version: None,
enabled: extension.enabled,
enabled: extension.enabled.unwrap_or(false),
});

vec_extensions.push(ControllerExtension {
Expand Down
2 changes: 1 addition & 1 deletion tembo-cli/temboclient/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "temboclient"
version = "1.0.2"
version = "1.0.3"
authors = ["OpenAPI Generator team and contributors"]
description = "Platform API for Tembo Cloud </br> </br> To find a Tembo Data API, please find it here: </br> </br> [AWS US East 1](https://api.data-1.use1.tembo.io/swagger-ui/) "
# Override this license by providing a License Object in the OpenAPI.
Expand Down
10 changes: 5 additions & 5 deletions tembo-operator/yaml/sample-dw.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
apiVersion: coredb.io/v1alpha1
kind: CoreDB
metadata:
name: tembo-dw
name: sample-dw
spec:
image: quay.io/tembo/dw-cnpg:15-a0a5ab5
image: quay.io/tembo/dw-cnpg:15-023bf95
stack:
name: DataWarehouse
runtime_config:
Expand Down Expand Up @@ -43,7 +43,7 @@ spec:
- name: multicorn
version: 2.5.0
- name: pg_tier
version: 0.0.3
version: 0.0.5
extensions:
- name: pg_stat_statements
locations:
Expand Down Expand Up @@ -71,7 +71,7 @@ spec:
locations:
- database: postgres
enabled: true
version: '1.1'
version: '0.4'
- name: redis_fdw
description: redis_fdw
locations:
Expand All @@ -95,4 +95,4 @@ spec:
locations:
- database: postgres
enabled: true
version: 0.0.3
version: 0.0.5
2 changes: 1 addition & 1 deletion tembo-stacks/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "tembo-stacks"
description = "Tembo Stacks for Postgres"
version = "0.11.7"
version = "0.12.0"
authors = ["tembo.io"]
edition = "2021"
license = "Apache-2.0"
Expand Down
10 changes: 5 additions & 5 deletions tembo-stacks/src/stacks/specs/data_warehouse.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ description: A Postgres instance equipped with configuration and extensions for
repository: "quay.io/tembo"
organization: tembo
images:
14: "dw-cnpg:14-389a437"
15: "dw-cnpg:15-389a437"
16: "dw-cnpg:16-389a437"
14: "dw-cnpg:14-c19d507"
15: "dw-cnpg:15-c19d507"
16: "dw-cnpg:16-c19d507"
stack_version: 0.1.0
postgres_config_engine: olap
postgres_config:
Expand Down Expand Up @@ -49,7 +49,7 @@ trunk_installs:
- name: multicorn
version: 2.5.0
- name: pg_tier
version: 0.0.4
version: 0.0.5
extensions:
- name: pg_stat_statements
locations:
Expand Down Expand Up @@ -106,4 +106,4 @@ extensions:
locations:
- database: postgres
enabled: true
version: 0.0.4
version: 0.0.5

0 comments on commit ca45315

Please sign in to comment.