superset 0.2.7 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6b2b4cb255df5113b61de937f565c6f004c5df347bb047f0c47e6f1c06eadd2
-  data.tar.gz: a34377f58a2dbbfc0bcbcf7a897bee918760707c01b33c41d1119af0d940840d
+  metadata.gz: f9be8bc52c7852af239721ed6e260a12e068bb35042ae0d7a78507d39c498017
+  data.tar.gz: 3ddd9c26deca3cc72bd046d83435d22383f2986cee3bcfdebe9e4db0f0749ea3
 SHA512:
-  metadata.gz: c734a5177395f6981fa7733ee0a6c44c1839ca080eb18ad9c4c6e8d12f7adb2948f7710c5d5d2c13015c855cce03169b0ddf5b93254e17929173e3a81503501b
-  data.tar.gz: 3db00f88ca7dd063ace17729b41cc5c5c7e30b3b77ef37a15ccee83873cbe02caf1460bd30b397a4d28a7d3971179f57d9b0194a186ebf05b194e90a050ed650
+  metadata.gz: b1e1e71dace1acffd37407100c583f9bb61e29fcffafabdd13bcad834c49366b190a068fbe90b529c809e3c8d786afb9a370656ac47d96adfd740985dbbe9917
+  data.tar.gz: bee9ae33375f128d4d9abc11259d9f300ac281c188ec90c26088af85c8620e10350ba44a1f1645403b9994fcadc8760e79d94098e373a2a07666f6991dee418a

data/.rubocop.yml

@@ -1,5 +1,5 @@
 AllCops:
-  TargetRubyVersion: 2.6
+  TargetRubyVersion: 3.0
 
 Style/StringLiterals:
   Enabled: true

data/.ruby-version

@@ -1 +1 @@
-2.7.8
+3.4.4

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 ## Change Log
 
+## 0.3.0 - 2025-11-26
+* Rename reserved object_id to target_id in https://github.com/rdytech/superset-client/pull/58
+* Add dashboard cascade ownship in https://github.com/rdytech/superset-client/pull/59
+* allow dup dashboard dataset suffix naming override in https://github.com/rdytech/superset-client/pull/61
+* Bump ruby 3 bump gems by https://github.com/rdytech/superset-client/pull/60
+
+
 ## 0.2.7 - 2025-10-16
 * add to_h method to list classes for Hash output
 * add ids method to list classes for array of ids output

data/Dockerfile

@@ -1,5 +1,5 @@
-# 1: Use ruby 2.7 as base:
-FROM ruby:2.7
+# 1: Use ruby 3.4.4 as base:
+FROM ruby:3.4.4
 
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \

data/README.md

@@ -22,11 +22,14 @@ Build, bundle and open a ruby console
 docker-compose build
 docker-compose run --rm app bundle install
 docker-compose run --rm app bin/console
+
+# note .. windows users may need to call ruby the bin/console file
+docker-compose run --rm app ruby bin/console
 ```
 
-## Setup Locally ( no docker ) 
+## Setup Locally ( no docker )
 
-Requires Ruby >= 2.6.0 
+Requires Ruby >= 3
 
 Bundle install and open a ruby console.
 
@@ -37,7 +40,7 @@ bin/console
 
 ## Including in a Ruby app
 
-Add to your Gemfile `gem 'superset'`  
+Add to your Gemfile `gem 'superset'`
 And then execute: `bundle install`  
 Or install it yourself as `gem install superset`
 

data/doc/duplicate_dashboards.md

@@ -36,7 +36,7 @@ then you could go ahead and run something like this.
 ```ruby
 Superset::Services::DuplicateDashboard.new(
     source_dashboard_id: 90,
-    target_schema: 'public',
+    target_schema: 'client_1',
     target_database_id: 2
   ).perform
 
