ad-agent_architecture 0.0.11 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e62425f0ffeff140581be7741ce8b429fb9437a196294e071d017e343894562
-  data.tar.gz: b7da8713c09d8179f840a676787aac6608143fde09a112fbe683c9205e9a37d2
+  metadata.gz: c41297848057dc821b24cf29aa498f6cf409a03ca73d742d00cc44dc82a77a23
+  data.tar.gz: 187f2ba5232c9f28e11812a1458e3ee24aea85019465c31ee851f1ec3ca06489
 SHA512:
-  metadata.gz: 9e11fffa978aa478142fe2a540c08c2917aa9a169ab0c19f35a19ea449fb7d9a6b06ddbce72a58b489cd50a367cd2e2dd571622f818a14ad63813a770c931626
-  data.tar.gz: 733bf3314271fa108de844ffc4fb2189bb7d77742bbfae31e2316b2883995eb2bc21d2888b49da7954db0865bf9cb9c226edce7cc4bde490f4fda535f206f222
+  metadata.gz: 17fb7a95b7fc0d0259be2574be526d638de70cd5c25ffefcd22318c8a01b296537a544e249445594e4a32a65676b1d58eb8cb367f46a613084961671698ca994
+  data.tar.gz: f930948d7983e1dbced9d35379b3fff71e8145966bad9c63829494bb9f8850d3c4514de345536f852f4f622f11bd64e074b0dce2aa1b2b2b56c3a0e28085a2a2

data/.rubocop.yml

@@ -90,12 +90,14 @@ Lint/AmbiguousBlockAssociation:
 
 Style/AccessorGrouping:
   Enabled: false
+
 Metrics/AbcSize:
   Exclude:
     - "lib/ad/agent_architecture/**/*"
-Metrics/NoExpectationExample:
+
+Metrics/PerceivedComplexity:
   Exclude:
-    - "spec/ad/agent_architecture/dsl/*"
+    - "lib/ad/agent_architecture/dsl/actions/save_database.rb"
 
 Layout/SpaceBeforeComma:
   Enabled: false
@@ -112,18 +114,21 @@ RSpec/SpecFilePathSuffix:
   Enabled: true
 
 RSpec/NamedSubject:
-  Exclude:
-    - "**/spec/**/*"
+  Enabled: false
 
 RSpec/ExampleLength:
-  Exclude:
-    - "**/spec/**/*"
+  Enabled: false
 
 RSpec/MultipleExpectations:
   Max: 3
   Exclude:
     - "spec/ad/agent_architecture/dsl/actions/save_database_spec.rb"
 
+RSpec/MultipleMemoizedHelpers:
+  Enabled: false
+
 Metrics/CyclomaticComplexity:
   Exclude:
     - "lib/ad/agent_architecture/dsl/actions/save_database.rb"
