manifold-cli 0.0.13 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68f9ecd2e683b236126eb7d1bed9c9b8db446a551032976e64328596cf7e198b
-  data.tar.gz: '0929cfaabd84490c3e13f5ca9737244dc7fa9834767fb101560c26a49b69047f'
+  metadata.gz: 465e6236b9114a9a9170502e55646ae094a392ee25bb9ce29af81046fdb1b386
+  data.tar.gz: b8dc973ee3caf57fcde8919b93580c2278850b90aaa1df82425f9a819fc66a2d
 SHA512:
-  metadata.gz: 9cd0137b20b465bcf95117566a8d1509a3edfafeb8dc6865bc1da847cd5854f954b83674365e1fd2b394f60fbd9dba9baef2c6336d3ec6f703f9f16b41a857ad
-  data.tar.gz: 0aea89c6924dbc65a2628b720e60175493299b794cd406904965109ac76bc45da1fa0fa560a70def0edfdf0e657d722987c1e67631029670aaf58425004d4389
+  metadata.gz: 69d18cf361bdbf945685aab0264c3222c7c692e45141e3e10352238523f180df0b35f97689bff3bb71712897ddb52fb1f037c8a951762fa1818d6d28a560944b
+  data.tar.gz: f8e29a241c6f76a6632e5e47c421ac03d0736c1af3d7e8e2a374026d30f76aded46c02359aaa1a0d29b720c9bdc65355ed4e44a761cfe1af549d730988982e77

data/lib/manifold/api/schema_generator.rb

@@ -0,0 +1,84 @@
+# frozen_string_literal: true
+
+module Manifold
+  module API
+    # Handles schema generation for Manifold tables
+    class SchemaGenerator
+      VALID_OPERATORS = %w[AND OR NOT NAND NOR XOR XNOR].freeze
+
+      def initialize(dimensions_fields, manifold_yaml)
+        @dimensions_fields = dimensions_fields
+        @manifold_yaml = manifold_yaml
+      end
+
+      def dimensions_schema
+        [
+          { "type" => "STRING", "name" => "id", "mode" => "REQUIRED" },
+          { "type" => "RECORD", "name" => "dimensions", "mode" => "REQUIRED",
+            "fields" => @dimensions_fields }
+        ]
+      end
+
+      def manifold_schema
+        [
+          { "type" => "STRING", "name" => "id", "mode" => "REQUIRED" },
+          { "type" => "TIMESTAMP", "name" => "timestamp", "mode" => "REQUIRED" },
+          { "type" => "RECORD", "name" => "dimensions", "mode" => "REQUIRED",
+            "fields" => @dimensions_fields },
+          { "type" => "RECORD", "name" => "metrics", "mode" => "REQUIRED",
+            "fields" => metrics_fields }
+        ]
+      end
+
+      private
+
+      def metrics_fields
+        return [] unless @manifold_yaml["contexts"] && @manifold_yaml["metrics"]
+
+        @manifold_yaml["contexts"].map do |context_name, _context_config|
+          {
+            "name" => context_name,
+            "type" => "RECORD",
+            "mode" => "NULLABLE",
+            "fields" => context_metrics_fields
+          }
+        end
+      end
+
+      def context_metrics_fields
+        [
+          *countif_fields,
+          *sumif_fields
+        ]
+      end
+
+      def countif_fields
+        return [] unless @manifold_yaml.dig("metrics", "countif")
+
+        [{
+          "name" => @manifold_yaml["metrics"]["countif"],
+          "type" => "INTEGER",
+          "mode" => "NULLABLE"
+        }]
+      end
+
+      def sumif_fields
+        return [] unless @manifold_yaml.dig("metrics", "sumif")
+
+        @manifold_yaml["metrics"]["sumif"].keys.map do |metric_name|
+          {
+            "name" => metric_name,
+            "type" => "INTEGER",
+            "mode" => "NULLABLE"
+          }
+        end
+      end
+
+      def validate_operator!(operator)
+        return if VALID_OPERATORS.include?(operator)
+
+        raise ArgumentError, "Invalid operator: #{operator}. Valid operators are: #{VALID_OPERATORS.join(", ")}"
+      end
+    end
+  end
+end

data/lib/manifold/api/workspace.rb

@@ -2,6 +2,26 @@
 
 module Manifold
   module API
+    # Handles terraform configuration generation
+    class TerraformGenerator
+      def initialize(name, vectors, vector_service, manifold_yaml)
+        @name = name
+        @vectors = vectors
+        @vector_service = vector_service
+        @manifold_yaml = manifold_yaml
+      end
+
+      def generate(path)
+        config = Terraform::WorkspaceConfiguration.new(@name)
+        @vectors.each do |vector|
+          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(path)
+      end
+    end
+
     # Encapsulates a single manifold.
     class Workspace
       attr_reader :name, :template_path, :logger
@@ -27,11 +47,17 @@ module Manifold
       end
 
       def generate(with_terraform: false)
-        return unless manifold_exists? && any_vectors?
+        return nil unless manifold_exists? && any_vectors?
 
+        tables_directory.mkpath
         generate_dimensions
-        generate_terraform if with_terraform
+        generate_manifold
         logger.info("Generated BigQuery dimensions table schema for workspace '#{name}'.")
+
+        return unless with_terraform
+
+        generate_terraform
+        logger.info("Generated Terraform configuration for workspace '#{name}'.")
       end
 
       def tables_directory
@@ -74,16 +100,28 @@ module Manifold
         dimensions_path.write(dimensions_schema_json.concat("\n"))
       end
 
