rasti-ai 3.1.0 → 3.2.0

data/lib/rasti/ai/huawei_maas/assistant.rb

@@ -2,13 +2,6 @@ module Rasti
   module AI
     module HuaweiMaaS
       class Assistant < Rasti::AI::OpenAI::Assistant
-
-        private
-
-        def build_default_client
-          Client.new
-        end
-
       end
     end
   end

data/lib/rasti/ai/huawei_maas/client.rb

@@ -2,25 +2,6 @@ module Rasti
   module AI
     module HuaweiMaaS
       class Client < Rasti::AI::OpenAI::Client
-
-        private
-
-        def default_api_key
-          Rasti::AI.huawei_maas_api_key
-        end
-
-        def default_model
-          Rasti::AI.huawei_maas_default_model
-        end
-
-        def provider_name
-          'huawei_maas'
-        end
-
-        def base_url
-          'https://api-ap-southeast-1.modelarts-maas.com/v2'
-        end
-
       end
     end
   end

data/lib/rasti/ai/huawei_maas/provider.rb

@@ -0,0 +1,25 @@
+module Rasti
+  module AI
+    module HuaweiMaaS
+      class Provider < Rasti::AI::OpenAI::Provider
+
+        def name
+          :huawei_maas
+        end
+
+        def default_model
+          Rasti::AI.huawei_maas_default_model
+        end
+
+        def default_api_key
+          Rasti::AI.huawei_maas_api_key
+        end
+
+        def base_url
+          'https://api-ap-southeast-1.modelarts-maas.com/v2'
+        end
+
+      end
+    end
+  end
+end

data/lib/rasti/ai/huawei_maas/roles.rb

@@ -1,14 +1,7 @@
 module Rasti
   module AI
     module HuaweiMaaS
-      module Roles
-
-        ASSISTANT = 'assistant'.freeze
-        SYSTEM = 'system'.freeze
-        TOOL = 'tool'.freeze
-        USER = 'user'.freeze
-
-      end
+      Roles = OpenAI::Roles
     end
   end
 end

data/lib/rasti/ai/open_ai/assistant.rb

@@ -5,10 +5,6 @@ module Rasti
 
         private
 
-        def build_default_client
-          Client.new
-        end
-
         def build_user_message(prompt)
           {role: Roles::USER, content: prompt}
         end

data/lib/rasti/ai/open_ai/client.rb

@@ -11,44 +11,14 @@ module Rasti
             tool_choice: tools.empty? ? 'none' : 'auto'
           }
 
-          body[:response_format]   = response_format   unless response_format.nil?
-          body[:reasoning_effort]  = reasoning_effort  if reasoning_effort
+          body[:response_format] = response_format if response_format
+          body[:reasoning_effort] = reasoning_effort if reasoning_effort
 
           post '/chat/completions', body
         end
 
         private
 
-        def parse_usage(response)
-          usage = response['usage']
-          return unless usage
-          Usage.new(
-            provider: provider_name,
-            model: response['model'],
-            input_tokens: usage['prompt_tokens'],
-            output_tokens: usage['completion_tokens'],
-            cached_tokens: usage.dig('prompt_tokens_details', 'cached_tokens') || 0,
-            reasoning_tokens: usage.dig('completion_tokens_details', 'reasoning_tokens') || 0,
-            raw: usage
-          )
-        end
-
-        def default_api_key
-          Rasti::AI.openai_api_key
-        end
-
-        def default_model
-          Rasti::AI.openai_default_model
-        end
-
-        def provider_name
-          'open_ai'
-        end
-
-        def base_url
-          'https://api.openai.com/v1'
-        end
-
         def build_request(uri)
           request = super
           request['Authorization'] = "Bearer #{api_key}"
@@ -58,4 +28,4 @@ module Rasti
       end
     end
   end
-end
+end

data/lib/rasti/ai/open_ai/provider.rb

