refactoring

Author: aleksei-okatiev

Diff for: lib/llm_eval_ruby.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require_relative "llm_eval_ruby/version"
-require_relative "llm_eval_ruby/prompt"
+require_relative "llm_eval_ruby/prompt_repository"
 require_relative "llm_eval_ruby/configuration"
 
 module LlmEvalRuby

Diff for: lib/llm_eval_ruby/prompt.rb

@@ -1,8 +1,9 @@
 # frozen_string_literal: true
 
-require_relative "../prompts/roles/user"
-require_relative "../prompts/roles/system"
-require_relative "../prompts/roles/assistant"
+require_relative "../prompt_types/user"
+require_relative "../prompt_types/system"
+require_relative "../prompt_types/assistant"
+require_relative "../prompt_types/compiled"
 
 module LlmEvalRuby
   module PromptAdapters
@@ -28,11 +29,11 @@ def wrap_response(response)
           response_array.map do |prompt|
             case prompt["role"]
             when "system"
-              LlmEvalRuby::Prompts::Roles::System.new(adapter: self, content: prompt["content"])
+              PromptTypes::System.new(adapter: self, content: prompt["content"])
             when "user"
-              LlmEvalRuby::Prompts::Roles::User.new(adapter: self, content: prompt["content"])
+              PromptTypes::User.new(adapter: self, content: prompt["content"])
             when "assistant"
-              LlmEvalRuby::Prompts::Roles::Assistant.new(adapter: self, content: prompt["content"])
+              PromptTypes::Assistant.new(adapter: self, content: prompt["content"])
             else
               raise "Unsupported role #{prompt["role"]}"
             end

Diff for: lib/llm_eval_ruby/prompt_adapters/base.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require_relative "base"
-require_relative "../prompts/roles/compiled"
 require_relative "../api_clients/langfuse"
 
 module LlmEvalRuby
@@ -15,7 +14,7 @@ def fetch_prompt(name:, version: nil)
 
         def compile(prompt:, variables:)
           compiled = format(convert_prompt(prompt.content), variables)
-          LlmEvalRuby::Prompts::Roles::Compiled.new(role: prompt.role, content: compiled)
+          LlmEvalRuby::PromptTypes::Compiled.new(adapter: self, role: prompt.role, content: compiled)
         end
 
         private

Diff for: lib/llm_eval_ruby/prompt_adapters/langfuse.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require_relative "base"
-require_relative "../prompts/roles/compiled"
 
 module LlmEvalRuby
   module PromptAdapters
@@ -23,7 +22,7 @@ def fetch_prompt(name:, version: nil) # rubocop:disable Lint/UnusedMethodArgumen
 
         def compile(prompt:, variables:)
           compiled = format(convert_prompt(prompt.content), variables)
-          LlmEvalRuby::Prompts::Roles::Compiled.new(role: prompt.role, content: compiled)
+          LlmEvalRuby::PromptTypes::Compiled.new(adapter: self, role: prompt.role, content: compiled)
         end
 
         private

Diff for: lib/llm_eval_ruby/prompt_adapters/local.rb

@@ -4,7 +4,7 @@
 require_relative "../prompt_adapters/local"
 
 module LlmEvalRuby
-  module Prompts
+  module PromptRepositories
     class Base
       attr_reader :adapter
 

Diff for: lib/llm_eval_ruby/prompts/base.rb renamed to lib/llm_eval_ruby/prompt_repositories/base.rb

@@ -3,7 +3,7 @@
 require_relative "base"
 
 module LlmEvalRuby
-  module Prompts
+  module PromptRepositories
     class Chat < Base
       def fetch(name:, version: nil)
         adapter.fetch_prompt(name:, version:)

Diff for: lib/llm_eval_ruby/prompts/chat.rb renamed to lib/llm_eval_ruby/prompt_repositories/chat.rb

@@ -3,14 +3,15 @@
 require_relative "base"
 
 module LlmEvalRuby
-  module Prompts
+  module PromptRepositories
     class Text < Base
       def fetch(name:, version: nil)
         adapter.fetch_prompt(name:, version:)[0]
       end
 
       def fetch_and_compile(name:, variables:, version: nil)
         prompt = adapter.fetch_prompt(name:, version:)[0]
+
         adapter.compile(prompt:, variables:)
       end
     end

Diff for: lib/llm_eval_ruby/prompts/text.rb renamed to lib/llm_eval_ruby/prompt_repositories/text.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+require_relative "prompt_repositories/chat"
+require_relative "prompt_repositories/text"

Diff for: lib/llm_eval_ruby/prompt_repository.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require_relative "base"
+
+module LlmEvalRuby
+  module PromptTypes
+    class Assistant < Base
+      def initialize(adapter:, content:)
+        super(adapter: adapter, content: content, role: :assistant)
+      end
+    end
+  end
+end

Diff for: lib/llm_eval_ruby/prompt_types/assistant.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module LlmEvalRuby
+  module PromptTypes
+    class Base
+      attr_reader :role, :content
+
+      def initialize(adapter:, content:, role:)
+        @adapter = adapter
+        @role = role
+        @content = content
+      end
+
+      def to_h
+        { role: role, content: content }
+      end
+
+      def to_s
+        content
+      end
+
+      def compile(variables:)
+        @adapter.compile(prompt: self, variables: variables)
+      end
+    end
+  end
+end

Diff for: lib/llm_eval_ruby/prompt_types/base.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module LlmEvalRuby
+  module PromptTypes
+    class Compiled < Base
+      def compile(*)
+        raise "The prompt is already compiled"
+      end
+    end
+  end
+end

Diff for: lib/llm_eval_ruby/prompt_types/compiled.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require_relative "base"
+
+module LlmEvalRuby
+  module PromptTypes
+    class System < Base
+      def initialize(adapter:, content:)
+        super(adapter: adapter, content: content, role: :system)
+      end
+    end
+  end
+end

Diff for: lib/llm_eval_ruby/prompt_types/system.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require_relative "base"
+
+module LlmEvalRuby
+  module PromptTypes
+    class User < Base
+      def initialize(adapter:, content:)
+        super(adapter: adapter, content: content, role: :user)
+      end
+    end
+  end
+end

Diff for: lib/llm_eval_ruby/prompt_types/user.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+class PromptSerializer < ActiveJob::Serializers::ObjectSerializer
+  def serialize(prompt)
+    super({
+      "role" => prompt.role,
+      "content" => prompt.content,
+      "adapter" => prompt.instance_variable_get(:@adapter)
+    })
+  end
+
+  def deserialize(hash)
+    case hash["role"]
+    when "user"
+      klass = LlmEvalRuby::PromptTypes::User
+    when "system"
+      klass = LlmEvalRuby::PromptTypes::System
+    when "assistant"
+      klass = LlmEvalRuby::PromptTypes::Assistant
+    else
+      raise "Unsupported role #{role}"
+    end
+
+    klass.new(adapter: hash["adapter"], content: hash["content"])
+  end
+
+  private
+
+  def klass
+    LlmEvalRuby::PromptTypes::Base
+  end
+end