strata-cli 0.1.7 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17bd3f24bcacdbae3b7dce1d9af614e28d94d31ced0a3f9d491dccc6a0a0cc9f
-  data.tar.gz: 4ee0c2de9c22a06e6ac0c91e74f04a6a0dd9e76edcdbd2ea5f07c0b028f7fed2
+  metadata.gz: 31a0327b1b8df2f7a982ece6c882cf019322cdf6e649b8cafdf035132424a705
+  data.tar.gz: 16dbe764a144c7098574900d54fdad599727a65dbfc82fef531b6f63a59e39a7
 SHA512:
-  metadata.gz: 5932b6185ba4683a5a610866dd8bccc22216cf8974a6d03dee14bd0df843c0bb4a909fc679f9e152273059e8745e94b689da2a0688c13be44bd041953110a1cb
-  data.tar.gz: d8d3440b5b02d90bce6c1be4d0f8dd7f18129c45f2635a4119b8c55f23c1393457764479a27c89c2c06e9c377b1d5c251527ddeb6d96cd48434519baf0698022
+  metadata.gz: 2fa33f77c3082a06a9a7e3e52cbeebd5b12ed4195b621011380ed2c39d124f3ebcd28b1962f8cf1565a999e101c8df7db15ea864dafed4d778211272a5c3f250
+  data.tar.gz: b1b1250691596a599af3b3193220242fe36f50eb4c7cab83eaac18d3a59795979b4b861c11799a65588e6a077594b2ac396e45a54c4aa216421aaf6846896146

data/CHANGELOG.md

@@ -1,5 +1,30 @@
 ## [Unreleased]
 
+## [0.1.9] - 2026-05-13
+
+### Added
+
+- **Branch subcommands**: `strata branch` with `list` (local and server branches), `create`, `checkout`, and `delete` (remove a branch on the Strata server). Git helpers extended to support these flows.
+
+### Changed
+
+- **Terminal output**: Centralized printing through `Output`, reduced verbose logs from deployment monitoring and test reporting; removed `ColorHelper` in favor of shared output helpers.
+- **API client errors**: Added `ResponseErrorHandler` to centralize HTTP error handling and user-facing messages across the client and generators.
+- **AI table generation**: Updated `SYSTEM_PROMPT` for YAML model / field generation.
+
+### Fixed
+
+- **`list` command**: Correctly includes nested models in listings.
+- **Field editor**: Dimension lookup flags apply only to dimensions.
+
+## [0.1.8] - 2026-04-28
+
+### Changed
+
+- **Snowflake authentication**: Removed OAuth flow from CLI prompts and templates; Snowflake now supports `pat` and `kp` only.
+- **Databricks authentication**: Standardized on OAuth M2M (service principal) only; removed U2M flow and auth-mode selection prompt.
+- **CLI credential UX**: Added explicit guidance during Databricks credential collection that service principal `oauth_client_id` and `oauth_client_secret` are expected.
+
 ## [0.1.7] - 2026-04-23
 
 ### Added

data/README.md

@@ -342,14 +342,37 @@ my_snowflake:
   schema: PUBLIC
   role: ACCOUNTADMIN
   auth_mode: pat