@@ -0,0 +1,74 @@
+module Rasti
+  module AI
+    module OpenAI
+      class Provider < Rasti::AI::Provider
+
+        THINKING_LEVELS = {
+          'low' => 'low'.freeze,
+          'medium' => 'medium'.freeze,
+          'high' => 'high'.freeze
+        }.freeze
+
+        def name
+          :open_ai
+        end
+
+        def default_model
+          Rasti::AI.openai_default_model
+        end
+
+        def default_api_key
+          Rasti::AI.openai_api_key
+        end
+
+        def base_url
+          'https://api.openai.com/v1'
+        end
+
+        def parse_usage(response)
+          usage = response['usage']
+          return nil unless usage
+
+          Usage.new(
+            provider: name.to_s,
+            model: response['model'],
+            input_tokens: usage['prompt_tokens'],
+            output_tokens: usage['completion_tokens'],
+            cached_tokens: usage.dig('prompt_tokens_details', 'cached_tokens') || 0,
+            reasoning_tokens: usage.dig('completion_tokens_details', 'reasoning_tokens') || 0,
+            raw: usage
+          )
+        end
+
+        private
+
+        def request(client:, messages:, system:, model:, json_schema:, thinking:)
+          all_messages = system ? [{role: Roles::SYSTEM, content: system}] + messages : messages
+
+          client.chat_completions messages: all_messages,
+                                  model: model,
+                                  response_format: response_format(json_schema),
+                                  reasoning_effort: thinking
+        end
+
+        def encode_message(message)
+          {role: message[:role], content: message[:content]}
+        end
+
+        def parse_content(response)
+          response.dig 'choices', 0, 'message', 'content'
+        end
+
+        def response_format(json_schema)
+          return nil if json_schema.nil?
+
+          {
+            type: 'json_schema',
+            json_schema: json_schema
+          }
+        end
+
+      end
+    end
+  end
+end

data/lib/rasti/ai/open_router/assistant.rb

@@ -2,13 +2,6 @@ module Rasti
   module AI
     module OpenRouter
       class Assistant < Rasti::AI::OpenAI::Assistant
-
-        private
-
-        def build_default_client
-          Client.new
-        end
-
       end
     end
   end

data/lib/rasti/ai/open_router/client.rb

@@ -2,25 +2,6 @@ module Rasti
   module AI
     module OpenRouter
       class Client < Rasti::AI::OpenAI::Client
-
-        private
-
-        def default_api_key
-          Rasti::AI.openrouter_api_key
-        end
-
-        def default_model
-          Rasti::AI.openrouter_default_model
-        end
-
-        def provider_name
-          'open_router'
-        end
-
-        def base_url
-          'https://openrouter.ai/api/v1'
-        end
-
       end
     end
   end

data/lib/rasti/ai/open_router/provider.rb

@@ -0,0 +1,25 @@
+module Rasti
+  module AI
+    module OpenRouter
+      class Provider < Rasti::AI::OpenAI::Provider
+
+        def name
+          :open_router
+        end
+
+        def default_model
+          Rasti::AI.openrouter_default_model
+        end
+
+        def default_api_key
+          Rasti::AI.openrouter_api_key
+        end
+
+        def base_url
+          'https://openrouter.ai/api/v1'
+        end
+
+      end
+    end
+  end
+end

data/lib/rasti/ai/open_router/roles.rb

@@ -1,14 +1,7 @@
 module Rasti
   module AI
     module OpenRouter
-      module Roles
-
-        ASSISTANT = 'assistant'.freeze
-        SYSTEM = 'system'.freeze
-        TOOL = 'tool'.freeze
-        USER = 'user'.freeze
-
-      end
+      Roles = OpenAI::Roles
     end
   end
 end

data/lib/rasti/ai/provider.rb

