llmed 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87fc5d9fa3991a03d2055b3da5f8ec1203af3e987c6ff711353a3d617f3a5add
-  data.tar.gz: e4b535f0353bc4c575d84cb0648a7d8d38bc62b3d585f87f9eb4fde18b36d835
+  metadata.gz: d9bc1517e8b12805cae255599e37f2f6cb17ee1aae43043c2d36e232291dc63f
+  data.tar.gz: 2d82a1d9ff3fc1585b8fe952800786cc25ee107f9a1cf679e1ada541c4b105df
 SHA512:
-  metadata.gz: bf87dca2cc6babed42917e624511032e5f9747679244199a8340f6f2cbeca95bfa9a3fbf839a5ede32051138f7ae18affe154fe20177a9ae1ca20b03052e6cd7
-  data.tar.gz: 6243e74686ffc0aabfe27310216fab81a1dd5a6a7ea987da095b579eb6ba23323e6f68f26b948f4899d3b52c7f01ecf6ceb3ada1eaa8512c26b897c06eccf89a
+  metadata.gz: 347c5b9e439ceedbb8de5a850185d1a4e3a8aec23564d9f379747abda2d5a5921047d2891563d9205077476f29910ffe511819d729b24ef1ee3a94002ad1fbe5
+  data.tar.gz: 2b5053b7389eee52215e44799737f74fdb9fc43acf02c2a1036b2f052a1bef339f13427c6bc92606a1b7fb7d31b80b44fa6e6b4c94f3284d16d5550dfc1e321a

data/exe/llmed

@@ -1,23 +1,24 @@
 #!/bin/env ruby
 # Copyright 2025 Jovany Leandro G.C <bit4bit@riseup.net>
 # frozen_string_literal: true
+
 require 'optparse'
 require 'llmed'
 
 logger = Logger.new(STDERR)
 output_dir = './llmed-out'
 release_dir = output_dir
-template = <<-TMP
-set_llm provider: :openai, api_key: ENV['OPENAI_API_KEY'], model: 'gpt-4o'
-
-# Increment the RELEASE number once you approve the output.
-application "hi world", release: nil, language: '<HERE LANGUAGE>', output_file: "<HERE NAME>.ollmed" do
-  context "main" do
-    <<-LLM
-        Show to user 'hi world!'.
-    LLM
+template = <<~TMP
+  set_llm provider: :openai, api_key: ENV['OPENAI_API_KEY'], model: 'gpt-4o'
+
+  # Increment the RELEASE number once you approve the output.
+  application "hi world", release: nil, language: '<HERE LANGUAGE>', output_file: "<HERE NAME>.ollmed" do
+    context "main" do
+      <<-LLM
+          Show to user 'hi world!'.
+      LLM
+    end
   end
-end
 TMP
 
 OptionParser.new do |parser|

data/lib/llm.rb

@@ -18,18 +18,16 @@ class LLMed
 
     Response = Struct.new(:provider, :model, :source_code, :duration_seconds, :total_tokens, keyword_init: true)
 
-    class OpenAI
-
-      DEFAULT_URI_BASE = "https://api.openai.com/".freeze
-      MAX_TOKENS = 8192
-
-      def initialize(**args)
-        @logger = args.delete(:logger)
-        @llm = Langchain::LLM::OpenAI.new(**llm_arguments(args))
+    class Agent
+      def initialize(llm_instance)
+        @llm_instance = llm_instance
+        @assistant = Langchain::Assistant.new(
+          llm: @llm_instance.llm
+        )
       end
 
       def chat(messages: [])
-        messages = messages.map do |m|
+        llm_messages = messages.map do |m|
           case m
           when Message::System
             { role: 'system', content: m.content }
@@ -39,26 +37,40 @@ class LLMed
         end
 
         start = Time.now
-        llm_response = @llm.chat(messages: messages, max_tokens: MAX_TOKENS)
-        warn_token_limits(llm_response)
+
+        @assistant.add_messages(messages: llm_messages)
+        assistant_messages = @assistant.run!
+
+        assistant_response = assistant_messages.select { |m| m.role == 'assistant' }.last
 
         stop = Time.now