+      def generate_manifold
+        manifold_schema_path.write(manifold_schema_json.concat("\n"))
+      end
+
+      def manifold_schema_path
+        tables_directory.join("manifold.json")
+      end
+
+      def schema_generator
+        @schema_generator ||= SchemaGenerator.new(dimensions_fields, manifold_yaml)
+      end
+
+      def manifold_schema
+        schema_generator.manifold_schema
+      end
+
       def dimensions_schema
-        [
-          { "type" => "STRING", "name" => "id", "mode" => "REQUIRED" },
-          { "type" => "RECORD", "name" => "dimensions", "mode" => "REQUIRED",
-            "fields" => dimensions_fields }
-        ]
+        schema_generator.dimensions_schema
       end
 
       def dimensions_fields
-        vectors.filter_map do |vector|
+        @dimensions_fields ||= vectors.filter_map do |vector|
           logger.info("Loading vector schema for '#{vector}'.")
           @vector_service.load_vector_schema(vector)
         end
@@ -106,12 +144,12 @@ module Manifold
       end
 
       def generate_terraform
-        config = Terraform::WorkspaceConfiguration.new(name)
-        vectors.each do |vector|
-          vector_config = @vector_service.load_vector_config(vector)
-          config.add_vector(vector_config)
-        end
-        config.write(terraform_main_path)
+        terraform_generator = TerraformGenerator.new(name, vectors, @vector_service, manifold_yaml)
+        terraform_generator.generate(terraform_main_path)
+      end
+
+      def manifold_schema_json
+        JSON.pretty_generate(manifold_schema)
       end
     end
   end

data/lib/manifold/templates/vector_template.yml

@@ -9,7 +9,3 @@ attributes:
   # key_values:
   #   first_key: STRING
   #   second_key: STRING:REQUIRED
-
-# Optionally, reference a view specifying how to select vector dimensions
-# merge:
-#   source: lib/views/select_my_vector.sql

data/lib/manifold/templates/workspace_template.yml

@@ -3,23 +3,29 @@ vectors:
   # Example:
   # - User
 
-metrics:
-  - name: # Add your metric name here, e.g. Pageviews
+dimensions:
+  # Reference a view specifying how to select vector dimensions
+  merge:
+    source: lib/views/select_my_vector.sql
 
-    id:
-      field: # Identify the field that uniquely identifies each manifold vector
-      type: # Specify the type of that field, e.g. INTEGER
+timestamp:
+  interval: HOUR
+  field: timestamp
 
-    interval:
-      type: # Specify the interval type, e.g. TIMESTAMP or DATE
-      expression: # Compute the interval for the entry, e.g. TIMESTAMP_TRUNC(timestamp, HOUR)
+contexts:
+  paid: IS_PAID(context.location)
+  organic: IS_ORGANIC(context.location)
+  paidOrganic:
+    fields:
+      - paid
+      - organic
+    operator: AND
 
-    aggregations:
-      # Add any aggregations this metric should present
+metrics:
+  countif: tapCount
+  sumif:
+    sequenceSum:
+      field: context.sequence
 
-    source:
-      type: BIGQUERY_TABLE
-      project: # Add your project name here
-      dataset: # Add your dataset name here
-      table: # Add your table name
-      filter: # (optional) Add your filter condition here
+source: my_project.my_dataset.my_table
+filter: timestamp >= TIMESTAMP_SUB(CURRENT_TIMESTAMP(), INTERVAL 90 DAY)

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,
@@ -50,51 +53,60 @@ module Manifold
 
       def table_config
         {
-          "dimensions" => {
-            "dataset_id" => name,
-            "project" => "${var.project_id}",
-            "table_id" => "Dimensions",
-            "schema" => "${file(\"${path.module}/tables/dimensions.json\")}",
-            "depends_on" => ["google_bigquery_dataset.#{name}"]
-          }
+          "dimensions" => dimensions_table_config,
+          "manifold" => manifold_table_config
         }
       end
 
-      def routine_config
-        return nil if @vectors.empty?
+      def dimensions_table_config
+        {
+          "dataset_id" => name,
+          "project" => "${var.project_id}",
+          "table_id" => "Dimensions",
+          "schema" => "${file(\"${path.module}/tables/dimensions.json\")}",
+          "depends_on" => ["google_bigquery_dataset.#{name}"]
+        }
+      end
 
-        routines = @vectors.filter_map { |vector| build_routine(vector) }
-        routines.empty? ? nil : routines.to_h
+      def manifold_table_config
+        {
+          "dataset_id" => name,
+          "project" => "${var.project_id}",
+          "table_id" => "Manifold",
+          "schema" => "${file(\"${path.module}/tables/manifold.json\")}",
+          "depends_on" => ["google_bigquery_dataset.#{name}"]
+        }
       end
 
-      def build_routine(vector)
-        return nil unless vector["merge"]&.fetch("source", nil)
+      def routine_config
+        return nil if @vectors.empty? || @merge_config.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.13"
+  VERSION = "0.0.15"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: manifold-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.15
 platform: ruby
 authors:
 - claytongentry
 bindir: bin
 cert_chain: []
-date: 2025-02-07 00:00:00.000000000 Z
+date: 2025-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -43,6 +43,7 @@ files:
 - lib/manifold.rb
 - lib/manifold/api.rb
 - lib/manifold/api/project.rb
+- lib/manifold/api/schema_generator.rb
 - lib/manifold/api/vector.rb
 - lib/manifold/api/workspace.rb
 - lib/manifold/cli.rb