@@ -47,12 +47,12 @@ Superset::Services::DuplicateDashboard.new(
 # cat log/superset-client.log
 # INFO -- : >>>>>>>>>>>>>>>>> Starting DuplicateDashboard Service <<<<<<<<<<<<<<<<<<<<<<
 # INFO -- : Source Dashboard URL: https://your-superset-host/superset/dashboard/90/
-# INFO -- : Duplicating dashboard 90 into Target Schema: public in database 2
+# INFO -- : Duplicating dashboard 90 into Target Schema: client_1 in database 2
 # INFO -- :   Copy Dashboard/Charts Completed - New Dashboard ID: 401
 # INFO -- : Duplicating Source Dataset examples.video_game_sales with id 11
-# INFO -- :     Finished. Duplicate Dataset Name video_game_sales-example_two with id 542
-# INFO -- :     Validating Dataset ID: 542 schema update to public on Database: 2
-# INFO -- :     Successfully updated dataset schema to public on Database: 2
+# INFO -- :     Finished. Duplicate Dataset Name video_game_sales-example_two-client_1 with id 542
+# INFO -- :     Validating Dataset ID: 542 schema update to client_1 on Database: 2
+# INFO -- :     Successfully updated dataset schema to client_1 on Database: 2
 # INFO -- : Updating Charts to point to New Datasets and updating Dashboard json_metadata ...
 # INFO -- :   Update Chart 55752 to new dataset_id 542
 # INFO -- :   Updated new Dashboard json_metadata charts with new dataset ids
@@ -71,14 +71,53 @@ If your using the embedded dashboards you can also provied attributes for
 ```ruby
 Superset::Services::DuplicateDashboard.new(
     source_dashboard_id: 37,
-    target_schema: 'public',
+    target_schema: 'client_1',
     target_database_id: 2,
     allowed_domains: ["https://wylee-coyote-domain/"],
     tags: ["product:acme_fu", "client:wylee_coyote", "embedded"],
     publish: true
   ).perform
+
+
+
+```
+
+## Duplication when DB schemas are not used
+
+If your multitenant setup is at the database level, and database structures are replicated into the same base schema, ie public,
+then the target resulted datasets name must be overridden in order to get around the superset unique datasets name validation restriction.  This can be done through the parameter 'target_dataset_suffix_override'.
+
+```ruby
+Superset::Services::DuplicateDashboard.new(
+    source_dashboard_id: 90,
+    target_schema: 'public',
+    target_database_id: 2,
+    target_dataset_suffix_override: 'client_1' 
+  ).perform
+
 ```
 
+## Duplication now supports catalogs
+
+If you Database infrastructure uses catalogs, you can provide the target catalog as a paramater.
+If there is only 1 catalog in the target database, then it will be used by default.
+
+If multiple catalogs exist, and no catalog option is provided, an error will be raised.
+
+```ruby
+Superset::Services::DuplicateDashboard.new(
+    source_dashboard_id: 90,
+    target_schema: 'public',
+    target_database_id: 2,
+    target_dataset_suffix_override: 'client_1',
+    target_catalog_name: 'staging_client_1',
+  ).perform
+
+```
+
+
+
+
 ### What is my Database ID ?
 
 ``` ruby

data/lib/superset/base_put_request.rb

@@ -1,9 +1,9 @@
 module Superset
   class BasePutRequest < Superset::Request
-    attr_reader :object_id, :params
+    attr_reader :target_id, :params
 
-    def initialize(object_id: ,params: )
-      @object_id = object_id
+    def initialize(target_id: ,params: )
+      @target_id = target_id
       @params = params
     end
 
@@ -19,7 +19,7 @@ module Superset
     private
 
     def validate
-      raise "Error: object_id integer is required" unless object_id.present? && object_id.is_a?(Integer)
+      raise "Error: target_id integer is required" unless target_id.present? && target_id.is_a?(Integer)
       raise "Error: params hash is required" unless params.present? && params.is_a?(Hash)
     end
 

data/lib/superset/chart/bulk_delete.rb

@@ -18,7 +18,7 @@ module Superset
         raise InvalidParameterError, "chart_ids array of integers expected" unless chart_ids.is_a?(Array)
         raise InvalidParameterError, "chart_ids array must contain Integer only values" unless chart_ids.all? { |item| item.is_a?(Integer) }
 
-        logger.info("Attempting to delete charts with id: #{chart_ids.join(', ')}")
+        logger.info("Deleting charts with id: #{chart_ids.join(', ')}")
         response
       end
 

data/lib/superset/chart/delete.rb

@@ -12,7 +12,7 @@ module Superset
       def perform
         raise InvalidParameterError, "chart_id integer is required" unless chart_id.present? && chart_id.is_a?(Integer)
 
-        logger.info("Attempting to delete chart with id: #{chart_id}")
+        logger.info("Deleting chart with id: #{chart_id}")
         response
       end
 

data/lib/superset/chart/get.rb

@@ -17,28 +17,24 @@ module Superset
         self
       end
 
-      def result
-        [ super ]
-      end
-
       def datasource_id
-        if result.first['query_context'].present? && JSON.parse(result.first['query_context'])['datasource'].present?
-          JSON.parse(result.first['query_context'])['datasource']['id']
-        elsif result.first['params'].present? && JSON.parse(result.first['params'])['datasource'].present?
-          JSON.parse(result.first['params'])['datasource'].match(/^\d+/)[0].to_i
+        if result['query_context'].present? && JSON.parse(result['query_context'])['datasource'].present?
+          JSON.parse(result['query_context'])['datasource']['id']
+        elsif result['params'].present? && JSON.parse(result['params'])['datasource'].present?
+          JSON.parse(result['params'])['datasource'].match(/^\d+/)[0].to_i
         end
       end
 
       def owner_ids
-        result.first['owners'].map{|o| o['id']}
+        result['owners'].map{|o| o['id']}
       end
 
       def params
-        JSON.parse(result.first['params']) if result.first['params'].present?
+        JSON.parse(result['params']) if result['params'].present?
       end
 
       def query_context
-        JSON.parse(result.first['query_context']) if result.first['query_context'].present?
+        JSON.parse(result['query_context']) if result['query_context'].present?
       end
 
       private

data/lib/superset/chart/put.rb

@@ -2,7 +2,7 @@
 #
 # Usage:
 # params = { owners: [ 58, 3 ] }
-# Superset::Chart::Put.new(object_id: 202, params: params ).perform
+# Superset::Chart::Put.new(target_id: 202, params: params ).perform
 
 module Superset
   module Chart
@@ -11,7 +11,7 @@ module Superset
       private
 
       def route
-        "chart/#{object_id}"
+        "chart/#{target_id}"
       end
     end
   end

data/lib/superset/dashboard/bulk_delete.rb

@@ -20,7 +20,7 @@ module Superset
         raise InvalidParameterError, "dashboard_ids array of integers expected" unless dashboard_ids.is_a?(Array)
         raise InvalidParameterError, "dashboard_ids array must contain Integer only values" unless dashboard_ids.all? { |item| item.is_a?(Integer) }
 
-        logger.info("Attempting to delete dashboards with id: #{dashboard_ids.join(', ')}")
+        logger.info("Deleting dashboards with id: #{dashboard_ids.join(', ')}")
         response
       end
 

data/lib/superset/dashboard/cascade_ownership/add_new_owner.rb

@@ -0,0 +1,54 @@
+module Superset
+  module Dashboard
+    module CascadeOwnership
+      class AddNewOwner < Superset::Request
+        attr_reader :dashboard_id, :user_id
+
+        def initialize(dashboard_id:, user_id:)
+          @dashboard_id = dashboard_id
+          @user_id = user_id
+        end
+
+        def perform
+          raise "Error: dashboard_id integer is required" unless dashboard_id.present? && dashboard_id.is_a?(Integer)
+          raise "Error: user_id integer is required" unless user_id.present? && user_id.is_a?(Integer)
+
+          add_user_to_dashboard_ownership
+          add_user_to_charts_ownership
+          add_user_to_datasets_ownership
+        end
+
+        private
+
+        def add_user_to_dashboard_ownership
+          return if current_dashboard_owner_ids.include?(user_id)
+          Superset::Dashboard::Put.new(target_id: dashboard_id, params: { "owners":  current_dashboard_owner_ids << user_id }).perform
+        end
+
+        def add_user_to_charts_ownership
+          chart_ids = Superset::Dashboard::Charts::List.new(dashboard_id).ids
+          chart_ids.each do |chart_id|
+            current_chart_owner_ids = Superset::Chart::Get.new(chart_id).result['owners'].map{|c| c['id']}
+            next if current_chart_owner_ids.include?(user_id)
+
+            Superset::Chart::Put.new(target_id: chart_id, params: { "owners":  current_chart_owner_ids << user_id }).perform
+          end
+        end
+
+        def add_user_to_datasets_ownership
+          dataset_ids = Superset::Dashboard::Datasets::List.new(dashboard_id: dashboard_id).ids
+          dataset_ids.each do |dataset_id|
+            current_dataset_owner_ids = Superset::Dataset::Get.new(dataset_id).result['owners'].map{|c| c['id']}
+            next if current_dataset_owner_ids.include?(user_id)
+
+            Superset::Dataset::Put.new(target_id: dataset_id, params: { "owners":  current_dataset_owner_ids << user_id }).perform
+          end
+        end
+
+        def current_dashboard_owner_ids
+          @current_dashboard_owner_ids ||= Superset::Dashboard::Get.new(dashboard_id).result['owners'].map{|i| i['id'] }
+        end
+      end
+    end
+  end
+end

data/lib/superset/dashboard/datasets/list.rb

@@ -30,7 +30,7 @@ module Superset
             # For the current superset setup we will assume a dashboard datasets will point to EXACTLY one schema, their own.
             # if not .. we need to know about it. Potentially we could override this check if others do not consider it a problem.
             if all_dashboard_schemas.count > 1
-              Rollbar.error("SUPERSET DASHBOARD ERROR: Dashboard id #{id} has multiple dataset schema linked: #{all_dashboard_schemas.to_s}")
+              Rollbar.error("SUPERSET DASHBOARD ERROR: Dashboard id #{id} has multiple dataset schema linked: #{all_dashboard_schemas.to_s}") if defined?(Rollbar)
             end
             all_dashboard_schemas
           end
@@ -48,6 +48,20 @@ module Superset
           chart_datasets + filter_datasets(filter_dataset_ids_not_used_in_charts)
         end
 
+        def rows
+          datasets_details.map do |d|
+            [
+              d[:id],
+              d[:datasource_name],
+              d[:database][:id],
+              d[:database][:name],
+              d[:database][:backend],
+              d[:schema],
+              d[:filter_only]
+            ]
+          end
+        end
+
         private
 
         def filter_dataset_ids
@@ -74,20 +88,6 @@ module Superset
           ['id', 'datasource_name', 'database_id', 'database_name', 'database_backend', 'schema', 'filter_only'].map(&:to_sym)
         end
 
-        def rows
-          datasets_details.map do |d|
-            [
-              d[:id],
-              d[:datasource_name],
-              d[:database][:id],
-              d[:database][:name],
-              d[:database][:backend],
-              d[:schema],
-              d[:filter_only]
-            ]
-          end
-        end
-
         # when displaying a list of datasets, show dashboard title as well
         def title
           @title ||= [id, dashboard.title].join(' ')

data/lib/superset/dashboard/delete.rb

@@ -16,7 +16,7 @@ module Superset
 
         confirm_zero_charts_on_dashboard if confirm_zero_charts
 
-        logger.info("Attempting to delete dashboard with id: #{dashboard_id}")
+        logger.info("Deleting dashboard with id: #{dashboard_id}")
         response
       end
 

data/lib/superset/dashboard/put.rb

@@ -1,36 +1,19 @@
 
 # frozen_string_literal: true
 
+# Example Usage: Update Dashboard Ownership to a new set of users
+# this will override the existing owners and set the new owners
+# params = { owners: [ 58, 3 ] }
+# Superset::Dashboard::Put.new(target_id: 101, params: params ).perform
+
 module Superset
   module Dashboard
-    class Put < Superset::Request
-
-      attr_reader :target_dashboard_id, :params
-
-      def initialize(target_dashboard_id:, params:)
-        @target_dashboard_id = target_dashboard_id
-        @params = params
-      end
-
-      def perform
-        raise "Error: target_dashboard_id integer is required" unless target_dashboard_id.present? && target_dashboard_id.is_a?(Integer)
-        raise "Error: params hash is required" unless params.present? && params.is_a?(Hash)
-
-        response
-      end
-
-      def response
-        @response ||= client.put(route, params)
-      end
-
-      def id
-        response["result"]["id"]
-      end
+    class Put < Superset::BasePutRequest
 
       private
 
       def route
-        "dashboard/#{target_dashboard_id}"
+        "dashboard/#{target_id}"
       end
     end
   end

data/lib/superset/dashboard/warm_up_cache.rb

@@ -19,7 +19,7 @@ module Superset
           begin
             warm_up_dataset(dataset["datasource_name"], dataset["name"])
           rescue => e
-            Rollbar.error("Warm up cache failed for the dashboard #{dashboard_id.to_s} and for the dataset #{dataset["datasource_name"]} - #{e}")
+            Rollbar.error("Warm up cache failed for the dashboard #{dashboard_id.to_s} and for the dataset #{dataset["datasource_name"]} - #{e}") if defined?(Rollbar)
           end 
         end
       end

data/lib/superset/dataset/bulk_delete.rb

@@ -19,7 +19,7 @@ module Superset
         raise InvalidParameterError, "dataset_ids array of integers expected" unless dataset_ids.is_a?(Array)
         raise InvalidParameterError, "dataset_ids array must contain Integer only values" unless dataset_ids.all? { |item| item.is_a?(Integer) }
 
-        logger.info("Attempting to delete datasets with id: #{dataset_ids.join(', ')}")
+        logger.info("Deleting datasets with id: #{dataset_ids.join(', ')}")
         response
       end
 

data/lib/superset/dataset/delete.rb

@@ -12,7 +12,7 @@ module Superset
       def perform
         raise InvalidParameterError, "dataset_id integer is required" unless dataset_id.present? && dataset_id.is_a?(Integer)
 
-        logger.info("Attempting to delete dataset with id: #{dataset_id}")
+        logger.info("Deleting dataset with id: #{dataset_id}")
         response
       end
 

data/lib/superset/dataset/put.rb

@@ -2,7 +2,7 @@
 #
 # Usage:
 # params = { owners: [ 58, 3 ] }
-# Superset::Dataset::Put.new(object_id: 101, params: params ).perform
+# Superset::Dataset::Put.new(target_id: 101, params: params ).perform
 
 module Superset
   module Dataset
@@ -11,7 +11,7 @@ module Superset
       private
 
       def route
-        "dataset/#{object_id}"
+        "dataset/#{target_id}"
       end
     end
   end

data/lib/superset/services/duplicate_dashboard.rb

@@ -9,15 +9,17 @@ module Superset
   module Services
     class DuplicateDashboard < Superset::Request
 
-      attr_reader :source_dashboard_id, :target_schema, :target_database_id, :allowed_domains, :tags, :publish
+      attr_reader :source_dashboard_id, :target_schema, :target_database_id, :target_dataset_suffix_override, :allowed_domains, :tags, :publish, :target_catalog_name
 
-      def initialize(source_dashboard_id:, target_schema:, target_database_id: , allowed_domains: [], tags: [], publish: false)
+      def initialize(source_dashboard_id:, target_schema:, target_database_id: , target_dataset_suffix_override: nil, allowed_domains: [], tags: [], publish: false, target_catalog_name: nil)
         @source_dashboard_id = source_dashboard_id
         @target_schema = target_schema
         @target_database_id = target_database_id
+        @target_dataset_suffix_override = target_dataset_suffix_override
         @allowed_domains = allowed_domains
         @tags = tags
         @publish = publish
+        @target_catalog_name = target_catalog_name
       end
 
       def perform
@@ -55,6 +57,11 @@ module Superset
 
       rescue => e
         logger.error("#{e.message}")
+        remove_duplicated_objects
+        puts "------------------------------------------------------------------------------\n"
+        puts "DUPLICATE DASHBOARD FAILED - ERROR: #{e.message}\n"
+        puts "REMOVED DUPLICATED OBJECTS - Check log/superset-client.log for more details\n"
+        puts "------------------------------------------------------------------------------\n"
         raise e
       end
 
@@ -67,12 +74,12 @@ module Superset
       def add_tags_to_new_dashboard
         return unless tags.present?
 
-        Superset::Tag::AddToObject.new(object_type_id: ObjectType::DASHBOARD, object_id: new_dashboard.id, tags: tags).perform
+        Superset::Tag::AddToObject.new(object_type_id: ObjectType::DASHBOARD, target_id: new_dashboard.id, tags: tags).perform
         logger.info "  Added tags to dashboard #{new_dashboard.id}: #{tags}"
       rescue => e
         # catching tag error and display in log .. but also alowing the process to finish logs as tag error is fairly insignificant
-        logger.error("  FAILED to add tags to new dashboard id: #{new_dashboard.id}. Error is #{e.message}")
-        logger.error("  Missing Tags Values are #{tags}")
+        logger.error("  FAILED to add tags to new dashboard id: #{new_dashboard.id}. Error: #{e.message}")
+        raise ValidationError, "Failed to add tags to new dashboard id: #{new_dashboard.id}. #{e.message}. Missing Tags Values are #{tags}"
       end
 
       def created_embedded_config
@@ -90,35 +97,39 @@ module Superset
 
       def duplicate_source_dashboard_datasets
         source_dashboard_datasets.each do |dataset|
-          # duplicate the dataset, renaming to use of suffix as the target_schema
-          # reason: there is a bug(or feature) in the SS API where a dataset name must be uniq when duplicating.  
-          # (note however renaming in the GUI to a dup name works fine)
-          new_dataset_name = "#{dataset[:datasource_name]}-#{target_schema}"
-          existing_datasets = Superset::Dataset::List.new(title_equals: new_dataset_name, schema_equals: target_schema).result
+          # duplicate the dataset, renaming to use of suffix as the target_schema OR target_dataset_suffix_override value
+          # reason: there is a bug(or feature) in the SS where a dataset name must be uniq when duplicating
+          target_dataset_name = new_dataset_name(dataset[:datasource_name])
+          existing_datasets = Superset::Dataset::List.new(title_equals: target_dataset_name, schema_equals: target_schema).result
           if existing_datasets.any?
-            logger.info "Dataset #{existing_datasets[0]["table_name"]} already exists. Reusing it"
-            new_dataset_id = existing_datasets[0]["id"] # assuming that we do not name multiple datasets with same name in a single schema
+            logger.info "  Dataset #{target_dataset_name} already exists. Reusing it"
+            new_dataset_id = existing_datasets[0]["id"]
           else
-            new_dataset_id = Superset::Dataset::Duplicate.new(source_dataset_id: dataset[:id], new_dataset_name: new_dataset_name).perform
+            new_dataset_id = Superset::Dataset::Duplicate.new(source_dataset_id: dataset[:id], new_dataset_name: target_dataset_name).perform
             # update the new dataset with the target schema, database, catalog
             Superset::Dataset::UpdateSchema.new(
               source_dataset_id:  new_dataset_id,
               target_database_id: target_database_id,
               target_schema:      target_schema,
-              target_catalog:     target_database_catalog).perform
+              target_catalog:     validated_target_database_catalog_name).perform
           end
           # keep track of the previous dataset and the matching new dataset_id
           dataset_duplication_tracker <<  { source_dataset_id: dataset[:id], new_dataset_id: new_dataset_id }
         end
       end
 
+      # if a suffix is provided, use it to suffix the dataset name
+      # if no suffix is provided, use the schema name as the suffix
+      def new_dataset_name(dataset_name)
+        return "#{dataset_name}-#{target_schema}" if target_dataset_suffix_override.blank?
+        "#{dataset_name}-#{target_dataset_suffix_override.downcase}"
+      end
+
       def update_charts_with_new_datasets
         logger.info "Updating Charts to point to New Datasets and updating Dashboard json_metadata ..."
         # note dashboard json_metadata currently still points to the old chart ids and is updated here
-
         new_dashboard_json_metadata_json_string = new_dashboard_json_metadata_configuration.to_json # need to convert to string for gsub
-        # get all chart ids for the new dashboard
-        new_charts_list = Superset::Dashboard::Charts::List.new(new_dashboard.id).result
+
         new_chart_ids_list = new_charts_list&.map { |r| r['id'] }&.compact
         # get all chart details for the source dashboard
         original_charts = Superset::Dashboard::Charts::List.new(source_dashboard_id).result.map { |r| [r['slice_name'], r['id']] }.to_h
@@ -148,6 +159,11 @@ module Superset
         @new_dashboard_json_metadata_configuration = JSON.parse(new_dashboard_json_metadata_json_string)
       end
 
+      def new_charts_list
+        # get all chart ids for the new dashboard
+        @new_charts_list ||= Superset::Dashboard::Charts::List.new(new_dashboard.id).result
+      end
+
       def duplicate_source_dashboard_filters
         return unless source_dashboard_filter_dataset_ids.length.positive?
 
@@ -164,11 +180,11 @@ module Superset
 
       def update_source_dashboard_json_metadata
         logger.info "  Updated new Dashboard json_metadata charts with new dataset ids"
-        Superset::Dashboard::Put.new(target_dashboard_id: new_dashboard.id, params: { "json_metadata" => @new_dashboard_json_metadata_configuration.to_json }).perform
+        Superset::Dashboard::Put.new(target_id: new_dashboard.id, params: { "json_metadata" => @new_dashboard_json_metadata_configuration.to_json }).perform
       end
 
       def publish_dashboard
-        Superset::Dashboard::Put.new(target_dashboard_id: new_dashboard.id, params: { published: publish } ).perform
+        Superset::Dashboard::Put.new(target_id: new_dashboard.id, params: { published: publish } ).perform
       end
 
       def new_dashboard
@@ -209,7 +225,7 @@ module Superset
         raise ValidationError, "One or more source dashboard filters point to a different schema than the dashboard charts. Identified Unpermittied Filter Dataset Ids are #{unpermitted_filter_dataset_ids.to_s}" if unpermitted_filter_dataset_ids.any?
 
         # new dataset validations - Need to be commented for EU dashboard duplication as we are using the existing datasets for the new dashboard
-        raise ValidationError, "DATASET NAME CONFLICT: The Target Schema #{target_schema} already has existing datasets named: #{target_schema_matching_dataset_names.join(',')}" unless target_schema_matching_dataset_names.empty?
+        raise ValidationError, "DATASET NAME CONFLICT: The Target Database #{target_database_id} with Schema #{target_schema} already has existing datasets named: #{target_schema_matching_dataset_names.join(',')}" unless target_schema_matching_dataset_names.empty?
         validate_source_dashboard_datasets_sql_does_not_hard_code_schema
 
         # embedded allowed_domain validations
@@ -218,8 +234,8 @@ module Superset
 
       def validate_source_dashboard_datasets_sql_does_not_hard_code_schema
         errors = source_dashboard_datasets.map do |dataset|
-          "The Dataset ID #{dataset[:id]} SQL query is hard coded with the schema value and can not be duplicated cleanly.  " +
-            "Remove all direct embedded schema calls from the Dataset SQL query before continuing." if dataset[:sql].include?("#{dataset[:schema]}.")
+          "The Dataset ID #{dataset[:id]} SQL query is hard coded with the schema value: #{dataset[:schema]}. This indicates that the dataset can not be duplicated cleanly to point to the target schema.  " +
+            "Remove all direct embedded schema calls from the Dataset SQL query before continuing." if dataset[:sql]&.include?("#{dataset[:schema]}.")
         end.compact
         raise ValidationError, errors.join("\n") unless errors.empty?
       end
@@ -245,13 +261,15 @@ module Superset
         source_dashboard_datasets.map { |dataset| dataset[:datasource_name] }.uniq
       end
 
-      # identify any already existing datasets in the target schema that have the same name as the source dashboard datasets
+      # identify any already existing datasets in the target database and schema that have the same name as the source dashboard datasets + suffix
       # note this is prior to adding the (COPY) suffix
-      # here we will need to decide if we want to use the existing dataset or not see NEP-????
+      # here we will need to decide if we want to use the existing dataset or not
       # for now we will exit with an error if we find any existing datasets of the same name
       def target_schema_matching_dataset_names
         @target_schema_matching_dataset_names ||= source_dashboard_dataset_names.map do |source_dataset_name|
-          existing_names = Superset::Dataset::List.new(title_contains: source_dataset_name, schema_equals: target_schema).result.map{|t|t['table_name']}.uniq # contains match to cover with suffix as well
+          source_dataset_name_with_suffix = new_dataset_name(source_dataset_name)
+
+          existing_names = Superset::Dataset::List.new(title_contains: source_dataset_name_with_suffix, database_id_eq: target_database_id, schema_equals: target_schema).result.map{|t|t['table_name']}.uniq # contains match to cover with suffix as well
           unless existing_names.flatten.empty?
             logger.error "  HALTING PROCESS: Schema #{target_schema} already has Dataset called #{existing_names}"
           end
@@ -267,11 +285,13 @@ module Superset
         @filter_dataset_ids ||= source_dashboard.filter_configuration.map { |c| c['targets'] }.flatten.compact.map { |c| c['datasetId'] }.flatten.compact.uniq
       end
 
-      # currently does not support multiple catalogs, assumption is that 1 catalog is used per database
-      def target_database_catalog
+      # if multiple catalogs are present, the target_catalog_name must be provided, otherwise use the first catalog
+      def validated_target_database_catalog_name
         catalogs = Superset::Database::GetCatalogs.new(target_database_id).catalogs
-        raise ValidationError, "Target Database #{target_database_id} has multiple catalogs" if catalogs.size > 1
-        catalogs.first
+        return target_catalog_name if catalogs.include?(target_catalog_name)
+
+        raise ValidationError, "Target Database #{target_database_id} has multiple catalogs, must provide target_catalog_name" if catalogs.size > 1 && target_catalog_name.blank?
+        @validated_target_database_catalog_name ||= catalogs.find { |c| c['name'] == target_catalog_name } || catalogs.first
       end
 
       # Primary Assumption is that all charts datasets on the source dashboard are pointing to the same database schema
@@ -290,6 +310,21 @@ module Superset
         end
       end
 
+      # remove the confirmed duplicated objects if the process fails
+      # do not use Dashboard::BulkDeleteCascade here as it may remove datasets from the source dashboard as well
+      def remove_duplicated_objects
+        logger.info "Removing duplicated objects ..."
+
+        new_dataset_ids = dataset_duplication_tracker&.map { |dataset| dataset[:new_dataset_id] }.compact
+        Superset::Dataset::BulkDelete.new(dataset_ids: new_dataset_ids).perform if new_dataset_ids.any?
+
+        new_chart_ids = new_charts_list&.map { |r| r['id'] }.compact
+        Superset::Chart::BulkDelete.new(chart_ids: new_chart_ids).perform if new_chart_ids.any?
+
+        Superset::Dashboard::Delete.new(dashboard_id: new_dashboard.id).perform if new_dashboard.id.present?
+        logger.info "Removed duplicated objects successfully."
+      end
+
       def logger
         @logger ||= Superset::Logger.new
       end

data/lib/superset/tag/add_to_object.rb

@@ -4,11 +4,11 @@ module Superset
   module Tag
     class AddToObject < Superset::Request
 
-      attr_reader :object_type_id, :object_id, :tags
+      attr_reader :object_type_id, :target_id, :tags
 
-      def initialize(object_type_id:, object_id:, tags: [])
+      def initialize(object_type_id:, target_id:, tags: [])
         @object_type_id = object_type_id
-        @object_id = object_id
+        @target_id = target_id
         @tags = tags
       end
 
@@ -31,7 +31,7 @@ module Superset
       def validate_constructor_args
         raise InvalidParameterError, "object_type_id integer is required" unless object_type_id.present? && object_type_id.is_a?(Integer)
         raise InvalidParameterError, "object_type_id is not a known value" unless ObjectType.list.include?(object_type_id)
-        raise InvalidParameterError, "object_id integer is required" unless object_id.present? && object_id.is_a?(Integer)
+        raise InvalidParameterError, "target_id integer is required" unless target_id.present? && target_id.is_a?(Integer)
         raise InvalidParameterError, "tags array is required" unless tags.present? && tags.is_a?(Array)
         raise InvalidParameterError, "tags array must contain string only values" unless tags.all? { |item| item.is_a?(String) }
       end
@@ -39,7 +39,7 @@ module Superset
       private
 
       def route
-        "tag/#{object_type_id}/#{object_id}/"
+        "tag/#{object_type_id}/#{target_id}/"
       end
     end
   end

data/lib/superset/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Superset
-  VERSION = "0.2.7"
+  VERSION = "0.3.0"
 end

data/superset.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
   spec.summary = "A Ruby Client for Apache Superset API"
   spec.homepage = "https://github.com/rdytech/superset-client"
   spec.license = "MIT"
-  spec.required_ruby_version = ">= 2.7.8"
+  spec.required_ruby_version = ">= 3"
 
   #spec.metadata["allowed_push_host"] = ""
 
@@ -34,21 +34,20 @@ Gem::Specification.new do |spec|
     "lib"
   ]
 
-  # Uncomment to register a new dependency of your gem
-  spec.add_dependency "dotenv", "~> 2.7"
-  spec.add_dependency "json", "~> 2.6"
+  spec.add_dependency "json", ">= 2.0"
   spec.add_dependency "terminal-table", "~> 4.0"
-  spec.add_dependency "rake", "~> 13.0"
-  spec.add_dependency "rollbar", "~> 3.4"
-  spec.add_dependency "require_all", "~> 3.0"
-  spec.add_dependency "rubyzip", "~> 1.0"
+  spec.add_dependency "require_all", ">= 3.0"
+  spec.add_dependency "rubyzip", ">= 1.3"
   spec.add_dependency "faraday", "~> 1.0"
   spec.add_dependency "faraday-multipart", "~> 1.0"
-  spec.add_dependency "enumerate_it", "~> 1.7.0"
-
-  spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "rubocop", "~> 1.5"
-  spec.add_development_dependency "pry", "~> 0.14"
+  spec.add_dependency "enumerate_it", ">= 1.7"
+
+  spec.add_development_dependency "dotenv", ">= 2.0"
+  spec.add_development_dependency "rake", ">= 13.0"
+  spec.add_development_dependency "rspec", ">= 3.0"
+  spec.add_development_dependency "rubocop", ">= 1.0"
+  spec.add_development_dependency "pry", ">= 0.14"
+  spec.add_development_dependency "rollbar", ">= 3.0"
 
   # For more information and examples about making a new gem, check out our
   # guide at: https://bundler.io/guides/creating_gem.html

metadata

@@ -1,43 +1,28 @@
 --- !ruby/object:Gem::Specification
 name: superset
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.3.0
 platform: ruby
 authors:
 - jbat
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-10-24 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: dotenv
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.7'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: terminal-table
   requirement: !ruby/object:Gem::Requirement
@@ -53,49 +38,49 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: require_all
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: rollbar
+  name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: require_all
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: rubyzip
+  name: faraday-multipart
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -109,90 +94,103 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: faraday
+  name: enumerate_it
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
-  name: faraday-multipart
+  name: dotenv
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
+        version: '2.0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: enumerate_it
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.0
-  type: :runtime
+        version: '13.0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.14'
-description:
+- !ruby/object:Gem::Dependency
+  name: rollbar
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.0'
 email:
 - jonathon.batson@gmail.com
 executables: []
@@ -233,6 +231,7 @@ files:
 - lib/superset/credential/embedded_user.rb
 - lib/superset/dashboard/bulk_delete.rb
 - lib/superset/dashboard/bulk_delete_cascade.rb
+- lib/superset/dashboard/cascade_ownership/add_new_owner.rb
 - lib/superset/dashboard/charts/list.rb
 - lib/superset/dashboard/compare.rb
 - lib/superset/dashboard/copy.rb
@@ -293,7 +292,6 @@ homepage: https://github.com/rdytech/superset-client
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -301,15 +299,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.8
+      version: '3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key:
+rubygems_version: 3.6.7
 specification_version: 4
 summary: A Ruby Client for Apache Superset API
 test_files: []