manifold-cli 0.0.12 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83355b0f1c47db5081d22f62151431820af4b24d1bc43df571c68acc24b747fe
-  data.tar.gz: 8c6cb9cff9b68ca9001af2706b993fe0e81ebc54b0054d7f7452d81a87d8562f
+  metadata.gz: 38d11b038b09c8e1f83ef07ff4b238fcb07edaeeb1a36518a182a0963c5d5589
+  data.tar.gz: 8ad9000c2ed33ff8a8324ce202b2c15b367b894de756099417479e9354750864
 SHA512:
-  metadata.gz: 8411214d613656f7a7d591cd463dd9e863aa84c0def4733f6f6d70273d8d1a6058545984b936db6f328dd2f77c69dbbc1d15a86e3bc953626523389d3f7b2a66
-  data.tar.gz: 2d3aa8049dce5dc2e11b46cf61b25639b5017753b81515c7503c41da8c9f1b55d792e6d39572aac0305a4d6cb0eec14c6e04f76062d58bade315333c2749279d
+  metadata.gz: 79a51d73c4d63c7fc02e13336e1cdd51be4d93023eac402134e1f3be4ecf067d016813b9a533318f37708469ad001a568abdb436b96af3ccace25db0f50ce1d5
+  data.tar.gz: 4143c27f33fbe4b6a7bdc16282080a9c3cd9d5f507c0ded3db633b5a571bbb0a5a39659def1eb9342e8a711875a65c9daf000f15d6e54aaef53e38301de104b8

data/lib/manifold/api/workspace.rb

@@ -111,6 +111,7 @@ module Manifold
           vector_config = @vector_service.load_vector_config(vector)
           config.add_vector(vector_config)
         end
+        config.merge_config = manifold_yaml["dimensions"]&.fetch("merge", nil) if manifold_yaml["dimensions"]
         config.write(terraform_main_path)
       end
     end

data/lib/manifold/services/vector_service.rb

@@ -32,16 +32,35 @@ module Manifold
       private
 
       def transform_attributes_to_schema(attributes)
-        attributes.map do |name, type_str|
-          type, mode = parse_type_and_mode(type_str)
-          {
-            "name" => name,
-            "type" => type.upcase,
-            "mode" => mode
-          }
+        attributes.map { |name, type_def| transform_field(name, type_def) }
+      end
+
+      def transform_field(name, type_def)
+        if type_def.is_a?(Hash)
+          transform_record_field(name, type_def)
+        else
+          transform_scalar_field(name, type_def)
         end
       end
 
+      def transform_record_field(name, type_def)
+        {
+          "name" => name,
+          "type" => "RECORD",
+          "mode" => "NULLABLE",
+          "fields" => transform_attributes_to_schema(type_def)
+        }
+      end
+
+      def transform_scalar_field(name, type_def)
+        type, mode = parse_type_and_mode(type_def)
+        {
+          "name" => name,
+          "type" => type.upcase,
+          "mode" => mode
+        }
+      end
+
       def parse_type_and_mode(type_str)
         type, mode = type_str.split(":")
         mode = mode&.upcase || "NULLABLE"

data/lib/manifold/templates/vector_template.yml

@@ -6,7 +6,6 @@ attributes:
   # created_at: TIMESTAMP
   # status: STRING
   # names: STRING:REPEATED
-
-# Optionally, reference a view specifying how to select vector dimensions
-# merge:
-#   source: lib/views/select_my_vector.sql
+  # key_values:
+  #   first_key: STRING
+  #   second_key: STRING:REQUIRED

data/lib/manifold/templates/workspace_template.yml

@@ -3,6 +3,11 @@ vectors:
   # Example:
   # - User
 
+dimensions:
+  # Reference a view specifying how to select vector dimensions
+  merge:
+    source: lib/views/select_my_vector.sql
+
 metrics:
   - name: # Add your metric name here, e.g. Pageviews
 

data/lib/manifold/terraform/workspace_configuration.rb

@@ -10,12 +10,15 @@ module Manifold
         super()
         @name = name
         @vectors = []
+        @merge_config = nil
       end
 
       def add_vector(vector_config)
         @vectors << vector_config
       end
 
+      attr_writer :merge_config
+
       def as_json
         {
           "variable" => variables_block,
@@ -61,40 +64,34 @@ module Manifold
       end
 
       def routine_config
-        return nil if @vectors.empty?
-
-        routines = @vectors.filter_map { |vector| build_routine(vector) }
-        routines.empty? ? nil : routines.to_h
-      end
+        return nil if @vectors.empty? || @merge_config.nil?
 
-      def build_routine(vector)
-        return nil unless vector["merge"]&.fetch("source", nil)
-
-        routine_name = "merge_#{vector["name"].downcase}_dimensions"
-        [routine_name, routine_attributes(routine_name, vector)]
+        {
+          "merge_dimensions" => routine_attributes
+        }
       end
 
-      def routine_attributes(routine_name, vector)
+      def routine_attributes
         {
           "dataset_id" => name,
           "project" => "${var.project_id}",
-          "routine_id" => routine_name,
+          "routine_id" => "merge_dimensions",
           "routine_type" => "PROCEDURE",
           "language" => "SQL",
-          "definition_body" => merge_routine_definition(vector),
+          "definition_body" => merge_routine_definition,
           "depends_on" => ["google_bigquery_dataset.#{name}"]
         }
       end
 
-      def merge_routine_definition(vector)
-        source_sql = read_source_sql(vector["merge"]["source"])
+      def merge_routine_definition
+        source_sql = read_source_sql(@merge_config["source"])
         <<~SQL
           MERGE #{name}.Dimensions AS TARGET
           USING (
             #{source_sql}
           ) AS source
           ON source.id = target.id
-          WHEN MATCHED THEN UPDATE SET target.#{vector["name"].downcase} = source.dimensions
+          WHEN MATCHED THEN UPDATE SET target.dimensions = source.dimensions
           WHEN NOT MATCHED THEN INSERT ROW;
         SQL
       end

data/lib/manifold/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Manifold
-  VERSION = "0.0.12"
+  VERSION = "0.0.14"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: manifold-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.14
 platform: ruby
 authors:
 - claytongentry