+
+

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [0.0.12](https://github.com/appydave/ad-agent_architecture/compare/v0.0.11...v0.0.12) (2024-07-02)
+
+
+### Bug Fixes
+
+* refactor DSL and Child DSL components, add support for prompt loading ([f260260](https://github.com/appydave/ad-agent_architecture/commit/f260260ea416d0c9d3a39dc1dd7fd0b66d145a80))
+
+## [0.0.11](https://github.com/appydave/ad-agent_architecture/compare/v0.0.10...v0.0.11) (2024-06-29)
+
+
+### Bug Fixes
+
+* improve reports ([62aac63](https://github.com/appydave/ad-agent_architecture/commit/62aac63af8b48b30514f21b940005e899538307f))
+
 ## [0.0.10](https://github.com/appydave/ad-agent_architecture/compare/v0.0.9...v0.0.10) (2024-06-29)
 
 

data/Gemfile

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

data/Guardfile

@@ -27,10 +27,4 @@ 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/bin/watch.rb

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+puts 'Watch Agent Workflow DSLs'
+
+require 'pry'
+require 'listen'
+
+$LOAD_PATH.unshift(File.expand_path('../lib', __dir__))
+
+require 'ad/agent_architecture'
+
+directory_to_watch = File.expand_path('../spec/usecases', __dir__)
+
+callback = proc do |modified, added, _removed|
+  (modified + added).each do |file|
+    if file.match(%r{spec/usecases/.+\.rbx$})
+      # puts "Detected change in #{file}, running command..."
+      load file
+    end
+  end
+end
+
+listener = Listen.to(directory_to_watch, &callback)
+listener.start
+
+puts "Listening for changes in #{directory_to_watch}..."
+
+sleep

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

@@ -11,12 +11,15 @@ module Ad
           end
 
           def save
+            # puts JSON.pretty_generate(@workflow_hash)
             DB.transaction do
+              # puts "Saving Workflow: #{@workflow_hash[:name]}"
               # Save workflow
               workflow_record = Ad::AgentArchitecture::Database::Workflow.create(name: @workflow_hash[:name])
 
-              # Save attributes
+              # Saving attributes
               attribute_records = @workflow_hash[:attributes].map do |_name, attr|
+                # puts "Saving Attribute: #{attr}"
                 Ad::AgentArchitecture::Database::Attribute.create(
                   name: attr[:name], type: attr[:type], is_array: attr[:is_array], workflow: workflow_record
                 )
@@ -26,6 +29,7 @@ module Ad
 
               # Save prompts
               @workflow_hash[:prompts].each_value do |prompt|
+                # puts "Saving Prompt: #{prompt}"
                 Ad::AgentArchitecture::Database::Prompt.create(
                   name: prompt[:name], path: prompt[:path], content: prompt[:content], workflow: workflow_record
                 )
@@ -33,22 +37,26 @@ module Ad
 
               # Save sections and steps
               @workflow_hash[:sections].each do |section|
+                # puts "Saving Section: #{section}"
                 section_record = Ad::AgentArchitecture::Database::Section.create(
                   name: section[:name], order: section[:order], workflow: workflow_record
                 )
 
                 section[:steps].each do |step|
+                  # puts "Saving Step: #{step}"
                   step_record = Ad::AgentArchitecture::Database::Step.create(
                     name: step[:name], order: step[:order], prompt: step[:prompt], section: section_record
                   )
 
                   step[:input_attributes].each do |attr_name|
+                    # puts "Saving Input Attribute for Step: #{attr_name}"
                     Ad::AgentArchitecture::Database::InputAttribute.create(
                       step: step_record, attribute: attribute_map[attr_name.to_sym]
                     )
                   end
 
                   step[:output_attributes].each do |attr_name|
+                    # puts "Saving Output Attribute for Step: #{attr_name}"
                     Ad::AgentArchitecture::Database::OutputAttribute.create(
                       step: step_record, attribute: attribute_map[attr_name.to_sym]
                     )
@@ -56,6 +64,9 @@ module Ad
                 end
               end
             end
+          rescue StandardError => e
+            puts "An error occurred: #{e.message}"
+            raise
           end
         end
       end

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

@@ -7,16 +7,22 @@ module Ad
       class AgentDsl
         attr_reader :workflow
 
-        def self.create(name:, &block)
+        def self.create(name, &block)
           new(name).tap do |dsl|
             dsl.instance_eval(&block) if block_given?
           end
         end
 
         def initialize(name)
+          raise ArgumentError, 'Agent name must be a string or symbol' unless name.is_a?(String) || name.is_a?(Symbol)
+
           @workflow = WorkflowDsl.new(name)
         end
 
+        def settings(&block)
+          @workflow.settings(&block)
+        end
+
         def attributes(&block)
           @workflow.attributes(&block)
         end
@@ -25,8 +31,10 @@ module Ad
           @workflow.prompts(&block)
         end
 
-        def section(name:, &block)
-          @workflow.section(name: name, &block)
+        def section(name, &block)
+          raise ArgumentError, 'Section name must be a string or symbol' unless name.is_a?(String) || name.is_a?(Symbol)
+
+          @workflow.section(name, &block)
         end
 
         def save

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

@@ -4,13 +4,11 @@ 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
-
+      class AttributeDsl < ChildDsl
         def attribute(name, type:, is_array: false)
-          @attributes[name] = { name: name, type: type, is_array: is_array }
+          raise ArgumentError, 'Attribute name must be a string or symbol' unless name.is_a?(String) || name.is_a?(Symbol)
+
+          workflow[:attributes][name] = { name: name, type: type, is_array: is_array }
         end
       end
     end

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

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Ad
+  module AgentArchitecture
+    module Dsl
+      # This is the base class for all child DSLs
+      class ChildDsl
+        attr_reader :workflow
+
+        def initialize(workflow)
+          @workflow = workflow
+        end
+      end
+    end
+  end
+end

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

@@ -4,13 +4,19 @@ module Ad
   module AgentArchitecture
     module Dsl
       # This class is responsible for defining the prompts of a workflow
-      class PromptDsl
-        def initialize(prompts)
-          @prompts = prompts
+      class PromptDsl < ChildDsl
+        def prompt(name, path: nil, content: nil)
+          raise ArgumentError, 'Prompt name must be a string or symbol' unless name.is_a?(String) || name.is_a?(Symbol)
+
+          workflow[:prompts][name] = { name: name, content: content }
         end
 
-        def prompt(name, path: nil, content: nil)
-          @prompts[name] = { name: name, path: path, content: content }
+        def prompt_file(file)
+          prompt_path = workflow[:settings][:prompt_path]
+          raise 'Prompt path not defined in settings. Set "prompt_path" to the path where you are keping prompts' unless prompt_path
+
+          full_path = File.join(prompt_path, file)
+          File.read(full_path)
         end
       end
     end

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

@@ -4,16 +4,19 @@ module Ad
   module AgentArchitecture
     module Dsl
       # This class is responsible for creating a section in the workflow
-      class SectionDsl
-        def initialize(name, order, sections)
+      class SectionDsl < ChildDsl
+        def initialize(workflow, name, order)
+          super(workflow)
+
           @section = { name: name, order: order, steps: [] }
-          @sections = sections
+          @workflow[:sections] << @section
           @current_step_order = 1
-          @sections << @section
         end
 
-        def step(name:, &block)
-          StepDsl.new(name, @current_step_order, @section[:steps]).instance_eval(&block)
+        def step(name, &block)
+          raise ArgumentError, 'Step name must be a string or symbol' unless name.is_a?(String) || name.is_a?(Symbol)
+
+          StepDsl.new(workflow, @section, name, @current_step_order).instance_eval(&block)
           @current_step_order += 1
         end
       end

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

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Ad
+  module AgentArchitecture
+    module Dsl
+      # This class is responsible for defining the settings of a workflow
+      class SettingsDsl < ChildDsl
+        def method_missing(name, *args, &block)
+          if args.length == 1 && block.nil?
+            workflow[:settings][name] = args.first
+          else
+            super
+          end
+        end
+
+        def respond_to_missing?(_name, _include_private = false)
+          true
+        end
+      end
+    end
+  end
+end

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

@@ -4,11 +4,22 @@ 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
+      class StepDsl < ChildDsl
+        attr_reader :section
+        attr_reader :step
+
+        def initialize(workflow, section, name, order)
+          super(workflow)
+          @step = {
+            name: name,
+            order: order,
+            prompt: '',
+            input_attributes: [],
+            output_attributes: []
+          }
+
+          @section = section
+          @section[:steps] << @step
         end
 
         def input(attr_name, **_opts)

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

@@ -8,24 +8,33 @@ module Ad
         attr_reader :workflow
 
         def initialize(name)
-          @workflow = { name: name, sections: [], attributes: {}, prompts: {} }
+          @workflow = { name: name, sections: [], attributes: {}, prompts: {}, settings: {} }
           @current_section_order = 1
         end
 
+        def settings(&block)
+          dsl = SettingsDsl.new(@workflow)
+          dsl.instance_eval(&block) if block_given?
+          dsl
+        end
+
         def attributes(&block)
-          dsl = AttributeDsl.new(@workflow[:attributes])
+          dsl = AttributeDsl.new(@workflow)
           dsl.instance_eval(&block) if block_given?
+          dsl
         end
 
         def prompts(&block)
-          dsl = PromptDsl.new(@workflow[:prompts])
+          dsl = PromptDsl.new(@workflow)
           dsl.instance_eval(&block) if block_given?
+          dsl
         end
 
-        def section(name:, &block)
-          dsl = SectionDsl.new(name, @current_section_order, @workflow[:sections])
-          dsl.instance_eval(&block) if block_given?
+        def section(name, &block)
+          dsl = SectionDsl.new(@workflow, name, @current_section_order)
           @current_section_order += 1
+          dsl.instance_eval(&block) if block_given?
+          dsl
         end
       end
     end

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

@@ -22,7 +22,7 @@ module Ad
               # 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(', ')
+              log.kv 'Output Attributes', step.output_attributes.map { |oa| oa.attribute&.name }.join(', ')
             end
           end
         end

data/lib/ad/agent_architecture/version.rb

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

data/lib/ad/agent_architecture.rb

@@ -13,10 +13,12 @@ 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/child_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/settings_dsl'
 require 'ad/agent_architecture/dsl/workflow_dsl'
 require 'ad/agent_architecture/dsl/agent_dsl'
 require 'ad/agent_architecture/dsl/actions/save_database'
@@ -25,15 +27,25 @@ 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'
+# AgentDsl Alias
 Agent = Ad::AgentArchitecture::Dsl::AgentDsl
 
 module Ad
+  # Module for the Agent Architecture gem
   module AgentArchitecture
     # raise Ad::AgentArchitecture::Error, 'Sample message'
     Error = Class.new(StandardError)
 
-    # Your code goes here...
+    # Define the root path of the gem
+    ROOT_PATH = Pathname.new(File.expand_path('../..', __dir__))
+
+    def self.gem_root
+      ROOT_PATH
+    end
+
+    def self.gem_relative_file(*args)
+      File.join(ROOT_PATH, *args)
+    end
   end
 end
 

data/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "ad-agent_architecture",
-  "version": "0.0.11",
+  "version": "0.0.13",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "ad-agent_architecture",
-      "version": "0.0.11",
+      "version": "0.0.13",
       "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.11",
+  "version": "0.0.13",
   "description": "Architecture/Schema for AI Agents",
   "scripts": {
     "release": "semantic-release"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ad-agent_architecture
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.13
 platform: ruby
 authors:
 - David Cruwys
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-06-29 00:00:00.000000000 Z
+date: 2024-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: k_log
@@ -75,6 +75,7 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- bin/watch.rb
 - docs/erd.svg
 - docs/images/sample-workflow.png
 - docs/requirements.md
@@ -87,10 +88,11 @@ files:
 - lib/ad/agent_architecture/dsl/actions/save_json.rb
 - lib/ad/agent_architecture/dsl/actions/save_yaml.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/child_dsl.rb
 - lib/ad/agent_architecture/dsl/prompt_dsl.rb
 - lib/ad/agent_architecture/dsl/section_dsl.rb
+- lib/ad/agent_architecture/dsl/settings_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

data/lib/ad/agent_architecture/dsl/agent_workflow_dsl.rb.old

@@ -1,84 +0,0 @@
-# frozen_string_literal: true
-
-module Ad
-  module AgentArchitecture
-    module Dsl
-      # DSL for defining agent workflows
-      class AgentWorkflowDsl
-        def self.create(name:, &block)
-          new(name).tap do |dsl|
-            dsl.instance_eval(&block) if block_given?
-          end
-        end
-
-        def initialize(name)
-          @workflow = { name: name, sections: [], attributes: {}, prompts: [] }
-          @current_section_order = 1
-        end
-
-        def attributes(&block)
-          instance_eval(&block) if block_given?
-        end
-
-        def attribute(name, type:, is_array: false)
-          @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: [] }
-          @current_section_order += 1
-          instance_eval(&block) if block_given?
-          @workflow[:sections] << @current_section
-        end
-
-        def step(name:, &block)
-          @current_step = { name: name, order: @current_step_order, input_attributes: [], output_attributes: [] }
-          @current_step_order += 1
-          instance_eval(&block) if block_given?
-          @current_section[:steps] << @current_step
-        end
-
-        def input(attr_name, **_opts)
-          @current_step[:input_attributes] << attr_name
-        end
-
-        def output(attr_name, **_opts)
-          @current_step[:output_attributes] << attr_name
-        end
-
-        def prompt(prompt_text, **_opts)
-          @current_step[:prompt] = prompt_text
-        end
-
-        def save
-          Ad::AgentArchitecture::Dsl::Actions::SaveDatabase.new(@workflow).save
-
-          self
-        end
-
-        def save_json(file_name: nil)
-          full_file_name = file_name || 'workflow.json'
-          Ad::AgentArchitecture::Dsl::Actions::SaveJson.new(@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).save(full_file_name)
-
-          self
-        end
-      end
-    end
-  end
-end