-        Response.new({ provider: provider,
-                       model: @llm.chat_parameters[:model],
+        Response.new({ provider: @llm_instance.provider,
+                       model: @llm_instance.model,
                        duration_seconds: stop.to_i - start.to_i,
-                       source_code: source_code(llm_response.chat_completion),
-                       total_tokens: llm_response.total_tokens })
+                       source_code: @llm_instance.source_code(assistant_response.content),
+                       total_tokens: @assistant.total_tokens })
       end
+    end
 
-      private
-      def warn_token_limits(llm_response)
-        if llm_response.completion_tokens >= MAX_TOKENS
-          @logger.warn("POSSIBLE INCONSISTENCY COMPLETED TOKENS REACHED MAX TOKENS #{MAX_TOKENS}")
-        end
+    class OpenAI
+      DEFAULT_URI_BASE = "https://api.openai.com/".freeze
+      MAX_TOKENS = 8192
+
+      attr_reader :llm
+
+      def initialize(**args)
+        @logger = args.delete(:logger)
+        @llm = Langchain::LLM::OpenAI.new(**llm_arguments(args))
       end
 
-      def llm_arguments(args)
-        args
+      def chat(messages: [])
+        llm_response = @llm.chat(messages: messages, max_tokens: MAX_TOKENS)
+        warn_token_limits(llm_response)
+        llm_response
+      end
+
+      def model
+        @llm.chat_parameters[:model]
       end
 
       def provider
@@ -68,31 +80,43 @@ class LLMed
       def source_code(content)
         content.gsub('```', '').sub(/^(node(js)?|javascript|ruby|python(\d*)|elixir|bash|html|go|c(pp)?)([ \n])/, '')
       end
-    end
 
-    class Anthropic < OpenAI
       private
 
+      def warn_token_limits(llm_response)
+        if llm_response.completion_tokens >= MAX_TOKENS
+          @logger.warn("POSSIBLE INCONSISTENCY COMPLETED TOKENS REACHED MAX TOKENS #{MAX_TOKENS}")
+        end
+      end
+
       def llm_arguments(args)
-        @logger = args.delete(:logger)
-        args.merge({ llm_options: { uri_base: 'https://api.anthropic.com/v1/' } })
+        args
       end
+    end
 
+    class Anthropic < OpenAI
       def provider
         :anthropic
       end
-    end
 
-    class LikeOpenAI < OpenAI
       private
 
       def llm_arguments(args)
-        args
+        @logger = args.delete(:logger)
+        args.merge({ llm_options: { uri_base: 'https://api.anthropic.com/v1/' } })
       end
+    end
 
+    class LikeOpenAI < OpenAI
       def provider
         :like_openai
       end
+
+      private
+
+      def llm_arguments(args)
+        args
+      end
     end
 
     class Test
@@ -100,14 +124,25 @@ class LLMed
         @output = ''
       end
 
+      def chat_parameters
+        { model: 'test' }
+      end
+
+      def model
+        'test'
+      end
+
       def chat(messages: [])
-        @output = messages.map { |m| m[:content] }.join("\n")
+        output = messages.map { |m| m[:content] }.join("\n")
+        Struct.new(:chat_completion, :total_tokens).new(output, 0)
+      end
+
+      def source_code(code)
+        code
+      end
 
-        Response.new({ provider: :test,
-                       model: 'test',
-                       duration_seconds: 0,
-                       source_code: @output,
-                       total_tokens: 0 })
+      def provider
+        :test
       end
     end
   end

data/lib/llmed/application.rb

@@ -49,6 +49,7 @@ class LLMed
 
     # Example:
     # application { context "demo" { "content" } }
+    # DEPRECATED: Use spec instead of context
     def context(name, **opts, &block)
       opts[:release_dir] = @release_dir
       ctx = Context.new(name: name, options: opts)
@@ -58,6 +59,12 @@ class LLMed
       @contexts << ctx
     end
 
+    # Example:
+    # application { spec "demo" { "content" } }
+    def spec(name, **opts, &block)
+      context(name, **opts, &block)
+    end
+
     def achieve(name, **opts, &block)
       opts[:release_dir] = @release_dir
       goal = Goal.new(name: name, options: opts)
@@ -85,7 +92,7 @@ class LLMed
       end
 
       def refresh(contexts)
-        @contexts = contexts.map{ |ctx| [ctx.name, {'name' => ctx.name, 'message' => ctx.raw}]}.to_h
+        @contexts = contexts.map { |ctx| [ctx.name, { 'name' => ctx.name, 'message' => ctx.raw }] }.to_h
         dump
       end
 