@@ -0,0 +1,197 @@
+module Rasti
+  module AI
+    class Provider
+
+      MODULES = {
+        open_ai: 'OpenAI',
+        gemini: 'Gemini',
+        anthropic: 'Anthropic',
+        open_router: 'OpenRouter',
+        huawei_maas: 'HuaweiMaaS'
+      }.freeze
+
+      ALIASES = {
+        openai: :open_ai,
+        openrouter: :open_router,
+        huawei: :huawei_maas
+      }.freeze
+
+      class << self
+
+        def build(name, **options)
+          return name if name.is_a? Provider
+          provider_class(name).new(**options)
+        end
+
+        def names
+          MODULES.keys
+        end
+
+        private
+
+        def provider_class(name)
+          key = normalize name
+          key = ALIASES.fetch key, key
+
+          raise Errors::UnknownProvider.new(name, names) unless MODULES.key? key
+
+          AI.const_get(MODULES[key])::Provider
+        end
+
+        def normalize(name)
+          name.to_s.downcase.to_sym
+        end
+
+      end
+
+      attr_reader :model
+
+      def initialize(model:nil, api_key:nil, usage_tracker:nil, logger:nil,
+                     http_connect_timeout:nil, http_read_timeout:nil, http_max_retries:nil)
+
+        @model = model || default_model
+        @api_key = api_key || default_api_key
+        @usage_tracker = usage_tracker
+        @logger = logger
+        @http_connect_timeout = http_connect_timeout
+        @http_read_timeout = http_read_timeout
+        @http_max_retries = http_max_retries
+      end
+
+      def name
+        raise NotImplementedError
+      end
+
+      def default_model
+        raise NotImplementedError
+      end
+
+      def default_api_key
+        raise NotImplementedError
+      end
+
+      def base_url
+        raise NotImplementedError
+      end
+
+      def parse_usage(response)
+        raise NotImplementedError
+      end
+
+      def build_client
+        client_class.new(
+          provider: self,
+          api_key: api_key,
+          logger: logger,
+          usage_tracker: usage_tracker,
+          http_connect_timeout: http_connect_timeout,
+          http_read_timeout: http_read_timeout,
+          http_max_retries: http_max_retries
+        )
+      end
+
+      def create_assistant(state:nil, system:nil, model:nil, tools:[], mcp_servers:{},
+                           json_schema:nil, thinking:nil, client:nil)
+
+        raise ArgumentError, 'Use state or system, not both' if state && system
+
+        state = AssistantState.new(context: system) if state.nil? && system
+
+        assistant_class.new(
+          provider: self,
+          client: client,
+          model: model || self.model,
+          state: state,
+          tools: tools,
+          mcp_servers: mcp_servers,
+          json_schema: json_schema,
+          thinking: thinking,
+          logger: logger
+        )
+      end
+
+      def generate_text(prompt:nil, messages:nil, system:nil, model:nil,
+                        json_schema:nil, thinking:nil, client:nil)
+
+        raise ArgumentError, 'Use prompt or messages, not both' if prompt && messages
+        raise ArgumentError, 'Undefined prompt or messages' if prompt.nil? && messages.nil?
+
+        system_prompt, conversation = split_system(messages || [{role: Roles::USER, content: prompt}])
+
+        client ||= build_client
+
+        response = request(
+          client: client,
+          messages: conversation.map { |message| encode_message message },
+          system: system || system_prompt,
+          model: model || self.model,
+          json_schema: json_schema,
+          thinking: thinking_config(thinking)
+        )
+
+        Result.new content: parse_content(response),
+                   usage: parse_usage(response),
+                   raw: response
+      end
+
+      private
+
+      attr_reader :api_key, :usage_tracker, :logger,
+                  :http_connect_timeout, :http_read_timeout, :http_max_retries
+
+      def provider_module
+        AI.const_get MODULES.fetch(name)
+      end
+
+      def client_class
+        provider_module::Client
+      end
+
+      def assistant_class
+        provider_module::Assistant
+      end
+
+      def split_system(messages)
+        normalized = messages.map { |message| normalize_message message }
+
+        system_messages, conversation = normalized.partition { |message| message[:role] == Roles::SYSTEM }
+
+        system_prompt = system_messages.map { |message| message[:content] }.join("\n") unless system_messages.empty?
+
+        [system_prompt, conversation]
+      end
+
+      def normalize_message(message)
+        {
+          role: (message[:role] || message['role'] || Roles::USER).to_s,
+          content: message[:content] || message['content']
+        }
+      end
+
+      def thinking_config(level)
+        return nil if level.nil?
+
+        levels = self.class::THINKING_LEVELS
+
+        raise ArgumentError, "Invalid thinking level '#{level}'. Valid: #{levels.keys.join(', ')}" unless levels.key? level
+
+        levels[level]
+      end
+
+      # --- Template methods ---
+
+      def request(client:, messages:, system:, model:, json_schema:, thinking:)
+        raise NotImplementedError
+      end
+
+      def encode_message(message)
+        raise NotImplementedError
+      end
+
+      def parse_content(response)
+        raise NotImplementedError
+      end
+
+    end
+  end
+end

data/lib/rasti/ai/provider_aware.rb

@@ -0,0 +1,17 @@
+module Rasti
+  module AI
+    module ProviderAware
+
+      private
+
+      def provider
+        @provider ||= provider_module::Provider.new
+      end
+
+      def provider_module
+        Object.const_get self.class.name.split('::')[0..-2].join('::')
+      end
+
+    end
+  end
+end

data/lib/rasti/ai/result.rb

@@ -0,0 +1,11 @@
+module Rasti
+  module AI
+    class Result < Rasti::Model
+
+      attribute :content, Rasti::Types::String
+      attribute :usage
+      attribute :raw
+
+    end
+  end
+end

data/lib/rasti/ai/roles.rb

