generative_ui 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df2a6ce2fc73069777780c94ee27b0b5a42d547967e3fc2a10c71b000c8b8dfa
-  data.tar.gz: fc79d3abe16ad49b5cca16d3afe605ec9dd324a88d212ae497c90f602452373b
+  metadata.gz: fb665b5e260116d8e3afdeadbb670906145e58b90231215ee2e6a055f0495d7d
+  data.tar.gz: 78499012634cab55dc364d04d316c801d41dc13e9ccaccb0c315d542232a2570
 SHA512:
-  metadata.gz: e8d303d2d70e8e2bee59e84cbe7e512494233361a347c4e938550f21ddae1e6937c4e60cba11a3a9358388d7751f315388f074d4656c2a4309e75972918db988
-  data.tar.gz: c5b6c4c975352d732b1f91696f4f3f65677bbc9654e3e6ce39c0aa071044e36b4d3deacb9fc28e8ed9c2ca43417fd662b15d9b25505b219a3b306f300ca1d43a
+  metadata.gz: dc82dc45a8d222d27c10704bf987a0141a85385af29543294b2da99685e52626a2ef1d9e47b95201df74481bcbbe6b8cabce5ddc2c47f9d5a86f8e345d05acf2
+  data.tar.gz: e68ce4aac53939817eb6064b0b3caf5f1a3972c8d5c42d13a1e6ccb150dede902a0c0f887647443f5c526930f5beaa891c2d0dd5732d6212497de75c27e0e140

data/README.md

@@ -32,7 +32,7 @@ class ApplicationGenerativeCatalog < GenerativeUI::Catalog
 end
 ```
 
-Component attributes use `RubyLLM::Schema`. Structural refs use `one_component` for one child id and `many_components` for ordered child ids.
+Component attributes use the `Schematist::Schema` DSL (the schema library behind RubyLLM 2.0 tools). Structural refs use `one_component` for one child id and `many_components` for ordered child ids.
 
 Register the default catalog explicitly:
 
@@ -82,7 +82,7 @@ chat.with_instructions(<<~PROMPT)
   - IMPORTANT: after calling generate_ui, do not add a final text answer.
     The tool call itself is the user-visible UI response.
 PROMPT
-chat.with_tool(tool)
+chat.with_tools(tool)
 
 chat.ask("What programming language was designed to make developers happy and also turned out to be especially token-efficient for LLMs? Name its iconic web framework too, and present the answer as a titled card with one short explanation.")
 ```
@@ -112,7 +112,7 @@ The partial hides only `InvalidComponentTreeError`; configuration and rendering
 
 ```ruby
 tool = GenerativeUI::Tool.new(catalog: :support)
-chat.with_tool(tool)
+chat.with_tools(tool)
 ```
 
 ```erb

data/generative_ui.gemspec

@@ -26,6 +26,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = [ "lib" ]
 
   spec.add_dependency "activesupport", ">= 7.0"
-  spec.add_dependency "ruby_llm",      "~> 1.15"
+  spec.add_dependency "ruby_llm",      "~> 2.0"
+  spec.add_dependency "schematist",    "~> 1.1"
   spec.add_dependency "json_schemer",  "~> 2.5"
 end

data/lib/generative_ui/attributes.rb

@@ -39,9 +39,14 @@ module GenerativeUI
       end
     end
 
+    # Schematist builds nested objects from a bare Schematist::Schema subclass, so
+    # `one_component`/`many_components` would be undefined inside an `object` block.
+    # Build them from the current class instead so the structural DSL stays available.
     module LocalSchemaBuilders
-      def object_schema(description: nil, of: nil, &block)
-        return determine_object_reference(of, description) if of
+      private
+
+      def build_object_schema(description, &block)
+        raise Schematist::InvalidObjectTypeError, 'An object needs a block or an `of:` schema to describe it.' unless block
 
         sub_schema = Class.new(self)
         result = sub_schema.class_eval(&block)
@@ -51,18 +56,14 @@ module GenerativeUI
         elsif schema_class?(result) && sub_schema.properties.empty?
           schema_class_to_inline_schema(result).merge(description ? { description: description } : {})
         else
-          {
-            type: 'object',
-            properties: sub_schema.properties,
-            required: sub_schema.required_properties,
-            additionalProperties: sub_schema.additional_properties,
-            description: description
-          }.compact
+          schema = schema_for(sub_schema)
+          schema[:description] = description if description
+          schema
         end
       end
     end
 
-    class Schema < RubyLLM::Schema
+    class Schema < Schematist::Schema
       extend StructuralDsl
       extend LocalSchemaBuilders
 
@@ -92,8 +93,15 @@ module GenerativeUI
       @schema_class = schema_class
     end
 
+    # The schema as declared, with snake_case names and structural-ref metadata intact.
+    # Schematist#to_json_schema stringifies keys and values and adds document headers,
+    # so read the schema body straight from the class instead.
+    def raw_schema
+      @raw_schema ||= schema_class.send(:schema_for, schema_class)
+    end
+
     def json_schema
-      @json_schema ||= camelize_schema(schema_class.new.to_json_schema.fetch(:schema))
+      @json_schema ||= camelize_schema(raw_schema)
     end
 
     def structural_refs

data/lib/generative_ui/catalog.rb

@@ -239,7 +239,7 @@ module GenerativeUI
 
     def validate_component_fields!
       definitions.each do |definition|
-        raw_schema = definition.attributes_definition&.schema_class&.new&.to_json_schema&.fetch(:schema)
+        raw_schema = definition.attributes_definition&.raw_schema
         next unless raw_schema
 
         validate_schema_fields!(definition, raw_schema)

data/lib/generative_ui/component_definition.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'ruby_llm/schema'
+require 'schematist'
 
 module GenerativeUI
   class ComponentDefinition

data/lib/generative_ui/tool.rb

@@ -46,8 +46,8 @@ module GenerativeUI
       TEXT
     end
 
-    def params_schema
-      @params_schema ||= JSON.parse(catalog.tool_arguments_schema.to_json)
+    def parameters_schema
+      @parameters_schema ||= JSON.parse(catalog.tool_arguments_schema.to_json)
     end
 
     def execute(**args)

data/lib/generative_ui/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GenerativeUI
-  VERSION = '0.0.1'
+  VERSION = '0.1.0'
 end

data/lib/generative_ui.rb

@@ -3,7 +3,7 @@
 require 'active_support'
 require 'active_support/concern'
 require 'active_support/core_ext'
-require 'ruby_llm/schema'
+require 'schematist'
 require 'json'
 
 require_relative 'generative_ui/version'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: generative_ui
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Andrey Samsonov
@@ -29,14 +29,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: schematist
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: json_schemer
   requirement: !ruby/object:Gem::Requirement