@@ -98,7 +105,7 @@ class LLMed
                    else
                      line_diff(current_ctx['message'], other_ctx.raw)
                    end
-          if !result.all?{|op, line| op == '=:'}
+          if !result.all? { |op, line| op == '=:' }
             diffs[other_ctx.name] = result
           end
         end
@@ -133,8 +140,8 @@ class LLMed
             i2 += 1
           else
             # Try to find if one of the lines matches later
-            idx1 = lines1[i1+1..-1]&.index(line2)
-            idx2 = lines2[i2+1..-1]&.index(line1)
+            idx1 = lines1[i1 + 1..-1]&.index(line2)
+            idx2 = lines2[i2 + 1..-1]&.index(line1)
 
             if !idx1.nil? && (idx2.nil? || idx1 <= idx2)
               result << ["-:", line1]
@@ -161,13 +168,13 @@ class LLMed
             @contexts = JSON.load(f.read)['contexts']
           end
         else
-          @contexts = default.map{ |ctx| [ctx.name, {'name' => ctx.name, 'message' => ctx.raw}]}.to_h
+          @contexts = default.map { |ctx| [ctx.name, { 'name' => ctx.name, 'message' => ctx.raw }] }.to_h
         end
       end
 
       def dump
         File.open(@snapshot_file, 'w') do |file|
-          file.write(JSON.dump({'contexts' => @contexts}))
+          file.write(JSON.dump({ 'contexts' => @contexts }))
         end
       end
     end
@@ -216,7 +223,6 @@ class LLMed
     end
 
     def patch_or_create(output)
-
       output_content = output
 
       if @release && File.exist?(release_source_code) && !release_contexts.empty?
@@ -246,6 +252,7 @@ class LLMed
       end
 
       return unless @output_file.is_a?(String)
+
       output_file = Pathname.new(@output_dir) + @output_file
       FileUtils.cp(output_file, release_source_code)
       FileUtils.cp(output_file, release_main_source_code)

data/lib/llmed/configuration.rb

@@ -60,7 +60,8 @@ class LLMed
 ", input_variables: %w[language source_code code_comment_begin code_comment_end update_context_digests changes_of_contexts goals])
     end
 
