Merge pull request #17 from trouze/feat/cll-impact

add sl support

Author: trouze

src/api/semantic_layer/mod.rs

@@ -4,20 +4,47 @@ pub mod types;
 
 /// Construct the Semantic Layer API base URL from a dbt Cloud host.
 ///
-/// Multi-tenant hosts (cloud.getdbt.com, emea.dbt.com, au.dbt.com)
-/// use the pattern `https://semantic-layer.{host}`.
+/// Multi-tenant: `https://tk626.us1.dbt.com` → `https://tk626.semantic-layer.us1.dbt.com`
+/// Legacy:       `https://cloud.getdbt.com`   → `https://semantic-layer.cloud.getdbt.com`
 pub fn semantic_layer_url(host: &str) -> String {
-    let host = host
-        .trim_start_matches("https://")
-        .trim_start_matches("http://")
-        .trim_end_matches('/');
-    format!("https://semantic-layer.{host}")
+    let host = host.trim_end_matches('/');
+
+    let (scheme, rest) = if let Some(rest) = host.strip_prefix("https://") {
+        ("https://", rest)
+    } else if let Some(rest) = host.strip_prefix("http://") {
+        ("http://", rest)
+    } else {
+        ("https://", host)
+    };
+
+    // Multi-tenant pattern: {slug}.{region}.dbt.com → {slug}.semantic-layer.{region}.dbt.com
+    // Only applies when host has the form {slug}.{region}.dbt.com (two+ segments before .dbt.com)
+    if let Some(prefix) = rest.strip_suffix(".dbt.com") {
+        if prefix.contains('.') {
+            if let Some(dot) = rest.find('.') {
+                let slug = &rest[..dot];
+                let remainder = &rest[dot + 1..];
+                return format!("{scheme}{slug}.semantic-layer.{remainder}");
+            }
+        }
+    }
+
+    // Legacy: cloud.getdbt.com → semantic-layer.cloud.getdbt.com
+    format!("{scheme}semantic-layer.{rest}")
 }
 
 #[cfg(test)]
 mod tests {
     use super::*;
 
+    #[test]
+    fn test_semantic_layer_url_multi_tenant() {
+        assert_eq!(
+            semantic_layer_url("https://tk626.us1.dbt.com"),
+            "https://tk626.semantic-layer.us1.dbt.com"
+        );
+    }
+
     #[test]
     fn test_semantic_layer_url_plain_host() {
         assert_eq!(
@@ -37,8 +64,8 @@ mod tests {
     #[test]
     fn test_semantic_layer_url_with_trailing_slash() {
         assert_eq!(
-            semantic_layer_url("https://au.dbt.com/"),
-            "https://semantic-layer.au.dbt.com"
+            semantic_layer_url("https://tk626.us1.dbt.com/"),
+            "https://tk626.semantic-layer.us1.dbt.com"
         );
     }
 }

src/cli/commands/init.rs

@@ -49,6 +49,7 @@ pub async fn exec(args: &InitArgs) -> Result<()> {
         connection: Connection {
             host: Some(host),
             token: Some(token),
+            service_token: None,
             account_id: Some(account_id),
         },
         defaults: Defaults {

src/cli/commands/mod.rs

@@ -127,17 +127,23 @@ pub async fn exec(
             println!("{}", format_output(&val, output_format));
         }
 
-        // Semantic Layer API commands
+        // Semantic Layer API commands — require a service token
         Commands::Metrics(args) => {
-            let val = metrics::exec(args, gql, config).await?;
+            let sl_token = config.service_token.as_deref().unwrap_or(&config.token);
+            let gql_sl = GraphqlClient::new(sl_token)?;
+            let val = metrics::exec(args, &gql_sl, config).await?;
             println!("{}", format_output(&val, output_format));
         }
         Commands::SavedQueries(args) => {
-            let val = saved_queries::exec(args, gql, config).await?;
+            let sl_token = config.service_token.as_deref().unwrap_or(&config.token);
+            let gql_sl = GraphqlClient::new(sl_token)?;
+            let val = saved_queries::exec(args, &gql_sl, config).await?;
             println!("{}", format_output(&val, output_format));
         }
         Commands::DimensionValues(args) => {
-            let val = dimension_values::exec(args, gql, config).await?;
+            let sl_token = config.service_token.as_deref().unwrap_or(&config.token);
+            let gql_sl = GraphqlClient::new(sl_token)?;
+            let val = dimension_values::exec(args, &gql_sl, config).await?;
             println!("{}", format_output(&val, output_format));
         }
     }

src/cli/mod.rs

@@ -51,6 +51,10 @@ pub struct GlobalOpts {
     #[arg(long, global = true, env = "DBTP_TOKEN")]
     pub token: Option<String>,
 
+    /// Semantic Layer service token (required for metrics/saved-queries/dimension-values)
+    #[arg(long, global = true, env = "DBTP_SERVICE_TOKEN")]
+    pub service_token: Option<String>,
+
     /// dbt Cloud account ID
     #[arg(long, global = true, env = "DBTP_ACCOUNT_ID")]
     pub account_id: Option<u64>,

src/core/config.rs

@@ -10,6 +10,8 @@ use super::error::{DbtpError, Result};
 pub struct Config {
     pub host: String,
     pub token: String,
+    /// Service token for the Semantic Layer API. Falls back to `token` if not set.
+    pub service_token: Option<String>,
     pub account_id: Option<u64>,
     pub project_id: Option<String>,
     pub environment_id: Option<String>,
@@ -38,6 +40,7 @@ pub struct ConfigFile {
 pub struct Connection {
     pub host: Option<String>,
     pub token: Option<String>,
+    pub service_token: Option<String>,
     pub account_id: Option<u64>,
 }
 
@@ -64,6 +67,7 @@ fn default_output() -> String {
 pub struct ConfigOverrides {
     pub host: Option<String>,
     pub token: Option<String>,
+    pub service_token: Option<String>,
     pub account_id: Option<u64>,
     pub project_id: Option<String>,
     pub environment_id: Option<String>,
@@ -163,6 +167,11 @@ pub fn load(overrides: ConfigOverrides) -> Result<Config> {
         .or(file.connection.token)
         .unwrap_or_default();
 
+    let service_token = overrides
+        .service_token
+        .or_else(|| std::env::var("DBTP_SERVICE_TOKEN").ok())
+        .or(file.connection.service_token);
+
     let account_id = overrides
         .account_id
         .or_else(|| {
@@ -186,6 +195,7 @@ pub fn load(overrides: ConfigOverrides) -> Result<Config> {
     Ok(Config {
         host,
         token,
+        service_token,
         account_id,
         project_id,
         environment_id,

src/core/graphql_client.rs

@@ -85,7 +85,7 @@ impl GraphqlClient {
     pub async fn semantic_layer(
         &self,
         host: &str,
-        environment_id: u64,
+        _environment_id: u64,
         query: &str,
         variables: Option<Value>,
     ) -> Result<Value> {
@@ -97,7 +97,6 @@ impl GraphqlClient {
         let body = json!({
             "query": query,
             "variables": variables.unwrap_or(json!({})),
-            "environmentId": environment_id,
         });
 
         let resp = self

src/main.rs

@@ -24,6 +24,7 @@ async fn run(cli: Cli) -> crate::core::error::Result<()> {
     let overrides = ConfigOverrides {
         host: cli.global.host.clone(),
         token: cli.global.token.clone(),
+        service_token: cli.global.service_token.clone(),
         account_id: cli.global.account_id,
         project_id: cli.global.project_id.clone(),
         environment_id: cli.global.environment_id.clone(),