@@ -0,0 +1,11 @@
+module Rasti
+  module AI
+    module Roles
+
+      ASSISTANT = 'assistant'.freeze
+      SYSTEM = 'system'.freeze
+      USER = 'user'.freeze
+
+    end
+  end
+end

data/lib/rasti/ai/version.rb

@@ -1,5 +1,5 @@
 module Rasti
   module AI
-    VERSION = '3.1.0'
+    VERSION = '3.2.0'
   end
 end

data/lib/rasti/ai.rb

@@ -15,12 +15,16 @@ module Rasti
     extend ClassConfig
 
     require_relative 'ai/errors'
+    require_relative 'ai/roles'
     require_relative 'ai/usage'
+    require_relative 'ai/result'
     require_relative 'ai/assistant_state'
     require_relative 'ai/tool'
     require_relative 'ai/tool_serializer'
+    require_relative 'ai/provider_aware'
     require_relative 'ai/client'
     require_relative 'ai/assistant'
+    require_relative 'ai/provider'
     require_relative_pattern 'ai/open_ai/*'
     require_relative_pattern 'ai/**/*'
 
@@ -30,6 +34,8 @@ module Rasti
     attr_config :http_read_timeout, 60
     attr_config :http_max_retries, 3
 
+    attr_config :default_provider, ENV['AI_DEFAULT_PROVIDER']
+
     attr_config :openai_api_key, ENV['OPENAI_API_KEY']
     attr_config :openai_default_model, ENV['OPENAI_DEFAULT_MODEL']
 
@@ -47,5 +53,92 @@ module Rasti
 
     attr_config :usage_tracker, nil
 
+    class << self
+
+      def provider(name=nil, model:nil, api_key:nil, usage_tracker:nil, logger:nil,
+                        http_connect_timeout:nil, http_read_timeout:nil, http_max_retries:nil)
+
+        build_provider(
+          name, model, api_key, usage_tracker, logger,
+          http_connect_timeout, http_read_timeout, http_max_retries
+        ).first
+      end
+
+      def create_assistant(provider:nil, model:nil, api_key:nil, usage_tracker:nil, logger:nil,
+                                http_connect_timeout:nil, http_read_timeout:nil, http_max_retries:nil,
+                                state:nil, system:nil, tools:[], mcp_servers:{}, json_schema:nil,
+                                thinking:nil, client:nil)
+
+        resolved_provider, resolved_model = build_provider(
+          provider, model, api_key, usage_tracker, logger,
+          http_connect_timeout, http_read_timeout, http_max_retries
+        )
+
+        resolved_provider.create_assistant(
+          model: resolved_model,
+          state: state,
+          system: system,
+          tools: tools,
+          mcp_servers: mcp_servers,
+          json_schema: json_schema,
+          thinking: thinking,
+          client: client
+        )
+      end
+
+      def generate_text(provider:nil, model:nil, api_key:nil, usage_tracker:nil, logger:nil,
+                            http_connect_timeout:nil, http_read_timeout:nil, http_max_retries:nil,
+                            prompt:nil, messages:nil, system:nil, json_schema:nil,
+                            thinking:nil, client:nil)
+
+        resolved_provider, resolved_model = build_provider(
+          provider, model, api_key, usage_tracker, logger,
+          http_connect_timeout, http_read_timeout, http_max_retries
+        )
+
+        resolved_provider.generate_text(
+          model: resolved_model,
+          prompt: prompt,
+          messages: messages,
+          system: system,
+          json_schema: json_schema,
+          thinking: thinking,
+          client: client
+        )
+      end
+
+      private
+
+      def build_provider(name, model, api_key, usage_tracker, logger,
+                         http_connect_timeout, http_read_timeout, http_max_retries)
+
+        name, model = split_provider_and_model name, model
+
+        resolved_provider = Provider.build name,
+                                           model: model,
+                                           api_key: api_key,
+                                           usage_tracker: usage_tracker,
+                                           logger: logger,
+                                           http_connect_timeout: http_connect_timeout,
+                                           http_read_timeout: http_read_timeout,
+                                           http_max_retries: http_max_retries
+
+        [resolved_provider, model]
+      end
+
+      def split_provider_and_model(name, model)
+        if name.nil? && model.to_s.include?(':')
+          name, model = model.split ':', 2
+        end
+
+        name ||= default_provider
+
+        raise ArgumentError, "Undefined provider. Set it with provider: or Rasti::AI.default_provider. Valid providers: #{Provider.names.join(', ')}" if name.nil?
+
+        [name, model]
+      end
+
+    end
+
   end
 end