ask-tools 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d96e703071657b83c628b1ee0ef7d810a41b4792e349c2b821211d0289db7888
-  data.tar.gz: 5f2e7ef5d18005f88e31149721351a0b1f361ac54fdda073294c9d27762acdf5
+  metadata.gz: 7672f4d067288ae4d37530eb3884b818355d6a3aeaaefc14594224e7c4794b9d
+  data.tar.gz: fe3d5ba56939e98775c4e80edec495d40d14fb8bd6d71b2d594d9a3484fc0d13
 SHA512:
-  metadata.gz: 247461f2d7527f39653bf6fcbc35026ca5bd03d4943066d881aa364cf50191845d0707ee21bc233ba620698f6ed3110535f89f28af989de354cc735907166a8f
-  data.tar.gz: 16a50fc193ed557e585064b2804bab91481f38e57529a55f42c5b39af6698690654faa3d1084ee9bda636d623d6d7aa9e98b404de99bc36064e45a7705b2d772
+  metadata.gz: '08a09910d9ace8bbdb32640e3049e30bbefb8fd6a18ea4594f000441b71029815ad0bf9ef22e2ef0c9da727de29f2f1ee3d3aa99f6ac1162a6a7987270384b2e'
+  data.tar.gz: dc70926d230847a1a6d114986c8042cc8a91fc7f9ce448b0354d19f6d613906287ff0fd777d0dd737ade6e5fcf693376a8ab4125e6b7102c703bc681a24ede35

data/lib/ask/tools/tool.rb

@@ -48,6 +48,49 @@ module Ask
         @provider_params ||= {}
       end
 
+      def params_schema
+        @params_schema ||= begin
+          if @params_schema_definition
+            deep_stringify_keys(resolve_params_schema(@params_schema_definition))
+          elsif @parameters && @parameters.any?
+            build_schema_from_params
+          else
+            nil
+          end
+        end
+      end
+
+      def build_schema_from_params
+        properties = parameters.to_h do |_name, param|
+          schema = { type: param.type }
+          schema[:description] = param.description if param.description
+          schema[:items] = { type: "string" } if param.type == "array"
+          [param.name.to_s, schema]
+        end
+        required = parameters.select { |_, p| p.required }.keys.map(&:to_s)
+        { type: "object", properties: properties, required: required, additionalProperties: false }
+      end
+
+      def resolve_params_schema(definition)
+        case definition
+        when Proc
+          schema_class = Ask::Schema.create(&definition)
+          schema_class.new.to_json_schema.dig(:schema)
+        when Hash then definition
+        when ->(d) { d.respond_to?(:to_json_schema) }
+          definition.to_json_schema.dig(:schema)
+        else nil
+        end
+      end
+
+      def deep_stringify_keys(obj)
+        case obj
+        when Hash then obj.each_with_object({}) { |(k, v), h| h[k.to_s] = deep_stringify_keys(v) }
+        when Array then obj.map { |v| deep_stringify_keys(v) }
+        else obj
+        end
+      end
+
       private
 
       def validate_param_type!(type, name)
@@ -89,10 +132,11 @@ module Ask
       self.class.parameters
     end
 
-    def call(args = {})
+      def call(args = {}, abort_controller = nil)
       normalized = normalize_args(args)
       validation = validate(normalized)
       return Ask::Result.failure(validation) if validation
+      normalized[:_abort_controller] = abort_controller if abort_controller
       execute(**normalized)
     rescue Halt => e
       Ask::Result.ok(data: e.content, metadata: { halted: true })
@@ -100,7 +144,7 @@ module Ask
       Ask::Result.failure("#{self.class.name.split('::').last} raised #{e.class}: #{e.message}")
     end
 
-    def execute(**)
+      def execute(**args)
       raise NotImplementedError, "#{self.class} must implement #execute(**args)"
     end
 

data/lib/ask/version.rb

@@ -2,6 +2,6 @@
 
 module Ask
   module Tools
-    VERSION = "0.1.2"
+    VERSION = "0.2.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ask-tools
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Kaka Ruto