ad-agent_architecture 0.0.9 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1afc432b8e4a84cec6f099987e20ccb1abd19b278a1f299fdd3cd822e47b6f2
-  data.tar.gz: fd1b6e9054740f005c083712e3cd67b1872cc0cd8d66eadaa2c9541fb3f33c9c
+  metadata.gz: 2e62425f0ffeff140581be7741ce8b429fb9437a196294e071d017e343894562
+  data.tar.gz: b7da8713c09d8179f840a676787aac6608143fde09a112fbe683c9205e9a37d2
 SHA512:
-  metadata.gz: 7af0666287aaef19e10bc414c160066ff2ab0dde2f55f2ae758790454028bccc5bb33ee48fb1ff63ca307a98ab25a82a16a896d2dbf256090151870519e5cb78
-  data.tar.gz: ae03bbcc49b5f4a0f467852a6f2c411c5d45484ba86eeac3251f75ce97379b2f04e8790530248ad997e5b8fee776174c5ef6ec36b128d89dfc693c52e09de874
+  metadata.gz: 9e11fffa978aa478142fe2a540c08c2917aa9a169ab0c19f35a19ea449fb7d9a6b06ddbce72a58b489cd50a367cd2e2dd571622f818a14ad63813a770c931626
+  data.tar.gz: 733bf3314271fa108de844ffc4fb2189bb7d77742bbfae31e2316b2883995eb2bc21d2888b49da7954db0865bf9cb9c226edce7cc4bde490f4fda535f206f222

data/.rubocop.yml

@@ -15,6 +15,7 @@ AllCops:
     - ".builders/**/*"
     - "spec/samples/**/*"
     - "lib/ad/agent_architecture/database/*"
+    - "spec/usecases/**/*"
 
 Metrics/BlockLength:
   Exclude:
@@ -116,4 +117,13 @@ RSpec/NamedSubject:
 
 RSpec/ExampleLength:
   Exclude:
-    - "**/spec/**/*"
+    - "**/spec/**/*"
+
+RSpec/MultipleExpectations:
+  Max: 3
+  Exclude:
+    - "spec/ad/agent_architecture/dsl/actions/save_database_spec.rb"
+
+Metrics/CyclomaticComplexity:
+  Exclude:
+    - "lib/ad/agent_architecture/dsl/actions/save_database.rb"

data/CHANGELOG.md