+
+my_databricks:
+  adapter: databricks
+  name: Databricks Warehouse
+  host: workspace.cloud.databricks.com
+  warehouse: warehouse_id
+  catalog: main
+  schema: default
+  auth_mode: oauth_m2m
+```
+
+### Databricks authentication
+
+Databricks now requires explicit `auth_mode`.
+
+If you already have Databricks datasources, update `datasources.yml`:
+
+```yaml
+my_databricks:
+  adapter: databricks
+  auth_mode: oauth_m2m
 ```
 
+Use service principal credentials and run `strata ds auth my_databricks` to save `oauth_client_id` and `oauth_client_secret` in `.strata`.
+
 ## Supported Data Warehouse Adapters
 
 - **PostgreSQL** - Full support
 - **MySQL** - Full support
 - **SQL Server** - Full support (including Azure)
-- **Snowflake** - Full support (PAT, Key Pair, OAuth)
+- **Snowflake** - Full support (PAT, Key Pair)
 - **Athena** - AWS Athena support
 - **Trino** - Trino/Presto support
 - **DuckDB** - Embedded analytics database

data/lib/strata/cli/ai/services/table_generator.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative "../client"
+require_relative "../../output"
 require "yaml"
 
 module Strata
@@ -14,17 +15,29 @@ module Strata
             You are a semantic modeling expert for the Strata Business Intelligence platform.
             Analyze database columns and generate semantic field definitions.
 
-            You must understand that Names are extremely important in the Strata application.  When the same named dimension 
+            You must understand that Names are extremely important in the Strata application. When the same named dimension
             is mapped to multiple tables, Strata treats them as the same entity but with multiple potential tables. Strata
-            will at query generation time choose the best table.  Therefore it is extremely important to consider whether a 
-            potential dimension or measure is the same as an existing one. You can try and infer that based on the table name, 
-            column name, and the existing fields.  In general, you should use existing names for the same schema type if it makes sense.
+            will at query generation time choose the best table. Therefore it is extremely important to consider whether a
+            potential dimension or measure is the same as an existing one. You can infer that based on the table name,
+            column name, existing fields, and business context. Reuse an existing dimension name only when it represents
+            the same business concept across tables. If the same column label describes the current table's own entity,
+            lifecycle, or attributes, create a table-specific name instead of reusing a generic existing name.
+            Example:
+              existing dimension name: Record Start Date
+              table name: web_page
+              column name: record_start_date
+              dimension name: Web Page Record Start Date
+            Example:
+              existing dimension name: Country
+              table name: customer
+              column name: country
+              dimension name: Country
             The edge case is when you have a Dimension table like Customer with column first_name and another Dimension
             table called Billed Customer with first_name, then they are likely not the same. A dimension created from
             Billed Customer should be given an appropriately prefixed name: Billed Customer First Name.
 
-            Next, if the column is something highly ambigous and the current table is likely a dimension table, we should prefix 
-            then dimension name with approprite prefix based on the name of the dimension table.
+            Next, if the column is something highly ambiguous and the current table is likely a dimension table, prefix
+            the dimension name with an appropriate prefix based on the name of the dimension table.
             Example:
               table name: item_dim
               column name: color
@@ -48,8 +61,8 @@ module Strata
               Example: "State" in a geography table → ["province"]
               Example: "Customer Return Date" → [] -- name has high specificity already so no synonyms needed 
 
-            In cases where a dimension already exists (i.e. a dimension with same name exists), omit everything 
-            except the following fields: name, schema_type, data_type, expression.
+            In cases where you intentionally reuse an existing dimension name because it is the same business concept,
+            omit everything except the following fields: name, schema_type, data_type, expression.
 
             Output ONLY valid JSON array, no explanations.
           PROMPT
@@ -68,7 +81,7 @@ module Strata
           # @return [Hash, nil] Generated model data or nil if AI disabled
           def call(table_name:, columns:, datasource:, user_context: nil)
             unless ai_available?
-              warn "AI not available - using rule-based fallback"
+              Output.print_warning("AI not available - using rule-based fallback")
               return fallback_fields(columns)
             end
 
@@ -85,7 +98,7 @@ module Strata
               parse_response(response, columns)
             rescue => e
               # Fallback to basic field generation on AI error
-              warn "AI failed to generate fields: #{e.message} - performing basic field generation"
+              Output.print_warning("AI failed to generate fields: #{e.message} - performing basic field generation")
               fallback_fields(columns)
             end
           end
@@ -99,8 +112,7 @@ module Strata
           # @return [Array<Hash>] Regenerated fields
           def call_with_prompt(table_name:, columns:, datasource:, user_prompt:, current_fields:)
             unless ai_available?
-              warn "AI not available - could not use prompt mode"
-              return nil
+              raise AIError, "AI is not available - configure ai_api_key in .strata"
             end
 
             prompt = build_prompt_with_user_input(
@@ -114,8 +126,7 @@ module Strata
               response = @client.complete(prompt, system_prompt: SYSTEM_PROMPT)
               parse_response(response, columns)
             rescue => e
-              warn "AI failed to generate fields: #{e.message}"
-              nil
+              raise AIError, "AI failed to generate fields: #{e.message}"
             end
           end
 
@@ -134,7 +145,7 @@ module Strata
             end.join("\n")
 
             context_section = if existing_models_context && !existing_models_context.empty?
-              "\n\nExisting model patterns for consistency:\n#{existing_models_context}"
+              "\n\nExisting semantic model fields for naming comparison:\n#{existing_models_context}"
             else
               ""
             end
@@ -168,7 +179,7 @@ module Strata
 
             existing_models = load_existing_models_context
             context_section = if existing_models && !existing_models.empty?
-              "\n\nExisting model patterns for consistency:\n#{existing_models}"
+              "\n\nExisting semantic model fields for naming comparison:\n#{existing_models}"
             else
               ""
             end
@@ -190,17 +201,21 @@ module Strata
           def load_existing_models_context
             return nil unless Dir.exist?("models")
 
-            model_files = Dir.glob("models/**/tbl.*.yml").first(100) # Limit to 5 for performance
+            model_files = Dir.glob("models/**/tbl[._]*.yml").first(100) # Limit to 5 for performance
             return nil if model_files.empty?
 
             contexts = model_files.filter_map do |file|
               model = YAML.safe_load_file(file, permitted_classes: [Date, Time], aliases: true) || {}
               fields_summary = (model["fields"] || []).map do |f|
-                "#{f["name"]} (#{f["type"]}) data type: #{f["data_type"]}"
+                expression = f["expression"]
+                expression_sql = expression.is_a?(Hash) ? expression["sql"] : expression
+                "#{f["name"]} (#{f["type"]}) data type: #{f["data_type"]}, expression: #{expression_sql}"
               end.join("\n\t")
-              "Model: #{model["name"]} \n Fields: \n\t#{fields_summary}"
+              "Model: #{model["name"]}, physical table: #{model["physical_name"]}\n Fields: \n\t#{fields_summary}"
             rescue => e
-              warn "Failed to load model file #{file}: #{e.message}" if ENV["DEBUG"]
+              if ENV["DEBUG"]
+                Output.print_warning("Failed to load model file #{file}: #{e.message}")
+              end
               nil
             end
 

data/lib/strata/cli/api/client.rb

@@ -4,12 +4,14 @@ require "faraday"
 require "faraday/multipart"
 require "json"
 require_relative "connection_error_handler"
+require_relative "response_error_handler"
 
 module Strata
   module CLI
     module API
       class Client
         include ConnectionErrorHandler
+        include ResponseErrorHandler
 
         def initialize(server_url, api_key)
           @server_url = server_url.chomp("/")
@@ -65,6 +67,21 @@ module Strata
           deployments.first
         end
 
+        def branches(project_id)
+          response = with_connection_error_handling(@server_url) { connection.get(branches_url(project_id)) }
+          return [] if response.status == 404
+
+          handle_response(response)
+        end
+
+        def delete_branch(project_id, branch_id)
+          response = with_connection_error_handling(@server_url) { connection.delete(branch_url(project_id, branch_id)) }
+          return false if response.status == 404
+
+          handle_response(response)
+          true
+        end
+
         def create_project(name, uid, description: nil, git: nil, production_branch: "main")
           url = "#{@server_url}/api/v1/projects"
           response = with_connection_error_handling(@server_url) do
@@ -96,73 +113,16 @@ module Strata
           end
         end
 
-        def handle_response(response)
-          case response.status
-          when 200..299
-            response.body
-          when 401
-            raise Strata::CommandError, "Authentication failed. Check your API key."
-          when 403
-            raise Strata::CommandError, "Access denied. You don't have permission for this action."
-          when 404
-            raise Strata::CommandError, "Resource not found."
-          when 422
-            errors = extract_errors(response.body)
-            raise Strata::CommandError, "Validation failed: #{errors}"
-          when 500..599
-            raise Strata::CommandError, "Server error: #{response.status}"
-          else
-            raise Strata::CommandError, "Unexpected response: #{response.status}"
-          end
-        rescue Faraday::Error => e
-          raise Strata::CommandError, "Network error: #{e.message}"
+        def deployment_url(project_id, branch_id)
+          "#{@server_url}/api/v1/projects/#{project_id}/b/#{branch_id}/deploys"
         end
 
-        def extract_errors(body)
-          # Handle nil or empty body
-          return "Unknown error" if body.nil? || body.empty?
-
-          # Check if it's an HTML error page (Rails error page)
-          if body.is_a?(String) && body.include?("<!DOCTYPE html>")
-            # Try to extract error message from HTML
-            if body =~ %r{<h1[^>]*>(.*?)</h1>}
-              return "Server error: #{::Regexp.last_match(1).strip}"
-            elsif body =~ %r{<title[^>]*>(.*?)</title>}
-              return "Server error: #{::Regexp.last_match(1).strip}"
-            else
-              return "Server returned an HTML error page. Check server logs for details."
-            end
-          end
-
-          # Parse JSON string if needed
-          parsed_body = if body.is_a?(String)
-            begin
-              JSON.parse(body)
-            rescue JSON::ParserError
-              return body[0..200] # Return first 200 chars if not JSON
-            end
-          else
-            body
-          end
-
-          # Extract error messages from various formats
-          if parsed_body.is_a?(Hash)
-            if parsed_body["errors"].is_a?(Array)
-              parsed_body["errors"].join(", ")
-            elsif parsed_body["error"].is_a?(String)
-              parsed_body["error"]
-            elsif parsed_body["message"].is_a?(String)
-              parsed_body["message"]
-            else
-              parsed_body.to_json
-            end
-          else
-            parsed_body.to_s[0..200] # Limit length
-          end
+        def branches_url(project_id)
+          "#{@server_url}/api/v1/projects/#{project_id}/branches"
         end
 
-        def deployment_url(project_id, branch_id)
-          "#{@server_url}/api/v1/projects/#{project_id}/b/#{branch_id}/deploys"
+        def branch_url(project_id, branch_id)
+          "#{@server_url}/api/v1/projects/#{project_id}/b/#{branch_id}"
         end
       end
     end

data/lib/strata/cli/api/response_error_handler.rb

@@ -0,0 +1,115 @@
+# frozen_string_literal: true
+
+require "faraday"
+require "json"
+
+module Strata
+  module CLI
+    module API
+      module ResponseErrorHandler
+        DETAIL_LIMIT = 200
+
+        private
+
+        def handle_response(response)
+          case response.status
+          when 200..299
+            response.body
+          else
+            raise Strata::CommandError, response_error_message(response)
+          end
+        rescue Faraday::Error => e
+          raise Strata::CommandError, "Network error: #{e.message}"
+        end
+
+        def response_error_message(response, default_message: nil)
+          status = response.status
+          return "Server error: #{status}" if (500..599).cover?(status)
+
+          message = default_message || base_response_error_message(status)
+          details = extract_error_details(response.body)
+          return message unless details
+
+          return "#{message}: #{details}" if status == 422
+
+          "#{message} Details: #{details}"
+        end
+
+        def base_response_error_message(status)
+          case status
+          when 401
+            "Authentication failed. Check your API key."
+          when 403
+            "Access denied. You don't have permission for this action."
+          when 404
+            "Resource not found."
+          when 422
+            "Validation failed"
+          else
+            "Request failed with status #{status}."
+          end
+        end
+
+        def extract_error_details(body)
+          return nil if body.nil? || (body.respond_to?(:empty?) && body.empty?)
+
+          return extract_html_error_details(body) if body.is_a?(String) && body.include?("<!DOCTYPE html>")
+
+          parsed_body = parse_error_body(body)
+          details = details_from_parsed_body(parsed_body)
+          truncate_error_detail(details)
+        end
+
+        def extract_html_error_details(body)
+          detail = if body =~ %r{<h1[^>]*>(.*?)</h1>}m
+            ::Regexp.last_match(1)
+          elsif body =~ %r{<title[^>]*>(.*?)</title>}m
+            ::Regexp.last_match(1)
+          else
+            "Server returned an HTML error page."
+          end
+
+          truncate_error_detail(detail)
+        end
+
+        def parse_error_body(body)
+          return body unless body.is_a?(String)
+
+          JSON.parse(body)
+        rescue JSON::ParserError
+          body
+        end
+
+        def details_from_parsed_body(parsed_body)
+          case parsed_body
+          when Hash
+            parsed_body = parsed_body.transform_keys(&:to_s)
+
+            if parsed_body["errors"].is_a?(Array)
+              parsed_body["errors"].join(", ")
+            elsif parsed_body["errors"].is_a?(Hash)
+              parsed_body["errors"].flat_map do |field, messages|
+                Array(messages).map { |message| "#{field} #{message}" }
+              end.join(", ")
+            elsif parsed_body["error"].is_a?(String)
+              parsed_body["error"]
+            elsif parsed_body["message"].is_a?(String)
+              parsed_body["message"]
+            else
+              parsed_body.to_json
+            end
+          else
+            parsed_body.to_s
+          end
+        end
+
+        def truncate_error_detail(detail)
+          detail = detail.to_s.gsub(/\s+/, " ").strip
+          return nil if detail.empty?
+
+          (detail.length > DETAIL_LIMIT) ? "#{detail[0...DETAIL_LIMIT]}..." : detail
+        end
+      end
+    end
+  end
+end

data/lib/strata/cli/credentials.rb

@@ -16,8 +16,9 @@ module Strata
 
       attr_reader :adapter, :credentials
 
-      def initialize(adapter)
+      def initialize(adapter, datasource_config: nil)
         @adapter = adapter.downcase.strip
+        @datasource_config = datasource_config || {}
         @prompt = TTY::Prompt.new
       end
 
@@ -30,7 +31,7 @@ module Strata
 
         case adapter
         when "snowflake"
-          auth_mode = @prompt.select("Authentication mode:", %w[pat kp oauth], default: "pat")
+          auth_mode = @prompt.select("Authentication mode:", %w[pat kp], default: "pat")
           credentials["auth_mode"] = auth_mode
 
           case auth_mode
@@ -39,18 +40,13 @@ module Strata
           when "kp"
             credentials["username"] = @prompt.ask("Enter Username:")
             credentials["private_key"] = @prompt.ask("Enter Private Key Absolute Path:")
-          when "oauth"
-            credentials["oauth_client_id"] = @prompt.ask("OAuth Client ID:")
-            credentials["oauth_client_secret"] = @prompt.ask("OAuth Client Secret:")
-            credentials["oauth_redirect_uri"] = @prompt.ask("OAuth Redirect URI:", default: "https://localhost:3420/callback")
-            oauth_scope = @prompt.ask("OAuth Scope (optional):")
-            credentials["oauth_scope"] = oauth_scope unless oauth_scope.empty?
           end
         when "athena"
           credentials["access_key_id"] = @prompt.ask("AWS Access Key ID:")
           credentials["secret_access_key"] = @prompt.ask("AWS Secret Access Key:")
         when "databricks"
-          credentials["oauth_client_id"] = @prompt.ask("OAuth Client ID (service principal):")
+          credentials["auth_mode"] = "oauth_m2m"
+          credentials["oauth_client_id"] = @prompt.ask("OAuth Client ID:")
           credentials["oauth_client_secret"] = @prompt.ask("OAuth Client Secret:")
         else
           if required?

data/lib/strata/cli/error_reporter.rb

@@ -2,6 +2,7 @@
 
 require "fileutils"
 require "time"
+require_relative "output"
 
 module Strata
   module CLI
@@ -63,7 +64,9 @@ module Strata
           f.puts("")
         end
       rescue => e
-        warn "Failed to write CLI log: #{e.message}" if ENV["DEBUG"]
+        if ENV["DEBUG"]
+          Output.print_warning("Failed to write CLI log: #{e.message}")
+        end
       end
     end
   end

data/lib/strata/cli/generators/datasource.rb

@@ -2,6 +2,7 @@
 
 require_relative "group"
 require "open3"
+require_relative "../output"
 
 module Strata
   module CLI
@@ -24,7 +25,7 @@ module Strata
 
         def add_datasource_config
           @ds_key = get_unique_ds_key
-          say_status :adapter, "adding #{adapter} config to datasources", :yellow
+          Output.print_status(:adapter, "adding #{adapter} config to datasources", type: :warning, context: self)
 
           # Interactive mode: write config directly from prompts
           config_yaml = {@ds_key => options[:config]}.to_yaml.sub(/^---\n/, "\n")
@@ -44,12 +45,12 @@ module Strata
         end
 
         def install_duckdb_gem
-          say_status :gem, "Installing duckdb gem...", :yellow
+          Output.print_status(:gem, "Installing duckdb gem...", type: :warning, context: self)
 
           begin
             # Install the duckdb gem
             run "gem install duckdb", verbose: false, capture: true
-            say_status :success, "duckdb gem installed successfully", :green
+            Output.print_status(:success, "duckdb gem installed successfully", type: :success, context: self)
           rescue => e
             raise DWH::ConfigError, "Failed to install duckdb gem: #{e.message}"
           end

data/lib/strata/cli/generators/group.rb

@@ -1,10 +1,47 @@
 # frozen_string_literal: true
 
+require_relative "../output"
+
 module Strata
   module CLI
     module Generators
       class Group < Thor::Group
         include Thor::Actions
+        include Output
+
+        class QuietActionsShell < Thor::Shell::Color
+          DEFAULT_ALLOWED_STATUSES = %w[
+            created
+            setup
+            clone
+            success
+            adapter
+            gem
+          ].freeze
+
+          def initialize(verbose: false, allowed_statuses: DEFAULT_ALLOWED_STATUSES)
+            super()
+            @verbose = verbose
+            @allowed_statuses = allowed_statuses
+          end
+
+          def say_status(status, message, log_status = true)
+            return super if @verbose
+            return if log_status == false
+
+            s = status.to_s
+            return super if @allowed_statuses.include?(s)
+
+            nil
+          end
+        end
+
+        no_commands do
+          def initialize(*args)
+            super
+            @shell = QuietActionsShell.new(verbose: options[:verbose] == true)
+          end
+        end
 
         def self.source_root
           File.expand_path("templates/", __dir__)

data/lib/strata/cli/generators/migration.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative "group"
+require_relative "../output"
 
 module Strata
   module CLI
@@ -28,7 +29,7 @@ module Strata
           # Write the updated template
           create_file output_path, updated_content
 
-          say_status :created, output_path, :green
+          Output.print_status(:created, output_path, type: :success, context: self)
         end
 
         private