-    def prompt(language:, source_code:, code_comment_begin:, code_comment_end:, update_context_digests: [], changes_of_contexts: '', goals: '')
+    def prompt(language:, source_code:, code_comment_begin:, code_comment_end:, update_context_digests: [],
+               changes_of_contexts: '', goals: '')
       @prompt.format(language: language,
                      source_code: source_code,
                      code_comment_begin: code_comment_begin,
@@ -102,33 +103,35 @@ class LLMed
     end
 
     def llm
-      case @provider
-      when :openai
-        LLMed::LLM::OpenAI.new(
-          logger: @logger,
-          api_key: @provider_api_key,
-          default_options: { max_tokens: nil, temperature: 0.7, chat_model: @provider_model }
-        )
-      when :anthropic
-        LLMed::LLM::Anthropic.new(
-          logger: @logger,
-          api_key: @provider_api_key,
-          default_options: { max_tokens: nil, temperature: 0.7, chat_model: @provider_model }
-        )
-      when :like_openai
-        LLMed::LLM::LikeOpenAI.new(
-          logger: @logger,
-          api_key: @provider_api_key,
-          default_options: { temperature: 0.7, chat_model: @provider_model },
-          llm_options: @provider_options
-        )
-      when :test
-        LLMed::LLM::Test.new
-      when nil
-        raise 'Please set the provider with `set_llm(provider, api_key, model)`'
-      else
-        raise "not implemented provider #{@provider}"
-      end
+      llm_instance = case @provider
+                     when :openai
+                       LLMed::LLM::OpenAI.new(
+                         logger: @logger,
+                         api_key: @provider_api_key,
+                         default_options: { max_tokens: nil, temperature: 0.7, chat_model: @provider_model }
+                       )
+                     when :anthropic
+                       LLMed::LLM::Anthropic.new(
+                         logger: @logger,
+                         api_key: @provider_api_key,
+                         default_options: { max_tokens: nil, temperature: 0.7, chat_model: @provider_model }
+                       )
+                     when :like_openai
+                       LLMed::LLM::LikeOpenAI.new(
+                         logger: @logger,
+                         api_key: @provider_api_key,
+                         default_options: { temperature: 0.7, chat_model: @provider_model },
+                         llm_options: @provider_options
+                       )
+                     when :test
+                       LLMed::LLM::Test.new
+                     when nil
+                       raise 'Please set the provider with `set_llm(provider, api_key, model)`'
+                     else
+                       raise "not implemented provider #{@provider}"
+                     end
+
+      LLMed::LLM::Agent.new(llm_instance)
     end
   end
 end

data/lib/llmed/goal.rb

@@ -8,7 +8,6 @@ class LLMed
     def initialize(name:, options: {})
       @name = name
       @options = options
-
     end
 
     def llm(message)
@@ -20,7 +19,7 @@ class LLMed
     end
 
     def message?
-       !(@message.nil? || @message.empty?)
+      !(@message.nil? || @message.empty?)
     end
   end
 end

data/lib/llmed/literate_programming/markdown.rb

@@ -1,9 +1,9 @@
-#<llmed-code context='Library LLMed::LiterateProgramming::Markdown' digest='9c0e3f61ab4cdc3c56c29230a800487dd1a7ef0d929c843fd2461907d0831ab2' after=''>
+# <llmed-code context='Library LLMed::LiterateProgramming::Markdown' digest='9c0e3f61ab4cdc3c56c29230a800487dd1a7ef0d929c843fd2461907d0831ab2' after=''>
 class LLMed::LiterateProgramming::Markdown
   def parse(input)
     contexts = []
     current_context = { type: :context, title: "_default", content: [] }
-    
+
     input.each_line do |line|
       if line.strip =~ /^# (.+)$/
         contexts << current_context unless current_context[:content].empty?
@@ -23,4 +23,4 @@ class LLMed::LiterateProgramming::Markdown
     contexts
   end
 end
-#</llmed-code>
+# </llmed-code>

data/lib/llmed/literate_programming.rb

@@ -41,7 +41,7 @@ class LLMed
               context[:content] += "#{URI.open(item_content[:reference]).read}\n"
             end
           end
-        contexts << context
+          contexts << context
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: llmed
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Jovany Leandro G.C
@@ -93,9 +93,7 @@ files:
 - README.md
 - exe/llmed
 - exe/llmed.literate
-- lib/#llm.rb#
 - lib/llm.rb
-- lib/llm.rb~
 - lib/llmed.rb
 - lib/llmed/application.rb
 - lib/llmed/configuration.rb

data/lib/#llm.rb#

@@ -1,114 +0,0 @@
-require 'openai'
-require 'langchain'
-
-Langchain.logger.level = Logger::ERROR
-
-class LLMed
-  module LLM
-    module Message
-      System = Struct.new(:content)
-      User = Struct.new(:content)
-    end
-
-    module Template
-      def self.build(template:, input_variables:)
-        Langchain::Prompt::PromptTemplate.new(template: template, input_variables: input_variables)
-      end
-    end
-
-    Response = Struct.new(:provider, :model, :source_code, :duration_seconds, :total_tokens, keyword_init: true)
-
-    class OpenAI
-
-      DEFAULT_URI_BASE = "https://api.openai.com/".freeze
-      MAX_TOKENS = 8192
-
-      def initialize(**args)
-        @logger = args.delete(:logger)
-        @llm = Langchain::LLM::OpenAI.new(**llm_arguments(args))
-      end
-
-      def chat(messages: [])
-        messages = messages.map do |m|
-          case messages
-          when Message::System
-            { role: 'system', content: m.content }
-          when Message::User
-            { role: 'user', content: m.content }
-          end
-        end
-        messages.e
-        start = Time.now
-        llm_response = @llm.chat(messages: messages, max_tokens: MAX_TOKENS)
-        warn_token_limits(llm_response)
-
-        stop = Time.now
-        Response.new({ provider: provider,
-                       model: @llm.chat_parameters[:model],
-                       duration_seconds: stop.to_i - start.to_i,
-                       source_code: source_code(llm_response.chat_completion),
-                       total_tokens: llm_response.total_tokens })
-      end
-
-      private
-      def warn_token_limits(llm_response)
-        if llm_response.completion_tokens >= MAX_TOKENS
-          @logger.warn("POSSIBLE INCONSISTENCY COMPLETED TOKENS REACHED MAX TOKENS #{MAX_TOKENS}")
-        end
-      end
-
-      def llm_arguments(args)
-        args
-      end
-
-      def provider
-        :openai
-      end
-
-      def source_code(content)
-        content.gsub('```', '').sub(/^(node(js)?|javascript|ruby|python(\d*)|elixir|bash|html|go|c(pp)?)([ \n])/, '')
-      end
-    end
-
-    class Anthropic < OpenAI
-      private
-
-      def llm_arguments(args)
-        @logger = args.delete(:logger)
-        args.merge({ llm_options: { uri_base: 'https://api.anthropic.com/v1/' } })
-      end
-
-      def provider
-        :anthropic
-      end
-    end
-
-    class LikeOpenAI < OpenAI
-      private
-
-      def llm_arguments(args)
-        args
-      end
-
-      def provider
-        :like_openai
-      end
-    end
-
-    class Test
-      def initialize
-        @output = ''
-      end
-
-      def chat(messages: [])
-        @output = messages.map { |m| m[:content] }.join("\n")
-
-        Response.new({ provider: :test,
-                       model: 'test',
-                       duration_seconds: 0,
-                       source_code: @output,
-                       total_tokens: 0 })
-      end
-    end
-  end
-end

data/lib/llm.rb~

@@ -1,114 +0,0 @@
-require 'openai'
-require 'langchain'
-
-Langchain.logger.level = Logger::ERROR
-
-class LLMed
-  module LLM
-    module Message
-      System = Struct.new(:content)
-      User = Struct.new(:content)
-    end
-
-    module Template
-      def self.build(template:, input_variables:)
-        Langchain::Prompt::PromptTemplate.new(template: template, input_variables: input_variables)
-      end
-    end
-
-    Response = Struct.new(:provider, :model, :source_code, :duration_seconds, :total_tokens, keyword_init: true)
-
-    class OpenAI
-
-      DEFAULT_URI_BASE = "https://api.openai.com/".freeze
-      MAX_TOKENS = 8192
-
-      def initialize(**args)
-        @logger = args.delete(:logger)
-        @llm = Langchain::LLM::OpenAI.new(**llm_arguments(args))
-      end
-
-      def chat(messages: [])
-        messages = messages.map do |m|
-          case m
-          when Message::System
-            { role: 'system', content: m.content }
-          when Message::User
-            { role: 'user', content: m.content }
-          end
-        end
-
-        start = Time.now
-        llm_response = @llm.chat(messages: messages, max_tokens: MAX_TOKENS)
-        warn_token_limits(llm_response)
-
-        stop = Time.now
-        Response.new({ provider: provider,
-                       model: @llm.chat_parameters[:model],
-                       duration_seconds: stop.to_i - start.to_i,
-                       source_code: source_code(llm_response.chat_completion),
-                       total_tokens: llm_response.total_tokens })
-      end
-
-      private
-      def warn_token_limits(llm_response)
-        if llm_response.completion_tokens >= MAX_TOKENS
-          @logger.warn("POSSIBLE INCONSISTENCY COMPLETED TOKENS REACHED MAX TOKENS #{MAX_TOKENS}")
-        end
-      end
-
-      def llm_arguments(args)
-        args
-      end
-
-      def provider
-        :openai
-      end
-
-      def source_code(content)
-        content.gsub('```', '').sub(/^(node(js)?|javascript|ruby|python(\d*)|elixir|bash|html|go|c(pp)?)([ \n])/, '')
-      end
-    end
-
-    class Anthropic < OpenAI
-      private
-
-      def llm_arguments(args)
-        @logger = args.delete(:logger)
-        args.merge({ llm_options: { uri_base: 'https://api.anthropic.com/v1/' } })
-      end
-
-      def provider
-        :anthropic
-      end
-    end
-
-    class LikeOpenAI < OpenAI
-      private
-
-      def llm_arguments(args)
-        args
-      end
-
-      def provider
-        :like_openai
-      end
-    end
-
-    class Test
-      def initialize
-        @output = ''
-      end
-
-      def chat(messages: [])
-        @output = messages.map { |m| m[:content] }.join("\n")
-
-        Response.new({ provider: :test,
-                       model: 'test',
-                       duration_seconds: 0,
-                       source_code: @output,
-                       total_tokens: 0 })
-      end
-    end
-  end
-end