@@ -1,3 +1,18 @@
+## [0.0.10](https://github.com/appydave/ad-agent_architecture/compare/v0.0.9...v0.0.10) (2024-06-29)
+
+
+### Bug Fixes
+
+* refactor DSL to use component DSLs ([597050a](https://github.com/appydave/ad-agent_architecture/commit/597050ad727f1aaf8eb3e6589cf1c618f41499e7))
+
+## [0.0.9](https://github.com/appydave/ad-agent_architecture/compare/v0.0.8...v0.0.9) (2024-06-29)
+
+
+### Bug Fixes
+
+* add save, save_json, save_yaml and better report support ([4350628](https://github.com/appydave/ad-agent_architecture/commit/4350628f95b06a5df3bac3432f52aa560c7699f5))
+* add save, save_json, save_yaml and better report support ([9a7238a](https://github.com/appydave/ad-agent_architecture/commit/9a7238a0102e40a6e603a7a82757ff7c684ab374))
+
 ## [0.0.8](https://github.com/appydave/ad-agent_architecture/compare/v0.0.7...v0.0.8) (2024-06-29)
 
 

data/Gemfile

@@ -9,6 +9,7 @@ group :development, :test do
   gem 'guard-bundler'
   gem 'guard-rspec'
   gem 'guard-rubocop'
+  gem 'guard-shell'
   gem 'rake'
   gem 'rake-compiler', require: false
   gem 'rspec', '~> 3.0'

data/Guardfile

@@ -27,4 +27,10 @@ group :green_pass_then_cop, halt_on_fail: true do
     watch(/{.+\.rb$/)
     watch(%r{(?:.+/)?\.rubocop(?:_todo)?\.yml$}) { |m| File.dirname(m[0]) }
   end
+
+  guard :shell do
+    watch(%r{^spec/usecases/.+\.rbx$}) do |m|
+      `ruby -r ./spec/usecases/dsl_initialize.rb #{m[0]}`
+    end
+  end
 end

data/lib/ad/agent_architecture/database/create_schema.rb

@@ -69,6 +69,16 @@ module Ad
             foreign_key :attribute_id, :attributes
           end
 
+          db.create_table :prompts do
+            primary_key :id
+            String :name, null: false
+            String :path, null: true
+            String :content, null: true
+            foreign_key :workflow_id, :workflows
+          end
+
+          # Workflow runs workflows that are executed
+
           db.create_table :workflow_runs do
             primary_key :id
             foreign_key :workflow_id, :workflows

data/lib/ad/agent_architecture/database/models.rb

@@ -10,6 +10,7 @@ module Ad
         one_to_many :sections, class: 'Ad::AgentArchitecture::Database::Section'
         one_to_many :attributes, class: 'Ad::AgentArchitecture::Database::Attribute'
         one_to_many :workflow_runs, class: 'Ad::AgentArchitecture::Database::WorkflowRun'
+        one_to_many :prompts, class: 'Ad::AgentArchitecture::Database::Prompt'
       end
 
       # Section model represents a section entity in the database.
@@ -46,6 +47,10 @@ module Ad
         many_to_one :attribute, class: 'Ad::AgentArchitecture::Database::Attribute'
       end
 
+      class Prompt < Sequel::Model
+        many_to_one :workflow, class: 'Ad::AgentArchitecture::Database::Workflow'
+      end
+
       # WorkflowRun model represents a workflow run entity in the database.
       class WorkflowRun < Sequel::Model
         many_to_one :workflow, class: 'Ad::AgentArchitecture::Database::Workflow'

data/lib/ad/agent_architecture/dsl/actions/save_database.rb

@@ -24,6 +24,13 @@ module Ad
 
               attribute_map = attribute_records.to_h { |ar| [ar.name.to_sym, ar] }
 
+              # Save prompts
+              @workflow_hash[:prompts].each_value do |prompt|
+                Ad::AgentArchitecture::Database::Prompt.create(
+                  name: prompt[:name], path: prompt[:path], content: prompt[:content], workflow: workflow_record
+                )
+              end
+
               # Save sections and steps
               @workflow_hash[:sections].each do |section|
                 section_record = Ad::AgentArchitecture::Database::Section.create(

data/lib/ad/agent_architecture/dsl/agent_dsl.rb

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+module Ad
+  module AgentArchitecture
+    module Dsl
+      # This class is responsible for defining the agent DSL
+      class AgentDsl
+        attr_reader :workflow
+
+        def self.create(name:, &block)
+          new(name).tap do |dsl|
+            dsl.instance_eval(&block) if block_given?
+          end
+        end
+
+        def initialize(name)
+          @workflow = WorkflowDsl.new(name)
+        end
+
+        def attributes(&block)
+          @workflow.attributes(&block)
+        end
+
+        def prompts(&block)
+          @workflow.prompts(&block)
+        end
+
+        def section(name:, &block)
+          @workflow.section(name: name, &block)
+        end
+
+        def save
+          Ad::AgentArchitecture::Dsl::Actions::SaveDatabase.new(@workflow.workflow).save
+
+          self
+        end
+
+        def save_json(file_name = nil)
+          full_file_name = file_name || 'workflow.json'
+          Ad::AgentArchitecture::Dsl::Actions::SaveJson.new(@workflow.workflow).save(full_file_name)
+
+          self
+        end
+
+        def save_yaml(file_name = nil)
+          full_file_name = file_name || 'workflow.yaml'
+          Ad::AgentArchitecture::Dsl::Actions::SaveYaml.new(@workflow.workflow).save(full_file_name)
+
+          self
+        end
+      end
+    end
+  end
+end

data/lib/ad/agent_architecture/dsl/{agent_workflow_dsl.rb → agent_workflow_dsl.rb.old}

@@ -12,7 +12,7 @@ module Ad
         end
 
         def initialize(name)
-          @workflow = { name: name, sections: [], attributes: {} }
+          @workflow = { name: name, sections: [], attributes: {}, prompts: [] }
           @current_section_order = 1
         end
 
@@ -24,6 +24,14 @@ module Ad
           @workflow[:attributes][name] = { name: name, type: type, is_array: is_array }
         end
 
+        def prompts(&block)
+          instance_eval(&block) if block_given?
+        end
+
+        def define_prompt(name, path: nil, content: nil)
+          @workflow[:prompts] << { name: name, path: path, content: content }
+        end
+
         def section(name:, &block)
           @current_step_order = 1
           @current_section = { name: name, order: @current_section_order, steps: [] }

data/lib/ad/agent_architecture/dsl/attribute_dsl.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Ad
+  module AgentArchitecture
+    module Dsl
+      # This class is responsible for defining the attributes of a workflow
+      class AttributeDsl
+        def initialize(attributes)
+          @attributes = attributes
+        end
+
+        def attribute(name, type:, is_array: false)
+          @attributes[name] = { name: name, type: type, is_array: is_array }
+        end
+      end
+    end
+  end
+end

data/lib/ad/agent_architecture/dsl/prompt_dsl.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Ad
+  module AgentArchitecture
+    module Dsl
+      # This class is responsible for defining the prompts of a workflow
+      class PromptDsl
+        def initialize(prompts)
+          @prompts = prompts
+        end
+
+        def prompt(name, path: nil, content: nil)
+          @prompts[name] = { name: name, path: path, content: content }
+        end
+      end
+    end
+  end
+end

data/lib/ad/agent_architecture/dsl/section_dsl.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Ad
+  module AgentArchitecture
+    module Dsl
+      # This class is responsible for creating a section in the workflow
+      class SectionDsl
+        def initialize(name, order, sections)
+          @section = { name: name, order: order, steps: [] }
+          @sections = sections
+          @current_step_order = 1
+          @sections << @section
+        end
+
+        def step(name:, &block)
+          StepDsl.new(name, @current_step_order, @section[:steps]).instance_eval(&block)
+          @current_step_order += 1
+        end
+      end
+    end
+  end
+end

data/lib/ad/agent_architecture/dsl/step_dsl.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Ad
+  module AgentArchitecture
+    module Dsl
+      # This class is responsible for defining the steps of a section
+      class StepDsl
+        def initialize(name, order, steps)
+          @step = { name: name, order: order, input_attributes: [], output_attributes: [], prompt: '' }
+          @steps = steps
+          @steps << @step
+        end
+
+        def input(attr_name, **_opts)
+          @step[:input_attributes] << attr_name
+        end
+
+        def output(attr_name, **_opts)
+          @step[:output_attributes] << attr_name
+        end
+
+        def prompt(prompt_text, **_opts)
+          @step[:prompt] = prompt_text
+        end
+      end
+    end
+  end
+end

data/lib/ad/agent_architecture/dsl/workflow_dsl.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module Ad
+  module AgentArchitecture
+    module Dsl
+      # This class is responsible for defining the workflow DSL
+      class WorkflowDsl
+        attr_reader :workflow
+
+        def initialize(name)
+          @workflow = { name: name, sections: [], attributes: {}, prompts: {} }
+          @current_section_order = 1
+        end
+
+        def attributes(&block)
+          dsl = AttributeDsl.new(@workflow[:attributes])
+          dsl.instance_eval(&block) if block_given?
+        end
+
+        def prompts(&block)
+          dsl = PromptDsl.new(@workflow[:prompts])
+          dsl.instance_eval(&block) if block_given?
+        end
+
+        def section(name:, &block)
+          dsl = SectionDsl.new(name, @current_section_order, @workflow[:sections])
+          dsl.instance_eval(&block) if block_given?
+          @current_section_order += 1
+        end
+      end
+    end
+  end
+end

data/lib/ad/agent_architecture/report/workflow_detail_report.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'k_log'
-
 module Ad
   module AgentArchitecture
     module Report
@@ -12,15 +10,17 @@ module Ad
         def print(workflow)
           log.section_heading 'Workflow Details Report'
           log.kv 'Name', workflow.name
-          log.kv 'Description', workflow.description
+          # log.kv 'Description', workflow.description
 
           workflow.sections.each do |section|
             log.section_heading "Section: #{section.name}"
-            log.kv 'Order', section.order
+            # log.kv 'Order', section.order
             section.steps.each do |step|
               log.section_heading "Step: #{step.name}"
-              log.kv 'Order', step.order
-              log.kv 'Prompt', step.prompt
+              # log.kv 'Order', step.order
+              # log.kv 'Prompt', step.prompt
+              # puts step.input_attributes.first
+              # An ERROR here means you have not configured an attribute name
               log.kv 'Input Attributes', step.input_attributes.map { |ia| ia.attribute.name }.join(', ')
               log.kv 'Output Attributes', step.output_attributes.map { |oa| oa.attribute.name }.join(', ')
             end

data/lib/ad/agent_architecture/version.rb

@@ -2,6 +2,6 @@
 
 module Ad
   module AgentArchitecture
-    VERSION = '0.0.9'
+    VERSION = '0.0.11'
   end
 end

data/lib/ad/agent_architecture.rb

@@ -13,13 +13,21 @@ Ad::AgentArchitecture::Database::CreateSchema.new(DB).execute
 
 require 'ad/agent_architecture/database/models'
 require 'ad/agent_architecture/database/sql_query'
-require 'ad/agent_architecture/dsl/agent_workflow_dsl'
+require 'ad/agent_architecture/dsl/attribute_dsl'
+require 'ad/agent_architecture/dsl/prompt_dsl'
+require 'ad/agent_architecture/dsl/section_dsl'
+require 'ad/agent_architecture/dsl/step_dsl'
+require 'ad/agent_architecture/dsl/workflow_dsl'
+require 'ad/agent_architecture/dsl/agent_dsl'
 require 'ad/agent_architecture/dsl/actions/save_database'
 require 'ad/agent_architecture/dsl/actions/save_json'
 require 'ad/agent_architecture/dsl/actions/save_yaml'
 require 'ad/agent_architecture/report/workflow_detail_report'
 require 'ad/agent_architecture/report/workflow_list_report'
 
+# Alias'
+Agent = Ad::AgentArchitecture::Dsl::AgentDsl
+
 module Ad
   module AgentArchitecture
     # raise Ad::AgentArchitecture::Error, 'Sample message'

data/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "ad-agent_architecture",
-  "version": "0.0.9",
+  "version": "0.0.11",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "ad-agent_architecture",
-      "version": "0.0.9",
+      "version": "0.0.11",
       "devDependencies": {
         "@klueless-js/semantic-release-rubygem": "github:klueless-js/semantic-release-rubygem",
         "@semantic-release/changelog": "^6.0.3",

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ad-agent_architecture",
-  "version": "0.0.9",
+  "version": "0.0.11",
   "description": "Architecture/Schema for AI Agents",
   "scripts": {
     "release": "semantic-release"

data/workflow.json

@@ -39,32 +39,38 @@
           "prompt": "Create 5 introduction variations for [first_draft]."
         },
         {
-          "name": "SEO Analysis",
+          "name": "Update Draft with Intro",
           "order": 4,
           "input_attributes": [
-            "first_draft"
+            "first_draft",
+            "intro_variation"
           ],
           "output_attributes": [
-            "seo_analysis"
+            "second_draft"
           ],
-          "prompt": "Analyze the blog post for SEO."
-        }
-      ]
-    },
-    {
-      "name": "Editing",
-      "order": 2,
-      "steps": [
+          "prompt": "Update [first_draft] with a better intro [intro_variation]."
+        },
         {
-          "name": "Edit Draft",
-          "order": 1,
+          "name": "Analyse Intro",
+          "order": 5,
           "input_attributes": [
-            "first_draft"
+            "second_draft"
           ],
           "output_attributes": [
-            "first_draft"
+            "intro_analysis"
           ],
-          "prompt": "Edit [first_draft] for grammar, style, and clarity."
+          "prompt": "Analyze the article [second_draft] introduction"
+        },
+        {
+          "name": "Combine Intro Analysis",
+          "order": 6,
+          "input_attributes": [
+
+          ],
+          "output_attributes": [
+            "intro_analysis_combined"
+          ],
+          "prompt": ""
         }
       ]
     }
@@ -90,10 +96,27 @@
       "type": "array",
       "is_array": false
     },
-    "seo_analysis": {
-      "name": "seo_analysis",
+    "intro_variation": {
+      "name": "intro_variation",
+      "type": "string",
+      "is_array": false
+    },
+    "second_draft": {
+      "name": "second_draft",
+      "type": "string",
+      "is_array": false
+    },
+    "intro_analysis": {
+      "name": "intro_analysis",
+      "type": "string",
+      "is_array": false
+    },
+    "intro_analysis_combined": {
+      "name": "intro_analysis_combined",
       "type": "string",
       "is_array": false
     }
+  },
+  "prompts": {
   }
 }

data/workflow.yaml

@@ -25,23 +25,27 @@
     :output_attributes:
     - :intro_variations
     :prompt: Create 5 introduction variations for [first_draft].
-  - :name: SEO Analysis
+  - :name: Update Draft with Intro
     :order: 4
     :input_attributes:
     - :first_draft
+    - :intro_variation
     :output_attributes:
-    - :seo_analysis
-    :prompt: Analyze the blog post for SEO.
-- :name: Editing
-  :order: 2
-  :steps:
-  - :name: Edit Draft
-    :order: 1
+    - :second_draft
+    :prompt: Update [first_draft] with a better intro [intro_variation].
+  - :name: Analyse Intro
+    :order: 5
     :input_attributes:
-    - :first_draft
+    - :second_draft
     :output_attributes:
-    - :first_draft
-    :prompt: Edit [first_draft] for grammar, style, and clarity.
+    - :intro_analysis
+    :prompt: Analyze the article [second_draft] introduction
+  - :name: Combine Intro Analysis
+    :order: 6
+    :input_attributes: []
+    :output_attributes:
+    - :intro_analysis_combined
+    :prompt: ''
 :attributes:
   :transcript:
     :name: :transcript
@@ -59,7 +63,20 @@
     :name: :intro_variations
     :type: :array
     :is_array: false
-  :seo_analysis:
-    :name: :seo_analysis
+  :intro_variation:
+    :name: :intro_variation
+    :type: :string
+    :is_array: false
+  :second_draft:
+    :name: :second_draft
+    :type: :string
+    :is_array: false
+  :intro_analysis:
+    :name: :intro_analysis
+    :type: :string
+    :is_array: false
+  :intro_analysis_combined:
+    :name: :intro_analysis_combined
     :type: :string
     :is_array: false
+:prompts: {}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ad-agent_architecture
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.11
 platform: ruby
 authors:
 - David Cruwys
@@ -86,7 +86,13 @@ files:
 - lib/ad/agent_architecture/dsl/actions/save_database.rb
 - lib/ad/agent_architecture/dsl/actions/save_json.rb
 - lib/ad/agent_architecture/dsl/actions/save_yaml.rb
-- lib/ad/agent_architecture/dsl/agent_workflow_dsl.rb
+- lib/ad/agent_architecture/dsl/agent_dsl.rb
+- lib/ad/agent_architecture/dsl/agent_workflow_dsl.rb.old
+- lib/ad/agent_architecture/dsl/attribute_dsl.rb
+- lib/ad/agent_architecture/dsl/prompt_dsl.rb
+- lib/ad/agent_architecture/dsl/section_dsl.rb
+- lib/ad/agent_architecture/dsl/step_dsl.rb
+- lib/ad/agent_architecture/dsl/workflow_dsl.rb
 - lib/ad/agent_architecture/report/workflow_detail_report.rb
 - lib/ad/agent_architecture/report/workflow_list_report.rb
 - lib/ad/agent_architecture/sql/workflow_details.sql