girb-ruby_llm 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a587322ce50087756c3a8e0178062385ea59f83737fb8b9c70816777024b230a
-  data.tar.gz: 165288aad6307d5e658abc4f0385409752bab2f35b2e0cc9fe81f9a0f0fac05d
+  metadata.gz: cfe19c19205f70c38e3f95b1fca105e6c3c5d5c3398871e1a43cf5310e7bfb7a
+  data.tar.gz: 52dcce3593879b4bd66864f8928e5b7eb0aa1f4adc186c62bc665bfc217c1fd5
 SHA512:
-  metadata.gz: 15a8df02dcec847a6c884d7ffc099cb9c9a7bfa484d210b8796102ef60e6a2029828f1efdfe343fefec2196f889fb467eb2d0921cd28468b4d27f317a6a72645
-  data.tar.gz: 2cded93009f453527579f0cf9b1ba9c356760bb3f6dabb63b7aea122172a12d6454294d0a7b9a5f3d1972a8f92f65871e174dbf744d3ed19ffa36984d4308f3c
+  metadata.gz: e030b3dd7df74d07d15b6bfef72e61c7f5c1d9c6d8aa093eed9440855960c8e0773bb3046461a8d05e496e07d8891d6366a4e17bac299cb74d4d8da3bfb5fc2b
+  data.tar.gz: eb256345ace0da90621bd10069a4b0ed3dc94bc72b768d5da79cfd3cf4f558250fae6d9aa0aa3782aa66c632c86783931cf025739dab8dd6e1826b6010dca17f

data/CHANGELOG.md

@@ -1,5 +1,23 @@
 # Changelog
 
+## [0.1.2] - 2026-02-03
+
+### Fixed
+
+- Fix tool names being empty strings in dynamic RubyLLM::Tool classes
+- Properly execute girb tools within RubyLLM's auto-execute framework
+
+## [0.1.1] - 2026-02-03
+
+### Added
+
+- GIRB_MODEL environment variable support (required)
+- Auto-refresh models for local providers (Ollama, GPUStack)
+
+### Changed
+
+- Recommend ~/.irbrc configuration instead of environment variables
+
 ## [0.1.0] - 2025-02-02
 
 ### Added

data/README.md

