ad-agent_architecture 0.0.17 → 0.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e8653a9a481270318b46b2ef7d9974cdc1d1028a1381b43ff8a69b741ca6f24
-  data.tar.gz: e534b902fd7bf929225b06afdc7dc7c32ce1b2d033eb3b4a81ac593df9203131
+  metadata.gz: dac798e05760933625c449dbe26204f844588554476dd8d6ce32c443081881a9
+  data.tar.gz: 6b3fb54a748dbcf5a33b56e6de0c80b910ea429f67e31fbeaf7bf46c7dbb1de8
 SHA512:
-  metadata.gz: dc5fdfcdce78ceb2a0e666b41ae910843d712220d0384f487b4c6606d1365f0378cc1086adda7267bbbb09d3b5904afa60d781583be9fe0da67c8d4d883ffeb3
-  data.tar.gz: eca2c0f7662cf8c43563fd00eec0a89b94cec1cf12b21127dcfb021cda786b62cfd07b9469f1db0304e5cdab28321c566901c188d0e8bc4bc721037c1673b007
+  metadata.gz: 7b959b1130a64ef8956c35e98745bea434b6639b04c5796e53cb6ba8d91f2871377e45d5a439f024c0236e31d367d8d21ad3622b9641b8c5ad4eb4bddafafe34
+  data.tar.gz: b1d59d4aa15a2b85005c50098d42fef5d2ce32b08cb2b19183df0bc8f7e7f8299f8fb1a8bab311b329818c9f0679f95965fd8c3efc236561d27c7da2d47a8501

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## [0.0.17](https://github.com/appydave/ad-agent_architecture/compare/v0.0.16...v0.0.17) (2024-07-03)
+
+
+### Bug Fixes
+
+* cops ([36d85fc](https://github.com/appydave/ad-agent_architecture/commit/36d85fc622eaf609c12bbf2c2d81fd25daa17915))
+* update project plan ([eaf460d](https://github.com/appydave/ad-agent_architecture/commit/eaf460d5c12ec1383f47fd38ab76135f3d844b54))
+
 ## [0.0.16](https://github.com/appydave/ad-agent_architecture/compare/v0.0.15...v0.0.16) (2024-07-03)
 
 

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

@@ -38,21 +38,21 @@ module Ad
         end
 
         def save
-          Ad::AgentArchitecture::Dsl::Actions::SaveDatabase.new(@workflow.workflow).save
+          Ad::AgentArchitecture::Dsl::Actions::SaveDatabase.new(@workflow.data).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)
+          Ad::AgentArchitecture::Dsl::Actions::SaveJson.new(@workflow.data).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)
+          Ad::AgentArchitecture::Dsl::Actions::SaveYaml.new(@workflow.data).save(full_file_name)
 
           self
         end

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

@@ -8,17 +8,17 @@ module Ad
         def attribute(name, type:, is_array: false)
           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 }
+          attributes[name] = { name: name, type: type, is_array: is_array }
         end
 
         def infer_attribute(name)
           raise ArgumentError, 'Attribute name must be a string or symbol' unless name.is_a?(String) || name.is_a?(Symbol)
 
-          return if workflow[:attributes].key?(name)
+          return if attributes.key?(name)
 
           # May want to add more sophisticated type inference here
           type = name.to_s.end_with?('s') ? 'array' : 'string'
-          workflow[:attributes][name] = { name: name, type: type, is_array: type == 'array' }
+          attributes[name] = { name: name, type: type, is_array: type == 'array' }
         end
       end
     end

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

@@ -5,10 +5,15 @@ module Ad
     module Dsl
       # This is the base class for all child DSLs
       class ChildDsl
+        include DataAccessors
         attr_reader :workflow
 
-        def initialize(workflow)
-          @workflow = workflow
+        def initialize(workflow_dsl)
+          @workflow = workflow_dsl
+        end
+
+        def data
+          @workflow.data
         end
       end
     end

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

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module Ad
+  module AgentArchitecture
+    module Dsl
+      # Helper methods for accessing data in the workflow DSL
+      module DataAccessors
+        def settings
+          data[:settings]
+        end
+
+        def sections
+          data[:sections]
+        end
+
+        def get_setting(name)
+          settings[name.to_sym] || settings[name.to_s]
+        end
+
+        def attributes
+          data[:attributes]
+        end
+
+        def get_attribute(name)
+          attributes[name.to_sym] || attributes[name.to_s]
+        end
+
+        def prompts
+          data[:prompts]
+        end
+
+        def get_prompt(name)
+          prompts[name.to_sym] || prompts[name.to_s]
+        end
+      end
+    end
+  end
+end

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

@@ -8,11 +8,11 @@ module Ad
         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 }
+          prompts[name] = { name: name, content: content }
         end
 
         def prompt_file(file)
-          prompt_path = workflow[:settings][:prompt_path]
+          prompt_path = 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)

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

@@ -9,7 +9,7 @@ module Ad
           super(workflow)
 
           @section = { name: name, order: order, steps: [] }
-          @workflow[:sections] << @section
+          sections << @section
           @current_step_order = 1
         end
 

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

@@ -7,7 +7,7 @@ module Ad
       class SettingsDsl < ChildDsl
         def method_missing(name, *args, &block)
           if args.length == 1 && block.nil?
-            workflow[:settings][name] = args.first
+            data[:settings][name] = args.first
           else
             super
           end

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

@@ -35,6 +35,7 @@ module Ad
         end
 
         def prompt(prompt, **_opts)
+          # lookup_prompt = workflow.get_prompt(prompt)
           @step[:prompt] = prompt
         end
 

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

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

data/lib/ad/agent_architecture/version.rb

@@ -2,6 +2,6 @@
 
 module Ad
   module AgentArchitecture
-    VERSION = '0.0.17'
+    VERSION = '0.0.18'
   end
 end

data/lib/ad/agent_architecture.rb

@@ -13,6 +13,7 @@ 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/data_accessors'
 require 'ad/agent_architecture/dsl/child_dsl'
 require 'ad/agent_architecture/dsl/attribute_dsl'
 require 'ad/agent_architecture/dsl/prompt_dsl'

data/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "ad-agent_architecture",
-  "version": "0.0.17",
+  "version": "0.0.18",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "ad-agent_architecture",
-      "version": "0.0.17",
+      "version": "0.0.18",
       "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.17",
+  "version": "0.0.18",
   "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.17
+  version: 0.0.18
 platform: ruby
 authors:
 - David Cruwys
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-07-03 00:00:00.000000000 Z
+date: 2024-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: k_log
@@ -96,6 +96,7 @@ files:
 - lib/ad/agent_architecture/dsl/agent_dsl.rb
 - lib/ad/agent_architecture/dsl/attribute_dsl.rb
 - lib/ad/agent_architecture/dsl/child_dsl.rb
+- lib/ad/agent_architecture/dsl/data_accessors.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