llmed 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5733bac9f8a6d8c5465f487bda233c8997491d838c778b45194e3c15f9c14734
-  data.tar.gz: e606c3e377bc6d0bf75eed59dd6456773c02650e98118a0135814808195e2fb8
+  metadata.gz: 48b4c352f5fd54aa841fe411fd7f5025f1c98f40b8a287589aeb46ad213def68
+  data.tar.gz: c53e2efec6164261d6985f9297b101b363d1e9da432123ddeac1e369a7f045d2
 SHA512:
-  metadata.gz: 3fc77a1b7b7ca6ba6c8bcb528e1ef702277588195c47e538cfa6a8432aef4ae7cb876b10537605866bfa7ea0a61ceacf1308cd52d3b5f0f2a7a4f51ef5b552ed
-  data.tar.gz: 94f66750f04e2c97d8e78125ac920c52037fd6bc5e5759cbd2e349402be599619fb5cb2dc92af0c519a0cc557333be022925abb556f09995460a0b0d936386c8
+  metadata.gz: 1b228350f691be1762449160bafde3f3c3eba0cc180fd918207f09a855939d0ec784f53861f72304a61d6c4c2adfd525d4e29cf868c1bc1d1dbfb9aa0ff7ad15
+  data.tar.gz: 7eea2cc52879f589c1b4612409c7c0923aa88135bcb705817966fb4827d449032cc528891140e37a088ff0145fe792982f068162b716785d41e5c3ac736a8bfd

data/lib/llm.rb

@@ -56,7 +56,7 @@ class LLMed
           @logger.warn("POSSIBLE INCONSISTENCY COMPLETED TOKENS REACHED MAX TOKENS #{MAX_TOKENS}")
         end
       end
-      
+
       def llm_arguments(args)
         args
       end

data/lib/llmed/application.rb

@@ -134,9 +134,8 @@ class LLMed
       !digests_of_context_to_update.tap do |digests|
         digests.each do |digest|
           context_by_digest = release_contexts.invert
-
           if context_by_digest[digest].nil?
-            @logger.info("APPLICATION #{@name} ADDING CONTEXT #{user_contexts.invert[digest]}")
+            @logger.info("APPLICATION #{@name} ADDING CONTEXT #{user_contexts.by_digest(digest).name}")
           else
             @logger.info("APPLICATION #{@name} REBUILDING CONTEXT #{context_by_digest[digest]}")
           end
@@ -188,8 +187,8 @@ class LLMed
           end
 
           # added new context
-          if !release_context.digest? && !user_contexts[ctx.name].nil?
-            update_context_digest << user_contexts[ctx.name]
+          if !release_context.digest? && !user_contexts.by_name(ctx.name).nil?
+            update_context_digest << user_contexts.by_name(ctx.name).digest
             next
           elsif release_context.digest? && !ctx.same_digest?(release_context.digest)
             update_rest = true
@@ -214,9 +213,7 @@ class LLMed
     end
 
     def user_contexts
-      @contexts.map do |ctx|
-        [ctx.name, ctx.digest]
-      end.to_h
+      UserContexts.new(@contexts)
     end
 
     def release_contexts

data/lib/llmed/configuration.rb

@@ -12,22 +12,22 @@ Don't make any assumptions/expectations or wait for implementations, always impl
 The contexts are declarations of how the source code will be (not a file) ensure to follow this always.
 The contexts are connected as a flat linked list.
 All the contexts represent one source code.
-There is always a one-to-one correspondence between context and source code.
+Always exists one-to-one correspondence between context and source code.
 Always include the properly escaped comment: LLMED-COMPILED.
 
 You must only modify the following source code:
-```
+```{language}
 {source_code}
 ```
 
 Only generate source code of the context who digest belongs to {update_context_digests}.
 
 Wrap with comment every code that belongs to the indicated context, example in {language}:
-{code_comment_begin}<llmed-code context='context name' digest='....' after='digest next context'>{code_comment_end}
+{code_comment_begin}<llmed-code context='here context name' digest='....' link-digest='next digest' after='here same value of attribute link-digest'>{code_comment_end}
 ...
 {code_comment_begin}</llmed-code>{code_comment_end}
 
-!!Your response must contain only the generated source code, with no additional text or comments, and you must ensure that runs correctly on the first attempt.
+!!Your response must contain only the generated source code with all indicated contexts, with no additional text or comments, and you must ensure that runs correctly on the first attempt.
 ", input_variables: %w[language source_code code_comment_begin code_comment_end update_context_digests])
     end
 

data/lib/llmed/context.rb

@@ -1,14 +1,53 @@
 # Copyright 2025 Jovany Leandro G.C <bit4bit@riseup.net>
 # frozen_string_literal: true
+
 require 'erb'
 
 class LLMed
+  class UserContexts
+    def initialize(contexts)
+      @contexts = contexts.dup
+    end
+
+    def each(&block)
+      @contexts.each(&block)
+    end
+
+    def empty?
+      @contexts.empty?
+    end
+
+    def [](idx)
+      @contexts[idx]
+    end
+
+    def each_with_next(&block)
+      @contexts.each_with_index do |ctx, idx|
+        next_ctx = @contexts[idx + 1]
+        block.call(ctx, next_ctx)
+      end
+    end
+
+    def count
+      @contexts.count
+    end
+
+    def by_name(name)
+      @contexts.find { |ctx| ctx.name == name }
+    end
+
+    def by_digest(digest)
+      @contexts.find { |ctx| ctx.same_digest?(digest) }
+    end
+  end
+
   class Context
     attr_reader :name
 
-    def initialize(name:, options: {})
+    def initialize(name:, digest: nil, options: {})
       @name = name
       @skip = options[:skip] || false
+      @fixed_digest = digest || nil
       @release_dir = options[:release_dir]
     end
 
@@ -21,7 +60,7 @@ class LLMed
     end
 
     def digest
-      Digest::SHA256.hexdigest "#{@name}.#{@message}"
+      @fixed_digest || Digest::SHA256.hexdigest("#{@name}.#{@message}")
     end
 
     def message

data/lib/llmed/release.rb

@@ -5,7 +5,8 @@ class LLMed
   class Release
     ContextCode = Struct.new(:name, :digest, :code, :after) do
       def to_llmed_code(code_comment)
-        "#{code_comment.begin}<llmed-code context='#{name}' digest='#{digest}' after='#{after}'>#{code_comment.end}#{code}#{code_comment.begin}</llmed-code>#{code_comment.end}"
+        close_newline = "\n" if code.strip.empty?
+        "#{code_comment.begin}<llmed-code context='#{name}' digest='#{digest}' after='#{after}'>#{code_comment.end}#{code}#{close_newline}#{code_comment.begin}</llmed-code>#{code_comment.end}"
       end
 
       def digest?
@@ -99,42 +100,53 @@ class LLMed
 
       # fix user contexts digest
       contexts.each do |ctx|
-        user_context_digest = user_contexts[ctx.name]
-        ctx.digest = user_context_digest unless user_context_digest.nil?
+        user_context = user_contexts.by_name(ctx.name)
+        ctx.digest = user_context.digest unless user_context.nil?
       end
 
       # insertions missed user contexts
-      user_contexts.each do |name, digest|
-        next if contexts.any? { |ctx| ctx.name == name }
-        code = release.context_by(name).code
-        new_ctx = ContextCode.new(name, digest, code, '')
+      user_contexts.each do |user_context|
+        next if contexts.any? { |ctx| ctx.name == user_context.name }
+
+        code = release.context_by(user_context.name).code
+        new_ctx = ContextCode.new(user_context.name, user_context.digest, code, '')
         contexts.prepend(new_ctx)
         @changes << [:added, new_ctx]
       end
 
-      contexts_sorted = []
-      # prioritize user order
-      user_contexts.each do |name, _digest|
-        contexts.each do |ctx|
-          if ctx.name == name
-            contexts_sorted << ctx
-            break
-          end
-        end
+      # code context must have the same order as user contexts
+      if user_contexts.empty?
+        contexts_sorted = contexts
+      else
+        user_contexts_iter = user_contexts.dup
+        contexts_iter = contexts.dup
+        rewire_code_contexts(contexts_iter, user_contexts_iter)
+        contexts_sorted = contexts_iter
       end
 
-      @contexts = contexts_sorted.sort {|a,b|
+      @contexts = contexts_sorted.sort do |a, b|
         if a.digest == b.after
           1
         else
           0
         end
-      }
+      end
+
       self
     end
 
     private
 
+    def rewire_code_contexts(code_contexts, user_contexts)
+      user_contexts.each_with_next do |user_context, next_user_context|
+        ctx = code_contexts.find { |ctx| ctx.digest == user_context.digest }
+        if ctx
+          ctx.after = '' if user_contexts.count > 1
+          ctx.after = next_user_context.digest if next_user_context
+        end
+      end
+    end
+
     def initialize(origin, code_comment)
       @origin = origin
       @content = ''
@@ -142,7 +154,7 @@ class LLMed
       @code_comment = code_comment
       @contexts = []
 
-      @origin.scan(%r{<llmed-code context='(.+?)' digest='(.+?)'\s*(after='.*?')?>#{@code_comment.end}(.+?)#{@code_comment.begin}+\s*<?/?llmed-code}im).each do |match|
+      @origin.scan(%r{<llmed-code context='(.+?)' digest='(.+?)'(?:\s+[^>]*?)?(after='.*?')?>#{@code_comment.end}(.+?)#{@code_comment.begin}+\s*<?/?llmed-code}im).each do |match|
         name, digest, after_block, code = match
         after = if after_block.nil?
                   ''

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: llmed
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Jovany Leandro G.C