@@ -8,43 +8,55 @@ This gem allows you to use multiple LLM providers (OpenAI, Anthropic, Google Gem
 
 ## Installation
 
+### For Rails Projects
+
 Add to your Gemfile:
 
 ```ruby
-gem 'girb'
-gem 'girb-ruby_llm'
+group :development do
+  gem 'girb-ruby_llm'
+end
 ```
 
-Or install directly:
+Then run:
 
 ```bash
-gem install girb girb-ruby_llm
+bundle install
 ```
 
-## Setup
+Create a `.girbrc` file in your project root:
 
-Set the provider and your API key:
+```ruby
+# .girbrc
+require 'girb-ruby_llm'
 
-```bash
-export GIRB_PROVIDER=girb-ruby_llm
-export GEMINI_API_KEY=your-api-key  # or other provider's API key
+Girb.configure do |c|
+  c.provider = Girb::Providers::RubyLlm.new(model: 'gemini-2.5-flash')
+end
 ```
 
-Then start girb:
+Now `rails console` will automatically load girb!
+
+### For Non-Rails Projects
+
+Install globally:
 
 ```bash
-girb
+gem install girb girb-ruby_llm
 ```
 
-### Using with regular irb
-
-Add to your `~/.irbrc`:
+Create a `.girbrc` file in your project directory:
 
 ```ruby
+# .girbrc
 require 'girb-ruby_llm'
+
+Girb.configure do |c|
+  c.provider = Girb::Providers::RubyLlm.new(model: 'gemini-2.5-flash')
+end
 ```
 
-Then use regular `irb` command.
+Then use `girb` command instead of `irb`.
 
 ## Configuration
 
@@ -85,61 +97,94 @@ Set your API key or endpoint as an environment variable:
 
 ## Examples
 
+### Using Google Gemini
+
+```ruby
+# .girbrc
+require 'girb-ruby_llm'
+
+# Set GEMINI_API_KEY environment variable
+Girb.configure do |c|
+  c.provider = Girb::Providers::RubyLlm.new(model: 'gemini-2.5-flash')
+end
+```
+
 ### Using OpenAI
 
-```bash
-export GIRB_PROVIDER=girb-ruby_llm
-export OPENAI_API_KEY="sk-..."
-girb
+```ruby
+# .girbrc
+require 'girb-ruby_llm'
+
+# Set OPENAI_API_KEY environment variable
+Girb.configure do |c|
+  c.provider = Girb::Providers::RubyLlm.new(model: 'gpt-4o')
+end
 ```
 
 ### Using Anthropic Claude
 
-```bash
-export GIRB_PROVIDER=girb-ruby_llm
-export ANTHROPIC_API_KEY="sk-ant-..."
-girb
+```ruby
+# .girbrc
+require 'girb-ruby_llm'
+
+# Set ANTHROPIC_API_KEY environment variable
+Girb.configure do |c|
+  c.provider = Girb::Providers::RubyLlm.new(model: 'claude-sonnet-4-20250514')
+end
 ```
 
 ### Using Ollama (Local)
 
-```bash
-# Start Ollama first
-ollama serve
+```ruby
+# .girbrc
+require 'girb-ruby_llm'
 
-# Set the provider and API base URL
-export GIRB_PROVIDER=girb-ruby_llm
-export OLLAMA_API_BASE="http://localhost:11434/v1"
-girb
+# Set OLLAMA_API_BASE environment variable (e.g., http://localhost:11434/v1)
+Girb.configure do |c|
+  c.provider = Girb::Providers::RubyLlm.new(model: 'llama3.2:latest')
+end
 ```
 
 ### Using OpenAI-compatible APIs (e.g., LM Studio, vLLM)
 
-```bash
-export GIRB_PROVIDER=girb-ruby_llm
-export OPENAI_API_KEY="not-needed"  # Some require any non-empty value
-export OPENAI_API_BASE="http://localhost:1234/v1"
-girb
-```
+```ruby
+# .girbrc
+require 'girb-ruby_llm'
 
-### Manual Configuration
+# Set OPENAI_API_BASE and OPENAI_API_KEY environment variables
+Girb.configure do |c|
+  c.provider = Girb::Providers::RubyLlm.new(model: 'your-model-name')
+end
+```
 
-You can configure the provider manually in your `~/.irbrc`:
+### Advanced Configuration
 
 ```ruby
-# ~/.irbrc
+# .girbrc
 require 'girb-ruby_llm'
 
-RubyLLM.configure do |config|
-  config.ollama_api_base = "http://localhost:11434/v1"
-end
-RubyLLM::Models.refresh!
-
 Girb.configure do |c|
-  c.provider = Girb::Providers::RubyLlm.new(model: 'llama3.2:latest')
+  c.provider = Girb::Providers::RubyLlm.new(model: 'gemini-2.5-flash')
+  c.debug = true  # Enable debug output
+  c.custom_prompt = <<~PROMPT
+    Always confirm before destructive operations.
+  PROMPT
 end
 ```
 
+Note: `RubyLLM::Models.refresh!` is automatically called for local providers (Ollama, GPUStack).
+
+## Alternative: Environment Variable Configuration
+
+For the `girb` command, you can also configure via environment variables (used when no `.girbrc` is found):
+
+```bash
+export GIRB_PROVIDER=girb-ruby_llm
+export GIRB_MODEL=gemini-2.5-flash
+export GEMINI_API_KEY=your-api-key
+girb
+```
+
 ## Supported Models
 
 See [RubyLLM Available Models](https://rubyllm.com/reference/available-models) for the full list of supported models.

data/README_ja.md

@@ -6,43 +6,55 @@
 
 ## インストール
 
+### Railsプロジェクトの場合
+
 Gemfileに追加:
 
 ```ruby
-gem 'girb'
-gem 'girb-ruby_llm'
+group :development do
+  gem 'girb-ruby_llm'
+end
 ```
 
-または直接インストール:
+そして実行:
 
 ```bash
-gem install girb girb-ruby_llm
+bundle install
 ```
 
-## セットアップ
+プロジェクトルートに `.girbrc` ファイルを作成:
 
-プロバイダーとAPIキーを設定:
+```ruby
+# .girbrc
+require 'girb-ruby_llm'
 
-```bash
-export GIRB_PROVIDER=girb-ruby_llm
-export GEMINI_API_KEY=your-api-key  # または他のプロバイダーのAPIキー
+Girb.configure do |c|
+  c.provider = Girb::Providers::RubyLlm.new(model: 'gemini-2.5-flash')
+end
 ```
 
-girbを起動:
+これで `rails console` が自動的にgirbを読み込みます！
+
+### 非Railsプロジェクトの場合
+
+グローバルにインストール:
 
 ```bash
-girb
+gem install girb girb-ruby_llm
 ```
 
-### 通常のirbで使用する場合
-
-`~/.irbrc` に追加:
+プロジェクトディレクトリに `.girbrc` ファイルを作成:
 
 ```ruby
+# .girbrc
 require 'girb-ruby_llm'
+
+Girb.configure do |c|
+  c.provider = Girb::Providers::RubyLlm.new(model: 'gemini-2.5-flash')
+end
 ```
 
-通常の `irb` コマンドで使用できます。
+`irb` の代わりに `girb` コマンドを使用します。
 
 ## 設定
 
@@ -83,61 +95,94 @@ APIキーまたはエンドポイントを環境変数として設定します:
 
 ## 使用例
 
+### Google Geminiを使用
+
+```ruby
+# .girbrc
+require 'girb-ruby_llm'
+
+# GEMINI_API_KEY 環境変数を設定
+Girb.configure do |c|
+  c.provider = Girb::Providers::RubyLlm.new(model: 'gemini-2.5-flash')
+end
+```
+
 ### OpenAIを使用
 
-```bash
-export GIRB_PROVIDER=girb-ruby_llm
-export OPENAI_API_KEY="sk-..."
-girb
+```ruby
+# .girbrc
+require 'girb-ruby_llm'
+
+# OPENAI_API_KEY 環境変数を設定
+Girb.configure do |c|
+  c.provider = Girb::Providers::RubyLlm.new(model: 'gpt-4o')
+end
 ```
 
 ### Anthropic Claudeを使用
 
-```bash
-export GIRB_PROVIDER=girb-ruby_llm
-export ANTHROPIC_API_KEY="sk-ant-..."
-girb
+```ruby
+# .girbrc
+require 'girb-ruby_llm'
+
+# ANTHROPIC_API_KEY 環境変数を設定
+Girb.configure do |c|
+  c.provider = Girb::Providers::RubyLlm.new(model: 'claude-sonnet-4-20250514')
+end
 ```
 
 ### Ollama（ローカル）を使用
 
-```bash
-# まずOllamaを起動
-ollama serve
+```ruby
+# .girbrc
+require 'girb-ruby_llm'
 
-# プロバイダーとAPIベースURLを設定
-export GIRB_PROVIDER=girb-ruby_llm
-export OLLAMA_API_BASE="http://localhost:11434/v1"
-girb
+# OLLAMA_API_BASE 環境変数を設定（例: http://localhost:11434/v1）
+Girb.configure do |c|
+  c.provider = Girb::Providers::RubyLlm.new(model: 'llama3.2:latest')
+end
 ```
 
 ### OpenAI互換API（LM Studio、vLLMなど）を使用
 
-```bash
-export GIRB_PROVIDER=girb-ruby_llm
-export OPENAI_API_KEY="not-needed"  # 空でない値が必要な場合
-export OPENAI_API_BASE="http://localhost:1234/v1"
-girb
-```
+```ruby
+# .girbrc
+require 'girb-ruby_llm'
 
-### 手動設定
+# OPENAI_API_BASE と OPENAI_API_KEY 環境変数を設定
+Girb.configure do |c|
+  c.provider = Girb::Providers::RubyLlm.new(model: 'your-model-name')
+end
+```
 
-`~/.irbrc` でプロバイダーを手動で設定できます:
+### 詳細設定
 
 ```ruby
-# ~/.irbrc
+# .girbrc
 require 'girb-ruby_llm'
 
-RubyLLM.configure do |config|
-  config.ollama_api_base = "http://localhost:11434/v1"
-end
-RubyLLM::Models.refresh!
-
 Girb.configure do |c|
-  c.provider = Girb::Providers::RubyLlm.new(model: 'llama3.2:latest')
+  c.provider = Girb::Providers::RubyLlm.new(model: 'gemini-2.5-flash')
+  c.debug = true  # デバッグ出力を有効化
+  c.custom_prompt = <<~PROMPT
+    破壊的操作の前に必ず確認してください。
+  PROMPT
 end
 ```
 
+注: ローカルプロバイダー（Ollama、GPUStack）使用時は`RubyLLM::Models.refresh!`が自動的に呼ばれます。
+
+## 代替: 環境変数での設定
+
+`girb` コマンドでは、`.girbrc` が見つからない場合に環境変数で設定することもできます:
+
+```bash
+export GIRB_PROVIDER=girb-ruby_llm
+export GIRB_MODEL=gemini-2.5-flash
+export GEMINI_API_KEY=your-api-key
+girb
+```
+
 ## 対応モデル
 
 サポートされているモデルの完全なリストは[RubyLLM Available Models](https://rubyllm.com/reference/available-models)を参照してください。

data/lib/girb/providers/ruby_llm.rb

@@ -6,11 +6,23 @@ require "girb/providers/base"
 module Girb
   module Providers
     class RubyLlm < Base
+      # Thread-local storage for current binding
+      def self.current_binding=(binding)
+        Thread.current[:girb_ruby_llm_binding] = binding
+      end
+
+      def self.current_binding
+        Thread.current[:girb_ruby_llm_binding]
+      end
+
       def initialize(model: nil)
         @model = model
       end
 
-      def chat(messages:, system_prompt:, tools:)
+      def chat(messages:, system_prompt:, tools:, binding: nil)
+        # Store binding for tool execution
+        self.class.current_binding = binding
+
         # Use specified model or RubyLLM's default
         chat_options = @model ? { model: @model } : {}
         ruby_llm_chat = ::RubyLLM.chat(**chat_options)
@@ -29,7 +41,7 @@ module Girb
         last_message = messages.last
         last_content = extract_content(last_message)
 
-        # Send the request
+        # Send the request - RubyLLM will auto-execute tools
         response = ruby_llm_chat.ask(last_content)
 
         parse_response(response)
@@ -37,6 +49,8 @@ module Girb
         Response.new(error: "API Error: #{e.message}")
       rescue StandardError => e
         Response.new(error: "Error: #{e.message}")
+      ensure
+        self.class.current_binding = nil
       end
 
       private
@@ -108,11 +122,42 @@ module Girb
                   required: required_params.include?(prop_name.to_s) || required_params.include?(prop_name)
           end
 
-          # Override name method to return the custom name
+          # Store tool_name for execute method and override name for RubyLLM
+          define_method(:girb_tool_name) { tool_name }
           define_method(:name) { tool_name }
 
-          # Execute method (never actually called, just for tool definition)
-          define_method(:execute) { |**_args| "" }
+          # Execute method - actually execute the girb tool
+          define_method(:execute) do |**args|
+            tool_name_for_log = girb_tool_name
+
+            if Girb.configuration&.debug
+              args_str = args.map { |k, v| "#{k}: #{v.inspect}" }.join(", ")
+              puts "[girb] Tool: #{tool_name_for_log}(#{args_str})"
+            end
+
+            binding = Girb::Providers::RubyLlm.current_binding
+            girb_tool_class = Girb::Tools.find_tool(tool_name_for_log)
+
+            unless girb_tool_class
+              return { error: "Unknown tool: #{tool_name_for_log}" }
+            end
+
+            girb_tool = girb_tool_class.new
+
+            result = if binding
+                       girb_tool.execute(binding, **args)
+                     else
+                       { error: "No binding available for tool execution" }
+                     end
+
+            if Girb.configuration&.debug && result.is_a?(Hash) && result[:error]
+              puts "[girb] Tool error: #{result[:error]}"
+            end
+
+            result
+          rescue StandardError => e
+            { error: "Tool execution failed: #{e.class} - #{e.message}" }
+          end
         end
 
         tool_class.new

data/lib/girb-ruby_llm/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GirbRubyLlm
-  VERSION = "0.1.0"
+  VERSION = "0.1.2"
 end

data/lib/girb-ruby_llm.rb

@@ -32,6 +32,9 @@ RUBY_LLM_CONFIG_MAP = {
 # Check if any RubyLLM config is available
 has_config = RUBY_LLM_CONFIG_MAP.any? { |env_var, _| ENV[env_var] }
 
+# Local providers that require Models.refresh!
+LOCAL_PROVIDERS = %w[OLLAMA_API_BASE GPUSTACK_API_BASE].freeze
+
 if has_config
   # Configure RubyLLM with all available environment variables
   RubyLLM.configure do |config|
@@ -40,9 +43,18 @@ if has_config
     end
   end
 
+  # Refresh models for local providers (Ollama, GPUStack)
+  if LOCAL_PROVIDERS.any? { |env_var| ENV[env_var] }
+    RubyLLM::Models.refresh!
+  end
+
+  model = ENV["GIRB_MODEL"]
+  unless model
+    warn "[girb-ruby_llm] GIRB_MODEL not set. Please specify a model."
+    warn "[girb-ruby_llm]   Example: export GIRB_MODEL=gemini-2.5-flash"
+  end
+
   Girb.configure do |c|
-    unless c.provider
-      c.provider = Girb::Providers::RubyLlm.new(model: c.model)
-    end
+    c.provider ||= Girb::Providers::RubyLlm.new(model: model)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: girb-ruby_llm
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - rira100000000