ad-agent_architecture 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e62425f0ffeff140581be7741ce8b429fb9437a196294e071d017e343894562
-  data.tar.gz: b7da8713c09d8179f840a676787aac6608143fde09a112fbe683c9205e9a37d2
+  metadata.gz: cbe6603e537c91457b8d7a3694ecaa23f77eec779bc43ae46a175f37c51e957b
+  data.tar.gz: a65c74eae0fc6fdd21296f5da8b6b03d1ef46f6a6dd407d1b6deb38577dbf116
 SHA512:
-  metadata.gz: 9e11fffa978aa478142fe2a540c08c2917aa9a169ab0c19f35a19ea449fb7d9a6b06ddbce72a58b489cd50a367cd2e2dd571622f818a14ad63813a770c931626
-  data.tar.gz: 733bf3314271fa108de844ffc4fb2189bb7d77742bbfae31e2316b2883995eb2bc21d2888b49da7954db0865bf9cb9c226edce7cc4bde490f4fda535f206f222
+  metadata.gz: 9e9c114cd087a31e91352a3c9165cbad5b3e11b8668a77c37bd3226503e4746e2e6cdd53fb30b9c0b3a2bba84b4b050b32bce525b9b1d4e79ce215e9a7355f33
+  data.tar.gz: c0473487b838ebc28e5a59ef16b9b9d77e3a4bb3ba210f1ff771a1747053736500747dd06542c482b5326a5cd97b8e1d9058a0697e02bae9b9f1dbc76e343a15

data/.rubocop.yml

@@ -93,9 +93,6 @@ Style/AccessorGrouping:
 Metrics/AbcSize:
   Exclude:
     - "lib/ad/agent_architecture/**/*"
-Metrics/NoExpectationExample:
-  Exclude:
-    - "spec/ad/agent_architecture/dsl/*"
 
 Layout/SpaceBeforeComma:
   Enabled: false
@@ -112,18 +109,19 @@ 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,10 @@
+## [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/Guardfile

@@ -28,9 +28,9 @@ group :green_pass_then_cop, halt_on_fail: true do
     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
+  # 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/dsl/agent_dsl.rb

@@ -17,6 +17,10 @@ module Ad
           @workflow = WorkflowDsl.new(name)
         end
 
+        def settings(&block)
+          @workflow.settings(&block)
+        end
+
         def attributes(&block)
           @workflow.attributes(&block)
         end
@@ -25,8 +29,8 @@ module Ad
           @workflow.prompts(&block)
         end
 
-        def section(name:, &block)
-          @workflow.section(name: name, &block)
+        def section(name, &block)
+          @workflow.section(name, &block)
         end
 
         def save

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

@@ -4,13 +4,9 @@ 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 }
+          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,17 @@ 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)
+          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' 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,17 @@ 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)
+          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

@@ -5,10 +5,16 @@ module Ad
     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
+        def initialize(_workflow, section, name, order)
+          @step = {
+            name: name,
+            order: order,
+            prompt: '',
+            input_attributes: [],
+            output_attributes: []
+          }
+
+          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.12'
   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.12",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "ad-agent_architecture",
-      "version": "0.0.11",
+      "version": "0.0.12",
       "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.12",
   "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.12
 platform: ruby
 authors:
 - David Cruwys
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-06-29 00:00:00.000000000 Z
+date: 2024-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: k_log
@@ -89,8 +89,10 @@ files:
 - 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